@acala-network/chopsticks-core 0.9.1-1 → 0.9.1-2

package/dist/cjs/api.js

@@ -124,6 +124,18 @@ class Api {
             return __classPrivateFieldGet(this, _Api_provider, "f").send('state_getKeysPaged', params, !!hash);
         }
     }
+    async subscribeRemoteNewHeads(cb) {
+        if (!__classPrivateFieldGet(this, _Api_provider, "f").hasSubscriptions) {
+            throw new Error('subscribeRemoteNewHeads only works with subscriptions');
+        }
+        return __classPrivateFieldGet(this, _Api_provider, "f").subscribe('chain_newHead', 'chain_subscribeNewHeads', [], cb);
+    }
+    async subscribeRemoteFinalizedHeads(cb) {
+        if (!__classPrivateFieldGet(this, _Api_provider, "f").hasSubscriptions) {
+            throw new Error('subscribeRemoteFinalizedHeads only works with subscriptions');
+        }
+        return __classPrivateFieldGet(this, _Api_provider, "f").subscribe('chain_finalizedHead', 'chain_subscribeFinalizedHeads', [], cb);
+    }
 }
 exports.Api = Api;
 _Api_provider = new WeakMap(), _Api_ready = new WeakMap(), _Api_chain = new WeakMap(), _Api_chainProperties = new WeakMap();

package/dist/cjs/blockchain/txpool.js

@@ -16,7 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _TxPool_instances, _TxPool_chain, _TxPool_pool, _TxPool_ump, _TxPool_dmp, _TxPool_hrmp, _TxPool_mode, _TxPool_inherentProvider, _TxPool_pendingBlocks, _TxPool_isBuilding, _TxPool_getSigner, _TxPool_maybeBuildBlock, _TxPool_batchBuildBlock, _TxPool_buildBlockIfNeeded, _TxPool_buildBlock;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxPool = exports.BuildBlockMode = exports.APPLY_EXTRINSIC_ERROR = void 0;
-const eventemitter3_1 = require("eventemitter3");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../utils");
 const block_builder_1 = require("./block-builder");
@@ -43,7 +43,7 @@ class TxPool {
         _TxPool_mode.set(this, void 0);
         _TxPool_inherentProvider.set(this, void 0);
         _TxPool_pendingBlocks.set(this, []);
-        this.event = new eventemitter3_1.EventEmitter();
+        this.event = new eventemitter3_1.default();
         _TxPool_isBuilding.set(this, false);
         _TxPool_batchBuildBlock.set(this, lodash_1.default.debounce(this.buildBlock, 100, { maxWait: 1000 }));
         __classPrivateFieldSet(this, _TxPool_chain, chain, "f");

package/dist/cjs/chopsticks-provider.js

@@ -10,10 +10,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var _a, _ChopsticksProvider_isConnected, _ChopsticksProvider_eventemitter, _ChopsticksProvider_isReadyPromise, _ChopsticksProvider_subscriptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChopsticksProvider = void 0;
-const eventemitter3_1 = require("eventemitter3");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const rpc_1 = require("./rpc");
 const logger_1 = require("./logger");
 const setup_1 = require("./setup");
@@ -113,7 +116,7 @@ class ChopsticksProvider {
                 throw e;
             }
         };
-        __classPrivateFieldSet(this, _ChopsticksProvider_eventemitter, new eventemitter3_1.EventEmitter(), "f");
+        __classPrivateFieldSet(this, _ChopsticksProvider_eventemitter, new eventemitter3_1.default(), "f");
         __classPrivateFieldSet(this, _ChopsticksProvider_isReadyPromise, new Promise((resolve, reject) => {
             __classPrivateFieldGet(this, _ChopsticksProvider_eventemitter, "f").once('connected', resolve);
             __classPrivateFieldGet(this, _ChopsticksProvider_eventemitter, "f").once('error', reject);

package/dist/cjs/genesis-provider.js

@@ -10,10 +10,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var _GenesisProvider_isConnected, _GenesisProvider_eventemitter, _GenesisProvider_isReadyPromise, _GenesisProvider_genesis, _GenesisProvider_stateRoot;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenesisProvider = void 0;
-const eventemitter3_1 = require("eventemitter3");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const schema_1 = require("./schema");
 const wasm_executor_1 = require("./wasm-executor");
 /**
@@ -104,7 +107,7 @@ class GenesisProvider {
             accu.push(item);
             return accu;
         }, []), 1), "f");
-        __classPrivateFieldSet(this, _GenesisProvider_eventemitter, new eventemitter3_1.EventEmitter(), "f");
+        __classPrivateFieldSet(this, _GenesisProvider_eventemitter, new eventemitter3_1.default(), "f");
         __classPrivateFieldSet(this, _GenesisProvider_isReadyPromise, new Promise((resolve, reject) => {
             __classPrivateFieldGet(this, _GenesisProvider_eventemitter, "f").once('connected', () => {
                 resolve();

package/dist/cjs/wasm-executor/node-worker.js

@@ -7,10 +7,41 @@ exports.startWorker = void 0;
 const comlink_1 = require("comlink");
 const node_adapter_js_1 = __importDefault(require("comlink/dist/umd/node-adapter.js"));
 const node_worker_threads_1 = __importDefault(require("node:worker_threads"));
-const node_url_1 = __importDefault(require("node:url"));
 const startWorker = async () => {
-    const worker = new node_worker_threads_1.default.Worker(node_url_1.default.resolve(__filename, 'node-wasm-executor.mjs'), {
+    const workerCode = `
+    const Comlink = require('comlink')
+    const pkg = require('@acala-network/chopsticks-executor')
+    const { parentPort } = require('node:worker_threads')
+    const nodeEndpoint = require('comlink/dist/umd/node-adapter.js')
+
+    const getRuntimeVersion = async (code) => {
+      return pkg.get_runtime_version(code)
+    }
+
+    // trie_version: 0 for old trie, 1 for new trie
+    const calculateStateRoot = async (entries, trie_version) => {
+      return pkg.calculate_state_root(entries, trie_version)
+    }
+
+    const decodeProof = async (trieRootHash, keys, nodes) => {
+      return pkg.decode_proof(trieRootHash, keys, nodes)
+    }
+
+    const createProof = async (nodes, entries) => {
+      return pkg.create_proof(nodes, entries)
+    }
+
+    const runTask = async (task, callback) => {
+      return pkg.run_task(task, callback, process.env.RUST_LOG)
+    }
+
+    const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }
+
+    Comlink.expose(wasmExecutor, nodeEndpoint(parentPort))
+    `;
+    const worker = new node_worker_threads_1.default.Worker(workerCode, {
         name: 'chopsticks-wasm-executor',
+        eval: true,
     });
     return {
         remote: (0, comlink_1.wrap)((0, node_adapter_js_1.default)(worker)),

package/dist/esm/api.js

@@ -121,5 +121,17 @@ export class Api {
             return __classPrivateFieldGet(this, _Api_provider, "f").send('state_getKeysPaged', params, !!hash);
         }
     }
+    async subscribeRemoteNewHeads(cb) {
+        if (!__classPrivateFieldGet(this, _Api_provider, "f").hasSubscriptions) {
+            throw new Error('subscribeRemoteNewHeads only works with subscriptions');
+        }
+        return __classPrivateFieldGet(this, _Api_provider, "f").subscribe('chain_newHead', 'chain_subscribeNewHeads', [], cb);
+    }
+    async subscribeRemoteFinalizedHeads(cb) {
+        if (!__classPrivateFieldGet(this, _Api_provider, "f").hasSubscriptions) {
+            throw new Error('subscribeRemoteFinalizedHeads only works with subscriptions');
+        }
+        return __classPrivateFieldGet(this, _Api_provider, "f").subscribe('chain_finalizedHead', 'chain_subscribeFinalizedHeads', [], cb);
+    }
 }
 _Api_provider = new WeakMap(), _Api_ready = new WeakMap(), _Api_chain = new WeakMap(), _Api_chainProperties = new WeakMap();

package/dist/esm/blockchain/txpool.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TxPool_instances, _TxPool_chain, _TxPool_pool, _TxPool_ump, _TxPool_dmp, _TxPool_hrmp, _TxPool_mode, _TxPool_inherentProvider, _TxPool_pendingBlocks, _TxPool_isBuilding, _TxPool_getSigner, _TxPool_maybeBuildBlock, _TxPool_batchBuildBlock, _TxPool_buildBlockIfNeeded, _TxPool_buildBlock;
-import { EventEmitter } from 'eventemitter3';
+import { default as EventEmitter } from 'eventemitter3';
 import _ from 'lodash';
 import { defer } from '../utils';
 import { buildBlock } from './block-builder';

package/dist/esm/chopsticks-provider.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _a, _ChopsticksProvider_isConnected, _ChopsticksProvider_eventemitter, _ChopsticksProvider_isReadyPromise, _ChopsticksProvider_subscriptions;
-import { EventEmitter } from 'eventemitter3';
+import { default as EventEmitter } from 'eventemitter3';
 import { allHandlers } from './rpc';
 import { defaultLogger } from './logger';
 import { setup } from './setup';

package/dist/esm/genesis-provider.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _GenesisProvider_isConnected, _GenesisProvider_eventemitter, _GenesisProvider_isReadyPromise, _GenesisProvider_genesis, _GenesisProvider_stateRoot;
-import { EventEmitter } from 'eventemitter3';
+import { default as EventEmitter } from 'eventemitter3';
 import { genesisSchema } from './schema';
 import { calculateStateRoot, emptyTaskHandler } from './wasm-executor';
 /**

package/dist/esm/package.json

@@ -0,0 +1 @@
+{"type": "module"}

package/dist/esm/wasm-executor/node-worker.js

@@ -1,10 +1,41 @@
 import { wrap } from 'comlink';
 import nodeEndpoint from 'comlink/dist/umd/node-adapter.js';
 import threads from 'node:worker_threads';
-import url from 'node:url';
 export const startWorker = async () => {
-    const worker = new threads.Worker(url.resolve(__filename, 'node-wasm-executor.mjs'), {
+    const workerCode = `
+    const Comlink = require('comlink')
+    const pkg = require('@acala-network/chopsticks-executor')
+    const { parentPort } = require('node:worker_threads')
+    const nodeEndpoint = require('comlink/dist/umd/node-adapter.js')
+
+    const getRuntimeVersion = async (code) => {
+      return pkg.get_runtime_version(code)
+    }
+
+    // trie_version: 0 for old trie, 1 for new trie
+    const calculateStateRoot = async (entries, trie_version) => {
+      return pkg.calculate_state_root(entries, trie_version)
+    }
+
+    const decodeProof = async (trieRootHash, keys, nodes) => {
+      return pkg.decode_proof(trieRootHash, keys, nodes)
+    }
+
+    const createProof = async (nodes, entries) => {
+      return pkg.create_proof(nodes, entries)
+    }
+
+    const runTask = async (task, callback) => {
+      return pkg.run_task(task, callback, process.env.RUST_LOG)
+    }
+
+    const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }
+
+    Comlink.expose(wasmExecutor, nodeEndpoint(parentPort))
+    `;
+    const worker = new threads.Worker(workerCode, {
         name: 'chopsticks-wasm-executor',
+        eval: true,
     });
     return {
         remote: wrap(nodeEndpoint(worker)),

package/dist/types/api.d.ts

@@ -1,6 +1,6 @@
 import { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
 import { HexString } from '@polkadot/util/types';
-import { ProviderInterface } from '@polkadot/rpc-provider/types';
+import { ProviderInterface, ProviderInterfaceCallback } from '@polkadot/rpc-provider/types';
 export type ChainProperties = {
     ss58Format?: number;
     tokenDecimals?: number[];
@@ -50,5 +50,7 @@ export declare class Api {
     getBlock(hash?: string): Promise<SignedBlock | null>;
     getStorage(key: string, hash?: string): Promise<`0x${string}` | null>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string, hash?: string): Promise<string[]>;
+    subscribeRemoteNewHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
+    subscribeRemoteFinalizedHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
 }
 export {};

package/dist/types/blockchain/txpool.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'eventemitter3';
+import { default as EventEmitter } from 'eventemitter3';
 import { HexString } from '@polkadot/util/types';
 import { Blockchain } from '.';
 import { InherentProvider } from './inherent';

package/dist/types/wasm-executor/browser-worker.d.ts

@@ -1,5 +1,4 @@
-import type { WasmExecutor } from '.';
-export declare const startWorker: () => Promise<{
-    remote: import("comlink").Remote<WasmExecutor>;
+export declare const startWorker: <T>() => Promise<{
+    remote: import("comlink").Remote<T>;
     terminate: () => Promise<void>;
 }>;

package/dist/types/wasm-executor/node-worker.d.ts

@@ -1,5 +1,4 @@
-import type { WasmExecutor } from '.';
-export declare const startWorker: () => Promise<{
-    remote: import("comlink").Remote<WasmExecutor>;
+export declare const startWorker: <T>() => Promise<{
+    remote: import("comlink").Remote<T>;
     terminate: () => Promise<void>;
 }>;

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.9.1-1",
+  "version": "0.9.1-2",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "scripts": {
     "clean": "rm -rf dist",
-    "build": "yarn clean && tsc -p ./tsconfig.json && tsc -p ./tsconfig.esm.json && yarn copyfiles",
+    "build": "yarn clean && tsc -p ./tsconfig.json && tsc -p ./tsconfig.esm.json && echo '{\"type\": \"module\"}' > ./dist/esm/package.json && yarn copyfiles",
     "copyfiles": "cp -r src/wasm-executor/*.mjs dist/cjs/wasm-executor/ && cp -r src/wasm-executor/*.mjs dist/esm/wasm-executor/",
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.9.1-1",
+    "@acala-network/chopsticks-executor": "0.9.1-2",
     "@polkadot/api": "^10.10.1",
     "@polkadot/util-crypto": "^12.5.1",
     "comlink": "^4.4.1",
@@ -45,12 +45,11 @@
       "import": "./dist/esm/index.js",
       "default": "./dist/esm/index.js"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./package.esm.json": "./dist/esm/package.json"
   },
   "browser": {
-    "./dist/cjs/wasm-executor/node-wasm-executor.mjs": "./dist/cjs/wasm-executor/browser-wasm-executor.mjs",
     "./dist/cjs/wasm-executor/node-worker.js": "./dist/cjs/wasm-executor/browser-worker.js",
-    "./dist/esm/wasm-executor/node-wasm-executor.mjs": "./dist/esm/wasm-executor/browser-wasm-executor.mjs",
     "./dist/esm/wasm-executor/node-worker.js": "./dist/esm/wasm-executor/browser-worker.js"
   }
 }

package/dist/cjs/wasm-executor/node-wasm-executor.mjs

@@ -1,29 +0,0 @@
-import * as Comlink from 'comlink'
-import * as pkg from '@acala-network/chopsticks-executor'
-import { parentPort } from 'node:worker_threads'
-import nodeEndpoint from 'comlink/dist/umd/node-adapter.js'
-
-const getRuntimeVersion = async (code) => {
-	return pkg.get_runtime_version(code)
-}
-
-// trie_version: 0 for old trie, 1 for new trie
-const calculateStateRoot = async (entries, trie_version) => {
-	return pkg.calculate_state_root(entries, trie_version)
-}
-
-const decodeProof = async (trieRootHash, keys, nodes) => {
-	return pkg.decode_proof(trieRootHash, keys, nodes)
-}
-
-const createProof = async (nodes, entries) => {
-	return pkg.create_proof(nodes, entries)
-}
-
-const runTask = async (task, callback) => {
-	return pkg.run_task(task, callback, process.env.RUST_LOG)
-}
-
-const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }
-
-Comlink.expose(wasmExecutor, nodeEndpoint(parentPort))

package/dist/esm/wasm-executor/node-wasm-executor.mjs

@@ -1,29 +0,0 @@
-import * as Comlink from 'comlink'
-import * as pkg from '@acala-network/chopsticks-executor'
-import { parentPort } from 'node:worker_threads'
-import nodeEndpoint from 'comlink/dist/umd/node-adapter.js'
-
-const getRuntimeVersion = async (code) => {
-	return pkg.get_runtime_version(code)
-}
-
-// trie_version: 0 for old trie, 1 for new trie
-const calculateStateRoot = async (entries, trie_version) => {
-	return pkg.calculate_state_root(entries, trie_version)
-}
-
-const decodeProof = async (trieRootHash, keys, nodes) => {
-	return pkg.decode_proof(trieRootHash, keys, nodes)
-}
-
-const createProof = async (nodes, entries) => {
-	return pkg.create_proof(nodes, entries)
-}
-
-const runTask = async (task, callback) => {
-	return pkg.run_task(task, callback, process.env.RUST_LOG)
-}
-
-const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }
-
-Comlink.expose(wasmExecutor, nodeEndpoint(parentPort))