fix(EVM): Fix CALL in static context (#1091)

matter-labs · Nov 27, 2024 · 871d1fe · 871d1fe
1 parent fcb2e2b
commit 871d1fe
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 27 deletions.
diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
@@ -641,7 +641,7 @@ object "EvmEmulator" {
         //               CALLS FUNCTIONALITY
         ////////////////////////////////////////////////////////////////
 
-        function performCall(oldSp, evmGasLeft, oldStackHead) -> newGasLeft, sp, stackHead {
+        function performCall(oldSp, evmGasLeft, oldStackHead, isStatic) -> newGasLeft, sp, stackHead {
             let gasToPass, addr, value, argsOffset, argsSize, retOffset, retSize
 
             popStackCheck(oldSp, 7)
@@ -673,6 +673,10 @@ object "EvmEmulator" {
             gasUsed := add(gasUsed, expandMemory2(retOffset, retSize, argsOffset, argsSize))
 
             if gt(value, 0) {
+                if isStatic {
+                    panic()
+                }
+
                 gasUsed := add(gasUsed, 9000) // positive_value_cost
 
                 if isAddrEmpty(addr) {
@@ -696,7 +700,7 @@ object "EvmEmulator" {
                 argsSize,
                 add(retOffset, MEM_OFFSET()),
                 retSize,
-                false
+                isStatic
             )
 
             newGasLeft := add(evmGasLeft, frameGasLeft)
@@ -2627,13 +2631,7 @@ object "EvmEmulator" {
                 }
                 case 0xF1 { // OP_CALL
                     // A function was implemented in order to avoid stack depth errors.
-                    switch isStatic
-                    case 0 {
-                        evmGasLeft, sp, stackHead := performCall(sp, evmGasLeft, stackHead)
-                    }
-                    default {
-                        evmGasLeft, sp, stackHead := performStaticCall(sp, evmGasLeft, stackHead)
-                    }
+                    evmGasLeft, sp, stackHead := performCall(sp, evmGasLeft, stackHead, isStatic)
                     ip := add(ip, 1)
                 }
                 case 0xF3 { // OP_RETURN
@@ -3668,7 +3666,7 @@ object "EvmEmulator" {
             //               CALLS FUNCTIONALITY
             ////////////////////////////////////////////////////////////////
 
-            function performCall(oldSp, evmGasLeft, oldStackHead) -> newGasLeft, sp, stackHead {
+            function performCall(oldSp, evmGasLeft, oldStackHead, isStatic) -> newGasLeft, sp, stackHead {
                 let gasToPass, addr, value, argsOffset, argsSize, retOffset, retSize
 
                 popStackCheck(oldSp, 7)
@@ -3700,6 +3698,10 @@ object "EvmEmulator" {
                 gasUsed := add(gasUsed, expandMemory2(retOffset, retSize, argsOffset, argsSize))
 
                 if gt(value, 0) {
+                    if isStatic {
+                        panic()
+                    }
+
                     gasUsed := add(gasUsed, 9000) // positive_value_cost
 
                     if isAddrEmpty(addr) {
@@ -3723,7 +3725,7 @@ object "EvmEmulator" {
                     argsSize,
                     add(retOffset, MEM_OFFSET()),
                     retSize,
-                    false
+                    isStatic
                 )
 
                 newGasLeft := add(evmGasLeft, frameGasLeft)
@@ -5654,13 +5656,7 @@ object "EvmEmulator" {
                     }
                     case 0xF1 { // OP_CALL
                         // A function was implemented in order to avoid stack depth errors.
-                        switch isStatic
-                        case 0 {
-                            evmGasLeft, sp, stackHead := performCall(sp, evmGasLeft, stackHead)
-                        }
-                        default {
-                            evmGasLeft, sp, stackHead := performStaticCall(sp, evmGasLeft, stackHead)
-                        }
+                        evmGasLeft, sp, stackHead := performCall(sp, evmGasLeft, stackHead, isStatic)
                         ip := add(ip, 1)
                     }
                     case 0xF3 { // OP_RETURN

diff --git a/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul b/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul
@@ -579,7 +579,7 @@ function resetEvmFrame() {
 //               CALLS FUNCTIONALITY
 ////////////////////////////////////////////////////////////////
 
-function performCall(oldSp, evmGasLeft, oldStackHead) -> newGasLeft, sp, stackHead {
+function performCall(oldSp, evmGasLeft, oldStackHead, isStatic) -> newGasLeft, sp, stackHead {
     let gasToPass, addr, value, argsOffset, argsSize, retOffset, retSize
 
     popStackCheck(oldSp, 7)
@@ -611,6 +611,10 @@ function performCall(oldSp, evmGasLeft, oldStackHead) -> newGasLeft, sp, stackHe
     gasUsed := add(gasUsed, expandMemory2(retOffset, retSize, argsOffset, argsSize))
 
     if gt(value, 0) {
+        if isStatic {
+            panic()
+        }
+
         gasUsed := add(gasUsed, 9000) // positive_value_cost
 
         if isAddrEmpty(addr) {
@@ -634,7 +638,7 @@ function performCall(oldSp, evmGasLeft, oldStackHead) -> newGasLeft, sp, stackHe
         argsSize,
         add(retOffset, MEM_OFFSET()),
         retSize,
-        false
+        isStatic
     )
 
     newGasLeft := add(evmGasLeft, frameGasLeft)

diff --git a/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul b/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul
@@ -1425,13 +1425,7 @@ for { } true { } {
     }
     case 0xF1 { // OP_CALL
         // A function was implemented in order to avoid stack depth errors.
-        switch isStatic
-        case 0 {
-            evmGasLeft, sp, stackHead := performCall(sp, evmGasLeft, stackHead)
-        }
-        default {
-            evmGasLeft, sp, stackHead := performStaticCall(sp, evmGasLeft, stackHead)
-        }
+        evmGasLeft, sp, stackHead := performCall(sp, evmGasLeft, stackHead, isStatic)
         ip := add(ip, 1)
     }
     case 0xF3 { // OP_RETURN