From 047cb61952b0f39004574dab1434a422c4e3e0c8 Mon Sep 17 00:00:00 2001 From: benjamin852 Date: Tue, 4 Jun 2024 11:29:29 -0400 Subject: [PATCH] fix: changed minter type, updated its version, and added customMinter for custom token ex --- examples/evm/its-custom-token/CustomToken.sol | 7 +++++-- examples/evm/its-custom-token/index.js | 10 +++++----- package-lock.json | 12 ++++++------ package.json | 6 +++--- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/examples/evm/its-custom-token/CustomToken.sol b/examples/evm/its-custom-token/CustomToken.sol index 14352c19..e3c11769 100644 --- a/examples/evm/its-custom-token/CustomToken.sol +++ b/examples/evm/its-custom-token/CustomToken.sol @@ -27,7 +27,6 @@ contract CustomToken is InterchainTokenStandard, ERC20, Minter { decimals_ = decimalsValue; interchainTokenService_ = interchainTokenServiceAddress; - _addMinter(interchainTokenService_); _addMinter(msg.sender); } @@ -75,6 +74,10 @@ contract CustomToken is InterchainTokenStandard, ERC20, Minter { _burn(account, amount); } + function addMinter(address minter) external { + _addMinter(minter); + } + /** * @notice A method to be overwritten that will decrease the allowance of the `spender` from `sender` by `amount`. * @dev Needs to be overwritten. This provides flexibility for the choice of ERC20 implementation used. Must revert if allowance is not sufficient. @@ -86,4 +89,4 @@ contract CustomToken is InterchainTokenStandard, ERC20, Minter { _approve(sender, spender, _allowance - amount); } } -} +} \ No newline at end of file diff --git a/examples/evm/its-custom-token/index.js b/examples/evm/its-custom-token/index.js index 8d6962a0..ca9caf3d 100644 --- a/examples/evm/its-custom-token/index.js +++ b/examples/evm/its-custom-token/index.js @@ -10,7 +10,7 @@ const { interchainTransfer } = require('../../../scripts/libs/its-utils'); const CustomToken = rootRequire('./artifacts/examples/evm/its-custom-token/CustomToken.sol/CustomToken.json'); const ITokenManager = rootRequire('./artifacts/@axelar-network/interchain-token-service/contracts/interfaces/ITokenManager.sol/ITokenManager.json'); -const MINT_BURN = 0; +const CUSTOM_MINT_BURN = 4; async function deploy(chain, wallet) { console.log(`Deploying CustomToken for ${chain.name}.`); @@ -36,13 +36,14 @@ async function execute(chains, wallet, options) { const params = defaultAbiCoder.encode(['bytes', 'address'], [wallet.address, chain.customToken.address]); const its = new Contract(chain.interchainTokenService, IInterchainTokenService.abi, wallet.connect(chain.provider)); - await (await its.deployTokenManager(salt, '', MINT_BURN, params, 0)).wait(); + await (await its.deployTokenManager(salt, '', CUSTOM_MINT_BURN, params, 0)).wait(); const tokenId = await its.interchainTokenId(wallet.address, salt); const tokenManagerAddress = await its.tokenManagerAddress(tokenId); const tokenManager = new Contract(tokenManagerAddress, ITokenManager.abi, wallet.connect(chain.provider)); + await (await chain.customToken.addMinter(tokenManagerAddress)).wait(); return tokenManager; } - + const tokenManager = await deployTokenManager(source, salt); await deployTokenManager(destination, salt); @@ -57,5 +58,4 @@ async function execute(chains, wallet, options) { module.exports = { deploy, execute, -}; - +}; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 91a6dbe0..2e29b2d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,12 +10,12 @@ "license": "ISC", "dependencies": { "@axelar-network/axelar-chains-config": "^1.2.0", - "@axelar-network/axelar-gmp-sdk-solidity": "5.8.0", - "@axelar-network/axelar-local-dev": "^2.3.2", + "@axelar-network/axelar-gmp-sdk-solidity": "^5.9.0", + "@axelar-network/axelar-local-dev": "2.3.2", "@axelar-network/axelar-local-dev-cosmos": "^2.3.0", "@axelar-network/axelar-local-dev-multiversx": "^2.3.0", "@axelar-network/axelarjs-sdk": "^0.15.0", - "@axelar-network/interchain-token-service": "^1.0.0", + "@axelar-network/interchain-token-service": "1.2.4", "@grpc/grpc-js": "^1.10.3", "@grpc/proto-loader": "^0.7.10", "@multiversx/sdk-core": "^12.19.0", @@ -86,9 +86,9 @@ } }, "node_modules/@axelar-network/axelar-gmp-sdk-solidity": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@axelar-network/axelar-gmp-sdk-solidity/-/axelar-gmp-sdk-solidity-5.8.0.tgz", - "integrity": "sha512-ThiCWK7lhwmsipgjKkw8c0z0ubB9toRMV9X0tRVOXHHSknKp5DCFfatbCwjpSC5GZRa+61ciTSqJNtCc7j9YoQ==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@axelar-network/axelar-gmp-sdk-solidity/-/axelar-gmp-sdk-solidity-5.9.0.tgz", + "integrity": "sha512-BarUqOln3m5jnvBo+LF6ARWwbRXqek93dDtCgIevKGl+Be2JcNOaBB32Bg2LOOBnpOKJBvJq1SI2ZoGurBQ4Qg==", "engines": { "node": ">=18" } diff --git a/package.json b/package.json index 24c5a83b..c5551c8d 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,12 @@ "license": "ISC", "dependencies": { "@axelar-network/axelar-chains-config": "^1.2.0", - "@axelar-network/axelar-gmp-sdk-solidity": "5.8.0", - "@axelar-network/axelar-local-dev": "^2.3.2", + "@axelar-network/axelar-gmp-sdk-solidity": "^5.9.0", + "@axelar-network/axelar-local-dev": "2.3.2", "@axelar-network/axelar-local-dev-cosmos": "^2.3.0", "@axelar-network/axelar-local-dev-multiversx": "^2.3.0", "@axelar-network/axelarjs-sdk": "^0.15.0", - "@axelar-network/interchain-token-service": "^1.0.0", + "@axelar-network/interchain-token-service": "1.2.4", "@grpc/grpc-js": "^1.10.3", "@grpc/proto-loader": "^0.7.10", "@multiversx/sdk-core": "^12.19.0",