Added a check for the token to exist

axelarnetwork · Dec 23, 2024 · 5bfbc66 · 5bfbc66
1 parent 862eeb4
commit 5bfbc66
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/contracts/InterchainTokenFactory.sol b/contracts/InterchainTokenFactory.sol
@@ -404,10 +404,24 @@ contract InterchainTokenFactory is IInterchainTokenFactory, ITokenManagerType, M
         bytes32 deploySalt = canonicalInterchainTokenDeploySalt(tokenAddress);
         string memory currentChain = '';
         uint256 gasValue = 0;
+        _checkToken(tokenAddress);
 
         tokenId = interchainTokenService.deployTokenManager(deploySalt, currentChain, TokenManagerType.LOCK_UNLOCK, params, gasValue);
     }
 
+    function _checkToken(address tokenAddress) internal view {
+        IERC20Named token = IERC20Named(tokenAddress);
+        try token.name() {} catch {
+            revert NotToken(tokenAddress);
+        }
+        try token.symbol() {} catch {
+            revert NotToken(tokenAddress);
+        }
+        try token.decimals() {} catch {
+            revert NotToken(tokenAddress);
+        }
+    }
+
     /**
      * @notice Deploys a canonical interchain token on a remote chain.
      * @param originalTokenAddress The address of the original token on the original chain.

diff --git a/contracts/interfaces/IInterchainTokenFactory.sol b/contracts/interfaces/IInterchainTokenFactory.sol
@@ -20,6 +20,7 @@ interface IInterchainTokenFactory is IUpgradable, IMulticall {
     error RemoteDeploymentNotApproved();
     error InvalidTokenId(bytes32 tokenId, bytes32 expectedTokenId);
     error ZeroSupplyToken();
+    error NotToken(address tokenAddress);
 
     /// @notice Emitted when a minter approves a deployer for a remote interchain token deployment that uses a custom destinationMinter address.
     event DeployRemoteInterchainTokenApproval(

diff --git a/test/InterchainTokenFactory.js b/test/InterchainTokenFactory.js
@@ -115,6 +115,10 @@ describe('InterchainTokenFactory', () => {
                 .withArgs(tokenId, tokenManagerAddress, LOCK_UNLOCK, params);
         });
 
+        it('Should not register a non-existing token', async () => {
+            await expectRevert((gasOptions) => tokenFactory.registerCanonicalInterchainToken(tokenFactory.address, { gasOptions }), tokenFactory, "NotToken", [tokenFactory.address])
+        });
+
         it('Should initiate a remote interchain token deployment with no original chain name provided', async () => {
             const gasValue = 1234;
             const payload = defaultAbiCoder.encode(