From 4e1faff25e519519e32cf0416f2496abfae55768 Mon Sep 17 00:00:00 2001
From: Edwin Guajardo <edwin@axelar.network>
Date: Thu, 15 Aug 2024 13:56:53 -0600
Subject: [PATCH 1/4] move common options to utils

---
 common/cli-utils.js         | 19 +++++++++++++----
 cosmwasm/cli-utils.js       | 41 +++++++++++++++++++++++++++++++++++++
 cosmwasm/deploy-contract.js | 27 +++---------------------
 cosmwasm/submit-proposal.js | 28 ++-----------------------
 4 files changed, 61 insertions(+), 54 deletions(-)
 create mode 100644 cosmwasm/cli-utils.js

diff --git a/common/cli-utils.js b/common/cli-utils.js
index 88fbc4a9..1bcb7173 100644
--- a/common/cli-utils.js
+++ b/common/cli-utils.js
@@ -13,9 +13,18 @@ const addBaseOptions = (program, options = {}) => {
             .env('ENV'),
     );
     program.addOption(new Option('-y, --yes', 'skip deployment prompt confirmation').env('YES'));
-    program.addOption(new Option('--parallel', 'run script parallely wrt chains'));
-    program.addOption(new Option('--saveChainSeparately', 'save chain info separately'));
-    program.addOption(new Option('--gasOptions <gasOptions>', 'gas options cli override'));
+
+    if (!options.ignoreParallel) {
+        program.addOption(new Option('--parallel', 'run script parallely wrt chains'));
+    }
+
+    if (!options.ignoreSaveChainSeparately) {
+        program.addOption(new Option('--saveChainSeparately', 'save chain info separately'));
+    }
+
+    if (!options.ignoreGasOptions) {
+        program.addOption(new Option('--gasOptions <gasOptions>', 'gas options cli override'));
+    }
 
     if (!options.ignoreChainNames) {
         program.addOption(
@@ -44,7 +53,9 @@ const addBaseOptions = (program, options = {}) => {
 const addExtendedOptions = (program, options = {}) => {
     addBaseOptions(program, options);
 
-    program.addOption(new Option('-v, --verify', 'verify the deployed contract on the explorer').env('VERIFY'));
+    if (!options.ignoreVerify) {
+        program.addOption(new Option('-v, --verify', 'verify the deployed contract on the explorer').env('VERIFY'));
+    }
 
     if (options.artifactPath) {
         program.addOption(new Option('--artifactPath <artifactPath>', 'artifact path'));
diff --git a/cosmwasm/cli-utils.js b/cosmwasm/cli-utils.js
new file mode 100644
index 00000000..e3a7bc61
--- /dev/null
+++ b/cosmwasm/cli-utils.js
@@ -0,0 +1,41 @@
+'use strict';
+
+require('dotenv').config();
+
+const { addExtendedOptions } = require('../common');
+const { governanceAddress } = require('./utils');
+
+const { Option } = require('commander');
+
+const addCommonAmplifierOptions = (program, options = {}) => {
+    const ops = {
+        ignoreParallel: true,
+        ignoreSaveChainSeparately: true,
+        ignoreGasOptions: true,
+        ignoreChainNames: true,
+        ignorePrivateKey: true,
+        ignoreVerify: true,
+        contractName: true,
+        salt: true,
+        ...options,
+    };
+
+    addExtendedOptions(program, ops);
+
+    program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
+    program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').makeOptionMandatory(true).env('ARTIFACT_PATH'));
+    program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
+    program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none'));
+    program.addOption(
+        new Option('--admin <address>', 'when instantiating contract, set an admin address. Defaults to governance module account').default(
+            governanceAddress,
+        ),
+    );
+    program.addOption(new Option('--instantiate2', 'use instantiate2 for constant address deployment'));
+    program.addOption(new Option('--fetchCodeId', 'fetch code id from the chain by comparing to the uploaded code hash'));
+    program.addOption(new Option('-l, --label <label>', 'contract instance label'));
+};
+
+module.exports = {
+    addCommonAmplifierOptions,
+};
diff --git a/cosmwasm/deploy-contract.js b/cosmwasm/deploy-contract.js
index 8e68223b..7b722c37 100644
--- a/cosmwasm/deploy-contract.js
+++ b/cosmwasm/deploy-contract.js
@@ -12,10 +12,10 @@ const {
     uploadContract,
     instantiateContract,
     makeInstantiateMsg,
-    governanceAddress,
 } = require('./utils');
 
 const { Command, Option } = require('commander');
+const { addCommonAmplifierOptions } = require('./cli-utils');
 
 const upload = (client, wallet, chainName, config, options) => {
     const { reuseCodeId, contractName, fetchCodeId } = options;
@@ -112,36 +112,15 @@ const programHandler = () => {
 
     program.name('upload-contract').description('Upload CosmWasm contracts');
 
-    program.addOption(
-        new Option('-e, --env <env>', 'environment')
-            .choices(['local', 'devnet', 'stagenet', 'testnet', 'mainnet'])
-            .default('testnet')
-            .makeOptionMandatory(true)
-            .env('ENV'),
-    );
-    program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
-    program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').makeOptionMandatory(true).env('ARTIFACT_PATH'));
-    program.addOption(new Option('-c, --contractName <contractName>', 'contract name').makeOptionMandatory(true));
-    program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none'));
+    addCommonAmplifierOptions(program);
+
     program.addOption(new Option('-r, --reuseCodeId', 'reuse code Id'));
-    program.addOption(new Option('-s, --salt <salt>', 'salt for instantiate2. defaults to contract name').env('SALT'));
-    program.addOption(
-        new Option('--admin <address>', 'when instantiating contract, set an admin address. Defaults to governance module account').default(
-            governanceAddress,
-        ),
-    );
     program.addOption(
         new Option(
             '-u, --uploadOnly',
             'upload the contract without instantiating. prints expected contract address if --instantiate2 is passed',
         ),
     );
-    program.addOption(new Option('--instantiate2', 'use instantiate2 for constant address deployment'));
-    program.addOption(new Option('-l, --label <label>', 'contract instance label'));
-    program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
-    program.addOption(new Option('-y, --yes', 'skip deployment prompt confirmation').env('YES'));
-
-    program.addOption(new Option('--fetchCodeId', 'fetch code id from the chain by comparing to the uploaded code hash'));
 
     program.action((options) => {
         main(options);
diff --git a/cosmwasm/submit-proposal.js b/cosmwasm/submit-proposal.js
index ebde299e..c2d8059b 100644
--- a/cosmwasm/submit-proposal.js
+++ b/cosmwasm/submit-proposal.js
@@ -31,6 +31,7 @@ const {
 } = require('cosmjs-types/cosmwasm/wasm/v1/proposal');
 
 const { Command, Option } = require('commander');
+const { addCommonAmplifierOptions } = require('./cli-utils');
 
 const updateContractConfig = (contractConfig, chainConfig, key, value) => {
     if (chainConfig) {
@@ -248,29 +249,7 @@ const programHandler = () => {
 
     program.name('submit-proposal').description('Submit governance proposals');
 
-    // TODO: combine deploy-contract and submit-proposal options to remove duplicates
-    program.addOption(
-        new Option('-e, --env <env>', 'environment')
-            .choices(['local', 'devnet', 'devnet-amplifier', 'devnet-verifiers', 'stagenet', 'testnet', 'mainnet'])
-            .default('devnet-amplifier')
-            .makeOptionMandatory(true)
-            .env('ENV'),
-    );
-    program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
-    program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').makeOptionMandatory(true).env('ARTIFACT_PATH'));
-    program.addOption(new Option('-c, --contractName <contractName>', 'contract name').makeOptionMandatory(true));
-    program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none'));
-
-    program.addOption(new Option('-s, --salt <salt>', 'salt for instantiate2. defaults to contract name').env('SALT'));
-    program.addOption(
-        new Option('--admin <address>', 'when instantiating contract, set an admin address. Defaults to governance module account').default(
-            governanceAddress,
-        ),
-    );
-    program.addOption(new Option('--instantiate2', 'use instantiate2 for constant address deployment'));
-    program.addOption(new Option('-l, --label <label>', 'contract instance label'));
-    program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
-    program.addOption(new Option('-y, --yes', 'skip prompt confirmation').env('YES'));
+    addCommonAmplifierOptions(program, { predictOnly: true });
 
     program.addOption(new Option('-t, --title <title>', 'title of proposal').makeOptionMandatory(true));
     program.addOption(new Option('-d, --description <description>', 'description of proposal').makeOptionMandatory(true));
@@ -285,7 +264,6 @@ const programHandler = () => {
             .choices(['store', 'storeInstantiate', 'instantiate', 'execute'])
             .makeOptionMandatory(true),
     );
-    program.addOption(new Option('--predictOnly', 'output the predicted changes only').env('PREDICT_ONLY'));
 
     program.addOption(new Option('--source <source>', "a valid HTTPS URI to the contract's source code"));
     program.addOption(
@@ -295,8 +273,6 @@ const programHandler = () => {
         new Option('-i, --instantiateAddresses <instantiateAddresses>', 'comma separated list of addresses allowed to instantiate'),
     );
 
-    program.addOption(new Option('--fetchCodeId', 'fetch code id from the chain by comparing to the uploaded code hash'));
-
     program.addOption(new Option('--msg <msg>', 'json encoded message to submit with an execute contract proposal'));
 
     program.action((options) => {

From ce6fe542c159e2b3e4733eafd7b8e7082dca60d5 Mon Sep 17 00:00:00 2001
From: Edwin Guajardo <edwin@axelar.network>
Date: Wed, 21 Aug 2024 09:30:38 -0600
Subject: [PATCH 2/4] add chain env to chainNames option

---
 cosmwasm/cli-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cosmwasm/cli-utils.js b/cosmwasm/cli-utils.js
index e3a7bc61..e1ef6a40 100644
--- a/cosmwasm/cli-utils.js
+++ b/cosmwasm/cli-utils.js
@@ -25,7 +25,7 @@ const addCommonAmplifierOptions = (program, options = {}) => {
     program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
     program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').makeOptionMandatory(true).env('ARTIFACT_PATH'));
     program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
-    program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none'));
+    program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none').env('CHAINS'));
     program.addOption(
         new Option('--admin <address>', 'when instantiating contract, set an admin address. Defaults to governance module account').default(
             governanceAddress,

From 54fcdc4a3c2cfed79b84da963d7bfa8514e98794 Mon Sep 17 00:00:00 2001
From: npty <78221556+npty@users.noreply.github.com>
Date: Thu, 22 Aug 2024 19:32:47 +0700
Subject: [PATCH 3/4] chore: reuse addEnvOptions (#344)

---
 common/cli-utils.js          | 19 ++++++++++++++++---
 cosmwasm/cli-utils.js        |  4 ++--
 cosmwasm/deploy-contract.js  |  5 +++++
 cosmwasm/submit-proposal.js  | 18 ++++++++++++++++++
 stellar/balances.js          |  9 ++-------
 stellar/deploy-contract.js   |  9 ++-------
 stellar/generate-bindings.js |  9 ++-------
 stellar/operators.js         | 10 ++--------
 sui/utils/cli-utils.js       |  9 ++-------
 9 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/common/cli-utils.js b/common/cli-utils.js
index 1bcb7173..189aee26 100644
--- a/common/cli-utils.js
+++ b/common/cli-utils.js
@@ -2,16 +2,28 @@
 
 require('dotenv').config();
 
+const fs = require('fs');
 const { Option } = require('commander');
 
-const addBaseOptions = (program, options = {}) => {
+// A path to the chain configuration files
+const CHAIN_CONFIG_PATH = `${__dirname}/../axelar-chains-config/info`;
+
+// A list of available chain environments which are the names of the files in the CHAIN_CONFIG_PATH
+const CHAIN_ENVIRONMENTS = fs.readdirSync(CHAIN_CONFIG_PATH).map((chainName) => chainName.split('.')[0]);
+
+const addEnvOption = (program, defaultValue) => {
     program.addOption(
         new Option('-e, --env <env>', 'environment')
-            .choices(['local', 'devnet', 'devnet-amplifier', 'devnet-verifiers', 'stagenet', 'testnet', 'mainnet'])
-            .default('testnet')
+            .choices(CHAIN_ENVIRONMENTS)
+            .default(defaultValue || 'testnet')
             .makeOptionMandatory(true)
             .env('ENV'),
     );
+};
+
+const addBaseOptions = (program, options = {}) => {
+    addEnvOption(program);
+
     program.addOption(new Option('-y, --yes', 'skip deployment prompt confirmation').env('YES'));
 
     if (!options.ignoreParallel) {
@@ -93,6 +105,7 @@ const addExtendedOptions = (program, options = {}) => {
 };
 
 module.exports = {
+    addEnvOption,
     addBaseOptions,
     addExtendedOptions,
 };
diff --git a/cosmwasm/cli-utils.js b/cosmwasm/cli-utils.js
index e1ef6a40..684f3382 100644
--- a/cosmwasm/cli-utils.js
+++ b/cosmwasm/cli-utils.js
@@ -2,7 +2,7 @@
 
 require('dotenv').config();
 
-const { addExtendedOptions } = require('../common');
+const { addExtendedOptions, addEnvOption } = require('../common');
 const { governanceAddress } = require('./utils');
 
 const { Option } = require('commander');
@@ -20,8 +20,8 @@ const addCommonAmplifierOptions = (program, options = {}) => {
         ...options,
     };
 
+    addEnvOption(program);
     addExtendedOptions(program, ops);
-
     program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
     program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').makeOptionMandatory(true).env('ARTIFACT_PATH'));
     program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
diff --git a/cosmwasm/deploy-contract.js b/cosmwasm/deploy-contract.js
index 7b722c37..da49d2f8 100644
--- a/cosmwasm/deploy-contract.js
+++ b/cosmwasm/deploy-contract.js
@@ -3,6 +3,7 @@
 require('dotenv').config();
 const { isNil } = require('lodash');
 
+const { addEnvOption } = require('../common');
 const { isNumber, printInfo, loadConfig, saveConfig, prompt } = require('../evm/utils');
 const {
     prepareWallet,
@@ -114,6 +115,10 @@ const programHandler = () => {
 
     addCommonAmplifierOptions(program);
 
+    program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
+    program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').makeOptionMandatory(true).env('ARTIFACT_PATH'));
+    program.addOption(new Option('-c, --contractName <contractName>', 'contract name').makeOptionMandatory(true));
+    program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none'));
     program.addOption(new Option('-r, --reuseCodeId', 'reuse code Id'));
     program.addOption(
         new Option(
diff --git a/cosmwasm/submit-proposal.js b/cosmwasm/submit-proposal.js
index c2d8059b..e56b941d 100644
--- a/cosmwasm/submit-proposal.js
+++ b/cosmwasm/submit-proposal.js
@@ -22,6 +22,7 @@ const {
     governanceAddress,
 } = require('./utils');
 const { isNumber, saveConfig, loadConfig, printInfo, prompt } = require('../evm/utils');
+const { addEnvOption } = require('../common');
 const {
     StoreCodeProposal,
     StoreAndInstantiateContractProposal,
@@ -251,6 +252,23 @@ const programHandler = () => {
 
     addCommonAmplifierOptions(program, { predictOnly: true });
 
+    // TODO: combine deploy-contract and submit-proposal options to remove duplicates
+    program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
+    program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').makeOptionMandatory(true).env('ARTIFACT_PATH'));
+    program.addOption(new Option('-c, --contractName <contractName>', 'contract name').makeOptionMandatory(true));
+    program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none'));
+
+    program.addOption(new Option('-s, --salt <salt>', 'salt for instantiate2. defaults to contract name').env('SALT'));
+    program.addOption(
+        new Option('--admin <address>', 'when instantiating contract, set an admin address. Defaults to governance module account').default(
+            governanceAddress,
+        ),
+    );
+    program.addOption(new Option('--instantiate2', 'use instantiate2 for constant address deployment'));
+    program.addOption(new Option('-l, --label <label>', 'contract instance label'));
+    program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
+    program.addOption(new Option('-y, --yes', 'skip prompt confirmation').env('YES'));
+
     program.addOption(new Option('-t, --title <title>', 'title of proposal').makeOptionMandatory(true));
     program.addOption(new Option('-d, --description <description>', 'description of proposal').makeOptionMandatory(true));
     program.addOption(new Option('--deposit <deposit>', 'the proposal deposit').makeOptionMandatory(true));
diff --git a/stellar/balances.js b/stellar/balances.js
index a1a45b92..601a55b6 100644
--- a/stellar/balances.js
+++ b/stellar/balances.js
@@ -1,6 +1,7 @@
 const { Command, Option } = require('commander');
 const { getWallet } = require('./utils');
 const { loadConfig } = require('../evm/utils');
+const { addEnvOption } = require('../common');
 require('./cli-utils');
 
 async function processCommand(options, _, chain) {
@@ -12,13 +13,7 @@ if (require.main === module) {
 
     program.name('balances').description('Wallet balance');
 
-    program.addOption(
-        new Option('-e, --env <env>', 'environment')
-            .choices(['local', 'devnet', 'stagenet', 'testnet', 'mainnet'])
-            .default('testnet')
-            .makeOptionMandatory(true)
-            .env('ENV'),
-    );
+    addEnvOption(program);
 
     program.addOption(new Option('-p, --privateKey <privateKey>', 'private key').makeOptionMandatory(true).env('PRIVATE_KEY'));
 
diff --git a/stellar/deploy-contract.js b/stellar/deploy-contract.js
index 033bd774..9a13d4f1 100644
--- a/stellar/deploy-contract.js
+++ b/stellar/deploy-contract.js
@@ -5,6 +5,7 @@ const { Command, Option } = require('commander');
 const { execSync } = require('child_process');
 const { loadConfig, printInfo, saveConfig } = require('../evm/utils');
 const { getNetworkPassphrase, getWallet, prepareTransaction, sendTransaction, buildTransaction, estimateCost } = require('./utils');
+const { addEnvOption } = require('../common');
 require('./cli-utils');
 
 function getInitializeArgs(chain, contractName, wallet, options) {
@@ -108,13 +109,7 @@ function main() {
     const program = new Command();
     program.name('deploy-contract').description('Deploy Axelar Soroban contracts on Stellar');
 
-    program.addOption(
-        new Option('-e, --env <env>', 'environment')
-            .choices(['local', 'devnet', 'stagenet', 'testnet', 'mainnet'])
-            .default('testnet')
-            .makeOptionMandatory(true)
-            .env('ENV'),
-    );
+    addEnvOption(program);
     program.addOption(new Option('-p, --privateKey <privateKey>', 'private key').env('PRIVATE_KEY'));
     program.addOption(new Option('-v, --verbose', 'verbose output').default(false));
     program.addOption(new Option('--initialize', 'initialize the contract'));
diff --git a/stellar/generate-bindings.js b/stellar/generate-bindings.js
index 89ff4486..608fa77d 100644
--- a/stellar/generate-bindings.js
+++ b/stellar/generate-bindings.js
@@ -5,6 +5,7 @@ const { execSync } = require('child_process');
 const { loadConfig } = require('../evm/utils');
 const path = require('path');
 const { getNetworkPassphrase } = require('./utils');
+const { addEnvOption } = require('../common');
 require('./cli-utils');
 
 function processCommand(options, _, chain) {
@@ -27,13 +28,7 @@ function main() {
     const program = new Command();
     program.name('Generate TypeScript Bindings for Soroban contract').description('Generates TypeScript bindings for a Soroban contract.');
 
-    program.addOption(
-        new Option('-e, --env <env>', 'environment')
-            .choices(['local', 'devnet', 'stagenet', 'testnet', 'mainnet'])
-            .default('testnet')
-            .makeOptionMandatory(true)
-            .env('ENV'),
-    );
+    addEnvOption(program);
     program.addOption(new Option('--wasmPath <wasmPath>', 'path to the WASM file').makeOptionMandatory(true));
     program.addOption(new Option('--contractId <contractId>', 'contract ID').makeOptionMandatory(true));
     program.addOption(
diff --git a/stellar/operators.js b/stellar/operators.js
index 1e1cb825..c99eda1c 100644
--- a/stellar/operators.js
+++ b/stellar/operators.js
@@ -2,6 +2,7 @@ const { Contract, Address, nativeToScVal } = require('@stellar/stellar-sdk');
 const { Command, Option } = require('commander');
 const { getWallet, prepareTransaction, buildTransaction, sendTransaction, estimateCost } = require('./utils');
 const { loadConfig, printInfo, parseArgs, validateParameters } = require('../evm/utils');
+const { addEnvOption } = require('../common');
 require('./cli-utils');
 
 async function processCommand(options, _, chain) {
@@ -115,14 +116,7 @@ if (require.main === module) {
 
     program.name('operators').description('Operators contract management');
 
-    program.addOption(
-        new Option('-e, --env <env>', 'environment')
-            .choices(['local', 'devnet', 'stagenet', 'testnet', 'mainnet'])
-            .default('testnet')
-            .makeOptionMandatory(true)
-            .env('ENV'),
-    );
-
+    addEnvOption(program);
     program.addOption(new Option('-p, --privateKey <privateKey>', 'private key').makeOptionMandatory(true).env('PRIVATE_KEY'));
     program.addOption(new Option('-v, --verbose', 'verbose output').default(false));
     program.addOption(
diff --git a/sui/utils/cli-utils.js b/sui/utils/cli-utils.js
index 8cf95622..9c8aa924 100644
--- a/sui/utils/cli-utils.js
+++ b/sui/utils/cli-utils.js
@@ -4,15 +4,10 @@ require('dotenv').config();
 
 const { Option, InvalidArgumentError } = require('commander');
 const { getUnitAmount } = require('./amount-utils');
+const { addEnvOption } = require('../../common');
 
 const addBaseOptions = (program, options = {}) => {
-    program.addOption(
-        new Option('-e, --env <env>', 'environment')
-            .choices(['local', 'devnet', 'devnet-amplifier', 'devnet-verifiers', 'stagenet', 'testnet', 'mainnet'])
-            .default('testnet')
-            .makeOptionMandatory(true)
-            .env('ENV'),
-    );
+    addEnvOption(program);
     program.addOption(new Option('-y, --yes', 'skip deployment prompt confirmation').env('YES'));
     program.addOption(new Option('--gasOptions <gasOptions>', 'gas options cli override'));
 

From 95c99c611054c51a9a5112bd487f9c8e6ce5a23d Mon Sep 17 00:00:00 2001
From: Edwin Guajardo <edwin@axelar.network>
Date: Wed, 28 Aug 2024 09:55:29 -0600
Subject: [PATCH 4/4] cleanup

---
 common/cli-utils.js         | 57 ++-----------------------------------
 cosmwasm/cli-utils.js       | 28 +++++++-----------
 cosmwasm/deploy-contract.js | 11 ++-----
 cosmwasm/submit-proposal.js | 24 +++-------------
 cosmwasm/utils.js           |  3 +-
 5 files changed, 21 insertions(+), 102 deletions(-)

diff --git a/common/cli-utils.js b/common/cli-utils.js
index b125f77f..9a60ff50 100644
--- a/common/cli-utils.js
+++ b/common/cli-utils.js
@@ -25,18 +25,9 @@ const addBaseOptions = (program, options = {}) => {
     addEnvOption(program);
 
     program.addOption(new Option('-y, --yes', 'skip deployment prompt confirmation').env('YES'));
-
-    if (!options.ignoreParallel) {
-        program.addOption(new Option('--parallel', 'run script parallely wrt chains'));
-    }
-
-    if (!options.ignoreSaveChainSeparately) {
-        program.addOption(new Option('--saveChainSeparately', 'save chain info separately'));
-    }
-
-    if (!options.ignoreGasOptions) {
-        program.addOption(new Option('--gasOptions <gasOptions>', 'gas options cli override'));
-    }
+    program.addOption(new Option('--parallel', 'run script parallely wrt chains'));
+    program.addOption(new Option('--saveChainSeparately', 'save chain info separately'));
+    program.addOption(new Option('--gasOptions <gasOptions>', 'gas options cli override'));
 
     if (!options.ignoreChainNames) {
         program.addOption(
@@ -62,48 +53,6 @@ const addBaseOptions = (program, options = {}) => {
     return program;
 };
 
-const addExtendedOptions = (program, options = {}) => {
-    addBaseOptions(program, options);
-
-    if (!options.ignoreVerify) {
-        program.addOption(new Option('-v, --verify', 'verify the deployed contract on the explorer').env('VERIFY'));
-    }
-
-    if (options.artifactPath) {
-        program.addOption(new Option('--artifactPath <artifactPath>', 'artifact path'));
-    }
-
-    if (options.contractName) {
-        program.addOption(new Option('-c, --contractName <contractName>', 'contract name').makeOptionMandatory(true));
-    }
-
-    if (options.deployMethod) {
-        program.addOption(
-            new Option('-m, --deployMethod <deployMethod>', 'deployment method')
-                .choices(['create', 'create2', 'create3'])
-                .default(options.deployMethod),
-        );
-    }
-
-    if (options.salt) {
-        program.addOption(new Option('-s, --salt <salt>', 'salt to use for create2 deployment').env('SALT'));
-    }
-
-    if (options.skipExisting) {
-        program.addOption(new Option('-x, --skipExisting', 'skip existing if contract was already deployed on chain').env('SKIP_EXISTING'));
-    }
-
-    if (options.upgrade) {
-        program.addOption(new Option('-u, --upgrade', 'upgrade a deployed contract').env('UPGRADE'));
-    }
-
-    if (options.predictOnly) {
-        program.addOption(new Option('--predictOnly', 'output the predicted changes only').env('PREDICT_ONLY'));
-    }
-
-    return program;
-};
-
 module.exports = {
     addEnvOption,
     addBaseOptions,
diff --git a/cosmwasm/cli-utils.js b/cosmwasm/cli-utils.js
index 684f3382..92c798b8 100644
--- a/cosmwasm/cli-utils.js
+++ b/cosmwasm/cli-utils.js
@@ -2,30 +2,20 @@
 
 require('dotenv').config();
 
-const { addExtendedOptions, addEnvOption } = require('../common');
+const { addEnvOption } = require('../common');
 const { governanceAddress } = require('./utils');
 
 const { Option } = require('commander');
 
-const addCommonAmplifierOptions = (program, options = {}) => {
-    const ops = {
-        ignoreParallel: true,
-        ignoreSaveChainSeparately: true,
-        ignoreGasOptions: true,
-        ignoreChainNames: true,
-        ignorePrivateKey: true,
-        ignoreVerify: true,
-        contractName: true,
-        salt: true,
-        ...options,
-    };
-
+const addAmplifierOptions = (program) => {
     addEnvOption(program);
-    addExtendedOptions(program, ops);
+
     program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
-    program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').makeOptionMandatory(true).env('ARTIFACT_PATH'));
-    program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
+    program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').env('ARTIFACT_PATH'));
+    program.addOption(new Option('-c, --contractName <contractName>', 'contract name').makeOptionMandatory(true));
     program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none').env('CHAINS'));
+
+    program.addOption(new Option('-s, --salt <salt>', 'salt for instantiate2. defaults to contract name').env('SALT'));
     program.addOption(
         new Option('--admin <address>', 'when instantiating contract, set an admin address. Defaults to governance module account').default(
             governanceAddress,
@@ -34,8 +24,10 @@ const addCommonAmplifierOptions = (program, options = {}) => {
     program.addOption(new Option('--instantiate2', 'use instantiate2 for constant address deployment'));
     program.addOption(new Option('--fetchCodeId', 'fetch code id from the chain by comparing to the uploaded code hash'));
     program.addOption(new Option('-l, --label <label>', 'contract instance label'));
+
+    program.addOption(new Option('-y, --yes', 'skip prompt confirmation').env('YES'));
 };
 
 module.exports = {
-    addCommonAmplifierOptions,
+    addAmplifierOptions,
 };
diff --git a/cosmwasm/deploy-contract.js b/cosmwasm/deploy-contract.js
index 92438eda..a0d6a126 100644
--- a/cosmwasm/deploy-contract.js
+++ b/cosmwasm/deploy-contract.js
@@ -3,8 +3,7 @@
 require('dotenv').config();
 const { isNil } = require('lodash');
 
-const { addEnvOption } = require('../common');
-const { isNumber, printInfo, loadConfig, saveConfig, prompt } = require('../evm/utils');
+const { isNumber, printInfo, loadConfig, saveConfig, prompt, getChainConfig } = require('../evm/utils');
 const {
     prepareWallet,
     prepareClient,
@@ -16,7 +15,7 @@ const {
 } = require('./utils');
 
 const { Command, Option } = require('commander');
-const { addCommonAmplifierOptions } = require('./cli-utils');
+const { addAmplifierOptions } = require('./cli-utils');
 
 const upload = (client, wallet, chainName, config, options) => {
     const { reuseCodeId, contractName, fetchCodeId } = options;
@@ -113,12 +112,8 @@ const programHandler = () => {
 
     program.name('upload-contract').description('Upload CosmWasm contracts');
 
-    addCommonAmplifierOptions(program);
+    addAmplifierOptions(program);
 
-    program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
-    program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').makeOptionMandatory(true).env('ARTIFACT_PATH'));
-    program.addOption(new Option('-c, --contractName <contractName>', 'contract name').makeOptionMandatory(true));
-    program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none'));
     program.addOption(new Option('-r, --reuseCodeId', 'reuse code Id'));
     program.addOption(
         new Option(
diff --git a/cosmwasm/submit-proposal.js b/cosmwasm/submit-proposal.js
index 77b81542..c8b5899c 100644
--- a/cosmwasm/submit-proposal.js
+++ b/cosmwasm/submit-proposal.js
@@ -22,7 +22,6 @@ const {
     governanceAddress,
 } = require('./utils');
 const { isNumber, saveConfig, loadConfig, printInfo, prompt } = require('../evm/utils');
-const { addEnvOption } = require('../common');
 const {
     StoreCodeProposal,
     StoreAndInstantiateContractProposal,
@@ -32,7 +31,7 @@ const {
 } = require('cosmjs-types/cosmwasm/wasm/v1/proposal');
 
 const { Command, Option } = require('commander');
-const { addCommonAmplifierOptions } = require('./cli-utils');
+const { addAmplifierOptions } = require('./cli-utils');
 
 const updateContractConfig = (contractConfig, chainConfig, key, value) => {
     if (chainConfig) {
@@ -250,24 +249,7 @@ const programHandler = () => {
 
     program.name('submit-proposal').description('Submit governance proposals');
 
-    addCommonAmplifierOptions(program, { predictOnly: true });
-
-    // TODO: combine deploy-contract and submit-proposal options to remove duplicates
-    program.addOption(new Option('-m, --mnemonic <mnemonic>', 'mnemonic').makeOptionMandatory(true).env('MNEMONIC'));
-    program.addOption(new Option('-a, --artifactPath <artifactPath>', 'artifact path').env('ARTIFACT_PATH'));
-    program.addOption(new Option('-c, --contractName <contractName>', 'contract name').makeOptionMandatory(true));
-    program.addOption(new Option('-n, --chainNames <chainNames>', 'chain names').default('none'));
-
-    program.addOption(new Option('-s, --salt <salt>', 'salt for instantiate2. defaults to contract name').env('SALT'));
-    program.addOption(
-        new Option('--admin <address>', 'when instantiating contract, set an admin address. Defaults to governance module account').default(
-            governanceAddress,
-        ),
-    );
-    program.addOption(new Option('--instantiate2', 'use instantiate2 for constant address deployment'));
-    program.addOption(new Option('-l, --label <label>', 'contract instance label'));
-    program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
-    program.addOption(new Option('-y, --yes', 'skip prompt confirmation').env('YES'));
+    addAmplifierOptions(program);
 
     program.addOption(new Option('-t, --title <title>', 'title of proposal').makeOptionMandatory(true));
     program.addOption(new Option('-d, --description <description>', 'description of proposal').makeOptionMandatory(true));
@@ -293,6 +275,8 @@ const programHandler = () => {
 
     program.addOption(new Option('--msg <msg>', 'json encoded message to submit with an execute contract proposal'));
 
+    program.addOption(new Option('--predictOnly', 'output the predicted changes only').env('PREDICT_ONLY'));
+
     program.action((options) => {
         main(options);
     });
diff --git a/cosmwasm/utils.js b/cosmwasm/utils.js
index 3fa94f88..f036a714 100644
--- a/cosmwasm/utils.js
+++ b/cosmwasm/utils.js
@@ -56,8 +56,7 @@ const getSalt = (salt, contractName, chainNames) => fromHex(getSaltFromKey(salt
 
 const getLabel = ({ contractName, label }) => label || contractName;
 
-const readWasmFile = ({ artifactPath, contractName, aarch64 }) =>
-    readFileSync(`${artifactPath}/${pascalToSnake(contractName)}${aarch64 ? '-aarch64' : ''}.wasm`);
+const readWasmFile = ({ artifactPath, contractName }) => readFileSync(`${artifactPath}/${pascalToSnake(contractName)}.wasm`);
 
 const getChains = (config, { chainNames, instantiate2 }) => {
     let chains = chainNames.split(',').map((str) => str.trim());