fix: disable callOnRevert in GatewayEVM call (#407)

zeta-chain · Oct 23, 2024 · cc56841 · cc56841
1 parent 25a6e0b
commit cc56841
Show file tree

Hide file tree

Showing 21 changed files with 85 additions and 24 deletions.
diff --git a/v2/contracts/Errors.sol b/v2/contracts/Errors.sol
@@ -5,4 +5,5 @@ pragma solidity 0.8.26;
 /// @notice Interface for contracts that with non supported methods.
 interface INotSupportedMethods {
     error ZETANotSupported();
+    error CallOnRevertNotSupported();
 }
diff --git a/v2/contracts/evm/GatewayEVM.sol b/v2/contracts/evm/GatewayEVM.sol
@@ -329,6 +329,7 @@ contract GatewayEVM is
         external
         whenNotPaused
     {
+        if (revertOptions.callOnRevert) revert CallOnRevertNotSupported();
         if (receiver == address(0)) revert ZeroAddress();
         if (payload.length + revertOptions.revertMessage.length > MAX_PAYLOAD_SIZE) revert PayloadSizeExceeded();
 

diff --git a/v2/docs/src/contracts/Errors.sol/interface.INotSupportedMethods.md b/v2/docs/src/contracts/Errors.sol/interface.INotSupportedMethods.md
@@ -11,3 +11,9 @@ Interface for contracts that with non supported methods.
 error ZETANotSupported();
 ```
 
+### CallOnRevertNotSupported
+
+```solidity
+error CallOnRevertNotSupported();
+```
+
diff --git a/v2/pkg/erc20custody.t.sol/erc20custodytest.go b/v2/pkg/erc20custody.t.sol/erc20custodytest.go
diff --git a/v2/pkg/errors.sol/inotsupportedmethods.go b/v2/pkg/errors.sol/inotsupportedmethods.go
diff --git a/v2/pkg/gatewayevm.sol/gatewayevm.go b/v2/pkg/gatewayevm.sol/gatewayevm.go
diff --git a/v2/pkg/gatewayevm.t.sol/gatewayevminboundtest.go b/v2/pkg/gatewayevm.t.sol/gatewayevminboundtest.go
diff --git a/v2/pkg/gatewayevm.t.sol/gatewayevmtest.go b/v2/pkg/gatewayevm.t.sol/gatewayevmtest.go
diff --git a/v2/pkg/gatewayevmupgradetest.sol/gatewayevmupgradetest.go b/v2/pkg/gatewayevmupgradetest.sol/gatewayevmupgradetest.go
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/zetaconnectornative.t.sol/zetaconnectornativetest.go b/v2/pkg/zetaconnectornative.t.sol/zetaconnectornativetest.go
diff --git a/v2/pkg/zetaconnectornonnative.t.sol/zetaconnectornonnativetest.go b/v2/pkg/zetaconnectornonnative.t.sol/zetaconnectornonnativetest.go
diff --git a/v2/pkg/zrc20.t.sol/zrc20test.go b/v2/pkg/zrc20.t.sol/zrc20test.go
diff --git a/v2/test/GatewayEVM.t.sol b/v2/test/GatewayEVM.t.sol
@@ -398,7 +398,13 @@ contract GatewayEVMTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IReceiver
     }
 }
 
-contract GatewayEVMInboundTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IReceiverEVMEvents {
+contract GatewayEVMInboundTest is
+    Test,
+    IGatewayEVMErrors,
+    IGatewayEVMEvents,
+    IReceiverEVMEvents,
+    INotSupportedMethods
+{
     using SafeERC20 for IERC20;
 
     address proxy;
@@ -414,8 +420,6 @@ contract GatewayEVMInboundTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IR
 
     uint256 ownerAmount = 1_000_000;
 
-    error ZETANotSupported();
-
     function setUp() public {
         owner = address(this);
         destination = address(0x1234);
@@ -456,7 +460,7 @@ contract GatewayEVMInboundTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IR
 
         revertOptions = RevertOptions({
             revertAddress: address(0x321),
-            callOnRevert: true,
+            callOnRevert: false,
             abortAddress: address(0x321),
             revertMessage: "",
             onRevertGasLimit: 0
@@ -680,6 +684,14 @@ contract GatewayEVMInboundTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IR
         gateway.call(destination, payload, revertOptions);
     }
 
+    function testCallWithPayloadFailsIfCallOnRevertIsTrue() public {
+        bytes memory payload = abi.encodeWithSignature("hello(address)", destination);
+        revertOptions.callOnRevert = true;
+
+        vm.expectRevert(CallOnRevertNotSupported.selector);
+        gateway.call(destination, payload, revertOptions);
+    }
+
     function testCallWithPayloadFailsIfDestinationIsZeroAddress() public {
         bytes memory payload = abi.encodeWithSignature("hello(address)", destination);
 

diff --git a/v2/types/factories/Errors.sol/INotSupportedMethods__factory.ts b/v2/types/factories/Errors.sol/INotSupportedMethods__factory.ts
@@ -9,6 +9,11 @@ import type {
 } from "../../Errors.sol/INotSupportedMethods";
 
 const _abi = [
+  {
+    type: "error",
+    name: "CallOnRevertNotSupported",
+    inputs: [],
+  },
   {
     type: "error",
     name: "ZETANotSupported",

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