fix(op-extcodesize): Fix op-extcodesize

lambdaclass · Apr 22, 2024 · a043847 · a043847
1 parent 566232e
commit a043847
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/system-contracts/contracts/EvmInterpreterFunctions.template.yul b/system-contracts/contracts/EvmInterpreterFunctions.template.yul
@@ -192,6 +192,7 @@ function _getRawCodeHash(account) -> hash {
 }
 
 // Basically performs an extcodecopy, while returning the length of the bytecode.
+// it is not an actual extcodecopy, since the first 32bytes are skipped
 function _fetchDeployedCode(addr, _offset, _len) -> codeLen {
     let codeHash := _getRawCodeHash(addr)
 

diff --git a/system-contracts/contracts/EvmInterpreterLoop.template.yul b/system-contracts/contracts/EvmInterpreterLoop.template.yul
@@ -403,8 +403,9 @@ for { } true { } {
         // TODO: check, the .sol uses extcodesize directly, but it doesnt seem to work
         // if a contract is created it works, but if the address is a zkSync's contract
         // what happens?
-
-        sp := pushStackItem(sp, _fetchDeployedCodeLen(addr))
+        switch _isEVM(addr) 
+            case 0  { sp := pushStackItem(sp, extcodesize(addr)) }
+            default { sp := pushStackItem(sp, _fetchDeployedCodeLen(addr)) }
     }
     case 0x3C { // OP_EXTCODECOPY
         let addr, dest, offset, len
@@ -425,6 +426,7 @@ for { } true { } {
             default {
                 dynamicGas := 2600
             }
+
         dynamicGas := add(dynamicGas, add(mul(3, shr(5, add(len, 31))), expandMemory(add(offset, len))))
         evmGasLeft := chargeGas(evmGasLeft, dynamicGas)