fix(EVM): Fix panics on insufficient balance in calls (#1108)

matter-labs · Dec 2, 2024 · 2b6f698 · 2b6f698
1 parent 00e662c
commit 2b6f698
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 36 deletions.
diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
@@ -293,6 +293,12 @@ object "EvmEmulator" {
             }
         }
 
+        function insufficientBalance(value) -> res {
+            if value {
+                res := gt(value, selfbalance())
+            }
+        }
+
         // It is the responsibility of the caller to ensure that ip is correct
         function readIP(ip, bytecodeEndOffset) -> opcode {
             if lt(ip, bytecodeEndOffset) {
@@ -825,12 +831,19 @@ object "EvmEmulator" {
                 }
             }
             default {
-                pushEvmFrame(gasToPass, isStatic)
-                // pass all remaining native gas
-                success := call(gas(), addr, value, argsOffset, argsSize, 0, 0)
-                frameGasLeft := _saveReturndataAfterEVMCall(retOffset, retSize)
-                if iszero(success) {
-                    resetEvmFrame()
+                switch insufficientBalance(value)
+                case 0 {
+                    pushEvmFrame(gasToPass, isStatic)
+                    // pass all remaining native gas
+                    success := call(gas(), addr, value, argsOffset, argsSize, 0, 0)
+                    frameGasLeft := _saveReturndataAfterEVMCall(retOffset, retSize)
+                    if iszero(success) {
+                        resetEvmFrame()
+                    }
+                }
+                default {
+                    frameGasLeft := gasToPass
+                    _eraseReturndataPointer()
                 }
             }
         }
@@ -1042,12 +1055,7 @@ object "EvmEmulator" {
 
             _eraseReturndataPointer()
 
-            let err := 0
-            if value {
-                if gt(value, selfbalance()) {
-                    err := 1
-                }
-            }
+            let err := insufficientBalance(value)
 
             if iszero(err) {
                 offset := add(MEM_OFFSET(), offset) // caller must ensure that it doesn't overflow
@@ -3345,6 +3353,12 @@ object "EvmEmulator" {
                 }
             }
 
+            function insufficientBalance(value) -> res {
+                if value {
+                    res := gt(value, selfbalance())
+                }
+            }
+
             // It is the responsibility of the caller to ensure that ip is correct
             function readIP(ip, bytecodeEndOffset) -> opcode {
                 if lt(ip, bytecodeEndOffset) {
@@ -3877,12 +3891,19 @@ object "EvmEmulator" {
                     }
                 }
                 default {
-                    pushEvmFrame(gasToPass, isStatic)
-                    // pass all remaining native gas
-                    success := call(gas(), addr, value, argsOffset, argsSize, 0, 0)
-                    frameGasLeft := _saveReturndataAfterEVMCall(retOffset, retSize)
-                    if iszero(success) {
-                        resetEvmFrame()
+                    switch insufficientBalance(value)
+                    case 0 {
+                        pushEvmFrame(gasToPass, isStatic)
+                        // pass all remaining native gas
+                        success := call(gas(), addr, value, argsOffset, argsSize, 0, 0)
+                        frameGasLeft := _saveReturndataAfterEVMCall(retOffset, retSize)
+                        if iszero(success) {
+                            resetEvmFrame()
+                        }
+                    }
+                    default {
+                        frameGasLeft := gasToPass
+                        _eraseReturndataPointer()
                     }
                 }
             }
@@ -4094,12 +4115,7 @@ object "EvmEmulator" {
 
                 _eraseReturndataPointer()
 
-                let err := 0
-                if value {
-                    if gt(value, selfbalance()) {
-                        err := 1
-                    }
-                }
+                let err := insufficientBalance(value)
 
                 if iszero(err) {
                     offset := add(MEM_OFFSET(), offset) // caller must ensure that it doesn't overflow

diff --git a/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul b/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul
@@ -231,6 +231,12 @@ function checkOverflow(data1, data2) {
     }
 }
 
+function insufficientBalance(value) -> res {
+    if value {
+        res := gt(value, selfbalance())
+    }
+}
+
 // It is the responsibility of the caller to ensure that ip is correct
 function readIP(ip, bytecodeEndOffset) -> opcode {
     if lt(ip, bytecodeEndOffset) {
@@ -763,12 +769,19 @@ function _genericCall(addr, gasToPass, value, argsOffset, argsSize, retOffset, r
         }
     }
     default {
-        pushEvmFrame(gasToPass, isStatic)
-        // pass all remaining native gas
-        success := call(gas(), addr, value, argsOffset, argsSize, 0, 0)
-        frameGasLeft := _saveReturndataAfterEVMCall(retOffset, retSize)
-        if iszero(success) {
-            resetEvmFrame()
+        switch insufficientBalance(value)
+        case 0 {
+            pushEvmFrame(gasToPass, isStatic)
+            // pass all remaining native gas
+            success := call(gas(), addr, value, argsOffset, argsSize, 0, 0)
+            frameGasLeft := _saveReturndataAfterEVMCall(retOffset, retSize)
+            if iszero(success) {
+                resetEvmFrame()
+            }
+        }
+        default {
+            frameGasLeft := gasToPass
+            _eraseReturndataPointer()
         }
     }
 }
@@ -980,12 +993,7 @@ function $llvm_NoInline_llvm$_genericCreate(offset, size, value, evmGasLeftOld,
 
     _eraseReturndataPointer()
 
-    let err := 0
-    if value {
-        if gt(value, selfbalance()) {
-            err := 1
-        }
-    }
+    let err := insufficientBalance(value)
 
     if iszero(err) {
         offset := add(MEM_OFFSET(), offset) // caller must ensure that it doesn't overflow