update

trufflesuite · Jun 29, 2023 · 9c6765a · 9c6765a
1 parent fbd8fc8
commit 9c6765a
Show file tree

Hide file tree

Showing 42 changed files with 85 additions and 101 deletions.
diff --git a/scripts/create.ts b/scripts/create.ts
@@ -1,4 +1,4 @@
-import { TruffleColors } from "../src/packages/colors";
+import { TruffleColors } from "../src/colors";
 import { sep, join, resolve } from "path";
 import { highlight } from "cli-highlight";
 import { mkdir, mkdirSync, writeFile } from "fs-extra";
@@ -22,7 +22,7 @@ const COMMAND_NAME = "create";
 const getArgv = () => {
   const npmConfigArgv = process.env["npm_config_argv"];
   if (npmConfigArgv) {
-    // handle `npm run create name --location chains`
+    // handle `npm run create name --location ethereum`
     // convert original npm args into a command
     // create <name> --location <location> [--folder <folder>]
     return JSON.parse(npmConfigArgv).original.slice(1);
@@ -45,11 +45,7 @@ const COLORS = {
   FgRed: "\x1b[31m"
 };
 
-let locations = getDirectories(join(__dirname, "../src"));
-const chainLocations = getDirectories(join(__dirname, "../src/chains")).map(
-  d => `chains/${d}`
-);
-locations = locations.concat(chainLocations);
+const locations = ["/", "ethereum"];
 
 const argv = yargs(getArgv())
   .command(`${COMMAND_NAME} <name>`, "", yargs => {
@@ -118,24 +114,10 @@ process.stdout.write(`${COLORS.Reset}`);
   // determines how many `../` are needed for package contents
   const numDirectoriesAwayFromSrc = 1 + location.split(sep).length;
   const relativePathToSrc = "../".repeat(numDirectoriesAwayFromSrc);
-  const isNewChain = location === "chains";
 
   const workspaceDir = join(__dirname, "../");
   const dir = join(workspaceDir, "src", location, folderName);
 
-  if (isNewChain) {
-    mkdirSync(dir);
-
-    const fullLocation = join(location, folderName);
-    console.log(
-      chalk`{green success} {magenta create} New chain folder {bgBlack  ${name} } created at ./src/${fullLocation}.`
-    );
-    console.log("");
-    console.log(
-      chalk`  Add packages to this chain by running: {bgBlack {bold npm run create {dim <}name{dim >} {dim --}location ${fullLocation}}}`
-    );
-    return;
-  }
   try {
     const LICENSE = readFile(join(workspaceDir, "LICENSE"), "utf-8");
 
@@ -352,4 +334,4 @@ describe("${packageName}", () => {
       chalk`{red fail} {magenta create} New package {bgBlack  ${name} } not created. See error above.`
     );
   }
-})();
+})();
diff --git a/src/cli/cli/.npmignore → src/cli/.npmignore b/src/cli/cli/.npmignore → src/cli/.npmignore
diff --git a/src/cli/cli/LICENSE → src/cli/LICENSE b/src/cli/cli/LICENSE → src/cli/LICENSE
diff --git a/src/cli/cli/README.md → src/cli/README.md b/src/cli/cli/README.md → src/cli/README.md
diff --git a/src/cli/cli/index.ts → src/cli/index.ts b/src/cli/cli/index.ts → src/cli/index.ts
diff --git a/src/cli/cli/package-lock.json → src/cli/package-lock.json b/src/cli/cli/package-lock.json → src/cli/package-lock.json
diff --git a/src/cli/cli/package.json → src/cli/package.json b/src/cli/cli/package.json → src/cli/package.json
diff --git a/src/cli/cli/src/args.ts → src/cli/src/args.ts b/src/cli/cli/src/args.ts → src/cli/src/args.ts
diff --git a/src/cli/cli/src/cli.ts → src/cli/src/cli.ts b/src/cli/cli/src/cli.ts → src/cli/src/cli.ts
diff --git a/src/cli/cli/src/detach.ts → src/cli/src/detach.ts b/src/cli/cli/src/detach.ts → src/cli/src/detach.ts
diff --git a/src/cli/cli/src/flavors.ts → src/cli/src/flavors.ts b/src/cli/cli/src/flavors.ts → src/cli/src/flavors.ts
diff --git a/src/cli/cli/src/helpers.ts → src/cli/src/helpers.ts b/src/cli/cli/src/helpers.ts → src/cli/src/helpers.ts
diff --git a/src/cli/cli/src/process-name.ts → src/cli/src/process-name.ts b/src/cli/cli/src/process-name.ts → src/cli/src/process-name.ts
diff --git a/src/cli/cli/src/types.ts → src/cli/src/types.ts b/src/cli/cli/src/types.ts → src/cli/src/types.ts
diff --git a/src/cli/cli/tests/args.test.ts → src/cli/tests/args.test.ts b/src/cli/cli/tests/args.test.ts → src/cli/tests/args.test.ts
diff --git a/src/cli/cli/tests/detach.test.ts → src/cli/tests/detach.test.ts b/src/cli/cli/tests/detach.test.ts → src/cli/tests/detach.test.ts
diff --git a/src/cli/cli/tsconfig.json → src/cli/tsconfig.json b/src/cli/cli/tsconfig.json → src/cli/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig-base.json",
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",
@@ -18,17 +18,17 @@
       "name": "@ganache/options",
       "path": "../options"
     },
-    {
-      "name": "@ganache/ethereum",
-      "path": "../../chains/ethereum/ethereum"
-    },
     {
       "name": "@ganache/colors",
       "path": "../colors"
     },
     {
       "name": "@ganache/flavor",
       "path": "../flavor"
+    },
+    {
+      "name": "@ganache/ethereum",
+      "path": "../ethereum/ethereum"
     }
   ]
 }
diff --git a/src/colors/colors/.npmignore → src/colors/.npmignore b/src/colors/colors/.npmignore → src/colors/.npmignore
diff --git a/src/colors/colors/LICENSE → src/colors/LICENSE b/src/colors/colors/LICENSE → src/colors/LICENSE
diff --git a/src/colors/colors/README.md → src/colors/README.md b/src/colors/colors/README.md → src/colors/README.md
diff --git a/src/colors/colors/index.ts → src/colors/index.ts b/src/colors/colors/index.ts → src/colors/index.ts
diff --git a/src/colors/colors/package-lock.json → src/colors/package-lock.json b/src/colors/colors/package-lock.json → src/colors/package-lock.json
diff --git a/src/colors/colors/package.json → src/colors/package.json b/src/colors/colors/package.json → src/colors/package.json
diff --git a/src/colors/colors/src/index.ts → src/colors/src/index.ts b/src/colors/colors/src/index.ts → src/colors/src/index.ts
diff --git a/src/colors/colors/tests/index.test.ts → src/colors/tests/index.test.ts b/src/colors/colors/tests/index.test.ts → src/colors/tests/index.test.ts
diff --git a/src/colors/colors/tsconfig.json → src/colors/tsconfig.json b/src/colors/colors/tsconfig.json → src/colors/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig-base.json",
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",

diff --git a/src/core/tsconfig.json b/src/core/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig-base.json",
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",
@@ -10,10 +10,6 @@
     "src/**/*"
   ],
   "references": [
-    {
-      "name": "@ganache/ethereum",
-      "path": "../../chains/ethereum/ethereum"
-    },
     {
       "name": "@ganache/options",
       "path": "../options"
@@ -25,6 +21,10 @@
     {
       "name": "@ganache/flavor",
       "path": "../flavor"
+    },
+    {
+      "name": "@ganache/ethereum",
+      "path": "../ethereum/ethereum"
     }
   ]
 }
diff --git a/src/ethereum/address/tsconfig.json b/src/ethereum/address/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",
@@ -12,7 +12,7 @@
   "references": [
     {
       "name": "@ganache/utils",
-      "path": "../../../packages/utils"
+      "path": "../../utils"
     }
   ]
 }
diff --git a/src/ethereum/block/tsconfig.json b/src/ethereum/block/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",
@@ -19,16 +19,16 @@
       "path": "../transaction"
     },
     {
-      "name": "@ganache/rlp",
-      "path": "../../../packages/rlp"
+      "name": "@ganache/ethereum-utils",
+      "path": "../utils"
     },
     {
-      "name": "@ganache/utils",
-      "path": "../../../packages/utils"
+      "name": "@ganache/rlp",
+      "path": "../../rlp"
     },
     {
-      "name": "@ganache/ethereum-utils",
-      "path": "../utils"
+      "name": "@ganache/utils",
+      "path": "../../utils"
     }
   ]
 }
diff --git a/src/ethereum/console.log/tsconfig.json b/src/ethereum/console.log/tsconfig.json
@@ -1,15 +1,20 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",
     "composite": true
   },
-  "include": ["src", "index.ts", "scripts/generate.ts", "scripts/helpers.ts"],
+  "include": [
+    "src",
+    "index.ts",
+    "scripts/generate.ts",
+    "scripts/helpers.ts"
+  ],
   "references": [
     {
       "name": "@ganache/utils",
-      "path": "../../../packages/utils"
+      "path": "../../utils"
     }
   ]
-}
+}
diff --git a/src/ethereum/ethereum/tsconfig.json b/src/ethereum/ethereum/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",
@@ -14,22 +14,10 @@
       "name": "@ganache/ethereum-utils",
       "path": "../utils"
     },
-    {
-      "name": "@ganache/promise-queue",
-      "path": "../../../packages/promise-queue"
-    },
     {
       "name": "@ganache/ethereum-options",
       "path": "../options"
     },
-    {
-      "name": "@ganache/utils",
-      "path": "../../../packages/utils"
-    },
-    {
-      "name": "@ganache/rlp",
-      "path": "../../../packages/rlp"
-    },
     {
       "name": "@ganache/ethereum-transaction",
       "path": "../transaction"
@@ -42,21 +30,33 @@
       "name": "@ganache/ethereum-block",
       "path": "../block"
     },
-    {
-      "name": "@ganache/secp256k1",
-      "path": "../../../packages/secp256k1"
-    },
     {
       "name": "@ganache/console.log",
       "path": "../console.log"
     },
     {
-      "name": "@ganache/flavor",
-      "path": "../../../packages/flavor"
+      "name": "@ganache/colors",
+      "path": "../../colors"
     },
     {
-      "name": "@ganache/colors",
-      "path": "../../../packages/colors"
+      "name": "@ganache/promise-queue",
+      "path": "../../promise-queue"
+    },
+    {
+      "name": "@ganache/rlp",
+      "path": "../../rlp"
+    },
+    {
+      "name": "@ganache/secp256k1",
+      "path": "../../secp256k1"
+    },
+    {
+      "name": "@ganache/utils",
+      "path": "../../utils"
+    },
+    {
+      "name": "@ganache/flavor",
+      "path": "../../flavor"
     }
   ]
 }
diff --git a/src/ethereum/options/tsconfig.json b/src/ethereum/options/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",
@@ -15,16 +15,16 @@
       "path": "../utils"
     },
     {
-      "name": "@ganache/options",
-      "path": "../../../packages/options"
+      "name": "@ganache/ethereum-address",
+      "path": "../address"
     },
     {
-      "name": "@ganache/utils",
-      "path": "../../../packages/utils"
+      "name": "@ganache/options",
+      "path": "../../options"
     },
     {
-      "name": "@ganache/ethereum-address",
-      "path": "../address"
+      "name": "@ganache/utils",
+      "path": "../../utils"
     }
   ]
 }
diff --git a/src/ethereum/transaction/tsconfig.json b/src/ethereum/transaction/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",
@@ -10,14 +10,6 @@
     "index.ts"
   ],
   "references": [
-    {
-      "name": "@ganache/utils",
-      "path": "../../../packages/utils"
-    },
-    {
-      "name": "@ganache/rlp",
-      "path": "../../../packages/rlp"
-    },
     {
       "name": "@ganache/ethereum-address",
       "path": "../address"
@@ -26,9 +18,17 @@
       "name": "@ganache/ethereum-utils",
       "path": "../utils"
     },
+    {
+      "name": "@ganache/rlp",
+      "path": "../../rlp"
+    },
     {
       "name": "@ganache/secp256k1",
-      "path": "../../../packages/secp256k1"
+      "path": "../../secp256k1"
+    },
+    {
+      "name": "@ganache/utils",
+      "path": "../../utils"
     }
   ]
 }
diff --git a/src/ethereum/utils/tsconfig.json b/src/ethereum/utils/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig-base.json",
+  "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",
@@ -11,16 +11,16 @@
   ],
   "references": [
     {
-      "name": "@ganache/utils",
-      "path": "../../../packages/utils"
+      "name": "@ganache/ethereum-address",
+      "path": "../address"
     },
     {
       "name": "@ganache/rlp",
-      "path": "../../../packages/rlp"
+      "path": "../../rlp"
     },
     {
-      "name": "@ganache/ethereum-address",
-      "path": "../address"
+      "name": "@ganache/utils",
+      "path": "../../utils"
     }
   ]
 }
diff --git a/src/flavor/tsconfig.json b/src/flavor/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig-base.json",
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",

diff --git a/src/ganache/tsconfig.json b/src/ganache/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig-base.json",
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib"
   },

diff --git a/src/options/tsconfig.json b/src/options/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig-base.json",
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
     "outDir": "lib",
     "declarationDir": "typings",