Add check if contract is constructing

matter-labs · Aug 23, 2024 · 1c5c124 · 1c5c124
1 parent 19f0e0d
commit 1c5c124
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/system-contracts/contracts/EvmGasManager.sol b/system-contracts/contracts/EvmGasManager.sol
@@ -2,6 +2,7 @@
 pragma solidity ^0.8.0;
 
 import "./EvmConstants.sol";
+import "./libraries/Utils.sol";
 
 import {ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT} from "./Constants.sol";
 
@@ -42,10 +43,13 @@ contract EvmGasManager {
         }
 
         if (!isEVM) {
-            isEVM = ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.isAccountEVM(msg.sender);
+            bytes32 bytecodeHash = ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.getRawCodeHash(msg.sender);
+            isEVM = Utils.isCodeHashEVM(bytecodeHash);
             if (isEVM) {
-                assembly {
-                    tstore(transient_slot, isEVM)
+                if (!Utils.isContractConstructing(bytecodeHash)) {
+                    assembly {
+                        tstore(transient_slot, isEVM)
+                    }
                 }
             }
         }