Merge branch 'main' into cleanup-tss-updater-changes

zeta-chain · Sep 30, 2024 · 6d25508 · 6d25508
2 parents 11cc43e + 1a7773c
commit 6d25508
Show file tree

Hide file tree

Showing 15 changed files with 193 additions and 12 deletions.
diff --git a/v2/contracts/zevm/GatewayZEVM.sol b/v2/contracts/zevm/GatewayZEVM.sol
@@ -177,6 +177,7 @@ contract GatewayZEVM is
     {
         if (receiver.length == 0) revert ZeroAddress();
         if (amount == 0) revert InsufficientZRC20Amount();
+        if (gasLimit == 0) revert InsufficientGasLimit();
 
         uint256 gasFee = _withdrawZRC20WithGasLimit(amount, zrc20, gasLimit);
         emit Withdrawn(
@@ -214,6 +215,7 @@ contract GatewayZEVM is
     {
         if (receiver.length == 0) revert ZeroAddress();
         if (amount == 0) revert InsufficientZRC20Amount();
+        if (callOptions.gasLimit == 0) revert InsufficientGasLimit();
 
         uint256 gasFee = _withdrawZRC20WithGasLimit(amount, zrc20, callOptions.gasLimit);
         emit Withdrawn(
@@ -318,6 +320,7 @@ contract GatewayZEVM is
     {
         if (receiver.length == 0) revert ZeroAddress();
         if (amount == 0) revert InsufficientZetaAmount();
+        if (callOptions.gasLimit == 0) revert InsufficientGasLimit();
 
         _transferZETA(amount, PROTOCOL_ADDRESS);
         emit Withdrawn(
@@ -342,6 +345,8 @@ contract GatewayZEVM is
         nonReentrant
         whenNotPaused
     {
+        if (callOptions.gasLimit == 0) revert InsufficientGasLimit();
+
         _call(receiver, zrc20, message, callOptions, revertOptions);
     }
 
@@ -362,6 +367,8 @@ contract GatewayZEVM is
         nonReentrant
         whenNotPaused
     {
+        if (gasLimit == 0) revert InsufficientGasLimit();
+
         _call(receiver, zrc20, message, CallOptions({ gasLimit: gasLimit, isArbitraryCall: true }), revertOptions);
     }
 

diff --git a/v2/contracts/zevm/interfaces/IGatewayZEVM.sol b/v2/contracts/zevm/interfaces/IGatewayZEVM.sol
@@ -86,6 +86,9 @@ interface IGatewayZEVMErrors {
 
     /// @notice Error indicating call method received empty message as argument.
     error EmptyMessage();
+
+    /// @notice Error indicating an insufficient gas limit.
+    error InsufficientGasLimit();
 }
 
 /// @title IGatewayZEVM

diff --git a/.../src/contracts/zevm/interfaces/IGatewayZEVM.sol/interface.IGatewayZEVMErrors.md b/.../src/contracts/zevm/interfaces/IGatewayZEVM.sol/interface.IGatewayZEVMErrors.md
@@ -101,3 +101,11 @@ Error indicating call method received empty message as argument.
 error EmptyMessage();
 ```
 
+### InsufficientGasLimit
+Error indicating an insufficient gas limit.
+
+
+```solidity
+error InsufficientGasLimit();
+```
+
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/igatewayzevm.sol/igatewayzevm.go b/v2/pkg/igatewayzevm.sol/igatewayzevm.go
diff --git a/v2/pkg/igatewayzevm.sol/igatewayzevmerrors.go b/v2/pkg/igatewayzevm.sol/igatewayzevmerrors.go
diff --git a/v2/pkg/senderzevm.sol/senderzevm.go b/v2/pkg/senderzevm.sol/senderzevm.go