Merge pull request #609 from lambdaclass/increment-nonce-only-for-eoa…

…s-on-failure [EVM Equivalence Yul] Increment nonce on failed deployments only for eoas
matter-labs · Jul 11, 2024 · dc2e056 · dc2e056
2 parents 0b58290 + a252e10
commit dc2e056
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 3 deletions.
diff --git a/system-contracts/contracts/EvmInterpreterFunctions.template.yul b/system-contracts/contracts/EvmInterpreterFunctions.template.yul
@@ -596,6 +596,19 @@ function warmSlot(key,currentValue) -> isWarm, originalValue {
     originalValue := mload(32)
 }
 
+function MAX_SYSTEM_CONTRACT_ADDR() -> ret {
+    ret := 0x000000000000000000000000000000000000ffff
+}
+
+/// @dev Checks whether an address is an EOA (i.e. has not code deployed on it)
+/// @param addr The address to check
+function isEOA(addr) -> ret {
+    ret := 0
+    if gt(addr, MAX_SYSTEM_CONTRACT_ADDR()) {
+        ret := iszero(_getRawCodeHash(addr))
+    }
+}
+
 function getNewAddress(addr) -> newAddr {
     let digest, nonce, addressEncoded, nonceEncoded, nonceEncodedLength, listLength, listLengthEconded
 
@@ -1280,7 +1293,17 @@ function genericCreate(addr, offset, size, sp, value, evmGasLeftOld) -> result,
 
     _popEVMFrame()
 
-    incrementNonce(address())
+    switch result
+    case 1 {
+        incrementNonce(address())
+    }
+    default {
+        switch isEOA(address())
+        case 1 {
+            incrementNonce(address())
+        }
+        default {}
+    }
 
     let back
 

diff --git a/system-contracts/contracts/EvmInterpreterPreprocessed.yul b/system-contracts/contracts/EvmInterpreterPreprocessed.yul
@@ -670,6 +670,19 @@ object "EVMInterpreter" {
             originalValue := mload(32)
         }
 
+        function MAX_SYSTEM_CONTRACT_ADDR() -> ret {
+            ret := 0x000000000000000000000000000000000000ffff
+        }
+
+        /// @dev Checks whether an address is an EOA (i.e. has not code deployed on it)
+        /// @param addr The address to check
+        function isEOA(addr) -> ret {
+            ret := 0
+            if gt(addr, MAX_SYSTEM_CONTRACT_ADDR()) {
+                ret := iszero(_getRawCodeHash(addr))
+            }
+        }
+
         function getNewAddress(addr) -> newAddr {
             let digest, nonce, addressEncoded, nonceEncoded, nonceEncodedLength, listLength, listLengthEconded
 
@@ -1354,7 +1367,17 @@ object "EVMInterpreter" {
 
             _popEVMFrame()
 
-            incrementNonce(address())
+            switch result
+            case 1 {
+                incrementNonce(address())
+            }
+            default {
+                switch isEOA(address())
+                case 1 {
+                    incrementNonce(address())
+                }
+                default {}
+            }
 
             let back
 
@@ -3502,6 +3525,19 @@ object "EVMInterpreter" {
                 originalValue := mload(32)
             }
 
+            function MAX_SYSTEM_CONTRACT_ADDR() -> ret {
+                ret := 0x000000000000000000000000000000000000ffff
+            }
+
+            /// @dev Checks whether an address is an EOA (i.e. has not code deployed on it)
+            /// @param addr The address to check
+            function isEOA(addr) -> ret {
+                ret := 0
+                if gt(addr, MAX_SYSTEM_CONTRACT_ADDR()) {
+                    ret := iszero(_getRawCodeHash(addr))
+                }
+            }
+
             function getNewAddress(addr) -> newAddr {
                 let digest, nonce, addressEncoded, nonceEncoded, nonceEncodedLength, listLength, listLengthEconded
 
@@ -4186,7 +4222,17 @@ object "EVMInterpreter" {
 
                 _popEVMFrame()
 
-                incrementNonce(address())
+                switch result
+                case 1 {
+                    incrementNonce(address())
+                }
+                default {
+                    switch isEOA(address())
+                    case 1 {
+                        incrementNonce(address())
+                    }
+                    default {}
+                }
 
                 let back