fix(EVM): Zero out frame gas left for underpaid precompiles (#1101)

matter-labs · Dec 2, 2024 · cf5e450 · cf5e450
1 parent 71626e4
commit cf5e450
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
@@ -839,6 +839,7 @@ object "EvmEmulator" {
             let zkVmGasToPass := gas() // pass all remaining gas, precompiles should not call any contracts
             if lt(gasToPass, precompileCost) {
                 zkVmGasToPass := 0  // in EVM precompile should revert consuming all gas in that case
+                precompileCost := gasToPass // just in case
             }
 
             switch isStatic
@@ -3890,6 +3891,7 @@ object "EvmEmulator" {
                 let zkVmGasToPass := gas() // pass all remaining gas, precompiles should not call any contracts
                 if lt(gasToPass, precompileCost) {
                     zkVmGasToPass := 0  // in EVM precompile should revert consuming all gas in that case
+                    precompileCost := gasToPass // just in case
                 }
 
                 switch isStatic

diff --git a/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul b/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul
@@ -777,6 +777,7 @@ function callPrecompile(addr, precompileCost, gasToPass, value, argsOffset, args
     let zkVmGasToPass := gas() // pass all remaining gas, precompiles should not call any contracts
     if lt(gasToPass, precompileCost) {
         zkVmGasToPass := 0  // in EVM precompile should revert consuming all gas in that case
+        precompileCost := gasToPass // just in case
     }
 
     switch isStatic