diff --git a/axelar-chains-config/tests/schema/index.js b/axelar-chains-config/tests/schema/index.js index 47dbaee6..9f9ab0a0 100644 --- a/axelar-chains-config/tests/schema/index.js +++ b/axelar-chains-config/tests/schema/index.js @@ -3,12 +3,13 @@ const axelarSchema = { type: 'object', properties: { id: { type: 'string' }, + axelarId: { type: 'string' }, rpc: { type: 'string' }, lcd: { type: 'string' }, grpc: { type: 'string' }, tokenSymbol: { type: 'string' }, }, - required: ['id', 'rpc', 'lcd', 'grpc', 'tokenSymbol'], + required: ['id', 'axelarId', 'rpc', 'lcd', 'grpc', 'tokenSymbol'], }; export const contractValueSchema = { @@ -65,6 +66,7 @@ export const chainValueSchema = { properties: { name: { type: 'string' }, id: { type: 'string' }, + axelarId: { type: 'string' }, chainId: { type: 'number' }, rpc: { type: 'string' }, tokenSymbol: { type: 'string' }, @@ -73,7 +75,7 @@ export const chainValueSchema = { gasOptions: { $ref: gasOptionSchema.id }, confirmations: { type: 'number' }, }, - required: ['name', 'id', 'chainId', 'rpc', 'tokenSymbol', 'contracts', 'explorer'], + required: ['name', 'id', 'axelarId', 'chainId', 'rpc', 'tokenSymbol', 'contracts', 'explorer'], }; export const chainsSchema = { diff --git a/cosmwasm/deploy-contract.js b/cosmwasm/deploy-contract.js index a61a634c..9dc7c0d4 100644 --- a/cosmwasm/deploy-contract.js +++ b/cosmwasm/deploy-contract.js @@ -331,8 +331,8 @@ const upload = (client, wallet, chainName, config, options) => { } if (chainConfig) { - contractConfig[chainConfig.id] = { - ...contractConfig[chainConfig.id], + contractConfig[chainConfig.axelarId] = { + ...contractConfig[chainConfig.axelarId], address, }; } else { @@ -360,8 +360,8 @@ const instantiate = (client, wallet, chainName, config, options) => { const initMsg = makeInstantiateMsg(contractName, chainName, config); return instantiateContract(client, wallet, initMsg, config, options).then((contractAddress) => { if (chainConfig) { - contractConfig[chainConfig.id] = { - ...contractConfig[chainConfig.id], + contractConfig[chainConfig.axelarId] = { + ...contractConfig[chainConfig.axelarId], address: contractAddress, }; } else { diff --git a/evm/its.js b/evm/its.js index 5b274874..bd786c18 100644 --- a/evm/its.js +++ b/evm/its.js @@ -468,7 +468,7 @@ async function processCommand(config, chain, options) { trustedChains = itsChains.map((chain) => chain.axelarId); trustedAddresses = itsChains.map((_) => chain.contracts?.InterchainTokenService?.address); } else { - const trustedChain = config.chains[options.trustedChain.toLowerCase()]?.id; + const trustedChain = config.chains[options.trustedChain.toLowerCase()]?.axelarId; if (trustedChain === undefined) { throw new Error(`Invalid chain: ${options.trustedChain}`); @@ -501,7 +501,7 @@ async function processCommand(config, chain, options) { if (options.trustedChain === 'all') { [trustedChains] = await getTrustedChainsAndAddresses(config, interchainTokenService); } else { - const trustedChain = config.chains[options.trustedChain.toLowerCase()]?.id; + const trustedChain = config.chains[options.trustedChain.toLowerCase()]?.axelarId; if (trustedChain === undefined) { throw new Error(`Invalid chain: ${options.trustedChain}`); diff --git a/evm/utils.js b/evm/utils.js index afb22c5f..de43c27c 100644 --- a/evm/utils.js +++ b/evm/utils.js @@ -1073,7 +1073,7 @@ function validateGasOptions(gasOptions) { function isValidChain(config, chainName) { const chains = config.chains; - const validChain = Object.values(chains).some((chainObject) => chainObject.id === chainName); + const validChain = Object.values(chains).some((chainObject) => chainObject.axelarId === chainName); if (!validChain) { throw new Error(`Invalid destination chain: ${chainName}`);