refactor: remove UniversalTokenLib

synapsecns · Oct 22, 2024 · 2ab2f6e · 2ab2f6e
1 parent 3a211e6
commit 2ab2f6e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/packages/contracts-rfq/contracts/FastBridgeV2.sol b/packages/contracts-rfq/contracts/FastBridgeV2.sol
@@ -5,7 +5,6 @@ import {SafeERC20, IERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeE
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 
 import {BridgeTransactionV2Lib} from "./libs/BridgeTransactionV2.sol";
-import {UniversalTokenLib} from "./libs/UniversalToken.sol";
 
 import {Admin} from "./Admin.sol";
 import {IFastBridge} from "./interfaces/IFastBridge.sol";
@@ -17,7 +16,6 @@ import {IZapRecipient} from "./interfaces/IZapRecipient.sol";
 contract FastBridgeV2 is Admin, IFastBridgeV2, IFastBridgeV2Errors {
     using BridgeTransactionV2Lib for bytes;
     using SafeERC20 for IERC20;
-    using UniversalTokenLib for address;
 
     /// @notice Address reserved for native gas token (ETH on Ethereum and most L2s, AVAX on Avalanche, etc)
     address public constant NATIVE_GAS_TOKEN = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
@@ -389,8 +387,9 @@ contract FastBridgeV2 is Admin, IFastBridgeV2, IFastBridgeV2Errors {
         } else {
             // For ERC20s, token is explicitly transferred from the user to FastBridgeV2.
             // We don't allow non-zero `msg.value` to avoid extra funds from being stuck in FastBridgeV2.
-            token.assertIsContract();
             if (msg.value != 0) revert MsgValueIncorrect();
+            // Throw an explicit error if the provided token address is not a contract
+            if (token.code.length == 0) revert TokenNotContract();
             amountTaken = IERC20(token).balanceOf(address(this));
             IERC20(token).safeTransferFrom(msg.sender, address(this), amount);
             // Use the balance difference as the amount taken in case of fee on transfer tokens.

diff --git a/packages/contracts-rfq/contracts/interfaces/IFastBridgeV2Errors.sol b/packages/contracts-rfq/contracts/interfaces/IFastBridgeV2Errors.sol
@@ -8,6 +8,7 @@ interface IFastBridgeV2Errors {
     error MsgValueIncorrect();
     error SenderIncorrect();
     error StatusIncorrect();
+    error TokenNotContract();
     error ZapDataLengthAboveMax();
     error ZapNativeNotSupported();
     error ZeroAddress();

diff --git a/packages/contracts-rfq/test/FastBridgeV2.Src.FBRV2.t.sol b/packages/contracts-rfq/test/FastBridgeV2.Src.FBRV2.t.sol
@@ -10,7 +10,6 @@ contract FastBridgeV2SrcFBRouterV2Test is FastBridgeV2SrcTest {
     address public router;
 
     error FastBridgeRouterV2__OriginSenderNotSpecified();
-    error TokenNotContract();
 
     function setUp() public virtual override {
         super.setUp();