Merge pull request #677 from lambdaclass/dont-charge-the-regular-cost…

…-of-calls-for-precompiles [EVM Equivalence in Yul] fix: Don't charge the regular cost of the call when calling precompiles
matter-labs · Aug 20, 2024 · 74767c1 · 74767c1
2 parents 36c03ec + 5a3e3f5
commit 74767c1
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 18 deletions.
diff --git a/system-contracts/contracts/EvmInterpreterFunctions.template.yul b/system-contracts/contracts/EvmInterpreterFunctions.template.yul
@@ -907,8 +907,15 @@ function performStaticCall(oldSp,evmGasLeft) -> extraCost, sp {
         }
     }
 
-    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-    extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+    let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+    switch iszero(precompileCost)
+    case 1 {
+        extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+    }
+    default {
+        extraCost := add(extraCost, precompileCost)
+    }
+
     sp := pushStackItem(sp, success, evmGasLeft)
 }
 function capGas(evmGasLeft,oldGasToPass) -> gasToPass {
@@ -1031,8 +1038,14 @@ function performCall(oldSp, evmGasLeft, isStatic) -> extraCost, sp {
         isStatic
     )
 
-    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-    extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+    let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+    switch iszero(precompileCost)
+    case 1 {
+        extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+    }
+    default {
+        extraCost := add(extraCost, precompileCost)
+    }
     sp := pushStackItem(sp,success, evmGasLeft) 
 }
 
@@ -1095,8 +1108,14 @@ function delegateCall(oldSp, oldIsStatic, evmGasLeft) -> sp, isStatic, extraCost
 
     _popEVMFrame()
 
-    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-    extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+    let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+    switch iszero(precompileCost)
+    case 1 {
+        extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+    }
+    default {
+        extraCost := add(extraCost, precompileCost)
+    }
     sp := pushStackItem(sp, success, evmGasLeft)
 }
 

diff --git a/system-contracts/contracts/EvmInterpreterPreprocessed.yul b/system-contracts/contracts/EvmInterpreterPreprocessed.yul
@@ -978,8 +978,15 @@ object "EVMInterpreter" {
                 }
             }
 
-            extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-            extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+            let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+            switch iszero(precompileCost)
+            case 1 {
+                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+            }
+            default {
+                extraCost := add(extraCost, precompileCost)
+            }
+
             sp := pushStackItem(sp, success, evmGasLeft)
         }
         function capGas(evmGasLeft,oldGasToPass) -> gasToPass {
@@ -1102,8 +1109,14 @@ object "EVMInterpreter" {
                 isStatic
             )
 
-            extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-            extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+            let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+            switch iszero(precompileCost)
+            case 1 {
+                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+            }
+            default {
+                extraCost := add(extraCost, precompileCost)
+            }
             sp := pushStackItem(sp,success, evmGasLeft) 
         }
 
@@ -1166,8 +1179,14 @@ object "EVMInterpreter" {
 
             _popEVMFrame()
 
-            extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-            extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+            let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+            switch iszero(precompileCost)
+            case 1 {
+                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+            }
+            default {
+                extraCost := add(extraCost, precompileCost)
+            }
             sp := pushStackItem(sp, success, evmGasLeft)
         }
 
@@ -3928,8 +3947,15 @@ object "EVMInterpreter" {
                     }
                 }
 
-                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-                extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+                let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+                switch iszero(precompileCost)
+                case 1 {
+                    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+                }
+                default {
+                    extraCost := add(extraCost, precompileCost)
+                }
+
                 sp := pushStackItem(sp, success, evmGasLeft)
             }
             function capGas(evmGasLeft,oldGasToPass) -> gasToPass {
@@ -4052,8 +4078,14 @@ object "EVMInterpreter" {
                     isStatic
                 )
 
-                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-                extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+                let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+                switch iszero(precompileCost)
+                case 1 {
+                    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+                }
+                default {
+                    extraCost := add(extraCost, precompileCost)
+                }
                 sp := pushStackItem(sp,success, evmGasLeft) 
             }
 
@@ -4116,8 +4148,14 @@ object "EVMInterpreter" {
 
                 _popEVMFrame()
 
-                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-                extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+                let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+                switch iszero(precompileCost)
+                case 1 {
+                    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+                }
+                default {
+                    extraCost := add(extraCost, precompileCost)
+                }
                 sp := pushStackItem(sp, success, evmGasLeft)
             }