mixmix/custom-config

src/account/command.ts

@@ -1,10 +1,11 @@
 import Entropy from "@entropyxyz/sdk"
 import { Command, Option } from 'commander'
+
 import { EntropyAccount } from "./main";
 import { selectAndPersistNewAccount, persistVerifyingKeyToAccount, generateAccountDataForPrint } from "./utils";
 import { ACCOUNTS_CONTENT } from './constants'
 import * as config from '../config'
-import { accountOption, endpointOption, cliWrite } from "../common/utils-cli";
+import { accountOption, configOption, endpointOption, cliWrite } from "../common/utils-cli";
 import { loadEntropyCli } from "../common/load-entropy"
 
 export function entropyAccountCommand () {
@@ -24,17 +25,18 @@ function entropyAccountCreate () {
     .alias('new')
     .description('Create a new entropy account from scratch. Output is JSON of form {name, address}')
     .argument('<name>', 'A user friendly name for your new account.')
+    .addOption(configOption())
     .addOption(
       new Option(
         '--path',
         'Derivation path'
       ).default(ACCOUNTS_CONTENT.path.default)
     )
     .action(async (name, opts) => {
-      const { path } = opts
+      const { config: configPath, path } = opts
       const newAccount = await EntropyAccount.create({ name, path })
 
-      await selectAndPersistNewAccount(newAccount)
+      await selectAndPersistNewAccount(configPath, newAccount)
 
       cliWrite(generateAccountDataForPrint(newAccount))
 
@@ -47,17 +49,18 @@ function entropyAccountImport () {
     .description('Import an existing entropy account from seed. Output is JSON of form {name, address}')
     .argument('<name>', 'A user friendly name for your new account.')
     .argument('<seed>', 'The seed for the account you are importing')
+    .addOption(configOption())
     .addOption(
       new Option(
         '--path',
         'Derivation path'
       ).default(ACCOUNTS_CONTENT.path.default)
     )
     .action(async (name, seed, opts) => {
-      const { path } = opts
+      const { config: configPath, path } = opts
       const newAccount = await EntropyAccount.import({ name, seed, path })
 
-      await selectAndPersistNewAccount(newAccount)
+      await selectAndPersistNewAccount(configPath, newAccount)
 
       cliWrite({
         name: newAccount.name,
@@ -72,9 +75,9 @@ function entropyAccountList () {
   return new Command('list')
     .alias('ls')
     .description('List all accounts. Output is JSON of form [{ name, address, verifyingKeys }]')
-    .action(async () => {
-      // TODO: test if it's an encrypted account, if no password provided, throw because later on there's no protection from a prompt coming up
-      const accounts = await config.get()
+    .addOption(configOption())
+    .action(async (opts) => {
+      const accounts = await config.get(opts.config)
         .then(storedConfig => EntropyAccount.list(storedConfig))
         .catch((err) => {
           if (err.message.includes('currently no accounts')) return []
@@ -92,6 +95,7 @@ function entropyAccountRegister () {
   return new Command('register')
     .description('Register an entropy account with a program')
     .addOption(accountOption())
+    .addOption(configOption())
     .addOption(endpointOption())
     // Removing these options for now until we update the design to accept program configs
     // .addOption(
@@ -111,7 +115,8 @@ function entropyAccountRegister () {
       const accountService = new EntropyAccount(entropy, opts.endpoint)
 
       const verifyingKey = await accountService.register()
-      await persistVerifyingKeyToAccount(verifyingKey, opts.account)
+      // TODO: handle error
+      await persistVerifyingKeyToAccount(opts.config, verifyingKey, opts.account)
 
       cliWrite(verifyingKey)
       process.exit(0)

src/account/interaction.ts

@@ -1,7 +1,9 @@
 import inquirer from "inquirer";
 import Entropy from "@entropyxyz/sdk";
+import yoctoSpinner from "yocto-spinner";
 
 import { EntropyAccount } from './main'
+import { EntropyTuiOptions } from '../types'
 import { selectAndPersistNewAccount, persistVerifyingKeyToAccount, generateAccountDataForPrint } from "./utils";
 import { findAccountByAddressOrName, print } from "../common/utils"
 import { EntropyConfig } from "../config/types";
@@ -12,13 +14,11 @@ import {
   accountNewQuestions,
   accountSelectQuestions
 } from "./utils"
-import { ERROR_RED } from "src/common/constants";
-import yoctoSpinner from "yocto-spinner";
 
 /*
  * @returns partialConfigUpdate | "exit" | undefined
  */
-export async function entropyAccount (endpoint: string, storedConfig: EntropyConfig) {
+export async function entropyAccount (opts: EntropyTuiOptions, storedConfig: EntropyConfig) {
   const { accounts } = storedConfig
   const { interactionChoice } = await inquirer.prompt(accountManageQuestions)
 
@@ -37,7 +37,7 @@ export async function entropyAccount (endpoint: string, storedConfig: EntropyCon
       ? await EntropyAccount.import({ seed, name, path })
       : await EntropyAccount.create({ name, path })
 
-    await selectAndPersistNewAccount(newAccount)
+    await selectAndPersistNewAccount(opts.config, newAccount)
     print(generateAccountDataForPrint(newAccount))
     return
   }
@@ -48,8 +48,8 @@ export async function entropyAccount (endpoint: string, storedConfig: EntropyCon
       return
     }
     const { selectedAccount } = await inquirer.prompt(accountSelectQuestions(accounts))
-    
-    await config.setSelectedAccount(selectedAccount)
+
+    await config.setSelectedAccount(opts.config, selectedAccount)
 
     print('Current selected account is:')
     print({ name: selectedAccount.name, address: selectedAccount.address })
@@ -77,8 +77,9 @@ export async function entropyAccount (endpoint: string, storedConfig: EntropyCon
 
 const registrationSpinner = yoctoSpinner()
 const SPINNER_TEXT =  'Registering account…'
-export async function entropyRegister (entropy: Entropy, endpoint: string, storedConfig: EntropyConfig): Promise<Partial<EntropyConfig>> {
-  const accountService = new EntropyAccount(entropy, endpoint)
+
+export async function entropyRegister (entropy: Entropy, opts: EntropyTuiOptions, storedConfig: EntropyConfig): Promise<Partial<EntropyConfig>> {
+  const accountService = new EntropyAccount(entropy, opts.endpoint)
 
   const { accounts, selectedAccount } = storedConfig
   const account = findAccountByAddressOrName(accounts, selectedAccount)
@@ -94,17 +95,18 @@ export async function entropyRegister (entropy: Entropy, endpoint: string, store
   try {
     if (!registrationSpinner.isSpinning) registrationSpinner.start()
     const verifyingKey = await accountService.register()
-    await persistVerifyingKeyToAccount(verifyingKey, account.address)
+    await persistVerifyingKeyToAccount(opts.config, verifyingKey, account.address)
+
     if (registrationSpinner.isSpinning) registrationSpinner.stop()
     print("Your address", account.address, "has been successfully registered.")
   } catch (error) {
     const endpointErrorMessageToMatch = 'Extrinsic registry.register expects 3 arguments, got 2'
     registrationSpinner.text = 'Registration has failed...'
     if (registrationSpinner.isSpinning) registrationSpinner.stop()
     if (error.message.includes(endpointErrorMessageToMatch)) {
-      console.error(ERROR_RED + 'GenericError: Incompatible endpoint, expected core version 0.3.0, got 0.2.0')
+      print.error('GenericError: Incompatible endpoint, expected core version 0.3.0, got 0.2.0')
       return
     }
-    console.error(ERROR_RED + 'RegisterError:', error.message);
+    print.error('RegisterError:', error.message)
   }
 }

src/account/utils.ts

@@ -7,8 +7,8 @@ import { EntropyConfigAccount } from "../config/types";
 import * as config from "../config";
 import { generateAccountChoices, findAccountByAddressOrName } from '../common/utils';
 
-export async function selectAndPersistNewAccount (newAccount: EntropyConfigAccount) {
-  const storedConfig = await config.get()
+export async function selectAndPersistNewAccount (configPath: string, newAccount: EntropyConfigAccount) {
+  const storedConfig = await config.get(configPath)
   const { accounts } = storedConfig
 
   const isExistingName = accounts.find(account => account.name === newAccount.name)
@@ -22,22 +22,25 @@ export async function selectAndPersistNewAccount (newAccount: EntropyConfigAccou
 
   // persist to config, set selectedAccount
   accounts.push(newAccount)
-  await config.set({
+  await config.set(configPath, {
     ...storedConfig,
-    selectedAccount: newAccount.name
+    selectedAccount: newAccount.address
   })
 }
 
-export async function persistVerifyingKeyToAccount (verifyingKey: string, accountNameOrAddress: string) {
-  const storedConfig = await config.get()
+export async function persistVerifyingKeyToAccount (configPath: string, verifyingKey: string, accountNameOrAddress: string) {
+  const storedConfig = await config.get(configPath)
   const { accounts } = storedConfig
 
   const account = findAccountByAddressOrName(accounts, accountNameOrAddress)
   if (!account) throw Error(`Unable to persist verifyingKey "${verifyingKey}" to unknown account "${accountNameOrAddress}"`)
 
   // persist to config, set selectedAccount
   account.data.registration.verifyingKeys.push(verifyingKey)
-  await config.set(storedConfig)
+  await config.set(configPath, {
+    ...storedConfig,
+    selectedAccount: account.name
+  })
 }
 
 function validateSeedInput (seed) {

src/balance/command.ts

@@ -2,7 +2,7 @@ import { Command } from "commander";
 import Entropy from "@entropyxyz/sdk";
 
 import { EntropyBalance } from "./main";
-import { endpointOption, cliWrite } from "../common/utils-cli";
+import { configOption, endpointOption, cliWrite } from "../common/utils-cli";
 import { findAccountByAddressOrName, getTokenDetails, nanoBitsToBits, round } from "../common/utils";
 import { loadEntropyCli } from "../common/load-entropy"
 import * as config from "../config";
@@ -11,17 +11,18 @@ export function entropyBalanceCommand () {
   const balanceCommand = new Command('balance')
   balanceCommand
     .description('Command to retrieive the balance of an account on the Entropy Network')
-    .argument('<account>', [
+    .argument('account <address|name>', [
       'The address an account address whose balance you want to query.',
       'Can also be the human-readable name of one of your accounts'
     ].join(' '))
+    .addOption(configOption())
     .addOption(endpointOption())
     .action(async (account, opts) => {
       const entropy: Entropy = await loadEntropyCli({ account, ...opts })
       const balanceService = new EntropyBalance(entropy, opts.endpoint)
       const { decimals, symbol } = await getTokenDetails(entropy)
 
-      const { accounts } = await config.get()
+      const { accounts } = await config.get(opts.config)
       const address = findAccountByAddressOrName(accounts, account)?.address
 
       const nanoBalance = await balanceService.getBalance(address)

src/balance/interaction.ts

@@ -1,11 +1,13 @@
-import { findAccountByAddressOrName, getTokenDetails, print, round, nanoBitsToBits } from "src/common/utils"
 import { EntropyBalance } from "./main"
+import { findAccountByAddressOrName, getTokenDetails, print, round, nanoBitsToBits } from "../common/utils"
 
-export async function entropyBalance (entropy, endpoint, storedConfig) {
+import { EntropyTuiOptions } from '../types'
+
+export async function entropyBalance (entropy, opts: EntropyTuiOptions, storedConfig) {
   try {
     // grabbing decimals from chain spec as that is the source of truth for the value
     const { decimals, symbol } = await getTokenDetails(entropy)
-    const balanceService = new EntropyBalance(entropy, endpoint)
+    const balanceService = new EntropyBalance(entropy, opts.endpoint)
     const address = findAccountByAddressOrName(storedConfig.accounts, storedConfig.selectedAccount)?.address
     const nanoBalance = await balanceService.getBalance(address)
     const balance = round(nanoBitsToBits(nanoBalance, decimals))

src/cli.ts

@@ -44,15 +44,13 @@ cli
 
     // print entropy help and exit
     cli.help()
-
-    // tuiAction(opts)
-    // NOTE: this doesn't quite work, because -a, -e are not defined as options
-    // and if we do put them in here it gets a bit confusing
   })
 
   // set up config file, run migrations
-  .hook('preAction', async () => {
-    return config.init()
+  .hook('preAction', async (thisCommand, actionCommand) => {
+    const { config: configPath } = actionCommand.opts()
+
+    if (configPath) await config.init(configPath)
   })
 
 cli.parseAsync()

src/common/constants.ts

@@ -1,4 +1,6 @@
+export const ENTROPY_ENDPOINT_DEFAULT = 'wss://testnet.entropy.xyz/'
+
 // ASCII Colors for Logging to Console
 export const ERROR_RED = '\u001b[31m'
 export const SUCCESS_GREEN = '\u001b[32m'
-export const INFO_BLUE = '\u001b[34m'
+export const INFO_BLUE = '\u001b[34m'