@acala-network/chopsticks-core 1.0.2 → 1.0.4

package/dist/cjs/api.d.ts

@@ -29,9 +29,10 @@ export declare class Api {
     getSystemChain(): Promise<string>;
     getBlockHash(blockNumber?: number): Promise<`0x${string}` | null>;
     getHeader(hash?: string): Promise<Header | null>;
+    getFinalizedHead(): Promise<string>;
     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[]>;
+    getKeysPaged(prefix: string, pageSize: number, startKey: string, hash?: string): Promise<`0x${string}`[]>;
     getStorageBatch(prefix: HexString, keys: HexString[], hash?: HexString): Promise<[`0x${string}`, `0x${string}` | null][]>;
     subscribeRemoteNewHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
     subscribeRemoteFinalizedHeads(cb: ProviderInterfaceCallback): Promise<string | number>;

package/dist/cjs/api.js

@@ -129,6 +129,9 @@ class Api {
             hash
         ] : [], !!hash);
     }
+    async getFinalizedHead() {
+        return this.send('chain_getFinalizedHead', []);
+    }
     async getBlock(hash) {
         return this.send('chain_getBlock', hash ? [
             hash

package/dist/cjs/blockchain/storage-layer.d.ts

@@ -1,3 +1,4 @@
+import type { HexString } from '@polkadot/util/types';
 import type { Api } from '../api.js';
 import type { Database } from '../database.js';
 export declare enum StorageValueKind {
@@ -21,7 +22,7 @@ export interface StorageLayerProvider {
 }
 export declare class RemoteStorageLayer implements StorageLayerProvider {
     #private;
-    constructor(api: Api, at: string, db: Database | undefined);
+    constructor(api: Api, at: HexString, db: Database | undefined);
     get(key: string, _cache: boolean): Promise<StorageValue>;
     findNextKey(prefix: string, startKey: string, _knownBest?: string): Promise<string | undefined>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string): Promise<string[]>;

package/dist/cjs/blockchain/storage-layer.js

@@ -156,12 +156,23 @@ class RemoteStorageLayer {
                 break;
             }
             if (_class_private_field_get(this, _db)) {
-                // batch fetch storage values and save to db, they may be used later
-                _class_private_field_get(this, _api).getStorageBatch(prefix, batch, _class_private_field_get(this, _at)).then((storage)=>{
-                    for (const [key, value] of storage){
-                        _class_private_field_get(this, _db)?.saveStorage(_class_private_field_get(this, _at), key, value);
+                // filter out keys that are not in the db]
+                const newBatch = [];
+                for (const key of batch){
+                    const res = await _class_private_field_get(this, _db).queryStorage(_class_private_field_get(this, _at), key);
+                    if (res) {
+                        continue;
                     }
-                });
+                    newBatch.push(key);
+                }
+                if (newBatch.length > 0) {
+                    // batch fetch storage values and save to db, they may be used later
+                    _class_private_field_get(this, _api).getStorageBatch(prefix, newBatch, _class_private_field_get(this, _at)).then((storage)=>{
+                        for (const [key, value] of storage){
+                            _class_private_field_get(this, _db)?.saveStorage(_class_private_field_get(this, _at), key, value);
+                        }
+                    });
+                }
             }
         }
         return keysPaged;

package/dist/cjs/blockchain/txpool.js

@@ -326,6 +326,14 @@ async function buildBlockIfNeeded() {
     _class_private_field_set(this, _isBuilding, true);
     try {
         await _class_private_method_get(this, _buildBlock, buildBlock).call(this);
+    } catch (error) {
+        logger.error({
+            error
+        }, 'build block failed');
+        for (const { deferred } of _class_private_field_get(this, _pendingBlocks)){
+            deferred.reject(error);
+        }
+        _class_private_field_get(this, _pendingBlocks).length = 0;
     } finally{
         _class_private_field_set(this, _isBuilding, false);
     }

package/dist/cjs/genesis-provider.js

@@ -191,6 +191,7 @@ class GenesisProvider {
                 case 'chain_getBlock':
                     return this.getBlock();
                 case 'chain_getBlockHash':
+                case 'chain_getFinalizedHead':
                     return this.blockHash;
                 case 'state_getKeysPaged':
                 case 'state_getKeysPagedAt':

package/dist/cjs/logger.js

@@ -45,10 +45,13 @@ const innerTruncate = (level = 0)=>(val)=>{
         }
         switch(typeof val){
             case 'string':
-                if (val.length > 66 && !verboseLog) {
-                    return `${val.slice(0, 34)}…${val.slice(-32)}`;
+                {
+                    const maxLength = verboseLog ? 10 * 1024 : 66;
+                    if (val.length > maxLength) {
+                        return `${val.slice(0, 34)}…${val.slice(-32)}`;
+                    }
+                    return val;
                 }
-                return val;
             case 'object':
                 if (Array.isArray(val)) {
                     return val.map(innerTruncate(level + 1));

package/dist/cjs/setup.d.ts

@@ -18,6 +18,7 @@ export type SetupOptions = {
     offchainWorker?: boolean;
     maxMemoryBlockCount?: number;
     processQueuedMessages?: boolean;
+    rpcTimeout?: number;
     hooks?: {
         apiFetching?: () => void;
     };
@@ -37,6 +38,7 @@ export declare const processOptions: (options: SetupOptions) => Promise<{
     offchainWorker?: boolean;
     maxMemoryBlockCount?: number;
     processQueuedMessages?: boolean;
+    rpcTimeout?: number;
     hooks?: {
         apiFetching?: () => void;
     };

package/dist/cjs/setup.js

@@ -30,7 +30,7 @@ const processOptions = async (options)=>{
     } 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);
+        provider = new _rpcprovider.WsProvider(options.endpoint, 3_000, undefined, options.rpcTimeout);
     }
     const api = new _api.Api(provider);
     // setup api hooks
@@ -38,7 +38,7 @@ const processOptions = async (options)=>{
     await api.isReady;
     let blockHash;
     if (options.block == null) {
-        blockHash = await api.getBlockHash().then((hash)=>{
+        blockHash = await api.getFinalizedHead().then((hash)=>{
             if (!hash) {
                 // should not happen, but just in case
                 throw new Error('Cannot find block hash');

package/dist/cjs/utils/index.d.ts

@@ -20,7 +20,7 @@ export type Deferred<T> = {
 export declare function defer<T>(): Deferred<T>;
 export declare const CHILD_PREFIX_LENGTH: number;
 export declare const PREFIX_LENGTH = 66;
-export declare const prefixedChildKey: (prefix: HexString, key: HexString) => string;
+export declare const prefixedChildKey: (prefix: HexString, key: HexString) => HexString;
 export declare const isPrefixedChildKey: (key: HexString) => boolean;
 export declare const splitChildKey: (key: HexString) => [`0x${string}`, `0x${string}`] | never[];
 export declare const stripChildPrefix: (key: HexString) => `0x${string}`;

package/dist/esm/api.d.ts

@@ -29,9 +29,10 @@ export declare class Api {
     getSystemChain(): Promise<string>;
     getBlockHash(blockNumber?: number): Promise<`0x${string}` | null>;
     getHeader(hash?: string): Promise<Header | null>;
+    getFinalizedHead(): Promise<string>;
     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[]>;
+    getKeysPaged(prefix: string, pageSize: number, startKey: string, hash?: string): Promise<`0x${string}`[]>;
     getStorageBatch(prefix: HexString, keys: HexString[], hash?: HexString): Promise<[`0x${string}`, `0x${string}` | null][]>;
     subscribeRemoteNewHeads(cb: ProviderInterfaceCallback): Promise<string | number>;
     subscribeRemoteFinalizedHeads(cb: ProviderInterfaceCallback): Promise<string | number>;

package/dist/esm/api.js

@@ -81,6 +81,9 @@ import { prefixedChildKey, splitChildKey, stripChildPrefix } from './utils/index
             hash
         ] : [], !!hash);
     }
+    async getFinalizedHead() {
+        return this.send('chain_getFinalizedHead', []);
+    }
     async getBlock(hash) {
         return this.send('chain_getBlock', hash ? [
             hash

package/dist/esm/blockchain/storage-layer.d.ts

@@ -1,3 +1,4 @@
+import type { HexString } from '@polkadot/util/types';
 import type { Api } from '../api.js';
 import type { Database } from '../database.js';
 export declare enum StorageValueKind {
@@ -21,7 +22,7 @@ export interface StorageLayerProvider {
 }
 export declare class RemoteStorageLayer implements StorageLayerProvider {
     #private;
-    constructor(api: Api, at: string, db: Database | undefined);
+    constructor(api: Api, at: HexString, db: Database | undefined);
     get(key: string, _cache: boolean): Promise<StorageValue>;
     findNextKey(prefix: string, startKey: string, _knownBest?: string): Promise<string | undefined>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string): Promise<string[]>;

package/dist/esm/blockchain/storage-layer.js

@@ -89,12 +89,23 @@ export class RemoteStorageLayer {
                 break;
             }
             if (this.#db) {
-                // batch fetch storage values and save to db, they may be used later
-                this.#api.getStorageBatch(prefix, batch, this.#at).then((storage)=>{
-                    for (const [key, value] of storage){
-                        this.#db?.saveStorage(this.#at, key, value);
+                // filter out keys that are not in the db]
+                const newBatch = [];
+                for (const key of batch){
+                    const res = await this.#db.queryStorage(this.#at, key);
+                    if (res) {
+                        continue;
                     }
-                });
+                    newBatch.push(key);
+                }
+                if (newBatch.length > 0) {
+                    // batch fetch storage values and save to db, they may be used later
+                    this.#api.getStorageBatch(prefix, newBatch, this.#at).then((storage)=>{
+                        for (const [key, value] of storage){
+                            this.#db?.saveStorage(this.#at, key, value);
+                        }
+                    });
+                }
             }
         }
         return keysPaged;

package/dist/esm/blockchain/txpool.js

@@ -201,6 +201,14 @@ export class TxPool {
         this.#isBuilding = true;
         try {
             await this.#buildBlock();
+        } catch (error) {
+            logger.error({
+                error
+            }, 'build block failed');
+            for (const { deferred } of this.#pendingBlocks){
+                deferred.reject(error);
+            }
+            this.#pendingBlocks.length = 0;
         } finally{
             this.#isBuilding = false;
         }

package/dist/esm/genesis-provider.js

@@ -127,6 +127,7 @@ import { calculateStateRoot, emptyTaskHandler } from './wasm-executor/index.js';
             case 'chain_getBlock':
                 return this.getBlock();
             case 'chain_getBlockHash':
+            case 'chain_getFinalizedHead':
                 return this.blockHash;
             case 'state_getKeysPaged':
             case 'state_getKeysPagedAt':

package/dist/esm/logger.js

@@ -24,10 +24,13 @@ const innerTruncate = (level = 0)=>(val)=>{
         }
         switch(typeof val){
             case 'string':
-                if (val.length > 66 && !verboseLog) {
-                    return `${val.slice(0, 34)}…${val.slice(-32)}`;
+                {
+                    const maxLength = verboseLog ? 10 * 1024 : 66;
+                    if (val.length > maxLength) {
+                        return `${val.slice(0, 34)}…${val.slice(-32)}`;
+                    }
+                    return val;
                 }
-                return val;
             case 'object':
                 if (Array.isArray(val)) {
                     return val.map(innerTruncate(level + 1));

package/dist/esm/setup.d.ts

@@ -18,6 +18,7 @@ export type SetupOptions = {
     offchainWorker?: boolean;
     maxMemoryBlockCount?: number;
     processQueuedMessages?: boolean;
+    rpcTimeout?: number;
     hooks?: {
         apiFetching?: () => void;
     };
@@ -37,6 +38,7 @@ export declare const processOptions: (options: SetupOptions) => Promise<{
     offchainWorker?: boolean;
     maxMemoryBlockCount?: number;
     processQueuedMessages?: boolean;
+    rpcTimeout?: number;
     hooks?: {
         apiFetching?: () => void;
     };

package/dist/esm/setup.js

@@ -12,7 +12,7 @@ export const processOptions = async (options)=>{
     } else if (typeof options.endpoint === 'string' && /^(https|http):\/\//.test(options.endpoint || '')) {
         provider = new HttpProvider(options.endpoint);
     } else {
-        provider = new WsProvider(options.endpoint, 3_000);
+        provider = new WsProvider(options.endpoint, 3_000, undefined, options.rpcTimeout);
     }
     const api = new Api(provider);
     // setup api hooks
@@ -20,7 +20,7 @@ export const processOptions = async (options)=>{
     await api.isReady;
     let blockHash;
     if (options.block == null) {
-        blockHash = await api.getBlockHash().then((hash)=>{
+        blockHash = await api.getFinalizedHead().then((hash)=>{
             if (!hash) {
                 // should not happen, but just in case
                 throw new Error('Cannot find block hash');

package/dist/esm/utils/index.d.ts

@@ -20,7 +20,7 @@ export type Deferred<T> = {
 export declare function defer<T>(): Deferred<T>;
 export declare const CHILD_PREFIX_LENGTH: number;
 export declare const PREFIX_LENGTH = 66;
-export declare const prefixedChildKey: (prefix: HexString, key: HexString) => string;
+export declare const prefixedChildKey: (prefix: HexString, key: HexString) => HexString;
 export declare const isPrefixedChildKey: (key: HexString) => boolean;
 export declare const splitChildKey: (key: HexString) => [`0x${string}`, `0x${string}`] | never[];
 export declare const stripChildPrefix: (key: HexString) => `0x${string}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -14,28 +14,28 @@
     "depcheck": "npx depcheck"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "1.0.2",
-    "@polkadot/rpc-provider": "^15.0",
-    "@polkadot/types": "^15.0",
-    "@polkadot/types-codec": "^15.0",
-    "@polkadot/types-known": "^15.0",
-    "@polkadot/util": "^13.2",
-    "@polkadot/util-crypto": "^13.2",
+    "@acala-network/chopsticks-executor": "1.0.4",
+    "@polkadot/rpc-provider": "^15.7.1",
+    "@polkadot/types": "^15.7.1",
+    "@polkadot/types-codec": "^15.7.1",
+    "@polkadot/types-known": "^15.7.1",
+    "@polkadot/util": "^13.4.3",
+    "@polkadot/util-crypto": "^13.4.3",
     "comlink": "^4.4.2",
     "eventemitter3": "^5.0.1",
     "lodash": "^4.17.21",
     "lru-cache": "^11.0.2",
-    "pino": "^9.5.0",
+    "pino": "^9.6.0",
     "pino-pretty": "^13.0.0",
-    "rxjs": "^7.8.1",
-    "zod": "^3.24.1"
+    "rxjs": "^7.8.2",
+    "zod": "^3.24.2"
   },
   "devDependencies": {
-    "@swc/cli": "0.5.2",
-    "@swc/core": "^1.10.1",
-    "@types/lodash": "^4.17.13",
-    "typescript": "^5.7.2",
-    "vitest": "^2.1.8"
+    "@swc/cli": "0.6.0",
+    "@swc/core": "^1.11.1",
+    "@types/lodash": "^4.17.15",
+    "typescript": "^5.7.3",
+    "vitest": "^3.0.7"
   },
   "files": [
     "dist/esm/**",