safeTransferFrom

zeta-chain · Nov 20, 2024 · a6d9809 · a6d9809
1 parent 786d629
commit a6d9809
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/examples/call/contracts/Connected.sol b/examples/call/contracts/Connected.sol
@@ -3,15 +3,16 @@ pragma solidity 0.8.26;
 
 import {RevertContext} from "@zetachain/protocol-contracts/contracts/Revert.sol";
 import "@zetachain/protocol-contracts/contracts/evm/GatewayEVM.sol";
+import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 contract Connected {
+    using SafeERC20 for IERC20; // Use SafeERC20 for IERC20 operations
+
     GatewayEVM public immutable gateway;
 
     event RevertEvent(string, RevertContext);
     event HelloEvent(string, string);
 
-    error TransferFailed();
-    error ApprovalFailed();
     error Unauthorized();
 
     modifier onlyGateway() {
@@ -44,12 +45,8 @@ contract Connected {
         address asset,
         RevertOptions memory revertOptions
     ) external {
-        if (!IERC20(asset).transferFrom(msg.sender, address(this), amount)) {
-            revert TransferFailed();
-        }
-        if (!IERC20(asset).approve(address(gateway), amount)) {
-            revert ApprovalFailed();
-        }
+        IERC20(asset).safeTransferFrom(msg.sender, address(this), amount);
+        IERC20(asset).approve(address(gateway), amount);
         gateway.deposit(receiver, amount, asset, revertOptions);
     }
 
@@ -60,12 +57,8 @@ contract Connected {
         bytes calldata message,
         RevertOptions memory revertOptions
     ) external {
-        if (!IERC20(asset).transferFrom(msg.sender, address(this), amount)) {
-            revert TransferFailed();
-        }
-        if (!IERC20(asset).approve(address(gateway), amount)) {
-            revert ApprovalFailed();
-        }
+        IERC20(asset).safeTransferFrom(msg.sender, address(this), amount);
+        IERC20(asset).approve(address(gateway), amount);
         gateway.depositAndCall(receiver, amount, asset, message, revertOptions);
     }