call: reverts

zeta-chain · Nov 12, 2024 · f05a97c · f05a97c
1 parent 382e08c
commit f05a97c
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/examples/call/contracts/Connected.sol b/examples/call/contracts/Connected.sol
@@ -10,6 +10,9 @@ contract Connected {
     event RevertEvent(string, RevertContext);
     event HelloEvent(string, string);
 
+    error TransferFailed();
+    error ApprovalFailed();
+
     modifier onlyGateway() {
         require(msg.sender == address(gateway), "Caller is not the gateway");
         _;
@@ -32,29 +35,37 @@ contract Connected {
         address asset,
         RevertOptions memory revertOptions
     ) external {
-        IERC20(asset).transferFrom(msg.sender, address(this), amount);
-        IERC20(asset).approve(address(gateway), amount);
+        if (!IERC20(asset).transferFrom(msg.sender, address(this), amount)) {
+            revert TransferFailed();
+        }
+        if (!IERC20(asset).approve(address(gateway), amount)) {
+            revert ApprovalFailed();
+        }
         gateway.deposit(receiver, amount, asset, revertOptions);
     }
 
-    function call(
+    function depositAndCall(
         address receiver,
+        uint256 amount,
+        address asset,
         bytes calldata message,
         RevertOptions memory revertOptions
     ) external {
-        gateway.call(receiver, message, revertOptions);
+        if (!IERC20(asset).transferFrom(msg.sender, address(this), amount)) {
+            revert TransferFailed();
+        }
+        if (!IERC20(asset).approve(address(gateway), amount)) {
+            revert ApprovalFailed();
+        }
+        gateway.depositAndCall(receiver, amount, asset, message, revertOptions);
     }
 
-    function depositAndCall(
+    function call(
         address receiver,
-        uint256 amount,
-        address asset,
         bytes calldata message,
         RevertOptions memory revertOptions
     ) external {
-        IERC20(asset).transferFrom(msg.sender, address(this), amount);
-        IERC20(asset).approve(address(gateway), amount);
-        gateway.depositAndCall(receiver, amount, asset, message, revertOptions);
+        gateway.call(receiver, message, revertOptions);
     }
 
     function depositAndCall(