more debugging, simulation gas limit

zeta-chain · Nov 18, 2024 · 7899157 · 7899157
1 parent 74d3082
commit 7899157
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 8 deletions.
diff --git a/v2/contracts/zevm/GatewayZEVM.sol b/v2/contracts/zevm/GatewayZEVM.sol
@@ -51,6 +51,8 @@ contract GatewayZEVM is
     /// https://github.com/zeta-chain/node/pull/3106
     uint256 public constant MAX_GAS_LIMIT = 2_000_000;
 
+    uint256 public constant SIMULATION_GAS_LIMIT = 24_000_000;
+
     /// @dev Only protocol address allowed modifier.
     modifier onlyProtocol() {
         if (msg.sender != PROTOCOL_ADDRESS) {
@@ -384,7 +386,7 @@ contract GatewayZEVM is
 
         // TODO: remove after the protocol upgrad with this change: https://github.com/zeta-chain/node/pull/3106
         uint256 leftGas = uint256(gasleft());
-        if (leftGas > MAX_GAS_LIMIT) {
+        if (leftGas > MAX_GAS_LIMIT && leftGas < SIMULATION_GAS_LIMIT) {
             revert GasLimitExceeded();
         }
 

diff --git a/v2/docs/src/contracts/zevm/GatewayZEVM.sol/contract.GatewayZEVM.md b/v2/docs/src/contracts/zevm/GatewayZEVM.sol/contract.GatewayZEVM.md
@@ -60,6 +60,13 @@ uint256 public constant MAX_GAS_LIMIT = 2_000_000;
 ```
 
 
+### SIMULATION_GAS_LIMIT
+
+```solidity
+uint256 public constant SIMULATION_GAS_LIMIT = 24_000_000;
+```
+
+
 ## Functions
 ### onlyProtocol
 

diff --git a/v2/pkg/gatewayevmzevm.t.sol/gatewayevmzevmtest.go b/v2/pkg/gatewayevmzevm.t.sol/gatewayevmzevmtest.go
diff --git a/v2/pkg/gatewayzevm.sol/gatewayzevm.go b/v2/pkg/gatewayzevm.sol/gatewayzevm.go
diff --git a/v2/pkg/gatewayzevm.t.sol/gatewayzevminboundtest.go b/v2/pkg/gatewayzevm.t.sol/gatewayzevminboundtest.go
diff --git a/v2/pkg/gatewayzevm.t.sol/gatewayzevmoutboundtest.go b/v2/pkg/gatewayzevm.t.sol/gatewayzevmoutboundtest.go
diff --git a/v2/pkg/zrc20.t.sol/zrc20test.go b/v2/pkg/zrc20.t.sol/zrc20test.go
diff --git a/v2/types/GatewayZEVM.ts b/v2/types/GatewayZEVM.ts
@@ -89,6 +89,7 @@ export interface GatewayZEVMInterface extends Interface {
       | "MAX_MESSAGE_SIZE"
       | "PAUSER_ROLE"
       | "PROTOCOL_ADDRESS"
+      | "SIMULATION_GAS_LIMIT"
       | "UPGRADE_INTERFACE_VERSION"
       | "call"
       | "deposit"
@@ -150,6 +151,10 @@ export interface GatewayZEVMInterface extends Interface {
     functionFragment: "PROTOCOL_ADDRESS",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "SIMULATION_GAS_LIMIT",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "UPGRADE_INTERFACE_VERSION",
     values?: undefined
@@ -291,6 +296,10 @@ export interface GatewayZEVMInterface extends Interface {
     functionFragment: "PROTOCOL_ADDRESS",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "SIMULATION_GAS_LIMIT",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "UPGRADE_INTERFACE_VERSION",
     data: BytesLike
@@ -636,6 +645,8 @@ export interface GatewayZEVM extends BaseContract {
 
   PROTOCOL_ADDRESS: TypedContractMethod<[], [string], "view">;
 
+  SIMULATION_GAS_LIMIT: TypedContractMethod<[], [bigint], "view">;
+
   UPGRADE_INTERFACE_VERSION: TypedContractMethod<[], [string], "view">;
 
   call: TypedContractMethod<
@@ -829,6 +840,9 @@ export interface GatewayZEVM extends BaseContract {
   getFunction(
     nameOrSignature: "PROTOCOL_ADDRESS"
   ): TypedContractMethod<[], [string], "view">;
+  getFunction(
+    nameOrSignature: "SIMULATION_GAS_LIMIT"
+  ): TypedContractMethod<[], [bigint], "view">;
   getFunction(
     nameOrSignature: "UPGRADE_INTERFACE_VERSION"
   ): TypedContractMethod<[], [string], "view">;

diff --git a/v2/types/factories/GatewayZEVM__factory.ts b/v2/types/factories/GatewayZEVM__factory.ts