Hedera ITS / Diff #1
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,8 +24,11 @@ import { IMinter } from './interfaces/IMinter.sol'; | |
| import { Create3AddressFixed } from './utils/Create3AddressFixed.sol'; | ||
| import { Operator } from './utils/Operator.sol'; | ||
| import { ChainTracker } from './utils/ChainTracker.sol'; | ||
| import { TokenCreationPricing } from './utils/TokenCreationPricing.sol'; | ||
| import { ItsHubAddressTracker } from './utils/ItsHubAddressTracker.sol'; | ||
|
|
||
| import { IWHBAR } from './hedera/IWHBAR.sol'; | ||
|
|
||
| /** | ||
| * @title The Interchain Token Service | ||
| * @notice This contract is responsible for facilitating interchain token transfers. | ||
|
|
@@ -42,6 +45,7 @@ contract InterchainTokenService is | |
| ExpressExecutorTracker, | ||
| InterchainAddressTracker, | ||
| ChainTracker, | ||
| TokenCreationPricing, | ||
| ItsHubAddressTracker, | ||
| IInterchainTokenService | ||
| { | ||
|
|
@@ -236,17 +240,6 @@ contract InterchainTokenService is | |
| tokenAddress = ITokenManager(deployedTokenManager(tokenId)).tokenAddress(); | ||
| } | ||
|
|
||
| /** | ||
| * @notice Calculates the tokenId that would correspond to a link for a given deployer with a specified salt. | ||
| * @param sender The address of the TokenManager deployer. | ||
|
|
@@ -404,9 +397,7 @@ contract InterchainTokenService is | |
| emit InterchainTokenIdClaimed(tokenId, deployer, salt); | ||
|
|
||
| if (bytes(destinationChain).length == 0) { | ||
| _deployTokenManagerWithInterchainToken(tokenId, name, symbol, decimals, minter); | ||
| } else { | ||
| if (chainNameHash == keccak256(bytes(destinationChain))) revert CannotDeployRemotelyToSelf(); | ||
|
|
||
|
|
@@ -575,35 +566,6 @@ contract InterchainTokenService is | |
| _interchainTransfer(tokenId, destinationChain, destinationAddress, amount, data, gasValue); | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Custom tokens should still be able to use this so probably do not remove it. |
||
| /*************\ | ||
| OWNER FUNCTIONS | ||
| \*************/ | ||
|
|
@@ -639,6 +601,22 @@ contract InterchainTokenService is | |
| _removeTrustedChain(chainName); | ||
| } | ||
|
|
||
| /** | ||
| * @notice Used to set the token creation price in tinycents. | ||
| * @param price The new token creation price in tinycents. | ||
| */ | ||
| function setTokenCreationPrice(uint256 price) external onlyOperatorOrOwner { | ||
|
There was a problem hiding this comment. Q: Why cast to u8 in onlyOperatorOrOwner There was a problem hiding this comment. if you ask about the I'll leave the convo open in case you meant something else. |
||
| _setTokenCreationPrice(price); | ||
| } | ||
|
|
||
| /** | ||
| * @notice Used to set the WHBAR contract address. | ||
| * @param whbarAddress_ The new WHBAR contract address. | ||
| */ | ||
| function setWhbarAddress(address whbarAddress_) external onlyOperatorOrOwner { | ||
|
||
| _setWhbarAddress(whbarAddress_); | ||
| } | ||
|
|
||
| /** | ||
| * @notice Allows the owner to pause/unpause the token service. | ||
| * @param paused Boolean value representing whether to pause or unpause. | ||
|
|
@@ -651,22 +629,15 @@ contract InterchainTokenService is | |
| } | ||
| } | ||
|
|
||
| /****************\ | ||
| INTERNAL FUNCTIONS | ||
| \****************/ | ||
|
|
||
| function _setup(bytes calldata params) internal override { | ||
| (address operator, string memory chainName_, string[] memory trustedChainNames, uint256 _tokenCreationPrice) = abi.decode( | ||
| params, | ||
| (address, string, string[], uint256) | ||
| ); | ||
| if (operator == address(0)) revert ZeroAddress(); | ||
| if (bytes(chainName_).length == 0 || keccak256(bytes(chainName_)) != chainNameHash) revert InvalidChainName(); | ||
|
|
||
|
|
@@ -682,6 +653,8 @@ contract InterchainTokenService is | |
| _removeTrustedAddress(trustedChainName); | ||
| } | ||
| } | ||
|
|
||
| _setTokenCreationPrice(_tokenCreationPrice); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -767,11 +740,8 @@ contract InterchainTokenService is | |
| payload, | ||
| (uint256, bytes32, string, string, uint8, bytes) | ||
| ); | ||
|
|
||
| _deployTokenManagerWithInterchainToken(tokenId, name, symbol, decimals, minterBytes); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -970,6 +940,58 @@ contract InterchainTokenService is | |
| _routeMessage(destinationChain, payload, gasValue); | ||
| } | ||
|
|
||
| /** | ||
| * @notice Deploys a token manager. | ||
| * @param tokenId The ID of the token. | ||
rista404 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * @param operator The operator of the token manager. | ||
| */ | ||
| function _deployTokenManagerWithInterchainToken( | ||
| bytes32 tokenId, | ||
| string memory name, | ||
| string memory symbol, | ||
| uint8 decimals, | ||
| bytes memory operator | ||
| ) internal { | ||
| // Price in tinybars | ||
| uint256 tokenCreatePrice = _tokenCreationPriceTinybars(); | ||
|
|
||
| // TokenManagerProxy deploy params | ||
| bytes memory params = abi.encode(operator, name, symbol, decimals, tokenCreatePrice); | ||
|
|
||
| TokenManagerType tokenManagerType = TokenManagerType.NATIVE_INTERCHAIN_TOKEN; | ||
|
|
||
| // Get the pre-determined token manager address | ||
| address tokenManager_ = tokenManagerAddress(tokenId); | ||
|
|
||
| // Approve the token manager deployer to spend the token creation price | ||
| IWHBAR(whbarAddress()).approve(tokenManager_, tokenCreatePrice); | ||
rista404 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| (bool success, bytes memory returnData) = tokenManagerDeployer.delegatecall( | ||
|
|
||
| abi.encodeWithSelector(ITokenManagerDeployer.deployTokenManager.selector, tokenId, tokenManagerType, params) | ||
| ); | ||
| if (!success) revert TokenManagerDeploymentFailed(returnData); | ||
|
|
||
| assembly { | ||
| tokenManager_ := mload(add(returnData, 0x20)) | ||
| } | ||
|
|
||
| (success, returnData) = tokenHandler.delegatecall( | ||
|
|
||
| abi.encodeWithSelector(ITokenHandler.postTokenManagerDeploy.selector, tokenManagerType, tokenManager_) | ||
| ); | ||
| if (!success) revert PostDeployFailed(returnData); | ||
|
|
||
| // Get the token address from the deployed token manager | ||
| address tokenAddress = ITokenManager(tokenManager_).tokenAddress(); | ||
|
|
||
| address minter; | ||
| if (bytes(operator).length != 0) minter = operator.toAddress(); | ||
|
|
||
| // slither-disable-next-line reentrancy-events | ||
| emit InterchainTokenDeployed(tokenId, tokenAddress, minter, name, symbol, decimals); | ||
| // slither-disable-next-line reentrancy-events | ||
| emit TokenManagerDeployed(tokenId, tokenManager_, tokenManagerType, params); | ||
| } | ||
|
|
||
| /** | ||
| * @notice Deploys a token manager. | ||
| * @param tokenId The ID of the token. | ||
|
|
@@ -1009,44 +1031,6 @@ contract InterchainTokenService is | |
| salt = keccak256(abi.encode(PREFIX_INTERCHAIN_TOKEN_SALT, tokenId)); | ||
| } | ||
|
|
||
| /** | ||
| * @notice Decodes the metadata into a version number and data bytes. | ||
| * @dev The function expects the metadata to have the version in the first 4 bytes, followed by the actual data. | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.