@acala-network/chopsticks-core 1.0.0 → 1.0.1

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

@@ -10,25 +10,20 @@ export interface StorageLayerProvider {
      * Get the value of a storage key.
      */
     get(key: string, cache: boolean): Promise<StorageValue>;
-    /**
-     * Fold the storage layer into another layer.
-     */
-    foldInto(into: StorageLayer): Promise<StorageLayerProvider | undefined>;
-    /**
-     * Fold the storage layer into the parent if it exists.
-     */
-    fold(): Promise<void>;
     /**
      * Get paged storage keys.
      */
     getKeysPaged(prefix: string, pageSize: number, startKey: string): Promise<string[]>;
+    /**
+     * Find next storage key.
+     */
+    findNextKey(prefix: string, startKey: string, knownBest?: string): Promise<string | undefined>;
 }
 export declare class RemoteStorageLayer implements StorageLayerProvider {
     #private;
     constructor(api: Api, at: string, db: Database | undefined);
     get(key: string, _cache: boolean): Promise<StorageValue>;
-    foldInto(_into: StorageLayer): Promise<StorageLayerProvider>;
-    fold(): Promise<void>;
+    findNextKey(prefix: string, startKey: string, _knownBest?: string): Promise<string | undefined>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string): Promise<string[]>;
 }
 export declare class StorageLayer implements StorageLayerProvider {
@@ -37,8 +32,7 @@ export declare class StorageLayer implements StorageLayerProvider {
     get(key: string, cache: boolean): Promise<StorageValue | undefined>;
     set(key: string, value: StorageValue): void;
     setAll(values: Record<string, StorageValue | null> | [string, StorageValue | null][]): void;
-    foldInto(into: StorageLayer): Promise<StorageLayerProvider | undefined>;
-    fold(): Promise<void>;
+    findNextKey(prefix: string, startKey: string, knownBest?: string): Promise<string | undefined>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string): Promise<string[]>;
     /**
      * Merge the storage layer into the given object, can be used to get sotrage diff.

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

@@ -104,10 +104,10 @@ class RemoteStorageLayer {
         _class_private_field_get(this, _db)?.saveStorage(_class_private_field_get(this, _at), key, data);
         return data ?? undefined;
     }
-    async foldInto(_into) {
-        return this;
+    async findNextKey(prefix, startKey, _knownBest) {
+        const keys = await this.getKeysPaged(prefix, 1, startKey);
+        return keys[0];
     }
-    async fold() {}
     async getKeysPaged(prefix, pageSize, startKey) {
         if (pageSize > BATCH_SIZE) throw new Error(`pageSize must be less or equal to ${BATCH_SIZE}`);
         logger.trace({
@@ -119,7 +119,7 @@ class RemoteStorageLayer {
         const isChild = (0, _index.isPrefixedChildKey)(prefix);
         const minPrefixLen = isChild ? _index.CHILD_PREFIX_LENGTH : _index.PREFIX_LENGTH;
         // can't handle keyCache without prefix
-        if (prefix.length < minPrefixLen || startKey.length < minPrefixLen) {
+        if (prefix === startKey || prefix.length < minPrefixLen || startKey.length < minPrefixLen) {
             return _class_private_field_get(this, _api).getKeysPaged(prefix, pageSize, startKey, _class_private_field_get(this, _at));
         }
         let batchComplete = false;
@@ -243,123 +243,38 @@ class StorageLayer {
             this.set(key, value || "Deleted");
         }
     }
-    async foldInto(into) {
-        const newParent = await _class_private_field_get(this, _parent)?.foldInto(into);
-        for (const deletedPrefix of _class_private_field_get(this, _deletedPrefix)){
-            into.set(deletedPrefix, "DeletedPrefix");
+    async findNextKey(prefix, startKey, knownBest) {
+        const maybeBest = _class_private_field_get(this, _keys).find((key)=>key.startsWith(prefix) && key > startKey);
+        if (!knownBest) {
+            knownBest = maybeBest;
+        } else if (maybeBest && maybeBest < knownBest) {
+            knownBest = maybeBest;
         }
-        for (const [key, value] of _class_private_field_get(this, _store)){
-            into.set(key, await value);
-        }
-        return newParent;
-    }
-    async fold() {
-        if (_class_private_field_get(this, _parent)) {
-            _class_private_field_set(this, _parent, await _class_private_field_get(this, _parent).foldInto(this));
-        }
-    }
-    async getKeysPaged(prefix, pageSize, startKey) {
-        let parentFetchComplete = false;
-        const parentFetchKeys = async (batchSize, startKey)=>{
-            if (!_class_private_field_get(this, _deletedPrefix).some((dp)=>startKey.startsWith(dp))) {
-                const newKeys = [];
-                while(newKeys.length < batchSize){
-                    const remote = await _class_private_field_get(this, _parent)?.getKeysPaged(prefix, batchSize, startKey) ?? [];
-                    if (remote.length) {
-                        startKey = remote[remote.length - 1];
-                    }
-                    for (const key of remote){
-                        if (_class_private_field_get(this, _store).get(key) === "Deleted") {
-                            continue;
-                        }
-                        if (_class_private_field_get(this, _deletedPrefix).some((dp)=>key.startsWith(dp))) {
-                            continue;
-                        }
-                        newKeys.push(key);
-                    }
-                    if (remote.length < batchSize) {
-                        parentFetchComplete = true;
-                        break;
-                    }
-                }
-                return newKeys;
-            } else {
-                parentFetchComplete = true;
-                return [];
-            }
-        };
-        const res = [];
-        const foundNextKey = (key)=>{
-            // make sure keys are unique and start with the prefix
-            if (!res.includes(key) && key.startsWith(prefix)) {
-                res.push(key);
-            }
-        };
-        const iterLocalKeys = (prefix, startKey, includeFirst, endKey)=>{
-            let idx = _class_private_field_get(this, _keys).findIndex((x)=>x.startsWith(startKey));
-            if (_class_private_field_get(this, _keys)[idx] !== startKey) {
-                idx = _class_private_field_get(this, _keys).findIndex((x)=>x.startsWith(prefix) && x > startKey);
-                const key = _class_private_field_get(this, _keys)[idx];
-                if (key) {
-                    if (endKey && key >= endKey) {
-                        return startKey;
-                    }
-                    foundNextKey(key);
-                    ++idx;
-                }
-            }
-            if (idx !== -1) {
-                if (includeFirst) {
-                    const key = _class_private_field_get(this, _keys)[idx];
-                    if (key && key.startsWith(prefix) && key > startKey) {
-                        foundNextKey(key);
-                    }
-                }
-                while(res.length < pageSize){
-                    ++idx;
-                    const key = _class_private_field_get(this, _keys)[idx];
-                    if (!key || !key.startsWith(prefix)) {
-                        break;
-                    }
-                    if (endKey && key >= endKey) {
-                        break;
-                    }
-                    foundNextKey(key);
+        if (_class_private_field_get(this, _parent) && !_class_private_field_get(this, _deletedPrefix).some((dp)=>dp === prefix)) {
+            const parentBest = await _class_private_field_get(this, _parent).findNextKey(prefix, startKey, knownBest);
+            if (parentBest) {
+                if (!maybeBest) {
+                    return parentBest;
+                } else if (parentBest < maybeBest) {
+                    return parentBest;
                 }
-                return _lodash.default.last(res) ?? startKey;
             }
-            return startKey;
-        };
-        if (prefix !== startKey && _class_private_field_get(this, _keys).find((x)=>x === startKey)) {
-            startKey = iterLocalKeys(prefix, startKey, false);
         }
-        // then iterate the parent keys
-        let keys = await parentFetchKeys(pageSize - res.length, startKey);
-        if (keys.length) {
-            let idx = 0;
-            while(res.length < pageSize){
-                const key = keys[idx];
-                if (!key || !key.startsWith(prefix)) {
-                    if (parentFetchComplete) {
-                        break;
-                    } else {
-                        keys = await parentFetchKeys(pageSize - res.length, _lodash.default.last(keys));
-                        continue;
-                    }
-                }
-                const keyPosition = _lodash.default.sortedIndex(_class_private_field_get(this, _keys), key);
-                const localParentKey = _class_private_field_get(this, _keys)[keyPosition - 1];
-                if (localParentKey < key) {
-                    startKey = iterLocalKeys(prefix, startKey, false, key);
-                }
-                foundNextKey(key);
-                ++idx;
-            }
+        return knownBest;
+    }
+    async getKeysPaged(prefix, pageSize, startKey) {
+        if (!startKey || startKey === '0x') {
+            startKey = prefix;
         }
-        if (res.length < pageSize) {
-            iterLocalKeys(prefix, startKey, prefix === startKey);
+        const keys = [];
+        while(keys.length < pageSize){
+            const next = await this.findNextKey(prefix, startKey, undefined);
+            if (!next) break;
+            startKey = next;
+            if (await this.get(next, false) == "Deleted") continue;
+            keys.push(next);
         }
-        return res;
+        return keys;
     }
     /**
    * Merge the storage layer into the given object, can be used to get sotrage diff.

package/dist/cjs/rpc/substrate/chain.d.ts

@@ -41,6 +41,7 @@ export declare const chain_getFinalizedHead: Handler<void, HexString>;
 export declare const chain_subscribeNewHead: Handler<void, string>;
 export declare const chain_subscribeFinalizedHeads: Handler<void, string>;
 export declare const chain_unsubscribeNewHead: Handler<[string], void>;
+export declare const archive_unstable_hashByHeight: Handler<[number | `0x${string}` | `0x${string}`[] | number[] | null], `0x${string}` | (`0x${string}` | null)[] | null>;
 export declare const chain_getHead: Handler<[number | `0x${string}` | `0x${string}`[] | number[] | null], `0x${string}` | (`0x${string}` | null)[] | null>;
 export declare const chain_subscribeNewHeads: Handler<void, string>;
 export declare const chain_unsubscribeNewHeads: Handler<[string], void>;

package/dist/cjs/rpc/substrate/chain.js

@@ -9,6 +9,9 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    archive_unstable_hashByHeight: function() {
+        return archive_unstable_hashByHeight;
+    },
     chain_getBlock: function() {
         return chain_getBlock;
     },
@@ -109,6 +112,7 @@ const chain_subscribeFinalizedHeads = async (context, _params, { subscribe })=>{
 const chain_unsubscribeNewHead = async (_context, [subid], { unsubscribe })=>{
     unsubscribe(subid);
 };
+const archive_unstable_hashByHeight = chain_getBlockHash;
 const chain_getHead = chain_getBlockHash;
 const chain_subscribeNewHeads = chain_subscribeNewHead;
 const chain_unsubscribeNewHeads = chain_unsubscribeNewHead;

package/dist/cjs/rpc/substrate/index.d.ts

@@ -55,6 +55,7 @@ declare const handlers: {
     chain_subscribeNewHead: import("../shared.js").Handler<void, string>;
     chain_subscribeFinalizedHeads: import("../shared.js").Handler<void, string>;
     chain_unsubscribeNewHead: import("../shared.js").Handler<[string], void>;
+    archive_unstable_hashByHeight: import("../shared.js").Handler<[number | `0x${string}` | `0x${string}`[] | number[] | null], `0x${string}` | (`0x${string}` | null)[] | null>;
     chain_getHead: import("../shared.js").Handler<[number | `0x${string}` | `0x${string}`[] | number[] | null], `0x${string}` | (`0x${string}` | null)[] | null>;
     chain_subscribeNewHeads: import("../shared.js").Handler<void, string>;
     chain_unsubscribeNewHeads: import("../shared.js").Handler<[string], void>;

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

@@ -10,25 +10,20 @@ export interface StorageLayerProvider {
      * Get the value of a storage key.
      */
     get(key: string, cache: boolean): Promise<StorageValue>;
-    /**
-     * Fold the storage layer into another layer.
-     */
-    foldInto(into: StorageLayer): Promise<StorageLayerProvider | undefined>;
-    /**
-     * Fold the storage layer into the parent if it exists.
-     */
-    fold(): Promise<void>;
     /**
      * Get paged storage keys.
      */
     getKeysPaged(prefix: string, pageSize: number, startKey: string): Promise<string[]>;
+    /**
+     * Find next storage key.
+     */
+    findNextKey(prefix: string, startKey: string, knownBest?: string): Promise<string | undefined>;
 }
 export declare class RemoteStorageLayer implements StorageLayerProvider {
     #private;
     constructor(api: Api, at: string, db: Database | undefined);
     get(key: string, _cache: boolean): Promise<StorageValue>;
-    foldInto(_into: StorageLayer): Promise<StorageLayerProvider>;
-    fold(): Promise<void>;
+    findNextKey(prefix: string, startKey: string, _knownBest?: string): Promise<string | undefined>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string): Promise<string[]>;
 }
 export declare class StorageLayer implements StorageLayerProvider {
@@ -37,8 +32,7 @@ export declare class StorageLayer implements StorageLayerProvider {
     get(key: string, cache: boolean): Promise<StorageValue | undefined>;
     set(key: string, value: StorageValue): void;
     setAll(values: Record<string, StorageValue | null> | [string, StorageValue | null][]): void;
-    foldInto(into: StorageLayer): Promise<StorageLayerProvider | undefined>;
-    fold(): Promise<void>;
+    findNextKey(prefix: string, startKey: string, knownBest?: string): Promise<string | undefined>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string): Promise<string[]>;
     /**
      * Merge the storage layer into the given object, can be used to get sotrage diff.

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

@@ -37,10 +37,10 @@ export class RemoteStorageLayer {
         this.#db?.saveStorage(this.#at, key, data);
         return data ?? undefined;
     }
-    async foldInto(_into) {
-        return this;
+    async findNextKey(prefix, startKey, _knownBest) {
+        const keys = await this.getKeysPaged(prefix, 1, startKey);
+        return keys[0];
     }
-    async fold() {}
     async getKeysPaged(prefix, pageSize, startKey) {
         if (pageSize > BATCH_SIZE) throw new Error(`pageSize must be less or equal to ${BATCH_SIZE}`);
         logger.trace({
@@ -52,7 +52,7 @@ export class RemoteStorageLayer {
         const isChild = isPrefixedChildKey(prefix);
         const minPrefixLen = isChild ? CHILD_PREFIX_LENGTH : PREFIX_LENGTH;
         // can't handle keyCache without prefix
-        if (prefix.length < minPrefixLen || startKey.length < minPrefixLen) {
+        if (prefix === startKey || prefix.length < minPrefixLen || startKey.length < minPrefixLen) {
             return this.#api.getKeysPaged(prefix, pageSize, startKey, this.#at);
         }
         let batchComplete = false;
@@ -172,123 +172,38 @@ export class StorageLayer {
             this.set(key, value || "Deleted");
         }
     }
-    async foldInto(into) {
-        const newParent = await this.#parent?.foldInto(into);
-        for (const deletedPrefix of this.#deletedPrefix){
-            into.set(deletedPrefix, "DeletedPrefix");
-        }
-        for (const [key, value] of this.#store){
-            into.set(key, await value);
-        }
-        return newParent;
-    }
-    async fold() {
-        if (this.#parent) {
-            this.#parent = await this.#parent.foldInto(this);
-        }
-    }
-    async getKeysPaged(prefix, pageSize, startKey) {
-        let parentFetchComplete = false;
-        const parentFetchKeys = async (batchSize, startKey)=>{
-            if (!this.#deletedPrefix.some((dp)=>startKey.startsWith(dp))) {
-                const newKeys = [];
-                while(newKeys.length < batchSize){
-                    const remote = await this.#parent?.getKeysPaged(prefix, batchSize, startKey) ?? [];
-                    if (remote.length) {
-                        startKey = remote[remote.length - 1];
-                    }
-                    for (const key of remote){
-                        if (this.#store.get(key) === "Deleted") {
-                            continue;
-                        }
-                        if (this.#deletedPrefix.some((dp)=>key.startsWith(dp))) {
-                            continue;
-                        }
-                        newKeys.push(key);
-                    }
-                    if (remote.length < batchSize) {
-                        parentFetchComplete = true;
-                        break;
-                    }
-                }
-                return newKeys;
-            } else {
-                parentFetchComplete = true;
-                return [];
-            }
-        };
-        const res = [];
-        const foundNextKey = (key)=>{
-            // make sure keys are unique and start with the prefix
-            if (!res.includes(key) && key.startsWith(prefix)) {
-                res.push(key);
-            }
-        };
-        const iterLocalKeys = (prefix, startKey, includeFirst, endKey)=>{
-            let idx = this.#keys.findIndex((x)=>x.startsWith(startKey));
-            if (this.#keys[idx] !== startKey) {
-                idx = this.#keys.findIndex((x)=>x.startsWith(prefix) && x > startKey);
-                const key = this.#keys[idx];
-                if (key) {
-                    if (endKey && key >= endKey) {
-                        return startKey;
-                    }
-                    foundNextKey(key);
-                    ++idx;
+    async findNextKey(prefix, startKey, knownBest) {
+        const maybeBest = this.#keys.find((key)=>key.startsWith(prefix) && key > startKey);
+        if (!knownBest) {
+            knownBest = maybeBest;
+        } else if (maybeBest && maybeBest < knownBest) {
+            knownBest = maybeBest;
+        }
+        if (this.#parent && !this.#deletedPrefix.some((dp)=>dp === prefix)) {
+            const parentBest = await this.#parent.findNextKey(prefix, startKey, knownBest);
+            if (parentBest) {
+                if (!maybeBest) {
+                    return parentBest;
+                } else if (parentBest < maybeBest) {
+                    return parentBest;
                 }
             }
-            if (idx !== -1) {
-                if (includeFirst) {
-                    const key = this.#keys[idx];
-                    if (key && key.startsWith(prefix) && key > startKey) {
-                        foundNextKey(key);
-                    }
-                }
-                while(res.length < pageSize){
-                    ++idx;
-                    const key = this.#keys[idx];
-                    if (!key || !key.startsWith(prefix)) {
-                        break;
-                    }
-                    if (endKey && key >= endKey) {
-                        break;
-                    }
-                    foundNextKey(key);
-                }
-                return _.last(res) ?? startKey;
-            }
-            return startKey;
-        };
-        if (prefix !== startKey && this.#keys.find((x)=>x === startKey)) {
-            startKey = iterLocalKeys(prefix, startKey, false);
-        }
-        // then iterate the parent keys
-        let keys = await parentFetchKeys(pageSize - res.length, startKey);
-        if (keys.length) {
-            let idx = 0;
-            while(res.length < pageSize){
-                const key = keys[idx];
-                if (!key || !key.startsWith(prefix)) {
-                    if (parentFetchComplete) {
-                        break;
-                    } else {
-                        keys = await parentFetchKeys(pageSize - res.length, _.last(keys));
-                        continue;
-                    }
-                }
-                const keyPosition = _.sortedIndex(this.#keys, key);
-                const localParentKey = this.#keys[keyPosition - 1];
-                if (localParentKey < key) {
-                    startKey = iterLocalKeys(prefix, startKey, false, key);
-                }
-                foundNextKey(key);
-                ++idx;
-            }
         }
-        if (res.length < pageSize) {
-            iterLocalKeys(prefix, startKey, prefix === startKey);
-        }
-        return res;
+        return knownBest;
+    }
+    async getKeysPaged(prefix, pageSize, startKey) {
+        if (!startKey || startKey === '0x') {
+            startKey = prefix;
+        }
+        const keys = [];
+        while(keys.length < pageSize){
+            const next = await this.findNextKey(prefix, startKey, undefined);
+            if (!next) break;
+            startKey = next;
+            if (await this.get(next, false) == "Deleted") continue;
+            keys.push(next);
+        }
+        return keys;
     }
     /**
    * Merge the storage layer into the given object, can be used to get sotrage diff.

package/dist/esm/rpc/substrate/chain.d.ts

@@ -41,6 +41,7 @@ export declare const chain_getFinalizedHead: Handler<void, HexString>;
 export declare const chain_subscribeNewHead: Handler<void, string>;
 export declare const chain_subscribeFinalizedHeads: Handler<void, string>;
 export declare const chain_unsubscribeNewHead: Handler<[string], void>;
+export declare const archive_unstable_hashByHeight: Handler<[number | `0x${string}` | `0x${string}`[] | number[] | null], `0x${string}` | (`0x${string}` | null)[] | null>;
 export declare const chain_getHead: Handler<[number | `0x${string}` | `0x${string}`[] | number[] | null], `0x${string}` | (`0x${string}` | null)[] | null>;
 export declare const chain_subscribeNewHeads: Handler<void, string>;
 export declare const chain_unsubscribeNewHeads: Handler<[string], void>;

package/dist/esm/rpc/substrate/chain.js

@@ -83,6 +83,7 @@ export const chain_subscribeFinalizedHeads = async (context, _params, { subscrib
 export const chain_unsubscribeNewHead = async (_context, [subid], { unsubscribe })=>{
     unsubscribe(subid);
 };
+export const archive_unstable_hashByHeight = chain_getBlockHash;
 export const chain_getHead = chain_getBlockHash;
 export const chain_subscribeNewHeads = chain_subscribeNewHead;
 export const chain_unsubscribeNewHeads = chain_unsubscribeNewHead;

package/dist/esm/rpc/substrate/index.d.ts

@@ -55,6 +55,7 @@ declare const handlers: {
     chain_subscribeNewHead: import("../shared.js").Handler<void, string>;
     chain_subscribeFinalizedHeads: import("../shared.js").Handler<void, string>;
     chain_unsubscribeNewHead: import("../shared.js").Handler<[string], void>;
+    archive_unstable_hashByHeight: import("../shared.js").Handler<[number | `0x${string}` | `0x${string}`[] | number[] | null], `0x${string}` | (`0x${string}` | null)[] | null>;
     chain_getHead: import("../shared.js").Handler<[number | `0x${string}` | `0x${string}`[] | number[] | null], `0x${string}` | (`0x${string}` | null)[] | null>;
     chain_subscribeNewHeads: import("../shared.js").Handler<void, string>;
     chain_unsubscribeNewHeads: import("../shared.js").Handler<[string], void>;

package/package.json

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