fi(EVM): Fix EXTCODECOPY zeroing offset (#1115)

matter-labs · Dec 4, 2024 · 7afaf45 · 7afaf45
1 parent 17e46ab
commit 7afaf45
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
@@ -1717,6 +1717,8 @@ object "EvmEmulator" {
 
                     evmGasLeft := chargeGas(evmGasLeft, dynamicGas)
 
+                    dstOffset := add(dstOffset, MEM_OFFSET())
+
                     if gt(srcOffset, MAX_UINT64()) {
                         srcOffset := MAX_UINT64()
                     } 
@@ -1725,7 +1727,7 @@ object "EvmEmulator" {
                         let copiedLen
                         if getRawCodeHash(addr) {
                              // Gets the code from the addr
-                             copiedLen := fetchDeployedCode(addr, add(dstOffset, MEM_OFFSET()), srcOffset, len)
+                             copiedLen := fetchDeployedCode(addr, dstOffset, srcOffset, len)
                         }
 
                         if lt(copiedLen, len) {
@@ -4789,6 +4791,8 @@ object "EvmEmulator" {
 
                         evmGasLeft := chargeGas(evmGasLeft, dynamicGas)
 
+                        dstOffset := add(dstOffset, MEM_OFFSET())
+
                         if gt(srcOffset, MAX_UINT64()) {
                             srcOffset := MAX_UINT64()
                         } 
@@ -4797,7 +4801,7 @@ object "EvmEmulator" {
                             let copiedLen
                             if getRawCodeHash(addr) {
                                  // Gets the code from the addr
-                                 copiedLen := fetchDeployedCode(addr, add(dstOffset, MEM_OFFSET()), srcOffset, len)
+                                 copiedLen := fetchDeployedCode(addr, dstOffset, srcOffset, len)
                             }
 
                             if lt(copiedLen, len) {

diff --git a/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul b/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul
@@ -493,6 +493,8 @@ for { } true { } {
 
         evmGasLeft := chargeGas(evmGasLeft, dynamicGas)
 
+        dstOffset := add(dstOffset, MEM_OFFSET())
+
         if gt(srcOffset, MAX_UINT64()) {
             srcOffset := MAX_UINT64()
         } 
@@ -501,7 +503,7 @@ for { } true { } {
             let copiedLen
             if getRawCodeHash(addr) {
                  // Gets the code from the addr
-                 copiedLen := fetchDeployedCode(addr, add(dstOffset, MEM_OFFSET()), srcOffset, len)
+                 copiedLen := fetchDeployedCode(addr, dstOffset, srcOffset, len)
             }
 
             if lt(copiedLen, len) {