@acala-network/chopsticks 0.7.2 → 0.7.3

package/lib/cli.d.ts

@@ -1,2 +1 @@
-import { Config } from './schema';
-export declare const fetchConfig: (path: string) => Promise<Config>;
+export {};

package/lib/cli.js

@@ -3,56 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchConfig = void 0;
-const node_path_1 = require("node:path");
 const dotenv_1 = require("dotenv");
 const helpers_1 = require("yargs/helpers");
-const node_fs_1 = require("node:fs");
-const lodash_1 = __importDefault(require("lodash"));
-const axios_1 = __importDefault(require("axios"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
 const yargs_1 = __importDefault(require("yargs"));
 const _1 = require(".");
-const schema_1 = require("./schema");
 const decoder_1 = require("./utils/decoder");
 const dry_run_1 = require("./dry-run");
 const dry_run_preimage_1 = require("./dry-run-preimage");
-const utils_1 = require("./utils");
-const shared_1 = require("./rpc/shared");
+const schema_1 = require("./schema");
 const run_block_1 = require("./run-block");
 const try_runtime_1 = require("./try-runtime");
 (0, dotenv_1.config)();
-const CONFIGS_BASE_URL = 'https://raw.githubusercontent.com/AcalaNetwork/chopsticks/master/configs/';
-const fetchConfig = async (path) => {
-    let file;
-    if ((0, utils_1.isUrl)(path)) {
-        file = await axios_1.default.get(path).then((x) => x.data);
-    }
-    else {
-        try {
-            file = (0, node_fs_1.readFileSync)(path, 'utf8');
-        }
-        catch (err) {
-            if ((0, node_path_1.basename)(path) === path && ['', '.yml', '.yaml', '.json'].includes((0, node_path_1.extname)(path))) {
-                if ((0, node_path_1.extname)(path) === '') {
-                    path += '.yml';
-                }
-                const url = CONFIGS_BASE_URL + path;
-                shared_1.logger.info(`Loading config file ${url}`);
-                file = await axios_1.default.get(url).then((x) => x.data);
-            }
-            else {
-                throw err;
-            }
-        }
-    }
-    const config = js_yaml_1.default.load(lodash_1.default.template(file, { variable: 'env' })(process.env));
-    return schema_1.configSchema.parse(config);
-};
-exports.fetchConfig = fetchConfig;
 const processArgv = async (argv) => {
     if (argv.config) {
-        argv = { ...(await (0, exports.fetchConfig)(argv.config)), ...argv };
+        argv = { ...(await (0, schema_1.fetchConfig)(argv.config)), ...argv };
     }
     argv.port = argv.port ?? (process.env.PORT ? Number(process.env.PORT) : 8000);
     return argv;
@@ -225,14 +189,14 @@ const mockOptions = {
     .alias('parachain', 'p'), async (argv) => {
     const parachains = [];
     for (const config of argv.parachain) {
-        const { chain } = await (0, _1.setupWithServer)(await (0, exports.fetchConfig)(config));
+        const { chain } = await (0, _1.setupWithServer)(await (0, schema_1.fetchConfig)(config));
         parachains.push(chain);
     }
     if (parachains.length > 1) {
         await (0, _1.connectParachains)(parachains);
     }
     if (argv.relaychain) {
-        const { chain: relaychain } = await (0, _1.setupWithServer)(await (0, exports.fetchConfig)(argv.relaychain));
+        const { chain: relaychain } = await (0, _1.setupWithServer)(await (0, schema_1.fetchConfig)(argv.relaychain));
         for (const parachain of parachains) {
             await (0, _1.connectVertical)(relaychain, parachain);
         }

package/lib/index.d.ts

@@ -4,5 +4,5 @@ export { BuildBlockMode } from './blockchain/txpool';
 export { connectParachains, connectVertical } from './xcm';
 export { setup } from './setup';
 export { setupWithServer } from './setup-with-server';
-export { fetchConfig } from './cli';
+export { Config, fetchConfig } from './schema';
 export * from './blockchain/inherent';

package/lib/index.js

@@ -28,6 +28,6 @@ var setup_1 = require("./setup");
 Object.defineProperty(exports, "setup", { enumerable: true, get: function () { return setup_1.setup; } });
 var setup_with_server_1 = require("./setup-with-server");
 Object.defineProperty(exports, "setupWithServer", { enumerable: true, get: function () { return setup_with_server_1.setupWithServer; } });
-var cli_1 = require("./cli");
-Object.defineProperty(exports, "fetchConfig", { enumerable: true, get: function () { return cli_1.fetchConfig; } });
+var schema_1 = require("./schema");
+Object.defineProperty(exports, "fetchConfig", { enumerable: true, get: function () { return schema_1.fetchConfig; } });
 __exportStar(require("./blockchain/inherent"), exports);

package/lib/schema/index.d.ts

@@ -1,5 +1,5 @@
-import { BuildBlockMode } from '../blockchain/txpool';
 import { z } from 'zod';
+import { BuildBlockMode } from '../blockchain/txpool';
 export declare const genesisSchema: z.ZodObject<{
     id: z.ZodString;
     name: z.ZodString;
@@ -190,3 +190,4 @@ export declare const configSchema: z.ZodObject<{
     'offchain-worker'?: boolean | undefined;
 }>;
 export type Config = z.infer<typeof configSchema>;
+export declare const fetchConfig: (path: string) => Promise<Config>;

package/lib/schema/index.js

@@ -1,8 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configSchema = exports.genesisSchema = void 0;
-const txpool_1 = require("../blockchain/txpool");
+exports.fetchConfig = exports.configSchema = exports.genesisSchema = void 0;
+const node_path_1 = require("node:path");
+const node_fs_1 = require("node:fs");
 const zod_1 = require("zod");
+const lodash_1 = __importDefault(require("lodash"));
+const axios_1 = __importDefault(require("axios"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const txpool_1 = require("../blockchain/txpool");
+const utils_1 = require("../utils");
+const shared_1 = require("../rpc/shared");
 exports.genesisSchema = zod_1.z.object({
     id: zod_1.z.string(),
     name: zod_1.z.string(),
@@ -30,3 +40,31 @@ exports.configSchema = zod_1.z
     'offchain-worker': zod_1.z.boolean().optional(),
 })
     .strict();
+const CONFIGS_BASE_URL = 'https://raw.githubusercontent.com/AcalaNetwork/chopsticks/master/configs/';
+const fetchConfig = async (path) => {
+    let file;
+    if ((0, utils_1.isUrl)(path)) {
+        file = await axios_1.default.get(path).then((x) => x.data);
+    }
+    else {
+        try {
+            file = (0, node_fs_1.readFileSync)(path, 'utf8');
+        }
+        catch (err) {
+            if ((0, node_path_1.basename)(path) === path && ['', '.yml', '.yaml', '.json'].includes((0, node_path_1.extname)(path))) {
+                if ((0, node_path_1.extname)(path) === '') {
+                    path += '.yml';
+                }
+                const url = CONFIGS_BASE_URL + path;
+                shared_1.logger.info(`Loading config file ${url}`);
+                file = await axios_1.default.get(url).then((x) => x.data);
+            }
+            else {
+                throw err;
+            }
+        }
+    }
+    const config = js_yaml_1.default.load(lodash_1.default.template(file, { variable: 'env' })(process.env));
+    return exports.configSchema.parse(config);
+};
+exports.fetchConfig = fetchConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
@@ -16,7 +16,7 @@
     "dev:moonbeam": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- --config=configs/moonbeam.yml"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.7.2",
+    "@acala-network/chopsticks-executor": "0.7.3",
     "@pnpm/npm-conf": "^2.2.2",
     "@polkadot/api": "^10.9.1",
     "axios": "^1.4.0",