From 0e26da74126250981c27679b7b9e71c208a92b68 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Fri, 24 Mar 2023 15:06:28 +0200
Subject: [PATCH 01/46] cleanup

---
 packages/cli/src/commands/contract/compile.ts | 13 +++++++------
 packages/cli/src/commands/contract/test.ts    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/commands/contract/compile.ts b/packages/cli/src/commands/contract/compile.ts
index c8e6835c..ef75a6e8 100644
--- a/packages/cli/src/commands/contract/compile.ts
+++ b/packages/cli/src/commands/contract/compile.ts
@@ -9,7 +9,7 @@ import {
   Spinner,
   generateTypesFor,
 } from "@astar-network/swanky-core";
-import { writeJSON, readdirSync, existsSync } from "fs-extra";
+import { writeJSON, existsSync } from "fs-extra";
 
 export class CompileContract extends Command {
   static description = "Compile the smart contract(s) in your contracts directory";
@@ -23,13 +23,14 @@ export class CompileContract extends Command {
     release: Flags.boolean({
       default: false,
       char: "r",
-      description: "A production contract should always be build in `release` mode for building optimized wasm"
+      description:
+        "A production contract should always be build in `release` mode for building optimized wasm",
     }),
     all: Flags.boolean({
       default: false,
       char: "a",
-      description: "Set all to true to compile all contracts"
-    })
+      description: "Set all to true to compile all contracts",
+    }),
   };
 
   static args = {
@@ -45,7 +46,7 @@ export class CompileContract extends Command {
     const { args, flags } = await this.parse(CompileContract);
 
     if (args.contractName === undefined && !flags.all) {
-      this.error("No contracts were selected to compile")
+      this.error("No contracts were selected to compile");
     }
 
     await ensureSwankyProject();
@@ -90,7 +91,7 @@ export class CompileContract extends Command {
           });
         },
         `Compiling ${contractName} contract`,
-        `${contractName} Contract compiled successfully`,
+        `${contractName} Contract compiled successfully`
       );
 
       await spinner.runCommand(
diff --git a/packages/cli/src/commands/contract/test.ts b/packages/cli/src/commands/contract/test.ts
index 25e47a77..8ed0ee2f 100644
--- a/packages/cli/src/commands/contract/test.ts
+++ b/packages/cli/src/commands/contract/test.ts
@@ -4,7 +4,7 @@ import path = require("node:path");
 import { ensureSwankyProject, getSwankyConfig } from "@astar-network/swanky-core";
 import globby from "globby";
 import Mocha from "mocha";
-import { ensureDir, readdirSync } from "fs-extra";
+import { ensureDir } from "fs-extra";
 import * as shell from "shelljs";
 
 declare global {

From 0189647ccc21cc57130c015085241866fa110678 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 27 Mar 2023 10:42:01 +0300
Subject: [PATCH 02/46] remove timestamp from compile step

---
 packages/core/src/lib/command-utils.ts | 104 +++++++++++++------------
 1 file changed, 56 insertions(+), 48 deletions(-)

diff --git a/packages/core/src/lib/command-utils.ts b/packages/core/src/lib/command-utils.ts
index d1c5c1eb..3934049e 100644
--- a/packages/core/src/lib/command-utils.ts
+++ b/packages/core/src/lib/command-utils.ts
@@ -48,17 +48,14 @@ export function resolveNetworkUrl(config: SwankyConfig, networkName: string): st
 export function getBuildCommandFor(
   language: ContractData["language"],
   contractPath: string,
-  release: boolean,
-) : ChildProcessWithoutNullStreams {
+  release: boolean
+): ChildProcessWithoutNullStreams {
   if (language === "ink") {
-    const args = ["contract", "build", "--manifest-path", `${contractPath}/Cargo.toml`]
+    const args = ["contract", "build", "--manifest-path", `${contractPath}/Cargo.toml`];
     if (release) {
-      args.push("--release")
+      args.push("--release");
     }
-    return spawn(
-      "cargo",
-      args
-    )
+    return spawn("cargo", args);
   }
   if (language === "ask") {
     const args = ["asc", "--config", `${contractPath}/asconfig.json`, `${contractPath}/index.ts`];
@@ -66,11 +63,9 @@ export function getBuildCommandFor(
       args.push("-O");
       args.push("--noAssert");
     }
-    return spawn(
-      "npx",
-      args,
-      { env: { ...process.env, ASK_CONFIG: `${contractPath}/askconfig.json` } }
-    );
+    return spawn("npx", args, {
+      env: { ...process.env, ASK_CONFIG: `${contractPath}/askconfig.json` },
+    });
   }
   throw new Error("Unsupported language!");
 }
@@ -85,54 +80,59 @@ export async function generateTypesFor(
     await Promise.all([
       fs.copyFile(
         path.resolve(contractPath, "target", "ink", `${contractName}.contract`),
-        path.resolve(ARTIFACTS_PATH, `${contractName}.contract`),
+        path.resolve(ARTIFACTS_PATH, `${contractName}.contract`)
       ),
       fs.copyFile(
         path.resolve(contractPath, "target", "ink", `${contractName}.json`),
-        path.resolve(ARTIFACTS_PATH, `${contractName}.json`),
-      )
-    ])
+        path.resolve(ARTIFACTS_PATH, `${contractName}.json`)
+      ),
+    ]);
   } else if (language === "ask") {
     await Promise.all([
       fs.copyFile(
         path.resolve(contractPath, "build", `${contractName}.wasm`),
-        path.resolve(ARTIFACTS_PATH, `${contractName}.wasm`),
+        path.resolve(ARTIFACTS_PATH, `${contractName}.wasm`)
       ),
       fs.copyFile(
         path.resolve(contractPath, "build", "metadata.json"),
-        path.resolve(ARTIFACTS_PATH, `${contractName}.json`),
+        path.resolve(ARTIFACTS_PATH, `${contractName}.json`)
       ),
-    ])
+    ]);
 
     // Ask! build artifacts don't have `.contract` file which is just an combination of abi json and wasm blob
     // `.contract` will have .source.wasm field whose value is wasm blob hex representation.
     // If Ask! officially support .contract file, no need for this step.
-    const contract = JSON.parse(Files.readFileSync(path.resolve(ARTIFACTS_PATH, `${contractName}.json`)).toString());
+    const contract = JSON.parse(
+      Files.readFileSync(path.resolve(ARTIFACTS_PATH, `${contractName}.json`)).toString()
+    );
     const wasmBuf = Files.readFileSync(path.resolve(contractPath, "build", `${contractName}.wasm`));
-    const prefix = "0x"
+    const prefix = "0x";
     contract.source.wasm = prefix + wasmBuf.toString("hex");
-    fs.writeFileSync(path.resolve(ARTIFACTS_PATH, `${contractName}.contract`), JSON.stringify(contract));
+    fs.writeFileSync(
+      path.resolve(ARTIFACTS_PATH, `${contractName}.contract`),
+      JSON.stringify(contract)
+    );
     fs.remove(path.resolve(ARTIFACTS_PATH, `${contractName}.wasm`));
   } else {
     throw new Error("Unsupported language!");
   }
 
-  await generateTypes(ARTIFACTS_PATH, TYPED_CONTRACT_PATH)
+  await generateTypes(ARTIFACTS_PATH, TYPED_CONTRACT_PATH);
 }
 
-export async function moveArtifacts(
-  contractName: string,
-): Promise<BuildData> {
+export async function moveArtifacts(contractName: string): Promise<BuildData> {
+  const contractArtifactsPath = path.resolve(ARTIFACTS_PATH, contractName);
+
+  // emptyDir also creates the directory if it doesn't exist
+  await fs.emptyDir(contractArtifactsPath);
+
   const ts = Date.now();
-  const fullPath = path.resolve(ARTIFACTS_PATH, contractName, ts.toString());
-  const relativePath = path.relative(path.resolve(), fullPath);
+  const relativePath = path.relative(path.resolve(), contractArtifactsPath);
   const buildData = {
-    timestamp: ts,
     artifactsPath: relativePath,
+    timestamp: ts,
   };
 
-  await fs.ensureDir(buildData.artifactsPath);
-
   // copy artifacts/contract_name.contract and .json to artifactsPath .contract and .json
   try {
     await Promise.all([
@@ -147,9 +147,9 @@ export async function moveArtifacts(
     ]);
     // move both to test/contract_name/artifacts
     const testArtifacts = path.resolve("test", contractName, "artifacts");
-    const testTypedContracts = path.resolve("test", contractName, "typedContract")
+    const testTypedContracts = path.resolve("test", contractName, "typedContract");
     await fs.ensureDir(testArtifacts);
-    await fs.ensureDir(testTypedContracts)
+    await fs.ensureDir(testTypedContracts);
     await Promise.all([
       fs.move(
         path.resolve(ARTIFACTS_PATH, `${contractName}.contract`),
@@ -173,7 +173,7 @@ export async function moveArtifacts(
 }
 
 export async function printContractInfo(metadataPath: string) {
-  const abi = new Abi((await fs.readJson(metadataPath)));
+  const abi = new Abi(await fs.readJson(metadataPath));
 
   // TODO: Use templating, colorize.
 
@@ -183,34 +183,42 @@ export async function printContractInfo(metadataPath: string) {
     Hash: ${abi.info.source.hash}
     Language: ${abi.info.source.language}
     Compiler: ${abi.info.source.compiler}
-  `)
+  `);
 
-  console.log(`    === Constructors ===\n`)
+  console.log(`    === Constructors ===\n`);
   for (const constructor of abi.constructors) {
     console.log(`    * ${constructor.method}:
-        Args: ${constructor.args.length > 0 ? constructor.args.map((arg) => {
-          return `\n        - ${arg.name} (${arg.type.displayName})`
-        }) : "None"}
+        Args: ${
+          constructor.args.length > 0
+            ? constructor.args.map((arg) => {
+                return `\n        - ${arg.name} (${arg.type.displayName})`;
+              })
+            : "None"
+        }
         Description: ${constructor.docs.map((line) => {
           if (line != "") {
-            return `\n         ` + line
+            return `\n         ` + line;
           }
         })}
-    `)
+    `);
   }
 
-  console.log(`    === Messages ===\n`)
+  console.log(`    === Messages ===\n`);
   for (const message of abi.messages) {
     console.log(`    * ${message.method}:
         Payable: ${message.isPayable}
-        Args: ${message.args.length > 0 ? message.args.map((arg) => {
-          return `\n        - ${arg.name} (${arg.type.displayName})`
-        }) : "None"}
+        Args: ${
+          message.args.length > 0
+            ? message.args.map((arg) => {
+                return `\n        - ${arg.name} (${arg.type.displayName})`;
+              })
+            : "None"
+        }
         Description: ${message.docs.map((line) => {
           if (line != "") {
-            return `\n         ` + line
+            return `\n         ` + line;
           }
         })}
-    `)
+    `);
   }
 }

From 37644c7b1f635f73b91bca42058367524d7699e9 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 27 Mar 2023 15:32:08 +0300
Subject: [PATCH 03/46] cleanup

---
 packages/core/src/lib/command-utils.ts | 3 +--
 packages/core/src/lib/tasks.ts         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/lib/command-utils.ts b/packages/core/src/lib/command-utils.ts
index 3934049e..ebd9843f 100644
--- a/packages/core/src/lib/command-utils.ts
+++ b/packages/core/src/lib/command-utils.ts
@@ -126,11 +126,10 @@ export async function moveArtifacts(contractName: string): Promise<BuildData> {
   // emptyDir also creates the directory if it doesn't exist
   await fs.emptyDir(contractArtifactsPath);
 
-  const ts = Date.now();
   const relativePath = path.relative(path.resolve(), contractArtifactsPath);
   const buildData = {
     artifactsPath: relativePath,
-    timestamp: ts,
+    timestamp: Date.now(),
   };
 
   // copy artifacts/contract_name.contract and .json to artifactsPath .contract and .json
diff --git a/packages/core/src/lib/tasks.ts b/packages/core/src/lib/tasks.ts
index 279527d6..d1bf33a4 100644
--- a/packages/core/src/lib/tasks.ts
+++ b/packages/core/src/lib/tasks.ts
@@ -1,5 +1,5 @@
 import execa from "execa";
-import { ensureDir, rename, copy, readFile, rm, writeFile, remove, pathExists } from "fs-extra";
+import { ensureDir, rename, copy, readFile, rm, writeFile, remove } from "fs-extra";
 import path from "node:path";
 import globby from "globby";
 import handlebars from "handlebars";

From efe26019f7a85a5257ce55b07c38d7247024c5fc Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 27 Mar 2023 15:32:23 +0300
Subject: [PATCH 04/46] remove timestamp from test report path

---
 packages/cli/src/commands/contract/test.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/commands/contract/test.ts b/packages/cli/src/commands/contract/test.ts
index 8ed0ee2f..61783c1b 100644
--- a/packages/cli/src/commands/contract/test.ts
+++ b/packages/cli/src/commands/contract/test.ts
@@ -4,7 +4,7 @@ import path = require("node:path");
 import { ensureSwankyProject, getSwankyConfig } from "@astar-network/swanky-core";
 import globby from "globby";
 import Mocha from "mocha";
-import { ensureDir } from "fs-extra";
+import { emptyDir } from "fs-extra";
 import * as shell from "shelljs";
 
 declare global {
@@ -59,13 +59,8 @@ export class TestContract extends Command {
       }
       const buildData = contractInfo.build;
 
-      const reportDir = path.resolve(
-        projectDir,
-        buildData.artifactsPath,
-        "testReports",
-        Date.now().toString()
-      );
-      await ensureDir(reportDir);
+      const reportDir = path.resolve(projectDir, buildData.artifactsPath, "testReports");
+      await emptyDir(reportDir);
 
       const mocha = new Mocha({
         timeout: 200000,

From aa5736de38b28f2bf85d0fe6ba97dc5d309ead7e Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 3 Apr 2023 09:37:20 +0300
Subject: [PATCH 05/46] init inherit BaseCommand

---
 packages/cli/src/commands/contract/explain.ts | 4 ++--
 packages/cli/src/commands/init/index.ts       | 7 ++++---
 packages/cli/src/lib/baseCommand.ts           | 4 ++--
 packages/cli/src/lib/contractCall.ts          | 4 +---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/commands/contract/explain.ts b/packages/cli/src/commands/contract/explain.ts
index 00045578..8f4f598f 100644
--- a/packages/cli/src/commands/contract/explain.ts
+++ b/packages/cli/src/commands/contract/explain.ts
@@ -5,8 +5,8 @@ import { readdirSync } from "node:fs";
 import { printContractInfo } from "@astar-network/swanky-core";
 import { Args } from "@oclif/core";
 
-export class ExplainContract extends BaseCommand<typeof ExplainContract> {
-  static description = "Explain contract messages based on thier metadata";
+export class ExplainContract extends BaseCommand {
+  static description = "Explain contract messages based on the contracts' metadata";
 
   static args = {
     contractName: Args.string({
diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 5e9b9336..371749ce 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -1,4 +1,4 @@
-import { Args, Command, Flags } from "@oclif/core";
+import { Args, Flags } from "@oclif/core";
 import path = require("node:path");
 import { ensureDir, writeJSON } from "fs-extra";
 import execa = require("execa");
@@ -18,13 +18,14 @@ import {
   swankyNode,
 } from "@astar-network/swanky-core";
 import { getAllTemplateNames, getTemplates } from "@astar-network/swanky-templates";
+import { BaseCommand } from "../../lib/baseCommand";
 const {
   DEFAULT_ASTAR_NETWORK_URL,
   DEFAULT_NETWORK_URL,
   DEFAULT_SHIBUYA_NETWORK_URL,
   DEFAULT_SHIDEN_NETWORK_URL,
 } = consts;
-export class Init extends Command {
+export class Init extends BaseCommand {
   static description = "Generate a new smart contract environment";
 
   static flags = {
@@ -34,7 +35,7 @@ export class Init extends Command {
       char: "t",
     }),
     language: Flags.string({ options: ["ask", "ink"], char: "l" }),
-    verbose: Flags.boolean({ char: "v" }),
+    convert: Flags.boolean(),
   };
 
   static args = {
diff --git a/packages/cli/src/lib/baseCommand.ts b/packages/cli/src/lib/baseCommand.ts
index c83aa258..f059f7d5 100644
--- a/packages/cli/src/lib/baseCommand.ts
+++ b/packages/cli/src/lib/baseCommand.ts
@@ -1,7 +1,7 @@
-import { Command, Flags, Interfaces } from "@oclif/core";
+import { Command, Flags } from "@oclif/core";
 import { getSwankyConfig, Spinner, SwankyConfig } from "@astar-network/swanky-core";
 
-export abstract class BaseCommand<T extends typeof Command> extends Command {
+export abstract class BaseCommand extends Command {
   protected spinner!: Spinner;
   protected swankyConfig!: SwankyConfig;
 
diff --git a/packages/cli/src/lib/contractCall.ts b/packages/cli/src/lib/contractCall.ts
index d5796fa3..a21a91bb 100644
--- a/packages/cli/src/lib/contractCall.ts
+++ b/packages/cli/src/lib/contractCall.ts
@@ -21,9 +21,7 @@ export type JoinedFlagsType<T extends typeof Command> = Interfaces.InferredFlags
   typeof BaseCommand["baseFlags"] & typeof ContractCall["baseFlags"] & T["flags"]
 >;
 
-export abstract class ContractCall<T extends typeof Command> extends BaseCommand<
-  typeof ContractCall
-> {
+export abstract class ContractCall<T extends typeof Command> extends BaseCommand {
   static callArgs = {
     contractName: Args.string({
       name: "Contract name",

From 69fafb28534c537327fd2b71f89b30e4b8d32c13 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 3 Apr 2023 11:06:28 +0300
Subject: [PATCH 06/46] add NO_CONFIG_COMMANDS list

---
 packages/cli/src/lib/baseCommand.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/lib/baseCommand.ts b/packages/cli/src/lib/baseCommand.ts
index f059f7d5..4366bf86 100644
--- a/packages/cli/src/lib/baseCommand.ts
+++ b/packages/cli/src/lib/baseCommand.ts
@@ -4,12 +4,21 @@ import { getSwankyConfig, Spinner, SwankyConfig } from "@astar-network/swanky-co
 export abstract class BaseCommand extends Command {
   protected spinner!: Spinner;
   protected swankyConfig!: SwankyConfig;
-
+  static NO_CONFIG_COMMANDS = ["Init"];
   public async init(): Promise<void> {
     await super.init();
     this.spinner = new Spinner();
 
-    this.swankyConfig = await getSwankyConfig();
+    try {
+      this.swankyConfig = await getSwankyConfig();
+    } catch (error) {
+      if (
+        error instanceof Error &&
+        error.message.includes("swanky.config.json") &&
+        !BaseCommand.NO_CONFIG_COMMANDS.includes(this.constructor.name)
+      )
+        throw error;
+    }
   }
 
   protected async catch(err: Error & { exitCode?: number }): Promise<any> {

From 2a482c4142261b5353adb34a27ca21578efc2245 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 3 Apr 2023 11:06:38 +0300
Subject: [PATCH 07/46] take a path for convert

---
 packages/cli/src/commands/init/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 371749ce..439b1860 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -35,7 +35,10 @@ export class Init extends BaseCommand {
       char: "t",
     }),
     language: Flags.string({ options: ["ask", "ink"], char: "l" }),
-    convert: Flags.boolean(),
+    convert: Flags.string({
+      char: "c",
+      description: "Converts an existing smart contract into a Swanky project",
+    }),
   };
 
   static args = {

From c36253ba3753b2b4ea44895e5a64458a08e99180 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 3 Apr 2023 11:24:30 +0300
Subject: [PATCH 08/46] add project dir check if empty

---
 packages/cli/src/commands/init/index.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 439b1860..bcabd31d 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -1,6 +1,6 @@
 import { Args, Flags } from "@oclif/core";
 import path = require("node:path");
-import { ensureDir, writeJSON } from "fs-extra";
+import { ensureDir, writeJSON, stat, readdir } from "fs-extra";
 import execa = require("execa");
 import { paramCase, pascalCase, snakeCase } from "change-case";
 import inquirer = require("inquirer");
@@ -54,6 +54,17 @@ export class Init extends BaseCommand {
 
     const projectPath = path.resolve(args.projectName);
 
+    try {
+      const pathStat = await stat(projectPath);
+
+      if (pathStat.isDirectory()) {
+        const files = await readdir(projectPath);
+        if (files.length > 0) throw new Error(`Directory ${args.projectName} is not empty!`);
+      }
+    } catch (error: unknown) {
+      if (error instanceof Error && !error.message.includes("ENOENT")) throw error;
+    }
+
     const { contractLanguage } = await inquirer.prompt([pickLanguage()]);
 
     const templates = getTemplates(contractLanguage);

From 9f9582baff1325ef29683ce402df4ea1039c9de0 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:14:32 +0300
Subject: [PATCH 09/46] introduce task queue, extract generate

---
 packages/cli/src/commands/init/index.ts | 249 +++++++++++++++---------
 1 file changed, 157 insertions(+), 92 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index bcabd31d..eb4eaaa4 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -14,7 +14,6 @@ import {
   processTemplates,
   SwankyConfig,
   consts,
-  Spinner,
   swankyNode,
 } from "@astar-network/swanky-core";
 import { getAllTemplateNames, getTemplates } from "@astar-network/swanky-templates";
@@ -25,6 +24,18 @@ const {
   DEFAULT_SHIBUYA_NETWORK_URL,
   DEFAULT_SHIDEN_NETWORK_URL,
 } = consts;
+
+type TaskFunction = (...args: any[]) => any;
+
+interface Task {
+  task: TaskFunction;
+  args: any[];
+  runningMessage: string;
+  successMessage?: string;
+  failMessage?: string;
+  shouldExitOnError?: boolean;
+  callback?: (param: string) => void;
+}
 export class Init extends BaseCommand {
   static description = "Generate a new smart contract environment";
 
@@ -49,22 +60,129 @@ export class Init extends BaseCommand {
     }),
   };
 
+  projectPath = "";
+
+  configBuilder: Partial<SwankyConfig> = {
+    node: {
+      localPath: "",
+      polkadotPalletVersions: swankyNode.polkadotPalletVersions,
+      supportedInk: swankyNode.supportedInk,
+    },
+    accounts: [
+      {
+        alias: "alice",
+        mnemonic: "//Alice",
+        isDev: true,
+        address: new ChainAccount("//Alice").pair.address,
+      },
+      {
+        alias: "bob",
+        mnemonic: "//Bob",
+        isDev: true,
+        address: new ChainAccount("//Bob").pair.address,
+      },
+    ],
+    networks: {
+      local: { url: DEFAULT_NETWORK_URL },
+      astar: { url: DEFAULT_ASTAR_NETWORK_URL },
+      shiden: { url: DEFAULT_SHIDEN_NETWORK_URL },
+      shibuya: { url: DEFAULT_SHIBUYA_NETWORK_URL },
+    },
+  };
+
+  taskQueue: Task[] = [];
+
   async run(): Promise<void> {
     const { args, flags } = await this.parse(Init);
 
-    const projectPath = path.resolve(args.projectName);
+    this.projectPath = path.resolve(args.projectName);
 
+    // check if projectPath dir exists and is it empty
     try {
-      const pathStat = await stat(projectPath);
-
+      const pathStat = await stat(this.projectPath);
       if (pathStat.isDirectory()) {
-        const files = await readdir(projectPath);
+        const files = await readdir(this.projectPath);
         if (files.length > 0) throw new Error(`Directory ${args.projectName} is not empty!`);
       }
     } catch (error: unknown) {
-      if (error instanceof Error && !error.message.includes("ENOENT")) throw error;
+      // ignore if it doesn't exist, it will be created
+      if (!(error instanceof Error) || !error.message.includes("ENOENT")) throw error;
+    }
+
+    if (flags.convert) {
+      await this.convert(flags.convert);
+    } else {
+      await this.generate(args.projectName);
     }
 
+    this.taskQueue.push({
+      task: installDeps,
+      args: [this.projectPath],
+      runningMessage: "Installing dependencies",
+      shouldExitOnError: false,
+    });
+
+    this.taskQueue.push({
+      task: execa.command,
+      args: ["git init", { cwd: this.projectPath }],
+      runningMessage: "Initializing git",
+    });
+
+    if (!flags["swanky-node"]) {
+      const { useSwankyNode } = await inquirer.prompt([
+        choice("useSwankyNode", "Do you want to download Swanky node?"),
+      ]);
+      if (useSwankyNode) {
+        this.taskQueue.push({
+          task: downloadNode,
+          args: [this.projectPath, swankyNode, this.spinner],
+          runningMessage: "Downloading Swanky node",
+          callback: (result) =>
+            this.configBuilder.node ? (this.configBuilder.node.localPath = result) : null,
+        });
+      }
+    }
+
+    Object.keys(this.configBuilder.contracts as typeof this.swankyConfig.contracts).forEach(
+      async (contractName) => {
+        await ensureDir(path.resolve(this.projectPath, "artifacts", contractName));
+        await ensureDir(path.resolve(this.projectPath, "test", contractName));
+      }
+    );
+
+    this.taskQueue.push({
+      task: () =>
+        writeJSON(path.resolve(this.projectPath, "swanky.config.json"), this.configBuilder, {
+          spaces: 2,
+        }),
+      args: [],
+      runningMessage: "Writing config",
+    });
+
+    for (const {
+      task,
+      args,
+      runningMessage,
+      successMessage,
+      failMessage,
+      shouldExitOnError,
+      callback,
+    } of this.taskQueue) {
+      const result = await this.spinner.runCommand(
+        () => task(...args),
+        runningMessage,
+        successMessage,
+        failMessage,
+        shouldExitOnError
+      );
+      if (result && callback) {
+        callback(result as string);
+      }
+    }
+    this.log("🎉 😎 Swanky project successfully initialised! 😎 🎉");
+  }
+
+  async generate(projectName: string) {
     const { contractLanguage } = await inquirer.prompt([pickLanguage()]);
 
     const templates = getTemplates(contractLanguage);
@@ -80,31 +198,31 @@ export class Init extends BaseCommand {
       email(),
     ];
 
-    if (!flags["swanky-node"]) {
-      questions.push(choice("useSwankyNode", "Do you want to download Swanky node?"));
-    }
-
     const answers = await inquirer.prompt(questions);
 
-    const spinner = new Spinner(flags.verbose);
-
-    await spinner.runCommand(() => checkCliDependencies(spinner), "Checking dependencies");
-
-    await spinner.runCommand(
-      () =>
-        copyTemplateFiles(
-          templates.templatesPath,
-          path.resolve(templates.contractTemplatesPath, answers.contractTemplate),
-          answers.contractName,
-          projectPath
-        ),
-      "Copying template files"
-    );
+    this.taskQueue.push({
+      task: checkCliDependencies,
+      args: [this.spinner],
+      runningMessage: "Checking dependencies",
+    });
+
+    this.taskQueue.push({
+      task: copyTemplateFiles,
+      args: [
+        templates.templatesPath,
+        path.resolve(templates.contractTemplatesPath, answers.contractTemplate),
+        answers.contractName,
+        this.projectPath,
+      ],
+      runningMessage: "Copying template files",
+    });
 
-    await spinner.runCommand(
-      () =>
-        processTemplates(projectPath, {
-          project_name: paramCase(args.projectName),
+    this.taskQueue.push({
+      task: processTemplates,
+      args: [
+        this.projectPath,
+        {
+          project_name: paramCase(projectName),
           author_name: answers.authorName,
           author_email: answers.email,
           swanky_version: this.config.pjson.version,
@@ -112,74 +230,21 @@ export class Init extends BaseCommand {
           contract_name_snake: snakeCase(answers.contractName),
           contract_name_pascal: pascalCase(answers.contractName),
           contract_language: contractLanguage,
-        }),
-      "Processing templates"
-    );
-
-    await spinner.runCommand(
-      () => execa.command("git init", { cwd: projectPath }),
-      "Initializing git"
-    );
-
-    let nodePath = "";
-    if (flags["swanky-node"] || answers.useSwankyNode) {
-      const taskResult = (await spinner.runCommand(
-        () => downloadNode(projectPath, swankyNode, spinner),
-        "Downloading Swanky node"
-      )) as string;
-      nodePath = path.relative(projectPath, taskResult);
-    }
-
-    await ensureDir(path.resolve(projectPath, "artifacts", answers.contractName));
-    await ensureDir(path.resolve(projectPath, "test", answers.contractName));
-
-    await spinner.runCommand(
-      () => installDeps(projectPath),
-      "Installing dependencies",
-      "",
-      "",
-      false
-    );
-
-    const config: SwankyConfig = {
-      node: {
-        localPath: nodePath,
-        polkadotPalletVersions: swankyNode.polkadotPalletVersions,
-        supportedInk: swankyNode.supportedInk,
-      },
-      accounts: [
-        {
-          alias: "alice",
-          mnemonic: "//Alice",
-          isDev: true,
-          address: new ChainAccount("//Alice").pair.address,
-        },
-        {
-          alias: "bob",
-          mnemonic: "//Bob",
-          isDev: true,
-          address: new ChainAccount("//Bob").pair.address,
         },
       ],
-      contracts: {
-        [answers.contractName as string]: {
-          name: answers.contractName as string,
-          deployments: [],
-          language: contractLanguage,
-        },
-      },
-      networks: {
-        local: { url: DEFAULT_NETWORK_URL },
-        astar: { url: DEFAULT_ASTAR_NETWORK_URL },
-        shiden: { url: DEFAULT_SHIDEN_NETWORK_URL },
-        shibuya: { url: DEFAULT_SHIBUYA_NETWORK_URL },
+      runningMessage: "Processing templates",
+    });
+
+    this.configBuilder.contracts = {
+      [answers.contractName as string]: {
+        name: answers.contractName as string,
+        deployments: [],
+        language: contractLanguage,
       },
     };
-    await spinner.runCommand(
-      () => writeJSON(path.resolve(projectPath, "swanky.config.json"), config, { spaces: 2 }),
-      "Writing config"
-    );
+  }
 
-    this.log("🎉 😎 Swanky project successfully initialised! 😎 🎉");
+  async convert(pathToProject: string) {
+    return;
   }
 }

From 3931500cc35c6be89e16dacd3d8033497fb8af7a Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:46:28 +0300
Subject: [PATCH 10/46] move test reports to test directory

---
 packages/cli/src/commands/contract/test.ts | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/packages/cli/src/commands/contract/test.ts b/packages/cli/src/commands/contract/test.ts
index 61783c1b..087ccf44 100644
--- a/packages/cli/src/commands/contract/test.ts
+++ b/packages/cli/src/commands/contract/test.ts
@@ -40,26 +40,17 @@ export class TestContract extends Command {
     await ensureSwankyProject();
     const config = await getSwankyConfig();
 
-    const contractNames = [];
-    if (flags.all) {
-      for (const contractName of Object.keys(config.contracts)) {
-        console.log(`${contractName} contract is found`);
-        contractNames.push(contractName);
-      }
-    } else {
-      contractNames.push(args.contractName);
-    }
+    const contractNames = flags.all ? Object.keys(config.contracts) : args.contractName;
 
-    const projectDir = path.resolve();
     const testDir = path.resolve("test");
     for (const contractName of contractNames) {
+      console.log(`Testing contract: ${contractName}`);
       const contractInfo = config.contracts[contractName];
       if (!contractInfo.build) {
         this.error(`Cannot find build data for ${contractName} contract in swanky.config.json`);
       }
-      const buildData = contractInfo.build;
 
-      const reportDir = path.resolve(projectDir, buildData.artifactsPath, "testReports");
+      const reportDir = path.resolve(testDir, contractInfo.name, "testReports");
       await emptyDir(reportDir);
 
       const mocha = new Mocha({

From 5a6ca70326ab785ccabb41acd23ecc5c7e8df5dd Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:49:31 +0300
Subject: [PATCH 11/46] simplify contract name gathering

---
 packages/cli/src/commands/contract/compile.ts | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/cli/src/commands/contract/compile.ts b/packages/cli/src/commands/contract/compile.ts
index ef75a6e8..355c8e6d 100644
--- a/packages/cli/src/commands/contract/compile.ts
+++ b/packages/cli/src/commands/contract/compile.ts
@@ -52,15 +52,7 @@ export class CompileContract extends Command {
     await ensureSwankyProject();
     const config = await getSwankyConfig();
 
-    const contractNames = [];
-    if (flags.all) {
-      for (const contractName of Object.keys(config.contracts)) {
-        console.log(`${contractName} contract is found`);
-        contractNames.push(contractName);
-      }
-    } else {
-      contractNames.push(args.contractName);
-    }
+    const contractNames = flags.all ? Object.keys(config.contracts) : args.contractName;
 
     const spinner = new Spinner();
 

From 14dcbb3c0203feb76628e088bcff9dbed5cf4d34 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Thu, 13 Apr 2023 12:28:42 +0300
Subject: [PATCH 12/46] detect contracts from workspace in cargo.toml

---
 packages/cli/package.json               |   1 +
 packages/cli/src/commands/init/index.ts |  62 +-
 yarn.lock                               | 758 ++++++++++--------------
 3 files changed, 359 insertions(+), 462 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5c8eeb5d..80e272e5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -32,6 +32,7 @@
     "fs-extra": "10.1.0",
     "globby": "11",
     "inquirer": "8.2.5",
+    "js-toml": "^0.1.1",
     "listr2": "5.0.7",
     "mocha": "10.2.0",
     "mocha-suppress-logs": "0.3.1",
diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index eb4eaaa4..8730e3d3 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -1,9 +1,10 @@
 import { Args, Flags } from "@oclif/core";
 import path = require("node:path");
-import { ensureDir, writeJSON, stat, readdir } from "fs-extra";
+import { ensureDir, writeJSON, stat, readdir, pathExists, readFile } from "fs-extra";
 import execa = require("execa");
 import { paramCase, pascalCase, snakeCase } from "change-case";
 import inquirer = require("inquirer");
+import { load } from "js-toml";
 import { choice, email, name, pickLanguage, pickTemplate } from "../../lib/prompts";
 import {
   checkCliDependencies,
@@ -18,6 +19,7 @@ import {
 } from "@astar-network/swanky-core";
 import { getAllTemplateNames, getTemplates } from "@astar-network/swanky-templates";
 import { BaseCommand } from "../../lib/baseCommand";
+import globby = require("globby");
 const {
   DEFAULT_ASTAR_NETWORK_URL,
   DEFAULT_NETWORK_URL,
@@ -111,6 +113,7 @@ export class Init extends BaseCommand {
 
     if (flags.convert) {
       await this.convert(flags.convert);
+      return;
     } else {
       await this.generate(args.projectName);
     }
@@ -244,7 +247,60 @@ export class Init extends BaseCommand {
     };
   }
 
-  async convert(pathToProject: string) {
-    return;
+  async convert(pathToExistingProject: string) {
+    try {
+      const pathStat = await stat(pathToExistingProject);
+      if (pathStat.isDirectory()) {
+        const files = await readdir(pathToExistingProject);
+        if (files.length < 1)
+          throw new Error(`Target project directory [${pathToExistingProject}] is empty!`);
+      }
+    } catch (error: unknown) {
+      if (error instanceof Error && error.message.includes("ENOENT"))
+        throw new Error(`Target project directory [${pathToExistingProject}] not found!`);
+      throw error;
+    }
+
+    // 2. Look for cargo.toml with "workspace" field in the root
+    const rootToml = await getRootCargoToml(pathToExistingProject);
+    // 3a. Workspace found - use the glob in the "members field" to select directories to copy over
+    // 3b. workspace not found, use regex to find dir/dirs*/[cargo.toml, lib.rs]
+    // 3c. if not found, ask user for a path where contracts are -> [Ctrl+C to cancel]
+    // 4. make a list (checkbox) for user to confirm contracts to copy
+    // 5. add directories from Cargo.toml/exclude path to copy list
+    // 6. look for test/tests directory and add it to the list
+    // 7. copy all the selected directories/files and update the swanky.config
+    // 8. copy cargo.toml from the root, modify path if needed ( "uniswap-v2/contracts/**" -> "contracts/**")
+    // 9. keep log of all the steps and write it to file
+    // 10. Copy rust.toolchain and .rustfmt.toml if exists
   }
 }
+
+async function getRootCargoToml(targetPath: string) {
+  const rootTomlPath = path.resolve(targetPath, "Cargo.toml");
+
+  if (!(await pathExists(rootTomlPath))) return;
+
+  const fileData = await readFile(rootTomlPath, "utf-8");
+  const toml: { workspace?: { members?: string[]; exclude?: string[] } } = load(fileData);
+
+  if (!toml.workspace?.members) return;
+
+  const getGlobPaths = async (globList: string[]) =>
+    globby(
+      globList.map((glob) => path.resolve(targetPath, glob)),
+      {
+        absolute: true,
+        onlyDirectories: true,
+        deep: 1,
+        objectMode: true,
+      }
+    );
+
+  const detectedPaths = {
+    contracts: await getGlobPaths(toml.workspace.members),
+    additionalPaths: toml.workspace.exclude ? await getGlobPaths(toml.workspace.exclude) : [],
+  };
+
+  return detectedPaths;
+}
diff --git a/yarn.lock b/yarn.lock
index f660f39f..fa9956d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23,13 +23,41 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/runtime@^7.20.13", "@babel/runtime@^7.20.6":
+"@babel/runtime-corejs3@^7.16.5":
   version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.21.0.tgz#6e4939d9d9789ff63e2dc58e88f13a3913a24eba"
+  integrity sha512-TDD4UJzos3JJtM+tHX+w2Uc+KWj7GV+VKKFdMVd2Rx8sdA19hcc3P3AHFYd5LVOw+pYuSd5lICC3gm52B6Rwxw==
   dependencies:
+    core-js-pure "^3.25.1"
     regenerator-runtime "^0.13.11"
 
+"@chevrotain/cst-dts-gen@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@chevrotain/cst-dts-gen/-/cst-dts-gen-10.5.0.tgz#922ebd8cc59d97241bb01b1b17561a5c1ae0124e"
+  integrity sha512-lhmC/FyqQ2o7pGK4Om+hzuDrm9rhFYIJ/AXoQBeongmn870Xeb0L6oGEiuR8nohFNL5sMaQEJWCxr1oIVIVXrw==
+  dependencies:
+    "@chevrotain/gast" "10.5.0"
+    "@chevrotain/types" "10.5.0"
+    lodash "4.17.21"
+
+"@chevrotain/gast@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@chevrotain/gast/-/gast-10.5.0.tgz#e4e614bc46d17a8892742f38e56cd33f1f3ad162"
+  integrity sha512-pXdMJ9XeDAbgOWKuD1Fldz4ieCs6+nLNmyVhe2gZVqoO7v8HXuHYs5OV2EzUtbuai37TlOAQHrTDvxMnvMJz3A==
+  dependencies:
+    "@chevrotain/types" "10.5.0"
+    lodash "4.17.21"
+
+"@chevrotain/types@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@chevrotain/types/-/types-10.5.0.tgz#52a97d74a8cfbc197f054636d93ecd8912d33d21"
+  integrity sha512-f1MAia0x/pAVPWH/T73BJVyO2XU5tI4/iE7cnxb7tqdNTNhQI3Uq3XkqcoteTmD4t1aM0LbHCJOhgIDn07kl2A==
+
+"@chevrotain/utils@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@chevrotain/utils/-/utils-10.5.0.tgz#0ee36f65b49b447fbac71b9e5af5c5c6c98ac057"
+  integrity sha512-hBzuU5+JjB2cqNZyszkDHZgOSrUUT8V3dhgRl8Q9Gp6dAj/H5+KILGjbhDpc3Iy9qmqlm/akuOI2ut9VUtzJxQ==
+
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
@@ -1455,100 +1483,91 @@
   dependencies:
     esquery "^1.0.1"
 
-"@polkadot/api-augment@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-augment/-/api-augment-9.14.2.tgz#2c49cdcfdf7057523db1dc8d7b0801391a8a2e69"
-  integrity sha512-19MmW8AHEcLkdcUIo3LLk0eCQgREWqNSxkUyOeWn7UiNMY1AhDOOwMStUBNCvrIDK6VL6GGc1sY7rkPCLMuKSw==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/api-base" "9.14.2"
-    "@polkadot/rpc-augment" "9.14.2"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/types-augment" "9.14.2"
-    "@polkadot/types-codec" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-
-"@polkadot/api-base@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-base/-/api-base-9.14.2.tgz#605b44e3692a125bd8d97eed9cea8af9d0c454e2"
-  integrity sha512-ky9fmzG1Tnrjr/SBZ0aBB21l0TFr+CIyQenQczoUyVgiuxVaI/2Bp6R2SFrHhG28P+PW2/RcYhn2oIAR2Z2fZQ==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/rpc-core" "9.14.2"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/util" "^10.4.2"
+"@polkadot/api-augment@10.0.1", "@polkadot/api-augment@9.14.2":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-augment/-/api-augment-10.0.1.tgz#b8e7766e1d89e3ee753ae053e3edd21ddc0c780c"
+  integrity sha512-VOMkUurEZ/r27Sx5zeGACApm4wLZx5bsxo8sWxaVE1enZvob1JpzGuN12rTlMr0ej4Az8BxvlGbcT3fQYw275Q==
+  dependencies:
+    "@polkadot/api-base" "10.0.1"
+    "@polkadot/rpc-augment" "10.0.1"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/types-augment" "10.0.1"
+    "@polkadot/types-codec" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    tslib "^2.5.0"
+
+"@polkadot/api-base@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-base/-/api-base-10.0.1.tgz#c3f19b5ea483ba642e98724364b58c9e16ba26fe"
+  integrity sha512-yuCgHYQU7Tn32I4sNk5Qb/OwB85ICXCfWja95watbEP6os601IllI6s7JhFx3G4fjvfI94DzewOnOhhBHt+2SA==
+  dependencies:
+    "@polkadot/rpc-core" "10.0.1"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/util" "^11.0.1"
     rxjs "^7.8.0"
+    tslib "^2.5.0"
 
-"@polkadot/api-contract@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-9.14.2.tgz#42ca46eecd6cef64b6c453b452bdb5d22a29b6a3"
-  integrity sha512-gAAHEh+tOIKuAJWxbAuB8Imo+Z8s0FHdICN6/q4JOxBhONJNA9beHB4wmqWSKvYqYmWrJvtv3HensLaITzAcrQ==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/api" "9.14.2"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/types-codec" "9.14.2"
-    "@polkadot/types-create" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-    "@polkadot/util-crypto" "^10.4.2"
+"@polkadot/api-contract@10.0.1", "@polkadot/api-contract@9.14.2":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-10.0.1.tgz#cc2ab107a4d78388ede7cab6018162f16e32cecb"
+  integrity sha512-VLMx3/2eCzuY76ExvEkxeKT0RWS4Fnsn5Shb1YumCWsLNocLO5p/XK6eRU0BaCs+X7zHD1YDF+/5tht/nhuiJA==
+  dependencies:
+    "@polkadot/api" "10.0.1"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/types-codec" "10.0.1"
+    "@polkadot/types-create" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    "@polkadot/util-crypto" "^11.0.1"
     rxjs "^7.8.0"
+    tslib "^2.5.0"
 
-"@polkadot/api-derive@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-9.14.2.tgz#e8fcd4ee3f2b80b9fe34d4dec96169c3bdb4214d"
-  integrity sha512-yw9OXucmeggmFqBTMgza0uZwhNjPxS7MaT7lSCUIRKckl1GejdV+qMhL3XFxPFeYzXwzFpdPG11zWf+qJlalqw==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/api" "9.14.2"
-    "@polkadot/api-augment" "9.14.2"
-    "@polkadot/api-base" "9.14.2"
-    "@polkadot/rpc-core" "9.14.2"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/types-codec" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-    "@polkadot/util-crypto" "^10.4.2"
+"@polkadot/api-derive@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-10.0.1.tgz#fa62a5dc9301167fc628483a6bce65fd5f5a8adc"
+  integrity sha512-btiE/ATJybKqBBYQvjujXZ+WrMfzwNvKRGI84cbEYnX4OHIo47O/v+zGQ2nUhbOfcJFa8FBU6dB9fMTBRl2R5g==
+  dependencies:
+    "@polkadot/api" "10.0.1"
+    "@polkadot/api-augment" "10.0.1"
+    "@polkadot/api-base" "10.0.1"
+    "@polkadot/rpc-core" "10.0.1"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/types-codec" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    "@polkadot/util-crypto" "^11.0.1"
     rxjs "^7.8.0"
+    tslib "^2.5.0"
 
-"@polkadot/api@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-9.14.2.tgz#d5cee02236654c6063d7c4b70c78c290db5aba8d"
-  integrity sha512-R3eYFj2JgY1zRb+OCYQxNlJXCs2FA+AU4uIEiVcXnVLmR3M55tkRNEwYAZmiFxx0pQmegGgPMc33q7TWGdw24A==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/api-augment" "9.14.2"
-    "@polkadot/api-base" "9.14.2"
-    "@polkadot/api-derive" "9.14.2"
-    "@polkadot/keyring" "^10.4.2"
-    "@polkadot/rpc-augment" "9.14.2"
-    "@polkadot/rpc-core" "9.14.2"
-    "@polkadot/rpc-provider" "9.14.2"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/types-augment" "9.14.2"
-    "@polkadot/types-codec" "9.14.2"
-    "@polkadot/types-create" "9.14.2"
-    "@polkadot/types-known" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-    "@polkadot/util-crypto" "^10.4.2"
+"@polkadot/api@10.0.1", "@polkadot/api@9.14.2":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-10.0.1.tgz#ff3272e9f3d5d8c6d7c9e842f0a11c1c6a462265"
+  integrity sha512-XDJwGqtnFKWlY2kEGOCOAFhczgUxwNZ553zVbmkR65eK4gVlCwIMHLkU/rPlPf/QShrTCZXQhaS/HwIXeFHIvw==
+  dependencies:
+    "@polkadot/api-augment" "10.0.1"
+    "@polkadot/api-base" "10.0.1"
+    "@polkadot/api-derive" "10.0.1"
+    "@polkadot/keyring" "^11.0.1"
+    "@polkadot/rpc-augment" "10.0.1"
+    "@polkadot/rpc-core" "10.0.1"
+    "@polkadot/rpc-provider" "10.0.1"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/types-augment" "10.0.1"
+    "@polkadot/types-codec" "10.0.1"
+    "@polkadot/types-create" "10.0.1"
+    "@polkadot/types-known" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    "@polkadot/util-crypto" "^11.0.1"
     eventemitter3 "^5.0.0"
     rxjs "^7.8.0"
+    tslib "^2.5.0"
 
-"@polkadot/keyring@10.4.2", "@polkadot/keyring@^10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-10.4.2.tgz#793377fdb9076df0af771df11388faa6be03c70d"
-  integrity sha512-7iHhJuXaHrRTG6cJDbZE9G+c1ts1dujp0qbO4RfAPmT7YUvphHvAtCKueN9UKPz5+TYDL+rP/jDEaSKU8jl/qQ==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/util" "10.4.2"
-    "@polkadot/util-crypto" "10.4.2"
-
-"@polkadot/networks@10.4.2", "@polkadot/networks@^10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-10.4.2.tgz#d7878c6aad8173c800a21140bfe5459261724456"
-  integrity sha512-FAh/znrEvWBiA/LbcT5GXHsCFUl//y9KqxLghSr/CreAmAergiJNT0MVUezC7Y36nkATgmsr4ylFwIxhVtuuCw==
+"@polkadot/keyring@10.4.2", "@polkadot/keyring@11.0.1", "@polkadot/keyring@^11.0.1":
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-11.0.1.tgz#e03de854f15ae68b5797137604d5055e55412bac"
+  integrity sha512-ypQs9cYp/WsmHPvnv4RowbVyZTdOg8rIvcHj6Ols3sqJbQXVn9rfWZTS2l341d9z4kJtmqwbSdKAVV0GT+Mj1A==
   dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/util" "10.4.2"
-    "@substrate/ss58-registry" "^1.38.0"
+    "@polkadot/util" "11.0.1"
+    "@polkadot/util-crypto" "11.0.1"
+    tslib "^2.5.0"
 
 "@polkadot/networks@11.0.1":
   version "11.0.1"
@@ -1559,129 +1578,121 @@
     "@substrate/ss58-registry" "^1.39.0"
     tslib "^2.5.0"
 
-"@polkadot/rpc-augment@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-augment/-/rpc-augment-9.14.2.tgz#eb70d5511463dab8d995faeb77d4edfe4952fe26"
-  integrity sha512-mOubRm3qbKZTbP9H01XRrfTk7k5it9WyzaWAg72DJBQBYdgPUUkGSgpPD/Srkk5/5GAQTWVWL1I2UIBKJ4TJjQ==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/rpc-core" "9.14.2"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/types-codec" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-
-"@polkadot/rpc-core@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-9.14.2.tgz#26d4f00ac7abbf880f8280e9b96235880d35794b"
-  integrity sha512-krA/mtQ5t9nUQEsEVC1sjkttLuzN6z6gyJxK2IlpMS3S5ncy/R6w4FOpy+Q0H18Dn83JBo0p7ZtY7Y6XkK48Kw==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/rpc-augment" "9.14.2"
-    "@polkadot/rpc-provider" "9.14.2"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/util" "^10.4.2"
+"@polkadot/networks@^11.0.1":
+  version "11.1.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-11.1.3.tgz#e113c98269328267962c2047dccca4d2790cc8a5"
+  integrity sha512-goLpX9SswAGGeh1jXB79wHEfWOF5rLIItMHYalujBmhQVxyAqbxP2tzQqPQXDLcnkWbgwkyYGLXaDD72GBqHZw==
+  dependencies:
+    "@polkadot/util" "11.1.3"
+    "@substrate/ss58-registry" "^1.39.0"
+    tslib "^2.5.0"
+
+"@polkadot/rpc-augment@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-augment/-/rpc-augment-10.0.1.tgz#f46a97543310837fd2feabc9419b9e8a6c68f9c0"
+  integrity sha512-DZK4V99qIhtSS9gaYL5BjsFoa5DxIunO3emxvc5V0jm3o5ZNejGDwRCZNL/atIt5tGyjosU6cYMmVvvgLuQbzg==
+  dependencies:
+    "@polkadot/rpc-core" "10.0.1"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/types-codec" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    tslib "^2.5.0"
+
+"@polkadot/rpc-core@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-10.0.1.tgz#f6644c9e61c4001c76db2cc5cf80443d83cef26a"
+  integrity sha512-HuWFttfQknSfB0Xff+svDP1rba5cwLyOhJ4EDPxz2QcyChTdOCzHBymD9GLKZJEaGp+IT4VOcUPwLDMml1TG1A==
+  dependencies:
+    "@polkadot/rpc-augment" "10.0.1"
+    "@polkadot/rpc-provider" "10.0.1"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/util" "^11.0.1"
     rxjs "^7.8.0"
+    tslib "^2.5.0"
 
-"@polkadot/rpc-provider@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-9.14.2.tgz#0dea667f3a03bf530f202cba5cd360df19b32e30"
-  integrity sha512-YTSywjD5PF01V47Ru5tln2LlpUwJiSOdz6rlJXPpMaY53hUp7+xMU01FVAQ1bllSBNisSD1Msv/mYHq84Oai2g==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/keyring" "^10.4.2"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/types-support" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-    "@polkadot/util-crypto" "^10.4.2"
-    "@polkadot/x-fetch" "^10.4.2"
-    "@polkadot/x-global" "^10.4.2"
-    "@polkadot/x-ws" "^10.4.2"
+"@polkadot/rpc-provider@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-10.0.1.tgz#ad94e2f0c357263a7ea5e1b6566f6e772ad0b38a"
+  integrity sha512-kv6uShbKgBZtoRcsxTVxpzkjRUqcd/cctG0lEqpy2BZU8koCnSu3XhooifcTm8jO17EUuC4Mm/wfM0DQKmojmQ==
+  dependencies:
+    "@polkadot/keyring" "^11.0.1"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/types-support" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    "@polkadot/util-crypto" "^11.0.1"
+    "@polkadot/x-fetch" "^11.0.1"
+    "@polkadot/x-global" "^11.0.1"
+    "@polkadot/x-ws" "^11.0.1"
     eventemitter3 "^5.0.0"
     mock-socket "^9.2.1"
     nock "^13.3.0"
+    tslib "^2.5.0"
   optionalDependencies:
-    "@substrate/connect" "0.7.19"
-
-"@polkadot/types-augment@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-augment/-/types-augment-9.14.2.tgz#1a478e18e713b04038f3e171287ee5abe908f0aa"
-  integrity sha512-WO9d7RJufUeY3iFgt2Wz762kOu1tjEiGBR5TT4AHtpEchVHUeosVTrN9eycC+BhleqYu52CocKz6u3qCT/jKLg==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/types-codec" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-
-"@polkadot/types-codec@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-codec/-/types-codec-9.14.2.tgz#d625c80495d7a68237b3d5c0a60ff10d206131fa"
-  integrity sha512-AJ4XF7W1no4PENLBRU955V6gDxJw0h++EN3YoDgThozZ0sj3OxyFupKgNBZcZb2V23H8JxQozzIad8k+nJbO1w==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/util" "^10.4.2"
-    "@polkadot/x-bigint" "^10.4.2"
-
-"@polkadot/types-create@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-create/-/types-create-9.14.2.tgz#aec515a2d3bc7e7b7802095cdd35ece48dc442bc"
-  integrity sha512-nSnKpBierlmGBQT8r6/SHf6uamBIzk4WmdMsAsR4uJKJF1PtbIqx2W5PY91xWSiMSNMzjkbCppHkwaDAMwLGaw==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/types-codec" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-
-"@polkadot/types-known@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-9.14.2.tgz#17fe5034a5b907bd006093a687f112b07edadf10"
-  integrity sha512-iM8WOCgguzJ3TLMqlm4K1gKQEwWm2zxEKT1HZZ1irs/lAbBk9MquDWDvebryiw3XsLB8xgrp3RTIBn2Q4FjB2A==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/networks" "^10.4.2"
-    "@polkadot/types" "9.14.2"
-    "@polkadot/types-codec" "9.14.2"
-    "@polkadot/types-create" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-
-"@polkadot/types-support@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-support/-/types-support-9.14.2.tgz#d25e8d4e5ec3deef914cb55fc8bc5448431ddd18"
-  integrity sha512-VWCOPgXDK3XtXT7wMLyIWeNDZxUbNcw/8Pn6n6vMogs7o/n4h6WGbGMeTIQhPWyn831/RmkVs5+2DUC+2LlOhw==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/util" "^10.4.2"
-
-"@polkadot/types@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-9.14.2.tgz#5105f41eb9e8ea29938188d21497cbf1753268b8"
-  integrity sha512-hGLddTiJbvowhhUZJ3k+olmmBc1KAjWIQxujIUIYASih8FQ3/YJDKxaofGOzh0VygOKW3jxQBN2VZPofyDP9KQ==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/keyring" "^10.4.2"
-    "@polkadot/types-augment" "9.14.2"
-    "@polkadot/types-codec" "9.14.2"
-    "@polkadot/types-create" "9.14.2"
-    "@polkadot/util" "^10.4.2"
-    "@polkadot/util-crypto" "^10.4.2"
-    rxjs "^7.8.0"
+    "@substrate/connect" "0.7.20"
 
-"@polkadot/util-crypto@10.4.2", "@polkadot/util-crypto@^10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-10.4.2.tgz#871fb69c65768bd48c57bb5c1f76a85d979fb8b5"
-  integrity sha512-RxZvF7C4+EF3fzQv8hZOLrYCBq5+wA+2LWv98nECkroChY3C2ZZvyWDqn8+aonNULt4dCVTWDZM0QIY6y4LUAQ==
+"@polkadot/types-augment@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-augment/-/types-augment-10.0.1.tgz#5c3d40c2976510f893e11f6acde02d8fe0c40a8b"
+  integrity sha512-PK7CmZwamJiqIIuyeEfV2a1KsEKAuviTH7DkDZWb1aH8495hNkKx88JeTwotjTG6xrkaFZcEqF7UbhXCQs2zOA==
   dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@noble/hashes" "1.2.0"
-    "@noble/secp256k1" "1.7.1"
-    "@polkadot/networks" "10.4.2"
-    "@polkadot/util" "10.4.2"
-    "@polkadot/wasm-crypto" "^6.4.1"
-    "@polkadot/x-bigint" "10.4.2"
-    "@polkadot/x-randomvalues" "10.4.2"
-    "@scure/base" "1.1.1"
-    ed2curve "^0.3.0"
-    tweetnacl "^1.0.3"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/types-codec" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    tslib "^2.5.0"
+
+"@polkadot/types-codec@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-codec/-/types-codec-10.0.1.tgz#c9f4fd0142800fc5339de3c0d6c1611d7d0947d8"
+  integrity sha512-RrrEuc6PZID/VvIH+eZ6aqvpx7kjbFD58nsb/8ZQR57352EP4tVvR3arHsqh6j2WiM62uJ3zKT/rL8bCYVHjIw==
+  dependencies:
+    "@polkadot/util" "^11.0.1"
+    "@polkadot/x-bigint" "^11.0.1"
+    tslib "^2.5.0"
+
+"@polkadot/types-create@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-create/-/types-create-10.0.1.tgz#c94edbd181abc5b589a7807b20ccd16788eae2cd"
+  integrity sha512-Sr4BmswhFGj09e727XeS4nOnrvkWwWSSaXAwLenwVOCK9UaevYw+jmc28HcYypL5+i8kT4jKyU+1av7UtJyOzg==
+  dependencies:
+    "@polkadot/types-codec" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    tslib "^2.5.0"
+
+"@polkadot/types-known@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-10.0.1.tgz#0bbee8b8556d202549b2cacd7336122da9796492"
+  integrity sha512-GoHnDS1yKwLmsEQX7xjcMNR5SvaszxGV7E5Jkgl16VOF3QmO13Vs19jz1bdyv4Dw6soKFI5XAUEJY9PoA0DDMg==
+  dependencies:
+    "@polkadot/networks" "^11.0.1"
+    "@polkadot/types" "10.0.1"
+    "@polkadot/types-codec" "10.0.1"
+    "@polkadot/types-create" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    tslib "^2.5.0"
+
+"@polkadot/types-support@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-support/-/types-support-10.0.1.tgz#301125e2e2840801e575cb969fe0cc2bb36df86a"
+  integrity sha512-J5i4BM08/HZGBNQhN2X29eWPS8+Ie7n6O8L0y8IZ3rS0hkXU1V2SFd9X4LO8ADPGvT3JvPpQKESsq0f/Z5UbYQ==
+  dependencies:
+    "@polkadot/util" "^11.0.1"
+    tslib "^2.5.0"
+
+"@polkadot/types@10.0.1", "@polkadot/types@9.14.2":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-10.0.1.tgz#54c636bbe6f151c5e4bc2c9220bb98bbb1fc428d"
+  integrity sha512-/ALKLIWulXJrK/nNEY8iXByZRwaq1uQiRzzFqwWgfGpnLVCHYljV5ZEi3QqeDjGJzywQYxqJB+bJSiUe0+iNvg==
+  dependencies:
+    "@polkadot/keyring" "^11.0.1"
+    "@polkadot/types-augment" "10.0.1"
+    "@polkadot/types-codec" "10.0.1"
+    "@polkadot/types-create" "10.0.1"
+    "@polkadot/util" "^11.0.1"
+    "@polkadot/util-crypto" "^11.0.1"
+    rxjs "^7.8.0"
+    tslib "^2.5.0"
 
-"@polkadot/util-crypto@11.0.1":
+"@polkadot/util-crypto@10.4.2", "@polkadot/util-crypto@11.0.1", "@polkadot/util-crypto@^11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-11.0.1.tgz#ec17ee499bf78262d1cc23963fb365aeb4ede34b"
   integrity sha512-IEircl43g6ZT9IqjzB1ttR7vK+/IaUar6l8yeU+Bn6x0TSS6tXyOJmXfVsXsqfLM58GIXY18mBZCTfhF/LwuKg==
@@ -1698,20 +1709,7 @@
     tslib "^2.5.0"
     tweetnacl "^1.0.3"
 
-"@polkadot/util@10.4.2", "@polkadot/util@^10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-10.4.2.tgz#df41805cb27f46b2b4dad24c371fa2a68761baa1"
-  integrity sha512-0r5MGICYiaCdWnx+7Axlpvzisy/bi1wZGXgCSw5+ZTyPTOqvsYRqM2X879yxvMsGfibxzWqNzaiVjToz1jvUaA==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/x-bigint" "10.4.2"
-    "@polkadot/x-global" "10.4.2"
-    "@polkadot/x-textdecoder" "10.4.2"
-    "@polkadot/x-textencoder" "10.4.2"
-    "@types/bn.js" "^5.1.1"
-    bn.js "^5.2.1"
-
-"@polkadot/util@11.0.1":
+"@polkadot/util@10.4.2", "@polkadot/util@11.0.1", "@polkadot/util@11.1.3", "@polkadot/util@^11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-11.0.1.tgz#04ce76339a7bd6ea2746173cbac119905330b47a"
   integrity sha512-IMk3hPxIGzlAW6fhOigVPMvaW0E+dTMzO1IKnEATdhAJFKjaqU4K9Pwj79fj93xgM5Y8PkHV5sUPJKuce+u+4A==
@@ -1724,13 +1722,6 @@
     bn.js "^5.2.1"
     tslib "^2.5.0"
 
-"@polkadot/wasm-bridge@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-bridge/-/wasm-bridge-6.4.1.tgz#e97915dd67ba543ec3381299c2a5b9330686e27e"
-  integrity sha512-QZDvz6dsUlbYsaMV5biZgZWkYH9BC5AfhT0f0/knv8+LrbAoQdP3Asbvddw8vyU9sbpuCHXrd4bDLBwUCRfrBQ==
-  dependencies:
-    "@babel/runtime" "^7.20.6"
-
 "@polkadot/wasm-bridge@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-bridge/-/wasm-bridge-7.0.2.tgz#c906c12fa5a2ce40515c37d88a17637f467f6199"
@@ -1738,13 +1729,6 @@
   dependencies:
     tslib "^2.5.0"
 
-"@polkadot/wasm-crypto-asmjs@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-6.4.1.tgz#3cc76bbda5ea4a7a860982c64f9565907b312253"
-  integrity sha512-UxZTwuBZlnODGIQdCsE2Sn/jU0O2xrNQ/TkhRFELfkZXEXTNu4lw6NpaKq7Iey4L+wKd8h4lT3VPVkMcPBLOvA==
-  dependencies:
-    "@babel/runtime" "^7.20.6"
-
 "@polkadot/wasm-crypto-asmjs@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.0.2.tgz#c7f807ee4f290c98d6b17b629f0b2cdcc4f8b186"
@@ -1752,16 +1736,6 @@
   dependencies:
     tslib "^2.5.0"
 
-"@polkadot/wasm-crypto-init@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-init/-/wasm-crypto-init-6.4.1.tgz#4d9ab0030db52cf177bf707ef8e77aa4ca721668"
-  integrity sha512-1ALagSi/nfkyFaH6JDYfy/QbicVbSn99K8PV9rctDUfxc7P06R7CoqbjGQ4OMPX6w1WYVPU7B4jPHGLYBlVuMw==
-  dependencies:
-    "@babel/runtime" "^7.20.6"
-    "@polkadot/wasm-bridge" "6.4.1"
-    "@polkadot/wasm-crypto-asmjs" "6.4.1"
-    "@polkadot/wasm-crypto-wasm" "6.4.1"
-
 "@polkadot/wasm-crypto-init@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.0.2.tgz#e707c34ba6be9ee1419453eeceab2b441da7fef3"
@@ -1772,14 +1746,6 @@
     "@polkadot/wasm-crypto-wasm" "7.0.2"
     tslib "^2.5.0"
 
-"@polkadot/wasm-crypto-wasm@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-6.4.1.tgz#97180f80583b18f6a13c1054fa5f7e8da40b1028"
-  integrity sha512-3VV9ZGzh0ZY3SmkkSw+0TRXxIpiO0nB8lFwlRgcwaCihwrvLfRnH9GI8WE12mKsHVjWTEVR3ogzILJxccAUjDA==
-  dependencies:
-    "@babel/runtime" "^7.20.6"
-    "@polkadot/wasm-util" "6.4.1"
-
 "@polkadot/wasm-crypto-wasm@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.0.2.tgz#6adecfd7ac7dec7967c427adcc18c9b6be09e566"
@@ -1788,18 +1754,6 @@
     "@polkadot/wasm-util" "7.0.2"
     tslib "^2.5.0"
 
-"@polkadot/wasm-crypto@^6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-6.4.1.tgz#79310e23ad1ca62362ba893db6a8567154c2536a"
-  integrity sha512-FH+dcDPdhSLJvwL0pMLtn/LIPd62QDPODZRCmDyw+pFjLOMaRBc7raomWUOqyRWJTnqVf/iscc2rLVLNMyt7ag==
-  dependencies:
-    "@babel/runtime" "^7.20.6"
-    "@polkadot/wasm-bridge" "6.4.1"
-    "@polkadot/wasm-crypto-asmjs" "6.4.1"
-    "@polkadot/wasm-crypto-init" "6.4.1"
-    "@polkadot/wasm-crypto-wasm" "6.4.1"
-    "@polkadot/wasm-util" "6.4.1"
-
 "@polkadot/wasm-crypto@^7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-7.0.2.tgz#44aa5f5322f3e8bdcacb1806e3e1a6543d20cbb4"
@@ -1812,13 +1766,6 @@
     "@polkadot/wasm-util" "7.0.2"
     tslib "^2.5.0"
 
-"@polkadot/wasm-util@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-util/-/wasm-util-6.4.1.tgz#74aecc85bec427a9225d9874685944ea3dc3ab76"
-  integrity sha512-Uwo+WpEsDmFExWC5kTNvsVhvqXMZEKf4gUHXFn4c6Xz4lmieRT5g+1bO1KJ21pl4msuIgdV3Bksfs/oiqMFqlw==
-  dependencies:
-    "@babel/runtime" "^7.20.6"
-
 "@polkadot/wasm-util@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-util/-/wasm-util-7.0.2.tgz#1f3eaf048bd9134f08857e74325084ce129cd50c"
@@ -1826,14 +1773,6 @@
   dependencies:
     tslib "^2.5.0"
 
-"@polkadot/x-bigint@10.4.2", "@polkadot/x-bigint@^10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-bigint/-/x-bigint-10.4.2.tgz#7eb2ec732259df48b5a00f07879a1331e05606ec"
-  integrity sha512-awRiox+/XSReLzimAU94fPldowiwnnMUkQJe8AebYhNocAj6SJU00GNoj6j6tAho6yleOwrTJXZaWFBaQVJQNg==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/x-global" "10.4.2"
-
 "@polkadot/x-bigint@11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/x-bigint/-/x-bigint-11.0.1.tgz#0a2c21f8fa76d1299a02111f8391d16593f456ae"
@@ -1842,22 +1781,22 @@
     "@polkadot/x-global" "11.0.1"
     tslib "^2.5.0"
 
-"@polkadot/x-fetch@^10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-10.4.2.tgz#bc6ba70de71a252472fbe36180511ed920e05f05"
-  integrity sha512-Ubb64yaM4qwhogNP+4mZ3ibRghEg5UuCYRMNaCFoPgNAY8tQXuDKrHzeks3+frlmeH9YRd89o8wXLtWouwZIcw==
+"@polkadot/x-bigint@^11.0.1":
+  version "11.1.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-bigint/-/x-bigint-11.1.3.tgz#37b09a12a9ed6df704e047e261f1b8b2ac978497"
+  integrity sha512-fRUUHfW9VFsXT7sLUUY7gSu8v+PvzNLRwvjnp+Ly8vFx9LTLuVGFCi+mpysuRTaPpqZZJlzBJ3fST7xTGh67Pg==
   dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/x-global" "10.4.2"
-    "@types/node-fetch" "^2.6.2"
-    node-fetch "^3.3.0"
+    "@polkadot/x-global" "11.1.3"
+    tslib "^2.5.0"
 
-"@polkadot/x-global@10.4.2", "@polkadot/x-global@^10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-10.4.2.tgz#5662366e3deda0b4c8f024b2d902fa838f9e60a4"
-  integrity sha512-g6GXHD/ykZvHap3M6wh19dO70Zm43l4jEhlxf5LtTo5/0/UporFCXr2YJYZqfbn9JbQwl1AU+NroYio+vtJdiA==
+"@polkadot/x-fetch@^11.0.1":
+  version "11.1.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-11.1.3.tgz#e39df53fc7fb6399d3883b45d03f6ef7f265a7f9"
+  integrity sha512-+Z0RxxsN7+l2ZmmDdHqOo0kgqvjXJ1bw8CwTVnq3t9nPgZKn2pC3Fq3xdj/sRWiLuf/UhgCxKfYfMmt5ek4kIg==
   dependencies:
-    "@babel/runtime" "^7.20.13"
+    "@polkadot/x-global" "11.1.3"
+    node-fetch "^3.3.1"
+    tslib "^2.5.0"
 
 "@polkadot/x-global@11.0.1":
   version "11.0.1"
@@ -1866,13 +1805,12 @@
   dependencies:
     tslib "^2.5.0"
 
-"@polkadot/x-randomvalues@10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-randomvalues/-/x-randomvalues-10.4.2.tgz#895f1220d5a4522a83d8d5014e3c1e03b129893e"
-  integrity sha512-mf1Wbpe7pRZHO0V3V89isPLqZOy5XGX2bCqsfUWHgb1NvV1MMx5TjVjdaYyNlGTiOkAmJKlOHshcfPU2sYWpNg==
+"@polkadot/x-global@11.1.3", "@polkadot/x-global@^11.0.1":
+  version "11.1.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-11.1.3.tgz#4086694f52373fea63910b62da999bf0981d7d86"
+  integrity sha512-R3aqtIjgzFHJ3TyX6wavhp+59oLbZiqczIHkaas/nJe21+SVARqFmIII6BwS7ty7+8Uu4fHliA9re+ZSUp+rwg==
   dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/x-global" "10.4.2"
+    tslib "^2.5.0"
 
 "@polkadot/x-randomvalues@11.0.1":
   version "11.0.1"
@@ -1882,14 +1820,6 @@
     "@polkadot/x-global" "11.0.1"
     tslib "^2.5.0"
 
-"@polkadot/x-textdecoder@10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-10.4.2.tgz#93202f3e5ad0e7f75a3fa02d2b8a3343091b341b"
-  integrity sha512-d3ADduOKUTU+cliz839+KCFmi23pxTlabH7qh7Vs1GZQvXOELWdqFOqakdiAjtMn68n1KVF4O14Y+OUm7gp/zA==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/x-global" "10.4.2"
-
 "@polkadot/x-textdecoder@11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-11.0.1.tgz#4f42d41150ebf5c36a40adb0dfe7b7da530a21a5"
@@ -1898,14 +1828,6 @@
     "@polkadot/x-global" "11.0.1"
     tslib "^2.5.0"
 
-"@polkadot/x-textencoder@10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-10.4.2.tgz#cd2e6c8a66b0b400a73f0164e99c510fb5c83501"
-  integrity sha512-mxcQuA1exnyv74Kasl5vxBq01QwckG088lYjc3KwmND6+pPrW2OWagbxFX5VFoDLDAE+UJtnUHsjdWyOTDhpQA==
-  dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/x-global" "10.4.2"
-
 "@polkadot/x-textencoder@11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-11.0.1.tgz#f95c7c3e06065862e3a2624ad873bbf0329c7d3b"
@@ -1914,15 +1836,14 @@
     "@polkadot/x-global" "11.0.1"
     tslib "^2.5.0"
 
-"@polkadot/x-ws@^10.4.2":
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-10.4.2.tgz#4e9d88f37717570ccf942c6f4f63b06260f45025"
-  integrity sha512-3gHSTXAWQu1EMcMVTF5QDKHhEHzKxhAArweEyDXE7VsgKUP/ixxw4hVZBrkX122iI5l5mjSiooRSnp/Zl3xqDQ==
+"@polkadot/x-ws@^11.0.1":
+  version "11.1.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-11.1.3.tgz#5a759bcbbbdceeecca53bcc74170e52cd3ca774b"
+  integrity sha512-omNU2mIVX997HiHm2YxEdJdyCFnv+oTyKWZd0+FdS47rdfhVwD+H9/bS+rtQ9lIqfhODdGmw3fG//gq1KpYJcw==
   dependencies:
-    "@babel/runtime" "^7.20.13"
-    "@polkadot/x-global" "10.4.2"
-    "@types/websocket" "^1.0.5"
-    websocket "^1.0.34"
+    "@polkadot/x-global" "11.1.3"
+    tslib "^2.5.0"
+    ws "^8.13.0"
 
 "@scure/base@1.1.1":
   version "1.1.1"
@@ -1939,24 +1860,16 @@
   resolved "https://registry.yarnpkg.com/@substrate/connect-extension-protocol/-/connect-extension-protocol-1.0.1.tgz#fa5738039586c648013caa6a0c95c43265dbe77d"
   integrity sha512-161JhCC1csjH3GE5mPLEd7HbWtwNSPJBg3p1Ksz9SFlTzj/bgEwudiRN2y5i0MoLGCIJRYKyKGMxVnd29PzNjg==
 
-"@substrate/connect@0.7.19":
-  version "0.7.19"
-  resolved "https://registry.yarnpkg.com/@substrate/connect/-/connect-0.7.19.tgz#7c879cb275bc7ac2fe9edbf797572d4ff8d8b86a"
-  integrity sha512-+DDRadc466gCmDU71sHrYOt1HcI2Cbhm7zdCFjZfFVHXhC/E8tOdrVSglAH2HDEHR0x2SiHRxtxOGC7ak2Zjog==
+"@substrate/connect@0.7.20":
+  version "0.7.20"
+  resolved "https://registry.yarnpkg.com/@substrate/connect/-/connect-0.7.20.tgz#ce5647368be21199d608715bbd77bcb7c25a4227"
+  integrity sha512-f/sMgGUikJxDaNMkQXCU/1WaMy0MLJB+KS+P+CpsIhWyxj2dOcph5YXjAJiIlgrZqHImV28RJnraxXBD3AlmLQ==
   dependencies:
     "@substrate/connect-extension-protocol" "^1.0.1"
-    "@substrate/smoldot-light" "0.7.9"
     eventemitter3 "^4.0.7"
+    smoldot "0.7.11"
 
-"@substrate/smoldot-light@0.7.9":
-  version "0.7.9"
-  resolved "https://registry.yarnpkg.com/@substrate/smoldot-light/-/smoldot-light-0.7.9.tgz#68449873a25558e547e9468289686ee228a9930f"
-  integrity sha512-HP8iP7sFYlpSgjjbo0lqHyU+gu9lL2hbDNce6dWk5/10mFFF9jKIFGfui4zCecUY808o/Go9pan/31kMJoLbug==
-  dependencies:
-    pako "^2.0.4"
-    ws "^8.8.1"
-
-"@substrate/ss58-registry@^1.38.0", "@substrate/ss58-registry@^1.39.0":
+"@substrate/ss58-registry@^1.39.0":
   version "1.39.0"
   resolved "https://registry.yarnpkg.com/@substrate/ss58-registry/-/ss58-registry-1.39.0.tgz#eb916ff5fea7fa02e77745823fde21af979273d2"
   integrity sha512-qZYpuE6n+mwew+X71dOur/CbMXj6rNW27o63JeJwdQH/GvcSKm3JLNhd+bGzwUKg0D/zD30Qc6p4JykArzM+tA==
@@ -2108,14 +2021,6 @@
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.0.0.tgz#3205bcd15ada9bc681ac20bef64e9e6df88fd297"
   integrity sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==
 
-"@types/node-fetch@^2.6.2":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
-  integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
 "@types/node@*":
   version "18.14.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.6.tgz#ae1973dd2b1eeb1825695bb11ebfb746d27e3e93"
@@ -2193,13 +2098,6 @@
     "@types/expect" "^1.20.4"
     "@types/node" "*"
 
-"@types/websocket@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.5.tgz#3fb80ed8e07f88e51961211cd3682a3a4a81569c"
-  integrity sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==
-  dependencies:
-    "@types/node" "*"
-
 "@typescript-eslint/eslint-plugin@5.35.1":
   version "5.35.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.35.1.tgz#0d822bfea7469904dfc1bb8f13cabd362b967c93"
@@ -2773,13 +2671,6 @@ buffer@^5.2.1, buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-bufferutil@^4.0.1:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad"
-  integrity sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==
-  dependencies:
-    node-gyp-build "^4.3.0"
-
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
@@ -2989,6 +2880,18 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
 
+chevrotain@^10.4.1:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/chevrotain/-/chevrotain-10.5.0.tgz#9c1dc62ef0753bb562dbe521b5f72d041bad624e"
+  integrity sha512-Pkv5rBY3+CsHOYfV5g/Vs5JY9WTHHDEKOlohI2XeygaZhUeqhAlldZ8Hz9cRmxu709bvS08YzxHdTPHhffc13A==
+  dependencies:
+    "@chevrotain/cst-dts-gen" "10.5.0"
+    "@chevrotain/gast" "10.5.0"
+    "@chevrotain/types" "10.5.0"
+    "@chevrotain/utils" "10.5.0"
+    lodash "4.17.21"
+    regexp-to-ast "0.5.0"
+
 chokidar@3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@@ -3371,6 +3274,11 @@ conventional-recommended-bump@^6.1.0:
     meow "^8.0.0"
     q "^1.5.1"
 
+core-js-pure@^3.25.1:
+  version "3.30.0"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.0.tgz#41b6c42e5f363bd53d79999bd35093b17e42e1bf"
+  integrity sha512-+2KbMFGeBU0ln/csoPqTe0i/yfHbrd2EUhNMObsGtXMKS/RTtlkYyi+/3twLcevbgNR0yM/r0Psa3TEoQRpFMQ==
+
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
@@ -3412,14 +3320,6 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
-  dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
-
 dargs@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
@@ -3452,13 +3352,6 @@ debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, de
   dependencies:
     ms "2.1.2"
 
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -3752,32 +3645,6 @@ error@^10.4.0:
   resolved "https://registry.yarnpkg.com/error/-/error-10.4.0.tgz#6fcf0fd64bceb1e750f8ed9a3dd880f00e46a487"
   integrity sha512-YxIFEJuhgcICugOUvRx5th0UM+ActZ9sjY0QJmeVwsQdvosZ7kYzc9QqS0Da3R5iUmgU5meGIxh0xBeZpMVeLw==
 
-es5-ext@^0.10.35, es5-ext@^0.10.50:
-  version "0.10.62"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
-  integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
-  dependencies:
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.3"
-    next-tick "^1.1.0"
-
-es6-iterator@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
-es6-symbol@^3.1.1, es6-symbol@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
-  dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -3961,13 +3828,6 @@ execa@5.1.1, execa@^5.0.0, execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-ext@^1.1.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
-  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
-  dependencies:
-    type "^2.7.2"
-
 external-editor@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -4185,15 +4045,6 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -5109,6 +4960,14 @@ js-sdsl@^4.1.4:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-toml@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/js-toml/-/js-toml-0.1.1.tgz#c3173f8037b849cea611ae6823a6b03ecfebeb70"
+  integrity sha512-ETaJONe4lKpXqXml4AeiCrVWLTfyyYsUMDAUAwldT0z5lDg2tBLq4aIIqFOwQZIDUeIhS0ofQBABYvicwKhQIg==
+  dependencies:
+    chevrotain "^10.4.1"
+    xregexp "^5.1.1"
+
 js-yaml@4.1.0, js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -5394,7 +5253,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5884,11 +5743,6 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -5945,11 +5799,6 @@ neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-next-tick@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
-  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
-
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -5995,10 +5844,10 @@ node-fetch@^2.6.1, node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.0.tgz#37e71db4ecc257057af828d523a7243d651d91e4"
-  integrity sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==
+node-fetch@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.1.tgz#b3eea7b54b3a48020e46f4f88b9c5a7430d20b2e"
+  integrity sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==
   dependencies:
     data-uri-to-buffer "^4.0.0"
     fetch-blob "^3.1.4"
@@ -7049,6 +6898,11 @@ regenerator-runtime@^0.13.11:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
+regexp-to-ast@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz#56c73856bee5e1fef7f73a00f1473452ab712a24"
+  integrity sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==
+
 regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
@@ -7324,6 +7178,14 @@ smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
+smoldot@0.7.11:
+  version "0.7.11"
+  resolved "https://registry.yarnpkg.com/smoldot/-/smoldot-0.7.11.tgz#8e39464f2cf7736eacff5f2a87819dd9f688b352"
+  integrity sha512-aE1led154FJ2/jrXKv2HLKdNIyvYJG6H2ZmKYFS++kW1OAcTQ6idDy3fzAI1VdydLDYK0YbKUsj7SJDmrjsS3g==
+  dependencies:
+    pako "^2.0.4"
+    ws "^8.8.1"
+
 snake-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
@@ -7911,16 +7773,6 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
-type@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
-  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
-
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -8038,13 +7890,6 @@ url@0.10.3:
     punycode "1.3.2"
     querystring "0.2.0"
 
-utf-8-validate@^5.0.2:
-  version "5.0.10"
-  resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2"
-  integrity sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==
-  dependencies:
-    node-gyp-build "^4.3.0"
-
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -8153,18 +7998,6 @@ webidl-conversions@^3.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
-websocket@^1.0.34:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.34.tgz#2bdc2602c08bf2c82253b730655c0ef7dcab3111"
-  integrity sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==
-  dependencies:
-    bufferutil "^4.0.1"
-    debug "^2.2.0"
-    es5-ext "^0.10.50"
-    typedarray-to-buffer "^3.1.5"
-    utf-8-validate "^5.0.2"
-    yaeti "^0.0.6"
-
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -8327,6 +8160,11 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
+ws@^8.13.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+
 ws@^8.8.1:
   version "8.12.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.1.tgz#c51e583d79140b5e42e39be48c934131942d4a8f"
@@ -8345,6 +8183,13 @@ xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==
 
+xregexp@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-5.1.1.tgz#6d3fe18819e3143aaf52f9284d34f49a59583ebb"
+  integrity sha512-fKXeVorD+CzWvFs7VBuKTYIW63YD1e1osxwQ8caZ6o1jg6pDAbABDG54LCIq0j5cy7PjRvGIq6sef9DYPXpncg==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.16.5"
+
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -8355,11 +8200,6 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yaeti@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577"
-  integrity sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==
-
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"

From b07136e77512a35322b925b6d97ee785bc07a1a5 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 18 Apr 2023 13:15:05 +0300
Subject: [PATCH 13/46] wip: parse workspace for contract list

---
 packages/cli/src/commands/init/index.ts | 27 +++++++++++++++----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 8730e3d3..cb1b196c 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -262,10 +262,17 @@ export class Init extends BaseCommand {
     }
 
     // 2. Look for cargo.toml with "workspace" field in the root
-    const rootToml = await getRootCargoToml(pathToExistingProject);
-    // 3a. Workspace found - use the glob in the "members field" to select directories to copy over
-    // 3b. workspace not found, use regex to find dir/dirs*/[cargo.toml, lib.rs]
-    // 3c. if not found, ask user for a path where contracts are -> [Ctrl+C to cancel]
+    const rootTomlPath = path.resolve(pathToExistingProject, "Cargo.toml");
+    if (await pathExists(rootTomlPath)) {
+      const rootTomlContracts = await getRootCargoToml(rootTomlPath);
+      // 3a. Workspace found - use the glob in the "members field" to select directories to copy over
+      console.log(rootTomlContracts);
+    } else {
+      // WILL NOT IMPLEMENT - too many variables 3b. workspace not found, use regex to find dir/dirs*/[cargo.toml, lib.rs]
+      // 3c. if not found, ask user for a path where contracts are -> [Ctrl+C to cancel]
+      // and optionally
+    }
+
     // 4. make a list (checkbox) for user to confirm contracts to copy
     // 5. add directories from Cargo.toml/exclude path to copy list
     // 6. look for test/tests directory and add it to the list
@@ -276,19 +283,17 @@ export class Init extends BaseCommand {
   }
 }
 
-async function getRootCargoToml(targetPath: string) {
-  const rootTomlPath = path.resolve(targetPath, "Cargo.toml");
-
-  if (!(await pathExists(rootTomlPath))) return;
+// async function copyWorkspaceContracts() {}
 
+async function getRootCargoToml(rootTomlPath: string) {
   const fileData = await readFile(rootTomlPath, "utf-8");
   const toml: { workspace?: { members?: string[]; exclude?: string[] } } = load(fileData);
 
-  if (!toml.workspace?.members) return;
+  if (!toml.workspace?.members) throw new Error(`No "workspace.members" field in Cargo.toml`);
 
   const getGlobPaths = async (globList: string[]) =>
     globby(
-      globList.map((glob) => path.resolve(targetPath, glob)),
+      globList.map((glob) => path.resolve(path.dirname(rootTomlPath), glob)),
       {
         absolute: true,
         onlyDirectories: true,
@@ -301,6 +306,6 @@ async function getRootCargoToml(targetPath: string) {
     contracts: await getGlobPaths(toml.workspace.members),
     additionalPaths: toml.workspace.exclude ? await getGlobPaths(toml.workspace.exclude) : [],
   };
-
+  console.log(toml);
   return detectedPaths;
 }

From 7c1e0f0d1554609a6be9c5661e71b94772834143 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Thu, 27 Apr 2023 19:30:48 +0300
Subject: [PATCH 14/46] wip: add manual paths entry

---
 packages/cli/package.json               |   1 +
 packages/cli/src/commands/init/index.ts | 134 ++++++++++++++++++------
 yarn.lock                               |  22 +++-
 3 files changed, 123 insertions(+), 34 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 80e272e5..c2557ca1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -32,6 +32,7 @@
     "fs-extra": "10.1.0",
     "globby": "11",
     "inquirer": "8.2.5",
+    "inquirer-file-tree-selection-prompt": "^1",
     "js-toml": "^0.1.1",
     "listr2": "5.0.7",
     "mocha": "10.2.0",
diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index cb1b196c..b43bdf1c 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -20,6 +20,7 @@ import {
 import { getAllTemplateNames, getTemplates } from "@astar-network/swanky-templates";
 import { BaseCommand } from "../../lib/baseCommand";
 import globby = require("globby");
+import inquirerFileTreeSelection from "inquirer-file-tree-selection-prompt";
 const {
   DEFAULT_ASTAR_NETWORK_URL,
   DEFAULT_NETWORK_URL,
@@ -38,6 +39,8 @@ interface Task {
   shouldExitOnError?: boolean;
   callback?: (param: string) => void;
 }
+
+inquirer.registerPrompt("file-tree-selection", inquirerFileTreeSelection);
 export class Init extends BaseCommand {
   static description = "Generate a new smart contract environment";
 
@@ -262,50 +265,117 @@ export class Init extends BaseCommand {
     }
 
     // 2. Look for cargo.toml with "workspace" field in the root
-    const rootTomlPath = path.resolve(pathToExistingProject, "Cargo.toml");
-    if (await pathExists(rootTomlPath)) {
-      const rootTomlContracts = await getRootCargoToml(rootTomlPath);
-      // 3a. Workspace found - use the glob in the "members field" to select directories to copy over
-      console.log(rootTomlContracts);
-    } else {
-      // WILL NOT IMPLEMENT - too many variables 3b. workspace not found, use regex to find dir/dirs*/[cargo.toml, lib.rs]
-      // 3c. if not found, ask user for a path where contracts are -> [Ctrl+C to cancel]
-      // and optionally
-    }
+    let rootTomlPaths = await getRootCargoToml(pathToExistingProject);
 
-    // 4. make a list (checkbox) for user to confirm contracts to copy
-    // 5. add directories from Cargo.toml/exclude path to copy list
-    // 6. look for test/tests directory and add it to the list
-    // 7. copy all the selected directories/files and update the swanky.config
-    // 8. copy cargo.toml from the root, modify path if needed ( "uniswap-v2/contracts/**" -> "contracts/**")
-    // 9. keep log of all the steps and write it to file
-    // 10. Copy rust.toolchain and .rustfmt.toml if exists
+    if (rootTomlPaths) {
+      console.log("Workspaces detected in root Cargo.toml file.");
+      const { shouldKeepRootToml } = await inquirer.prompt([
+        choice("shouldKeepRootToml", "Do you want to use it to automatically copy contracts?"),
+      ]);
+      rootTomlPaths = shouldKeepRootToml ? rootTomlPaths : null;
+    }
+    console.log(rootTomlPaths);
+    const candidatesList = rootTomlPaths
+      ? await getCopyCandidatesList(pathToExistingProject, rootTomlPaths)
+      : await getCopyCandidatesList(
+          pathToExistingProject,
+          await getManualPaths(pathToExistingProject)
+        );
+
+    console.log("Candidates list: ", candidatesList);
   }
 }
 
 // async function copyWorkspaceContracts() {}
 
-async function getRootCargoToml(rootTomlPath: string) {
+async function getRootCargoToml(pathToProject: string) {
+  const rootTomlPath = path.resolve(pathToProject, "Cargo.toml");
+  if (!(await pathExists(rootTomlPath))) return null;
+
   const fileData = await readFile(rootTomlPath, "utf-8");
   const toml: { workspace?: { members?: string[]; exclude?: string[] } } = load(fileData);
 
-  if (!toml.workspace?.members) throw new Error(`No "workspace.members" field in Cargo.toml`);
+  if (!toml.workspace?.members) return null;
 
-  const getGlobPaths = async (globList: string[]) =>
-    globby(
-      globList.map((glob) => path.resolve(path.dirname(rootTomlPath), glob)),
-      {
-        absolute: true,
-        onlyDirectories: true,
-        deep: 1,
-        objectMode: true,
-      }
-    );
+  return {
+    contractsDirectories: toml.workspace.members,
+    cratesDirectories: toml.workspace.exclude,
+  };
+}
 
+async function getManualPaths(pathToProject: string) {
+  console.log("No Cargo.toml found in the provided directory, or no workspace field within it.");
+  const { contractsDirectory, cratesDirectory, useCrateDirectory } = await inquirer.prompt([
+    {
+      type: "file-tree-selection",
+      name: "contractsDirectory",
+      onlyShowDir: true,
+      root: pathToProject,
+      message: "Please enter the path to the contracts directory: ",
+      hideRoot: true,
+    },
+    {
+      type: "confirm",
+      name: "useCrateDirectory",
+      message: "Do you have an extra the crate directory?",
+      default: false,
+    },
+    {
+      when: (answers) => answers.useCrateDirectory,
+      type: "file-tree-selection",
+      name: "cratesDirectory",
+      onlyShowDir: true,
+      root: pathToProject,
+      message: "Please enter the path to the contracts directory: ",
+    },
+  ]);
+
+  return {
+    contractsDirectories: [contractsDirectory],
+    cratesDirectories: useCrateDirectory ? [cratesDirectory] : [],
+  };
+}
+
+async function getCopyCandidatesList(
+  projectPath: string,
+  pathsToCopy: {
+    contractsDirectories: string[];
+    cratesDirectories?: string[];
+  }
+) {
   const detectedPaths = {
-    contracts: await getGlobPaths(toml.workspace.members),
-    additionalPaths: toml.workspace.exclude ? await getGlobPaths(toml.workspace.exclude) : [],
+    contracts: [
+      ...(await getGlobPaths(projectPath, pathsToCopy.contractsDirectories, false)),
+      ...(await getGlobPaths(projectPath, pathsToCopy.contractsDirectories, true)),
+    ],
+    additionalPaths:
+      pathsToCopy.cratesDirectories && pathsToCopy.cratesDirectories.length > 0
+        ? [
+            ...(await getGlobPaths(projectPath, pathsToCopy.cratesDirectories, false)),
+            ...(await getGlobPaths(projectPath, pathsToCopy.cratesDirectories, true)),
+          ]
+        : [],
   };
-  console.log(toml);
+
   return detectedPaths;
 }
+
+async function getGlobPaths(projectPath: string, globList: string[], isDirOnly: boolean) {
+  return globby(
+    globList.map((glob) => path.resolve(projectPath, glob)),
+    {
+      absolute: true,
+      onlyDirectories: isDirOnly,
+      deep: 1,
+      objectMode: true,
+    }
+  );
+}
+
+// 4. make a list (checkbox) for user to confirm contracts to copy
+// 5. add directories from Cargo.toml/exclude path to copy list
+// 6. look for test/tests directory and add it to the list
+// 7. copy all the selected directories/files and update the swanky.config
+// 8. copy cargo.toml from the root, modify path if needed ( "uniswap-v2/contracts/**" -> "contracts/**")
+// 9. keep log of all the steps and write it to file
+// 10. Copy rust.toolchain and .rustfmt.toml if exists
diff --git a/yarn.lock b/yarn.lock
index fa9956d0..46634e05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2934,7 +2934,7 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha512-3Fo5wu8Ytle8q9iCzS4D2MWVL2X7JVWRiS1BnXbTFDhS9c/REkM9vd1AmabsoZoY5/dGi5TT9iKL8Kb6DeBRQg==
 
-cli-cursor@3.1.0, cli-cursor@^3.1.0:
+cli-cursor@3.1.0, cli-cursor@^3, cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
@@ -3927,7 +3927,7 @@ fetch-blob@^3.1.2, fetch-blob@^3.1.4:
     node-domexception "^1.0.0"
     web-streams-polyfill "^3.0.3"
 
-figures@3.2.0, figures@^3.0.0:
+figures@3.2.0, figures@^3, figures@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
@@ -4678,6 +4678,17 @@ init-package-json@^3.0.2:
     validate-npm-package-license "^3.0.4"
     validate-npm-package-name "^4.0.0"
 
+inquirer-file-tree-selection-prompt@^1:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/inquirer-file-tree-selection-prompt/-/inquirer-file-tree-selection-prompt-1.0.19.tgz#40fa05991a6ab4bda4dad6116f07a8892627c3d2"
+  integrity sha512-aL01njANm5bJhQtUNBKWurniroUJ9I+rnJ20DBG3xY9gtKBxgpRFSRs0lzjx42iCRJ4J083IZ2SrN4t8ejPlEQ==
+  dependencies:
+    chalk "^4.0.0"
+    cli-cursor "^3"
+    figures "^3"
+    lodash "^4.17.11"
+    rxjs "^7.5.2"
+
 inquirer@8.2.5, inquirer@^8.0.0, inquirer@^8.2.4:
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8"
@@ -7010,6 +7021,13 @@ rxjs@^7.0.0, rxjs@^7.5.5, rxjs@^7.8.0:
   dependencies:
     tslib "^2.1.0"
 
+rxjs@^7.5.2:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"

From 183b37393290e686504a331354dbfaa1461c9dbd Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 2 May 2023 15:32:57 +0300
Subject: [PATCH 15/46] use fuzzypath instead of tree selector

---
 packages/cli/package.json               |   3 +-
 packages/cli/src/commands/init/index.ts |  22 ++--
 yarn.lock                               | 157 +++++++++++++++++++++---
 3 files changed, 154 insertions(+), 28 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index c2557ca1..6eaa606c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -32,7 +32,7 @@
     "fs-extra": "10.1.0",
     "globby": "11",
     "inquirer": "8.2.5",
-    "inquirer-file-tree-selection-prompt": "^1",
+    "inquirer-fuzzy-path": "^2.3.0",
     "js-toml": "^0.1.1",
     "listr2": "5.0.7",
     "mocha": "10.2.0",
@@ -49,6 +49,7 @@
     "@types/chai": "4",
     "@types/fs-extra": "9.0.13",
     "@types/inquirer": "8.2.5",
+    "@types/inquirer-fuzzy-path": "^2.3.6",
     "@types/mocha": "9.0.0",
     "@types/node": "18.11.9",
     "@types/semver": "7.3.10",
diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index b43bdf1c..e1277f6c 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -20,7 +20,9 @@ import {
 import { getAllTemplateNames, getTemplates } from "@astar-network/swanky-templates";
 import { BaseCommand } from "../../lib/baseCommand";
 import globby = require("globby");
-import inquirerFileTreeSelection from "inquirer-file-tree-selection-prompt";
+
+import inquirerFuzzyPath from "inquirer-fuzzy-path";
+
 const {
   DEFAULT_ASTAR_NETWORK_URL,
   DEFAULT_NETWORK_URL,
@@ -40,7 +42,8 @@ interface Task {
   callback?: (param: string) => void;
 }
 
-inquirer.registerPrompt("file-tree-selection", inquirerFileTreeSelection);
+inquirer.registerPrompt("fuzzypath", inquirerFuzzyPath);
+
 export class Init extends BaseCommand {
   static description = "Generate a new smart contract environment";
 
@@ -307,12 +310,12 @@ async function getManualPaths(pathToProject: string) {
   console.log("No Cargo.toml found in the provided directory, or no workspace field within it.");
   const { contractsDirectory, cratesDirectory, useCrateDirectory } = await inquirer.prompt([
     {
-      type: "file-tree-selection",
+      type: "fuzzypath",
       name: "contractsDirectory",
-      onlyShowDir: true,
-      root: pathToProject,
+      itemType: "directory",
+      rootPath: pathToProject,
       message: "Please enter the path to the contracts directory: ",
-      hideRoot: true,
+      excludePath: (nodePath: string) => nodePath.startsWith("node_modules"),
     },
     {
       type: "confirm",
@@ -322,11 +325,12 @@ async function getManualPaths(pathToProject: string) {
     },
     {
       when: (answers) => answers.useCrateDirectory,
-      type: "file-tree-selection",
+      type: "fuzzypath",
       name: "cratesDirectory",
-      onlyShowDir: true,
-      root: pathToProject,
+      itemType: "directory",
+      rootPath: pathToProject,
       message: "Please enter the path to the contracts directory: ",
+      excludePath: (nodePath: string) => nodePath.startsWith("node_modules"),
     },
   ]);
 
diff --git a/yarn.lock b/yarn.lock
index 46634e05..5fc98f91 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1972,6 +1972,21 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
   integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
 
+"@types/inquirer-autocomplete-prompt@^2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-2.0.0.tgz#8b60cab59bb6b4c2f1885cb86316f0aa82fa24c9"
+  integrity sha512-KgzR9j7R2hyhnLAdYjZ4EzjspnLENrcqZyKXphBAeN2/9qvHpd4lTxSWKkTuG8aeTPM9/5Fk0IGqSJCTkV+ZVw==
+  dependencies:
+    "@types/inquirer" "^8"
+
+"@types/inquirer-fuzzy-path@^2.3.6":
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/@types/inquirer-fuzzy-path/-/inquirer-fuzzy-path-2.3.6.tgz#bc7a1e32c93ac7d60d1bd158b3843948b67a856e"
+  integrity sha512-O/XTBIu5rcPVO752pfvsIgf2AiZ7RlPjuVGzL9KIexPYAz0N2CD4CbcAebTlfVWsJ55kYOblXjz/7tnQYgi8yQ==
+  dependencies:
+    "@types/inquirer" "^8"
+    "@types/inquirer-autocomplete-prompt" "^2"
+
 "@types/inquirer@8.2.5":
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-8.2.5.tgz#c508423bcc11126db278170ab07347783ac2300c"
@@ -1979,6 +1994,14 @@
   dependencies:
     "@types/through" "*"
 
+"@types/inquirer@^8":
+  version "8.2.6"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-8.2.6.tgz#abd41a5fb689c7f1acb12933d787d4262a02a0ab"
+  integrity sha512-3uT88kxg8lNzY8ay2ZjP44DKcRaTGztqeIvN2zHvhzIBH/uAPaL75aBtdNRKbA7xXoMbBt5kX0M00VKAnfOYlA==
+  dependencies:
+    "@types/through" "*"
+    rxjs "^7.2.0"
+
 "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
@@ -2358,12 +2381,12 @@ ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
   integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
-ansi-escapes@^3.1.0:
+ansi-escapes@^3.1.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.2:
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.1, ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -2380,6 +2403,11 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
   integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
+ansi-regex@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -2843,7 +2871,7 @@ chalk@^1.0.0:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2934,13 +2962,20 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha512-3Fo5wu8Ytle8q9iCzS4D2MWVL2X7JVWRiS1BnXbTFDhS9c/REkM9vd1AmabsoZoY5/dGi5TT9iKL8Kb6DeBRQg==
 
-cli-cursor@3.1.0, cli-cursor@^3, cli-cursor@^3.1.0:
+cli-cursor@3.1.0, cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
     restore-cursor "^3.1.0"
 
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
+  dependencies:
+    restore-cursor "^2.0.0"
+
 cli-progress@^3.12.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.12.0.tgz#807ee14b66bcc086258e444ad0f19e7d42577942"
@@ -2973,6 +3008,11 @@ cli-truncate@^2.1.0:
     slice-ansi "^3.0.0"
     string-width "^4.2.0"
 
+cli-width@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
 cli-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
@@ -3927,13 +3967,20 @@ fetch-blob@^3.1.2, fetch-blob@^3.1.4:
     node-domexception "^1.0.0"
     web-streams-polyfill "^3.0.3"
 
-figures@3.2.0, figures@^3, figures@^3.0.0:
+figures@3.2.0, figures@^3.0.0, figures@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -4135,6 +4182,11 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
 
+fuzzy@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
+  integrity sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w==
+
 gauge@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
@@ -4678,16 +4730,27 @@ init-package-json@^3.0.2:
     validate-npm-package-license "^3.0.4"
     validate-npm-package-name "^4.0.0"
 
-inquirer-file-tree-selection-prompt@^1:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/inquirer-file-tree-selection-prompt/-/inquirer-file-tree-selection-prompt-1.0.19.tgz#40fa05991a6ab4bda4dad6116f07a8892627c3d2"
-  integrity sha512-aL01njANm5bJhQtUNBKWurniroUJ9I+rnJ20DBG3xY9gtKBxgpRFSRs0lzjx42iCRJ4J083IZ2SrN4t8ejPlEQ==
+inquirer-autocomplete-prompt@^1.0.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.4.0.tgz#e767592f747e3d5bb6336fe71fb4094352e4c317"
+  integrity sha512-qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw==
   dependencies:
+    ansi-escapes "^4.3.1"
     chalk "^4.0.0"
-    cli-cursor "^3"
-    figures "^3"
-    lodash "^4.17.11"
-    rxjs "^7.5.2"
+    figures "^3.2.0"
+    run-async "^2.4.0"
+    rxjs "^6.6.2"
+
+inquirer-fuzzy-path@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer-fuzzy-path/-/inquirer-fuzzy-path-2.3.0.tgz#9bc51dc47d7d9c7eb53daac7fd7c9e615eb040c5"
+  integrity sha512-zfHC/97GSkxKKM7IctZM22x1sVi+FYBh9oaHTmI7Er/GKFpNykUgtviTmqqpiFQs5yJoSowxbT0PHy6N+H+QRg==
+  dependencies:
+    ansi-styles "^3.2.1"
+    fuzzy "^0.1.3"
+    inquirer "^6.0.0"
+    inquirer-autocomplete-prompt "^1.0.2"
+    strip-ansi "^4.0.0"
 
 inquirer@8.2.5, inquirer@^8.0.0, inquirer@^8.2.4:
   version "8.2.5"
@@ -4710,6 +4773,25 @@ inquirer@8.2.5, inquirer@^8.0.0, inquirer@^8.2.4:
     through "^2.3.6"
     wrap-ansi "^7.0.0"
 
+inquirer@^6.0.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.12"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
 interpret@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
@@ -5264,7 +5346,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5505,6 +5587,11 @@ mime-types@^2.1.12:
   dependencies:
     mime-db "1.52.0"
 
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -5775,6 +5862,11 @@ multimatch@^5.0.0:
     arrify "^2.0.1"
     minimatch "^3.0.4"
 
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
+
 mute-stream@0.0.8, mute-stream@~0.0.4:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -6211,6 +6303,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
+  dependencies:
+    mimic-fn "^1.0.0"
+
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -6972,6 +7071,14 @@ responselike@^2.0.0:
   dependencies:
     lowercase-keys "^2.0.0"
 
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -7002,7 +7109,7 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-run-async@^2.0.0, run-async@^2.4.0:
+run-async@^2.0.0, run-async@^2.2.0, run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
@@ -7014,6 +7121,13 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+rxjs@^6.4.0, rxjs@^6.6.2:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 rxjs@^7.0.0, rxjs@^7.5.5, rxjs@^7.8.0:
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
@@ -7021,7 +7135,7 @@ rxjs@^7.0.0, rxjs@^7.5.5, rxjs@^7.8.0:
   dependencies:
     tslib "^2.1.0"
 
-rxjs@^7.5.2:
+rxjs@^7.2.0:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
   integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
@@ -7355,7 +7469,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^2.0.0:
+string-width@^2.0.0, string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -7391,6 +7505,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -7720,7 +7841,7 @@ tslib@2.5.0, tslib@^2, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, t
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
   integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
 
-tslib@^1.8.1:
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

From 6442522d63443dd471c1cfca1b7812e648ec8729 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 2 May 2023 22:30:56 +0300
Subject: [PATCH 16/46] add test detection

---
 packages/cli/src/commands/init/index.ts | 99 ++++++++++++++++++++-----
 1 file changed, 80 insertions(+), 19 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index e1277f6c..03a26888 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -1,6 +1,6 @@
 import { Args, Flags } from "@oclif/core";
 import path = require("node:path");
-import { ensureDir, writeJSON, stat, readdir, pathExists, readFile } from "fs-extra";
+import { ensureDir, writeJSON, stat, readdir, pathExists, readFile, Dirent } from "fs-extra";
 import execa = require("execa");
 import { paramCase, pascalCase, snakeCase } from "change-case";
 import inquirer = require("inquirer");
@@ -42,6 +42,18 @@ interface Task {
   callback?: (param: string) => void;
 }
 
+type PathEntry = {
+  dirent: Dirent;
+  name: string;
+  path: string;
+};
+
+type CopyCandidates = {
+  contracts: PathEntry[];
+  additionalPaths: PathEntry[];
+  tests?: PathEntry[];
+};
+
 inquirer.registerPrompt("fuzzypath", inquirerFuzzyPath);
 
 export class Init extends BaseCommand {
@@ -267,7 +279,6 @@ export class Init extends BaseCommand {
       throw error;
     }
 
-    // 2. Look for cargo.toml with "workspace" field in the root
     let rootTomlPaths = await getRootCargoToml(pathToExistingProject);
 
     if (rootTomlPaths) {
@@ -277,14 +288,58 @@ export class Init extends BaseCommand {
       ]);
       rootTomlPaths = shouldKeepRootToml ? rootTomlPaths : null;
     }
-    console.log(rootTomlPaths);
-    const candidatesList = rootTomlPaths
+
+    const candidatesList: CopyCandidates = rootTomlPaths
       ? await getCopyCandidatesList(pathToExistingProject, rootTomlPaths)
       : await getCopyCandidatesList(
           pathToExistingProject,
           await getManualPaths(pathToExistingProject)
         );
 
+    const testDirNames = ["test", "tests", "spec", "specs"];
+
+    let testDir = undefined;
+
+    for (const testDirName of testDirNames) {
+      const testDirCandidate = path.resolve(pathToExistingProject, testDirName);
+      const testDirExists = await pathExists(testDirCandidate);
+      if (testDirExists) {
+        testDir = testDirCandidate;
+        break;
+      }
+    }
+
+    const { shouldOverwriteTestDir, manualTestDir } = await inquirer.prompt([
+      {
+        type: "confirm",
+        name: "shouldOverwriteTestDir",
+        message: `${
+          testDir
+            ? `Detected test directory [${path.basename(
+                testDir
+              )}] will be copied. Do you want to override and`
+            : "No test directory detected, do you want to"
+        } specify it manually?`,
+        default: false,
+      },
+      {
+        when: (answers) => answers.shouldOverwriteTestDir,
+        type: "fuzzypath",
+        name: "manualTestDir",
+        itemType: "directory",
+        rootPath: pathToExistingProject,
+        message: "Please enter the path to the contracts directory: ",
+        excludePath: (nodePath: string) => nodePath.startsWith("node_modules"),
+      },
+    ]);
+    if (shouldOverwriteTestDir) {
+      testDir = manualTestDir;
+    }
+
+    candidatesList.tests = (await pathExists(testDir))
+      ? await getDirsAndFiles(pathToExistingProject, [testDir])
+      : [];
+
     console.log("Candidates list: ", candidatesList);
   }
 }
@@ -348,16 +403,10 @@ async function getCopyCandidatesList(
   }
 ) {
   const detectedPaths = {
-    contracts: [
-      ...(await getGlobPaths(projectPath, pathsToCopy.contractsDirectories, false)),
-      ...(await getGlobPaths(projectPath, pathsToCopy.contractsDirectories, true)),
-    ],
+    contracts: await getDirsAndFiles(projectPath, pathsToCopy.contractsDirectories),
     additionalPaths:
       pathsToCopy.cratesDirectories && pathsToCopy.cratesDirectories.length > 0
-        ? [
-            ...(await getGlobPaths(projectPath, pathsToCopy.cratesDirectories, false)),
-            ...(await getGlobPaths(projectPath, pathsToCopy.cratesDirectories, true)),
-          ]
+        ? await getDirsAndFiles(projectPath, pathsToCopy.cratesDirectories)
         : [],
   };
 
@@ -376,10 +425,22 @@ async function getGlobPaths(projectPath: string, globList: string[], isDirOnly:
   );
 }
 
-// 4. make a list (checkbox) for user to confirm contracts to copy
-// 5. add directories from Cargo.toml/exclude path to copy list
-// 6. look for test/tests directory and add it to the list
-// 7. copy all the selected directories/files and update the swanky.config
-// 8. copy cargo.toml from the root, modify path if needed ( "uniswap-v2/contracts/**" -> "contracts/**")
-// 9. keep log of all the steps and write it to file
-// 10. Copy rust.toolchain and .rustfmt.toml if exists
+async function getDirsAndFiles(projectPath: string, globList: string[]) {
+  return [
+    ...(await getGlobPaths(projectPath, globList, false)),
+    ...(await getGlobPaths(projectPath, globList, true)),
+  ];
+}
+
+//[X] 1. Check if the project is a directory, or is it empty
+//[X] 2. Look for cargo.toml with "workspace" field in the root
+//[X] 3a. Workspace found - use the glob in the "members field" to select directories to copy over
+//[X] 3b. if not found, ask user for a path where contracts are -> [Ctrl+C to cancel]
+//[X] 4. add directories from Cargo.toml/exclude path to copy list
+//[ ] 5. make a list (checkbox) for user to confirm contracts/crates/files to copy
+//[X] 6. look for test/tests directory and add it to the list (also take manual input)
+//[ ] 7. copy all the selected directories/files and update the swanky.config
+//[ ] 8. copy cargo.toml from the root, modify path if needed ( "uniswap-v2/contracts/**" -> "contracts/**")
+//[ ] 9. keep log of all the steps and write it to file
+//[ ] 10. Copy rust.toolchain and .rustfmt.toml if exists
+//[ ] 11. Merge package.json from imported project into the one generated from template

From ea712e45269730ce23ebdad60278083030afc679 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 2 May 2023 23:52:07 +0300
Subject: [PATCH 17/46] confirmed files to copy

---
 packages/cli/src/commands/init/index.ts | 130 ++++++++++++++++--------
 1 file changed, 89 insertions(+), 41 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 03a26888..6a368954 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -296,56 +296,104 @@ export class Init extends BaseCommand {
           await getManualPaths(pathToExistingProject)
         );
 
-    const testDirNames = ["test", "tests", "spec", "specs"];
-
-    let testDir = undefined;
-
-    for (const testDirName of testDirNames) {
-      const testDirCandidate = path.resolve(pathToExistingProject, testDirName);
-      const testDirExists = await pathExists(testDirCandidate);
-      if (testDirExists) {
-        testDir = testDirCandidate;
-        break;
-      }
-    }
-
-    const { shouldOverwriteTestDir, manualTestDir } = await inquirer.prompt([
-      {
-        type: "confirm",
-        name: "shouldOverwriteTestDir",
-        message: `${
-          testDir
-            ? `Detected test directory [${path.basename(
-                testDir
-              )}] will be copied. Do you want to override and`
-            : "No test directory detected, do you want to"
-        } specify it manually?`,
-        default: false,
-      },
-      {
-        when: (answers) => answers.shouldOverwriteTestDir,
-        type: "fuzzypath",
-        name: "manualTestDir",
-        itemType: "directory",
-        rootPath: pathToExistingProject,
-        message: "Please enter the path to the contracts directory: ",
-        excludePath: (nodePath: string) => nodePath.startsWith("node_modules"),
-      },
-    ]);
-    if (shouldOverwriteTestDir) {
-      testDir = manualTestDir;
-    }
+    const testDir = await detectTests(pathToExistingProject);
 
     candidatesList.tests = (await pathExists(testDir))
       ? await getDirsAndFiles(pathToExistingProject, [testDir])
       : [];
 
-    console.log("Candidates list: ", candidatesList);
+    const confirmedCopyList = await confirmCopyList(candidatesList);
+    console.log("Candidates list: ", confirmedCopyList);
   }
 }
 
 // async function copyWorkspaceContracts() {}
 
+async function confirmCopyList(candidatesList: CopyCandidates) {
+  if (!candidatesList.tests) candidatesList.tests = [];
+
+  const { confirmedCopyList } = await inquirer.prompt({
+    message: "Please review  the list of files and directories to copy:",
+    name: "confirmedCopyList",
+    type: "checkbox",
+    choices: [
+      new inquirer.Separator("=====Contracts====="),
+      ...candidatesList.contracts.map((contract) => ({
+        name: `${contract.name}${contract.dirent.isDirectory() ? "/" : ""}`,
+        value: { ...contract, group: "contracts" },
+        checked: true,
+      })),
+      new inquirer.Separator("=====Crates====="),
+      ...candidatesList.additionalPaths.map((path) => ({
+        name: `${path.name}${path.dirent.isDirectory() ? "/" : ""}`,
+        value: { ...path, group: "additionalPaths" },
+        checked: true,
+      })),
+      new inquirer.Separator("=====Tests====="),
+      ...candidatesList.tests.map((test) => ({
+        name: `${test.name}${test.dirent.isDirectory() ? "/" : ""}`,
+        value: { ...test, group: "tests" },
+        checked: true,
+      })),
+    ],
+  });
+
+  const resultingList: CopyCandidates = { contracts: [], additionalPaths: [], tests: [] };
+  confirmedCopyList.forEach(
+    (
+      item: PathEntry & {
+        group: "contracts" | "additionalPaths" | "tests";
+      }
+    ) => {
+      resultingList[item.group]?.push(item);
+    }
+  );
+  return resultingList;
+}
+
+async function detectTests(pathToExistingProject: string) {
+  const testDirNames = ["test", "tests", "spec", "specs"];
+
+  let testDir = undefined;
+
+  for (const testDirName of testDirNames) {
+    const testDirCandidate = path.resolve(pathToExistingProject, testDirName);
+    const testDirExists = await pathExists(testDirCandidate);
+    if (testDirExists) {
+      testDir = testDirCandidate;
+      break;
+    }
+  }
+
+  const { shouldOverwriteTestDir, manualTestDir } = await inquirer.prompt([
+    {
+      type: "confirm",
+      name: "shouldOverwriteTestDir",
+      message: `${
+        testDir
+          ? `Detected test directory [${path.basename(
+              testDir
+            )}] will be copied. Do you want to override and`
+          : "No test directory detected, do you want to"
+      } specify it manually?`,
+      default: false,
+    },
+    {
+      when: (answers) => answers.shouldOverwriteTestDir,
+      type: "fuzzypath",
+      name: "manualTestDir",
+      itemType: "directory",
+      rootPath: pathToExistingProject,
+      message: "Please enter the path to the contracts directory: ",
+      excludePath: (nodePath: string) => nodePath.startsWith("node_modules"),
+    },
+  ]);
+  if (shouldOverwriteTestDir) {
+    return manualTestDir;
+  }
+  return testDir;
+}
+
 async function getRootCargoToml(pathToProject: string) {
   const rootTomlPath = path.resolve(pathToProject, "Cargo.toml");
   if (!(await pathExists(rootTomlPath))) return null;
@@ -437,7 +485,7 @@ async function getDirsAndFiles(projectPath: string, globList: string[]) {
 //[X] 3a. Workspace found - use the glob in the "members field" to select directories to copy over
 //[X] 3b. if not found, ask user for a path where contracts are -> [Ctrl+C to cancel]
 //[X] 4. add directories from Cargo.toml/exclude path to copy list
-//[ ] 5. make a list (checkbox) for user to confirm contracts/crates/files to copy
+//[X] 5. make a list (checkbox) for user to confirm contracts/crates/files to copy
 //[X] 6. look for test/tests directory and add it to the list (also take manual input)
 //[ ] 7. copy all the selected directories/files and update the swanky.config
 //[ ] 8. copy cargo.toml from the root, modify path if needed ( "uniswap-v2/contracts/**" -> "contracts/**")

From e58c56cfe3e6fae54ab99945862d7ee58faabc65 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 8 May 2023 08:11:50 +0300
Subject: [PATCH 18/46] wip: copy selected files and dirs

---
 packages/cli/src/commands/init/index.ts | 48 +++++++++++++++++++------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 6a368954..03347666 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -1,6 +1,6 @@
 import { Args, Flags } from "@oclif/core";
 import path = require("node:path");
-import { ensureDir, writeJSON, stat, readdir, pathExists, readFile, Dirent } from "fs-extra";
+import { ensureDir, writeJSON, stat, readdir, pathExists, readFile, Dirent, copy } from "fs-extra";
 import execa = require("execa");
 import { paramCase, pascalCase, snakeCase } from "change-case";
 import inquirer = require("inquirer");
@@ -50,7 +50,7 @@ type PathEntry = {
 
 type CopyCandidates = {
   contracts: PathEntry[];
-  additionalPaths: PathEntry[];
+  crates: PathEntry[];
   tests?: PathEntry[];
 };
 
@@ -108,6 +108,7 @@ export class Init extends BaseCommand {
       shiden: { url: DEFAULT_SHIDEN_NETWORK_URL },
       shibuya: { url: DEFAULT_SHIBUYA_NETWORK_URL },
     },
+    contracts: {},
   };
 
   taskQueue: Task[] = [];
@@ -131,7 +132,6 @@ export class Init extends BaseCommand {
 
     if (flags.convert) {
       await this.convert(flags.convert);
-      return;
     } else {
       await this.generate(args.projectName);
     }
@@ -303,17 +303,43 @@ export class Init extends BaseCommand {
       : [];
 
     const confirmedCopyList = await confirmCopyList(candidatesList);
-    console.log("Candidates list: ", confirmedCopyList);
+
+    this.taskQueue.push({
+      task: copyWorkspaceContracts,
+      args: [confirmedCopyList, this.projectPath],
+      runningMessage: "Copying existing project files",
+      successMessage: "Project files successfully copied",
+      failMessage: "Failed to copy project files",
+      shouldExitOnError: true,
+      callback: (result) => {
+        console.log(result);
+      },
+    });
   }
 }
 
-// async function copyWorkspaceContracts() {}
+async function copyWorkspaceContracts(copyList: CopyCandidates, projectPath: string) {
+  const copyPaths = async (group: "contracts" | "tests" | "crates") => {
+    const destDir = path.resolve(projectPath, group);
+    await ensureDir(destDir);
+
+    for (const entry of copyList[group] as PathEntry[]) {
+      const basename = path.basename(entry.path);
+      const destPath = path.join(destDir, basename);
+      await copy(entry.path, destPath);
+    }
+  };
+
+  await copyPaths("contracts");
+  await copyPaths("tests");
+  await copyPaths("crates");
+}
 
 async function confirmCopyList(candidatesList: CopyCandidates) {
   if (!candidatesList.tests) candidatesList.tests = [];
 
   const { confirmedCopyList } = await inquirer.prompt({
-    message: "Please review  the list of files and directories to copy:",
+    message: "Please review the list of files and directories to copy:",
     name: "confirmedCopyList",
     type: "checkbox",
     choices: [
@@ -324,9 +350,9 @@ async function confirmCopyList(candidatesList: CopyCandidates) {
         checked: true,
       })),
       new inquirer.Separator("=====Crates====="),
-      ...candidatesList.additionalPaths.map((path) => ({
+      ...candidatesList.crates.map((path) => ({
         name: `${path.name}${path.dirent.isDirectory() ? "/" : ""}`,
-        value: { ...path, group: "additionalPaths" },
+        value: { ...path, group: "crates" },
         checked: true,
       })),
       new inquirer.Separator("=====Tests====="),
@@ -338,11 +364,11 @@ async function confirmCopyList(candidatesList: CopyCandidates) {
     ],
   });
 
-  const resultingList: CopyCandidates = { contracts: [], additionalPaths: [], tests: [] };
+  const resultingList: CopyCandidates = { contracts: [], crates: [], tests: [] };
   confirmedCopyList.forEach(
     (
       item: PathEntry & {
-        group: "contracts" | "additionalPaths" | "tests";
+        group: "contracts" | "crates" | "tests";
       }
     ) => {
       resultingList[item.group]?.push(item);
@@ -452,7 +478,7 @@ async function getCopyCandidatesList(
 ) {
   const detectedPaths = {
     contracts: await getDirsAndFiles(projectPath, pathsToCopy.contractsDirectories),
-    additionalPaths:
+    crates:
       pathsToCopy.cratesDirectories && pathsToCopy.cratesDirectories.length > 0
         ? await getDirsAndFiles(projectPath, pathsToCopy.cratesDirectories)
         : [],

From a3a64a013a2957eaceaf15b61b981149fb7a59b3 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 8 May 2023 10:45:45 +0300
Subject: [PATCH 19/46] replace TOML lib

---
 packages/cli/package.json                |   5 +-
 packages/cli/src/commands/check/index.ts |   4 +-
 yarn.lock                                | 706 +++++++++++++++--------
 3 files changed, 480 insertions(+), 235 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6eaa606c..b86cb42c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -19,13 +19,13 @@
   "dependencies": {
     "@astar-network/swanky-core": "^2.0.0",
     "@astar-network/swanky-templates": "^2.0.0",
+    "@iarna/toml": "^2.2.5",
     "@oclif/core": "2.5.0",
     "@oclif/plugin-help": "5.2.7",
     "@oclif/plugin-plugins": "2.3.2",
     "@oclif/plugin-version": "1.2.1",
     "@polkadot/util": "11.0.1",
     "@polkadot/util-crypto": "11.0.1",
-    "@types/shelljs": "0.8.11",
     "chalk": "4",
     "change-case": "4.1.2",
     "execa": "5.1.1",
@@ -40,7 +40,6 @@
     "mochawesome": "7.1.3",
     "semver": "7.3.8",
     "shelljs": "0.8.5",
-    "toml": "3.0.0",
     "ts-mocha": "^10.0.0",
     "typescript": "4.9.5"
   },
@@ -48,11 +47,13 @@
     "@oclif/test": "2.3.9",
     "@types/chai": "4",
     "@types/fs-extra": "9.0.13",
+    "@types/iarna__toml": "^2.0.2",
     "@types/inquirer": "8.2.5",
     "@types/inquirer-fuzzy-path": "^2.3.6",
     "@types/mocha": "9.0.0",
     "@types/node": "18.11.9",
     "@types/semver": "7.3.10",
+    "@types/shelljs": "0.8.11",
     "@typescript-eslint/eslint-plugin": "5.35.1",
     "@typescript-eslint/parser": "5.35.1",
     "chai": "4",
diff --git a/packages/cli/src/commands/check/index.ts b/packages/cli/src/commands/check/index.ts
index d5682ac4..09e1c056 100644
--- a/packages/cli/src/commands/check/index.ts
+++ b/packages/cli/src/commands/check/index.ts
@@ -3,7 +3,7 @@ import { Listr } from "listr2";
 import { commandStdoutOrNull, ensureSwankyProject, SwankyConfig } from "@astar-network/swanky-core";
 import fs = require("fs-extra");
 import path = require("node:path");
-import toml = require("toml");
+import TOML from "@iarna/toml";
 import semver = require("semver");
 
 interface Ctx {
@@ -78,7 +78,7 @@ export default class Check extends Command {
               encoding: "utf8",
             });
 
-            const cargoToml = toml.parse(cargoTomlString);
+            const cargoToml = TOML.parse(cargoTomlString);
 
             const inkDependencies = Object.entries(cargoToml.dependencies)
               .filter((dependency) => dependency[0].includes("ink_"))
diff --git a/yarn.lock b/yarn.lock
index 5fc98f91..3a42ef2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,6 +31,13 @@
     core-js-pure "^3.25.1"
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.20.13", "@babel/runtime@^7.20.6":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
+  integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@chevrotain/cst-dts-gen@10.5.0":
   version "10.5.0"
   resolved "https://registry.yarnpkg.com/@chevrotain/cst-dts-gen/-/cst-dts-gen-10.5.0.tgz#922ebd8cc59d97241bb01b1b17561a5c1ae0124e"
@@ -109,6 +116,11 @@
   resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
   integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
 
+"@iarna/toml@^2.2.5":
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
+  integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
+
 "@isaacs/string-locale-compare@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
@@ -1483,91 +1495,100 @@
   dependencies:
     esquery "^1.0.1"
 
-"@polkadot/api-augment@10.0.1", "@polkadot/api-augment@9.14.2":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-augment/-/api-augment-10.0.1.tgz#b8e7766e1d89e3ee753ae053e3edd21ddc0c780c"
-  integrity sha512-VOMkUurEZ/r27Sx5zeGACApm4wLZx5bsxo8sWxaVE1enZvob1JpzGuN12rTlMr0ej4Az8BxvlGbcT3fQYw275Q==
-  dependencies:
-    "@polkadot/api-base" "10.0.1"
-    "@polkadot/rpc-augment" "10.0.1"
-    "@polkadot/types" "10.0.1"
-    "@polkadot/types-augment" "10.0.1"
-    "@polkadot/types-codec" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    tslib "^2.5.0"
-
-"@polkadot/api-base@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-base/-/api-base-10.0.1.tgz#c3f19b5ea483ba642e98724364b58c9e16ba26fe"
-  integrity sha512-yuCgHYQU7Tn32I4sNk5Qb/OwB85ICXCfWja95watbEP6os601IllI6s7JhFx3G4fjvfI94DzewOnOhhBHt+2SA==
-  dependencies:
-    "@polkadot/rpc-core" "10.0.1"
-    "@polkadot/types" "10.0.1"
-    "@polkadot/util" "^11.0.1"
+"@polkadot/api-augment@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-augment/-/api-augment-9.14.2.tgz#2c49cdcfdf7057523db1dc8d7b0801391a8a2e69"
+  integrity sha512-19MmW8AHEcLkdcUIo3LLk0eCQgREWqNSxkUyOeWn7UiNMY1AhDOOwMStUBNCvrIDK6VL6GGc1sY7rkPCLMuKSw==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/api-base" "9.14.2"
+    "@polkadot/rpc-augment" "9.14.2"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/types-augment" "9.14.2"
+    "@polkadot/types-codec" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+
+"@polkadot/api-base@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-base/-/api-base-9.14.2.tgz#605b44e3692a125bd8d97eed9cea8af9d0c454e2"
+  integrity sha512-ky9fmzG1Tnrjr/SBZ0aBB21l0TFr+CIyQenQczoUyVgiuxVaI/2Bp6R2SFrHhG28P+PW2/RcYhn2oIAR2Z2fZQ==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/rpc-core" "9.14.2"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/util" "^10.4.2"
     rxjs "^7.8.0"
-    tslib "^2.5.0"
 
-"@polkadot/api-contract@10.0.1", "@polkadot/api-contract@9.14.2":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-10.0.1.tgz#cc2ab107a4d78388ede7cab6018162f16e32cecb"
-  integrity sha512-VLMx3/2eCzuY76ExvEkxeKT0RWS4Fnsn5Shb1YumCWsLNocLO5p/XK6eRU0BaCs+X7zHD1YDF+/5tht/nhuiJA==
-  dependencies:
-    "@polkadot/api" "10.0.1"
-    "@polkadot/types" "10.0.1"
-    "@polkadot/types-codec" "10.0.1"
-    "@polkadot/types-create" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    "@polkadot/util-crypto" "^11.0.1"
+"@polkadot/api-contract@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-9.14.2.tgz#42ca46eecd6cef64b6c453b452bdb5d22a29b6a3"
+  integrity sha512-gAAHEh+tOIKuAJWxbAuB8Imo+Z8s0FHdICN6/q4JOxBhONJNA9beHB4wmqWSKvYqYmWrJvtv3HensLaITzAcrQ==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/api" "9.14.2"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/types-codec" "9.14.2"
+    "@polkadot/types-create" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+    "@polkadot/util-crypto" "^10.4.2"
     rxjs "^7.8.0"
-    tslib "^2.5.0"
 
-"@polkadot/api-derive@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-10.0.1.tgz#fa62a5dc9301167fc628483a6bce65fd5f5a8adc"
-  integrity sha512-btiE/ATJybKqBBYQvjujXZ+WrMfzwNvKRGI84cbEYnX4OHIo47O/v+zGQ2nUhbOfcJFa8FBU6dB9fMTBRl2R5g==
-  dependencies:
-    "@polkadot/api" "10.0.1"
-    "@polkadot/api-augment" "10.0.1"
-    "@polkadot/api-base" "10.0.1"
-    "@polkadot/rpc-core" "10.0.1"
-    "@polkadot/types" "10.0.1"
-    "@polkadot/types-codec" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    "@polkadot/util-crypto" "^11.0.1"
+"@polkadot/api-derive@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-9.14.2.tgz#e8fcd4ee3f2b80b9fe34d4dec96169c3bdb4214d"
+  integrity sha512-yw9OXucmeggmFqBTMgza0uZwhNjPxS7MaT7lSCUIRKckl1GejdV+qMhL3XFxPFeYzXwzFpdPG11zWf+qJlalqw==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/api" "9.14.2"
+    "@polkadot/api-augment" "9.14.2"
+    "@polkadot/api-base" "9.14.2"
+    "@polkadot/rpc-core" "9.14.2"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/types-codec" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+    "@polkadot/util-crypto" "^10.4.2"
     rxjs "^7.8.0"
-    tslib "^2.5.0"
 
-"@polkadot/api@10.0.1", "@polkadot/api@9.14.2":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-10.0.1.tgz#ff3272e9f3d5d8c6d7c9e842f0a11c1c6a462265"
-  integrity sha512-XDJwGqtnFKWlY2kEGOCOAFhczgUxwNZ553zVbmkR65eK4gVlCwIMHLkU/rPlPf/QShrTCZXQhaS/HwIXeFHIvw==
-  dependencies:
-    "@polkadot/api-augment" "10.0.1"
-    "@polkadot/api-base" "10.0.1"
-    "@polkadot/api-derive" "10.0.1"
-    "@polkadot/keyring" "^11.0.1"
-    "@polkadot/rpc-augment" "10.0.1"
-    "@polkadot/rpc-core" "10.0.1"
-    "@polkadot/rpc-provider" "10.0.1"
-    "@polkadot/types" "10.0.1"
-    "@polkadot/types-augment" "10.0.1"
-    "@polkadot/types-codec" "10.0.1"
-    "@polkadot/types-create" "10.0.1"
-    "@polkadot/types-known" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    "@polkadot/util-crypto" "^11.0.1"
+"@polkadot/api@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-9.14.2.tgz#d5cee02236654c6063d7c4b70c78c290db5aba8d"
+  integrity sha512-R3eYFj2JgY1zRb+OCYQxNlJXCs2FA+AU4uIEiVcXnVLmR3M55tkRNEwYAZmiFxx0pQmegGgPMc33q7TWGdw24A==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/api-augment" "9.14.2"
+    "@polkadot/api-base" "9.14.2"
+    "@polkadot/api-derive" "9.14.2"
+    "@polkadot/keyring" "^10.4.2"
+    "@polkadot/rpc-augment" "9.14.2"
+    "@polkadot/rpc-core" "9.14.2"
+    "@polkadot/rpc-provider" "9.14.2"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/types-augment" "9.14.2"
+    "@polkadot/types-codec" "9.14.2"
+    "@polkadot/types-create" "9.14.2"
+    "@polkadot/types-known" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+    "@polkadot/util-crypto" "^10.4.2"
     eventemitter3 "^5.0.0"
     rxjs "^7.8.0"
-    tslib "^2.5.0"
 
-"@polkadot/keyring@10.4.2", "@polkadot/keyring@11.0.1", "@polkadot/keyring@^11.0.1":
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-11.0.1.tgz#e03de854f15ae68b5797137604d5055e55412bac"
-  integrity sha512-ypQs9cYp/WsmHPvnv4RowbVyZTdOg8rIvcHj6Ols3sqJbQXVn9rfWZTS2l341d9z4kJtmqwbSdKAVV0GT+Mj1A==
+"@polkadot/keyring@10.4.2", "@polkadot/keyring@^10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-10.4.2.tgz#793377fdb9076df0af771df11388faa6be03c70d"
+  integrity sha512-7iHhJuXaHrRTG6cJDbZE9G+c1ts1dujp0qbO4RfAPmT7YUvphHvAtCKueN9UKPz5+TYDL+rP/jDEaSKU8jl/qQ==
   dependencies:
-    "@polkadot/util" "11.0.1"
-    "@polkadot/util-crypto" "11.0.1"
-    tslib "^2.5.0"
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/util" "10.4.2"
+    "@polkadot/util-crypto" "10.4.2"
+
+"@polkadot/networks@10.4.2", "@polkadot/networks@^10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-10.4.2.tgz#d7878c6aad8173c800a21140bfe5459261724456"
+  integrity sha512-FAh/znrEvWBiA/LbcT5GXHsCFUl//y9KqxLghSr/CreAmAergiJNT0MVUezC7Y36nkATgmsr4ylFwIxhVtuuCw==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/util" "10.4.2"
+    "@substrate/ss58-registry" "^1.38.0"
 
 "@polkadot/networks@11.0.1":
   version "11.0.1"
@@ -1578,121 +1599,129 @@
     "@substrate/ss58-registry" "^1.39.0"
     tslib "^2.5.0"
 
-"@polkadot/networks@^11.0.1":
-  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-11.1.3.tgz#e113c98269328267962c2047dccca4d2790cc8a5"
-  integrity sha512-goLpX9SswAGGeh1jXB79wHEfWOF5rLIItMHYalujBmhQVxyAqbxP2tzQqPQXDLcnkWbgwkyYGLXaDD72GBqHZw==
-  dependencies:
-    "@polkadot/util" "11.1.3"
-    "@substrate/ss58-registry" "^1.39.0"
-    tslib "^2.5.0"
-
-"@polkadot/rpc-augment@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-augment/-/rpc-augment-10.0.1.tgz#f46a97543310837fd2feabc9419b9e8a6c68f9c0"
-  integrity sha512-DZK4V99qIhtSS9gaYL5BjsFoa5DxIunO3emxvc5V0jm3o5ZNejGDwRCZNL/atIt5tGyjosU6cYMmVvvgLuQbzg==
-  dependencies:
-    "@polkadot/rpc-core" "10.0.1"
-    "@polkadot/types" "10.0.1"
-    "@polkadot/types-codec" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    tslib "^2.5.0"
-
-"@polkadot/rpc-core@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-10.0.1.tgz#f6644c9e61c4001c76db2cc5cf80443d83cef26a"
-  integrity sha512-HuWFttfQknSfB0Xff+svDP1rba5cwLyOhJ4EDPxz2QcyChTdOCzHBymD9GLKZJEaGp+IT4VOcUPwLDMml1TG1A==
-  dependencies:
-    "@polkadot/rpc-augment" "10.0.1"
-    "@polkadot/rpc-provider" "10.0.1"
-    "@polkadot/types" "10.0.1"
-    "@polkadot/util" "^11.0.1"
+"@polkadot/rpc-augment@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-augment/-/rpc-augment-9.14.2.tgz#eb70d5511463dab8d995faeb77d4edfe4952fe26"
+  integrity sha512-mOubRm3qbKZTbP9H01XRrfTk7k5it9WyzaWAg72DJBQBYdgPUUkGSgpPD/Srkk5/5GAQTWVWL1I2UIBKJ4TJjQ==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/rpc-core" "9.14.2"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/types-codec" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+
+"@polkadot/rpc-core@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-9.14.2.tgz#26d4f00ac7abbf880f8280e9b96235880d35794b"
+  integrity sha512-krA/mtQ5t9nUQEsEVC1sjkttLuzN6z6gyJxK2IlpMS3S5ncy/R6w4FOpy+Q0H18Dn83JBo0p7ZtY7Y6XkK48Kw==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/rpc-augment" "9.14.2"
+    "@polkadot/rpc-provider" "9.14.2"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/util" "^10.4.2"
     rxjs "^7.8.0"
-    tslib "^2.5.0"
 
-"@polkadot/rpc-provider@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-10.0.1.tgz#ad94e2f0c357263a7ea5e1b6566f6e772ad0b38a"
-  integrity sha512-kv6uShbKgBZtoRcsxTVxpzkjRUqcd/cctG0lEqpy2BZU8koCnSu3XhooifcTm8jO17EUuC4Mm/wfM0DQKmojmQ==
-  dependencies:
-    "@polkadot/keyring" "^11.0.1"
-    "@polkadot/types" "10.0.1"
-    "@polkadot/types-support" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    "@polkadot/util-crypto" "^11.0.1"
-    "@polkadot/x-fetch" "^11.0.1"
-    "@polkadot/x-global" "^11.0.1"
-    "@polkadot/x-ws" "^11.0.1"
+"@polkadot/rpc-provider@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-9.14.2.tgz#0dea667f3a03bf530f202cba5cd360df19b32e30"
+  integrity sha512-YTSywjD5PF01V47Ru5tln2LlpUwJiSOdz6rlJXPpMaY53hUp7+xMU01FVAQ1bllSBNisSD1Msv/mYHq84Oai2g==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/keyring" "^10.4.2"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/types-support" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+    "@polkadot/util-crypto" "^10.4.2"
+    "@polkadot/x-fetch" "^10.4.2"
+    "@polkadot/x-global" "^10.4.2"
+    "@polkadot/x-ws" "^10.4.2"
     eventemitter3 "^5.0.0"
     mock-socket "^9.2.1"
     nock "^13.3.0"
-    tslib "^2.5.0"
   optionalDependencies:
-    "@substrate/connect" "0.7.20"
-
-"@polkadot/types-augment@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-augment/-/types-augment-10.0.1.tgz#5c3d40c2976510f893e11f6acde02d8fe0c40a8b"
-  integrity sha512-PK7CmZwamJiqIIuyeEfV2a1KsEKAuviTH7DkDZWb1aH8495hNkKx88JeTwotjTG6xrkaFZcEqF7UbhXCQs2zOA==
-  dependencies:
-    "@polkadot/types" "10.0.1"
-    "@polkadot/types-codec" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    tslib "^2.5.0"
-
-"@polkadot/types-codec@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-codec/-/types-codec-10.0.1.tgz#c9f4fd0142800fc5339de3c0d6c1611d7d0947d8"
-  integrity sha512-RrrEuc6PZID/VvIH+eZ6aqvpx7kjbFD58nsb/8ZQR57352EP4tVvR3arHsqh6j2WiM62uJ3zKT/rL8bCYVHjIw==
-  dependencies:
-    "@polkadot/util" "^11.0.1"
-    "@polkadot/x-bigint" "^11.0.1"
-    tslib "^2.5.0"
-
-"@polkadot/types-create@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-create/-/types-create-10.0.1.tgz#c94edbd181abc5b589a7807b20ccd16788eae2cd"
-  integrity sha512-Sr4BmswhFGj09e727XeS4nOnrvkWwWSSaXAwLenwVOCK9UaevYw+jmc28HcYypL5+i8kT4jKyU+1av7UtJyOzg==
-  dependencies:
-    "@polkadot/types-codec" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    tslib "^2.5.0"
-
-"@polkadot/types-known@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-10.0.1.tgz#0bbee8b8556d202549b2cacd7336122da9796492"
-  integrity sha512-GoHnDS1yKwLmsEQX7xjcMNR5SvaszxGV7E5Jkgl16VOF3QmO13Vs19jz1bdyv4Dw6soKFI5XAUEJY9PoA0DDMg==
-  dependencies:
-    "@polkadot/networks" "^11.0.1"
-    "@polkadot/types" "10.0.1"
-    "@polkadot/types-codec" "10.0.1"
-    "@polkadot/types-create" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    tslib "^2.5.0"
+    "@substrate/connect" "0.7.19"
+
+"@polkadot/types-augment@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-augment/-/types-augment-9.14.2.tgz#1a478e18e713b04038f3e171287ee5abe908f0aa"
+  integrity sha512-WO9d7RJufUeY3iFgt2Wz762kOu1tjEiGBR5TT4AHtpEchVHUeosVTrN9eycC+BhleqYu52CocKz6u3qCT/jKLg==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/types-codec" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+
+"@polkadot/types-codec@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-codec/-/types-codec-9.14.2.tgz#d625c80495d7a68237b3d5c0a60ff10d206131fa"
+  integrity sha512-AJ4XF7W1no4PENLBRU955V6gDxJw0h++EN3YoDgThozZ0sj3OxyFupKgNBZcZb2V23H8JxQozzIad8k+nJbO1w==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/util" "^10.4.2"
+    "@polkadot/x-bigint" "^10.4.2"
+
+"@polkadot/types-create@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-create/-/types-create-9.14.2.tgz#aec515a2d3bc7e7b7802095cdd35ece48dc442bc"
+  integrity sha512-nSnKpBierlmGBQT8r6/SHf6uamBIzk4WmdMsAsR4uJKJF1PtbIqx2W5PY91xWSiMSNMzjkbCppHkwaDAMwLGaw==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/types-codec" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+
+"@polkadot/types-known@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-9.14.2.tgz#17fe5034a5b907bd006093a687f112b07edadf10"
+  integrity sha512-iM8WOCgguzJ3TLMqlm4K1gKQEwWm2zxEKT1HZZ1irs/lAbBk9MquDWDvebryiw3XsLB8xgrp3RTIBn2Q4FjB2A==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/networks" "^10.4.2"
+    "@polkadot/types" "9.14.2"
+    "@polkadot/types-codec" "9.14.2"
+    "@polkadot/types-create" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+
+"@polkadot/types-support@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-support/-/types-support-9.14.2.tgz#d25e8d4e5ec3deef914cb55fc8bc5448431ddd18"
+  integrity sha512-VWCOPgXDK3XtXT7wMLyIWeNDZxUbNcw/8Pn6n6vMogs7o/n4h6WGbGMeTIQhPWyn831/RmkVs5+2DUC+2LlOhw==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/util" "^10.4.2"
+
+"@polkadot/types@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-9.14.2.tgz#5105f41eb9e8ea29938188d21497cbf1753268b8"
+  integrity sha512-hGLddTiJbvowhhUZJ3k+olmmBc1KAjWIQxujIUIYASih8FQ3/YJDKxaofGOzh0VygOKW3jxQBN2VZPofyDP9KQ==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/keyring" "^10.4.2"
+    "@polkadot/types-augment" "9.14.2"
+    "@polkadot/types-codec" "9.14.2"
+    "@polkadot/types-create" "9.14.2"
+    "@polkadot/util" "^10.4.2"
+    "@polkadot/util-crypto" "^10.4.2"
+    rxjs "^7.8.0"
 
-"@polkadot/types-support@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-support/-/types-support-10.0.1.tgz#301125e2e2840801e575cb969fe0cc2bb36df86a"
-  integrity sha512-J5i4BM08/HZGBNQhN2X29eWPS8+Ie7n6O8L0y8IZ3rS0hkXU1V2SFd9X4LO8ADPGvT3JvPpQKESsq0f/Z5UbYQ==
+"@polkadot/util-crypto@10.4.2", "@polkadot/util-crypto@^10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-10.4.2.tgz#871fb69c65768bd48c57bb5c1f76a85d979fb8b5"
+  integrity sha512-RxZvF7C4+EF3fzQv8hZOLrYCBq5+wA+2LWv98nECkroChY3C2ZZvyWDqn8+aonNULt4dCVTWDZM0QIY6y4LUAQ==
   dependencies:
-    "@polkadot/util" "^11.0.1"
-    tslib "^2.5.0"
-
-"@polkadot/types@10.0.1", "@polkadot/types@9.14.2":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-10.0.1.tgz#54c636bbe6f151c5e4bc2c9220bb98bbb1fc428d"
-  integrity sha512-/ALKLIWulXJrK/nNEY8iXByZRwaq1uQiRzzFqwWgfGpnLVCHYljV5ZEi3QqeDjGJzywQYxqJB+bJSiUe0+iNvg==
-  dependencies:
-    "@polkadot/keyring" "^11.0.1"
-    "@polkadot/types-augment" "10.0.1"
-    "@polkadot/types-codec" "10.0.1"
-    "@polkadot/types-create" "10.0.1"
-    "@polkadot/util" "^11.0.1"
-    "@polkadot/util-crypto" "^11.0.1"
-    rxjs "^7.8.0"
-    tslib "^2.5.0"
+    "@babel/runtime" "^7.20.13"
+    "@noble/hashes" "1.2.0"
+    "@noble/secp256k1" "1.7.1"
+    "@polkadot/networks" "10.4.2"
+    "@polkadot/util" "10.4.2"
+    "@polkadot/wasm-crypto" "^6.4.1"
+    "@polkadot/x-bigint" "10.4.2"
+    "@polkadot/x-randomvalues" "10.4.2"
+    "@scure/base" "1.1.1"
+    ed2curve "^0.3.0"
+    tweetnacl "^1.0.3"
 
-"@polkadot/util-crypto@10.4.2", "@polkadot/util-crypto@11.0.1", "@polkadot/util-crypto@^11.0.1":
+"@polkadot/util-crypto@11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-11.0.1.tgz#ec17ee499bf78262d1cc23963fb365aeb4ede34b"
   integrity sha512-IEircl43g6ZT9IqjzB1ttR7vK+/IaUar6l8yeU+Bn6x0TSS6tXyOJmXfVsXsqfLM58GIXY18mBZCTfhF/LwuKg==
@@ -1709,7 +1738,20 @@
     tslib "^2.5.0"
     tweetnacl "^1.0.3"
 
-"@polkadot/util@10.4.2", "@polkadot/util@11.0.1", "@polkadot/util@11.1.3", "@polkadot/util@^11.0.1":
+"@polkadot/util@10.4.2", "@polkadot/util@^10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-10.4.2.tgz#df41805cb27f46b2b4dad24c371fa2a68761baa1"
+  integrity sha512-0r5MGICYiaCdWnx+7Axlpvzisy/bi1wZGXgCSw5+ZTyPTOqvsYRqM2X879yxvMsGfibxzWqNzaiVjToz1jvUaA==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/x-bigint" "10.4.2"
+    "@polkadot/x-global" "10.4.2"
+    "@polkadot/x-textdecoder" "10.4.2"
+    "@polkadot/x-textencoder" "10.4.2"
+    "@types/bn.js" "^5.1.1"
+    bn.js "^5.2.1"
+
+"@polkadot/util@11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-11.0.1.tgz#04ce76339a7bd6ea2746173cbac119905330b47a"
   integrity sha512-IMk3hPxIGzlAW6fhOigVPMvaW0E+dTMzO1IKnEATdhAJFKjaqU4K9Pwj79fj93xgM5Y8PkHV5sUPJKuce+u+4A==
@@ -1722,6 +1764,13 @@
     bn.js "^5.2.1"
     tslib "^2.5.0"
 
+"@polkadot/wasm-bridge@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-bridge/-/wasm-bridge-6.4.1.tgz#e97915dd67ba543ec3381299c2a5b9330686e27e"
+  integrity sha512-QZDvz6dsUlbYsaMV5biZgZWkYH9BC5AfhT0f0/knv8+LrbAoQdP3Asbvddw8vyU9sbpuCHXrd4bDLBwUCRfrBQ==
+  dependencies:
+    "@babel/runtime" "^7.20.6"
+
 "@polkadot/wasm-bridge@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-bridge/-/wasm-bridge-7.0.2.tgz#c906c12fa5a2ce40515c37d88a17637f467f6199"
@@ -1729,6 +1778,13 @@
   dependencies:
     tslib "^2.5.0"
 
+"@polkadot/wasm-crypto-asmjs@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-6.4.1.tgz#3cc76bbda5ea4a7a860982c64f9565907b312253"
+  integrity sha512-UxZTwuBZlnODGIQdCsE2Sn/jU0O2xrNQ/TkhRFELfkZXEXTNu4lw6NpaKq7Iey4L+wKd8h4lT3VPVkMcPBLOvA==
+  dependencies:
+    "@babel/runtime" "^7.20.6"
+
 "@polkadot/wasm-crypto-asmjs@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.0.2.tgz#c7f807ee4f290c98d6b17b629f0b2cdcc4f8b186"
@@ -1736,6 +1792,16 @@
   dependencies:
     tslib "^2.5.0"
 
+"@polkadot/wasm-crypto-init@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-init/-/wasm-crypto-init-6.4.1.tgz#4d9ab0030db52cf177bf707ef8e77aa4ca721668"
+  integrity sha512-1ALagSi/nfkyFaH6JDYfy/QbicVbSn99K8PV9rctDUfxc7P06R7CoqbjGQ4OMPX6w1WYVPU7B4jPHGLYBlVuMw==
+  dependencies:
+    "@babel/runtime" "^7.20.6"
+    "@polkadot/wasm-bridge" "6.4.1"
+    "@polkadot/wasm-crypto-asmjs" "6.4.1"
+    "@polkadot/wasm-crypto-wasm" "6.4.1"
+
 "@polkadot/wasm-crypto-init@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.0.2.tgz#e707c34ba6be9ee1419453eeceab2b441da7fef3"
@@ -1746,6 +1812,14 @@
     "@polkadot/wasm-crypto-wasm" "7.0.2"
     tslib "^2.5.0"
 
+"@polkadot/wasm-crypto-wasm@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-6.4.1.tgz#97180f80583b18f6a13c1054fa5f7e8da40b1028"
+  integrity sha512-3VV9ZGzh0ZY3SmkkSw+0TRXxIpiO0nB8lFwlRgcwaCihwrvLfRnH9GI8WE12mKsHVjWTEVR3ogzILJxccAUjDA==
+  dependencies:
+    "@babel/runtime" "^7.20.6"
+    "@polkadot/wasm-util" "6.4.1"
+
 "@polkadot/wasm-crypto-wasm@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.0.2.tgz#6adecfd7ac7dec7967c427adcc18c9b6be09e566"
@@ -1754,6 +1828,18 @@
     "@polkadot/wasm-util" "7.0.2"
     tslib "^2.5.0"
 
+"@polkadot/wasm-crypto@^6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-6.4.1.tgz#79310e23ad1ca62362ba893db6a8567154c2536a"
+  integrity sha512-FH+dcDPdhSLJvwL0pMLtn/LIPd62QDPODZRCmDyw+pFjLOMaRBc7raomWUOqyRWJTnqVf/iscc2rLVLNMyt7ag==
+  dependencies:
+    "@babel/runtime" "^7.20.6"
+    "@polkadot/wasm-bridge" "6.4.1"
+    "@polkadot/wasm-crypto-asmjs" "6.4.1"
+    "@polkadot/wasm-crypto-init" "6.4.1"
+    "@polkadot/wasm-crypto-wasm" "6.4.1"
+    "@polkadot/wasm-util" "6.4.1"
+
 "@polkadot/wasm-crypto@^7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-7.0.2.tgz#44aa5f5322f3e8bdcacb1806e3e1a6543d20cbb4"
@@ -1766,6 +1852,13 @@
     "@polkadot/wasm-util" "7.0.2"
     tslib "^2.5.0"
 
+"@polkadot/wasm-util@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-util/-/wasm-util-6.4.1.tgz#74aecc85bec427a9225d9874685944ea3dc3ab76"
+  integrity sha512-Uwo+WpEsDmFExWC5kTNvsVhvqXMZEKf4gUHXFn4c6Xz4lmieRT5g+1bO1KJ21pl4msuIgdV3Bksfs/oiqMFqlw==
+  dependencies:
+    "@babel/runtime" "^7.20.6"
+
 "@polkadot/wasm-util@7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-util/-/wasm-util-7.0.2.tgz#1f3eaf048bd9134f08857e74325084ce129cd50c"
@@ -1773,6 +1866,14 @@
   dependencies:
     tslib "^2.5.0"
 
+"@polkadot/x-bigint@10.4.2", "@polkadot/x-bigint@^10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-bigint/-/x-bigint-10.4.2.tgz#7eb2ec732259df48b5a00f07879a1331e05606ec"
+  integrity sha512-awRiox+/XSReLzimAU94fPldowiwnnMUkQJe8AebYhNocAj6SJU00GNoj6j6tAho6yleOwrTJXZaWFBaQVJQNg==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/x-global" "10.4.2"
+
 "@polkadot/x-bigint@11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/x-bigint/-/x-bigint-11.0.1.tgz#0a2c21f8fa76d1299a02111f8391d16593f456ae"
@@ -1781,22 +1882,22 @@
     "@polkadot/x-global" "11.0.1"
     tslib "^2.5.0"
 
-"@polkadot/x-bigint@^11.0.1":
-  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-bigint/-/x-bigint-11.1.3.tgz#37b09a12a9ed6df704e047e261f1b8b2ac978497"
-  integrity sha512-fRUUHfW9VFsXT7sLUUY7gSu8v+PvzNLRwvjnp+Ly8vFx9LTLuVGFCi+mpysuRTaPpqZZJlzBJ3fST7xTGh67Pg==
+"@polkadot/x-fetch@^10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-10.4.2.tgz#bc6ba70de71a252472fbe36180511ed920e05f05"
+  integrity sha512-Ubb64yaM4qwhogNP+4mZ3ibRghEg5UuCYRMNaCFoPgNAY8tQXuDKrHzeks3+frlmeH9YRd89o8wXLtWouwZIcw==
   dependencies:
-    "@polkadot/x-global" "11.1.3"
-    tslib "^2.5.0"
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/x-global" "10.4.2"
+    "@types/node-fetch" "^2.6.2"
+    node-fetch "^3.3.0"
 
-"@polkadot/x-fetch@^11.0.1":
-  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-11.1.3.tgz#e39df53fc7fb6399d3883b45d03f6ef7f265a7f9"
-  integrity sha512-+Z0RxxsN7+l2ZmmDdHqOo0kgqvjXJ1bw8CwTVnq3t9nPgZKn2pC3Fq3xdj/sRWiLuf/UhgCxKfYfMmt5ek4kIg==
+"@polkadot/x-global@10.4.2", "@polkadot/x-global@^10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-10.4.2.tgz#5662366e3deda0b4c8f024b2d902fa838f9e60a4"
+  integrity sha512-g6GXHD/ykZvHap3M6wh19dO70Zm43l4jEhlxf5LtTo5/0/UporFCXr2YJYZqfbn9JbQwl1AU+NroYio+vtJdiA==
   dependencies:
-    "@polkadot/x-global" "11.1.3"
-    node-fetch "^3.3.1"
-    tslib "^2.5.0"
+    "@babel/runtime" "^7.20.13"
 
 "@polkadot/x-global@11.0.1":
   version "11.0.1"
@@ -1805,12 +1906,13 @@
   dependencies:
     tslib "^2.5.0"
 
-"@polkadot/x-global@11.1.3", "@polkadot/x-global@^11.0.1":
-  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-11.1.3.tgz#4086694f52373fea63910b62da999bf0981d7d86"
-  integrity sha512-R3aqtIjgzFHJ3TyX6wavhp+59oLbZiqczIHkaas/nJe21+SVARqFmIII6BwS7ty7+8Uu4fHliA9re+ZSUp+rwg==
+"@polkadot/x-randomvalues@10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-randomvalues/-/x-randomvalues-10.4.2.tgz#895f1220d5a4522a83d8d5014e3c1e03b129893e"
+  integrity sha512-mf1Wbpe7pRZHO0V3V89isPLqZOy5XGX2bCqsfUWHgb1NvV1MMx5TjVjdaYyNlGTiOkAmJKlOHshcfPU2sYWpNg==
   dependencies:
-    tslib "^2.5.0"
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/x-global" "10.4.2"
 
 "@polkadot/x-randomvalues@11.0.1":
   version "11.0.1"
@@ -1820,6 +1922,14 @@
     "@polkadot/x-global" "11.0.1"
     tslib "^2.5.0"
 
+"@polkadot/x-textdecoder@10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-10.4.2.tgz#93202f3e5ad0e7f75a3fa02d2b8a3343091b341b"
+  integrity sha512-d3ADduOKUTU+cliz839+KCFmi23pxTlabH7qh7Vs1GZQvXOELWdqFOqakdiAjtMn68n1KVF4O14Y+OUm7gp/zA==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/x-global" "10.4.2"
+
 "@polkadot/x-textdecoder@11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-11.0.1.tgz#4f42d41150ebf5c36a40adb0dfe7b7da530a21a5"
@@ -1828,6 +1938,14 @@
     "@polkadot/x-global" "11.0.1"
     tslib "^2.5.0"
 
+"@polkadot/x-textencoder@10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-10.4.2.tgz#cd2e6c8a66b0b400a73f0164e99c510fb5c83501"
+  integrity sha512-mxcQuA1exnyv74Kasl5vxBq01QwckG088lYjc3KwmND6+pPrW2OWagbxFX5VFoDLDAE+UJtnUHsjdWyOTDhpQA==
+  dependencies:
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/x-global" "10.4.2"
+
 "@polkadot/x-textencoder@11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-11.0.1.tgz#f95c7c3e06065862e3a2624ad873bbf0329c7d3b"
@@ -1836,14 +1954,15 @@
     "@polkadot/x-global" "11.0.1"
     tslib "^2.5.0"
 
-"@polkadot/x-ws@^11.0.1":
-  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-11.1.3.tgz#5a759bcbbbdceeecca53bcc74170e52cd3ca774b"
-  integrity sha512-omNU2mIVX997HiHm2YxEdJdyCFnv+oTyKWZd0+FdS47rdfhVwD+H9/bS+rtQ9lIqfhODdGmw3fG//gq1KpYJcw==
+"@polkadot/x-ws@^10.4.2":
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-10.4.2.tgz#4e9d88f37717570ccf942c6f4f63b06260f45025"
+  integrity sha512-3gHSTXAWQu1EMcMVTF5QDKHhEHzKxhAArweEyDXE7VsgKUP/ixxw4hVZBrkX122iI5l5mjSiooRSnp/Zl3xqDQ==
   dependencies:
-    "@polkadot/x-global" "11.1.3"
-    tslib "^2.5.0"
-    ws "^8.13.0"
+    "@babel/runtime" "^7.20.13"
+    "@polkadot/x-global" "10.4.2"
+    "@types/websocket" "^1.0.5"
+    websocket "^1.0.34"
 
 "@scure/base@1.1.1":
   version "1.1.1"
@@ -1860,14 +1979,27 @@
   resolved "https://registry.yarnpkg.com/@substrate/connect-extension-protocol/-/connect-extension-protocol-1.0.1.tgz#fa5738039586c648013caa6a0c95c43265dbe77d"
   integrity sha512-161JhCC1csjH3GE5mPLEd7HbWtwNSPJBg3p1Ksz9SFlTzj/bgEwudiRN2y5i0MoLGCIJRYKyKGMxVnd29PzNjg==
 
-"@substrate/connect@0.7.20":
-  version "0.7.20"
-  resolved "https://registry.yarnpkg.com/@substrate/connect/-/connect-0.7.20.tgz#ce5647368be21199d608715bbd77bcb7c25a4227"
-  integrity sha512-f/sMgGUikJxDaNMkQXCU/1WaMy0MLJB+KS+P+CpsIhWyxj2dOcph5YXjAJiIlgrZqHImV28RJnraxXBD3AlmLQ==
+"@substrate/connect@0.7.19":
+  version "0.7.19"
+  resolved "https://registry.yarnpkg.com/@substrate/connect/-/connect-0.7.19.tgz#7c879cb275bc7ac2fe9edbf797572d4ff8d8b86a"
+  integrity sha512-+DDRadc466gCmDU71sHrYOt1HcI2Cbhm7zdCFjZfFVHXhC/E8tOdrVSglAH2HDEHR0x2SiHRxtxOGC7ak2Zjog==
   dependencies:
     "@substrate/connect-extension-protocol" "^1.0.1"
+    "@substrate/smoldot-light" "0.7.9"
     eventemitter3 "^4.0.7"
-    smoldot "0.7.11"
+
+"@substrate/smoldot-light@0.7.9":
+  version "0.7.9"
+  resolved "https://registry.yarnpkg.com/@substrate/smoldot-light/-/smoldot-light-0.7.9.tgz#68449873a25558e547e9468289686ee228a9930f"
+  integrity sha512-HP8iP7sFYlpSgjjbo0lqHyU+gu9lL2hbDNce6dWk5/10mFFF9jKIFGfui4zCecUY808o/Go9pan/31kMJoLbug==
+  dependencies:
+    pako "^2.0.4"
+    ws "^8.8.1"
+
+"@substrate/ss58-registry@^1.38.0":
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/@substrate/ss58-registry/-/ss58-registry-1.40.0.tgz#2223409c496271df786c1ca8496898896595441e"
+  integrity sha512-QuU2nBql3J4KCnOWtWDw4n1K4JU0T79j54ZZvm/9nhsX6AIar13FyhsaBfs6QkJ2ixTQAnd7TocJIoJRWbqMZA==
 
 "@substrate/ss58-registry@^1.39.0":
   version "1.39.0"
@@ -1972,6 +2104,13 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
   integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
 
+"@types/iarna__toml@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/iarna__toml/-/iarna__toml-2.0.2.tgz#2e61b079e50760b477bc70e4df1fe5b633ef6c63"
+  integrity sha512-Q3obxKhBLVVbEQ8zsAmsQVobAAZhi8dFFFjF0q5xKXiaHvH8IkSxcbM27e46M9feUMieR03SPpmp5CtaNzpdBg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/inquirer-autocomplete-prompt@^2":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-2.0.0.tgz#8b60cab59bb6b4c2f1885cb86316f0aa82fa24c9"
@@ -2044,6 +2183,14 @@
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.0.0.tgz#3205bcd15ada9bc681ac20bef64e9e6df88fd297"
   integrity sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==
 
+"@types/node-fetch@^2.6.2":
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.3.tgz#175d977f5e24d93ad0f57602693c435c57ad7e80"
+  integrity sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
 "@types/node@*":
   version "18.14.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.6.tgz#ae1973dd2b1eeb1825695bb11ebfb746d27e3e93"
@@ -2121,6 +2268,13 @@
     "@types/expect" "^1.20.4"
     "@types/node" "*"
 
+"@types/websocket@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.5.tgz#3fb80ed8e07f88e51961211cd3682a3a4a81569c"
+  integrity sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==
+  dependencies:
+    "@types/node" "*"
+
 "@typescript-eslint/eslint-plugin@5.35.1":
   version "5.35.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.35.1.tgz#0d822bfea7469904dfc1bb8f13cabd362b967c93"
@@ -2699,6 +2853,13 @@ buffer@^5.2.1, buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+bufferutil@^4.0.1:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad"
+  integrity sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==
+  dependencies:
+    node-gyp-build "^4.3.0"
+
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
@@ -3360,6 +3521,14 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+  dependencies:
+    es5-ext "^0.10.50"
+    type "^1.0.1"
+
 dargs@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
@@ -3392,6 +3561,13 @@ debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, de
   dependencies:
     ms "2.1.2"
 
+debug@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -3685,6 +3861,32 @@ error@^10.4.0:
   resolved "https://registry.yarnpkg.com/error/-/error-10.4.0.tgz#6fcf0fd64bceb1e750f8ed9a3dd880f00e46a487"
   integrity sha512-YxIFEJuhgcICugOUvRx5th0UM+ActZ9sjY0QJmeVwsQdvosZ7kYzc9QqS0Da3R5iUmgU5meGIxh0xBeZpMVeLw==
 
+es5-ext@^0.10.35, es5-ext@^0.10.50:
+  version "0.10.62"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
+  integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
+  dependencies:
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.3"
+    next-tick "^1.1.0"
+
+es6-iterator@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-symbol@^3.1.1, es6-symbol@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  dependencies:
+    d "^1.0.1"
+    ext "^1.1.2"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -3868,6 +4070,13 @@ execa@5.1.1, execa@^5.0.0, execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+ext@^1.1.2:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
+  dependencies:
+    type "^2.7.2"
+
 external-editor@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -4092,6 +4301,15 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -5841,6 +6059,11 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -5902,6 +6125,11 @@ neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+next-tick@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -5947,7 +6175,7 @@ node-fetch@^2.6.1, node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^3.3.1:
+node-fetch@^3.3.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.1.tgz#b3eea7b54b3a48020e46f4f88b9c5a7430d20b2e"
   integrity sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==
@@ -7310,14 +7538,6 @@ smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
-smoldot@0.7.11:
-  version "0.7.11"
-  resolved "https://registry.yarnpkg.com/smoldot/-/smoldot-0.7.11.tgz#8e39464f2cf7736eacff5f2a87819dd9f688b352"
-  integrity sha512-aE1led154FJ2/jrXKv2HLKdNIyvYJG6H2ZmKYFS++kW1OAcTQ6idDy3fzAI1VdydLDYK0YbKUsj7SJDmrjsS3g==
-  dependencies:
-    pako "^2.0.4"
-    ws "^8.8.1"
-
 snake-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
@@ -7745,11 +7965,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-toml@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
-  integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
-
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -7912,6 +8127,16 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+
+type@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
+
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -8029,6 +8254,13 @@ url@0.10.3:
     punycode "1.3.2"
     querystring "0.2.0"
 
+utf-8-validate@^5.0.2:
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2"
+  integrity sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==
+  dependencies:
+    node-gyp-build "^4.3.0"
+
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -8137,6 +8369,18 @@ webidl-conversions@^3.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
+websocket@^1.0.34:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.34.tgz#2bdc2602c08bf2c82253b730655c0ef7dcab3111"
+  integrity sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==
+  dependencies:
+    bufferutil "^4.0.1"
+    debug "^2.2.0"
+    es5-ext "^0.10.50"
+    typedarray-to-buffer "^3.1.5"
+    utf-8-validate "^5.0.2"
+    yaeti "^0.0.6"
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -8299,11 +8543,6 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-ws@^8.13.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
-
 ws@^8.8.1:
   version "8.12.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.1.tgz#c51e583d79140b5e42e39be48c934131942d4a8f"
@@ -8339,6 +8578,11 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
+yaeti@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577"
+  integrity sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"

From 318f139a63bc9f45b9b0a66e422bcf07fbeabf72 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 8 May 2023 10:46:25 +0300
Subject: [PATCH 20/46] wip: copy toolchain files

---
 packages/cli/src/commands/init/index.ts | 85 +++++++++++++++++++++----
 1 file changed, 72 insertions(+), 13 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 03347666..18e1a99d 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -1,10 +1,20 @@
 import { Args, Flags } from "@oclif/core";
 import path = require("node:path");
-import { ensureDir, writeJSON, stat, readdir, pathExists, readFile, Dirent, copy } from "fs-extra";
+import {
+  ensureDir,
+  writeJSON,
+  stat,
+  readdir,
+  pathExists,
+  readFile,
+  Dirent,
+  copy,
+  outputFile,
+} from "fs-extra";
 import execa = require("execa");
 import { paramCase, pascalCase, snakeCase } from "change-case";
 import inquirer = require("inquirer");
-import { load } from "js-toml";
+import TOML from "@iarna/toml";
 import { choice, email, name, pickLanguage, pickTemplate } from "../../lib/prompts";
 import {
   checkCliDependencies,
@@ -279,7 +289,7 @@ export class Init extends BaseCommand {
       throw error;
     }
 
-    let rootTomlPaths = await getRootCargoToml(pathToExistingProject);
+    let rootTomlPaths = await getRootCargoTomlPaths(pathToExistingProject);
 
     if (rootTomlPaths) {
       console.log("Workspaces detected in root Cargo.toml file.");
@@ -315,6 +325,47 @@ export class Init extends BaseCommand {
         console.log(result);
       },
     });
+
+    if (!this.configBuilder.contracts) this.configBuilder.contracts = {};
+
+    for (const contract of confirmedCopyList.contracts) {
+      this.configBuilder.contracts[contract.name] = {
+        name: contract.name,
+        deployments: [],
+        language: "ink",
+      };
+    }
+
+    let rootToml = await readRootCargoToml(pathToExistingProject);
+
+    if (!rootToml) rootToml = { workspace: {} };
+
+    rootToml.workspace.members = ["contracts/*"];
+    rootToml.workspace.exclude = ["crates/*"];
+
+    this.taskQueue.push({
+      task: async (tomlObject, projectPath) => {
+        const tomlString = TOML.stringify(tomlObject);
+        const rootTomlPath = path.resolve(projectPath, "Cargo.toml");
+        await outputFile(rootTomlPath, tomlString);
+      },
+      args: [rootToml, this.projectPath],
+      runningMessage: "Writing Cargo.toml",
+    });
+
+    this.taskQueue.push({
+      task: async (pathToExistingProject, projectPath) => {
+        const fileList = ["rust-toolchain.toml", ".rustfmt.toml"];
+        for (const fileName of fileList) {
+          const filePath = await path.resolve(pathToExistingProject, fileName);
+          if (await pathExists(filePath)) {
+            await copy(filePath, path.resolve(projectPath, fileName));
+          }
+        }
+      },
+      args: [pathToExistingProject, this.projectPath],
+      runningMessage: "Copying workspace files",
+    });
   }
 }
 
@@ -420,14 +471,10 @@ async function detectTests(pathToExistingProject: string) {
   return testDir;
 }
 
-async function getRootCargoToml(pathToProject: string) {
-  const rootTomlPath = path.resolve(pathToProject, "Cargo.toml");
-  if (!(await pathExists(rootTomlPath))) return null;
+async function getRootCargoTomlPaths(pathToProject: string) {
+  const toml = await readRootCargoToml(pathToProject);
 
-  const fileData = await readFile(rootTomlPath, "utf-8");
-  const toml: { workspace?: { members?: string[]; exclude?: string[] } } = load(fileData);
-
-  if (!toml.workspace?.members) return null;
+  if (!toml?.workspace.members) return null;
 
   return {
     contractsDirectories: toml.workspace.members,
@@ -435,6 +482,17 @@ async function getRootCargoToml(pathToProject: string) {
   };
 }
 
+async function readRootCargoToml(pathToProject: string) {
+  const rootTomlPath = path.resolve(pathToProject, "Cargo.toml");
+  if (!(await pathExists(rootTomlPath))) return null;
+  const fileData = await readFile(rootTomlPath, "utf-8");
+  const toml: any = TOML.parse(fileData);
+
+  if (!toml.workspace) toml.workspace = {};
+
+  return toml;
+}
+
 async function getManualPaths(pathToProject: string) {
   console.log("No Cargo.toml found in the provided directory, or no workspace field within it.");
   const { contractsDirectory, cratesDirectory, useCrateDirectory } = await inquirer.prompt([
@@ -513,8 +571,9 @@ async function getDirsAndFiles(projectPath: string, globList: string[]) {
 //[X] 4. add directories from Cargo.toml/exclude path to copy list
 //[X] 5. make a list (checkbox) for user to confirm contracts/crates/files to copy
 //[X] 6. look for test/tests directory and add it to the list (also take manual input)
-//[ ] 7. copy all the selected directories/files and update the swanky.config
-//[ ] 8. copy cargo.toml from the root, modify path if needed ( "uniswap-v2/contracts/**" -> "contracts/**")
+//[X] 7. copy all the selected directories/files
+//[X] 7a. update the swanky.config
+//[X] 8. copy cargo.toml from the root, modify path if needed ( "uniswap-v2/contracts/**" -> "contracts/**")
 //[ ] 9. keep log of all the steps and write it to file
-//[ ] 10. Copy rust.toolchain and .rustfmt.toml if exists
+//[X] 10. Copy rust.toolchain and .rustfmt.toml if exists
 //[ ] 11. Merge package.json from imported project into the one generated from template

From fbb90bed13f0269c0bfae4ede694c5e9f9fef495 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 8 May 2023 11:22:09 +0300
Subject: [PATCH 21/46] separate common and contract template processing

---
 packages/cli/package.json               |  1 +
 packages/cli/src/commands/init/index.ts | 29 ++++++++++++++++++++-----
 packages/core/src/lib/tasks.ts          |  8 +------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index b86cb42c..7c1e445e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -35,6 +35,7 @@
     "inquirer-fuzzy-path": "^2.3.0",
     "js-toml": "^0.1.1",
     "listr2": "5.0.7",
+    "lodash": "^4.17.21",
     "mocha": "10.2.0",
     "mocha-suppress-logs": "0.3.1",
     "mochawesome": "7.1.3",
diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 18e1a99d..dc778331 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -18,7 +18,8 @@ import TOML from "@iarna/toml";
 import { choice, email, name, pickLanguage, pickTemplate } from "../../lib/prompts";
 import {
   checkCliDependencies,
-  copyTemplateFiles,
+  copyCommonTemplateFiles,
+  copyContractTemplateFiles,
   downloadNode,
   installDeps,
   ChainAccount,
@@ -30,7 +31,7 @@ import {
 import { getAllTemplateNames, getTemplates } from "@astar-network/swanky-templates";
 import { BaseCommand } from "../../lib/baseCommand";
 import globby = require("globby");
-
+import { merge } from "lodash";
 import inquirerFuzzyPath from "inquirer-fuzzy-path";
 
 const {
@@ -146,6 +147,23 @@ export class Init extends BaseCommand {
       await this.generate(args.projectName);
     }
 
+    const templates = getTemplates("ink");
+    this.taskQueue.push({
+      task: copyCommonTemplateFiles,
+      args: [templates.templatesPath, this.projectPath],
+      runningMessage: "Copying common template files",
+    });
+
+    this.taskQueue.push({
+      task: processTemplates,
+      args: [
+        this.projectPath,
+        {
+          project_name: paramCase(args.projectName),
+        },
+      ],
+      runningMessage: "Processing common templates",
+    });
     this.taskQueue.push({
       task: installDeps,
       args: [this.projectPath],
@@ -238,14 +256,13 @@ export class Init extends BaseCommand {
     });
 
     this.taskQueue.push({
-      task: copyTemplateFiles,
+      task: copyContractTemplateFiles,
       args: [
-        templates.templatesPath,
         path.resolve(templates.contractTemplatesPath, answers.contractTemplate),
         answers.contractName,
         this.projectPath,
       ],
-      runningMessage: "Copying template files",
+      runningMessage: "Copying contract template files",
     });
 
     this.taskQueue.push({
@@ -263,7 +280,7 @@ export class Init extends BaseCommand {
           contract_language: contractLanguage,
         },
       ],
-      runningMessage: "Processing templates",
+      runningMessage: "Processing contract template",
     });
 
     this.configBuilder.contracts = {
diff --git a/packages/core/src/lib/tasks.ts b/packages/core/src/lib/tasks.ts
index d1bf33a4..d500e3fe 100644
--- a/packages/core/src/lib/tasks.ts
+++ b/packages/core/src/lib/tasks.ts
@@ -25,12 +25,7 @@ export async function checkCliDependencies(spinner: Spinner) {
   }
 }
 
-export async function copyTemplateFiles(
-  templatesPath: string,
-  contractTemplatePath: string,
-  contractName: string,
-  projectPath: string
-) {
+export async function copyCommonTemplateFiles(templatesPath: string, projectPath: string) {
   await ensureDir(projectPath);
   const commonFiles = await globby(`*`, { cwd: templatesPath });
   await Promise.all(
@@ -39,7 +34,6 @@ export async function copyTemplateFiles(
     })
   );
   await rename(path.resolve(projectPath, "gitignore"), path.resolve(projectPath, ".gitignore"));
-  await copyContractTemplateFiles(contractTemplatePath, contractName, projectPath);
 }
 
 export async function copyContractTemplateFiles(

From ede5dd10c8d6abc917261f2b107ad23218c9b6d6 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 8 May 2023 11:40:11 +0300
Subject: [PATCH 22/46] merge package.json

---
 packages/cli/src/commands/init/index.ts | 33 ++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index dc778331..ea374c3d 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -10,6 +10,9 @@ import {
   Dirent,
   copy,
   outputFile,
+  readJSON,
+  writeJson,
+  remove,
 } from "fs-extra";
 import execa = require("execa");
 import { paramCase, pascalCase, snakeCase } from "change-case";
@@ -141,12 +144,6 @@ export class Init extends BaseCommand {
       if (!(error instanceof Error) || !error.message.includes("ENOENT")) throw error;
     }
 
-    if (flags.convert) {
-      await this.convert(flags.convert);
-    } else {
-      await this.generate(args.projectName);
-    }
-
     const templates = getTemplates("ink");
     this.taskQueue.push({
       task: copyCommonTemplateFiles,
@@ -164,6 +161,13 @@ export class Init extends BaseCommand {
       ],
       runningMessage: "Processing common templates",
     });
+
+    if (flags.convert) {
+      await this.convert(flags.convert);
+    } else {
+      await this.generate(args.projectName);
+    }
+
     this.taskQueue.push({
       task: installDeps,
       args: [this.projectPath],
@@ -383,6 +387,23 @@ export class Init extends BaseCommand {
       args: [pathToExistingProject, this.projectPath],
       runningMessage: "Copying workspace files",
     });
+
+    const existingPJsonPath = path.resolve(pathToExistingProject, "package.json");
+    if (await pathExists(existingPJsonPath)) {
+      this.taskQueue.push({
+        task: async (pJsonPath, projectPath) => {
+          const existingPJson = await readJSON(pJsonPath);
+          const templatePJsonPath = path.resolve(projectPath, "package.json");
+          const templatePJson = await readJSON(templatePJsonPath);
+          const mergedJson = merge(templatePJson, existingPJson);
+          console.log(existingPJson, templatePJson, mergedJson);
+          await remove(templatePJsonPath);
+          await writeJson(templatePJsonPath, mergedJson, { spaces: 2 });
+        },
+        args: [existingPJsonPath, this.projectPath],
+        runningMessage: "Merging package.json",
+      });
+    }
   }
 }
 

From 72d73a11bf58e3ff93d1e8723dba10800f55c7c6 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 8 May 2023 11:44:25 +0300
Subject: [PATCH 23/46] v2.2.0-alpha.0

---
 lerna.json                 |  2 +-
 packages/cli/README.md     | 23 ++++++++++++-----------
 packages/cli/package.json  |  4 ++--
 packages/core/package.json |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lerna.json b/lerna.json
index 3ac10006..09edd122 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useWorkspaces": true,
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "npmClient": "yarn"
 }
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 907e3fdc..a12911c2 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -17,7 +17,7 @@ $ npm install -g @astar-network/swanky-cli
 $ swanky COMMAND
 running command...
 $ swanky (--version|-V|-v)
-@astar-network/swanky-cli/2.1.0 darwin-x64 node-v18.2.0
+@astar-network/swanky-cli/2.2.0-alpha.0 darwin-x64 node-v18.2.0
 $ swanky --help [COMMAND]
 USAGE
   $ swanky COMMAND
@@ -37,7 +37,7 @@ USAGE
 * [`swanky contract explain CONTRACTNAME`](#swanky-contract-explain-contractname)
 * [`swanky contract new CONTRACTNAME`](#swanky-contract-new-contractname)
 * [`swanky contract query CONTRACTNAME MESSAGENAME`](#swanky-contract-query-contractname-messagename)
-* [`swanky contract test CONTRACTNAME`](#swanky-contract-test-contractname)
+* [`swanky contract test [CONTRACTNAME]`](#swanky-contract-test-contractname)
 * [`swanky contract tx CONTRACTNAME MESSAGENAME`](#swanky-contract-tx-contractname-messagename)
 * [`swanky contract typegen CONTRACTNAME`](#swanky-contract-typegen-contractname)
 * [`swanky help [COMMANDS]`](#swanky-help-commands)
@@ -113,7 +113,7 @@ DESCRIPTION
   Check installed package versions and compatibility
 ```
 
-_See code: [dist/commands/check/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.1.0/dist/commands/check/index.js)_
+_See code: [dist/commands/check/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.0-alpha.0/dist/commands/check/index.js)_
 
 ## `swanky contract compile [CONTRACTNAME]`
 
@@ -159,7 +159,7 @@ DESCRIPTION
 
 ## `swanky contract explain CONTRACTNAME`
 
-Explain contract messages based on thier metadata
+Explain contract messages based on the contracts' metadata
 
 ```
 USAGE
@@ -172,7 +172,7 @@ FLAGS
   -v, --verbose  Display more info in the result logs
 
 DESCRIPTION
-  Explain contract messages based on thier metadata
+  Explain contract messages based on the contracts' metadata
 ```
 
 ## `swanky contract new CONTRACTNAME`
@@ -217,13 +217,13 @@ FLAGS
   --address=<value>        Target specific address, defaults to last deployed. (--addr, --add)
 ```
 
-## `swanky contract test CONTRACTNAME`
+## `swanky contract test [CONTRACTNAME]`
 
 Run tests for a given contact
 
 ```
 USAGE
-  $ swanky contract test CONTRACTNAME [-a]
+  $ swanky contract test [CONTRACTNAME] [-a]
 
 ARGUMENTS
   CONTRACTNAME  Name of the contract to test
@@ -299,23 +299,24 @@ Generate a new smart contract environment
 
 ```
 USAGE
-  $ swanky init PROJECTNAME [--swanky-node] [-t blank|erc20token|flipper|blank|flipper|psp22] [-l ask|ink]
-    [-v]
+  $ swanky init PROJECTNAME [-v] [--swanky-node] [-t blank|erc20token|flipper|blank|flipper|psp22] [-l
+    ask|ink] [-c <value>]
 
 ARGUMENTS
   PROJECTNAME  directory name of new project
 
 FLAGS
+  -c, --convert=<value>    Converts an existing smart contract into a Swanky project
   -l, --language=<option>  <options: ask|ink>
   -t, --template=<option>  <options: blank|erc20token|flipper|blank|flipper|psp22>
-  -v, --verbose
+  -v, --verbose            Display more info in the result logs
   --swanky-node
 
 DESCRIPTION
   Generate a new smart contract environment
 ```
 
-_See code: [dist/commands/init/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.1.0/dist/commands/init/index.js)_
+_See code: [dist/commands/init/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.0-alpha.0/dist/commands/init/index.js)_
 
 ## `swanky node purge`
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7c1e445e..cbb3ae1c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/swanky-cli",
-  "version": "2.1.0",
+  "version": "2.2.0-alpha.0",
   "description": "Astar network WASM contract CLI tool",
   "author": "Astar network",
   "bin": {
@@ -17,7 +17,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@astar-network/swanky-core": "^2.0.0",
+    "@astar-network/swanky-core": "^2.2.0-alpha.0",
     "@astar-network/swanky-templates": "^2.0.0",
     "@iarna/toml": "^2.2.5",
     "@oclif/core": "2.5.0",
diff --git a/packages/core/package.json b/packages/core/package.json
index 2fd6692b..395455e4 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/swanky-core",
-  "version": "2.0.0",
+  "version": "2.2.0-alpha.0",
   "description": "Core library of Swanky Suite",
   "author": "Astar network",
   "license": "MIT",

From 1619f6ad553863883513ab1ff14b2d509ea7bde1 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 8 May 2023 18:22:26 +0300
Subject: [PATCH 24/46] clean up

---
 packages/cli/src/commands/init/index.ts | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index ea374c3d..6e1b6f78 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -396,7 +396,6 @@ export class Init extends BaseCommand {
           const templatePJsonPath = path.resolve(projectPath, "package.json");
           const templatePJson = await readJSON(templatePJsonPath);
           const mergedJson = merge(templatePJson, existingPJson);
-          console.log(existingPJson, templatePJson, mergedJson);
           await remove(templatePJsonPath);
           await writeJson(templatePJsonPath, mergedJson, { spaces: 2 });
         },
@@ -601,17 +600,3 @@ async function getDirsAndFiles(projectPath: string, globList: string[]) {
     ...(await getGlobPaths(projectPath, globList, true)),
   ];
 }
-
-//[X] 1. Check if the project is a directory, or is it empty
-//[X] 2. Look for cargo.toml with "workspace" field in the root
-//[X] 3a. Workspace found - use the glob in the "members field" to select directories to copy over
-//[X] 3b. if not found, ask user for a path where contracts are -> [Ctrl+C to cancel]
-//[X] 4. add directories from Cargo.toml/exclude path to copy list
-//[X] 5. make a list (checkbox) for user to confirm contracts/crates/files to copy
-//[X] 6. look for test/tests directory and add it to the list (also take manual input)
-//[X] 7. copy all the selected directories/files
-//[X] 7a. update the swanky.config
-//[X] 8. copy cargo.toml from the root, modify path if needed ( "uniswap-v2/contracts/**" -> "contracts/**")
-//[ ] 9. keep log of all the steps and write it to file
-//[X] 10. Copy rust.toolchain and .rustfmt.toml if exists
-//[ ] 11. Merge package.json from imported project into the one generated from template

From cae0d6d96fdd0cb26c8c045de0e1b1ad33406ff4 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 8 May 2023 18:36:05 +0300
Subject: [PATCH 25/46] use tests instead of test for directory name

---
 packages/cli/package.json                     | 2 +-
 packages/cli/src/commands/contract/new.ts     | 2 +-
 packages/cli/src/commands/contract/test.ts    | 2 +-
 packages/cli/src/commands/contract/typegen.ts | 2 +-
 packages/cli/src/commands/init/index.ts       | 2 +-
 packages/core/src/lib/command-utils.ts        | 4 ++--
 packages/core/src/lib/tasks.ts                | 4 ++--
 packages/templates/README.md                  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index cbb3ae1c..c30b8b38 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -98,7 +98,7 @@
     "lint": "eslint . --ext .ts --quiet --config .eslintrc",
     "postpack": "shx rm -f oclif.manifest.json",
     "prepack": "yarn build && oclif manifest && oclif readme",
-    "test": "mocha --require mocha-suppress-logs --forbid-only -r ts-node/register \"test/**/*.test.ts\"",
+    "test": "mocha --require mocha-suppress-logs --forbid-only -r ts-node/register \"tests/**/*.test.ts\"",
     "version": "oclif readme && git add README.md",
     "tarball:macos": "oclif pack tarballs --targets=darwin-x64 --no-xz",
     "tarball:linux": "oclif pack tarballs --targets=linux-x64 --no-xz",
diff --git a/packages/cli/src/commands/contract/new.ts b/packages/cli/src/commands/contract/new.ts
index fbdc6a8e..4c68615e 100644
--- a/packages/cli/src/commands/contract/new.ts
+++ b/packages/cli/src/commands/contract/new.ts
@@ -111,7 +111,7 @@ export class NewContract extends Command {
     );
 
     await ensureDir(path.resolve(projectPath, "artifacts", args.contractName));
-    await ensureDir(path.resolve(projectPath, "test", args.contractName));
+    await ensureDir(path.resolve(projectPath, "tests", args.contractName));
     if (contractLanguage === "ask") {
       await spinner.runCommand(async () => {
         const pjson = await readJSON("package.json");
diff --git a/packages/cli/src/commands/contract/test.ts b/packages/cli/src/commands/contract/test.ts
index 087ccf44..bb63f223 100644
--- a/packages/cli/src/commands/contract/test.ts
+++ b/packages/cli/src/commands/contract/test.ts
@@ -42,7 +42,7 @@ export class TestContract extends Command {
 
     const contractNames = flags.all ? Object.keys(config.contracts) : args.contractName;
 
-    const testDir = path.resolve("test");
+    const testDir = path.resolve("tests");
     for (const contractName of contractNames) {
       console.log(`Testing contract: ${contractName}`);
       const contractInfo = config.contracts[contractName];
diff --git a/packages/cli/src/commands/contract/typegen.ts b/packages/cli/src/commands/contract/typegen.ts
index 69d0b028..155dbecd 100644
--- a/packages/cli/src/commands/contract/typegen.ts
+++ b/packages/cli/src/commands/contract/typegen.ts
@@ -42,7 +42,7 @@ export class CompileContract extends Command {
       this.error(`Path to contract ${args.contractName} does not exist: ${contractPath}`);
     }
 
-    const testPath = path.resolve(`test/${args.contractName}`);
+    const testPath = path.resolve(`tests/${args.contractName}`);
 
     if (!contractInfo.build) {
       this.error(`No build data for contract "${args.contractName}"`);
diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 6e1b6f78..c371e7f9 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -199,7 +199,7 @@ export class Init extends BaseCommand {
     Object.keys(this.configBuilder.contracts as typeof this.swankyConfig.contracts).forEach(
       async (contractName) => {
         await ensureDir(path.resolve(this.projectPath, "artifacts", contractName));
-        await ensureDir(path.resolve(this.projectPath, "test", contractName));
+        await ensureDir(path.resolve(this.projectPath, "tests", contractName));
       }
     );
 
diff --git a/packages/core/src/lib/command-utils.ts b/packages/core/src/lib/command-utils.ts
index ebd9843f..67d662ff 100644
--- a/packages/core/src/lib/command-utils.ts
+++ b/packages/core/src/lib/command-utils.ts
@@ -145,8 +145,8 @@ export async function moveArtifacts(contractName: string): Promise<BuildData> {
       ),
     ]);
     // move both to test/contract_name/artifacts
-    const testArtifacts = path.resolve("test", contractName, "artifacts");
-    const testTypedContracts = path.resolve("test", contractName, "typedContract");
+    const testArtifacts = path.resolve("tests", contractName, "artifacts");
+    const testTypedContracts = path.resolve("tests", contractName, "typedContract");
     await fs.ensureDir(testArtifacts);
     await fs.ensureDir(testTypedContracts);
     await Promise.all([
diff --git a/packages/core/src/lib/tasks.ts b/packages/core/src/lib/tasks.ts
index d500e3fe..bc0b3f51 100644
--- a/packages/core/src/lib/tasks.ts
+++ b/packages/core/src/lib/tasks.ts
@@ -46,8 +46,8 @@ export async function copyContractTemplateFiles(
     path.resolve(projectPath, "contracts", contractName)
   );
   await copy(
-    path.resolve(contractTemplatePath, "test"),
-    path.resolve(projectPath, "test", contractName)
+    path.resolve(contractTemplatePath, "tests"),
+    path.resolve(projectPath, "tests", contractName)
   );
 }
 
diff --git a/packages/templates/README.md b/packages/templates/README.md
index 04bfd9cc..92296f0b 100644
--- a/packages/templates/README.md
+++ b/packages/templates/README.md
@@ -32,6 +32,6 @@ Contract-specific templates are grouped by language:
 - ask
 - ink
 
-Each contract directory must contain `contract` and `test` subdirectories.
+Each contract directory must contain `contract` and `tests` subdirectories.
 
 All the files contained within will be copied, respecting the directory structure, and the `.hbs` files will be processed by the templating engine.

From 4c1f5e5d584f346300768fdbc0f93fbf2aa6fa7a Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 8 May 2023 19:19:24 +0300
Subject: [PATCH 26/46] fix: test path

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index c30b8b38..cbb3ae1c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -98,7 +98,7 @@
     "lint": "eslint . --ext .ts --quiet --config .eslintrc",
     "postpack": "shx rm -f oclif.manifest.json",
     "prepack": "yarn build && oclif manifest && oclif readme",
-    "test": "mocha --require mocha-suppress-logs --forbid-only -r ts-node/register \"tests/**/*.test.ts\"",
+    "test": "mocha --require mocha-suppress-logs --forbid-only -r ts-node/register \"test/**/*.test.ts\"",
     "version": "oclif readme && git add README.md",
     "tarball:macos": "oclif pack tarballs --targets=darwin-x64 --no-xz",
     "tarball:linux": "oclif pack tarballs --targets=linux-x64 --no-xz",

From 3bc146d94abda0977497d08d0ad35d7561e7a57c Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 9 May 2023 16:47:22 +0300
Subject: [PATCH 27/46] fix iteration bug

---
 packages/cli/src/commands/contract/compile.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/cli/src/commands/contract/compile.ts b/packages/cli/src/commands/contract/compile.ts
index b3dc8542..4982a6b4 100644
--- a/packages/cli/src/commands/contract/compile.ts
+++ b/packages/cli/src/commands/contract/compile.ts
@@ -80,8 +80,7 @@ export class CompileContract extends Command {
     await ensureSwankyProject();
     const config = await getSwankyConfig();
 
-    const contractNames = flags.all ? Object.keys(config.contracts) : args.contractName;
-
+    const contractNames = flags.all ? Object.keys(config.contracts) : [args.contractName];
     const spinner = new Spinner();
 
     for (const contractName of contractNames) {

From d2f8a417e827a8e143e1a6bc23702353a20fa05f Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Wed, 10 May 2023 16:32:17 +0300
Subject: [PATCH 28/46] fix: typo?

---
 packages/core/src/lib/command-utils.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/lib/command-utils.ts b/packages/core/src/lib/command-utils.ts
index 09911c6b..21450709 100644
--- a/packages/core/src/lib/command-utils.ts
+++ b/packages/core/src/lib/command-utils.ts
@@ -158,11 +158,11 @@ export async function generateTypes(inputPath: string, contractName: string, out
   await fs.copyFile(
     path.resolve(inputPath, `${contractName}.contract`),
     path.resolve(TEMP_ARTIFACTS_PATH, `${contractName}.contract`)
-  ),
-    await fs.copyFile(
-      path.resolve(inputPath, `${contractName}.json`),
-      path.resolve(TEMP_ARTIFACTS_PATH, `${contractName}.json`)
-    );
+  );
+  await fs.copyFile(
+    path.resolve(inputPath, `${contractName}.json`),
+    path.resolve(TEMP_ARTIFACTS_PATH, `${contractName}.json`)
+  );
 
   await execa.command(
     `npx typechain-polkadot --in ${TEMP_ARTIFACTS_PATH} --out ${TEMP_TYPED_CONTRACT_PATH}`

From 5ab683c0057e50f8cb5ee2a4455fbdeb1d56c77a Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Wed, 10 May 2023 16:38:18 +0300
Subject: [PATCH 29/46] remove ask! conditionals

---
 packages/cli/src/commands/contract/compile.ts | 97 ++++++-------------
 1 file changed, 29 insertions(+), 68 deletions(-)

diff --git a/packages/cli/src/commands/contract/compile.ts b/packages/cli/src/commands/contract/compile.ts
index 4982a6b4..acf09b3f 100644
--- a/packages/cli/src/commands/contract/compile.ts
+++ b/packages/cli/src/commands/contract/compile.ts
@@ -1,44 +1,16 @@
 import { Args, Command, Flags } from "@oclif/core";
 import path = require("node:path");
-import Files from "fs";
-import fs = require("fs-extra");
 import {
   storeArtifacts,
   ensureSwankyProject,
-  ContractData,
   getSwankyConfig,
   BuildData,
   Spinner,
   generateTypes,
 } from "@astar-network/swanky-core";
-import { ChildProcessWithoutNullStreams, spawn } from "node:child_process";
+import { spawn } from "node:child_process";
 import { writeJSON, existsSync } from "fs-extra";
 
-function getBuildCommandFor(
-  language: ContractData["language"],
-  contractPath: string,
-  release: boolean
-): ChildProcessWithoutNullStreams {
-  if (language === "ink") {
-    const args = ["contract", "build", "--manifest-path", `${contractPath}/Cargo.toml`];
-    if (release) {
-      args.push("--release");
-    }
-    return spawn("cargo", args);
-  }
-  if (language === "ask") {
-    const args = ["asc", "--config", `${contractPath}/asconfig.json`, `${contractPath}/index.ts`];
-    if (release) {
-      args.push("-O");
-      args.push("--noAssert");
-    }
-    return spawn("npx", args, {
-      env: { ...process.env, ASK_CONFIG: `${contractPath}/askconfig.json` },
-    });
-  }
-  throw new Error("Unsupported language!");
-}
-
 export class CompileContract extends Command {
   static description = "Compile the smart contract(s) in your contracts directory";
 
@@ -93,19 +65,37 @@ export class CompileContract extends Command {
         this.error(`Contract folder not found at expected path`);
       }
 
-      await spinner.runCommand(
+      const compilationResult = await spinner.runCommand(
         async () => {
-          return new Promise<void>((resolve, reject) => {
-            const compile = getBuildCommandFor(contractInfo.language, contractPath, flags.release);
-            compile.stdout.on("data", () => spinner.ora.clear());
+          return new Promise<string>((resolve, reject) => {
+            const compileArgs = [
+              "contract",
+              "build",
+              "--manifest-path",
+              `${contractPath}/Cargo.toml`,
+            ];
+            if (flags.release) {
+              compileArgs.push("--release");
+            }
+            const compile = spawn("cargo", compileArgs);
+            let outputBuffer = "";
+
+            compile.stdout.on("data", (data) => {
+              outputBuffer += data.toString();
+              spinner.ora.clear();
+            });
             compile.stdout.pipe(process.stdout);
+
             if (flags.verbose) {
               compile.stderr.on("data", () => spinner.ora.clear());
               compile.stderr.pipe(process.stdout);
             }
             compile.on("exit", (code) => {
-              if (code === 0) resolve();
-              else reject();
+              if (code === 0) {
+                const regex = /Your contract artifacts are ready\. You can find them in:\n(.*)/;
+                const match = outputBuffer.match(regex);
+                if (match) resolve(match[1]);
+              } else reject();
             });
           });
         },
@@ -113,41 +103,12 @@ export class CompileContract extends Command {
         `${contractName} Contract compiled successfully`
       );
 
-      // Depends on which language was used, the artifacts will be generated in different places at compile step.
-      let artifactsPath: string;
-      if (contractInfo.language === "ink") {
-        artifactsPath = path.resolve("target", "ink", `${contractName}`);
-      } else if (contractInfo.language === "ask") {
-        artifactsPath = path.resolve(contractPath, "build");
-      } else {
-        throw new Error("Unsupported language!");
-      }
-
-      // Ask! build artifacts don't have `.contract` file which is just an combination of abi json and wasm blob
-      // `.contract` will have .source.wasm field whose value is wasm blob hex representation.
-      // Once Ask! support .contract file, this part will be removed.
-      if (contractInfo.language == "ask") {
-        // Unlike ink!, ask! names metadata file `metadata.json`. So, renaming it to contract name here needed for following tasks.
-        await fs.copyFile(
-          path.resolve(artifactsPath, "metadata.json"),
-          path.resolve(artifactsPath, `${contractName}.json`)
-        );
-        const contract = JSON.parse(
-          Files.readFileSync(path.resolve(artifactsPath, `${contractName}.json`)).toString()
-        );
-        const wasmBuf = Files.readFileSync(path.resolve(artifactsPath, `${contractName}.wasm`));
-        const prefix = "0x";
-        contract.source.wasm = prefix + wasmBuf.toString("hex");
-        fs.writeFileSync(
-          path.resolve(artifactsPath, `${contractName}.contract`),
-          JSON.stringify(contract)
-        );
-        await fs.remove(path.resolve(artifactsPath, `${contractName}.wasm`));
-      }
+      const artifactsPath = compilationResult as string;
 
-      const typedContractDestPath = path.resolve("test", contractName, "typedContract");
+      const typedContractDestPath = path.resolve("typedContracts", contractName);
       await spinner.runCommand(
-        async () => await generateTypes(artifactsPath, contractName, typedContractDestPath),
+        async () =>
+          await generateTypes(artifactsPath, path.basename(artifactsPath), typedContractDestPath),
         `Generating ${contractName} contract ts types`,
         `${contractName} contract's TS types Generated successfully`
       );

From ef2265df86a08740c399907d66268efdf460f929 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Thu, 11 May 2023 20:36:29 +0300
Subject: [PATCH 30/46] cleanup and fix compile and typeGen

---
 packages/cli/src/commands/contract/compile.ts |  28 ++---
 packages/cli/src/commands/contract/new.ts     |  16 ++-
 packages/cli/src/commands/contract/typegen.ts |  30 ++---
 packages/cli/src/commands/init/index.ts       |  48 ++++++--
 packages/core/src/lib/command-utils.ts        | 104 ++++++------------
 packages/core/src/lib/consts.ts               |   9 +-
 packages/core/src/types/index.ts              |   1 +
 7 files changed, 103 insertions(+), 133 deletions(-)

diff --git a/packages/cli/src/commands/contract/compile.ts b/packages/cli/src/commands/contract/compile.ts
index acf09b3f..252481ee 100644
--- a/packages/cli/src/commands/contract/compile.ts
+++ b/packages/cli/src/commands/contract/compile.ts
@@ -4,12 +4,11 @@ import {
   storeArtifacts,
   ensureSwankyProject,
   getSwankyConfig,
-  BuildData,
   Spinner,
   generateTypes,
 } from "@astar-network/swanky-core";
 import { spawn } from "node:child_process";
-import { writeJSON, existsSync } from "fs-extra";
+import { pathExists } from "fs-extra";
 
 export class CompileContract extends Command {
   static description = "Compile the smart contract(s) in your contracts directory";
@@ -60,8 +59,9 @@ export class CompileContract extends Command {
       if (!contractInfo) {
         this.error(`Cannot find contract info for ${contractName} contract in swanky.config.json`);
       }
-      const contractPath = path.resolve("contracts", contractName);
-      if (!existsSync(contractPath)) {
+      const contractPath = path.resolve("contracts", contractInfo.name);
+
+      if (!(await pathExists(contractPath))) {
         this.error(`Contract folder not found at expected path`);
       }
 
@@ -105,25 +105,15 @@ export class CompileContract extends Command {
 
       const artifactsPath = compilationResult as string;
 
-      const typedContractDestPath = path.resolve("typedContracts", contractName);
+      await spinner.runCommand(async () => {
+        return storeArtifacts(artifactsPath, contractInfo.name, contractInfo.moduleName);
+      }, "Moving artifacts");
+
       await spinner.runCommand(
-        async () =>
-          await generateTypes(artifactsPath, path.basename(artifactsPath), typedContractDestPath),
+        async () => await generateTypes(contractInfo.name),
         `Generating ${contractName} contract ts types`,
         `${contractName} contract's TS types Generated successfully`
       );
-
-      const buildData = (await spinner.runCommand(async () => {
-        return storeArtifacts(artifactsPath, contractInfo.name);
-      }, "Moving artifacts")) as BuildData;
-
-      contractInfo.build = buildData;
     }
-
-    await spinner.runCommand(async () => {
-      await writeJSON(path.resolve("swanky.config.json"), config, {
-        spaces: 2,
-      });
-    }, "Writing config");
   }
 }
diff --git a/packages/cli/src/commands/contract/new.ts b/packages/cli/src/commands/contract/new.ts
index 4c68615e..93d96914 100644
--- a/packages/cli/src/commands/contract/new.ts
+++ b/packages/cli/src/commands/contract/new.ts
@@ -1,6 +1,6 @@
 import { Args, Command, Flags } from "@oclif/core";
 import path = require("node:path");
-import { ensureDir, pathExistsSync, readJSON, writeJSON } from "fs-extra";
+import { ensureDir, pathExists, pathExistsSync, readJSON, writeJSON } from "fs-extra";
 import {
   getSwankyConfig,
   ensureSwankyProject,
@@ -43,16 +43,19 @@ export class NewContract extends Command {
 
     const config = await getSwankyConfig();
 
-    const projectPath = path.resolve();
+    const projectPath = process.cwd();
     const { args, flags } = await this.parse(NewContract);
 
-    if (
-      pathExistsSync(path.join(projectPath, "contracts", args.contractName)) ||
-      config.contracts[args.contractName]
-    ) {
+    if (await pathExists(path.resolve(projectPath, "contracts", args.contractName))) {
       throw new Error(`Contract folder '${args.contractName}' already exists`);
     }
 
+    if (config.contracts[args.contractName]) {
+      throw new Error(
+        `Contract with a name '${args.contractName}' already exists in swanky.config`
+      );
+    }
+
     const { contractLanguage } = flags.language
       ? { contractLanguage: flags.language }
       : await inquirer.prompt([pickLanguage()]);
@@ -125,6 +128,7 @@ export class NewContract extends Command {
     await spinner.runCommand(async () => {
       config.contracts[args.contractName] = {
         name: args.contractName,
+        moduleName: args.contractName,
         language: contractLanguage,
         deployments: [],
       };
diff --git a/packages/cli/src/commands/contract/typegen.ts b/packages/cli/src/commands/contract/typegen.ts
index d9869e85..8877416a 100644
--- a/packages/cli/src/commands/contract/typegen.ts
+++ b/packages/cli/src/commands/contract/typegen.ts
@@ -7,6 +7,7 @@ import {
   getSwankyConfig,
   Spinner,
   generateTypes,
+  consts,
 } from "@astar-network/swanky-core";
 
 export class TypegenCommand extends Command {
@@ -34,32 +35,25 @@ export class TypegenCommand extends Command {
 
     const spinner = new Spinner();
 
-    const contractList = readdirSync(path.resolve("contracts"));
+    const contractDirList = readdirSync(path.resolve("contracts"));
 
     const contractPath = path.resolve("contracts", args.contractName);
-    if (!contractList.includes(args.contractName)) {
+
+    if (!contractDirList.includes(args.contractName)) {
       this.error(`Path to contract ${args.contractName} does not exist: ${contractPath}`);
     }
 
-    const testPath = path.resolve(`tests/${args.contractName}`);
-
-    if (!contractInfo.build) {
-      this.error(`No build data for contract "${args.contractName}"`);
+    for (const artifact of [".json", ".contract"]) {
+      const artifactPath = path.resolve(
+        consts.ARTIFACTS_PATH,
+        `${contractInfo.moduleName}${artifact}`
+      );
+      if (!(await fs.pathExists(artifactPath)))
+        this.error(`No artifact file found at path: ${artifactPath}`);
     }
 
     await spinner.runCommand(async () => {
-      const destinationPath = path.resolve(testPath, "typedContract");
-      const destinationPathExists = await fs.pathExists(destinationPath);
-      if (destinationPathExists) {
-        await fs.remove(destinationPath);
-      }
-
-      const buildInfoArtifactsPath = contractInfo.build?.artifactsPath;
-      if (buildInfoArtifactsPath == undefined) {
-        throw new Error(`Invalid artifacts path "${buildInfoArtifactsPath}"`);
-      }
-
-      await generateTypes(buildInfoArtifactsPath, args.contractName, destinationPath)
+      await generateTypes(args.contractName);
     }, "Generating types");
   }
 }
diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index c371e7f9..8b9f6971 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -60,6 +60,7 @@ type PathEntry = {
   dirent: Dirent;
   name: string;
   path: string;
+  moduleName?: string;
 };
 
 type CopyCandidates = {
@@ -289,7 +290,8 @@ export class Init extends BaseCommand {
 
     this.configBuilder.contracts = {
       [answers.contractName as string]: {
-        name: answers.contractName as string,
+        name: answers.contractName,
+        moduleName: answers.contractName,
         deployments: [],
         language: contractLanguage,
       },
@@ -333,7 +335,7 @@ export class Init extends BaseCommand {
       ? await getDirsAndFiles(pathToExistingProject, [testDir])
       : [];
 
-    const confirmedCopyList = await confirmCopyList(candidatesList);
+    const confirmedCopyList = await detectModuleNames(await confirmCopyList(candidatesList));
 
     this.taskQueue.push({
       task: copyWorkspaceContracts,
@@ -352,6 +354,7 @@ export class Init extends BaseCommand {
     for (const contract of confirmedCopyList.contracts) {
       this.configBuilder.contracts[contract.name] = {
         name: contract.name,
+        moduleName: contract.moduleName as string,
         deployments: [],
         language: "ink",
       };
@@ -406,21 +409,44 @@ export class Init extends BaseCommand {
   }
 }
 
+async function detectModuleNames(copyList: CopyCandidates): Promise<CopyCandidates> {
+  const copyListWithModuleNames: CopyCandidates = {
+    contracts: [],
+    crates: [],
+    tests: copyList.tests ? [...copyList.tests] : [],
+  };
+
+  for (const group of ["contracts", "crates"]) {
+    for (const entry of copyList[group] as PathEntry[]) {
+      const moduleName = path.basename(entry.path);
+      const extendedEntry = { ...entry, moduleName };
+      if (
+        entry.dirent.isDirectory() &&
+        (await pathExists(path.resolve(entry.path, "Cargo.toml")))
+      ) {
+        const fileData = await readFile(path.resolve(entry.path, "Cargo.toml"), "utf-8");
+        const toml: any = TOML.parse(fileData);
+        if (toml.package?.name) {
+          extendedEntry.moduleName = toml.package.name;
+        } else {
+          console.log(`Could not detect the contract name from Cargo.toml. Using [${moduleName}]`);
+        }
+      }
+      copyListWithModuleNames[group].push(extendedEntry);
+    }
+  }
+  return copyListWithModuleNames;
+}
+
 async function copyWorkspaceContracts(copyList: CopyCandidates, projectPath: string) {
-  const copyPaths = async (group: "contracts" | "tests" | "crates") => {
+  for (const group of ["contracts", "crates", "tests"]) {
     const destDir = path.resolve(projectPath, group);
     await ensureDir(destDir);
-
     for (const entry of copyList[group] as PathEntry[]) {
-      const basename = path.basename(entry.path);
-      const destPath = path.join(destDir, basename);
+      const destPath = path.join(destDir, entry.name);
       await copy(entry.path, destPath);
     }
-  };
-
-  await copyPaths("contracts");
-  await copyPaths("tests");
-  await copyPaths("crates");
+  }
 }
 
 async function confirmCopyList(candidatesList: CopyCandidates) {
diff --git a/packages/core/src/lib/command-utils.ts b/packages/core/src/lib/command-utils.ts
index 21450709..40d9c39c 100644
--- a/packages/core/src/lib/command-utils.ts
+++ b/packages/core/src/lib/command-utils.ts
@@ -1,10 +1,9 @@
 import execa from "execa";
-import fs = require("fs-extra");
+import { copy, emptyDir, ensureDir, pathExists, readJSON, readJson } from "fs-extra";
 import path = require("node:path");
-import { DEFAULT_NETWORK_URL, STORED_ARTIFACTS_PATH } from "./consts.js";
-import { BuildData, SwankyConfig } from "../types";
+import { DEFAULT_NETWORK_URL, ARTIFACTS_PATH, TYPED_CONTRACTS_PATH } from "./consts.js";
+import { SwankyConfig } from "../types";
 import { Abi } from "@polkadot/api-contract";
-import { TEMP_ARTIFACTS_PATH, TEMP_TYPED_CONTRACT_PATH } from "./consts";
 
 export async function commandStdoutOrNull(command: string): Promise<string | null> {
   try {
@@ -16,7 +15,7 @@ export async function commandStdoutOrNull(command: string): Promise<string | nul
 }
 
 export async function ensureSwankyProject(): Promise<void> {
-  const configExists = await fs.pathExists("swanky.config.json");
+  const configExists = await pathExists("swanky.config.json");
   if (!configExists) {
     throw new Error("No 'swanky.config.json' detected in current folder!");
   }
@@ -24,7 +23,7 @@ export async function ensureSwankyProject(): Promise<void> {
 
 export async function getSwankyConfig(): Promise<SwankyConfig> {
   try {
-    const config = await fs.readJSON("swanky.config.json");
+    const config = await readJSON("swanky.config.json");
     return config;
   } catch {
     throw new Error("No 'swanky.config.json' detected in current folder!");
@@ -45,52 +44,31 @@ export function resolveNetworkUrl(config: SwankyConfig, networkName: string): st
 
 export async function storeArtifacts(
   artifactsPath: string,
-  contractName: string
-): Promise<BuildData> {
-  const ts = Date.now();
-  const fullPath = path.resolve(STORED_ARTIFACTS_PATH, contractName, ts.toString());
-  const relativePath = path.relative(path.resolve(), fullPath);
-  const buildData = {
-    artifactsPath: relativePath,
-    timestamp: Date.now(),
-  };
-
-  // copy artifacts/contract_name.contract and .json to artifactsPath .contract and .json
+  contractAlias: string,
+  moduleName: string
+): Promise<void> {
+  const destArtifactsPath = path.resolve(ARTIFACTS_PATH, contractAlias);
+  const testArtifactsPath = path.resolve("tests", contractAlias, "artifacts");
+
+  await ensureDir(destArtifactsPath);
+  await emptyDir(destArtifactsPath);
+
+  await ensureDir(testArtifactsPath);
+  await emptyDir(testArtifactsPath);
+
   try {
-    await Promise.all([
-      fs.copyFile(
-        path.resolve(artifactsPath, `${contractName}.contract`),
-        `${buildData.artifactsPath}/${contractName}.contract`
-      ),
-      fs.copyFile(
-        path.resolve(artifactsPath, `${contractName}.json`),
-        `${buildData.artifactsPath}/${contractName}.json`
-      ),
-    ]);
-    // move both to test/contract_name/artifacts
-    const testArtifacts = path.resolve("test", contractName, "artifacts");
-    await fs.ensureDir(testArtifacts);
-    await Promise.all([
-      fs.move(
-        path.resolve(artifactsPath, `${contractName}.contract`),
-        `${testArtifacts}/${contractName}.contract`,
-        { overwrite: true }
-      ),
-      fs.move(
-        path.resolve(artifactsPath, `${contractName}.json`),
-        `${testArtifacts}/${contractName}.json`,
-        { overwrite: true }
-      ),
-    ]);
-  } catch (e) {
-    console.error(e);
+    for (const fileName of [`${moduleName}.contract`, `${moduleName}.json`]) {
+      const artifactFileToCopy = path.resolve(artifactsPath, fileName);
+      await copy(artifactFileToCopy, path.resolve(destArtifactsPath, fileName));
+      await copy(artifactFileToCopy, path.resolve(testArtifactsPath, fileName));
+    }
+  } catch (error) {
+    console.error(error);
   }
-
-  return buildData;
 }
 
 export async function printContractInfo(metadataPath: string) {
-  const abi = new Abi(await fs.readJson(metadataPath));
+  const abi = new Abi(await readJson(metadataPath));
 
   // TODO: Use templating, colorize.
 
@@ -140,33 +118,15 @@ export async function printContractInfo(metadataPath: string) {
   }
 }
 
-export async function generateTypes(inputPath: string, contractName: string, outputPath: string) {
-  await fs.ensureDir(TEMP_ARTIFACTS_PATH);
+export async function generateTypes(contractName: string) {
+  const relativeInputPath = `${ARTIFACTS_PATH}/${contractName}`;
+  const relativeOutputPath = `${TYPED_CONTRACTS_PATH}/${contractName}`;
+  const outputPath = path.resolve(process.cwd(), relativeOutputPath);
 
-  // Getting error if typechain-polkadot takes folder with unnecessary files/folders as inputs.
-  // So, need to copy artifacts to empty temp folder and use it as input.
-  (await fs.readdir(TEMP_ARTIFACTS_PATH)).forEach(async (file) => {
-    const filepath = path.resolve(TEMP_ARTIFACTS_PATH, file);
-    const filestat = await fs.stat(filepath);
-    if (!filestat.isDirectory()) {
-      await fs.remove(filepath);
-    }
-  });
-
-  // Cannot generate typedContract directly to `outputAbsPath`
-  // because relative path of typechain-polkadot input and output folder does matter for later use.
-  await fs.copyFile(
-    path.resolve(inputPath, `${contractName}.contract`),
-    path.resolve(TEMP_ARTIFACTS_PATH, `${contractName}.contract`)
-  );
-  await fs.copyFile(
-    path.resolve(inputPath, `${contractName}.json`),
-    path.resolve(TEMP_ARTIFACTS_PATH, `${contractName}.json`)
-  );
+  ensureDir(outputPath);
+  emptyDir(outputPath);
 
   await execa.command(
-    `npx typechain-polkadot --in ${TEMP_ARTIFACTS_PATH} --out ${TEMP_TYPED_CONTRACT_PATH}`
+    `npx typechain-polkadot --in ${relativeInputPath} --out ${relativeOutputPath}`
   );
-
-  await fs.move(path.resolve(TEMP_TYPED_CONTRACT_PATH), outputPath, { overwrite: true });
 }
diff --git a/packages/core/src/lib/consts.ts b/packages/core/src/lib/consts.ts
index d924deea..11a5e39a 100644
--- a/packages/core/src/lib/consts.ts
+++ b/packages/core/src/lib/consts.ts
@@ -3,10 +3,5 @@ export const DEFAULT_ASTAR_NETWORK_URL = "wss://rpc.astar.network";
 export const DEFAULT_SHIDEN_NETWORK_URL = "wss://rpc.shiden.astar.network";
 export const DEFAULT_SHIBUYA_NETWORK_URL = "wss://rpc.shibuya.astar.network";
 
-export const STORED_ARTIFACTS_PATH = "./artifacts";
-
-// typechain-polkadot's output files are tightly coupled with input folder path.
-// ./artifacts folder is used not only for storing historical artifacts, but also as typechain-polkadot's input folder.
-// So, name duplication with `STORED_ARTIFACTS_PATH` is expected at least for now.
-export const TEMP_ARTIFACTS_PATH = "./artifacts";
-export const TEMP_TYPED_CONTRACT_PATH = "./typedContract";
\ No newline at end of file
+export const ARTIFACTS_PATH = "artifacts";
+export const TYPED_CONTRACTS_PATH = "typedContracts";
diff --git a/packages/core/src/types/index.ts b/packages/core/src/types/index.ts
index 6f1f6f19..b837364c 100644
--- a/packages/core/src/types/index.ts
+++ b/packages/core/src/types/index.ts
@@ -23,6 +23,7 @@ export interface AccountData {
 export interface ContractData {
   language: "ask" | "ink";
   name: string;
+  moduleName: string;
   build?: BuildData;
   deployments: DeploymentData[] | [];
 }

From 74c45714cb4d7ac4677e2ef5f350abafea883f85 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Thu, 11 May 2023 23:18:40 +0300
Subject: [PATCH 31/46] fix PR comment bug

---
 packages/core/src/lib/tasks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/lib/tasks.ts b/packages/core/src/lib/tasks.ts
index 38a896ba..aa9dd16b 100644
--- a/packages/core/src/lib/tasks.ts
+++ b/packages/core/src/lib/tasks.ts
@@ -46,7 +46,7 @@ export async function copyContractTemplateFiles(
     path.resolve(projectPath, "contracts", contractName)
   );
   await copy(
-    path.resolve(contractTemplatePath, "tests"),
+    path.resolve(contractTemplatePath, "test"),
     path.resolve(projectPath, "tests", contractName)
   );
 }

From b151414eb37152beffc1cb48bb12bc9ba24b6ddf Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Thu, 11 May 2023 23:18:56 +0300
Subject: [PATCH 32/46] add contract class

---
 packages/cli/src/lib/contract.ts | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 packages/cli/src/lib/contract.ts

diff --git a/packages/cli/src/lib/contract.ts b/packages/cli/src/lib/contract.ts
new file mode 100644
index 00000000..0eef95aa
--- /dev/null
+++ b/packages/cli/src/lib/contract.ts
@@ -0,0 +1,38 @@
+import { ContractData, DeploymentData, consts } from "@astar-network/swanky-core";
+import { pathExists } from "fs-extra";
+import path from "node:path";
+
+export class Contract {
+  static artifactTypes = [".json", ".contract"];
+  name: string;
+  moduleName: string;
+  language: string;
+  deployments: DeploymentData[];
+  contractPath: string;
+  artifactsPath: string;
+  constructor(contractRecord: ContractData) {
+    this.name = contractRecord.name;
+    this.moduleName = contractRecord.moduleName;
+    this.language = contractRecord.language;
+    this.deployments = contractRecord.deployments;
+    this.contractPath = path.resolve("contracts", contractRecord.name);
+    this.artifactsPath = path.resolve(consts.ARTIFACTS_PATH, contractRecord.name);
+  }
+
+  async pathExists() {
+    return pathExists(this.contractPath);
+  }
+
+  async artifactsExist() {
+    const result: { result: boolean; missing: string[] } = { result: true, missing: [] };
+    for (const artifactType of Contract.artifactTypes) {
+      const artifactPath = path.resolve(this.artifactsPath, `${this.moduleName}${artifactType}`);
+
+      if (!(await pathExists(artifactPath))) {
+        result.result = false;
+        result.missing.push(artifactPath);
+      }
+    }
+    return result;
+  }
+}

From 1afaff405a3cf1ac0e3712627fcd97fdec593265 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Thu, 11 May 2023 23:19:07 +0300
Subject: [PATCH 33/46] use contract class in typegen and deploy

---
 packages/cli/src/commands/contract/deploy.ts  | 39 +++++++++++--------
 packages/cli/src/commands/contract/typegen.ts | 30 ++++++--------
 packages/cli/src/lib/contract.ts              | 36 +++++++++++++++--
 3 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/packages/cli/src/commands/contract/deploy.ts b/packages/cli/src/commands/contract/deploy.ts
index b93b9bf1..90ecdaf8 100644
--- a/packages/cli/src/commands/contract/deploy.ts
+++ b/packages/cli/src/commands/contract/deploy.ts
@@ -1,6 +1,6 @@
 import { Args, Command, Flags } from "@oclif/core";
 import path = require("node:path");
-import { readJSON, readFile, writeJSON } from "fs-extra";
+import { writeJSON } from "fs-extra";
 import { cryptoWaitReady } from "@polkadot/util-crypto";
 import {
   ensureSwankyProject,
@@ -12,10 +12,11 @@ import {
   AccountData,
   Encrypted,
   decrypt,
-  AbiType as Abi,
+  AbiType,
 } from "@astar-network/swanky-core";
 import inquirer from "inquirer";
 import chalk = require("chalk");
+import { Contract } from "../../lib/contract";
 
 export class DeployContract extends Command {
   static description = "Deploy contract to a running node";
@@ -60,11 +61,23 @@ export class DeployContract extends Command {
 
     const spinner = new Spinner();
 
-    const contractInfo = config.contracts[args.contractName];
-    if (!contractInfo) {
+    const contractRecord = config.contracts[args.contractName];
+    if (!contractRecord) {
       this.error(`Cannot find a contract named ${args.contractName} in swanky.config.json`);
     }
 
+    const contract = new Contract(contractRecord);
+
+    if (!(await contract.pathExists())) {
+      this.error(`Path to contract ${args.contractName} does not exist: ${contract.contractPath}`);
+    }
+
+    const artifactsCheck = await contract.artifactsExist();
+
+    if (!artifactsCheck.result) {
+      this.error(`No artifact file found at path: ${artifactsCheck.missingPaths}`);
+    }
+
     const accountData = config.accounts.find(
       (account: AccountData) => account.alias === flags.account
     );
@@ -93,18 +106,10 @@ export class DeployContract extends Command {
     }, "Initialising")) as ChainAccount;
 
     const { abi, wasm } = (await spinner.runCommand(async () => {
-      if (!contractInfo.build) {
-        this.error(`No build info found for contract named ${args.contractName}`);
-      }
-      const abi = (await readJSON(
-        path.resolve(contractInfo.build.artifactsPath, `${args.contractName}.json`)
-      )) as Abi;
-      const contract = await readJSON(
-        path.resolve(contractInfo.build.artifactsPath, `${args.contractName}.contract`)
-      );
-      const wasm = contract.source.wasm;
+      const abi = await contract.getABI();
+      const wasm = await contract.getWasm();
       return { abi, wasm };
-    }, "Getting WASM")) as { abi: Abi; wasm: Buffer };
+    }, "Getting WASM")) as { abi: AbiType; wasm: Buffer };
 
     const networkUrl = resolveNetworkUrl(config, flags.network ?? "");
 
@@ -132,8 +137,8 @@ export class DeployContract extends Command {
     }, "Deploying")) as string;
 
     await spinner.runCommand(async () => {
-      contractInfo.deployments = [
-        ...contractInfo.deployments,
+      contractRecord.deployments = [
+        ...contractRecord.deployments,
         {
           timestamp: Date.now(),
           address: contractAddress,
diff --git a/packages/cli/src/commands/contract/typegen.ts b/packages/cli/src/commands/contract/typegen.ts
index 8877416a..df823bc3 100644
--- a/packages/cli/src/commands/contract/typegen.ts
+++ b/packages/cli/src/commands/contract/typegen.ts
@@ -1,14 +1,11 @@
 import { Args, Command } from "@oclif/core";
-import * as fs from "fs-extra";
-import path = require("node:path");
-import { readdirSync } from "node:fs";
 import {
   ensureSwankyProject,
   getSwankyConfig,
   Spinner,
   generateTypes,
-  consts,
 } from "@astar-network/swanky-core";
+import { Contract } from "../../lib/contract";
 
 export class TypegenCommand extends Command {
   static description = "Generate types from compiled contract metadata";
@@ -28,32 +25,27 @@ export class TypegenCommand extends Command {
 
     const config = await getSwankyConfig();
 
-    const contractInfo = config.contracts[args.contractName];
-    if (!contractInfo) {
+    const contractRecord = config.contracts[args.contractName];
+    if (!contractRecord) {
       this.error(`Cannot find a contract named ${args.contractName} in swanky.config.json`);
     }
 
     const spinner = new Spinner();
 
-    const contractDirList = readdirSync(path.resolve("contracts"));
+    const contract = new Contract(contractRecord);
 
-    const contractPath = path.resolve("contracts", args.contractName);
-
-    if (!contractDirList.includes(args.contractName)) {
-      this.error(`Path to contract ${args.contractName} does not exist: ${contractPath}`);
+    if (!(await contract.pathExists())) {
+      this.error(`Path to contract ${args.contractName} does not exist: ${contract.contractPath}`);
     }
 
-    for (const artifact of [".json", ".contract"]) {
-      const artifactPath = path.resolve(
-        consts.ARTIFACTS_PATH,
-        `${contractInfo.moduleName}${artifact}`
-      );
-      if (!(await fs.pathExists(artifactPath)))
-        this.error(`No artifact file found at path: ${artifactPath}`);
+    const artifactsCheck = await contract.artifactsExist();
+
+    if (!artifactsCheck.result) {
+      this.error(`No artifact file found at path: ${artifactsCheck.missingPaths}`);
     }
 
     await spinner.runCommand(async () => {
-      await generateTypes(args.contractName);
+      await generateTypes(contract.name);
     }, "Generating types");
   }
 }
diff --git a/packages/cli/src/lib/contract.ts b/packages/cli/src/lib/contract.ts
index 0eef95aa..4c692ee7 100644
--- a/packages/cli/src/lib/contract.ts
+++ b/packages/cli/src/lib/contract.ts
@@ -1,5 +1,5 @@
-import { ContractData, DeploymentData, consts } from "@astar-network/swanky-core";
-import { pathExists } from "fs-extra";
+import { AbiType, ContractData, DeploymentData, consts } from "@astar-network/swanky-core";
+import { pathExists, readJson } from "fs-extra";
 import path from "node:path";
 
 export class Contract {
@@ -24,15 +24,43 @@ export class Contract {
   }
 
   async artifactsExist() {
-    const result: { result: boolean; missing: string[] } = { result: true, missing: [] };
+    const result: { result: boolean; missingPaths: string[]; missingTypes: string[] } = {
+      result: true,
+      missingPaths: [],
+      missingTypes: [],
+    };
     for (const artifactType of Contract.artifactTypes) {
       const artifactPath = path.resolve(this.artifactsPath, `${this.moduleName}${artifactType}`);
 
       if (!(await pathExists(artifactPath))) {
         result.result = false;
-        result.missing.push(artifactPath);
+        result.missingPaths.push(artifactPath);
+        result.missingTypes.push(artifactType);
       }
     }
     return result;
   }
+
+  async getABI(): Promise<AbiType> {
+    const check = await this.artifactsExist();
+    if (!check.result && check.missingTypes.includes(".json")) {
+      throw new Error(`Cannot read ABI, path not found: ${check.missingPaths}`);
+    }
+    return readJson(path.resolve(this.artifactsPath, `${this.moduleName}.json`));
+  }
+
+  async getBundle() {
+    const check = await this.artifactsExist();
+    if (!check.result && check.missingTypes.includes(".contract")) {
+      throw new Error(`Cannot read .contract bundle, path not found: ${check.missingPaths}`);
+    }
+    return readJson(path.resolve(this.artifactsPath, `${this.moduleName}.contract`));
+  }
+
+  async getWasm(): Promise<Buffer> {
+    const bundle = await this.getBundle();
+    if (bundle.source?.wasm) return bundle.source.wasm;
+
+    throw new Error(`Cannot find wasm field in the .contract bundle!`);
+  }
 }

From bc40aa5aa8c47c8fae883519ed49e3bee80f3f07 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Fri, 12 May 2023 00:02:52 +0300
Subject: [PATCH 34/46] use contract class in contract test

---
 packages/cli/src/commands/contract/test.ts | 30 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/commands/contract/test.ts b/packages/cli/src/commands/contract/test.ts
index bb63f223..50e0761f 100644
--- a/packages/cli/src/commands/contract/test.ts
+++ b/packages/cli/src/commands/contract/test.ts
@@ -6,6 +6,7 @@ import globby from "globby";
 import Mocha from "mocha";
 import { emptyDir } from "fs-extra";
 import * as shell from "shelljs";
+import { Contract } from "../../lib/contract";
 
 declare global {
   var contractTypesPath: string; // eslint-disable-line no-var
@@ -40,17 +41,34 @@ export class TestContract extends Command {
     await ensureSwankyProject();
     const config = await getSwankyConfig();
 
-    const contractNames = flags.all ? Object.keys(config.contracts) : args.contractName;
+    const contractNames = flags.all ? Object.keys(config.contracts) : [args.contractName];
 
     const testDir = path.resolve("tests");
+
     for (const contractName of contractNames) {
-      console.log(`Testing contract: ${contractName}`);
-      const contractInfo = config.contracts[contractName];
-      if (!contractInfo.build) {
-        this.error(`Cannot find build data for ${contractName} contract in swanky.config.json`);
+      const contractRecord = config.contracts[contractName];
+      if (!contractRecord) {
+        this.error(`Cannot find a contract named ${args.contractName} in swanky.config.json`);
+      }
+
+      const contract = new Contract(contractRecord);
+
+      if (!(await contract.pathExists())) {
+        this.error(
+          `Path to contract ${args.contractName} does not exist: ${contract.contractPath}`
+        );
       }
 
-      const reportDir = path.resolve(testDir, contractInfo.name, "testReports");
+      const artifactsCheck = await contract.artifactsExist();
+
+      if (!artifactsCheck.result) {
+        this.error(`No artifact file found at path: ${artifactsCheck.missingPaths}`);
+      }
+
+      console.log(`Testing contract: ${contractName}`);
+
+      const reportDir = path.resolve(testDir, contract.name, "testReports");
+
       await emptyDir(reportDir);
 
       const mocha = new Mocha({

From 897bf2eb21a95a05e5a1c8079fed2f9d43535954 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Fri, 12 May 2023 11:51:31 +0300
Subject: [PATCH 35/46] add more exclusions to fuzzy search

---
 packages/cli/src/commands/init/index.ts |  15 +-
 yarn.lock                               | 648 +++++++++++++-----------
 2 files changed, 356 insertions(+), 307 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 8b9f6971..9940c219 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -525,7 +525,10 @@ async function detectTests(pathToExistingProject: string) {
       itemType: "directory",
       rootPath: pathToExistingProject,
       message: "Please enter the path to the contracts directory: ",
-      excludePath: (nodePath: string) => nodePath.startsWith("node_modules"),
+      excludePath: (nodePath: string) =>
+        nodePath.includes("node_modules") ||
+        nodePath.includes(".git") ||
+        nodePath.includes("target"),
     },
   ]);
   if (shouldOverwriteTestDir) {
@@ -565,7 +568,10 @@ async function getManualPaths(pathToProject: string) {
       itemType: "directory",
       rootPath: pathToProject,
       message: "Please enter the path to the contracts directory: ",
-      excludePath: (nodePath: string) => nodePath.startsWith("node_modules"),
+      excludePath: (nodePath: string) =>
+        nodePath.includes("node_modules") ||
+        nodePath.includes(".git") ||
+        nodePath.includes("target"),
     },
     {
       type: "confirm",
@@ -580,7 +586,10 @@ async function getManualPaths(pathToProject: string) {
       itemType: "directory",
       rootPath: pathToProject,
       message: "Please enter the path to the contracts directory: ",
-      excludePath: (nodePath: string) => nodePath.startsWith("node_modules"),
+      excludePath: (nodePath: string) =>
+        nodePath.includes("node_modules") ||
+        nodePath.includes(".git") ||
+        nodePath.includes("target"),
     },
   ]);
 
diff --git a/yarn.lock b/yarn.lock
index 51048239..7901ac02 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,9 +3,9 @@
 
 
 "@babel/code-frame@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
+  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
@@ -24,13 +24,20 @@
     js-tokens "^4.0.0"
 
 "@babel/runtime-corejs3@^7.16.5":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.21.0.tgz#6e4939d9d9789ff63e2dc58e88f13a3913a24eba"
-  integrity sha512-TDD4UJzos3JJtM+tHX+w2Uc+KWj7GV+VKKFdMVd2Rx8sdA19hcc3P3AHFYd5LVOw+pYuSd5lICC3gm52B6Rwxw==
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.21.5.tgz#a6d4e132ab1cb2fae2354f02284ebb6e07b4f7d8"
+  integrity sha512-FRqFlFKNazWYykft5zvzuEl1YyTDGsIRrjV9rvxvYkUC7W/ueBng1X68Xd6uRMzAaJ0xMKn08/wem5YS1lpX8w==
   dependencies:
     core-js-pure "^3.25.1"
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.21.0":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
+  integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@chevrotain/cst-dts-gen@10.5.0":
   version "10.5.0"
   resolved "https://registry.yarnpkg.com/@chevrotain/cst-dts-gen/-/cst-dts-gen-10.5.0.tgz#922ebd8cc59d97241bb01b1b17561a5c1ae0124e"
@@ -120,14 +127,14 @@
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
 
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
 
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
@@ -1093,76 +1100,75 @@
     read-package-json-fast "^2.0.3"
     which "^2.0.2"
 
-"@nrwl/cli@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.8.5.tgz#fbe1ad82c4f4c851d0686212707ad6e639358319"
-  integrity sha512-voy16nUO1MxRMRqCpLlhDB9U4KyPfGHZABXtfMEIQk+W3alncatFMMSVvMQZmi8HXwubM8LxWSOnPtTtOCKBrQ==
+"@nrwl/cli@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.9.4.tgz#63b600dff1cdc126f234d16978a888f72c22a00c"
+  integrity sha512-FoiGFCLpb/r4HXCM3KYqT0xteP+MRV6bIHjz3bdPHIDLmBNQQnRRaV2K47jtJ6zjh1eOU5UHKyDtDDYf80Idpw==
   dependencies:
-    nx "15.8.5"
+    nx "15.9.4"
 
 "@nrwl/devkit@>=14.8.6 < 16":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-15.8.5.tgz#c31053a9127785900f650fdf4a3949d4a5819450"
-  integrity sha512-NgpD1I1BfFb6wRxB5i5PGP4hMyRhPsArCyENWWvY4gCn8tylAc7yjpQyiDiy2QnymL2PjWM8QeAeCOy1eF2xgw==
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-15.9.4.tgz#3f0a43a9637fcd0a46c06df2a9c36012b27f006b"
+  integrity sha512-mUX1kXTuPMdTzFxIzH+MsSNvdppOmstPDOEtiGFZJTuJ625ki0HhNJILO3N2mJ7MeMrLqIlAiNdvelQaObxYsQ==
   dependencies:
-    "@phenomnomnominal/tsquery" "4.1.1"
     ejs "^3.1.7"
     ignore "^5.0.4"
     semver "7.3.4"
     tmp "~0.2.1"
     tslib "^2.3.0"
 
-"@nrwl/nx-darwin-arm64@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.8.5.tgz#9f4f180dec1d41df5b97eebcf149e706ac927b55"
-  integrity sha512-/8yXbh1J3k85MAW/A6cDiPeEnbt66SE9BPnM2IPlGoZrXakQvAXEn+gsjQlvnP3q2EaEyv7e5+GA+8d+p6mT5A==
-
-"@nrwl/nx-darwin-x64@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.8.5.tgz#801e2ec0e55db722782b4bb4072e4347395bf54e"
-  integrity sha512-zEVoi0d+YChLrQMypoGFwu73t3YiD8UkXSozMtUEa2mg/se4e7jh+15tB6Te+Oq5aL0JKwQpr027GE4YtAmpLw==
-
-"@nrwl/nx-linux-arm-gnueabihf@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.8.5.tgz#3522c0f91b07d3da09dfb44934eb00a368e6b251"
-  integrity sha512-4C5wN0C7gQD6/lC9+UKUsB6mbHvowKhlaO529GIgtzrCLmfEh/LJ/CybnnKGpFEB/8Y5GpCa2uTWyA1XcPDzUw==
-
-"@nrwl/nx-linux-arm64-gnu@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.8.5.tgz#fedfc7aa39a9a54db96515b5dbb274fdc6ad1c68"
-  integrity sha512-SMQ+oIsyK75JiKeSMprmb8VXce6MLdfcS5GWWOihpoDWfUC9FoQHAu4X1OtxHbVTmJfoEOInJKAhPxXAi5obdw==
-
-"@nrwl/nx-linux-arm64-musl@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.8.5.tgz#ec20be69ee1ad82b7ef57ce4040518631616d31a"
-  integrity sha512-GVENjltZ17aJ6KOCibdBtLXQcGY5lpBqKolB9+rIYJvTWuV1k/uHOkYJDG7Vl70Rj46rC8K0Jp6BCpJHCv1ksQ==
-
-"@nrwl/nx-linux-x64-gnu@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.8.5.tgz#4d8c3677c52b78b6d1b4aeb1dc8b54d527874acf"
-  integrity sha512-AW8YjhZv3c+LRUoLvHLx4BZaDakQbPCPx70+c/uQyDkQP/ckYJc0gRjoZukolcI6+AvNcBhkI559RL9W4qb9iw==
-
-"@nrwl/nx-linux-x64-musl@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.8.5.tgz#697f48c06397f8ec9b233befd5e79ad7f7250d6a"
-  integrity sha512-m4Iy/pbzH0LTsADq/X+74nfVzm2Tt0zorOXXy/uQN4ozL/JNGVpwvxdOFxZ7e3RBXDX4u6awUzSE52Z2d2f0uA==
-
-"@nrwl/nx-win32-arm64-msvc@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.8.5.tgz#a9a2a1aec2286c15016c93d436b67e954ea5037c"
-  integrity sha512-4AT1PHo5At8AXvgE5XlQbimE0THeSji6J3XZ1UTqq7n3L26QicNdnZcaHGyL1ukMtXRIwT/yed+xu1PFkXF4QA==
-
-"@nrwl/nx-win32-x64-msvc@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.8.5.tgz#09afb4b7c55806d6f66c84912dc15c50bc0c315b"
-  integrity sha512-53vzsQErvN4OeF/qBgfPg6OZ3smX4V8Lza59bwql9aAjjlMe1Ff9Su0BgAqlhVfSiYGxAirfHljgA6aWFqpCHQ==
-
-"@nrwl/tao@15.8.5":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.8.5.tgz#eb94e7e2f94c84fb3f8b8d10b4633a438be569f6"
-  integrity sha512-pb/hUprOOv2vgvbevGz9hiu8LLOtK7KKuBe4JLSXrFxfHEQjMFsK/2aymnts0ZQrA83QlIG2Mr0tuSKj6/iWvg==
-  dependencies:
-    nx "15.8.5"
+"@nrwl/nx-darwin-arm64@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.9.4.tgz#e5a2f39d42a60397a01140a251f894788f5d1fda"
+  integrity sha512-XnvrnT9BJsgThY/4xUcYtE077ERq/img8CkRj7MOOBNOh0/nVcR4LGbBKDHtwE3HPk0ikyS/SxRyNa9msvi3QQ==
+
+"@nrwl/nx-darwin-x64@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.9.4.tgz#97a810d4ff6b4bf395a43e4740890c0def2372da"
+  integrity sha512-WKSfSlpVMLchpXkax0geeUNyhvNxwO7qUz/s0/HJWBekt8fizwKDwDj1gP7fOu+YWb/tHiSscbR1km8PtdjhQw==
+
+"@nrwl/nx-linux-arm-gnueabihf@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.9.4.tgz#b8dd23b8c755b7e640d744945ab2dec3fd3eda65"
+  integrity sha512-a/b4PP7lP/Cgrh0LjC4O2YTt5pyf4DQTGtuE8qlo8o486UiofCtk4QGJX72q80s23L0ejCaKY2ULKx/3zMLjuA==
+
+"@nrwl/nx-linux-arm64-gnu@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.9.4.tgz#5bc150c2bdb2e0a2eaf8721b3c5fdb2eb93f8739"
+  integrity sha512-ibBV8fMhSfLVd/2WzcDuUm32BoZsattuKkvMmOoyU6Pzoznc3AqyDjJR4xCIoAn5Rf+Nu1oeQONr5FAtb1Ugow==
+
+"@nrwl/nx-linux-arm64-musl@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.9.4.tgz#df2f18f813828000dc52f1b7668339947b1a0862"
+  integrity sha512-iIjvVYd7+uM4jVD461+PvU5XTALgSvJOODUaMRGOoDl0KlMuTe6pQZlw0eXjl5rcTd6paKaVFWT5j6awr8kj7w==
+
+"@nrwl/nx-linux-x64-gnu@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.9.4.tgz#55547b07e6aeb0c36a43e05bd07c15b013f2de9f"
+  integrity sha512-q4OyH72mdrE4KellBWtwpr5EwfxHKNoFP9//7FAILO68ROh0rpMd7YQMlTB7T04UEUHjKEEsFGTlVXIee3Viwg==
+
+"@nrwl/nx-linux-x64-musl@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.9.4.tgz#29cd644736f643566d9c0e1a1171c49a62a08c09"
+  integrity sha512-67+/XNMR1CgLPyeGX8jqSG6l8yYD0iiwUgcu1Vaxq6N05WwnqVisIW8XzLSRUtKt4WyVQgOWk3aspImpMVOG3Q==
+
+"@nrwl/nx-win32-arm64-msvc@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.9.4.tgz#55a38bf5dc201e9088729fb03e505dc63caf8b3a"
+  integrity sha512-2rEsq3eOGVCYpYJn2tTJkOGNJm/U8rP/FmqtZXYa6VJv/00XP3Gl00IXFEDaYV6rZo7SWqLxtEPUbjK5LwPzZA==
+
+"@nrwl/nx-win32-x64-msvc@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.9.4.tgz#56bb859bfe47d08d14f8d5822d9a31d9098d95a9"
+  integrity sha512-bogVju4Z/hy1jbppqaTNbmV1R4Kg0R5fKxXAXC2LaL7FL0dup31wPumdV+mXttXBNOBDjV8V/Oz1ZqdmxpOJUw==
+
+"@nrwl/tao@15.9.4":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.9.4.tgz#5e384af06d1fb68e326eda2c6a5d8f99ce1583b8"
+  integrity sha512-m90iz8UsXx1rgPm1dxsBQjSrCViWYZIrp8bpwjSCW24j3kifyilYSXGuKaRwZwUn7eNmH/kZcI9/8qeGIPF4Sg==
+  dependencies:
+    nx "15.9.4"
 
 "@oclif/color@^1.0.4":
   version "1.0.4"
@@ -1175,7 +1181,7 @@
     supports-color "^8.1.1"
     tslib "^2"
 
-"@oclif/core@2.5.0", "@oclif/core@^2.0.3", "@oclif/core@^2.1.1", "@oclif/core@^2.3.0", "@oclif/core@^2.4.0":
+"@oclif/core@2.5.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.5.0.tgz#ade1ff5cf0c2f46851eb101a036ba03e54146d9d"
   integrity sha512-gHDqrJ3orSm9eV+EacNnw1hlbBie3BAUAenWLWKa7TfJHyfseVhLGV8skkb8uA9MTRAAESJNxWAADh0gIbtZKg==
@@ -1209,20 +1215,62 @@
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
 
-"@oclif/plugin-help@5.2.7", "@oclif/plugin-help@^5.1.19":
+"@oclif/core@^2.0.3", "@oclif/core@^2.1.1", "@oclif/core@^2.3.0", "@oclif/core@^2.4.0", "@oclif/core@^2.8.0", "@oclif/core@^2.8.2":
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.5.tgz#7964057bbee5e91dae8b35e030e767f38e50a19e"
+  integrity sha512-316DLfrHQDYmWDriI4Woxk9y1wVUrPN1sZdbQLHdOdlTA9v/twe7TdHpWOriEypfl6C85NWEJKc1870yuLtjrQ==
+  dependencies:
+    "@types/cli-progress" "^3.11.0"
+    ansi-escapes "^4.3.2"
+    ansi-styles "^4.3.0"
+    cardinal "^2.1.1"
+    chalk "^4.1.2"
+    clean-stack "^3.0.1"
+    cli-progress "^3.12.0"
+    debug "^4.3.4"
+    ejs "^3.1.8"
+    fs-extra "^9.1.0"
+    get-package-type "^0.1.0"
+    globby "^11.1.0"
+    hyperlinker "^1.0.0"
+    indent-string "^4.0.0"
+    is-wsl "^2.2.0"
+    js-yaml "^3.14.1"
+    natural-orderby "^2.0.3"
+    object-treeify "^1.1.33"
+    password-prompt "^1.1.2"
+    semver "^7.3.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    supports-color "^8.1.1"
+    supports-hyperlinks "^2.2.0"
+    ts-node "^10.9.1"
+    tslib "^2.5.0"
+    widest-line "^3.1.0"
+    wordwrap "^1.0.0"
+    wrap-ansi "^7.0.0"
+
+"@oclif/plugin-help@5.2.7":
   version "5.2.7"
   resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-5.2.7.tgz#3c7ed34186b52fd54b810ec120a5a0130c4abc87"
   integrity sha512-p6DJk0QMfzGvXGqrSZTQPitUGi68oGzr48tRKdrVxDDPMAELxHeXXFbkNRNdvjldPpTk44m0PbxV5tWhwurRwg==
   dependencies:
     "@oclif/core" "^2.4.0"
 
+"@oclif/plugin-help@^5.1.19":
+  version "5.2.9"
+  resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-5.2.9.tgz#badbafdfe3f98ac78a5a3b79582e081d4b64c4b7"
+  integrity sha512-0J3oowPURZJ4Dn1p1WpQ46E4+CoV20KTn1cvsNiDl6Hmbw+qoljKQnArJJzNFeZQxWo4R7/S42PrzKJTVYh68Q==
+  dependencies:
+    "@oclif/core" "^2.8.0"
+
 "@oclif/plugin-not-found@^2.3.7":
-  version "2.3.21"
-  resolved "https://registry.yarnpkg.com/@oclif/plugin-not-found/-/plugin-not-found-2.3.21.tgz#3bede6190c9d2e1e91107d8a910d777092bb21ee"
-  integrity sha512-6N0gTWQhl5nuE5bXipv5+8vH5cHyGgEd3MKJHQYxFnHIFwwb9jJnFl0BZ0fo7Jrjd9HZYCLT7rjnouS7p1Dl1w==
+  version "2.3.23"
+  resolved "https://registry.yarnpkg.com/@oclif/plugin-not-found/-/plugin-not-found-2.3.23.tgz#d40a469c35d64db0e6b074a76bc9ab56231b86ef"
+  integrity sha512-UZM8aolxXvqwH8WcmJxRNASDWgMoSQm/pgCdkc1AGCRevYc8+LBSO+U6nLWq+Dx8H/dn9RyIv5oiUIOGkKDlZA==
   dependencies:
     "@oclif/color" "^1.0.4"
-    "@oclif/core" "^2.3.0"
+    "@oclif/core" "^2.8.0"
     fast-levenshtein "^3.0.0"
     lodash "^4.17.21"
 
@@ -1251,17 +1299,17 @@
     "@oclif/core" "^2.0.3"
 
 "@oclif/plugin-warn-if-update-available@^2.0.14":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.0.30.tgz#e60f5663ddcb0bf52299d8fbdf887f01f8be2a58"
-  integrity sha512-CjLuqT1Jcuv2GG6s0nYukSo66U7N0UUGAzVB4LeGiGQHOJkeLxTBErfsPAjBNOTGss/cC3VAkCHBlHKovB5S6A==
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.0.36.tgz#c30a333ee1615b4c4dde82c684ccb3fe33717fcd"
+  integrity sha512-mHWoEWFICw1Amqn8C7oURxOsR6sT2Hx+xNi30Jbsui5MrCIYYo369dhjl27VfaWlcLjVqpjMVzVFMn5zXjgzBw==
   dependencies:
-    "@oclif/core" "^2.4.0"
+    "@oclif/core" "^2.8.2"
     chalk "^4.1.0"
     debug "^4.1.0"
     fs-extra "^9.0.1"
     http-call "^5.2.2"
     lodash "^4.17.21"
-    semver "^7.3.8"
+    semver "^7.5.0"
 
 "@oclif/test@2.3.9":
   version "2.3.9"
@@ -1352,10 +1400,10 @@
   resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0"
   integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==
 
-"@octokit/openapi-types@^16.0.0":
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-16.0.0.tgz#d92838a6cd9fb4639ca875ddb3437f1045cc625e"
-  integrity sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA==
+"@octokit/openapi-types@^17.1.2":
+  version "17.1.2"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-17.1.2.tgz#b7bc1cc5d3581adac9dce197a21f0e5f2ceaabf1"
+  integrity sha512-OaS7Ol4Y+U50PbejfzQflGWRMxO04nYWO5ZBv6JerqMKE2WS/tI9VoVDDPXHBlRMGG2fOdKwtVGlFfc7AVIstw==
 
 "@octokit/plugin-enterprise-rest@^6.0.1":
   version "6.0.1"
@@ -1370,11 +1418,11 @@
     "@octokit/types" "^6.40.0"
 
 "@octokit/plugin-paginate-rest@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.0.0.tgz#f34b5a7d9416019126042cd7d7b811e006c0d561"
-  integrity sha512-Sq5VU1PfT6/JyuXPyt04KZNVsFOSBaYOAq2QRZUwzVlI10KFvcbUo8lR258AAQL1Et60b0WuVik+zOWKLuDZxw==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.0.tgz#3522ef5c2712436332655085b197eafe4ac7afc4"
+  integrity sha512-5T4iXjJdYCVA1rdWS1C+uZV9AvtZY9QgTG74kFiSFVj94dZXowyi/YK8f4SGjZaL69jZthGlBaDKRdCMCF9log==
   dependencies:
-    "@octokit/types" "^9.0.0"
+    "@octokit/types" "^9.2.2"
 
 "@octokit/plugin-request-log@^1.0.4":
   version "1.0.4"
@@ -1390,11 +1438,11 @@
     deprecation "^2.3.1"
 
 "@octokit/plugin-rest-endpoint-methods@^7.0.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.0.1.tgz#f7ebe18144fd89460f98f35a587b056646e84502"
-  integrity sha512-pnCaLwZBudK5xCdrR823xHGNgqOzRnJ/mpC/76YPpNP7DybdsJtP7mdOwh+wYZxK5jqeQuhu59ogMI4NRlBUvA==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.1.0.tgz#7f3f4fac10bf72f8c5cd0c343252cd5f73dbf2d8"
+  integrity sha512-SWwz/hc47GaKJR6BlJI4WIVRodbAFRvrR0QRPSoPMs7krb7anYPML3psg+ThEz/kcwOdSNh/oA8qThi/Wvs4Fw==
   dependencies:
-    "@octokit/types" "^9.0.0"
+    "@octokit/types" "^9.2.2"
     deprecation "^2.3.1"
 
 "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
@@ -1466,12 +1514,12 @@
   dependencies:
     "@octokit/openapi-types" "^12.11.0"
 
-"@octokit/types@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.0.0.tgz#6050db04ddf4188ec92d60e4da1a2ce0633ff635"
-  integrity sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==
+"@octokit/types@^9.0.0", "@octokit/types@^9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.2.2.tgz#d111d33928f288f48083bfe49d8a9a5945e67db1"
+  integrity sha512-9BjDxjgQIvCjNWZsbqyH5QC2Yni16oaE6xL+8SUBMzcYPF4TGQBXGA97Cl3KceK9mwiNMb1mOYCz6FbCCLEL+g==
   dependencies:
-    "@octokit/openapi-types" "^16.0.0"
+    "@octokit/openapi-types" "^17.1.2"
 
 "@parcel/watcher@2.0.4":
   version "2.0.4"
@@ -1481,13 +1529,6 @@
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
 
-"@phenomnomnominal/tsquery@4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-4.1.1.tgz#42971b83590e9d853d024ddb04a18085a36518df"
-  integrity sha512-jjMmK1tnZbm1Jq5a7fBliM4gQwjxMU7TFoRNwIyzwlO+eHPRCFv/Nv+H/Gi1jc3WR7QURG8D5d0Tn12YGrUqBQ==
-  dependencies:
-    esquery "^1.0.1"
-
 "@polkadot/api-augment@10.0.1", "@polkadot/api-augment@9.14.2":
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/@polkadot/api-augment/-/api-augment-10.0.1.tgz#b8e7766e1d89e3ee753ae053e3edd21ddc0c780c"
@@ -1727,54 +1768,56 @@
     bn.js "^5.2.1"
     tslib "^2.5.0"
 
-"@polkadot/wasm-bridge@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-bridge/-/wasm-bridge-7.0.2.tgz#c906c12fa5a2ce40515c37d88a17637f467f6199"
-  integrity sha512-towgTgPG3FRLBRGPi4rLgdklouZxpedbwzUJ2s2CPrpCrbBxCsVn7Z36Wmr0qgLUTqzQEed3DFtluu5Od3EJLQ==
+"@polkadot/wasm-bridge@7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-bridge/-/wasm-bridge-7.1.2.tgz#c8c2f3ac84b6f56be7cdb3f57347d3a45801341e"
+  integrity sha512-6t8b1el/03b30ZFKVFYU5pQEx9OeDZ3GBndgZ5b6fMNFRoowFWTwx74HLqhXlQb+hOTjGJA70jHdxkplh1sO3A==
   dependencies:
+    "@polkadot/wasm-util" "7.1.2"
     tslib "^2.5.0"
 
-"@polkadot/wasm-crypto-asmjs@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.0.2.tgz#c7f807ee4f290c98d6b17b629f0b2cdcc4f8b186"
-  integrity sha512-oSNp+vrnBlPf2CpXBjq+jxfzaCuem+hGgyNxEDlwkON1yyopHXxyHhChmFt6zbDXkcUa6+YEaH0XT94ZC94Qrg==
+"@polkadot/wasm-crypto-asmjs@7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.1.2.tgz#bde1ec84721dd2e5ad60c6d8af927e1f8be15007"
+  integrity sha512-Gdb824MoeWjESv7fu57Dqpvmx7FR2zhM2Os34/H8s1LcZ8m5qUxvm22kjtq+6DRJlGo7KxpS0OA4xCbSDDe0rA==
   dependencies:
     tslib "^2.5.0"
 
-"@polkadot/wasm-crypto-init@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.0.2.tgz#e707c34ba6be9ee1419453eeceab2b441da7fef3"
-  integrity sha512-OQLelialR0swKp5iEisYJSP0nvs8FmchPt5juI6cRhn9k2jO+88c/s9Igh0Q+77wU5dhCT+tT4HqgilhJP4UHQ==
+"@polkadot/wasm-crypto-init@7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.1.2.tgz#ed44b39502c3abe2b403de750975300c310a543d"
+  integrity sha512-jqeK04MYofvCU7kFMJDoKUM9SjfDEBDizIxgurxAZZvF4jMOhgStZTLTr9QkKTOMTrMUE9PWRMzrnDM/Od3kzA==
   dependencies:
-    "@polkadot/wasm-bridge" "7.0.2"
-    "@polkadot/wasm-crypto-asmjs" "7.0.2"
-    "@polkadot/wasm-crypto-wasm" "7.0.2"
+    "@polkadot/wasm-bridge" "7.1.2"
+    "@polkadot/wasm-crypto-asmjs" "7.1.2"
+    "@polkadot/wasm-crypto-wasm" "7.1.2"
+    "@polkadot/wasm-util" "7.1.2"
     tslib "^2.5.0"
 
-"@polkadot/wasm-crypto-wasm@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.0.2.tgz#6adecfd7ac7dec7967c427adcc18c9b6be09e566"
-  integrity sha512-e1UztCUZ9s9LRfu8AhnWZDrxNhsuPBOJdDmOqoqe1dHaBQpB/R4+v1NhT9nLRSOM/JmV6B1PIaehcRbkb++8KA==
+"@polkadot/wasm-crypto-wasm@7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.1.2.tgz#16c36e7028f22817c2ec741dcb74be751e156594"
+  integrity sha512-p2RBfXc43r6rXkFo811LboSfRQFpCgOC6+ByqMs/geTA/+/I4l2ajz95aL6cQ20AA3W5x/ZwHxhwvmJ0HBjJ6A==
   dependencies:
-    "@polkadot/wasm-util" "7.0.2"
+    "@polkadot/wasm-util" "7.1.2"
     tslib "^2.5.0"
 
 "@polkadot/wasm-crypto@^7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-7.0.2.tgz#44aa5f5322f3e8bdcacb1806e3e1a6543d20cbb4"
-  integrity sha512-ETOl4OSAZMI8fzMR9f6uH8vid81CUIgJFZYLVkCwNS7kttdWHKO1EOGnlmuH0dzsEZ4YQOcfV4jx6fZ+2yS+YQ==
-  dependencies:
-    "@polkadot/wasm-bridge" "7.0.2"
-    "@polkadot/wasm-crypto-asmjs" "7.0.2"
-    "@polkadot/wasm-crypto-init" "7.0.2"
-    "@polkadot/wasm-crypto-wasm" "7.0.2"
-    "@polkadot/wasm-util" "7.0.2"
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-7.1.2.tgz#35e0b9243ee88f044925e681d729146373add40a"
+  integrity sha512-DO5Xf5nA2mSVdWnRM+PLAVE/wcg9vZAQkSHHSE+/qDmDVCQYygksHOA8ecRvn8nGfMNZQ0rmlIlsgyvAEtX1pw==
+  dependencies:
+    "@polkadot/wasm-bridge" "7.1.2"
+    "@polkadot/wasm-crypto-asmjs" "7.1.2"
+    "@polkadot/wasm-crypto-init" "7.1.2"
+    "@polkadot/wasm-crypto-wasm" "7.1.2"
+    "@polkadot/wasm-util" "7.1.2"
     tslib "^2.5.0"
 
-"@polkadot/wasm-util@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/wasm-util/-/wasm-util-7.0.2.tgz#1f3eaf048bd9134f08857e74325084ce129cd50c"
-  integrity sha512-N7bnZDNwUkjVO2WiJ6VvB0y8JS+CgiFTz6ofLxxSa/0HtBW1boCLrLxvp9EA0rh1+Ca212spLNM1GNkD/msMeg==
+"@polkadot/wasm-util@7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/wasm-util/-/wasm-util-7.1.2.tgz#71ee1d55d0c3d55ceef2ee762c02eda5395a759a"
+  integrity sha512-lHQJFG0iotgmUovXYcw/HM3QhGxtze6ozAgRMd0/maTQjYwbV/7z1NzEle9fBwxX6GijTnpWc1vzW+YU0O1lLw==
   dependencies:
     tslib "^2.5.0"
 
@@ -1875,9 +1918,9 @@
     smoldot "0.7.11"
 
 "@substrate/ss58-registry@^1.39.0":
-  version "1.39.0"
-  resolved "https://registry.yarnpkg.com/@substrate/ss58-registry/-/ss58-registry-1.39.0.tgz#eb916ff5fea7fa02e77745823fde21af979273d2"
-  integrity sha512-qZYpuE6n+mwew+X71dOur/CbMXj6rNW27o63JeJwdQH/GvcSKm3JLNhd+bGzwUKg0D/zD30Qc6p4JykArzM+tA==
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/@substrate/ss58-registry/-/ss58-registry-1.40.0.tgz#2223409c496271df786c1ca8496898896595441e"
+  integrity sha512-QuU2nBql3J4KCnOWtWDw4n1K4JU0T79j54ZZvm/9nhsX6AIar13FyhsaBfs6QkJ2ixTQAnd7TocJIoJRWbqMZA==
 
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
@@ -1912,9 +1955,9 @@
   integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
 
 "@tsconfig/node16@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
-  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
 "@types/bn.js@^5.1.1":
   version "5.1.1"
@@ -1934,9 +1977,9 @@
     "@types/responselike" "^1.0.0"
 
 "@types/chai@*", "@types/chai@4":
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4"
-  integrity sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.5.tgz#ae69bcbb1bebb68c4ac0b11e9d8ed04526b3562b"
+  integrity sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==
 
 "@types/cli-progress@^3.11.0":
   version "3.11.0"
@@ -2032,9 +2075,9 @@
     "@types/node" "*"
 
 "@types/lodash@*":
-  version "4.14.191"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.191.tgz#09511e7f7cba275acd8b419ddac8da9a6a79e2fa"
-  integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
+  version "4.14.194"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
+  integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
 
 "@types/minimatch@^3.0.3":
   version "3.0.5"
@@ -2057,9 +2100,9 @@
   integrity sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==
 
 "@types/node@*":
-  version "18.14.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.6.tgz#ae1973dd2b1eeb1825695bb11ebfb746d27e3e93"
-  integrity sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==
+  version "20.1.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.1.3.tgz#bc8e7cd8065a5fc355a3a191a68db8019c58bc00"
+  integrity sha512-NP2yfZpgmf2eDRPmgGq+fjGjSwFgYbihA8/gK+ey23qT9RkxsgNTZvGOEpXgzIGqesTYkElELLgtKoMQTys5vA==
 
 "@types/node@18.11.9":
   version "18.11.9"
@@ -2094,9 +2137,9 @@
   integrity sha512-zsv3fsC7S84NN6nPK06u79oWgrPVd0NvOyqgghV1haPaFcVxIrP4DLomRwGAXk0ui4HZA7mOcSFL98sMVW9viw==
 
 "@types/semver@^7.3.12":
-  version "7.3.13"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
-  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
+  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
 
 "@types/shelljs@0.8.11":
   version "0.8.11"
@@ -2107,9 +2150,9 @@
     "@types/node" "*"
 
 "@types/sinon@*":
-  version "10.0.13"
-  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-10.0.13.tgz#60a7a87a70d9372d0b7b38cc03e825f46981fb83"
-  integrity sha512-UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ==
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-10.0.14.tgz#6bd18b088ea5ef1e5153fa37d0b68e91eff09e22"
+  integrity sha512-mn72up6cjaMyMuaPaa/AwKf6WtsSRysQC7wxFkCm1XcOKXPM1z+5Y4H5wjIVBz4gdAkjvZxVVfjA6ba1nHr5WQ==
   dependencies:
     "@types/sinonjs__fake-timers" "*"
 
@@ -2302,9 +2345,9 @@
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
 "@yarnpkg/parsers@^3.0.0-rc.18":
-  version "3.0.0-rc.40"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.40.tgz#972af4bb01d797ad20e12de8126ea2276ab8fdea"
-  integrity sha512-sKbi5XhHKXCjzb5m0ftGuQuODM2iUXEsrCSl8MkKexNWHepCmU3IPaGTPC5gHZy4sOvsb9JqTLaZEez+kDzG+Q==
+  version "3.0.0-rc.43"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.43.tgz#2bf720ec6444e3f002f40dce734c262e9f3d888a"
+  integrity sha512-AhFF3mIDfA+jEwQv2WMHmiYhOvmdbh2qhUkDVQfiqzQtUwS4BgoWwom5NpSPg4Ix5vOul+w1690Bt21CkVLpgg==
   dependencies:
     js-yaml "^3.10.0"
     tslib "^2.4.0"
@@ -2556,9 +2599,9 @@ available-typed-arrays@^1.0.5:
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
 aws-sdk@^2.1231.0:
-  version "2.1329.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1329.0.tgz#6a83a1f7f8e1b3cdc8f8bdc3b7db7bfd43812b78"
-  integrity sha512-F5M9x/T+PanPiYGiL95atFE6QiwzJWwgPahaEgUdq+qvVAgruiNy5t6nw2B5tBB/yWDPPavHFip3UsXeO0qU3Q==
+  version "2.1377.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1377.0.tgz#85f3590c8a8c0a600268e921aea8a289f7804e87"
+  integrity sha512-59T3v/o40fk2I2zpgh2E0Z/BBK5awBQUva7VLjLHo9rsMvTM58mgya667hYTua00rHC1A3GJSCNORUhXvhomYQ==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -2569,12 +2612,12 @@ aws-sdk@^2.1231.0:
     url "0.10.3"
     util "^0.12.4"
     uuid "8.0.0"
-    xml2js "0.4.19"
+    xml2js "0.5.0"
 
 axios@^1.0.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.4.tgz#f5760cefd9cfb51fd2481acf88c05f67c4523024"
-  integrity sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
+  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"
@@ -3001,9 +3044,9 @@ cli-spinners@2.6.1:
   integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
 
 cli-spinners@^2.5.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
-  integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db"
+  integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==
 
 cli-table@^0.3.1:
   version "0.3.11"
@@ -3135,9 +3178,9 @@ color-support@^1.1.2, color-support@^1.1.3:
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
 colorette@^2.0.19:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
 colors@1.0.3:
   version "1.0.3"
@@ -3327,9 +3370,9 @@ conventional-recommended-bump@^6.1.0:
     q "^1.5.1"
 
 core-js-pure@^3.25.1:
-  version "3.30.0"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.0.tgz#41b6c42e5f363bd53d79999bd35093b17e42e1bf"
-  integrity sha512-+2KbMFGeBU0ln/csoPqTe0i/yfHbrd2EUhNMObsGtXMKS/RTtlkYyi+/3twLcevbgNR0yM/r0Psa3TEoQRpFMQ==
+  version "3.30.2"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.2.tgz#005a82551f4af3250dcfb46ed360fad32ced114e"
+  integrity sha512-p/npFUJXXBkCCTIlEGBdghofn00jWG6ZOtdoIXSJmAu2QBvN0IqpZXWweOytcwE6cfx8ZvVUy1vw8zxhe4Y2vg==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -3383,9 +3426,11 @@ data-uri-to-buffer@^4.0.0:
   integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
 
 date-fns@^2.29.1:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
-  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
 
 dateformat@^3.0.0:
   version "3.0.3"
@@ -3638,9 +3683,9 @@ ed2curve@^0.3.0:
     tweetnacl "1.x.x"
 
 ejs@^3.1.7, ejs@^3.1.8:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
-  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
+  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
   dependencies:
     jake "^10.8.5"
 
@@ -3738,9 +3783,9 @@ eslint-scope@^5.1.1:
     estraverse "^4.1.1"
 
 eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
+  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -3757,10 +3802,10 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
 eslint@8.26.0:
   version "8.26.0"
@@ -3808,20 +3853,20 @@ eslint@8.26.0:
     text-table "^0.2.0"
 
 espree@^9.4.0:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
-  integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
+  version "9.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
+  integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
   dependencies:
     acorn "^8.8.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1, esquery@^1.4.0:
+esquery@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
@@ -3856,9 +3901,9 @@ eventemitter3@^4.0.4, eventemitter3@^4.0.7:
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 eventemitter3@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.0.tgz#084eb7f5b5388df1451e63f4c2aafd71b217ccb3"
-  integrity sha512-riuVbElZZNXLeLEoprfNYoDSwTBRR44X3mnhdI1YcnENpWTCsTTVZ2zFuqQcpoyqPQIUXdiPEU0ECAq0KQRaHg==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
+  integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
 
 events@1.1.1:
   version "1.1.1"
@@ -3890,9 +3935,9 @@ external-editor@^3.0.3:
     tmp "^0.0.33"
 
 fancy-test@^2.0.12:
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.13.tgz#861323fe91f5f4b3d6d2e53104756f64274d7dfe"
-  integrity sha512-n+rbO0zU861qNT4L3vIy2CEZlsmLR1sp8sy/uZDEOdmRtfnBBwN9OgT37X0zhQJZTlu2vkdKRu51BsyekgB13Q==
+  version "2.0.22"
+  resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.22.tgz#f3ff137a8282b3e27561fea3c3c6e22798c25470"
+  integrity sha512-8b0hMMQpsUW8XSp2N3BLHcB3dsZrvLW+doUeaaWJ3KAJ20plat06tH2DNLkGSZiofLIoZFeF6hgGEroogTKBOg==
   dependencies:
     "@types/chai" "*"
     "@types/lodash" "*"
@@ -3900,7 +3945,7 @@ fancy-test@^2.0.12:
     "@types/sinon" "*"
     lodash "^4.17.13"
     mock-stdin "^1.0.0"
-    nock "^13.3.0"
+    nock "^13.3.1"
     stdout-stderr "^0.1.9"
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
@@ -4135,9 +4180,9 @@ fs-extra@10.1.0, fs-extra@^10.0.0:
     universalify "^2.0.0"
 
 fs-extra@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
-  integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
+  integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
@@ -4458,9 +4503,9 @@ got@^11:
     responselike "^2.0.0"
 
 graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 grapheme-splitter@^1.0.4:
   version "1.0.4"
@@ -4846,10 +4891,10 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
-  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4"
+  integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
   dependencies:
     has "^1.0.3"
 
@@ -5056,9 +5101,9 @@ jmespath@0.16.0:
   integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
 
 js-sdsl@^4.1.4:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711"
-  integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430"
+  integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -5653,9 +5698,9 @@ minimatch@^5.0.1:
     brace-expansion "^2.0.1"
 
 minimatch@^7.2.0:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.2.tgz#157e847d79ca671054253b840656720cb733f10f"
-  integrity sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb"
+  integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -5738,10 +5783,10 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.
   dependencies:
     yallist "^4.0.0"
 
-minipass@^4.0.0:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06"
-  integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
 minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
@@ -5927,10 +5972,10 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-nock@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/nock/-/nock-13.3.0.tgz#b13069c1a03f1ad63120f994b04bfd2556925768"
-  integrity sha512-HHqYQ6mBeiMc+N038w8LkMpDCRquCHWeNmN3v6645P3NhN2+qXOBqvPqo7Rt1VyCMzKhJ733wZqw5B7cQVFNPg==
+nock@^13.3.0, nock@^13.3.1:
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/nock/-/nock-13.3.1.tgz#f22d4d661f7a05ebd9368edae1b5dc0a62d758fc"
+  integrity sha512-vHnopocZuI93p2ccivFyGuUfzjq2fxNyNurp7816mlT5V5HF4SzXu8lvLrVzBbNqzs+ODooZ6OksuSUNM7Njkw==
   dependencies:
     debug "^4.1.0"
     json-stringify-safe "^5.0.1"
@@ -5953,9 +5998,9 @@ node-downloader-helper@2.1.4:
   integrity sha512-Cbc5jwGTe58apFIPjxgcUzX0Se+pcUgdbym6G+sk2yb1m/qwxYTLmD4C2xEHTJO9YkZ/eRujMJPl3WW+7fVksQ==
 
 node-fetch@^2.6.1, node-fetch@^2.6.7:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
+  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -6222,13 +6267,13 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
-nx@15.8.5, "nx@>=14.8.6 < 16":
-  version "15.8.5"
-  resolved "https://registry.yarnpkg.com/nx/-/nx-15.8.5.tgz#189b2146ba811f1b05f9d3b0b82c6ed43ba6b9fb"
-  integrity sha512-1c6Y3rPSzzlqQVJPo33Ej0HY/3t9ykeaPs074HpYxXH0+GU1BSIv/9EfXKQGvmBzjs5yAx6asGIv+H3QDrFt3A==
+nx@15.9.4, "nx@>=14.8.6 < 16":
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.4.tgz#1075bc33fe8ee6c6546c21ec6ffcfd2e000946c6"
+  integrity sha512-P1G4t59UvE/lkHyruLeSOB5ZuNyh01IwU0tTUOi8f9s/NbP7+OQ8MYVwDV74JHTr6mQgjlS+n+4Eox8tVm9itA==
   dependencies:
-    "@nrwl/cli" "15.8.5"
-    "@nrwl/tao" "15.8.5"
+    "@nrwl/cli" "15.9.4"
+    "@nrwl/tao" "15.9.4"
     "@parcel/watcher" "2.0.4"
     "@yarnpkg/lockfile" "^1.1.0"
     "@yarnpkg/parsers" "^3.0.0-rc.18"
@@ -6263,15 +6308,15 @@ nx@15.8.5, "nx@>=14.8.6 < 16":
     yargs "^17.6.2"
     yargs-parser "21.1.1"
   optionalDependencies:
-    "@nrwl/nx-darwin-arm64" "15.8.5"
-    "@nrwl/nx-darwin-x64" "15.8.5"
-    "@nrwl/nx-linux-arm-gnueabihf" "15.8.5"
-    "@nrwl/nx-linux-arm64-gnu" "15.8.5"
-    "@nrwl/nx-linux-arm64-musl" "15.8.5"
-    "@nrwl/nx-linux-x64-gnu" "15.8.5"
-    "@nrwl/nx-linux-x64-musl" "15.8.5"
-    "@nrwl/nx-win32-arm64-msvc" "15.8.5"
-    "@nrwl/nx-win32-x64-msvc" "15.8.5"
+    "@nrwl/nx-darwin-arm64" "15.9.4"
+    "@nrwl/nx-darwin-x64" "15.9.4"
+    "@nrwl/nx-linux-arm-gnueabihf" "15.9.4"
+    "@nrwl/nx-linux-arm64-gnu" "15.9.4"
+    "@nrwl/nx-linux-arm64-musl" "15.9.4"
+    "@nrwl/nx-linux-x64-gnu" "15.9.4"
+    "@nrwl/nx-linux-x64-musl" "15.9.4"
+    "@nrwl/nx-win32-arm64-msvc" "15.9.4"
+    "@nrwl/nx-win32-x64-msvc" "15.9.4"
 
 object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
@@ -6780,9 +6825,9 @@ promise-all-reject-late@^1.0.0:
   integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==
 
 promise-call-limit@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.1.tgz#4bdee03aeb85674385ca934da7114e9bcd3c6e24"
-  integrity sha512-3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.2.tgz#f64b8dd9ef7693c9c7613e7dfe8d6d24de3031ea"
+  integrity sha512-1vTUnfI2hzui8AEIixbdAJlFY4LFDXqQswy/2eOlThAscXCY4It8FdVuI0fMJGAB2aWGbdQf/gv0skKYXmdrHA==
 
 promise-inflight@^1.0.1:
   version "1.0.1"
@@ -6955,9 +7000,9 @@ read@1, read@^1.0.7:
     mute-stream "~0.0.4"
 
 readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.1.tgz#f9f9b5f536920253b3d26e7660e7da4ccff9bb62"
-  integrity sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -7068,11 +7113,11 @@ resolve-from@^5.0.0:
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
 resolve@^1.1.6, resolve@^1.10.0:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
   dependencies:
-    is-core-module "^2.9.0"
+    is-core-module "^2.11.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -7140,14 +7185,7 @@ rxjs@^6.4.0, rxjs@^6.6.2:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.0.0, rxjs@^7.5.5, rxjs@^7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
-  dependencies:
-    tslib "^2.1.0"
-
-rxjs@^7.2.0:
+rxjs@^7.0.0, rxjs@^7.2.0, rxjs@^7.5.5, rxjs@^7.8.0:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
   integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
@@ -7203,7 +7241,7 @@ semver@7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.3.8, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+semver@7.3.8:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
@@ -7215,6 +7253,13 @@ semver@^6.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
+  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 sentence-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz#3645a7b8c117c787fde8702056225bb62a45131f"
@@ -7268,9 +7313,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.7.3:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba"
-  integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
 shelljs@0.8.5, shelljs@^0.8.4, shelljs@^0.8.5:
   version "0.8.5"
@@ -7418,9 +7463,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779"
-  integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==
+  version "3.0.13"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
+  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
 
 split2@^3.0.0:
   version "3.2.2"
@@ -7668,13 +7713,13 @@ tar-stream@~2.2.0:
     readable-stream "^3.1.1"
 
 tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
-  version "6.1.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
-  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+  version "6.1.14"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.14.tgz#e87926bec1cfe7c9e783a77a79f3e81c1cfa3b66"
+  integrity sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
@@ -7707,9 +7752,9 @@ text-table@^0.2.0:
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 textextensions@^5.12.0, textextensions@^5.13.0:
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-5.15.0.tgz#4bb3296ad6fc111cf4b39c589dd028d8aaaf7060"
-  integrity sha512-MeqZRHLuaGamUXGuVn2ivtU3LA3mLCCIO5kUGoohTCoGmCBg/+8yPhWVX9WSl9telvVd8erftjFk9Fwb2dD6rw==
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-5.16.0.tgz#57dd60c305019bba321e848b1fdf0f99bfa59ec1"
+  integrity sha512-7D/r3s6uPZyU//MCYrX6I14nzauDwJ5CxazouuRGNuvSCihW87ufN6VLoROLCrHg6FblLuJrT6N2BVaPVzqElw==
 
 through2@^2.0.0:
   version "2.0.5"
@@ -7791,7 +7836,7 @@ ts-mocha@^10.0.0:
   optionalDependencies:
     tsconfig-paths "^3.5.0"
 
-ts-node@10.9.1:
+ts-node@10.9.1, ts-node@^10.9.1:
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
   integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
@@ -7835,9 +7880,9 @@ tsconfig-paths@^3.5.0:
     strip-bom "^3.0.0"
 
 tsconfig-paths@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz#4819f861eef82e6da52fb4af1e8c930a39ed979a"
-  integrity sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
   dependencies:
     json5 "^2.2.2"
     minimist "^1.2.6"
@@ -8306,28 +8351,23 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-ws@^8.13.0:
+ws@^8.13.0, ws@^8.8.1:
   version "8.13.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
   integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
 
-ws@^8.8.1:
-  version "8.12.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.1.tgz#c51e583d79140b5e42e39be48c934131942d4a8f"
-  integrity sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==
-
-xml2js@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+xml2js@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7"
+  integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==
   dependencies:
     sax ">=0.6.0"
-    xmlbuilder "~9.0.1"
+    xmlbuilder "~11.0.0"
 
-xmlbuilder@~9.0.1:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
 
 xregexp@^5.1.1:
   version "5.1.1"
@@ -8395,9 +8435,9 @@ yargs@16.2.0, yargs@^16.2.0:
     yargs-parser "^20.2.2"
 
 yargs@^17.2.1, yargs@^17.3.1, yargs@^17.6.2:
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
     cliui "^8.0.1"
     escalade "^3.1.1"
@@ -8421,9 +8461,9 @@ yauzl@^2.4.2:
     fd-slicer "~1.1.0"
 
 yeoman-environment@^3.11.1:
-  version "3.15.1"
-  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-3.15.1.tgz#b094b858bfbd24db8061d255d0e7871224190474"
-  integrity sha512-P4DTQxqCxNTBD7gph+P+dIckBdx0xyHmvOYgO3vsc9/Sl67KJ6QInz5Qv6tlXET3CFFJ/YxPIdl9rKb0XwTRLg==
+  version "3.16.2"
+  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-3.16.2.tgz#f50cdac9f55ca5c62b5f2577070a43f8c31ee4de"
+  integrity sha512-QJuZhQmSBm0ZdTkk5TyafvJldZtFZWXj9/i+7yFpSxRGuQuTrJ1B8daXNCvQeVidVhcAxzGV9l57W/iWzP6+AQ==
   dependencies:
     "@npmcli/arborist" "^4.0.4"
     are-we-there-yet "^2.0.0"

From 269eef9d3cfc0245698d8b07b6f31872cfa4ea26 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Fri, 12 May 2023 11:52:12 +0300
Subject: [PATCH 36/46] remove resolutions from package.json template

---
 packages/templates/src/templates/package.json.hbs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/templates/src/templates/package.json.hbs b/packages/templates/src/templates/package.json.hbs
index 67e15dac..ef2a4be6 100644
--- a/packages/templates/src/templates/package.json.hbs
+++ b/packages/templates/src/templates/package.json.hbs
@@ -35,14 +35,5 @@
     "mocha": "10.1.0",
     "mochawesome": "^7.1.3",
     "ts-node": "^10.8.0"
-  },
-  "resolutions": {
-    "@polkadot/api": "10.0.1",
-    "@polkadot/api-contract": "10.0.1",
-    "@polkadot/util": "11.0.1",
-    "@polkadot/util-crypto": "11.0.1",
-    "@polkadot/keyring": "11.0.1",
-    "@polkadot/api-augment": "10.0.1",
-    "@polkadot/types": "10.0.1"
   }
 }

From 2497a2b2b1c26f368ff2586ccb1e8152ace76029 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Fri, 12 May 2023 17:40:20 +0300
Subject: [PATCH 37/46] simplify test detection and prompt

---
 packages/cli/src/commands/init/index.ts | 156 +++++++++++++-----------
 1 file changed, 86 insertions(+), 70 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 9940c219..5e21732d 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -69,6 +69,8 @@ type CopyCandidates = {
   tests?: PathEntry[];
 };
 
+type CopyPathsList = { contractsDirectories: string[]; cratesDirectories: string[] };
+
 inquirer.registerPrompt("fuzzypath", inquirerFuzzyPath);
 
 export class Init extends BaseCommand {
@@ -312,28 +314,68 @@ export class Init extends BaseCommand {
       throw error;
     }
 
-    let rootTomlPaths = await getRootCargoTomlPaths(pathToExistingProject);
+    const rootTomlPaths = await getRootCargoTomlPaths(pathToExistingProject);
+
+    const copyGlobsList: CopyPathsList = {
+      contractsDirectories: [],
+      cratesDirectories: [],
+    };
+
+    if (rootTomlPaths.contractsDirectories.length) {
+      console.log("Detected a `workspace.members` field in Cargo.toml.");
+      const { shouldKeepRootTomlContracts } = await inquirer.prompt([
+        choice(
+          "shouldKeepRootTomlContracts",
+          "Do you want to use it to automatically copy contracts?"
+        ),
+      ]);
+      if (shouldKeepRootTomlContracts) {
+        copyGlobsList.contractsDirectories = rootTomlPaths.contractsDirectories;
+      }
+    }
+
+    if (!copyGlobsList.contractsDirectories.length) {
+      const manualContractsPath = await getManualPaths(pathToExistingProject, "contracts");
+      copyGlobsList.contractsDirectories.push(manualContractsPath);
+    }
+
+    if (rootTomlPaths.cratesDirectories.length) {
+      console.log("Detected a `workspace.exclude` field in Cargo.toml.");
+      const { shouldKeepRootTomlCrates } = await inquirer.prompt([
+        choice(
+          "shouldKeepRootTomlCrates",
+          "Do you want to use it to automatically copy additional crates?"
+        ),
+      ]);
+      if (shouldKeepRootTomlCrates) {
+        copyGlobsList.cratesDirectories = rootTomlPaths.cratesDirectories;
+      }
+    } else {
+      console.log("No `workspace.exclude` field detected in Cargo.toml.");
+    }
 
-    if (rootTomlPaths) {
-      console.log("Workspaces detected in root Cargo.toml file.");
-      const { shouldKeepRootToml } = await inquirer.prompt([
-        choice("shouldKeepRootToml", "Do you want to use it to automatically copy contracts?"),
+    if (!copyGlobsList.cratesDirectories.length) {
+      const { shouldSpecifyCratesDir } = await inquirer.prompt([
+        choice("shouldSpecifyCratesDir", "Do you want to specify an additional crates directory?"),
       ]);
-      rootTomlPaths = shouldKeepRootToml ? rootTomlPaths : null;
+
+      if (shouldSpecifyCratesDir) {
+        const manualCratesPath = await getManualPaths(pathToExistingProject, "crates");
+        copyGlobsList.cratesDirectories.push(manualCratesPath);
+      }
     }
 
-    const candidatesList: CopyCandidates = rootTomlPaths
-      ? await getCopyCandidatesList(pathToExistingProject, rootTomlPaths)
-      : await getCopyCandidatesList(
-          pathToExistingProject,
-          await getManualPaths(pathToExistingProject)
-        );
+    const candidatesList: CopyCandidates = await getCopyCandidatesList(
+      pathToExistingProject,
+      copyGlobsList
+    );
 
     const testDir = await detectTests(pathToExistingProject);
 
-    candidatesList.tests = (await pathExists(testDir))
-      ? await getDirsAndFiles(pathToExistingProject, [testDir])
-      : [];
+    candidatesList.tests =
+      testDir && (await pathExists(testDir))
+        ? await getDirsAndFiles(pathToExistingProject, [testDir])
+        : [];
 
     const confirmedCopyList = await detectModuleNames(await confirmCopyList(candidatesList));
 
@@ -491,10 +533,10 @@ async function confirmCopyList(candidatesList: CopyCandidates) {
   return resultingList;
 }
 
-async function detectTests(pathToExistingProject: string) {
+async function detectTests(pathToExistingProject: string): Promise<string | undefined> {
   const testDirNames = ["test", "tests", "spec", "specs"];
 
-  let testDir = undefined;
+  let testDir: string | undefined = undefined;
 
   for (const testDirName of testDirNames) {
     const testDirCandidate = path.resolve(pathToExistingProject, testDirName);
@@ -505,46 +547,39 @@ async function detectTests(pathToExistingProject: string) {
     }
   }
 
-  const { shouldOverwriteTestDir, manualTestDir } = await inquirer.prompt([
+  const testDirDetected = Boolean(testDir);
+
+  const { shouldInputTestDir } = await inquirer.prompt([
     {
+      when: () => testDirDetected,
       type: "confirm",
-      name: "shouldOverwriteTestDir",
-      message: `${
-        testDir
-          ? `Detected test directory [${path.basename(
-              testDir
-            )}] will be copied. Do you want to override and`
-          : "No test directory detected, do you want to"
-      } specify it manually?`,
-      default: false,
+      name: "shouldUseDetectedTestDir",
+      message: `Detected test directory [${path.basename(
+        testDir as string
+      )}]. Do you want to copy it to your new project?`,
+      default: true,
     },
     {
-      when: (answers) => answers.shouldOverwriteTestDir,
-      type: "fuzzypath",
-      name: "manualTestDir",
-      itemType: "directory",
-      rootPath: pathToExistingProject,
-      message: "Please enter the path to the contracts directory: ",
-      excludePath: (nodePath: string) =>
-        nodePath.includes("node_modules") ||
-        nodePath.includes(".git") ||
-        nodePath.includes("target"),
+      when: (answers) => (testDirDetected && !answers.shouldUseDetectedTestDir) || !testDirDetected,
+      name: "shouldInputTestDir",
+      type: "confirm",
+      message: "Do you want to specify a test directory to copy?",
+      default: false,
     },
   ]);
-  if (shouldOverwriteTestDir) {
+  if (shouldInputTestDir) {
+    const manualTestDir = await getManualPaths(pathToExistingProject, "tests");
     return manualTestDir;
   }
   return testDir;
 }
 
-async function getRootCargoTomlPaths(pathToProject: string) {
+async function getRootCargoTomlPaths(pathToProject: string): Promise<CopyPathsList> {
   const toml = await readRootCargoToml(pathToProject);
 
-  if (!toml?.workspace.members) return null;
-
   return {
-    contractsDirectories: toml.workspace.members,
-    cratesDirectories: toml.workspace.exclude,
+    contractsDirectories: toml?.workspace?.members || [],
+    cratesDirectories: toml?.workspace?.exclude || [],
   };
 }
 
@@ -559,33 +594,17 @@ async function readRootCargoToml(pathToProject: string) {
   return toml;
 }
 
-async function getManualPaths(pathToProject: string) {
-  console.log("No Cargo.toml found in the provided directory, or no workspace field within it.");
-  const { contractsDirectory, cratesDirectory, useCrateDirectory } = await inquirer.prompt([
+async function getManualPaths(
+  pathToProject: string,
+  directoryType: "contracts" | "crates" | "tests"
+): Promise<string> {
+  const { selectedDirectory } = await inquirer.prompt([
     {
       type: "fuzzypath",
-      name: "contractsDirectory",
+      name: "selectedDirectory",
       itemType: "directory",
       rootPath: pathToProject,
-      message: "Please enter the path to the contracts directory: ",
-      excludePath: (nodePath: string) =>
-        nodePath.includes("node_modules") ||
-        nodePath.includes(".git") ||
-        nodePath.includes("target"),
-    },
-    {
-      type: "confirm",
-      name: "useCrateDirectory",
-      message: "Do you have an extra the crate directory?",
-      default: false,
-    },
-    {
-      when: (answers) => answers.useCrateDirectory,
-      type: "fuzzypath",
-      name: "cratesDirectory",
-      itemType: "directory",
-      rootPath: pathToProject,
-      message: "Please enter the path to the contracts directory: ",
+      message: `Please enter a path to your ${directoryType} directory:`,
       excludePath: (nodePath: string) =>
         nodePath.includes("node_modules") ||
         nodePath.includes(".git") ||
@@ -593,10 +612,7 @@ async function getManualPaths(pathToProject: string) {
     },
   ]);
 
-  return {
-    contractsDirectories: [contractsDirectory],
-    cratesDirectories: useCrateDirectory ? [cratesDirectory] : [],
-  };
+  return selectedDirectory;
 }
 
 async function getCopyCandidatesList(

From eec9c6c6e8daff8f8c1bc4bdfb373ecc396a5a72 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Mon, 15 May 2023 10:14:51 +0300
Subject: [PATCH 38/46] v2.2.1-alpha.0

---
 lerna.json                      |  2 +-
 packages/cli/README.md          | 81 +++++++++++++++------------------
 packages/cli/package.json       |  6 +--
 packages/core/package.json      |  2 +-
 packages/templates/package.json |  2 +-
 5 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/lerna.json b/lerna.json
index 09edd122..7af6a017 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useWorkspaces": true,
-  "version": "2.2.0-alpha.0",
+  "version": "2.2.1-alpha.0",
   "npmClient": "yarn"
 }
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 2c3798ab..3602d48b 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -3,63 +3,58 @@
 [How to guide on Astar docs page](https://docs.astar.network/docs/wasm/sc-dev/swanky)
 
 <!-- toc -->
-
-- [Swanky CLI](#swanky-cli)
-- [Usage](#usage)
-- [Commands](#commands)
-- [Config](#config)
+* [Swanky CLI](#swanky-cli)
+* [Usage](#usage)
+* [Commands](#commands)
+* [Config](#config)
 <!-- tocstop -->
 
 # Usage
 
 <!-- usage -->
-
 ```sh-session
 $ npm install -g @astar-network/swanky-cli
 $ swanky COMMAND
 running command...
 $ swanky (--version|-V|-v)
-@astar-network/swanky-cli/2.2.0-alpha.0 darwin-x64 node-v18.2.0
+@astar-network/swanky-cli/2.2.1-alpha.0 darwin-x64 node-v18.2.0
 $ swanky --help [COMMAND]
 USAGE
   $ swanky COMMAND
 ...
 ```
-
 <!-- usagestop -->
 
 # Commands
 
 <!-- commands -->
-
-- [`swanky account create`](#swanky-account-create)
-- [`swanky account list`](#swanky-account-list)
-- [`swanky account ls`](#swanky-account-ls)
-- [`swanky check`](#swanky-check)
-- [`swanky contract compile [CONTRACTNAME]`](#swanky-contract-compile-contractname)
-- [`swanky contract deploy CONTRACTNAME`](#swanky-contract-deploy-contractname)
-- [`swanky contract explain CONTRACTNAME`](#swanky-contract-explain-contractname)
-- [`swanky contract new CONTRACTNAME`](#swanky-contract-new-contractname)
-- [`swanky contract query CONTRACTNAME MESSAGENAME`](#swanky-contract-query-contractname-messagename)
-- [`swanky contract test [CONTRACTNAME]`](#swanky-contract-test-contractname)
-- [`swanky contract test [CONTRACTNAME]`](#swanky-contract-test-contractname)
-- [`swanky contract tx CONTRACTNAME MESSAGENAME`](#swanky-contract-tx-contractname-messagename)
-- [`swanky contract typegen CONTRACTNAME`](#swanky-contract-typegen-contractname)
-- [`swanky help [COMMANDS]`](#swanky-help-commands)
-- [`swanky init PROJECTNAME`](#swanky-init-projectname)
-- [`swanky node install`](#swanky-node-install)
-- [`swanky node purge`](#swanky-node-purge)
-- [`swanky node start`](#swanky-node-start)
-- [`swanky plugins`](#swanky-plugins)
-- [`swanky plugins:install PLUGIN...`](#swanky-pluginsinstall-plugin)
-- [`swanky plugins:inspect PLUGIN...`](#swanky-pluginsinspect-plugin)
-- [`swanky plugins:install PLUGIN...`](#swanky-pluginsinstall-plugin-1)
-- [`swanky plugins:link PLUGIN`](#swanky-pluginslink-plugin)
-- [`swanky plugins:uninstall PLUGIN...`](#swanky-pluginsuninstall-plugin)
-- [`swanky plugins:uninstall PLUGIN...`](#swanky-pluginsuninstall-plugin-1)
-- [`swanky plugins:uninstall PLUGIN...`](#swanky-pluginsuninstall-plugin-2)
-- [`swanky plugins update`](#swanky-plugins-update)
-- [`swanky version`](#swanky-version)
+* [`swanky account create`](#swanky-account-create)
+* [`swanky account list`](#swanky-account-list)
+* [`swanky account ls`](#swanky-account-ls)
+* [`swanky check`](#swanky-check)
+* [`swanky contract compile [CONTRACTNAME]`](#swanky-contract-compile-contractname)
+* [`swanky contract deploy CONTRACTNAME`](#swanky-contract-deploy-contractname)
+* [`swanky contract explain CONTRACTNAME`](#swanky-contract-explain-contractname)
+* [`swanky contract new CONTRACTNAME`](#swanky-contract-new-contractname)
+* [`swanky contract query CONTRACTNAME MESSAGENAME`](#swanky-contract-query-contractname-messagename)
+* [`swanky contract test [CONTRACTNAME]`](#swanky-contract-test-contractname)
+* [`swanky contract tx CONTRACTNAME MESSAGENAME`](#swanky-contract-tx-contractname-messagename)
+* [`swanky contract typegen CONTRACTNAME`](#swanky-contract-typegen-contractname)
+* [`swanky help [COMMANDS]`](#swanky-help-commands)
+* [`swanky init PROJECTNAME`](#swanky-init-projectname)
+* [`swanky node install`](#swanky-node-install)
+* [`swanky node purge`](#swanky-node-purge)
+* [`swanky node start`](#swanky-node-start)
+* [`swanky plugins`](#swanky-plugins)
+* [`swanky plugins:install PLUGIN...`](#swanky-pluginsinstall-plugin)
+* [`swanky plugins:inspect PLUGIN...`](#swanky-pluginsinspect-plugin)
+* [`swanky plugins:install PLUGIN...`](#swanky-pluginsinstall-plugin-1)
+* [`swanky plugins:link PLUGIN`](#swanky-pluginslink-plugin)
+* [`swanky plugins:uninstall PLUGIN...`](#swanky-pluginsuninstall-plugin)
+* [`swanky plugins:uninstall PLUGIN...`](#swanky-pluginsuninstall-plugin-1)
+* [`swanky plugins:uninstall PLUGIN...`](#swanky-pluginsuninstall-plugin-2)
+* [`swanky plugins update`](#swanky-plugins-update)
+* [`swanky version`](#swanky-version)
 
 ## `swanky account create`
 
@@ -119,7 +114,7 @@ DESCRIPTION
   Check installed package versions and compatibility
 ```
 
-_See code: [dist/commands/check/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.0-alpha.0/dist/commands/check/index.js)_
+_See code: [dist/commands/check/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.1-alpha.0/dist/commands/check/index.js)_
 
 ## `swanky contract compile [CONTRACTNAME]`
 
@@ -225,14 +220,11 @@ FLAGS
 
 ## `swanky contract test [CONTRACTNAME]`
 
-## `swanky contract test [CONTRACTNAME]`
-
 Run tests for a given contact
 
 ```
 USAGE
   $ swanky contract test [CONTRACTNAME] [-a]
-  $ swanky contract test [CONTRACTNAME] [-a]
 
 ARGUMENTS
   CONTRACTNAME  Name of the contract to test
@@ -325,7 +317,7 @@ DESCRIPTION
   Generate a new smart contract environment
 ```
 
-_See code: [dist/commands/init/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.0-alpha.0/dist/commands/init/index.js)_
+_See code: [dist/commands/init/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.1-alpha.0/dist/commands/init/index.js)_
 
 ## `swanky node install`
 
@@ -431,7 +423,7 @@ ALIASES
   $ swanky plugins add
 
 EXAMPLES
-  $ swanky plugins:install myplugin
+  $ swanky plugins:install myplugin 
 
   $ swanky plugins:install https://github.com/someuser/someplugin
 
@@ -494,7 +486,7 @@ ALIASES
   $ swanky plugins add
 
 EXAMPLES
-  $ swanky plugins:install myplugin
+  $ swanky plugins:install myplugin 
 
   $ swanky plugins:install https://github.com/someuser/someplugin
 
@@ -632,7 +624,6 @@ FLAG DESCRIPTIONS
 ```
 
 _See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v1.2.1/src/commands/version.ts)_
-
 <!-- commandsstop -->
 
 # Config
diff --git a/packages/cli/package.json b/packages/cli/package.json
index cbb3ae1c..ebe8bbdf 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/swanky-cli",
-  "version": "2.2.0-alpha.0",
+  "version": "2.2.1-alpha.0",
   "description": "Astar network WASM contract CLI tool",
   "author": "Astar network",
   "bin": {
@@ -17,8 +17,8 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@astar-network/swanky-core": "^2.2.0-alpha.0",
-    "@astar-network/swanky-templates": "^2.0.0",
+    "@astar-network/swanky-core": "^2.2.1-alpha.0",
+    "@astar-network/swanky-templates": "^2.2.1-alpha.0",
     "@iarna/toml": "^2.2.5",
     "@oclif/core": "2.5.0",
     "@oclif/plugin-help": "5.2.7",
diff --git a/packages/core/package.json b/packages/core/package.json
index 395455e4..5c6fc716 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/swanky-core",
-  "version": "2.2.0-alpha.0",
+  "version": "2.2.1-alpha.0",
   "description": "Core library of Swanky Suite",
   "author": "Astar network",
   "license": "MIT",
diff --git a/packages/templates/package.json b/packages/templates/package.json
index d69545c4..71d530e5 100644
--- a/packages/templates/package.json
+++ b/packages/templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/swanky-templates",
-  "version": "2.1.1",
+  "version": "2.2.1-alpha.0",
   "description": "Templates for initialising Swanky projects",
   "author": "Astar network",
   "license": "MIT",

From ba4ed39e1d80165b6bef5d966207570fcf78ee86 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 16 May 2023 12:40:53 +0300
Subject: [PATCH 39/46] pr fix: update test template paths

---
 packages/cli/src/commands/contract/new.ts                     | 2 +-
 .../src/templates/contracts/ink/psp22/test/index.test.ts.hbs  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/commands/contract/new.ts b/packages/cli/src/commands/contract/new.ts
index 93d96914..33a46298 100644
--- a/packages/cli/src/commands/contract/new.ts
+++ b/packages/cli/src/commands/contract/new.ts
@@ -1,6 +1,6 @@
 import { Args, Command, Flags } from "@oclif/core";
 import path = require("node:path");
-import { ensureDir, pathExists, pathExistsSync, readJSON, writeJSON } from "fs-extra";
+import { ensureDir, pathExists, readJSON, writeJSON } from "fs-extra";
 import {
   getSwankyConfig,
   ensureSwankyProject,
diff --git a/packages/templates/src/templates/contracts/ink/psp22/test/index.test.ts.hbs b/packages/templates/src/templates/contracts/ink/psp22/test/index.test.ts.hbs
index 1723d29a..5e018a64 100644
--- a/packages/templates/src/templates/contracts/ink/psp22/test/index.test.ts.hbs
+++ b/packages/templates/src/templates/contracts/ink/psp22/test/index.test.ts.hbs
@@ -1,7 +1,7 @@
 import { expect, use } from "chai";
 import chaiAsPromised from "chai-as-promised";
-import {{contract_name_pascal}}Factory from "./typedContract/constructors/{{contract_name}}";
-import {{contract_name_pascal}} from "./typedContract/contracts/{{contract_name}}";
+import {{contract_name_pascal}}Factory from "../../typedContracts/{{contract_name}}/constructors/{{contract_name}}";
+import {{contract_name_pascal}} from "../../typedContracts/{{contract_name}}/contracts/{{contract_name}}";
 import { ApiPromise, WsProvider, Keyring } from "@polkadot/api";
 import { KeyringPair } from "@polkadot/keyring/types";
 

From c8f928dee6f53b61256f0226cd48ec48b51fbe65 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 16 May 2023 15:12:46 +0300
Subject: [PATCH 40/46] make getManualPaths recursive

---
 packages/cli/src/commands/init/index.ts | 27 +++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 5e21732d..17586984 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -336,7 +336,7 @@ export class Init extends BaseCommand {
 
     if (!copyGlobsList.contractsDirectories.length) {
       const manualContractsPath = await getManualPaths(pathToExistingProject, "contracts");
-      copyGlobsList.contractsDirectories.push(manualContractsPath);
+      copyGlobsList.contractsDirectories.push(...manualContractsPath);
     }
 
     if (rootTomlPaths.cratesDirectories.length) {
@@ -361,7 +361,7 @@ export class Init extends BaseCommand {
 
       if (shouldSpecifyCratesDir) {
         const manualCratesPath = await getManualPaths(pathToExistingProject, "crates");
-        copyGlobsList.cratesDirectories.push(manualCratesPath);
+        copyGlobsList.cratesDirectories.push(...manualCratesPath);
       }
     }
 
@@ -569,7 +569,7 @@ async function detectTests(pathToExistingProject: string): Promise<string | unde
   ]);
   if (shouldInputTestDir) {
     const manualTestDir = await getManualPaths(pathToExistingProject, "tests");
-    return manualTestDir;
+    return manualTestDir[0];
   }
   return testDir;
 }
@@ -596,8 +596,9 @@ async function readRootCargoToml(pathToProject: string) {
 
 async function getManualPaths(
   pathToProject: string,
-  directoryType: "contracts" | "crates" | "tests"
-): Promise<string> {
+  directoryType: "contracts" | "crates" | "tests",
+  paths: string[] = []
+): Promise<string[]> {
   const { selectedDirectory } = await inquirer.prompt([
     {
       type: "fuzzypath",
@@ -612,7 +613,21 @@ async function getManualPaths(
     },
   ]);
 
-  return selectedDirectory;
+  if (directoryType !== "tests") {
+    const { hasMorePaths } = await inquirer.prompt([
+      {
+        type: "confirm",
+        name: "hasMorePaths",
+        message: `Do you want to add more paths to ${directoryType}?`,
+        default: false,
+      },
+    ]);
+
+    if (hasMorePaths) {
+      return getManualPaths(pathToProject, directoryType, [...paths, selectedDirectory]);
+    }
+  }
+  return [...paths, selectedDirectory];
 }
 
 async function getCopyCandidatesList(

From c7548a799a565bd9a01a70fdfd63cf014017cadd Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 16 May 2023 16:55:58 +0300
Subject: [PATCH 41/46] remove automatic workspace detection

---
 packages/cli/src/commands/init/index.ts | 65 ++++---------------------
 1 file changed, 9 insertions(+), 56 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 17586984..30755583 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -314,55 +314,18 @@ export class Init extends BaseCommand {
       throw error;
     }
 
-    const rootTomlPaths = await getRootCargoTomlPaths(pathToExistingProject);
-
     const copyGlobsList: CopyPathsList = {
-      contractsDirectories: [],
+      contractsDirectories: await getManualPaths(pathToExistingProject, "contracts"),
       cratesDirectories: [],
     };
 
-    if (rootTomlPaths.contractsDirectories.length) {
-      console.log("Detected a `workspace.members` field in Cargo.toml.");
-      const { shouldKeepRootTomlContracts } = await inquirer.prompt([
-        choice(
-          "shouldKeepRootTomlContracts",
-          "Do you want to use it to automatically copy contracts?"
-        ),
-      ]);
-      if (shouldKeepRootTomlContracts) {
-        copyGlobsList.contractsDirectories = rootTomlPaths.contractsDirectories;
-      }
-    }
-
-    if (!copyGlobsList.contractsDirectories.length) {
-      const manualContractsPath = await getManualPaths(pathToExistingProject, "contracts");
-      copyGlobsList.contractsDirectories.push(...manualContractsPath);
-    }
-
-    if (rootTomlPaths.cratesDirectories.length) {
-      console.log("Detected a `workspace.exclude` field in Cargo.toml.");
-      const { shouldKeepRootTomlCrates } = await inquirer.prompt([
-        choice(
-          "shouldKeepRootTomlCrates",
-          "Do you want to use it to automatically copy additional crates?"
-        ),
-      ]);
-      if (shouldKeepRootTomlCrates) {
-        copyGlobsList.cratesDirectories = rootTomlPaths.cratesDirectories;
-      }
-    } else {
-      console.log("No `workspace.exclude` field detected in Cargo.toml.");
-    }
-
-    if (!copyGlobsList.cratesDirectories.length) {
-      const { shouldSpecifyCratesDir } = await inquirer.prompt([
-        choice("shouldSpecifyCratesDir", "Do you want to specify an additional crates directory?"),
-      ]);
+    const { shouldSpecifyCratesDir } = await inquirer.prompt([
+      choice("shouldSpecifyCratesDir", "Do you want to specify an additional crates directory?"),
+    ]);
 
-      if (shouldSpecifyCratesDir) {
-        const manualCratesPath = await getManualPaths(pathToExistingProject, "crates");
-        copyGlobsList.cratesDirectories.push(...manualCratesPath);
-      }
+    if (shouldSpecifyCratesDir) {
+      const manualCratesPath = await getManualPaths(pathToExistingProject, "crates");
+      copyGlobsList.cratesDirectories.push(...manualCratesPath);
     }
 
     const candidatesList: CopyCandidates = await getCopyCandidatesList(
@@ -407,7 +370,6 @@ export class Init extends BaseCommand {
     if (!rootToml) rootToml = { workspace: {} };
 
     rootToml.workspace.members = ["contracts/*"];
-    rootToml.workspace.exclude = ["crates/*"];
 
     this.taskQueue.push({
       task: async (tomlObject, projectPath) => {
@@ -574,15 +536,6 @@ async function detectTests(pathToExistingProject: string): Promise<string | unde
   return testDir;
 }
 
-async function getRootCargoTomlPaths(pathToProject: string): Promise<CopyPathsList> {
-  const toml = await readRootCargoToml(pathToProject);
-
-  return {
-    contractsDirectories: toml?.workspace?.members || [],
-    cratesDirectories: toml?.workspace?.exclude || [],
-  };
-}
-
 async function readRootCargoToml(pathToProject: string) {
   const rootTomlPath = path.resolve(pathToProject, "Cargo.toml");
   if (!(await pathExists(rootTomlPath))) return null;
@@ -634,13 +587,13 @@ async function getCopyCandidatesList(
   projectPath: string,
   pathsToCopy: {
     contractsDirectories: string[];
-    cratesDirectories?: string[];
+    cratesDirectories: string[];
   }
 ) {
   const detectedPaths = {
     contracts: await getDirsAndFiles(projectPath, pathsToCopy.contractsDirectories),
     crates:
-      pathsToCopy.cratesDirectories && pathsToCopy.cratesDirectories.length > 0
+      pathsToCopy.cratesDirectories.length > 0
         ? await getDirsAndFiles(projectPath, pathsToCopy.cratesDirectories)
         : [],
   };

From f04ce1300142a325f75eeee869d4569131f0fc9a Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 16 May 2023 17:00:28 +0300
Subject: [PATCH 42/46] restore .github dir copy

---
 packages/core/src/lib/tasks.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/src/lib/tasks.ts b/packages/core/src/lib/tasks.ts
index aa9dd16b..437847b8 100644
--- a/packages/core/src/lib/tasks.ts
+++ b/packages/core/src/lib/tasks.ts
@@ -34,6 +34,7 @@ export async function copyCommonTemplateFiles(templatesPath: string, projectPath
     })
   );
   await rename(path.resolve(projectPath, "gitignore"), path.resolve(projectPath, ".gitignore"));
+  await copy(path.resolve(templatesPath, "github"), path.resolve(projectPath, ".github"));
 }
 
 export async function copyContractTemplateFiles(

From 62bbcc62eae5b1f67d2197bd492c096917fa4a7d Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 16 May 2023 23:21:48 +0300
Subject: [PATCH 43/46] move account init inside the run method

---
 packages/cli/src/commands/init/index.ts | 30 +++++++++++++------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 30755583..21cc9215 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -105,20 +105,7 @@ export class Init extends BaseCommand {
       polkadotPalletVersions: swankyNode.polkadotPalletVersions,
       supportedInk: swankyNode.supportedInk,
     },
-    accounts: [
-      {
-        alias: "alice",
-        mnemonic: "//Alice",
-        isDev: true,
-        address: new ChainAccount("//Alice").pair.address,
-      },
-      {
-        alias: "bob",
-        mnemonic: "//Bob",
-        isDev: true,
-        address: new ChainAccount("//Bob").pair.address,
-      },
-    ],
+    accounts: [],
     networks: {
       local: { url: DEFAULT_NETWORK_URL },
       astar: { url: DEFAULT_ASTAR_NETWORK_URL },
@@ -199,6 +186,21 @@ export class Init extends BaseCommand {
       }
     }
 
+    this.configBuilder.accounts = [
+      {
+        alias: "alice",
+        mnemonic: "//Alice",
+        isDev: true,
+        address: new ChainAccount("//Alice").pair.address,
+      },
+      {
+        alias: "bob",
+        mnemonic: "//Bob",
+        isDev: true,
+        address: new ChainAccount("//Bob").pair.address,
+      },
+    ];
+
     Object.keys(this.configBuilder.contracts as typeof this.swankyConfig.contracts).forEach(
       async (contractName) => {
         await ensureDir(path.resolve(this.projectPath, "artifacts", contractName));

From 8bd8a04b30c1ca33123e73cfebc803caf6d51744 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Tue, 16 May 2023 23:42:43 +0300
Subject: [PATCH 44/46] v2.2.2-alpha.0

---
 lerna.json                      | 2 +-
 packages/cli/README.md          | 6 +++---
 packages/cli/package.json       | 6 +++---
 packages/core/package.json      | 2 +-
 packages/templates/package.json | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7af6a017..40478e31 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useWorkspaces": true,
-  "version": "2.2.1-alpha.0",
+  "version": "2.2.2-alpha.0",
   "npmClient": "yarn"
 }
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 3602d48b..c590befd 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -17,7 +17,7 @@ $ npm install -g @astar-network/swanky-cli
 $ swanky COMMAND
 running command...
 $ swanky (--version|-V|-v)
-@astar-network/swanky-cli/2.2.1-alpha.0 darwin-x64 node-v18.2.0
+@astar-network/swanky-cli/2.2.2-alpha.0 darwin-x64 node-v18.2.0
 $ swanky --help [COMMAND]
 USAGE
   $ swanky COMMAND
@@ -114,7 +114,7 @@ DESCRIPTION
   Check installed package versions and compatibility
 ```
 
-_See code: [dist/commands/check/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.1-alpha.0/dist/commands/check/index.js)_
+_See code: [dist/commands/check/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.2-alpha.0/dist/commands/check/index.js)_
 
 ## `swanky contract compile [CONTRACTNAME]`
 
@@ -317,7 +317,7 @@ DESCRIPTION
   Generate a new smart contract environment
 ```
 
-_See code: [dist/commands/init/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.1-alpha.0/dist/commands/init/index.js)_
+_See code: [dist/commands/init/index.js](https://github.com/AstarNetwork/swanky-cli/blob/v2.2.2-alpha.0/dist/commands/init/index.js)_
 
 ## `swanky node install`
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ebe8bbdf..1aed4c35 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/swanky-cli",
-  "version": "2.2.1-alpha.0",
+  "version": "2.2.2-alpha.0",
   "description": "Astar network WASM contract CLI tool",
   "author": "Astar network",
   "bin": {
@@ -17,8 +17,8 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@astar-network/swanky-core": "^2.2.1-alpha.0",
-    "@astar-network/swanky-templates": "^2.2.1-alpha.0",
+    "@astar-network/swanky-core": "^2.2.2-alpha.0",
+    "@astar-network/swanky-templates": "^2.2.2-alpha.0",
     "@iarna/toml": "^2.2.5",
     "@oclif/core": "2.5.0",
     "@oclif/plugin-help": "5.2.7",
diff --git a/packages/core/package.json b/packages/core/package.json
index 5c6fc716..73a4053c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/swanky-core",
-  "version": "2.2.1-alpha.0",
+  "version": "2.2.2-alpha.0",
   "description": "Core library of Swanky Suite",
   "author": "Astar network",
   "license": "MIT",
diff --git a/packages/templates/package.json b/packages/templates/package.json
index 71d530e5..c0a73b87 100644
--- a/packages/templates/package.json
+++ b/packages/templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/swanky-templates",
-  "version": "2.2.1-alpha.0",
+  "version": "2.2.2-alpha.0",
   "description": "Templates for initialising Swanky projects",
   "author": "Astar network",
   "license": "MIT",

From 40ad8b5a45dd9cbc7d8b536d65b62a91de9c0808 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Wed, 17 May 2023 10:53:11 +0300
Subject: [PATCH 45/46] PR fix: correct path in flipper test template

---
 .../templates/contracts/ink/flipper/test/index.test.ts.hbs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/templates/src/templates/contracts/ink/flipper/test/index.test.ts.hbs b/packages/templates/src/templates/contracts/ink/flipper/test/index.test.ts.hbs
index 460a711b..702a1033 100644
--- a/packages/templates/src/templates/contracts/ink/flipper/test/index.test.ts.hbs
+++ b/packages/templates/src/templates/contracts/ink/flipper/test/index.test.ts.hbs
@@ -1,7 +1,7 @@
 import { expect, use } from "chai";
 import chaiAsPromised from "chai-as-promised";
-import {{contract_name_pascal}}Factory from "./typedContract/constructors/{{contract_name}}";
-import {{contract_name_pascal}} from "./typedContract/contracts/{{contract_name}}";
+import {{contract_name_pascal}}Factory from "../../typedContracts/{{contract_name}}/constructors/{{contract_name}}";
+import {{contract_name_pascal}} from "../../typedContracts/{{contract_name}}/contracts/{{contract_name}}";
 import { ApiPromise, WsProvider, Keyring } from "@polkadot/api";
 import { KeyringPair } from "@polkadot/keyring/types";
 

From 8490bb3692ca5a7f9a955256a07e312ff9c62aa7 Mon Sep 17 00:00:00 2001
From: codespool <4625220+codespool@users.noreply.github.com>
Date: Wed, 17 May 2023 16:00:07 +0300
Subject: [PATCH 46/46] use snake_case for generated contracts moduleName

---
 packages/cli/src/commands/contract/new.ts | 2 +-
 packages/cli/src/commands/init/index.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/commands/contract/new.ts b/packages/cli/src/commands/contract/new.ts
index 33a46298..1a56cdf3 100644
--- a/packages/cli/src/commands/contract/new.ts
+++ b/packages/cli/src/commands/contract/new.ts
@@ -128,7 +128,7 @@ export class NewContract extends Command {
     await spinner.runCommand(async () => {
       config.contracts[args.contractName] = {
         name: args.contractName,
-        moduleName: args.contractName,
+        moduleName: snakeCase(args.contractName),
         language: contractLanguage,
         deployments: [],
       };
diff --git a/packages/cli/src/commands/init/index.ts b/packages/cli/src/commands/init/index.ts
index 21cc9215..02787243 100644
--- a/packages/cli/src/commands/init/index.ts
+++ b/packages/cli/src/commands/init/index.ts
@@ -295,7 +295,7 @@ export class Init extends BaseCommand {
     this.configBuilder.contracts = {
       [answers.contractName as string]: {
         name: answers.contractName,
-        moduleName: answers.contractName,
+        moduleName: snakeCase(answers.contractName),
         deployments: [],
         language: contractLanguage,
       },