chore: reuse addEnvOptions (#344)

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,
 };

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));

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(

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));

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'));
 

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'));

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(

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(

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'));