add interchainTransferFrom

axelarnetwork · Nov 3, 2023 · b6997ee · b6997ee
1 parent 650cc31
commit b6997ee
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 8 deletions.
diff --git a/contracts/interfaces/ITokenRegistrar.sol b/contracts/interfaces/ITokenRegistrar.sol
@@ -48,4 +48,22 @@ interface ITokenRegistrar {
         string calldata destinationChain,
         uint256 gasValue
     ) external payable;
+
+    function interchainTransfer(
+        bytes32 tokenId,
+        string calldata destinationChain,
+        bytes calldata destinationAddress,
+        uint256 amount,
+        bytes calldata metadata,
+        uint256 gasValue
+    ) external payable;
+
+    function interchainTransferFrom(
+        bytes32 tokenId,
+        string calldata destinationChain,
+        bytes calldata destinationAddress,
+        uint256 amount,
+        bytes calldata metadata,
+        uint256 gasValue
+    ) external payable;
 }
diff --git a/contracts/token-registrars/TokenRegistrar.sol b/contracts/token-registrars/TokenRegistrar.sol
@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.0;
 
+import { AddressBytes } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/AddressBytes.sol';
 import { SafeTokenTransfer, SafeTokenTransferFrom, SafeTokenCall } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/SafeTransfer.sol';
 import { Multicall } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/utils/Multicall.sol';
-
 import { Upgradable } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/upgradable/Upgradable.sol';
 
 import { IInterchainTokenService } from '../interfaces/IInterchainTokenService.sol';
@@ -13,11 +13,9 @@ import { ITokenManagerType } from '../interfaces/ITokenManagerType.sol';
 import { ITokenManager } from '../interfaces/ITokenManager.sol';
 import { IStandardizedToken } from '../interfaces/IStandardizedToken.sol';
 
-import { AddressBytesUtils } from '../libraries/AddressBytesUtils.sol';
-
 contract TokenRegistrar is ITokenRegistrar, ITokenManagerType, Multicall, Upgradable {
-    using AddressBytesUtils for bytes;
-    using AddressBytesUtils for address;
+    using AddressBytes for bytes;
+    using AddressBytes for address;
     using SafeTokenTransfer for IStandardizedToken;
     using SafeTokenTransferFrom for IStandardizedToken;
     using SafeTokenCall for IStandardizedToken;
@@ -201,14 +199,35 @@ contract TokenRegistrar is ITokenRegistrar, ITokenManagerType, Multicall, Upgrad
         string calldata destinationChain,
         bytes calldata destinationAddress,
         uint256 amount,
+        bytes calldata metadata,
         uint256 gasValue
     ) external payable {
         if (bytes(destinationChain).length == 0) {
             address tokenAddress = service.interchainTokenAddress(tokenId);
             IStandardizedToken token = IStandardizedToken(tokenAddress);
             token.safeTransfer(destinationAddress.toAddress(), amount);
         } else {
-            service.interchainTransfer{ value: gasValue }(tokenId, destinationChain, destinationAddress, amount, gasValue);
+            service.interchainTransfer{ value: gasValue }(tokenId, destinationChain, destinationAddress, amount, metadata);
+        }
+    }
+
+    function interchainTransferFrom(
+        bytes32 tokenId,
+        string calldata destinationChain,
+        bytes calldata destinationAddress,
+        uint256 amount,
+        bytes calldata metadata,
+        uint256 gasValue
+    ) external payable {
+        address tokenAddress = service.interchainTokenAddress(tokenId);
+        IStandardizedToken token = IStandardizedToken(tokenAddress);
+
+        if (bytes(destinationChain).length == 0) {
+            token.safeTransferFrom(msg.sender, destinationAddress.toAddress(), amount);
+        } else {
+            token.safeTransferFrom(msg.sender, address(this), amount);
+            token.approve(address(service), amount);
+            service.interchainTransfer{ value: gasValue }(tokenId, destinationChain, destinationAddress, amount, metadata);
         }
     }
 }
diff --git a/test/TokenRegistrars.js b/test/TokenRegistrars.js
@@ -96,7 +96,7 @@ describe('Token Registrsrs', () => {
                 .withArgs(service.address, destinationChain, service.address, keccak256(payload), payload);
         });
 
-        it('Should transfer some tokens though the registrar as the deployer', async () => {
+        it('Should transfer some tokens through the registrar as the deployer', async () => {
             const destinationAddress = '0x659703';
             const amount = 1234;
             const gasValue = 1234;
@@ -114,7 +114,7 @@ describe('Token Registrsrs', () => {
             await (await token.approve(tokenRegistrar.address, amount)).wait();
 
             await expect(
-                tokenRegistrar.transferCanonicalToken(token.address, destinationChain, destinationAddress, amount, gasValue, {
+                tokenRegistrar.interchainTransferFrom(tokenId, destinationChain, destinationAddress, amount, '0x', gasValue, {
                     value: gasValue,
                 }),
             )