Merge pull request #988 from argotorg/ethereum-tests

Move from `ethereum/tests` to `ethereum/execution-spec-tests`

Author: blishko

.github/workflows/build.yml

@@ -224,12 +224,9 @@ jobs:
           path: ethereum-solidity
           persist-credentials: false
 
-      - uses: actions/checkout@v4
-        with:
-          repository: ethereum/tests
-          ref: v13
-          path: ethereum-tests
-          persist-credentials: false
+      - name: Download execution-spec-tests fixtures
+        run: |
+          curl --retry 5 -fsSL https://github.com/ethereum/execution-spec-tests/releases/download/v5.4.0/fixtures_stable.tar.gz | tar xz
 
       - uses: actions/checkout@v4
         with:
@@ -257,7 +254,7 @@ jobs:
           echo DAPP_SOLC_PATH="$PWD/solc/" >> "$GITHUB_ENV"
           # repos
           echo HEVM_SOLIDITY_REPO="$PWD/ethereum-solidity" >> "$GITHUB_ENV"
-          echo HEVM_ETHEREUM_TESTS_REPO="$PWD/ethereum-tests" >> "$GITHUB_ENV"
+          echo HEVM_ETHEREUM_TESTS_REPO="$PWD/fixtures/blockchain_tests" >> "$GITHUB_ENV"
           echo HEVM_FORGE_STD_REPO="$PWD/forge-std" >> "$GITHUB_ENV"
 
       - name: run tests

bench/bench.hs

@@ -43,9 +43,8 @@ blockchainTests ts = bench "blockchain-tests" $ nfIO $ do
   tests <- ts
   putStrLn "    executing blockchain tests"
   let cases = concat . Map.elems . (fmap Map.toList) $ tests
-      ignored = Map.keys BCTests.problematicTests
   foldM (\acc (n, c) ->
-      if n `elem` ignored
+      if isJust (BCTests.findIgnoreReason n)
       then pure True
       else do
         res <- runApp $ runBCTest c

flake.lock

@@ -9,10 +9,6 @@
       url = "github:argotorg/solidity/8a97fa7a1db1ec509221ead6fea6802c684ee887";
       flake = false;
     };
-    ethereum-tests = {
-      url = "github:ethereum/tests/v13";
-      flake = false;
-    };
     forge-std = {
       url = "github:foundry-rs/forge-std";
       flake = false;
@@ -27,9 +23,13 @@
     };
   };
 
-  outputs = { nixpkgs, flake-utils, solidity, empty-smt-solver, forge-std, ethereum-tests, foundry, solc-pkgs, ... }:
+  outputs = { nixpkgs, flake-utils, solidity, empty-smt-solver, forge-std, foundry, solc-pkgs, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
+        execution-spec-tests-fixtures = builtins.fetchTarball {
+          url = "https://github.com/ethereum/execution-spec-tests/releases/download/v5.4.0/fixtures_stable.tar.gz";
+          sha256 = "0a0i20f611aghvh1vghvzcxilbh80bd4174n7ih7iarn5x71aq1p";
+        };
         pkgs = (import nixpkgs {
           inherit system;
           overlays = [solc-pkgs.overlay];
@@ -71,7 +71,7 @@
               secp256k1 = ps.secp256k1;
             }).overrideAttrs(final: prev: {
               HEVM_SOLIDITY_REPO = solidity;
-              HEVM_ETHEREUM_TESTS_REPO = ethereum-tests;
+              HEVM_ETHEREUM_TESTS_REPO = "${execution-spec-tests-fixtures}/blockchain_tests";
               HEVM_FORGE_STD_REPO = forge-std;
               DAPP_SOLC = "${solc}/bin/solc";
             }))
@@ -207,7 +207,7 @@
           # hevm tests expect these to be set
           HEVM_SOLIDITY_REPO = solidity;
           DAPP_SOLC = "${solc}/bin/solc";
-          HEVM_ETHEREUM_TESTS_REPO = ethereum-tests;
+          HEVM_ETHEREUM_TESTS_REPO = "${execution-spec-tests-fixtures}/blockchain_tests";
           HEVM_FORGE_STD_REPO = forge-std;
 
           # point cabal repl to system deps

flake.nix

@@ -1525,8 +1525,20 @@ finalize = do
       -- deposit the code from a creation tx
       creation <- use (#tx % #isCreate)
       createe  <- use (#state % #contract)
-      createeExists <- (Map.member createe) <$> use (#env % #contracts)
-      when (creation && createeExists) $
+      createeContract <- preuse (#env % #contracts % ix createe)
+      -- Check if this is a collision case (target has RuntimeCode instead of InitCode)
+      let isCollision = creation && case createeContract of
+            Just c -> case c.code of
+              InitCode _ _ -> False
+              RuntimeCode _ -> True   -- collision: existing contract has RuntimeCode
+              UnknownCode _ -> internalError "cannot determine collision with unknown code"
+            Nothing -> internalError "create transaction but no code found"
+      -- For collision: burn all gas (failed CREATE consumes all gas)
+      when isCollision $ assign (#state % #gas) initialGas
+      -- Only replace code if this is a creation tx, the contract exists,
+      -- and it has InitCode (not RuntimeCode from a collision)
+      let shouldReplaceCode = creation && not isCollision
+      when shouldReplaceCode $
         case output of
           ConcreteBuf bs -> replaceCode createe (RuntimeCode (ConcreteRuntimeCode bs))
           _ ->
@@ -2207,14 +2219,21 @@ delegateCall this gasGiven xTo xContext xValue xInOffset xInSize xOutOffset xOut
 
 -- -- * Contract creation
 
--- EIP 684
+-- EIP-684 and EIP-7610: collision if nonce != 0, code is non-empty, or storage is non-empty
 collision :: Maybe Contract -> Bool
 collision c' = case c' of
-  Just c -> c.nonce /= Just 0 || case c.code of
+  Just c -> c.nonce /= Just 0 || not (isStorageEmpty c.storage) || case c.code of
     RuntimeCode (ConcreteRuntimeCode "") -> False
     RuntimeCode (SymbolicRuntimeCode b) -> not $ null b
     _ -> True
   Nothing -> False
+  where
+    isStorageEmpty :: Expr Storage -> Bool
+    isStorageEmpty = \case
+      ConcreteStore m -> Map.null m
+      AbstractStore _ _ -> True -- empty symbolic store
+      SStore _ _ _ -> False     -- has writes, so non-empty
+      GVar _ -> internalError "unexpected global variable"
 
 create :: forall t. (?op :: Word8, ?conf::Config, VMOps t)
   => Expr EAddr -> Contract

src/EVM.hs

@@ -1,6 +1,6 @@
 module EVM.Transaction where
 
-import EVM (initialContract, ceilDiv)
+import EVM (initialContract, ceilDiv, collision)
 import EVM.Expr qualified as Expr
 import EVM.FeeSchedule
 import EVM.Format (hexText)
@@ -12,6 +12,7 @@ import Optics.Core hiding (cons)
 
 import Data.Aeson (FromJSON (..))
 import Data.Aeson qualified as JSON
+import Data.Function (applyWhen)
 import Data.Aeson.Types qualified as JSON
 import Data.ByteString (ByteString, cons)
 import Data.ByteString qualified as BS
@@ -34,10 +35,14 @@ data TxType
   = LegacyTransaction
   | AccessListTransaction
   | EIP1559Transaction
+  | EIP4844Transaction
+  | EIP7702Transaction
   deriving (Show, Eq, Generic)
 
 instance JSON.ToJSON TxType where
   toJSON t = case t of
+               EIP7702Transaction    -> "0x4" -- permanently sets the code for an EOA
+               EIP4844Transaction    -> "0x3" -- Proto-Danksharding
                EIP1559Transaction    -> "0x2" -- EIP1559
                LegacyTransaction     -> "0x1" -- EIP2718
                AccessListTransaction -> "0x1" -- EIP2930
@@ -124,6 +129,8 @@ signingData tx =
       else normalData
     AccessListTransaction -> eip2930Data
     EIP1559Transaction -> eip1559Data
+    EIP4844Transaction -> eip4844Data
+    EIP7702Transaction -> eip7702Data
   where v          = tx.v
         to'        = case tx.toAddr of
           Just a  -> BS $ word160Bytes a
@@ -166,7 +173,6 @@ signingData tx =
           , BS tx.txdata
           , rlpAccessList
           ]
-
         eip2930Data = cons 0x01 $ rlpList
           [ rlpWord256 tx.chainId
           , rlpWord256 tx.nonce
@@ -177,6 +183,31 @@ signingData tx =
           , BS tx.txdata
           , rlpAccessList
           ]
+        eip4844Data = cons 0x03 $ rlpList
+          [ rlpWord256 tx.chainId
+          , rlpWord256 tx.nonce
+          , rlpWord256 maxPrio
+          , rlpWord256 maxFee
+          , rlpWord256 (into tx.gasLimit)
+          , to'
+          , rlpWord256 tx.value
+          , BS tx.txdata
+          , rlpAccessList
+          , rlpWord256 $ undefined -- TODO EIP4844 max_fee_per_blob_gas
+          , undefined -- TODO EIP4844 blob_versioned_hashes
+          ]
+        eip7702Data = cons 0x04 $ rlpList
+          [ rlpWord256 tx.chainId
+          , rlpWord256 tx.nonce
+          , rlpWord256 maxPrio
+          , rlpWord256 maxFee
+          , rlpWord256 (into tx.gasLimit)
+          , to'
+          , rlpWord256 tx.value
+          , BS tx.txdata
+          , rlpAccessList
+          , undefined -- TODO EIP4844 authorization_list
+          ]
 
 accessListPrice :: FeeSchedule Word64 -> [AccessListEntry] -> Word64
 accessListPrice fs al =
@@ -220,7 +251,7 @@ instance FromJSON Transaction where
     toAddr   <- addrFieldMaybe val "to"
     v        <- wordField val "v"
     value    <- wordField val "value"
-    txType   <- fmap (read :: String -> Int) <$> (val JSON..:? "type")
+    txType   <- fmap (read :: String -> Int) <$> val JSON..:? "type"
     case txType of
       Just 0x00 -> pure $ Transaction tdata gasLimit gasPrice nonce r s toAddr v value LegacyTransaction [] Nothing Nothing 1
       Just 0x01 -> do
@@ -229,6 +260,14 @@ instance FromJSON Transaction where
       Just 0x02 -> do
         accessListEntries <- (val JSON..: "accessList") >>= parseJSONList
         pure $ Transaction tdata gasLimit gasPrice nonce r s toAddr v value EIP1559Transaction accessListEntries maxPrio maxFee 1
+      Just 0x03 -> do
+        accessListEntries <- (val JSON..: "accessList") >>= parseJSONList
+        -- TODO: capture max_fee_per_blob_gas and blob_versioned_hashes EIP4844
+        pure $ Transaction tdata gasLimit gasPrice nonce r s toAddr v value EIP4844Transaction accessListEntries maxPrio maxFee 1
+      Just 0x04 -> do
+        accessListEntries <- (val JSON..: "accessList") >>= parseJSONList
+        -- TODO: capture authorization_list EIP7702
+        pure $ Transaction tdata gasLimit gasPrice nonce r s toAddr v value EIP7702Transaction accessListEntries maxPrio maxFee 1
       Just _ -> fail "unrecognized custom transaction type"
       Nothing -> pure $ Transaction tdata gasLimit gasPrice nonce r s toAddr v value LegacyTransaction [] Nothing Nothing 1
   parseJSON invalid =
@@ -268,13 +307,20 @@ initTx vm =
     preState = setupTx origin coinbase gasPrice gasLimit vm.env.contracts
     oldBalance = view (accountAt toAddr % #balance) preState
     creation = vm.tx.isCreate
-    initState =
-        ((Map.adjust (over #balance (`Expr.sub` value))) origin)
-      . (Map.adjust (over #balance (Expr.add value))) toAddr
-      . (if creation
-         then Map.insert toAddr (toContract & (set #balance oldBalance))
-         else touchAccount toAddr)
-      $ preState
+    -- Check for collision at target address for CREATE transactions
+    hasCollision = creation && collision (Map.lookup toAddr preState)
+    -- For collision: don't transfer value, don't create contract
+    initState = if hasCollision
+      then touchAccount toAddr preState
+      else ((Map.adjust (over #balance (`Expr.sub` value))) origin)
+         . (Map.adjust (over #balance (Expr.add value))) toAddr
+         . (if creation
+            then Map.insert toAddr (toContract & (set #balance oldBalance))
+            else touchAccount toAddr)
+         $ preState
   in
     vm & #env % #contracts .~ initState
        & #tx % #txReversion .~ preState
+       -- For collision: set code to empty so exec1 immediately stops and calls finalize
+       -- (don't set #result directly, as that bypasses finalize which handles gas payment)
+       & applyWhen hasCollision (#state % #code .~ RuntimeCode (ConcreteRuntimeCode ""))