Hedera ITS / Diff

contracts/InterchainTokenFactory.sol

@@ -10,6 +10,9 @@ import { IInterchainTokenFactory } from './interfaces/IInterchainTokenFactory.so
 import { ITokenManager } from './interfaces/ITokenManager.sol';
 import { IInterchainToken } from './interfaces/IInterchainToken.sol';
 import { IERC20Named } from './interfaces/IERC20Named.sol';
+import { IMinter } from './interfaces/IMinter.sol';
+
+import { HTS, IHederaTokenService } from './hedera/HTS.sol';
 
 /**
  * @title InterchainTokenFactory
@@ -124,7 +127,7 @@ contract InterchainTokenFactory is IInterchainTokenFactory, Multicall, Upgradabl
      * @param name The name of the token.
      * @param symbol The symbol of the token.
      * @param decimals The number of decimals for the token.
-     * @param initialSupply The amount of tokens to mint initially (can be zero), allocated to the msg.sender.
+     * @param initialSupply The amount of tokens to mint initially (can be zero), allocated to the msg.sender. Not supported for HTS tokens.
      * @param minter The address to receive the minter and operator role of the token, in addition to ITS. If it is set to `address(0)`,
      * the additional minter isn't set, and can't be added later. This allows creating tokens that are managed only by ITS, reducing trust assumptions.
      * Reverts if the minter is the ITS address since it's already added as a minter.
@@ -144,9 +147,14 @@ contract InterchainTokenFactory is IInterchainTokenFactory, Multicall, Upgradabl
         string memory currentChain = '';
         uint256 gasValue = 0;
 
-        if (initialSupply > 0) {
-            minterBytes = address(this).toBytes();
-        } else if (minter != address(0)) {
+        // HTS tokens must previously be associated with an account
+        // to be able to send tokens to it. Since a new token will be created
+        // it's not possible to send it right away.
+        if (initialSupply != 0) {
+            revert HTS.InitialSupplyUnsupported();
+        }
+
+        if (minter != address(0)) {
             if (minter == address(interchainTokenService)) revert InvalidMinter(minter);
 
             minterBytes = minter.toBytes();
@@ -155,21 +163,6 @@ contract InterchainTokenFactory is IInterchainTokenFactory, Multicall, Upgradabl
         }
 
         tokenId = _deployInterchainToken(deploySalt, currentChain, name, symbol, decimals, minterBytes, gasValue);
-
-        if (initialSupply > 0) {
-            IInterchainToken token = IInterchainToken(interchainTokenService.registeredTokenAddress(tokenId));
-            ITokenManager tokenManager = ITokenManager(interchainTokenService.deployedTokenManager(tokenId));
-
-            token.mint(sender, initialSupply);
-
-            token.transferMintership(minter);
-            tokenManager.removeFlowLimiter(address(this));
-
-            // If minter == address(0), we still set it as a flow limiter for consistency with the remote token manager.
-            tokenManager.addFlowLimiter(minter);
-
-            tokenManager.transferOperatorship(minter);
-        }
     }
 
     /**
@@ -329,8 +322,8 @@ contract InterchainTokenFactory is IInterchainTokenFactory, Multicall, Upgradabl
      */
     function _checkTokenMinter(bytes32 tokenId, address minter) internal view {
         // Ensure that the minter is registered for the token on the current chain
-        IInterchainToken token = IInterchainToken(interchainTokenService.registeredTokenAddress(tokenId));
-        if (!token.isMinter(minter)) revert NotMinter(minter);
+        ITokenManager tokenManager = ITokenManager(interchainTokenService.deployedTokenManager(tokenId));
+        if (!tokenManager.isMinter(minter)) revert NotMinter(minter);
 
         // Sanity check to prevent accidental use of the current ITS address as the token minter
         if (minter == address(interchainTokenService)) revert InvalidMinter(minter);
@@ -412,31 +405,45 @@ contract InterchainTokenFactory is IInterchainTokenFactory, Multicall, Upgradabl
     }
 
     /**
-     * @notice Retrieves the metadata of an ERC20 token. Reverts with `NotToken` error if metadata is not available.
+     * @notice Retrieves the metadata of an ERC20 or HTS token. Reverts with `NotToken` error if metadata is not available.
+     * @notice Returns HTS.InvalidtokenDecimals() if the decimals are not supported.
      * @param tokenAddress The address of the token.
      * @return name The name of the token.
      * @return symbol The symbol of the token.
      * @return decimals The number of decimals for the token.
      */
-    function _getTokenMetadata(address tokenAddress) internal view returns (string memory name, string memory symbol, uint8 decimals) {
-        IERC20Named token = IERC20Named(tokenAddress);
+    function _getTokenMetadata(address tokenAddress) internal returns (string memory name, string memory symbol, uint8 decimals) {
+        bool isHTSToken = HTS.isToken(tokenAddress);
+
+        if (isHTSToken) {
+            IHederaTokenService.FungibleTokenInfo memory fTokenInfo = HTS.getFungibleTokenInfo(tokenAddress);
+            name = fTokenInfo.tokenInfo.token.name;
+            symbol = fTokenInfo.tokenInfo.token.symbol;
+            int32 htsDecimals = fTokenInfo.decimals;
+            if (htsDecimals > int32(uint32(type(uint8).max))) {
+                revert HTS.InvalidTokenDecimals();
+            }
+            decimals = uint8(uint32(htsDecimals));
+        } else {
+            IERC20Named token = IERC20Named(tokenAddress);
 
-        try token.name() returns (string memory name_) {
-            name = name_;
-        } catch {
-            revert NotToken(tokenAddress);
-        }
+            try token.name() returns (string memory name_) {
+                name = name_;
+            } catch {
+                revert NotToken(tokenAddress);
+            }
 
-        try token.symbol() returns (string memory symbol_) {
-            symbol = symbol_;
-        } catch {
-            revert NotToken(tokenAddress);
-        }
+            try token.symbol() returns (string memory symbol_) {
+                symbol = symbol_;
+            } catch {
+                revert NotToken(tokenAddress);
+            }
 
-        try token.decimals() returns (uint8 decimals_) {
-            decimals = decimals_;
-        } catch {
-            revert NotToken(tokenAddress);
+            try token.decimals() returns (uint8 decimals_) {
+                decimals = decimals_;
+            } catch {
+                revert NotToken(tokenAddress);
+            }
         }
     }
 
@@ -503,7 +510,7 @@ contract InterchainTokenFactory is IInterchainTokenFactory, Multicall, Upgradabl
     }
 
     /**
-     * @notice Register an existing ERC20 token under a `tokenId` computed from the provided `salt`.
+     * @notice Register an existing ERC20 or HTS token under a `tokenId` computed from the provided `salt`.
      * A token metadata registration message will also be sent to the ITS Hub.
      * This token can then be linked to remote tokens on different chains by submitting the `linkToken` function from the same `msg.sender` and using the same `salt`.
      * @dev This function is marked as payable since it can be called within a multicall with other payable methods.