@acala-network/chopsticks-core 0.8.0 → 0.8.1

package/lib/api.d.ts

@@ -36,7 +36,7 @@ export declare class Api {
     getBlockHash(blockNumber?: number): Promise<`0x${string}` | null>;
     getHeader(hash?: string): Promise<Header | null>;
     getBlock(hash?: string): Promise<SignedBlock | null>;
-    getStorage(key: string, hash?: string): Promise<string | null>;
+    getStorage(key: string, hash?: string): Promise<`0x${string}` | null>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string, hash?: string): Promise<string[]>;
 }
 export {};

package/lib/api.js

@@ -22,6 +22,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _Api_provider, _Api_ready, _Api_chain, _Api_chainProperties;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Api = void 0;
+const utils_1 = require("./utils");
 class Api {
     constructor(provider, signedExtensions) {
         _Api_provider.set(this, void 0);
@@ -96,18 +97,43 @@ class Api {
     }
     getStorage(key, hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const params = [key];
-            if (hash)
-                params.push(hash);
-            return __classPrivateFieldGet(this, _Api_provider, "f").send('state_getStorage', params);
+            const [child, storageKey] = (0, utils_1.splitChildKey)(key);
+            if (child) {
+                // child storage key, use childstate_getStorage
+                const params = [child, storageKey];
+                if (hash)
+                    params.push(hash);
+                return __classPrivateFieldGet(this, _Api_provider, "f").send('childstate_getStorage', params);
+            }
+            else {
+                // main storage key, use state_getStorage
+                const params = [key];
+                if (hash)
+                    params.push(hash);
+                return __classPrivateFieldGet(this, _Api_provider, "f").send('state_getStorage', params);
+            }
         });
     }
     getKeysPaged(prefix, pageSize, startKey, hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const params = [prefix, pageSize, startKey];
-            if (hash)
-                params.push(hash);
-            return __classPrivateFieldGet(this, _Api_provider, "f").send('state_getKeysPaged', params);
+            const [child, storageKey] = (0, utils_1.splitChildKey)(prefix);
+            if (child) {
+                // child storage key, use childstate_getKeysPaged
+                // strip child prefix from startKey
+                const params = [child, storageKey, pageSize, (0, utils_1.stripChildPrefix)(startKey)];
+                if (hash)
+                    params.push(hash);
+                return __classPrivateFieldGet(this, _Api_provider, "f")
+                    .send('childstate_getKeysPaged', params)
+                    .then((keys) => keys.map((key) => (0, utils_1.prefixedChildKey)(child, key)));
+            }
+            else {
+                // main storage key, use state_getKeysPaged
+                const params = [prefix, pageSize, startKey];
+                if (hash)
+                    params.push(hash);
+                return __classPrivateFieldGet(this, _Api_provider, "f").send('state_getKeysPaged', params);
+            }
         });
     }
 }

package/lib/blockchain/block.js

@@ -114,7 +114,7 @@ class Block {
             const layer = new storage_layer_1.StorageLayer(this.storage);
             yield layer.fold();
             const prefix = (_a = options.prefix) !== null && _a !== void 0 ? _a : '0x';
-            const startKey = (_b = options.startKey) !== null && _b !== void 0 ? _b : prefix;
+            const startKey = (_b = options.startKey) !== null && _b !== void 0 ? _b : '0x';
             const pageSize = options.pageSize;
             return layer.getKeysPaged(prefix, pageSize, startKey);
         });

package/lib/blockchain/index.js

@@ -106,13 +106,18 @@ class Blockchain {
                     .getRepository(entities_1.BlockEntity)
                     .findOne({ where: { [typeof key === 'number' ? 'number' : 'hash']: key } });
                 if (blockData) {
-                    const { hash, number, header, extrinsics, parentHash } = blockData;
-                    const parentBlock = parentHash ? __classPrivateFieldGet(this, _Blockchain_blocksByHash, "f")[parentHash] : undefined;
+                    const { hash, number, header, extrinsics } = blockData;
+                    const parentHash = blockData.parentHash || undefined;
+                    let parentBlock = parentHash ? __classPrivateFieldGet(this, _Blockchain_blocksByHash, "f")[parentHash] : undefined;
+                    if (!parentBlock) {
+                        parentBlock = yield this.getBlock(parentHash);
+                    }
                     const storageDiff = (_a = blockData.storageDiff) !== null && _a !== void 0 ? _a : undefined;
                     const registry = yield this.head.registry;
                     const block = new block_1.Block(this, number, hash, parentBlock, {
                         header: registry.createType('Header', header),
                         extrinsics,
+                        storage: parentBlock === null || parentBlock === void 0 ? void 0 : parentBlock.storage,
                         storageDiff,
                     });
                     __classPrivateFieldGet(this, _Blockchain_instances, "m", _Blockchain_registerBlock).call(this, block);

package/lib/blockchain/storage-layer.d.ts

@@ -14,7 +14,7 @@ export interface StorageLayerProvider {
 export declare class RemoteStorageLayer implements StorageLayerProvider {
     #private;
     constructor(api: Api, at: string, db: DataSource | undefined);
-    get(key: string): Promise<StorageValue>;
+    get(key: string, _cache: boolean): Promise<StorageValue>;
     foldInto(_into: StorageLayer): Promise<StorageLayerProvider>;
     fold(): Promise<void>;
     getKeysPaged(prefix: string, pageSize: number, startKey: string): Promise<string[]>;

package/lib/blockchain/storage-layer.js

@@ -46,7 +46,7 @@ class RemoteStorageLayer {
         __classPrivateFieldSet(this, _RemoteStorageLayer_at, at, "f");
         __classPrivateFieldSet(this, _RemoteStorageLayer_db, db, "f");
     }
-    get(key) {
+    get(key, _cache) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const keyValuePair = (_a = __classPrivateFieldGet(this, _RemoteStorageLayer_db, "f")) === null || _a === void 0 ? void 0 : _a.getRepository(entities_1.KeyValuePair);
@@ -124,7 +124,7 @@ class StorageLayer {
             if (key in __classPrivateFieldGet(this, _StorageLayer_store, "f")) {
                 return __classPrivateFieldGet(this, _StorageLayer_store, "f")[key];
             }
-            if (__classPrivateFieldGet(this, _StorageLayer_deletedPrefix, "f").some((prefix) => key.startsWith(prefix))) {
+            if (__classPrivateFieldGet(this, _StorageLayer_deletedPrefix, "f").some((dp) => key.startsWith(dp))) {
                 return StorageValueKind.Deleted;
             }
             if (__classPrivateFieldGet(this, _StorageLayer_parent, "f")) {
@@ -194,10 +194,10 @@ class StorageLayer {
     getKeysPaged(prefix, pageSize, startKey) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!__classPrivateFieldGet(this, _StorageLayer_deletedPrefix, "f").some((prefix) => startKey.startsWith(prefix))) {
+            if (!__classPrivateFieldGet(this, _StorageLayer_deletedPrefix, "f").some((dp) => startKey.startsWith(dp))) {
                 const remote = (_b = (yield ((_a = __classPrivateFieldGet(this, _StorageLayer_parent, "f")) === null || _a === void 0 ? void 0 : _a.getKeysPaged(prefix, pageSize, startKey)))) !== null && _b !== void 0 ? _b : [];
                 for (const key of remote) {
-                    if (__classPrivateFieldGet(this, _StorageLayer_deletedPrefix, "f").some((prefix) => key.startsWith(prefix))) {
+                    if (__classPrivateFieldGet(this, _StorageLayer_deletedPrefix, "f").some((dp) => key.startsWith(dp))) {
                         continue;
                     }
                     __classPrivateFieldGet(this, _StorageLayer_instances, "m", _StorageLayer_addKey).call(this, key);

package/lib/schema/index.d.ts

@@ -34,12 +34,12 @@ export declare const genesisSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     name: string;
-    id: string;
     properties: {
         ss58Format?: number | undefined;
         tokenDecimals?: number | number[] | undefined;
         tokenSymbol?: string | string[] | undefined;
     };
+    id: string;
     genesis: {
         raw: {
             top: Record<string, string>;
@@ -47,12 +47,12 @@ export declare const genesisSchema: z.ZodObject<{
     };
 }, {
     name: string;
-    id: string;
     properties: {
         ss58Format?: number | undefined;
         tokenDecimals?: number | number[] | undefined;
         tokenSymbol?: string | string[] | undefined;
     };
+    id: string;
     genesis: {
         raw: {
             top: Record<string, string>;

package/lib/utils/index.d.ts

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

package/lib/utils/index.js

@@ -23,8 +23,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defer = exports.isUrl = exports.getParaId = exports.compactHex = exports.fetchKeysToArray = exports.fetchKeys = void 0;
+exports.stripChildPrefix = exports.splitChildKey = exports.isPrefixedChildKey = exports.prefixedChildKey = exports.defer = exports.isUrl = exports.getParaId = exports.compactHex = exports.fetchKeysToArray = exports.fetchKeys = void 0;
 const util_1 = require("@polkadot/util");
+const hex_1 = require("@polkadot/util/hex");
 __exportStar(require("./set-storage"), exports);
 __exportStar(require("./time-travel"), exports);
 __exportStar(require("./decoder"), exports);
@@ -87,3 +88,34 @@ function defer() {
     return deferred;
 }
 exports.defer = defer;
+// Chopsticks treats both main storage and child storage as a key-value store
+// The difference is that child storage keys are prefixed with the child storage key
+// :child_storage:default: as hex string
+const DEFAULT_CHILD_STORAGE = '0x3a6368696c645f73746f726167653a64656661756c743a';
+// length of the child storage key
+const CHILD_LENGTH = DEFAULT_CHILD_STORAGE.length + 64;
+// returns a key that is prefixed with the child storage key
+const prefixedChildKey = (prefix, key) => prefix + (0, hex_1.hexStripPrefix)(key);
+exports.prefixedChildKey = prefixedChildKey;
+// returns true if the key is a child storage key
+const isPrefixedChildKey = (key) => key.startsWith(DEFAULT_CHILD_STORAGE);
+exports.isPrefixedChildKey = isPrefixedChildKey;
+// returns a key that is split into the child storage key and the rest
+const splitChildKey = (key) => {
+    if (!key.startsWith(DEFAULT_CHILD_STORAGE))
+        return [];
+    if (key.length < CHILD_LENGTH)
+        return [];
+    const child = key.slice(0, CHILD_LENGTH);
+    const rest = key.slice(CHILD_LENGTH);
+    return [child, (0, hex_1.hexAddPrefix)(rest)];
+};
+exports.splitChildKey = splitChildKey;
+// returns a key that is stripped of the child storage key
+const stripChildPrefix = (key) => {
+    const [child, storageKey] = (0, exports.splitChildKey)(key);
+    if (!child)
+        return key;
+    return storageKey;
+};
+exports.stripChildPrefix = stripChildPrefix;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "scripts": {
@@ -9,7 +9,7 @@
     "build": "yarn pack-wasm; tsc -p ./tsconfig.json"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.8.0",
+    "@acala-network/chopsticks-executor": "0.8.1",
     "@polkadot/api": "^10.9.1",
     "@polkadot/util-crypto": "^12.3.2",
     "axios": "^1.5.0",