cleaning up the cleanup for accounts restructure;

src/account/interaction.ts

@@ -1,35 +1,40 @@
 import inquirer from "inquirer";
 import { EntropyAccount } from './main'
 import { print } from "src/common/utils"
+import * as config from '../config'
 
 import { 
   manageAccountsQuestions,
   newAccountQuestions,
   registerAccount,
   selectAccountQuestions
 } from "./utils";
-
-
-export async function entropyAccountCreate (entropy, endpoint) {
-  const { name, path } = await inquirer.prompt(newAccountQuestions)
-
-  const service = new EntropyAccount(entropy, endpoint)
-  const account = await service.create({ name, path })
-
-  print(({
-    name: account.name,
-    address: account.address
-  }))
-}
-
-export async function entropyAccountCreate (entropy, endpoint) {
-  const { name, path } = await inquirer.prompt(newAccountQuestions)
-
-  const service = new EntropyAccount(entropy, endpoint)
-  const account = await service.create({ name, path })
-
-  print(({
-    name: account.name,
-    address: account.address
-  }))
+import Entropy from "@entropyxyz/sdk";
+import { EntropyConfig } from "src/config/types";
+
+export async function entropyManageAccounts (entropy: Entropy, endpoint: string, storedConfig: EntropyConfig) {
+  const AccountService = new EntropyAccount(entropy, endpoint)
+  const { interactionChoice } = await inquirer.prompt(manageAccountsQuestions)
+  switch (interactionChoice) {
+    case 'create-import': {
+      let { seed, name, path, importKey } = await inquirer.prompt(newAccountQuestions)
+      if (importKey && secret.includes('#debug')) {
+        // isDebugMode = true
+        seed = secret.split('#debug')[0]
+      } else {
+        seed = importKey ? secret : randomAsHex(32)
+      }
+
+    }
+    case 'list-account': {
+
+    }
+    case 'select-account': {
+
+    }
+    case 'exit': {
+
+    }
+  }
+  return { accounts: responses.accounts ? responses.accounts : storedConfig.accounts, selectedAccount: responses.selectedAccount || storedConfig.selectedAccount }
 }

src/account/main.ts

@@ -3,20 +3,19 @@ import Entropy from "@entropyxyz/sdk";
 import Keyring from '@entropyxyz/sdk/keys'
 import { randomAsHex } from '@polkadot/util-crypto'
 
-import { BaseCommand } from "../common/base-command";
+import { EntropyBase } from "../common/entropy-base";
 import { print, updateConfig } from "../common/utils";
 import { EntropyAccountConfig, EntropyConfig } from "../config/types";
 import { FLOW_CONTEXT } from "./constants";
 import { AccountCreateParams, AccountListResults } from "./types";
 
-export class EntropyAccount extends BaseCommand {
+export class EntropyAccount extends EntropyBase {
   // NOTE: this class is different - it doesn't need an entropy instance
   constructor (entropy: Entropy | null, endpoint: string) {
     super(entropy, endpoint, FLOW_CONTEXT)
   }
 
-  async create ({ name, path }: AccountCreateParams): Promise<EntropyAccountConfig> {
-    const seed = randomAsHex(32)
+  async create ({ seed = randomAsHex(32), name, path }: AccountCreateParams): Promise<EntropyAccountConfig> {
     const keyring = new Keyring({ seed, path, debug: true })
     const fullAccount = keyring.getAccount()
     // TODO: sdk should create account on constructor
@@ -40,7 +39,7 @@ export class EntropyAccount extends BaseCommand {
       : []
     if (!accountsArray.length)
       throw new Error(
-        'There are currently no accounts available, please create or import a new account'
+        'Accounts Error: There are currently no accounts available, please create or import a new account'
       )
     return formatAccountsList(accountsArray)
   }

src/account/types.ts

@@ -1,5 +1,6 @@
 export interface AccountCreateParams {
   name: string
+  seed: string
   path?: string
 }
 

src/balance/command.ts

@@ -1,5 +1,5 @@
 import Entropy from "@entropyxyz/sdk"
-import { BaseCommand } from "../common/base-command"
+import { BaseCommand } from "../common/entropy-base"
 import * as BalanceUtils from "./utils"
 
 const FLOW_CONTEXT = 'ENTROPY-BALANCE'

src/common/base-command.ts → src/common/entropy-base.ts

@@ -1,7 +1,7 @@
 import Entropy from "@entropyxyz/sdk";
 import { EntropyLogger } from "./logger";
 
-export abstract class BaseCommand {
+export abstract class EntropyBase {
   protected logger: EntropyLogger
   protected entropy: Entropy
 

src/transfer/command.ts

@@ -1,5 +1,5 @@
 import Entropy from "@entropyxyz/sdk";
-import { BaseCommand } from "../common/base-command";
+import { BaseCommand } from "../common/entropy-base";
 import { setupProgress } from "../common/progress";
 import * as TransferUtils from './utils'
 import inquirer from "inquirer";