@acala-network/chopsticks-core 1.5.0 → 1.5.1

package/dist/cjs/blockchain/inherent/data-renewal.d.ts

@@ -0,0 +1,6 @@
+import type { HexString } from '@polkadot/util/types';
+import type { Block } from '../block.js';
+import type { InherentProvider } from './index.js';
+export declare class ProcessPendingRenewals implements InherentProvider {
+    createInherents(newBlock: Block): Promise<HexString[]>;
+}

package/dist/cjs/blockchain/inherent/data-renewal.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "ProcessPendingRenewals", {
+    enumerable: true,
+    get: function() {
+        return ProcessPendingRenewals;
+    }
+});
+const _types = require("@polkadot/types");
+class ProcessPendingRenewals {
+    async createInherents(newBlock) {
+        const parent = await newBlock.parentBlock;
+        if (!parent) throw new Error('parent block not found');
+        const meta = await parent.meta;
+        if (!meta.tx.dataRenewal?.processPendingRenewals) {
+            return [];
+        }
+        // Bulletin's pallet-bulletin-data-renewal mandatory drain inherent.
+        // The pallet's on_finalize asserts PendingAutoRenewals was drained, so
+        // the inherent must be included in every block, matching the pallet's
+        // unconditional create_inherent.
+        const inherent = new _types.GenericExtrinsic(meta.registry, meta.tx.dataRenewal.processPendingRenewals());
+        return [
+            inherent.toHex()
+        ];
+    }
+}

package/dist/cjs/blockchain/inherent/index.d.ts

@@ -1,6 +1,7 @@
 import type { HexString } from '@polkadot/util/types';
 import type { Block } from '../block.js';
 import type { BuildBlockParams } from '../txpool.js';
+import { ProcessPendingRenewals } from './data-renewal.js';
 import { ParaInherentEnter } from './para-enter.js';
 import { SetBabeRandomness } from './parachain/babe-randomness.js';
 import { SetNimbusAuthorInherent } from './parachain/nimbus-author-inherent.js';
@@ -10,4 +11,4 @@ import { SetTransactionStorageProof } from './transaction-storage.js';
 export interface InherentProvider {
     createInherents(newBlock: Block, params: BuildBlockParams): Promise<HexString[]>;
 }
-export declare const inherentProviders: (ParaInherentEnter | SetBabeRandomness | SetNimbusAuthorInherent | SetValidationData | SetTimestamp | SetTransactionStorageProof)[];
+export declare const inherentProviders: (ProcessPendingRenewals | ParaInherentEnter | SetBabeRandomness | SetNimbusAuthorInherent | SetValidationData | SetTimestamp | SetTransactionStorageProof)[];

package/dist/cjs/blockchain/inherent/index.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "inherentProviders", {
         return inherentProviders;
     }
 });
+const _datarenewal = require("./data-renewal.js");
 const _paraenter = require("./para-enter.js");
 const _baberandomness = require("./parachain/babe-randomness.js");
 const _nimbusauthorinherent = require("./parachain/nimbus-author-inherent.js");
@@ -20,5 +21,6 @@ const inherentProviders = [
     new _paraenter.ParaInherentEnter(),
     new _nimbusauthorinherent.SetNimbusAuthorInherent(),
     new _baberandomness.SetBabeRandomness(),
-    new _transactionstorage.SetTransactionStorageProof()
+    new _transactionstorage.SetTransactionStorageProof(),
+    new _datarenewal.ProcessPendingRenewals()
 ];

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

@@ -172,9 +172,22 @@ class RemoteStorageLayer {
         }, 'RemoteStorageLayer getKeysPaged');
         const isChild = (0, _index.isPrefixedChildKey)(prefix);
         const minPrefixLen = isChild ? _index.CHILD_PREFIX_LENGTH : _index.PREFIX_LENGTH;
-        // KeyCache groups by the first `minPrefixLen` chars; it cannot correctly answer queries
-        // whose prefix is longer than that grouping width, so proxy directly to upstream.
-        if (prefix.length < minPrefixLen || startKey.length < minPrefixLen || prefix.length > minPrefixLen || startKey.length > minPrefixLen) {
+        // KeyCache groups by the first `minPrefixLen` chars; it cannot correctly answer queries whose PREFIX is
+        // off that grouping width, so those are proxied directly to upstream (a longer prefix would otherwise match
+        // on the truncated head and return keys that do not start with the requested prefix — smoldot's
+        // `clear_prefix` asserts `key.starts_with(prefix)`).
+        //
+        // `startKey` is a different matter: every CONTINUATION of a scan carries a full-length storage key by
+        // construction, and serving those from the cache is precisely what the cache is for. Bailing out on a long
+        // `startKey` makes each continuation page an upstream round-trip.
+        //
+        // But a long `startKey` is only cache-safe when it belongs to the SAME group as `prefix`. `KeyCache.next()`
+        // derives its range from the first `minPrefixLen` chars of the `startKey` alone and never checks the result
+        // against `prefix`, so a `startKey` from a different `minPrefixLen`-char group would be answered from that
+        // other group's range — returning a key that does not start with `prefix`. `!startKey.startsWith(prefix)`
+        // proxies those cross-group requests to upstream; genuine continuations (`startKey.startsWith(prefix)` by
+        // construction) still hit the cache. (Reported by @xlc on #1055.)
+        if (prefix.length !== minPrefixLen || startKey.length < minPrefixLen || !startKey.startsWith(prefix)) {
             return _class_private_field_get(this, _api).getKeysPaged(prefix, pageSize, startKey, _class_private_field_get(this, _at));
         }
         const startKeyEqualsPrefix = startKey === prefix;
@@ -281,7 +294,7 @@ class RemoteStorageLayer {
         _class_private_field_set(this, _db, db);
     }
 }
-var _store = /*#__PURE__*/ new WeakMap(), _keys = /*#__PURE__*/ new WeakMap(), _deletedPrefix = /*#__PURE__*/ new WeakMap(), _parent = /*#__PURE__*/ new WeakMap(), _addKey = /*#__PURE__*/ new WeakSet(), _removeKey = /*#__PURE__*/ new WeakSet();
+var _store = /*#__PURE__*/ new WeakMap(), _keys = /*#__PURE__*/ new WeakMap(), _deletedPrefix = /*#__PURE__*/ new WeakMap(), _parent = /*#__PURE__*/ new WeakMap(), _addKey = /*#__PURE__*/ new WeakSet(), _removeKey = /*#__PURE__*/ new WeakSet(), _cacheParentValue = /*#__PURE__*/ new WeakSet();
 class StorageLayer {
     deleted(key) {
         if (_class_private_field_get(this, _store).has(key)) {
@@ -303,9 +316,9 @@ class StorageLayer {
             return "Deleted";
         }
         if (_class_private_field_get(this, _parent)) {
-            const val = _class_private_field_get(this, _parent).get(key, false);
+            const val = await _class_private_field_get(this, _parent).get(key, false);
             if (cache) {
-                _class_private_field_get(this, _store).set(key, val);
+                _class_private_method_get(this, _cacheParentValue, cacheParentValue).call(this, key, val);
             }
             return val;
         }
@@ -314,9 +327,9 @@ class StorageLayer {
     async getMany(keys, cache) {
         const result = [];
         const pending = [];
-        const preloadedPromises = keys.map(async (key, idx)=>{
+        keys.forEach((key, idx)=>{
             if (_class_private_field_get(this, _store).has(key)) {
-                result[idx] = await _class_private_field_get(this, _store).get(key);
+                result[idx] = _class_private_field_get(this, _store).get(key);
             } else if (_class_private_field_get(this, _deletedPrefix).some((dp)=>key.startsWith(dp))) {
                 result[idx] = "Deleted";
             } else {
@@ -330,12 +343,11 @@ class StorageLayer {
             const vals = await _class_private_field_get(this, _parent).getMany(pending.map((p)=>p.key), false);
             vals.forEach((val, idx)=>{
                 if (cache) {
-                    _class_private_field_get(this, _store).set(pending[idx].key, val);
+                    _class_private_method_get(this, _cacheParentValue, cacheParentValue).call(this, pending[idx].key, val);
                 }
                 result[pending[idx].idx] = val;
             });
         }
-        await Promise.all(preloadedPromises);
         return result;
     }
     set(key, value) {
@@ -346,7 +358,7 @@ class StorageLayer {
                 break;
             case "DeletedPrefix":
                 _class_private_field_get(this, _deletedPrefix).push(key);
-                for (const k of _class_private_field_get(this, _keys)){
+                for (const k of _class_private_field_get(this, _store).keys()){
                     if (k.startsWith(key)) {
                         _class_private_field_get(this, _store).set(k, "Deleted");
                         _class_private_method_get(this, _removeKey, removeKey).call(this, k);
@@ -409,8 +421,7 @@ class StorageLayer {
     /**
    * Merge the storage layer into the given object, can be used to get sotrage diff.
    */ async mergeInto(into) {
-        for (const [key, maybeValue] of _class_private_field_get(this, _store)){
-            const value = await maybeValue;
+        for (const [key, value] of _class_private_field_get(this, _store)){
             if (value === "Deleted") {
                 into[key] = null;
             } else {
@@ -421,6 +432,7 @@ class StorageLayer {
     constructor(parent){
         _class_private_method_init(this, _addKey);
         _class_private_method_init(this, _removeKey);
+        _class_private_method_init(this, _cacheParentValue);
         _class_private_field_init(this, _store, {
             writable: true,
             value: new Map()
@@ -455,3 +467,8 @@ function removeKey(key) {
         _class_private_field_get(this, _keys).splice(idx, 1);
     }
 }
+function cacheParentValue(key, value) {
+    if (!_class_private_field_get(this, _store).has(key) && !_class_private_field_get(this, _deletedPrefix).some((dp)=>key.startsWith(dp))) {
+        _class_private_field_get(this, _store).set(key, value);
+    }
+}

package/dist/esm/blockchain/inherent/data-renewal.d.ts

@@ -0,0 +1,6 @@
+import type { HexString } from '@polkadot/util/types';
+import type { Block } from '../block.js';
+import type { InherentProvider } from './index.js';
+export declare class ProcessPendingRenewals implements InherentProvider {
+    createInherents(newBlock: Block): Promise<HexString[]>;
+}

package/dist/esm/blockchain/inherent/data-renewal.js

@@ -0,0 +1,19 @@
+import { GenericExtrinsic } from '@polkadot/types';
+export class ProcessPendingRenewals {
+    async createInherents(newBlock) {
+        const parent = await newBlock.parentBlock;
+        if (!parent) throw new Error('parent block not found');
+        const meta = await parent.meta;
+        if (!meta.tx.dataRenewal?.processPendingRenewals) {
+            return [];
+        }
+        // Bulletin's pallet-bulletin-data-renewal mandatory drain inherent.
+        // The pallet's on_finalize asserts PendingAutoRenewals was drained, so
+        // the inherent must be included in every block, matching the pallet's
+        // unconditional create_inherent.
+        const inherent = new GenericExtrinsic(meta.registry, meta.tx.dataRenewal.processPendingRenewals());
+        return [
+            inherent.toHex()
+        ];
+    }
+}

package/dist/esm/blockchain/inherent/index.d.ts

@@ -1,6 +1,7 @@
 import type { HexString } from '@polkadot/util/types';
 import type { Block } from '../block.js';
 import type { BuildBlockParams } from '../txpool.js';
+import { ProcessPendingRenewals } from './data-renewal.js';
 import { ParaInherentEnter } from './para-enter.js';
 import { SetBabeRandomness } from './parachain/babe-randomness.js';
 import { SetNimbusAuthorInherent } from './parachain/nimbus-author-inherent.js';
@@ -10,4 +11,4 @@ import { SetTransactionStorageProof } from './transaction-storage.js';
 export interface InherentProvider {
     createInherents(newBlock: Block, params: BuildBlockParams): Promise<HexString[]>;
 }
-export declare const inherentProviders: (ParaInherentEnter | SetBabeRandomness | SetNimbusAuthorInherent | SetValidationData | SetTimestamp | SetTransactionStorageProof)[];
+export declare const inherentProviders: (ProcessPendingRenewals | ParaInherentEnter | SetBabeRandomness | SetNimbusAuthorInherent | SetValidationData | SetTimestamp | SetTransactionStorageProof)[];

package/dist/esm/blockchain/inherent/index.js

@@ -1,3 +1,4 @@
+import { ProcessPendingRenewals } from './data-renewal.js';
 import { ParaInherentEnter } from './para-enter.js';
 import { SetBabeRandomness } from './parachain/babe-randomness.js';
 import { SetNimbusAuthorInherent } from './parachain/nimbus-author-inherent.js';
@@ -10,5 +11,6 @@ export const inherentProviders = [
     new ParaInherentEnter(),
     new SetNimbusAuthorInherent(),
     new SetBabeRandomness(),
-    new SetTransactionStorageProof()
+    new SetTransactionStorageProof(),
+    new ProcessPendingRenewals()
 ];

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

@@ -106,9 +106,22 @@ export class RemoteStorageLayer {
         }, 'RemoteStorageLayer getKeysPaged');
         const isChild = isPrefixedChildKey(prefix);
         const minPrefixLen = isChild ? CHILD_PREFIX_LENGTH : PREFIX_LENGTH;
-        // KeyCache groups by the first `minPrefixLen` chars; it cannot correctly answer queries
-        // whose prefix is longer than that grouping width, so proxy directly to upstream.
-        if (prefix.length < minPrefixLen || startKey.length < minPrefixLen || prefix.length > minPrefixLen || startKey.length > minPrefixLen) {
+        // KeyCache groups by the first `minPrefixLen` chars; it cannot correctly answer queries whose PREFIX is
+        // off that grouping width, so those are proxied directly to upstream (a longer prefix would otherwise match
+        // on the truncated head and return keys that do not start with the requested prefix — smoldot's
+        // `clear_prefix` asserts `key.starts_with(prefix)`).
+        //
+        // `startKey` is a different matter: every CONTINUATION of a scan carries a full-length storage key by
+        // construction, and serving those from the cache is precisely what the cache is for. Bailing out on a long
+        // `startKey` makes each continuation page an upstream round-trip.
+        //
+        // But a long `startKey` is only cache-safe when it belongs to the SAME group as `prefix`. `KeyCache.next()`
+        // derives its range from the first `minPrefixLen` chars of the `startKey` alone and never checks the result
+        // against `prefix`, so a `startKey` from a different `minPrefixLen`-char group would be answered from that
+        // other group's range — returning a key that does not start with `prefix`. `!startKey.startsWith(prefix)`
+        // proxies those cross-group requests to upstream; genuine continuations (`startKey.startsWith(prefix)` by
+        // construction) still hit the cache. (Reported by @xlc on #1055.)
+        if (prefix.length !== minPrefixLen || startKey.length < minPrefixLen || !startKey.startsWith(prefix)) {
             return this.#api.getKeysPaged(prefix, pageSize, startKey, this.#at);
         }
         const startKeyEqualsPrefix = startKey === prefix;
@@ -209,6 +222,11 @@ export class StorageLayer {
             this.#keys.splice(idx, 1);
         }
     }
+    #cacheParentValue(key, value) {
+        if (!this.#store.has(key) && !this.#deletedPrefix.some((dp)=>key.startsWith(dp))) {
+            this.#store.set(key, value);
+        }
+    }
     deleted(key) {
         if (this.#store.has(key)) {
             return this.#store.get(key) === "Deleted";
@@ -229,9 +247,9 @@ export class StorageLayer {
             return "Deleted";
         }
         if (this.#parent) {
-            const val = this.#parent.get(key, false);
+            const val = await this.#parent.get(key, false);
             if (cache) {
-                this.#store.set(key, val);
+                this.#cacheParentValue(key, val);
             }
             return val;
         }
@@ -240,9 +258,9 @@ export class StorageLayer {
     async getMany(keys, cache) {
         const result = [];
         const pending = [];
-        const preloadedPromises = keys.map(async (key, idx)=>{
+        keys.forEach((key, idx)=>{
             if (this.#store.has(key)) {
-                result[idx] = await this.#store.get(key);
+                result[idx] = this.#store.get(key);
             } else if (this.#deletedPrefix.some((dp)=>key.startsWith(dp))) {
                 result[idx] = "Deleted";
             } else {
@@ -256,12 +274,11 @@ export class StorageLayer {
             const vals = await this.#parent.getMany(pending.map((p)=>p.key), false);
             vals.forEach((val, idx)=>{
                 if (cache) {
-                    this.#store.set(pending[idx].key, val);
+                    this.#cacheParentValue(pending[idx].key, val);
                 }
                 result[pending[idx].idx] = val;
             });
         }
-        await Promise.all(preloadedPromises);
         return result;
     }
     set(key, value) {
@@ -272,7 +289,7 @@ export class StorageLayer {
                 break;
             case "DeletedPrefix":
                 this.#deletedPrefix.push(key);
-                for (const k of this.#keys){
+                for (const k of this.#store.keys()){
                     if (k.startsWith(key)) {
                         this.#store.set(k, "Deleted");
                         this.#removeKey(k);
@@ -335,8 +352,7 @@ export class StorageLayer {
     /**
    * Merge the storage layer into the given object, can be used to get sotrage diff.
    */ async mergeInto(into) {
-        for (const [key, maybeValue] of this.#store){
-            const value = await maybeValue;
+        for (const [key, value] of this.#store){
             if (value === "Deleted") {
                 into[key] = null;
             } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "1.5.0",
+  "version": "1.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.5.0",
+    "@acala-network/chopsticks-executor": "1.5.1",
     "@polkadot/rpc-provider": "^16.4.1",
     "@polkadot/types": "^16.4.1",
     "@polkadot/types-codec": "^16.4.1",