refactor a bit

zeta-chain · Sep 12, 2024 · 27e58e7 · 27e58e7
1 parent b40d43a
commit 27e58e7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/v2/contracts/evm/interfaces/IGatewayEVM.sol b/v2/contracts/evm/interfaces/IGatewayEVM.sol
@@ -190,4 +190,4 @@ struct MessageContext {
 
 interface Callable {
     function onCall(address sender, bytes calldata message) external returns (bytes memory);
-}
+}
diff --git a/v2/contracts/zevm/GatewayZEVM.sol b/v2/contracts/zevm/GatewayZEVM.sol
@@ -255,15 +255,7 @@ contract GatewayZEVM is
         nonReentrant
         whenNotPaused
     {
-        if (receiver.length == 0) revert ZeroAddress();
-        if (message.length == 0) revert EmptyMessage();
-
-        (address gasZRC20, uint256 gasFee) = IZRC20(zrc20).withdrawGasFeeWithGasLimit(callOptions.gasLimit);
-        if (!IZRC20(gasZRC20).transferFrom(msg.sender, FUNGIBLE_MODULE_ADDRESS, gasFee)) {
-            revert GasFeeTransferFailed();
-        }
-
-        emit Called(msg.sender, zrc20, receiver, message, callOptions, revertOptions);
+        _call(receiver, zrc20, message, callOptions, revertOptions);
     }
 
     function call(
@@ -276,23 +268,28 @@ contract GatewayZEVM is
         external
         nonReentrant
         whenNotPaused
+    {
+        _call(receiver, zrc20, message, CallOptions({ gasLimit: gasLimit, isArbitraryCall: true }), revertOptions);
+    }
+
+    function _call(
+        bytes memory receiver,
+        address zrc20,
+        bytes calldata message,
+        CallOptions memory callOptions,
+        RevertOptions memory revertOptions
+    )
+        internal
     {
         if (receiver.length == 0) revert ZeroAddress();
         if (message.length == 0) revert EmptyMessage();
 
-        (address gasZRC20, uint256 gasFee) = IZRC20(zrc20).withdrawGasFeeWithGasLimit(gasLimit);
+        (address gasZRC20, uint256 gasFee) = IZRC20(zrc20).withdrawGasFeeWithGasLimit(callOptions.gasLimit);
         if (!IZRC20(gasZRC20).transferFrom(msg.sender, FUNGIBLE_MODULE_ADDRESS, gasFee)) {
             revert GasFeeTransferFailed();
         }
 
-        emit Called(
-            msg.sender,
-            zrc20,
-            receiver,
-            message,
-            CallOptions({ gasLimit: gasLimit, isArbitraryCall: true }),
-            revertOptions
-        );
+        emit Called(msg.sender, zrc20, receiver, message, callOptions, revertOptions);
     }
 
     /// @notice Deposit foreign coins into ZRC20.
-Original file line number
+Diff line change
@@ Expand Up / @@ -190,4 +190,4 @@ struct MessageContext { @@
     interface Callable {
         function onCall(address sender, bytes calldata message) external returns (bytes memory);
-    }
+    }