@acala-network/chopsticks 0.3.6 → 0.3.8

package/dist/blockchain/head-state.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeadState = exports.randomId = void 0;
+const rxjs_1 = require("rxjs");
 const util_1 = require("@polkadot/util");
 const logger_1 = require("../logger");
 const randomId = () => Math.random().toString(36).substring(2);
@@ -46,23 +47,27 @@ class HeadState {
     async setHead(head) {
         this.#head = head;
         for (const cb of Object.values(this.#headListeners)) {
-            try {
-                cb(head);
-            }
-            catch (error) {
-                logger.error(error, 'callback');
-            }
-        }
-        const diff = await this.#head.storageDiff();
-        for (const [keys, cb] of Object.values(this.#storageListeners)) {
-            const changed = keys.filter((key) => diff[key]).map((key) => [key, diff[key]]);
-            if (changed.length > 0) {
+            rxjs_1.asapScheduler.schedule(() => {
                 try {
-                    cb(head, changed);
+                    cb(head);
                 }
                 catch (error) {
                     logger.error(error, 'callback');
                 }
+            });
+        }
+        const diff = await this.#head.storageDiff();
+        for (const [keys, cb] of Object.values(this.#storageListeners)) {
+            const changed = keys.filter((key) => diff[key]).map((key) => [key, diff[key]]);
+            if (changed.length > 0) {
+                rxjs_1.asapScheduler.schedule(() => {
+                    try {
+                        cb(head, changed);
+                    }
+                    catch (error) {
+                        logger.error(error, 'callback');
+                    }
+                });
             }
         }
         Object.assign(this.#oldValues, diff);

package/dist/blockchain/txpool.js

@@ -54,12 +54,7 @@ class TxPool {
     async upcomingBlock(count = 1) {
         if (count < 1)
             throw new Error('count needs to be greater than 0');
-        return new Promise((resolve) => {
-            const sub = this.#upcoming.pipe((0, operators_1.skip)(count - 1)).subscribe((block) => {
-                sub.unsubscribe();
-                resolve(block);
-            });
-        });
+        return (0, rxjs_1.firstValueFrom)(this.#upcoming.pipe((0, operators_1.skip)(count - 1), (0, operators_1.first)()));
     }
     async #buildBlock(wait, params) {
         await this.#chain.api.isReady;

package/dist/cli.js

@@ -5,21 +5,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("yargs/helpers");
 const node_fs_1 = require("node:fs");
+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 utils_1 = require("./utils");
 const run_block_1 = require("./run-block");
-const processConfig = (path) => {
-    const configFile = (0, node_fs_1.readFileSync)(path, 'utf8');
-    const config = js_yaml_1.default.load(configFile);
+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');
+    }
+    const config = js_yaml_1.default.load(file);
     return schema_1.configSchema.parse(config);
 };
-const processArgv = (argv) => {
+const processArgv = async (argv) => {
     if (argv.config) {
-        return { ...processConfig(argv.config), ...argv };
+        return { ...(await processConfig(argv.config)), ...argv };
     }
     return argv;
 };
@@ -63,7 +71,7 @@ const defaultOptions = {
         desc: 'Open generated html',
     },
 }), async (argv) => {
-    await (0, run_block_1.runBlock)(processArgv(argv));
+    await (0, run_block_1.runBlock)(await processArgv(argv));
 })
     .command('dry-run', 'Dry run an extrinsic', (yargs) => yargs.options({
     ...defaultOptions,
@@ -91,7 +99,7 @@ const defaultOptions = {
         desc: 'Open generated html',
     },
 }), async (argv) => {
-    await (0, dry_run_1.dryRun)(processArgv(argv));
+    await (0, dry_run_1.dryRun)(await processArgv(argv));
 })
     .command('dev', 'Dev mode', (yargs) => yargs.options({
     ...defaultOptions,
@@ -116,7 +124,7 @@ const defaultOptions = {
         boolean: true,
     },
 }), async (argv) => {
-    await (0, _1.setupWithServer)(processArgv(argv));
+    await (0, _1.setupWithServer)(await processArgv(argv));
 })
     .command('decode-key <key>', 'Deocde a key', (yargs) => yargs
     .positional('key', {
@@ -126,7 +134,7 @@ const defaultOptions = {
     .options({
     ...defaultOptions,
 }), async (argv) => {
-    const context = await (0, _1.setup)(processArgv(argv));
+    const context = await (0, _1.setup)(await processArgv(argv));
     const { storage, decodedKey } = await (0, decoder_1.decodeKey)(context.chain.head, argv.key);
     if (storage && decodedKey) {
         console.log(`${storage.section}.${storage.method}`, decodedKey.args.map((x) => JSON.stringify(x.toHuman())).join(', '));
@@ -150,14 +158,14 @@ const defaultOptions = {
 }), async (argv) => {
     const parachains = [];
     for (const config of argv.parachain) {
-        const { chain } = await (0, _1.setupWithServer)(processConfig(config));
+        const { chain } = await (0, _1.setupWithServer)(await processConfig(config));
         parachains.push(chain);
     }
     if (parachains.length > 1) {
         await (0, _1.connectParachains)(parachains);
     }
     if (argv.relaychain) {
-        const { chain: relaychain } = await (0, _1.setupWithServer)(processConfig(argv.relaychain));
+        const { chain: relaychain } = await (0, _1.setupWithServer)(await processConfig(argv.relaychain));
         for (const parachain of parachains) {
             await (0, _1.connectVertical)(relaychain, parachain);
         }

package/dist/genesis-provider.js

@@ -10,6 +10,7 @@ const util_1 = require("@polkadot/util");
 const axios_1 = __importDefault(require("axios"));
 const schema_1 = require("./schema");
 const executor_1 = require("./executor");
+const utils_1 = require("./utils");
 class GenesisProvider {
     #isConnected = false;
     stats;
@@ -32,16 +33,8 @@ class GenesisProvider {
         });
     }
     static fromUrl = async (url) => {
-        let isUrl = false;
-        try {
-            new URL(url);
-            isUrl = true;
-        }
-        catch (e) {
-            void e;
-        }
         let file;
-        if (isUrl) {
+        if ((0, utils_1.isUrl)(url)) {
             file = await axios_1.default.get(url).then((x) => x.data);
         }
         else if ((0, node_fs_1.lstatSync)(url).isFile()) {

package/dist/utils/index.d.ts

@@ -7,3 +7,4 @@ export declare function fetchKeys(getKeys: GetKeys, processKey: ProcessKey): Pro
 export declare function fetchKeysToArray(getKeys: GetKeys): Promise<StorageKey<any>[]>;
 export declare const compactHex: (value: Uint8Array) => HexString;
 export declare const getParaId: (chain: Blockchain) => Promise<import("@polkadot/types").u32>;
+export declare const isUrl: (url: string) => boolean;

package/dist/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParaId = exports.compactHex = exports.fetchKeysToArray = exports.fetchKeys = void 0;
+exports.isUrl = exports.getParaId = exports.compactHex = exports.fetchKeysToArray = exports.fetchKeys = void 0;
 const util_1 = require("@polkadot/util");
 async function fetchKeys(getKeys, processKey) {
     const processKeys = async (keys) => {
@@ -38,3 +38,13 @@ const getParaId = async (chain) => {
     return meta.registry.createType('u32', (0, util_1.hexToU8a)(raw));
 };
 exports.getParaId = getParaId;
+const isUrl = (url) => {
+    try {
+        new URL(url);
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+};
+exports.isUrl = isUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
@@ -29,7 +29,7 @@
     "dev:moonbeam": "ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=configs/moonbeam.yml"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.3.0",
+    "@acala-network/chopsticks-executor": "0.3.7",
     "@polkadot/api": "^9.11.3",
     "@polkadot/rpc-provider": "^9.11.3",
     "@polkadot/types": "^9.11.3",