Improved config feature

src/commands/account/create.ts

@@ -1,13 +1,16 @@
 import { Flags } from "@oclif/core";
 import chalk from "chalk";
-import { ChainAccount, encrypt } from "../../lib/index.js";
+import { ChainAccount, encrypt, isLocalConfigCheck } from "../../lib/index.js";
 import { AccountData } from "../../types/index.js";
 import inquirer from "inquirer";
 import { SwankyCommand } from "../../lib/swankyCommand.js";
 export class CreateAccount extends SwankyCommand<typeof CreateAccount> {
   static description = "Create a new dev account in config";
 
   static flags = {
+    global: Flags.boolean({
+      description: "Create account globally",
+    }),
     generate: Flags.boolean({
       char: "g",
     }),
@@ -76,8 +79,18 @@ export class CreateAccount extends SwankyCommand<typeof CreateAccount> {
     }
 
     this.swankyConfig.accounts.push(accountData);
+    if(this.swankyConfig.defaultAccount === null) {
+      this.swankyConfig.defaultAccount = accountData.alias;
+    }
 
-    await this.storeConfig();
+    if(flags.global) {
+      await this.storeSystemConfig();
+    }
+    else if(isLocalConfigCheck()) {
+      await this.storeConfig(process.cwd());
+    } else {
+      throw new Error("Cannot store account to config. Please run this command in a swanky project directory");
+    }
 
     this.log(
       `${chalk.greenBright("✔")} Account with alias ${chalk.yellowBright(

src/commands/account/default.ts

@@ -0,0 +1,66 @@
+import { Args, Flags } from "@oclif/core";
+import chalk from "chalk";
+import { AccountData } from "../../types/index.js";
+import inquirer from "inquirer";
+import { SwankyCommand } from "../../lib/swankyCommand.js";
+import { ConfigError } from "../../lib/errors.js";
+import { isLocalConfigCheck } from "../../lib/index.js";
+export class DefaultAccount extends SwankyCommand<typeof DefaultAccount> {
+  static description = "Set default account to use";
+
+  static flags = {
+    global: Flags.boolean({
+      char: "g",
+      description: "Set default account globally",
+    }),
+  }
+
+  static args = {
+    accountAlias: Args.string({
+      name: "accountAlias",
+      required: false,
+      description: "Alias of account to be used as default",
+    }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(DefaultAccount);
+
+    if(args.accountAlias) {
+      const accountData = this.swankyConfig.accounts.find(
+        (account: AccountData) => account.alias === args.accountAlias
+      );
+      if (!accountData) {
+        throw new ConfigError("Provided account alias not found in swanky.config.json");
+      }
+      this.swankyConfig.defaultAccount = accountData.alias;
+    } else {
+      await inquirer.prompt([
+        {
+          type: "list",
+          name: "defaultAccount",
+          message: "Select default account",
+          choices: this.swankyConfig.accounts.map((account: AccountData) => {
+            return {
+              name: `${account.alias} (${account.address})`,
+              value: account.alias,
+            };
+          }),
+        },
+      ]).then((answers) => {
+        this.swankyConfig.defaultAccount = answers.defaultAccount;
+      });
+    }
+
+    if(flags.global) {
+      await this.storeSystemConfig();
+    }
+    else if(isLocalConfigCheck()) {
+      await this.storeConfig(process.cwd());
+    } else {
+      throw new Error("Cannot store account to config. Please run this command in a swanky project directory");
+    }
+
+    console.log(chalk.greenBright(`Default account set to ${chalk.yellowBright(this.swankyConfig.defaultAccount)}`));
+  }
+}

src/commands/account/list.ts

@@ -6,10 +6,30 @@ export class ListAccounts extends SwankyCommand<typeof ListAccounts> {
   static aliases = [`account:ls`];
 
   async run(): Promise<void> {
-    this.log(`${chalk.greenBright("✔")} Stored dev accounts:`);
+    const countOfDevAccounts = this.swankyConfig.accounts.filter((account) => account.isDev).length;
 
-    for (const account of this.swankyConfig.accounts) {
-      this.log(`\t${chalk.yellowBright("Alias: ")} ${account.alias}`);
+    if(countOfDevAccounts !== 0) {
+      this.log(`${chalk.greenBright("✔")} Stored dev accounts:`);
+
+      for (const account of this.swankyConfig.accounts) {
+        if(account.isDev){
+          this.log(`\t${chalk.yellowBright("Alias: ")} ${account.alias}  \
+${chalk.yellowBright("Address: ")} ${account.address} ${this.swankyConfig.defaultAccount === account.alias ? chalk.greenBright("<- Default") : ""}`);
+        }
+      }
+    }
+
+    const countOfProdAccounts = this.swankyConfig.accounts.length - countOfDevAccounts;
+
+    if(countOfProdAccounts !== 0) {
+      this.log(`${chalk.greenBright("✔")} Stored prod accounts:`);
+
+      for (const account of this.swankyConfig.accounts) {
+        if(!account.isDev){
+          this.log(`\t${chalk.yellowBright("Alias: ")} ${account.alias}  \
+${chalk.yellowBright("Address: ")} ${account.address} ${this.swankyConfig.defaultAccount === account.alias ? chalk.greenBright("<- Default") : ""}`);
+        }
+      }
     }
   }
 }

src/commands/check/index.ts

@@ -1,12 +1,13 @@
 import { Listr } from "listr2";
-import { commandStdoutOrNull } from "../../lib/index.js";
+import { commandStdoutOrNull, isLocalConfigCheck } from "../../lib/index.js";
 import { SwankyConfig } from "../../types/index.js";
-import { pathExistsSync, readJSON } from "fs-extra/esm";
+import { pathExistsSync} from "fs-extra/esm";
 import { readFileSync } from "fs";
 import path from "node:path";
 import TOML from "@iarna/toml";
 import semver from "semver";
 import { SwankyCommand } from "../../lib/swankyCommand.js";
+import { FileError } from "../../lib/errors.js";
 
 interface Ctx {
   versions: {
@@ -59,13 +60,21 @@ export default class Check extends SwankyCommand<typeof Check> {
           ctx.versions.tools.cargoContract = await commandStdoutOrNull("cargo contract -V");
         },
       },
+      {
+        title: "Check Swanky Config",
+        task: async (ctx) => {
+          if (this.swankyConfig == undefined){
+            throw new FileError("Swanky config not found")
+          }
+          ctx.swankyConfig = this.swankyConfig;
+        }
+      },
       {
         title: "Read ink dependencies",
+        enabled: isLocalConfigCheck(),
+        skip: (ctx) => ctx.swankyConfig == undefined || Object.keys(ctx.swankyConfig.contracts).length == 0,
         task: async (ctx) => {
-          const swankyConfig = await readJSON("swanky.config.json");
-          ctx.swankyConfig = swankyConfig;
-
-          for (const contract in swankyConfig.contracts) {
+          for (const contract in ctx.swankyConfig!.contracts) {
             const tomlPath = path.resolve(`contracts/${contract}/Cargo.toml`);
             const doesCargoTomlExist = pathExistsSync(tomlPath);
             if (!doesCargoTomlExist) {
@@ -90,6 +99,8 @@ export default class Check extends SwankyCommand<typeof Check> {
       },
       {
         title: "Verify ink version",
+        enabled: isLocalConfigCheck(),
+        skip: (ctx) => ctx.swankyConfig == undefined || Object.keys(ctx.swankyConfig.contracts).length == 0,
         task: async (ctx) => {
           const supportedInk = ctx.swankyConfig?.node.supportedInk;
 

src/commands/contract/deploy.ts

@@ -1,21 +1,20 @@
 import { Args, Flags } from "@oclif/core";
-import path from "node:path";
-import { writeJSON } from "fs-extra/esm";
 import { cryptoWaitReady } from "@polkadot/util-crypto/crypto";
-import { resolveNetworkUrl, ChainApi, ChainAccount, decrypt, AbiType } from "../../lib/index.js";
+import { resolveNetworkUrl, ChainApi, ChainAccount, decrypt, AbiType, ensureAccountIsSet } from "../../lib/index.js";
 import { AccountData, Encrypted } from "../../types/index.js";
 import inquirer from "inquirer";
 import chalk from "chalk";
 import { Contract } from "../../lib/contract.js";
 import { SwankyCommand } from "../../lib/swankyCommand.js";
 import { ApiError, ConfigError, FileError } from "../../lib/errors.js";
+import { DEFAULT_ACCOUNT } from "../../lib/consts.js";
 
 export class DeployContract extends SwankyCommand<typeof DeployContract> {
   static description = "Deploy contract to a running node";
 
   static flags = {
     account: Flags.string({
-      required: true,
+      default: DEFAULT_ACCOUNT,
       description: "Alias of account to be used",
     }),
     gas: Flags.integer({
@@ -32,6 +31,7 @@ export class DeployContract extends SwankyCommand<typeof DeployContract> {
     }),
     network: Flags.string({
       char: "n",
+      default: "local",
       description: "Network name to connect to",
     }),
   };
@@ -47,6 +47,8 @@ export class DeployContract extends SwankyCommand<typeof DeployContract> {
   async run(): Promise<void> {
     const { args, flags } = await this.parse(DeployContract);
 
+    console.log("flags", flags);
+
     const contractRecord = this.swankyConfig.contracts[args.contractName];
     if (!contractRecord) {
       throw new ConfigError(
@@ -70,13 +72,29 @@ export class DeployContract extends SwankyCommand<typeof DeployContract> {
       );
     }
 
+    ensureAccountIsSet(flags.account, this.swankyConfig);
+
+    const accountAlias = flags.account ?? this.swankyConfig.defaultAccount;
+
     const accountData = this.swankyConfig.accounts.find(
-      (account: AccountData) => account.alias === flags.account
+      (account: AccountData) => account.alias === accountAlias
     );
     if (!accountData) {
       throw new ConfigError("Provided account alias not found in swanky.config.json");
     }
 
+    if (accountData.isDev && flags.network !== "local") {
+      throw new ConfigError(
+        `Account ${accountAlias} is a DEV account and can only be used with local network`
+      );
+    }
+
+    if(this.swankyConfig.defaultAccount === null)
+    {
+      this.swankyConfig.defaultAccount = accountAlias;
+      await this.storeSystemConfig();
+    }
+
     const mnemonic = accountData.isDev
       ? (accountData.mnemonic as string)
       : decrypt(
@@ -138,9 +156,7 @@ export class DeployContract extends SwankyCommand<typeof DeployContract> {
         },
       ];
 
-      await writeJSON(path.resolve("swanky.config.json"), this.swankyConfig, {
-        spaces: 2,
-      });
+      await this.storeConfig(process.cwd());
     }, "Writing config");
 
     this.log(`Contract deployed!`);

src/commands/contract/new.ts

@@ -1,6 +1,6 @@
 import { Args, Flags } from "@oclif/core";
 import path from "node:path";
-import { ensureDir, pathExists, writeJSON } from "fs-extra/esm";
+import { ensureDir, pathExists } from "fs-extra/esm";
 import {
   checkCliDependencies,
   copyContractTemplateFiles,
@@ -102,8 +102,7 @@ export class NewContract extends SwankyCommand<typeof NewContract> {
         deployments: [],
       };
 
-      await writeJSON(path.resolve("swanky.config.json"), this.swankyConfig, { spaces: 2 });
-    }, "Writing config");
+      await this.storeConfig(process.cwd())}, "Writing config");
 
     this.log("😎 New contract successfully generated! 😎");
   }