support USDT transfers (#34)

Author: thedarkjester

contracts/ISwapTokens.sol

@@ -166,11 +166,6 @@ interface ISwapTokens {
    */
   error SwapIsInThePast();
 
-  /**
-   * @dev Thrown when the token transfer failed.
-   */
-  error TokenTransferFailed(address tokenAddress, uint256);
-
   /**
    * @dev Thrown when the initiator in the config does not match the msg.sender.
    * @param expected The expected initiator address.

contracts/NonCancunTokenSwapper.sol

@@ -3,6 +3,8 @@ pragma solidity 0.8.20;
 
 import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+
 import { IERC1155 } from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 import { ISwapTokens } from "./ISwapTokens.sol";
 import { ReentrancyGuard } from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
@@ -489,9 +491,7 @@ contract NonCancunTokenSwapper is ISwapTokens, ReentrancyGuard {
     address _tokenOwner,
     address _recipient
   ) internal {
-    if (!IERC20(_tokenAddress).transferFrom(_tokenOwner, _recipient, _tokenQuantity)) {
-      revert TokenTransferFailed(_tokenAddress, _tokenQuantity);
-    }
+    SafeERC20.safeTransferFrom(IERC20(_tokenAddress), _tokenOwner, _recipient, _tokenQuantity);
   }
 
   /**

contracts/TokenSwapper.sol

@@ -3,6 +3,8 @@ pragma solidity 0.8.26;
 
 import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+
 import { IERC1155 } from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 import { ISwapTokens } from "./ISwapTokens.sol";
 import { TransientStorage } from "./TransientStorage.sol";
@@ -489,9 +491,7 @@ contract TokenSwapper is ISwapTokens {
     address _tokenOwner,
     address _recipient
   ) internal {
-    if (!IERC20(_tokenAddress).transferFrom(_tokenOwner, _recipient, _tokenQuantity)) {
-      revert TokenTransferFailed(_tokenAddress, _tokenQuantity);
-    }
+    SafeERC20.safeTransferFrom(IERC20(_tokenAddress), _tokenOwner, _recipient, _tokenQuantity);
   }
 
   /**

test/NonCanunTokenSwapperERC20.ts

@@ -877,8 +877,8 @@ describe("tokenSwapper erc20 testing", function () {
       await erc20B.connect(swapper2).approve(tokenSwapperAddress, 500n);
 
       await expect(tokenSwapper.connect(denyListedAccount).completeSwap(1, defaultSwap, { value: GENERIC_SWAP_ETH }))
-        .to.be.revertedWithCustomError(tokenSwapper, "TokenTransferFailed")
-        .withArgs(erc20BAddress, 500n);
+        .to.be.revertedWithCustomError(tokenSwapper, "SafeERC20FailedOperation")
+        .withArgs(erc20BAddress);
     });
   });
 });

test/TokenSwapperERC20.ts

@@ -877,8 +877,8 @@ describe("tokenSwapper erc20 testing", function () {
       await erc20B.connect(swapper2).approve(tokenSwapperAddress, 500n);
 
       await expect(tokenSwapper.connect(denyListedAccount).completeSwap(1, defaultSwap, { value: GENERIC_SWAP_ETH }))
-        .to.be.revertedWithCustomError(tokenSwapper, "TokenTransferFailed")
-        .withArgs(erc20BAddress, 500n);
+        .to.be.revertedWithCustomError(tokenSwapper, "SafeERC20FailedOperation")
+        .withArgs(erc20BAddress);
     });
   });
 });