@acala-network/chopsticks-core 0.9.3-1 → 0.9.3

package/dist/cjs/blockchain/block-builder.js

@@ -110,7 +110,7 @@ const newHeader = async (head, unsafeBlockHeight)=>{
             },
             ...consensus.rest
         ];
-        if (meta.query.randomness) {
+        if (meta.query.randomness?.notFirstBlock) {
             // TODO: shouldn't modify existing head
             // reset notFirstBlock so randomness will skip validation
             head.pushStorageLayer().set((0, _index.compactHex)(meta.query.randomness.notFirstBlock()), _storagelayer.StorageValueKind.Deleted);
@@ -349,14 +349,14 @@ const dryRunExtrinsic = async (head, inherents, extrinsic)=>{
             0xef
         ]);
         generic.signature.set(mockSignature);
-        _logger.defaultLogger.info({
+        logger.debug({
             call: call.toHuman()
         }, 'dry_run_call');
         return newBlock.call('BlockBuilder_apply_extrinsic', [
             generic.toHex()
         ]);
     }
-    _logger.defaultLogger.info({
+    logger.debug({
         call: registry.createType('GenericExtrinsic', (0, _util.hexToU8a)(extrinsic)).toHuman()
     }, 'dry_run_extrinsic');
     return newBlock.call('BlockBuilder_apply_extrinsic', [

package/dist/cjs/blockchain/index.js

@@ -17,8 +17,7 @@ const _block = require("./block.js");
 const _txpool = require("./txpool.js");
 const _headstate = require("./head-state.js");
 const _offchain = require("../offchain.js");
-const _index = require("../wasm-executor/index.js");
-const _index1 = require("../utils/index.js");
+const _index = require("../utils/index.js");
 const _logger = require("../logger.js");
 const _blockbuilder = require("./block-builder.js");
 function _check_private_redeclaration(obj, privateCollection) {
@@ -373,7 +372,7 @@ class Blockchain {
         const needsDispatch = meta.registry.createType('Vec<u32>', Object.keys(ump));
         const storageValues = [
             [
-                (0, _index1.compactHex)(meta.query.ump.needsDispatch()),
+                (0, _index.compactHex)(meta.query.ump.needsDispatch()),
                 needsDispatch.toHex()
             ]
         ];
@@ -385,11 +384,11 @@ class Blockchain {
                 upwardMessages.map((x)=>x.byteLength).reduce((s, i)=>s + i, 0)
             ]);
             storageValues.push([
-                (0, _index1.compactHex)(meta.query.ump.relayDispatchQueues(paraId)),
+                (0, _index.compactHex)(meta.query.ump.relayDispatchQueues(paraId)),
                 upwardMessages.toHex()
             ]);
             storageValues.push([
-                (0, _index1.compactHex)(meta.query.ump.relayDispatchQueueSize(paraId)),
+                (0, _index.compactHex)(meta.query.ump.relayDispatchQueueSize(paraId)),
                 queueSize.toHex()
             ]);
         }
@@ -415,9 +414,8 @@ class Blockchain {
         return inherents;
     }
     /**
-   * Close the db and release worker.
+   * Close the db and disconnect api.
    */ async close() {
-        await (0, _index.releaseWorker)();
         await this.api.disconnect();
         await this.db?.close();
     }

package/dist/cjs/setup.js

@@ -18,7 +18,7 @@ const setup = async (options)=>{
     let provider;
     if (options.genesis) {
         provider = options.genesis;
-    } else if (/^(https|http):\/\//.test(options.endpoint || '')) {
+    } else if (typeof options.endpoint === 'string' && /^(https|http):\/\//.test(options.endpoint || '')) {
         provider = new _rpcprovider.HttpProvider(options.endpoint);
     } else {
         provider = new _rpcprovider.WsProvider(options.endpoint, 3_000);

package/dist/cjs/wasm-executor/index.js

@@ -18,6 +18,9 @@ _export(exports, {
     decodeProof: function() {
         return decodeProof;
     },
+    destroyWorker: function() {
+        return destroyWorker;
+    },
     emptyTaskHandler: function() {
         return emptyTaskHandler;
     },
@@ -27,9 +30,6 @@ _export(exports, {
     getRuntimeVersion: function() {
         return getRuntimeVersion;
     },
-    releaseWorker: function() {
-        return releaseWorker;
-    },
     runTask: function() {
         return runTask;
     },
@@ -229,12 +229,10 @@ const getAuraSlotDuration = _lodash.default.memoize(async (wasm)=>{
     if ('Error' in result) throw new Error(result.Error);
     return (0, _util.u8aToBn)((0, _util.hexToU8a)(result.Call.result).subarray(0, 8 /* u64: 8 bytes */ )).toNumber();
 });
-const releaseWorker = async ()=>{
+const destroyWorker = async ()=>{
     if (!__executor_worker) return;
     const executor = await __executor_worker;
     executor.remote[_comlink.releaseProxy]();
-    // this delay seems to fix hanging tests
-    // https://github.com/vitest-dev/vitest/issues/3077
     await new Promise((resolve)=>setTimeout(resolve, 50));
     await executor.terminate();
     __executor_worker = undefined;

package/dist/esm/blockchain/block-builder.js

@@ -86,7 +86,7 @@ export const newHeader = async (head, unsafeBlockHeight)=>{
             },
             ...consensus.rest
         ];
-        if (meta.query.randomness) {
+        if (meta.query.randomness?.notFirstBlock) {
             // TODO: shouldn't modify existing head
             // reset notFirstBlock so randomness will skip validation
             head.pushStorageLayer().set(compactHex(meta.query.randomness.notFirstBlock()), StorageValueKind.Deleted);
@@ -325,14 +325,14 @@ export const dryRunExtrinsic = async (head, inherents, extrinsic)=>{
             0xef
         ]);
         generic.signature.set(mockSignature);
-        defaultLogger.info({
+        logger.debug({
             call: call.toHuman()
         }, 'dry_run_call');
         return newBlock.call('BlockBuilder_apply_extrinsic', [
             generic.toHex()
         ]);
     }
-    defaultLogger.info({
+    logger.debug({
         call: registry.createType('GenericExtrinsic', hexToU8a(extrinsic)).toHuman()
     }, 'dry_run_extrinsic');
     return newBlock.call('BlockBuilder_apply_extrinsic', [

package/dist/esm/blockchain/index.js

@@ -7,7 +7,6 @@ import { Block } from './block.js';
 import { TxPool } from './txpool.js';
 import { HeadState } from './head-state.js';
 import { OffchainWorker } from '../offchain.js';
-import { releaseWorker } from '../wasm-executor/index.js';
 import { compactHex } from '../utils/index.js';
 import { defaultLogger } from '../logger.js';
 import { dryRunExtrinsic, dryRunInherents } from './block-builder.js';
@@ -415,9 +414,8 @@ const logger = defaultLogger.child({
         return inherents;
     }
     /**
-   * Close the db and release worker.
+   * Close the db and disconnect api.
    */ async close() {
-        await releaseWorker();
         await this.api.disconnect();
         await this.db?.close();
     }

package/dist/esm/setup.js

@@ -8,7 +8,7 @@ export const setup = async (options)=>{
     let provider;
     if (options.genesis) {
         provider = options.genesis;
-    } else if (/^(https|http):\/\//.test(options.endpoint || '')) {
+    } else if (typeof options.endpoint === 'string' && /^(https|http):\/\//.test(options.endpoint || '')) {
         provider = new HttpProvider(options.endpoint);
     } else {
         provider = new WsProvider(options.endpoint, 3_000);

package/dist/esm/wasm-executor/index.js

@@ -145,12 +145,10 @@ export const getAuraSlotDuration = _.memoize(async (wasm)=>{
     if ('Error' in result) throw new Error(result.Error);
     return u8aToBn(hexToU8a(result.Call.result).subarray(0, 8 /* u64: 8 bytes */ )).toNumber();
 });
-export const releaseWorker = async ()=>{
+export const destroyWorker = async ()=>{
     if (!__executor_worker) return;
     const executor = await __executor_worker;
     executor.remote[Comlink.releaseProxy]();
-    // this delay seems to fix hanging tests
-    // https://github.com/vitest-dev/vitest/issues/3077
     await new Promise((resolve)=>setTimeout(resolve, 50));
     await executor.terminate();
     __executor_worker = undefined;

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

@@ -166,7 +166,7 @@ export declare class Blockchain {
      */
     getInherents(): Promise<HexString[]>;
     /**
-     * Close the db and release worker.
+     * Close the db and disconnect api.
      */
     close(): Promise<void>;
 }

package/dist/types/setup.d.ts

@@ -5,7 +5,7 @@ import { BuildBlockMode } from './blockchain/txpool.js';
 import { Database } from './database.js';
 import { GenesisProvider } from './genesis-provider.js';
 export type SetupOptions = {
-    endpoint?: string;
+    endpoint?: string | string[];
     block?: string | number | null;
     genesis?: GenesisProvider;
     buildBlockMode?: BuildBlockMode;

package/dist/types/wasm-executor/index.d.ts

@@ -71,4 +71,4 @@ export declare const emptyTaskHandler: {
     offchainSubmitTransaction: (_tx: HexString) => Promise<never>;
 };
 export declare const getAuraSlotDuration: ((wasm: HexString) => Promise<number>) & _.MemoizedFunction;
-export declare const releaseWorker: () => Promise<void>;
+export declare const destroyWorker: () => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.9.3-1",
+  "version": "0.9.3",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -13,7 +13,7 @@
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.9.3-1",
+    "@acala-network/chopsticks-executor": "0.9.3",
     "@polkadot/rpc-provider": "^10.10.1",
     "@polkadot/types": "^10.10.1",
     "@polkadot/types-codec": "^10.10.1",
@@ -34,7 +34,7 @@
     "@swc/core": "^1.3.99",
     "@types/lodash": "^4.14.202",
     "typescript": "^5.2.2",
-    "vitest": "^0.34.6"
+    "vitest": "^1.0.0-beta.5"
   },
   "files": [
     "dist/esm/**",