fix(EVM): Fix calls to contract being created (#1093)

matter-labs · Nov 29, 2024 · 19f9c16 · 19f9c16
1 parent b5a3258
commit 19f9c16
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
@@ -390,6 +390,13 @@ object "EvmEmulator" {
             isEVM := fetchFromSystemContract(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT(), 36)
         }
 
+        function isConstructedEvmContract(addr) -> isConstructedEVM {
+            let rawCodeHash := getRawCodeHash(addr)
+            let version := shr(248, rawCodeHash)
+            let isConstructedFlag := xor(shr(240, rawCodeHash), 1)
+            isConstructedEVM := and(eq(version, 2), isConstructedFlag)
+        }
+
         // Basically performs an extcodecopy, while returning the length of the copied bytecode.
         function fetchDeployedCode(addr, dstOffset, srcOffset, len) -> copiedLen {
             let codeHash := getRawCodeHash(addr)
@@ -803,7 +810,7 @@ object "EvmEmulator" {
         }
 
         function _genericCall(addr, gasToPass, value, argsOffset, argsSize, retOffset, retSize, isStatic) -> success, frameGasLeft {
-            switch isEvmContract(addr)
+            switch isConstructedEvmContract(addr)
             case 0 {
                 // zkEVM native call
                 let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
@@ -3415,6 +3422,13 @@ object "EvmEmulator" {
                 isEVM := fetchFromSystemContract(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT(), 36)
             }
 
+            function isConstructedEvmContract(addr) -> isConstructedEVM {
+                let rawCodeHash := getRawCodeHash(addr)
+                let version := shr(248, rawCodeHash)
+                let isConstructedFlag := xor(shr(240, rawCodeHash), 1)
+                isConstructedEVM := and(eq(version, 2), isConstructedFlag)
+            }
+
             // Basically performs an extcodecopy, while returning the length of the copied bytecode.
             function fetchDeployedCode(addr, dstOffset, srcOffset, len) -> copiedLen {
                 let codeHash := getRawCodeHash(addr)
@@ -3828,7 +3842,7 @@ object "EvmEmulator" {
             }
 
             function _genericCall(addr, gasToPass, value, argsOffset, argsSize, retOffset, retSize, isStatic) -> success, frameGasLeft {
-                switch isEvmContract(addr)
+                switch isConstructedEvmContract(addr)
                 case 0 {
                     // zkEVM native call
                     let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)

diff --git a/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul b/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul
@@ -328,6 +328,13 @@ function isEvmContract(addr) -> isEVM {
     isEVM := fetchFromSystemContract(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT(), 36)
 }
 
+function isConstructedEvmContract(addr) -> isConstructedEVM {
+    let rawCodeHash := getRawCodeHash(addr)
+    let version := shr(248, rawCodeHash)
+    let isConstructedFlag := xor(shr(240, rawCodeHash), 1)
+    isConstructedEVM := and(eq(version, 2), isConstructedFlag)
+}
+
 // Basically performs an extcodecopy, while returning the length of the copied bytecode.
 function fetchDeployedCode(addr, dstOffset, srcOffset, len) -> copiedLen {
     let codeHash := getRawCodeHash(addr)
@@ -741,7 +748,7 @@ function performDelegateCall(oldSp, evmGasLeft, isStatic, oldStackHead) -> newGa
 }
 
 function _genericCall(addr, gasToPass, value, argsOffset, argsSize, retOffset, retSize, isStatic) -> success, frameGasLeft {
-    switch isEvmContract(addr)
+    switch isConstructedEvmContract(addr)
     case 0 {
         // zkEVM native call
         let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)