@acala-network/chopsticks-core 1.0.3 → 1.0.5-1

package/dist/cjs/api.d.ts

@@ -32,7 +32,7 @@ export declare class Api {
     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/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/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

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/cjs/wasm-executor/index.js

@@ -135,20 +135,23 @@ const createProof = async (nodes, updates)=>{
         nodes: newNodes
     };
 };
+let nextTaskId = 0;
 const runTask = async (task, callback = emptyTaskHandler)=>{
+    const taskId = nextTaskId++;
     const task2 = {
         ...task,
+        id: taskId,
         storageProofSize: task.storageProofSize ?? 0
     };
     const worker = await getWorker();
-    logger.trace((0, _logger.truncate)(task2), 'taskRun');
+    logger.trace((0, _logger.truncate)(task2), `runTask #${taskId}`);
     const response = await worker.remote.runTask(task2, _comlink.proxy(callback));
     if ('Call' in response) {
-        logger.trace((0, _logger.truncate)(response.Call), 'taskResponse');
+        logger.trace((0, _logger.truncate)(response.Call), `taskResponse #${taskId}`);
     } else {
         logger.trace({
             response
-        }, 'taskResponse');
+        }, `taskResponse ${taskId}`);
     }
     return response;
 };

package/dist/esm/api.d.ts

@@ -32,7 +32,7 @@ export declare class Api {
     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/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/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

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/dist/esm/wasm-executor/index.js

@@ -48,20 +48,23 @@ export const createProof = async (nodes, updates)=>{
         nodes: newNodes
     };
 };
+let nextTaskId = 0;
 export const runTask = async (task, callback = emptyTaskHandler)=>{
+    const taskId = nextTaskId++;
     const task2 = {
         ...task,
+        id: taskId,
         storageProofSize: task.storageProofSize ?? 0
     };
     const worker = await getWorker();
-    logger.trace(truncate(task2), 'taskRun');
+    logger.trace(truncate(task2), `runTask #${taskId}`);
     const response = await worker.remote.runTask(task2, Comlink.proxy(callback));
     if ('Call' in response) {
-        logger.trace(truncate(response.Call), 'taskResponse');
+        logger.trace(truncate(response.Call), `taskResponse #${taskId}`);
     } else {
         logger.trace({
             response
-        }, 'taskResponse');
+        }, `taskResponse ${taskId}`);
     }
     return response;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "1.0.3",
+  "version": "1.0.5-1",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -14,7 +14,7 @@
     "depcheck": "npx depcheck"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "1.0.3",
+    "@acala-network/chopsticks-executor": "1.0.5-1",
     "@polkadot/rpc-provider": "^15.7.1",
     "@polkadot/types": "^15.7.1",
     "@polkadot/types-codec": "^15.7.1",