refactor(cosmwasm): use TS mainProcessor

common/utils.js

@@ -756,16 +756,6 @@ function encodeITSDestination(chains, destinationChain, destinationAddress) {
     }
 }
 
-const getProposalConfig = (config, env, key) => {
-    try {
-        const value = config.axelar?.[key];
-        if (value === undefined) throw new Error(`Key "${key}" not found in config for ${env}`);
-        return value;
-    } catch (error) {
-        throw new Error(`Failed to load config value "${key}" for ${env}: ${error.message}`);
-    }
-};
-
 /**
  * Validates if a chain is valid in the config.
  *
@@ -856,7 +846,6 @@ module.exports = {
     getCurrentVerifierSet,
     asciiToBytes,
     encodeITSDestination,
-    getProposalConfig,
     tokenManagerTypes,
     validateLinkType,
     validateChain,

cosmwasm/deploy-contract.js

@@ -4,22 +4,21 @@ require('../common/cli-utils');
 
 const { instantiate2Address } = require('@cosmjs/cosmwasm-stargate');
 
-const { printInfo, loadConfig, saveConfig, prompt } = require('../common');
+const { printInfo, prompt } = require('../common');
 
 const {
     CONTRACTS,
-    prepareWallet,
-    prepareClient,
     fromHex,
     getSalt,
-    initContractConfig,
     getAmplifierContractConfig,
     getCodeId,
     uploadContract,
     instantiateContract,
     migrateContract,
 } = require('./utils');
 
+const { mainProcessor } = require('./processor');
+
 const { Command } = require('commander');
 const { addAmplifierOptions } = require('./cli-utils');
 
@@ -87,20 +86,6 @@ const migrate = async (client, wallet, config, options) => {
     printInfo('Migration completed. Transaction hash', transactionHash);
 };
 
-const mainProcessor = async (processor, options) => {
-    const { env } = options;
-    const config = loadConfig(env);
-
-    initContractConfig(config, options);
-
-    const wallet = await prepareWallet(options);
-    const client = await prepareClient(config, wallet);
-
-    await processor(client, wallet, config, options);
-
-    saveConfig(config, env);
-};
-
 const programHandler = () => {
     const program = new Command();
 

cosmwasm/query.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const { prepareDummyWallet, prepareClient, initContractConfig } = require('./utils');
-const { loadConfig, printInfo, printWarn, getChainConfig, itsHubContractAddress, saveConfig } = require('../common');
+const { printInfo, printWarn, getChainConfig, itsHubContractAddress } = require('../common');
+const { mainProcessor } = require('./processor');
 const { Command } = require('commander');
 const { addAmplifierQueryOptions } = require('./cli-utils');
 
-async function rewards(client, config, args, options) {
+async function rewards(client, _wallet, config, _options, args, _fee) {
     const [chainName] = args;
 
     const rewardsContractAddresses = {
@@ -45,7 +45,7 @@ async function getItsChainConfig(client, config, chainName) {
     });
 }
 
-async function tokenConfig(client, config, args, _options) {
+async function tokenConfig(client, _wallet, config, _options, args, _fee) {
     const [tokenId] = args;
     const itsHubAddress = itsHubContractAddress(config.axelar);
 
@@ -65,7 +65,7 @@ async function tokenConfig(client, config, args, _options) {
     }
 }
 
-async function customTokenMetadata(client, config, args, options) {
+async function customTokenMetadata(client, _wallet, config, _options, args, _fee) {
     const [chainName, tokenAddress] = args;
     const itsHubAddress = itsHubContractAddress(config.axelar);
 
@@ -94,7 +94,7 @@ async function customTokenMetadata(client, config, args, options) {
     }
 }
 
-async function tokenInstance(client, config, args, options) {
+async function tokenInstance(client, _wallet, config, _options, args, _fee) {
     const [chainName, tokenId] = args;
     const itsHubAddress = itsHubContractAddress(config.axelar);
 
@@ -123,7 +123,7 @@ async function tokenInstance(client, config, args, options) {
     }
 }
 
-async function itsChainConfig(client, config, args, options) {
+async function itsChainConfig(client, _wallet, config, _options, args, _fee) {
     const [chainName] = args;
 
     try {
@@ -134,7 +134,7 @@ async function itsChainConfig(client, config, args, options) {
     }
 }
 
-async function saveDeployedContracts(client, config, args, options) {
+async function saveDeployedContracts(client, _wallet, config, _options, args, _fee) {
     const [chainName] = args;
 
     const coordinatorAddress = config.axelar?.contracts?.Coordinator?.address;
@@ -199,23 +199,9 @@ async function saveDeployedContracts(client, config, args, options) {
         address: result.prover,
     };
     printInfo(`Updated MultisigProver[${chainName}].address`, result.prover);
-
-    saveConfig(config, options.env);
     printInfo(`Config updated successfully for ${chainName}`);
 }
 
-const mainProcessor = async (processor, args, options) => {
-    const { env } = options;
-    const config = loadConfig(env);
-
-    initContractConfig(config, options);
-
-    const wallet = await prepareDummyWallet(options);
-    const client = await prepareClient(config, wallet);
-
-    await processor(client, config, args, options);
-};
-
 const programHandler = () => {
     const program = new Command();
 
@@ -225,42 +211,42 @@ const programHandler = () => {
         .command('rewards <chainName>')
         .description('Query rewards pool state for multisig and voting_verifier contracts')
         .action((chainName, options) => {
-            mainProcessor(rewards, [chainName], options);
+            mainProcessor(rewards, options, [chainName]);
         });
 
     const tokenConfigCmd = program
         .command('token-config <tokenId>')
         .description('Query token config from ITS Hub')
         .action((tokenId, options) => {
-            mainProcessor(tokenConfig, [tokenId], options);
+            mainProcessor(tokenConfig, options, [tokenId]);
         });
 
     const customTokenMetadataCmd = program
         .command('custom-token-metadata <chainName> <tokenAddress>')
         .description('Query custom token metadata by chain name and token address')
         .action((chainName, tokenAddress, options) => {
-            mainProcessor(customTokenMetadata, [chainName, tokenAddress], options);
+            mainProcessor(customTokenMetadata, options, [chainName, tokenAddress]);
         });
 
     const tokenInstanceCmd = program
         .command('token-instance <chainName> <tokenId>')
         .description('Query token instance by chain name and token ID')
         .action((chainName, tokenId, options) => {
-            mainProcessor(tokenInstance, [chainName, tokenId], options);
+            mainProcessor(tokenInstance, options, [chainName, tokenId]);
         });
 
     const itsChainConfigCmd = program
         .command('its-chain-config <chainName>')
         .description('Query ITS chain configuration for a specific chain')
         .action((chainName, options) => {
-            mainProcessor(itsChainConfig, [chainName], options);
+            mainProcessor(itsChainConfig, options, [chainName]);
         });
 
     const saveDeployedContractsCmd = program
         .command('save-deployed-contracts <chainName>')
         .description('Query and save deployed Gateway, VotingVerifier and MultisigProver contracts via Coordinator')
         .action((chainName, options) => {
-            mainProcessor(saveDeployedContracts, [chainName], options);
+            mainProcessor(saveDeployedContracts, options, [chainName]);
         });
 
     addAmplifierQueryOptions(rewardsCmd);

cosmwasm/rotate-signers.js

@@ -4,10 +4,10 @@ require('../common/cli-utils');
 
 const { Command } = require('commander');
 const { addAmplifierOptions } = require('./cli-utils');
-const { GasPrice, calculateFee } = require('@cosmjs/stargate');
 
-const { loadConfig, getCurrentVerifierSet, printInfo, sleep, printError } = require('../common');
-const { prepareWallet, prepareClient, executeTransaction } = require('./utils');
+const { getCurrentVerifierSet, printInfo, sleep, printError } = require('../common');
+const { executeTransaction } = require('./utils');
+const { mainProcessor } = require('./processor');
 
 const getNextVerifierSet = async (config, chain, client) => {
     return client.queryContractSmart(config.axelar.contracts.MultisigProver[chain].address, 'next_verifier_set');
@@ -17,7 +17,7 @@ const getVerifierSetStatus = async (config, chain, client, verifierStatus) => {
     return client.queryContractSmart(config.axelar.contracts.VotingVerifier[chain].address, { verifier_set_status: verifierStatus });
 };
 
-const updateVerifierSet = async (config, [chain], wallet, client, fee) => {
+const updateVerifierSet = async (client, wallet, config, _options, [chain], fee) => {
     const [account] = await wallet.getAccounts();
 
     const currentVerifierSet = await getCurrentVerifierSet(config.axelar, chain, client);
@@ -37,7 +37,7 @@ const updateVerifierSet = async (config, [chain], wallet, client, fee) => {
     printInfo('Mutisig session ID', multisigSessionId);
 };
 
-const confirmVerifierRotation = async (config, [chain, txHash], wallet, client, fee) => {
+const confirmVerifierRotation = async (client, wallet, config, _options, [chain, txHash], fee) => {
     const [account] = await wallet.getAccounts();
 
     const nextVerifierSet = (await getNextVerifierSet(config, chain, client)).verifier_set;
@@ -78,19 +78,6 @@ const confirmVerifierRotation = async (config, [chain, txHash], wallet, client,
     printInfo('Confirm verifier set rotation', transactionHash);
 };
 
-const processCommand = async (processCmd, options, args) => {
-    const config = loadConfig(options.env);
-    const wallet = await prepareWallet(options);
-    const client = await prepareClient(config, wallet);
-    const {
-        axelar: { gasPrice, gasLimit },
-    } = config;
-
-    const fee = gasLimit === 'auto' ? 'auto' : calculateFee(gasLimit, GasPrice.fromString(gasPrice));
-
-    await processCmd(config, args, wallet, client, fee);
-};
-
 const programHandler = () => {
     const program = new Command();
 
@@ -100,15 +87,15 @@ const programHandler = () => {
         .command('update-verifier-set <chain>')
         .description('Update verifier set')
         .action((chain, options) => {
-            processCommand(updateVerifierSet, options, [chain]);
+            mainProcessor(updateVerifierSet, options, [chain]);
         });
     addAmplifierOptions(updateVerifiersCmd, {});
 
     const confirmVerifiersCmd = program
         .command('confirm-verifier-rotation <chain> <txHash>')
         .description('Confirm verifier rotation')
         .action((chain, txHash, options) => {
-            processCommand(confirmVerifierRotation, options, [chain, txHash]);
+            mainProcessor(confirmVerifierRotation, options, [chain, txHash]);
         });
     addAmplifierOptions(confirmVerifiersCmd, {});
 

cosmwasm/submit-proposal.js

@@ -8,11 +8,8 @@ const { instantiate2Address } = require('@cosmjs/cosmwasm-stargate');
 
 const {
     CONTRACTS,
-    prepareWallet,
-    prepareClient,
     fromHex,
     getSalt,
-    initContractConfig,
     getAmplifierBaseContractConfig,
     getAmplifierContractConfig,
     getCodeId,
@@ -26,20 +23,10 @@ const {
     encodeParameterChangeProposal,
     encodeMigrateContractProposal,
     submitProposal,
-    governanceAddress,
     getInstantiateChainContractsMessage,
     validateItsChainChange,
 } = require('./utils');
-const {
-    saveConfig,
-    loadConfig,
-    printInfo,
-    prompt,
-    getChainConfig,
-    itsEdgeContract,
-    readContractCode,
-    getProposalConfig,
-} = require('../common');
+const { printInfo, prompt, getChainConfig, itsEdgeContract, readContractCode } = require('../common');
 const {
     StoreCodeProposal,
     StoreAndInstantiateContractProposal,
@@ -52,6 +39,7 @@ const { ParameterChangeProposal } = require('cosmjs-types/cosmos/params/v1beta1/
 
 const { Command, Option } = require('commander');
 const { addAmplifierOptions } = require('./cli-utils');
+const { mainProcessor } = require('./processor');
 
 const predictAddress = async (client, contractConfig, options) => {
     const { contractName, salt, chainName, runAs } = options;
@@ -289,33 +277,6 @@ const instantiateChainContracts = async (client, wallet, config, options) => {
     };
 };
 
-function addGovProposalDefaults(options, config, env) {
-    const { runAs, deposit, instantiateAddresses } = options;
-
-    if (!runAs) options.runAs = env == 'devnet-amplifier' ? 'axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9' : governanceAddress;
-
-    if (!deposit) options.deposit = getProposalConfig(config, env, 'govProposalDepositAmount');
-
-    if (!instantiateAddresses) options.instantiateAddresses = getProposalConfig(config, env, 'govProposalInstantiateAddresses');
-
-    return options;
-}
-
-const mainProcessor = async (processor, options) => {
-    const { env } = options;
-    const config = loadConfig(env);
-    addGovProposalDefaults(options, config, env);
-
-    initContractConfig(config, options);
-
-    const wallet = await prepareWallet(options);
-    const client = await prepareClient(config, wallet);
-
-    await processor(client, wallet, config, options);
-
-    saveConfig(config, env);
-};
-
 const programHandler = () => {
     const program = new Command();
 

cosmwasm/update-code-id.js

@@ -2,30 +2,20 @@
 
 require('../common/cli-utils');
 
-const { printInfo, loadConfig, saveConfig } = require('../common');
-const { prepareWallet, prepareClient, initContractConfig, getAmplifierContractConfig, fetchCodeIdFromContract } = require('./utils');
-
+const { getAmplifierContractConfig, fetchCodeIdFromContract } = require('./utils');
+const { mainProcessor } = require('./processor');
+const { printInfo } = require('../common');
 const { Command } = require('commander');
 const { addAmplifierOptions } = require('./cli-utils');
 
-const processCommand = async (options) => {
-    const { env } = options;
-    const config = loadConfig(env);
-
-    initContractConfig(config, options);
-
-    const wallet = await prepareWallet(options);
-    const client = await prepareClient(config, wallet);
-
+const processCommand = async (client, _wallet, config, options) => {
     const { contractConfig } = getAmplifierContractConfig(config, options);
 
     printInfo('Old code id', contractConfig.codeId);
 
     contractConfig.codeId = await fetchCodeIdFromContract(client, contractConfig);
 
     printInfo('New code id', contractConfig.codeId);
-
-    saveConfig(config, env);
 };
 
 const programHandler = () => {
@@ -38,7 +28,7 @@ const programHandler = () => {
     });
 
     program.action((options) => {
-        processCommand(options);
+        mainProcessor(processCommand, options);
     });
 
     program.parse();