fix(EVM): Use static call for isSlotWarm (L-07) (#1167)

matter-labs · Dec 30, 2024 · f2677bf · f2677bf
1 parent 8349c91
commit f2677bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
@@ -617,8 +617,7 @@ object "EvmEmulator" {
             // non-standard selector 0x01
             mstore(0, 0x0100000000000000000000000000000000000000000000000000000000000000)
             mstore(1, key)
-            // should be call since we use TSTORE in gas manager
-            let success := call(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 0, 33, 0, 0)
+            let success := staticcall(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 33, 0, 0)
 
             if iszero(success) {
                 // This error should never happen
@@ -3746,8 +3745,7 @@ object "EvmEmulator" {
                 // non-standard selector 0x01
                 mstore(0, 0x0100000000000000000000000000000000000000000000000000000000000000)
                 mstore(1, key)
-                // should be call since we use TSTORE in gas manager
-                let success := call(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 0, 33, 0, 0)
+                let success := staticcall(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 33, 0, 0)
 
                 if iszero(success) {
                     // This error should never happen

diff --git a/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul b/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul
@@ -557,8 +557,7 @@ function isSlotWarm(key) -> isWarm {
     // non-standard selector 0x01
     mstore(0, 0x0100000000000000000000000000000000000000000000000000000000000000)
     mstore(1, key)
-    // should be call since we use TSTORE in gas manager
-    let success := call(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 0, 33, 0, 0)
+    let success := staticcall(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 33, 0, 0)
 
     if iszero(success) {
         // This error should never happen