Implement EIP-7610 (non-empty storage create collision) and upgrade execution-tests

circle.yml

@@ -403,9 +403,7 @@ jobs:
  steps:
  - build
  - download_execution_tests:
- # v13.2 + fix
- rev: develop
- commit: 52ddcbcef0d58ec7de6b768b564725391a30b934
+ rev: v13.3
  - run:
  name: "State tests"
  working_directory: ~/build
@@ -432,7 +430,7 @@ jobs:
  working_directory: ~/build
  command: >
  bin/evmone-blockchaintest
- --gtest_filter='-*StateTests/stEOF/*.*'
+ --gtest_filter='-*StateTests/stEOF/*.*:*StateTests/stEIP2537.*'
  ~/tests/EIPTests/BlockchainTests/
  - download_execution_tests:
  repo: ipsilon/tests
@@ -463,7 +461,7 @@ jobs:
  command: sudo apt-get -q update && sudo apt-get -qy install libgmp-dev
  - build
  - download_execution_tests:
- rev: v12.4
+ rev: v13.3
  - run:
  name: "State tests"
  working_directory: ~/build

test/state/host.cpp

@@ -88,10 +88,19 @@ bytes_view extcode(bytes_view code) noexcept
 }
 
 /// Check if an existing account is the "create collision"
-/// as defined in the [EIP-684](https://eips.ethereum.org/EIPS/eip-684).
+/// as defined in the [EIP-7610](https://eips.ethereum.org/EIPS/eip-7610).
 [[nodiscard]] bool is_create_collision(const Account& acc) noexcept
 {
- return acc.nonce != 0 || !acc.code.empty();
+ if (acc.nonce != 0 || !acc.code.empty())
+ return true;
+
+ // acc.storage may have entries from access list, even if account storage is empty.
+ // Check for non-zero current values.
+ if (std::ranges::any_of(
+ acc.storage, [](auto& e) noexcept { return !is_zero(e.second.current); }))
+ return true;
+
+ return false;
 }
 } // namespace
 
@@ -268,14 +277,6 @@ evmc::Result Host::create(const evmc_message& msg) noexcept
 
  new_acc->just_created = true;
 
- // Clear the new account storage, but keep the access status (from tx access list).
- // This is only needed for tests and cannot happen in real networks.
- for (auto& [k, v] : new_acc->storage) [[unlikely]]
- {
- m_state.journal_storage_change(msg.recipient, k, v);
- v = StorageValue{.access_status = v.access_status};
- }
-
  auto& sender_acc = m_state.get(msg.sender); // TODO: Duplicated account lookup.
  const auto value = intx::be::load<intx::uint256>(msg.value);
  assert(sender_acc.balance >= value && "EVM must guarantee balance");