@acala-network/chopsticks 0.6.0 → 0.6.2

package/lib/cli.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_path_1 = require("node:path");
 const helpers_1 = require("yargs/helpers");
 const node_fs_1 = require("node:fs");
 const lodash_1 = __importDefault(require("lodash"));
@@ -16,16 +17,33 @@ 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 run_block_1 = require("./run-block");
 const try_runtime_1 = require("./try-runtime");
 dotenv_1.default.config();
+const CONFIGS_BASE_URL = 'https://raw.githubusercontent.com/AcalaNetwork/chopsticks/master/configs/';
 const processConfig = async (path) => {
     let file;
     if ((0, utils_1.isUrl)(path)) {
         file = await axios_1.default.get(path).then((x) => x.data);
     }
     else {
-        file = (0, node_fs_1.readFileSync)(path, 'utf8');
+        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);
@@ -63,18 +81,43 @@ const defaultOptions = {
         number: true,
     },
 };
+const mockOptions = {
+    'import-storage': {
+        desc: 'Pre-defined JSON/YAML storage file path',
+        string: true,
+    },
+    'mock-signature-host': {
+        desc: 'Mock signature host so any signature starts with 0xdeadbeef and filled by 0xcd is considered valid',
+        boolean: true,
+    },
+};
 (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .scriptName('chopsticks')
+    .command('*', 'Dev mode, fork off a chain', (yargs) => yargs.options({
+    ...defaultOptions,
+    ...mockOptions,
+    port: {
+        desc: 'Port to listen on',
+        number: true,
+    },
+    'build-block-mode': {
+        desc: 'Build block mode. Default to Batch',
+        enum: [_1.BuildBlockMode.Batch, _1.BuildBlockMode.Manual, _1.BuildBlockMode.Instant],
+    },
+    'allow-unresolved-imports': {
+        desc: 'Allow wasm unresolved imports',
+        boolean: true,
+    },
+}), async (argv) => {
+    await (0, _1.setupWithServer)(await processArgv(argv));
+})
     .command('run-block', 'Replay a block', (yargs) => yargs.options({
     ...defaultOptions,
+    ...mockOptions,
     'output-path': {
         desc: 'File path to print output',
         string: true,
     },
-    'import-storage': {
-        desc: 'Pre-defined JSON/YAML storage file path',
-        string: true,
-    },
     html: {
         desc: 'Generate html with storage diff',
     },
@@ -140,31 +183,6 @@ const defaultOptions = {
     else {
         await (0, dry_run_1.dryRun)(config);
     }
-})
-    .command('dev', 'Dev mode', (yargs) => yargs.options({
-    ...defaultOptions,
-    port: {
-        desc: 'Port to listen on',
-        number: true,
-    },
-    'build-block-mode': {
-        desc: 'Build block mode. Default to Batch',
-        enum: [_1.BuildBlockMode.Batch, _1.BuildBlockMode.Manual, _1.BuildBlockMode.Instant],
-    },
-    'import-storage': {
-        desc: 'Pre-defined JSON/YAML storage file path',
-        string: true,
-    },
-    'mock-signature-host': {
-        desc: 'Mock signature host so any signature starts with 0xdeadbeef and filled by 0xcd is considered valid',
-        boolean: true,
-    },
-    'allow-unresolved-imports': {
-        desc: 'Allow wasm unresolved imports',
-        boolean: true,
-    },
-}), async (argv) => {
-    await (0, _1.setupWithServer)(await processArgv(argv));
 })
     .command('decode-key <key>', 'Deocde a key', (yargs) => yargs
     .positional('key', {
@@ -184,7 +202,8 @@ const defaultOptions = {
     }
     process.exit(0);
 })
-    .command('xcm', 'XCM setup with relaychain and parachains', (yargs) => yargs.options({
+    .command('xcm', 'XCM setup with relaychain and parachains', (yargs) => yargs
+    .options({
     relaychain: {
         desc: 'Relaychain config file path',
         string: true,
@@ -195,7 +214,9 @@ const defaultOptions = {
         string: true,
         required: true,
     },
-}), async (argv) => {
+})
+    .alias('relaychain', 'r')
+    .alias('parachain', 'p'), async (argv) => {
     const parachains = [];
     for (const config of argv.parachain) {
         const { chain } = await (0, _1.setupWithServer)(await processConfig(config));
@@ -210,13 +231,16 @@ const defaultOptions = {
             await (0, _1.connectVertical)(relaychain, parachain);
         }
     }
-})
-    .command({
-    command: '*',
-    handler() {
-        yargs_1.default.showHelp();
-    },
 })
     .strict()
     .help()
-    .alias('help', 'h').argv;
+    .alias('help', 'h')
+    .alias('version', 'v')
+    .alias('config', 'c')
+    .alias('endpoint', 'e')
+    .alias('port', 'p')
+    .alias('block', 'b')
+    .alias('import-storage', 's')
+    .alias('wasm-override', 'w')
+    .usage('Usage: $0 <command> [options]')
+    .example('$0', '-c acala').argv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
@@ -11,11 +11,12 @@
     "script:run": "cd ../..; LOG_LEVEL=trace ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/dev.yml",
     "dev:karura": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/karura.yml",
     "dev:acala": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/acala.yml",
+    "dev:polkadot": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/polkadot.yml",
     "dev:moonriver": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/moonriver.yml",
     "dev:moonbeam": "cd ../..; ts-node-dev --transpile-only --inspect --notify=false packages/chopsticks/src/cli.ts -- dev --config=configs/moonbeam.yml"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.6.0",
+    "@acala-network/chopsticks-executor": "0.6.2",
     "@polkadot/api": "^10.2.1",
     "@polkadot/rpc-provider": "^10.2.1",
     "@polkadot/types": "^10.2.1",
@@ -39,12 +40,12 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.192",
-    "@types/node": "^18.15.10",
+    "@types/node": "^18.15.11",
     "@types/ws": "^8.5.4",
     "@types/yargs": "^17.0.24",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.0.2"
+    "typescript": "^5.0.3"
   },
   "files": [
     "lib",