@typeberry/lib 0.11.0-829b7ea → 0.11.0-9d838d3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.11.0-829b7ea",
+  "version": "0.11.0-9d838d3",
   "description": "Typeberry Library",
   "main": "./bin/lib/index.js",
   "types": "./bin/lib/index.d.ts",

package/packages/jam/database-fjall/blocks.d.ts

@@ -12,6 +12,7 @@ export declare class FjallBlocks implements BlocksDb {
     private readonly postStateRoots;
     static open(chainSpec: ChainSpec, root: FjallRoot): Promise<FjallBlocks>;
     private constructor();
+    private pendingPrune;
     setPostStateRoot(hash: HeaderHash, postStateRoot: StateRootHash): Promise<void>;
     getPostStateRoot(hash: HeaderHash): StateRootHash | null;
     insertBlock(block: WithHash<HeaderHash, BlockView>): Promise<void>;

package/packages/jam/database-fjall/blocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/blocks.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,aAAa,EAElB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAuB,KAAK,SAAS,EAAgC,MAAM,WAAW,CAAC;AAK9F,kCAAkC;AAClC,qBAAa,WAAY,YAAW,QAAQ;IAWxC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;WAdpB,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAS9E,OAAO;IAQD,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAQlD,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlE,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,iBAAiB,IAAI,UAAU;IAQ/B,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI;IAQ9C,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAQpD,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAQ5B,KAAK;CACZ"}
+{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/blocks.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,aAAa,EAElB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAuB,KAAK,SAAS,EAAgC,MAAM,WAAW,CAAC;AAK9F,kCAAkC;AAClC,qBAAa,WAAY,YAAW,QAAQ;IAWxC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;WAdpB,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAS9E,OAAO;IAQP,OAAO,CAAC,YAAY,CAAuC;IAErD,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAQlD,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlE,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,iBAAiB,IAAI,UAAU;IAQ/B,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI;IAQ9C,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAQpD,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAY5B,KAAK;CAGZ"}

package/packages/jam/database-fjall/blocks.js

@@ -28,6 +28,7 @@ export class FjallBlocks {
         this.extrinsics = extrinsics;
         this.postStateRoots = postStateRoots;
     }
+    pendingPrune = Promise.resolve();
     async setPostStateRoot(hash, postStateRoot) {
         await writable(this.postStateRoots, this.root).insert(hash.raw, postStateRoot.raw);
     }
@@ -70,13 +71,17 @@ export class FjallBlocks {
         return Decoder.decodeObject(Extrinsic.Codec.View, data, this.chainSpec);
     }
     markUnused(hash) {
-        void Promise.all([
+        this.pendingPrune = this.pendingPrune
+            .then(() => Promise.all([
             writable(this.headers, this.root).remove(hash.raw),
             writable(this.extrinsics, this.root).remove(hash.raw),
             writable(this.postStateRoots, this.root).remove(hash.raw),
-        ]).catch((e) => logger.warn `Failed to prune block ${hash}: ${e}`);
+        ]))
+            .catch((e) => logger.warn `Failed to prune block ${hash}: ${e}`);
+    }
+    async close() {
+        await this.pendingPrune;
     }
-    async close() { }
 }
 function writable(partition, root) {
     if (root.readOnly) {

package/packages/jam/database-fjall/hybrid-states.d.ts

@@ -5,13 +5,13 @@ import type { Blake2b } from "#@typeberry/hash";
 import type { ServicesUpdate, State } from "#@typeberry/state";
 import { SerializedState, type StateEntries } from "#@typeberry/state-merkleization";
 import { OK, Result } from "#@typeberry/utils";
-import { type FjallRootOptions, type Partition } from "./root.js";
+import { FjallRoot, type FjallRootOptions, type Partition } from "./root.js";
 /**
  * One open fjall keyspace together with its content-addressed `values`
  * partition.
  *
- * Opening the keyspace is the slow part, so the fuzz target opens one session
- * per run and reuses it for every reset (see `HybridSerializedStates.fromSession`).
+ * Opening the keyspace is the slow part, so the fuzz target can open one root
+ * per run and reuse it for every reset (see `HybridSerializedStates.fromRoot`).
  * The values partition is immutable - the key is the hash of the value - so it
  * is fine that values pile up across resets, the unreferenced ones just sit
  * there unused.
@@ -20,9 +20,13 @@ export declare class FjallValuesSession {
     private readonly root;
     /** Shared content-addressed values partition, reused across resets. */
     readonly values: Partition;
+    /** Whether close() should release the underlying keyspace. */
+    private readonly ownsRoot;
     private constructor();
     /** Open (or create) the keyspace at `dbPath` and its `values` partition. */
     static open(dbPath: string, options?: FjallRootOptions): Promise<FjallValuesSession>;
+    /** Wrap an already-open keyspace and open its `values` partition. */
+    static fromRoot(root: FjallRoot): Promise<FjallValuesSession>;
     /** Flush the journal to disk (a no-op for ephemeral keyspaces). */
     persist(): Promise<void>;
     /** Size of the keyspace directory on disk, in bytes. */
@@ -44,7 +48,7 @@ export declare class FjallValuesSession {
  * decided by in-memory refcounting (`ValueRefs`) driven by the importer's
  * finality signal. Counts are not persisted: this db cannot resume from disk
  * anyway (the leaf sets live in memory), so values left over by a previous run
- * are never collected. An instance backed by a shared session (fuzz reset
+ * are never collected. An instance backed by a shared keyspace (fuzz reset
  * reuse) only ever prunes values it inserted itself, since its refcounts start
  * empty - values left behind by earlier resets stay untouched.
  */
@@ -61,6 +65,8 @@ export declare class HybridSerializedStates implements StatesDb<SerializedState<
         ephemeral?: boolean;
         cacheSizeBytes?: number;
     }): Promise<HybridSerializedStates>;
+    /** Create a db over an already-open keyspace owned by the caller. */
+    static fromRoot(spec: ChainSpec, blake2b: Blake2b, root: FjallRoot): Promise<HybridSerializedStates>;
     /**
      * Wrap an already-open `FjallValuesSession` and reuse its keyspace.
      *

package/packages/jam/database-fjall/hybrid-states.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hybrid-states.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/hybrid-states.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hybrid-states.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/hybrid-states.ts"],"names":[],"mappings":"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"}

package/packages/jam/database-fjall/hybrid-states.js

@@ -10,8 +10,8 @@ const logger = Logger.new(import.meta.filename, "db");
  * One open fjall keyspace together with its content-addressed `values`
  * partition.
  *
- * Opening the keyspace is the slow part, so the fuzz target opens one session
- * per run and reuses it for every reset (see `HybridSerializedStates.fromSession`).
+ * Opening the keyspace is the slow part, so the fuzz target can open one root
+ * per run and reuse it for every reset (see `HybridSerializedStates.fromRoot`).
  * The values partition is immutable - the key is the hash of the value - so it
  * is fine that values pile up across resets, the unreferenced ones just sit
  * there unused.
@@ -19,11 +19,15 @@ const logger = Logger.new(import.meta.filename, "db");
 export class FjallValuesSession {
     root;
     values;
+    ownsRoot;
     constructor(root, 
     /** Shared content-addressed values partition, reused across resets. */
-    values) {
+    values, 
+    /** Whether close() should release the underlying keyspace. */
+    ownsRoot) {
         this.root = root;
         this.values = values;
+        this.ownsRoot = ownsRoot;
     }
     /** Open (or create) the keyspace at `dbPath` and its `values` partition. */
     static async open(dbPath, options = {}) {
@@ -33,13 +37,18 @@ export class FjallValuesSession {
         const root = await FjallRoot.open(dbPath, options);
         try {
             const values = await root.writablePartition("values");
-            return new FjallValuesSession(root, values);
+            return new FjallValuesSession(root, values, true);
         }
         catch (e) {
             await root.close();
             throw e;
         }
     }
+    /** Wrap an already-open keyspace and open its `values` partition. */
+    static async fromRoot(root) {
+        const values = await root.writablePartition("values");
+        return new FjallValuesSession(root, values, false);
+    }
     /** Flush the journal to disk (a no-op for ephemeral keyspaces). */
     async persist() {
         await this.root.persist();
@@ -50,7 +59,9 @@ export class FjallValuesSession {
     }
     /** Release the keyspace handle (skips the sync-all fsync when ephemeral). */
     async close() {
-        await this.root.close();
+        if (this.ownsRoot) {
+            await this.root.close();
+        }
     }
 }
 /**
@@ -67,7 +78,7 @@ export class FjallValuesSession {
  * decided by in-memory refcounting (`ValueRefs`) driven by the importer's
  * finality signal. Counts are not persisted: this db cannot resume from disk
  * anyway (the leaf sets live in memory), so values left over by a previous run
- * are never collected. An instance backed by a shared session (fuzz reset
+ * are never collected. An instance backed by a shared keyspace (fuzz reset
  * reuse) only ever prunes values it inserted itself, since its refcounts start
  * empty - values left behind by earlier resets stay untouched.
  */
@@ -81,6 +92,11 @@ export class HybridSerializedStates {
         // This instance owns the session it just opened, so its `close()` closes it.
         return new HybridSerializedStates(spec, blake2b, session, true);
     }
+    /** Create a db over an already-open keyspace owned by the caller. */
+    static async fromRoot(spec, blake2b, root) {
+        const session = await FjallValuesSession.fromRoot(root);
+        return new HybridSerializedStates(spec, blake2b, session, true);
+    }
     /**
      * Wrap an already-open `FjallValuesSession` and reuse its keyspace.
      *

package/packages/jam/database-fjall/root.d.ts

@@ -43,6 +43,8 @@ export declare class FjallRoot {
     partition(name: string): Promise<FjallPartition>;
     /** Open a writable partition, failing early when this root is read-only. */
     writablePartition(name: string): Promise<Partition>;
+    /** Delete a writable partition and all of its data. */
+    deletePartition(name: string): Promise<void>;
     /**
      * Flush the journal to disk so prior writes survive a crash.
      *

package/packages/jam/database-fjall/root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/root.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,SAAS,EAEd,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAIzB,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;AAC7C,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,iBAAiB,CAAC;AAE3D;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAKpE;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,iEAAiE;IACjE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,SAAS;IAElB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO;IAOP,2DAA2D;WAC9C,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC;IAWrF,sEAAsE;IACtE,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,wDAAwD;IAClD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAItD,4EAA4E;IACtE,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAOzD;;;;;OAKG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACH,WAAW,IAAI,MAAM,GAAG,IAAI;IAQ5B,oFAAoF;IAC9E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
+{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/root.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,SAAS,EAEd,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAIzB,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;AAC7C,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,iBAAiB,CAAC;AAE3D;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAKpE;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,iEAAiE;IACjE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,SAAS;IAElB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO;IAOP,2DAA2D;WAC9C,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC;IAWrF,sEAAsE;IACtE,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,wDAAwD;IAClD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAItD,4EAA4E;IACtE,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAOzD,uDAAuD;IACjD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlD;;;;;OAKG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACH,WAAW,IAAI,MAAM,GAAG,IAAI;IAQ5B,oFAAoF;IAC9E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}

package/packages/jam/database-fjall/root.js

@@ -31,7 +31,7 @@ export class FjallRoot {
     }
     /** Open (or create) a fjall keyspace at the given path. */
     static async open(dbPath, options = {}) {
-        // fjall-js 0.3 shares one engine per path. Readers must use the read-only
+        // fjall-js shares one engine per path. Readers must use the read-only
         // wrapper surface; durability is driven explicitly through persist().
         const config = {
             path: dbPath,
@@ -55,6 +55,13 @@ export class FjallRoot {
         }
         return (await this.keyspace.partition(name));
     }
+    /** Delete a writable partition and all of its data. */
+    async deletePartition(name) {
+        if (this.readOnly) {
+            throw new Error(`Cannot delete fjall partition '${name}' from a read-only keyspace.`);
+        }
+        await this.keyspace.deletePartition(name);
+    }
     /**
      * Flush the journal to disk so prior writes survive a crash.
      *

package/packages/jam/database-fjall/root.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=root.test.d.ts.map

package/packages/jam/database-fjall/root.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"root.test.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/root.test.ts"],"names":[],"mappings":""}

package/packages/jam/database-fjall/root.test.js

@@ -0,0 +1,23 @@
+import assert from "node:assert";
+import * as fs from "node:fs";
+import { describe, it } from "node:test";
+import { FjallRoot } from "./root.js";
+const key = Buffer.from("key");
+const value = Buffer.from("value");
+describe("FjallRoot", () => {
+    it("deletes a partition and recreates it empty", async () => {
+        const dbPath = fs.mkdtempSync("typeberry-fjall-root-");
+        const root = await FjallRoot.open(dbPath, { ephemeral: true });
+        try {
+            const first = await root.writablePartition("scratch");
+            await first.insert(key, value);
+            await root.deletePartition("scratch");
+            const second = await root.writablePartition("scratch");
+            assert.strictEqual(second.get(key), null);
+        }
+        finally {
+            await root.close();
+            fs.rmSync(dbPath, { recursive: true, force: true });
+        }
+    });
+});

package/packages/jam/database-fjall/states.d.ts

@@ -16,6 +16,7 @@ export declare class FjallStates implements StatesDb<SerializedState<LeafDb>>, I
     private readonly values;
     static open(spec: ChainSpec, blake2b: Blake2b, root: FjallRoot): Promise<FjallStates>;
     private readonly valuesDb;
+    private pendingPrune;
     private constructor();
     insertInitialState(headerHash: HeaderHash, entries: StateEntries): Promise<Result<OK, StateUpdateError>>;
     updateAndSetState(headerHash: HeaderHash, state: SerializedState<LeafDb>, update: Partial<State & ServicesUpdate>): Promise<Result<OK, StateUpdateError>>;

package/packages/jam/database-fjall/states.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"states.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/states.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,KAAK,YAAY,EACjB,MAAM,EACN,KAAK,QAAQ,EACb,gBAAgB,EAGjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAY,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAgD,MAAM,gCAAgC,CAAC;AAE/G,OAAO,EAAE,EAAE,EAAE,MAAM,EAAkB,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAuB,KAAK,SAAS,EAAgC,MAAM,WAAW,CAAC;AAI9F,0DAA0D;AAC1D,qBAAa,WAAY,YAAW,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC;IAS7F,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;WAZZ,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAK3F,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC,OAAO;IAUD,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAQxG,iBAAiB,CACrB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,EAC9B,MAAM,EAAE,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAUlC,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAI1E,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,IAAI;IAahE,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI;IAK7C,UAAU,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAMxC,eAAe,IAAI,MAAM,GAAG,IAAI;IAI1B,KAAK;YAEG,eAAe;IAyB7B,OAAO,CAAC,SAAS;CAOlB"}
+{"version":3,"file":"states.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/states.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,KAAK,YAAY,EACjB,MAAM,EACN,KAAK,QAAQ,EACb,gBAAgB,EAGjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAY,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAgD,MAAM,gCAAgC,CAAC;AAE/G,OAAO,EAAE,EAAE,EAAE,MAAM,EAAkB,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAuB,KAAK,SAAS,EAAgC,MAAM,WAAW,CAAC;AAI9F,0DAA0D;AAC1D,qBAAa,WAAY,YAAW,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC;IAU7F,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;WAbZ,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAK3F,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,YAAY,CAAuC;IAE3D,OAAO;IAUD,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAQxG,iBAAiB,CACrB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,EAC9B,MAAM,EAAE,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAUlC,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAI1E,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,IAAI;IAahE,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI;IAK7C,UAAU,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAMxC,eAAe,IAAI,MAAM,GAAG,IAAI;IAI1B,KAAK;YAIG,eAAe;IAyB7B,OAAO,CAAC,SAAS;CAOlB"}

package/packages/jam/database-fjall/states.js

@@ -19,6 +19,7 @@ export class FjallStates {
         return new FjallStates(spec, blake2b, root, states, values);
     }
     valuesDb;
+    pendingPrune = Promise.resolve();
     constructor(spec, blake2b, root, states, values) {
         this.spec = spec;
         this.blake2b = blake2b;
@@ -58,14 +59,16 @@ export class FjallStates {
         // would need counts persisted (and crash-consistent) alongside the values.
     }
     markUnused(headerHash) {
-        void writable(this.states, this.root)
-            .remove(headerHash.raw)
+        this.pendingPrune = this.pendingPrune
+            .then(() => writable(this.states, this.root).remove(headerHash.raw))
             .catch((e) => logger.warn `Failed to prune state ${headerHash}: ${e}`);
     }
     diskSizeInBytes() {
         return this.root.sizeInBytes();
     }
-    async close() { }
+    async close() {
+        await this.pendingPrune;
+    }
     async updateAndCommit(headerHash, leafs, data) {
         const { values } = updateLeafs(leafs, this.blake2b, data);
         const stateLeafs = BytesBlob.blobFromParts(leafs.array.map((x) => x.node.raw));

package/packages/jam/node/main-fuzz.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main-fuzz.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main-fuzz.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIrD,OAAO,EAAE,KAAK,MAAM,EAAoC,MAAM,kBAAkB,CAAC;AAGjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjD,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,aAAa,EAAE,SAAS,CAAC;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,uBAAuB,EAAE,OAAO,CAAC;CAClC,CAAC;AAqBF;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CASpF;AAED,iFAAiF;AACjF,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5D;AAED,wBAAgB,cAAc;;;;EAM7B;AAED,wBAAsB,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CA6LrH"}
+{"version":3,"file":"main-fuzz.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main-fuzz.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIrD,OAAO,EAAE,KAAK,MAAM,EAAoC,MAAM,kBAAkB,CAAC;AAGjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjD,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,aAAa,EAAE,SAAS,CAAC;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,uBAAuB,EAAE,OAAO,CAAC;CAClC,CAAC;AAoBF;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CASpF;AAED,iFAAiF;AACjF,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5D;AAED,wBAAgB,cAAc;;;;EAM7B;AAED,wBAAsB,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CA+MrH"}

package/packages/jam/node/main-fuzz.js

@@ -8,7 +8,7 @@ import { v1 as fuzzV1 } from "#@typeberry/fuzz-proto";
 import { HASH_SIZE } from "#@typeberry/hash";
 import { Logger } from "#@typeberry/logger";
 import { CURRENT_VERSION, Result, version } from "#@typeberry/utils";
-import { FjallValuesSession, logHostEnvironment } from "#@typeberry/workers-api-node";
+import { FjallRoot, logHostEnvironment } from "#@typeberry/workers-api-node";
 import { getChainSpec } from "./common.js";
 import { mainImporter } from "./main-importer.js";
 const logger = Logger.new(import.meta.filename, "fuzztarget");
@@ -16,16 +16,15 @@ const logger = Logger.new(import.meta.filename, "fuzztarget");
 const FUZZ_DB_SUBDIR = "typeberry-fuzz-db";
 const FUZZ_DB_FJALL = "fjall-hybrid";
 const FUZZ_DB_OPTIONS = [FUZZ_DB_FJALL, "fjall"];
-/** Subdirectory (under the fuzzer's db dir) holding the reused fjall values keyspace. */
-const FUZZ_FJALL_VALUES_SUBDIR = "values-session";
+/** The partitions used by FjallBlocks and FjallStates in the full-fjall backend. */
+const FUZZ_FJALL_PARTITIONS = ["headers", "extrinsics", "postStateRoots", "states", "values"];
 /**
- * Size of the fjall block-cache for the fuzz session. Values pile up across
- * resets (for fjall we do not wipe between them), so this cache is what keeps
- * the resident memory bounded.
+ * Size of the fjall block-cache for the fuzz session. The keyspace stays open
+ * across resets, so this cache is what keeps the resident memory bounded.
  */
 const FUZZ_FJALL_CACHE_BYTES = 128 * 1024 * 1024;
-/** Rebuild the fjall-hybrid values session every N resets to limit LSM read amplification. */
-const REBUILD_FJALL_SESSION_EVERY = 50;
+/** Rebuild reused fjall keyspaces every N resets to limit LSM write/read amplification. */
+const REBUILD_FJALL_KEYSPACE_EVERY = 50;
 /**
  * Resolve the directory the fuzzer should use for its on-disk database, or
  * `undefined` for an in-memory database. The dedicated `FUZZ_DB_SUBDIR` is
@@ -71,11 +70,10 @@ export async function mainFuzz(fuzzConfig, withRelPath) {
         logger.info `🗄️ Fuzz persistent backend: ${hybridStateBackend}.`;
     }
     let runningNode = null;
-    // The fjall values keyspace is opened once per fuzz session and reused on
-    // every reset, because opening it is the slow part. Only the in-memory blocks
-    // and leaf sets are rebuilt for each vector. fjall-hybrid only.
-    let fjallSession = null;
-    // Track how many times resetState has been called for periodic fjall session rebuilds.
+    // The fjall keyspace is opened once per fuzz session and reused on every
+    // reset, because opening it is the slow part.
+    let fjallKeyspace = null;
+    // Track how many times resetState has been called for periodic fjall keyspace rebuilds.
     let resetCount = 0;
     // Set when close() starts. Guards resetState so a fuzz command arriving
     // mid-shutdown can't build a fresh node that close() then orphans.
@@ -143,45 +141,67 @@ export async function mainFuzz(fuzzConfig, withRelPath) {
                         // db too much. Tiny stays uncompressed, its db is small and speed matters more.
                         ephemeral: isPersistent,
                         stateBackend: isPersistent ? hybridStateBackend : "fjall",
-                        // Reuse the session keyspace (fjall-hybrid only, other backends
-                        // ignore it). Nothing to pass for the in-memory fallback.
-                        sharedFjallSession: hybridStateBackend === "fjall-hybrid" ? (fjallSession ?? undefined) : undefined,
+                        // Reuse the keyspace for both fjall backends. Nothing to pass for
+                        // the in-memory fallback.
+                        sharedFjallKeyspace: fjallKeyspace ?? undefined,
                     });
                 };
                 if (fuzzDbBase !== undefined) {
                     try {
+                        const fjallKeyspacePath = withRelPath(fuzzDbBase);
                         if (hybridStateBackend === FUZZ_DB_FJALL) {
-                            // fjall-hybrid: manage a reused values session.
-                            // Rebuild it periodically to avoid LSM read amplification.
-                            const fjallSessionPath = `${withRelPath(fuzzDbBase)}/${FUZZ_FJALL_VALUES_SUBDIR}`;
-                            if (resetCount === 1) {
+                            // fjall-hybrid: values pile up across resets, so rebuild the
+                            // keyspace periodically to avoid LSM read amplification.
+                            if (resetCount === 1 || fjallKeyspace === null) {
                                 // First reset: start from a clean slate.
                                 await wipeFuzzDb(fuzzDbBase);
-                                fjallSession = await FjallValuesSession.open(fjallSessionPath, {
+                                fjallKeyspace = await FjallRoot.open(fjallKeyspacePath, {
                                     ephemeral: true,
                                     cacheSizeBytes: FUZZ_FJALL_CACHE_BYTES,
                                 });
-                                logger.info `🗄️ Opened reusable fjall values session at ${fjallSessionPath}`;
+                                logger.info `🗄️ Opened reusable fjall keyspace at ${fjallKeyspacePath}`;
                             }
-                            if (resetCount % REBUILD_FJALL_SESSION_EVERY === 0 && fjallSession !== null) {
-                                // Periodic rebuild: close, wipe session dir, and reopen.
-                                const session = fjallSession;
-                                fjallSession = null;
-                                await session.close().catch(() => { });
-                                await wipeFuzzDb(fjallSessionPath).catch(() => { });
-                            }
-                            if (fjallSession === null) {
-                                // No active session: create a fresh one.
-                                fjallSession = await FjallValuesSession.open(fjallSessionPath, {
+                            else if (resetCount % REBUILD_FJALL_KEYSPACE_EVERY === 0) {
+                                // Periodic rebuild: close, wipe keyspace dir, and reopen.
+                                const keyspace = fjallKeyspace;
+                                fjallKeyspace = null;
+                                await keyspace.close().catch(() => { });
+                                await wipeFuzzDb(fuzzDbBase).catch(() => { });
+                                fjallKeyspace = await FjallRoot.open(fjallKeyspacePath, {
                                     ephemeral: true,
                                     cacheSizeBytes: FUZZ_FJALL_CACHE_BYTES,
                                 });
-                                logger.info `🗄️ Opened reusable fjall values session at ${fjallSessionPath}`;
+                                logger.info `🗄️ Rebuilt reusable fjall keyspace at ${fjallKeyspacePath}`;
                             }
                         }
                         else {
-                            // Other backends ("fjall"): wipe and reopen on every reset.
-                            await wipeFuzzDb(fuzzDbBase);
+                            // full-fjall: keep one keyspace open and recycle only the five
+                            // partitions used by FjallBlocks/FjallStates.
+                            if (resetCount === 1 || fjallKeyspace === null) {
+                                await wipeFuzzDb(fuzzDbBase);
+                                fjallKeyspace = await FjallRoot.open(fjallKeyspacePath, {
+                                    ephemeral: true,
+                                    cacheSizeBytes: FUZZ_FJALL_CACHE_BYTES,
+                                });
+                                logger.info `🗄️ Opened reusable fjall keyspace at ${fjallKeyspacePath}`;
+                            }
+                            else if (resetCount % REBUILD_FJALL_KEYSPACE_EVERY === 0) {
+                                // Periodic rebuild: delete/recreate keeps correctness, but a
+                                // long-lived keyspace accumulates fjall write amplification.
+                                const keyspace = fjallKeyspace;
+                                fjallKeyspace = null;
+                                await keyspace.close().catch(() => { });
+                                await wipeFuzzDb(fuzzDbBase).catch(() => { });
+                                fjallKeyspace = await FjallRoot.open(fjallKeyspacePath, {
+                                    ephemeral: true,
+                                    cacheSizeBytes: FUZZ_FJALL_CACHE_BYTES,
+                                });
+                                logger.info `🗄️ Rebuilt reusable fjall keyspace at ${fjallKeyspacePath}`;
+                            }
+                            else if (fjallKeyspace !== null) {
+                                const keyspace = fjallKeyspace;
+                                await Promise.all(FUZZ_FJALL_PARTITIONS.map((name) => keyspace.deletePartition(name)));
+                            }
                         }
                         runningNode = await buildNode(fuzzDbBase);
                         return await runningNode.getBestStateRootHash();
@@ -210,9 +230,9 @@ export async function mainFuzz(fuzzConfig, withRelPath) {
             isClosing = true;
             // Stop accepting connections + unlink the socket.
             closeFuzzTarget();
-            // Drain the active session (flush + close DB). Swallow errors so a
+            // Drain the active reset (flush + close DB). Swallow errors so a
             // failing close still lets the process exit 0; the db is wiped next.
-            // The node references the shared fjall session, so it must close first.
+            // The node references the shared fjall keyspace, so it must close first.
             if (activeReset !== null) {
                 await activeReset.catch((e) => logger.error `Error waiting for fuzz reset: ${e}`);
             }
@@ -221,11 +241,11 @@ export async function mainFuzz(fuzzConfig, withRelPath) {
                 runningNode = null;
                 await node.close().catch((e) => logger.error `Error closing fuzz node: ${e}`);
             }
-            // Release the reused fjall values keyspace before wiping its files.
-            if (fjallSession !== null) {
-                const session = fjallSession;
-                fjallSession = null;
-                await session.close().catch((e) => logger.error `Error closing fjall session: ${e}`);
+            // Release the reused fjall keyspace before wiping its files.
+            if (fjallKeyspace !== null) {
+                const keyspace = fjallKeyspace;
+                fjallKeyspace = null;
+                await keyspace.close().catch((e) => logger.error `Error closing fjall keyspace: ${e}`);
             }
             if (fuzzDbBase !== undefined) {
                 await wipeFuzzDb(fuzzDbBase).catch(() => { });

package/packages/jam/node/main-importer.d.ts

@@ -1,4 +1,4 @@
-import { type FjallValuesSession } from "#@typeberry/workers-api-node";
+import { type FjallRoot } from "#@typeberry/workers-api-node";
 import type { JamConfig } from "./jam-config.js";
 import type { NodeApi } from "./main.js";
 export type StateBackend = "fjall" | "fjall-hybrid";
@@ -11,11 +11,10 @@ export type ImporterOptions = {
     /** Persistent backend used when `databaseBasePath` is set. Defaults to fjall. */
     stateBackend?: StateBackend;
     /**
-     * Reuse an already-open fjall values session instead of opening a fresh
-     * keyspace. Only used when `stateBackend === "fjall-hybrid"`. The fuzz target
-     * opens one per run and reuses it across resets.
+     * Reuse an already-open fjall keyspace instead of opening a fresh keyspace
+     * from `dbPath`. Used by fjall and fjall-hybrid fuzz targets.
      */
-    sharedFjallSession?: FjallValuesSession;
+    sharedFjallKeyspace?: FjallRoot;
 };
 export declare function mainImporter(config: JamConfig, withRelPath: (v: string) => string, options?: ImporterOptions): Promise<NodeApi>;
 //# sourceMappingURL=main-importer.d.ts.map

package/packages/jam/node/main-importer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main-importer.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main-importer.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,cAAc,CAAC;AAEpD,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,+FAA+F;IAC/F,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iFAAiF;IACjF,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAClC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,OAAO,CAAC,CAoGlB"}
+{"version":3,"file":"main-importer.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main-importer.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,SAAS,EAA4D,MAAM,6BAA6B,CAAC;AAEvH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,cAAc,CAAC;AAEpD,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,+FAA+F;IAC/F,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iFAAiF;IACjF,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAClC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,OAAO,CAAC,CAqGlB"}

package/packages/jam/node/main-importer.js

@@ -6,7 +6,7 @@ import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
 import { createImporter, ImporterConfig } from "#@typeberry/importer";
 import { tryAsU16 } from "#@typeberry/numbers";
 import { CURRENT_SUITE, CURRENT_VERSION, Result, resultToString, version } from "#@typeberry/utils";
-import { FjallWorkerConfig, HybridWorkerConfig, InMemWorkerConfig, } from "#@typeberry/workers-api-node";
+import { FjallWorkerConfig, HybridWorkerConfig, InMemWorkerConfig } from "#@typeberry/workers-api-node";
 import { getChainSpec, getDatabasePath, initializeDatabase, logger } from "./common.js";
 const zeroHash = Bytes.zero(HASH_SIZE).asOpaque();
 export async function mainImporter(config, withRelPath, options = {}) {
@@ -48,7 +48,7 @@ export async function mainImporter(config, withRelPath, options = {}) {
                 workerParams,
                 ephemeral,
                 compression,
-                sharedFjallSession: options.sharedFjallSession,
+                sharedFjallKeyspace: options.sharedFjallKeyspace,
             })
             : FjallWorkerConfig.new({
                 nodeName,
@@ -57,6 +57,7 @@ export async function mainImporter(config, withRelPath, options = {}) {
                 dbPath,
                 workerParams,
                 ephemeral,
+                sharedFjallKeyspace: options.sharedFjallKeyspace,
             });
     // Initialize the database with genesis state and block if there isn't one.
     logger.info `🛢️ Opening database at ${dbPath}`;

package/packages/workers/api-node/config.d.ts

@@ -2,11 +2,11 @@ import type { MessagePort } from "node:worker_threads";
 import { type Decode, type Encode } from "#@typeberry/codec";
 import { ChainSpec } from "#@typeberry/config";
 import { type BlocksDb, type RootDb, type SerializedStatesDb } from "#@typeberry/database";
-import { FjallValuesSession } from "#@typeberry/database-fjall";
+import { FjallRoot, FjallValuesSession } from "#@typeberry/database-fjall";
 import { Blake2b } from "#@typeberry/hash";
 import type { WorkerConfig } from "#@typeberry/workers-api";
 import { ThreadPort, type TransferablePort } from "./port.js";
-export { FjallValuesSession };
+export { FjallRoot, FjallValuesSession };
 /** Persistent regular-node backend. */
 export type PersistentBackend = "fjall";
 /** Transferable worker config for persistent regular-node workers. */
@@ -21,7 +21,8 @@ export declare class FjallWorkerConfig<T = void> implements WorkerConfig<T, Bloc
     readonly ports: Map<string, ThreadPort>;
     readonly ephemeral: boolean;
     readonly cacheSizeBytes: number | undefined;
-    static new<T>({ nodeName, chainSpec, workerParams, dbPath, blake2b, ports, ephemeral, cacheSizeBytes, }: {
+    private readonly sharedFjallKeyspace;
+    static new<T>({ nodeName, chainSpec, workerParams, dbPath, blake2b, ports, ephemeral, cacheSizeBytes, sharedFjallKeyspace, }: {
         nodeName: string;
         chainSpec: ChainSpec;
         workerParams: T;
@@ -30,6 +31,7 @@ export declare class FjallWorkerConfig<T = void> implements WorkerConfig<T, Bloc
         ports?: Map<string, ThreadPort>;
         ephemeral?: boolean;
         cacheSizeBytes?: number;
+        sharedFjallKeyspace?: FjallRoot;
     }): FjallWorkerConfig<T>;
     /** Restore node config from a transferable config object. */
     static fromTransferable<T>(decodeParams: Decode<T>, config: TransferableConfig): Promise<FjallWorkerConfig<T>>;
@@ -109,7 +111,7 @@ export declare class HybridWorkerConfig<T = undefined> implements WorkerConfig<T
     readonly ephemeral: boolean;
     readonly compression: boolean;
     private readonly states;
-    static new<T>({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, sharedFjallSession, }: {
+    static new<T>({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, sharedFjallKeyspace, }: {
         nodeName: string;
         chainSpec: ChainSpec;
         workerParams: T;
@@ -118,11 +120,11 @@ export declare class HybridWorkerConfig<T = undefined> implements WorkerConfig<T
         ephemeral?: boolean;
         compression?: boolean;
         /**
-         * Reuse an already-open fjall values session instead of opening a fresh
-         * keyspace. The fuzz target opens one per run and passes it on every reset,
-         * so only the in-memory blocks/leaf sets are rebuilt per vector.
+         * Reuse an already-open fjall keyspace instead of opening a fresh keyspace.
+         * The fuzz target opens one per run and passes it on every reset, so only
+         * the in-memory blocks/leaf sets are rebuilt per vector.
          */
-        sharedFjallSession?: FjallValuesSession;
+        sharedFjallKeyspace?: FjallRoot;
     }): Promise<HybridWorkerConfig<T>>;
     private readonly blocks;
     private constructor();

package/packages/workers/api-node/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/config.ts"],"names":[],"mappings":"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"}

package/packages/workers/api-node/config.js

@@ -4,9 +4,9 @@ import { InMemoryBlocks, InMemorySerializedStates, } from "#@typeberry/database"
 import { FjallBlocks, HybridSerializedStates as FjallHybridSerializedStates, FjallRoot, FjallStates, FjallValuesSession, } from "#@typeberry/database-fjall";
 import { Blake2b } from "#@typeberry/hash";
 import { ThreadPort } from "./port.js";
-// Re-exported so the fuzz target can open one values session per run and reuse
-// it across resets (see `HybridWorkerConfig` / `mainFuzz`).
-export { FjallValuesSession };
+// Re-exported so the fuzz target can open one keyspace per run and reuse it
+// across resets.
+export { FjallRoot, FjallValuesSession };
 /** Worker config for node.js, backed by a shared fjall engine. */
 export class FjallWorkerConfig {
     nodeName;
@@ -17,8 +17,9 @@ export class FjallWorkerConfig {
     ports;
     ephemeral;
     cacheSizeBytes;
-    static new({ nodeName, chainSpec, workerParams, dbPath, blake2b, ports = new Map(), ephemeral = false, cacheSizeBytes, }) {
-        return new FjallWorkerConfig(nodeName, chainSpec, workerParams, dbPath, blake2b, ports, ephemeral, cacheSizeBytes);
+    sharedFjallKeyspace;
+    static new({ nodeName, chainSpec, workerParams, dbPath, blake2b, ports = new Map(), ephemeral = false, cacheSizeBytes, sharedFjallKeyspace, }) {
+        return new FjallWorkerConfig(nodeName, chainSpec, workerParams, dbPath, blake2b, ports, ephemeral, cacheSizeBytes, sharedFjallKeyspace);
     }
     /** Restore node config from a transferable config object. */
     static async fromTransferable(decodeParams, config) {
@@ -38,7 +39,7 @@ export class FjallWorkerConfig {
     }
     constructor(nodeName, chainSpec, workerParams, dbPath, blake2b, ports, 
     // Kept for the fuzz/importer path. When set, persist() is skipped.
-    ephemeral = false, cacheSizeBytes = undefined) {
+    ephemeral = false, cacheSizeBytes = undefined, sharedFjallKeyspace = undefined) {
         this.nodeName = nodeName;
         this.chainSpec = chainSpec;
         this.workerParams = workerParams;
@@ -47,13 +48,19 @@ export class FjallWorkerConfig {
         this.ports = ports;
         this.ephemeral = ephemeral;
         this.cacheSizeBytes = cacheSizeBytes;
+        this.sharedFjallKeyspace = sharedFjallKeyspace;
     }
     async openDatabase(options = { readonly: true }) {
-        const fjall = await FjallRoot.open(this.dbPath, {
-            readOnly: options.readonly,
-            ephemeral: this.ephemeral,
-            cacheSizeBytes: this.cacheSizeBytes,
-        });
+        if (this.sharedFjallKeyspace !== undefined && options.readonly) {
+            throw new Error("Cannot open a read-only fjall database from a shared writable keyspace.");
+        }
+        const fjall = this.sharedFjallKeyspace ??
+            (await FjallRoot.open(this.dbPath, {
+                readOnly: options.readonly,
+                ephemeral: this.ephemeral,
+                cacheSizeBytes: this.cacheSizeBytes,
+            }));
+        const ownsFjall = this.sharedFjallKeyspace === undefined;
         let blocks = null;
         let states = null;
         try {
@@ -63,7 +70,9 @@ export class FjallWorkerConfig {
             ]);
         }
         catch (e) {
-            await fjall.close();
+            if (ownsFjall) {
+                await fjall.close();
+            }
             throw e;
         }
         return {
@@ -82,7 +91,9 @@ export class FjallWorkerConfig {
             close: async () => {
                 blocks = null;
                 states = null;
-                await fjall.close();
+                if (ownsFjall) {
+                    await fjall.close();
+                }
             },
         };
     }
@@ -181,11 +192,11 @@ export class HybridWorkerConfig {
     ephemeral;
     compression;
     states;
-    static async new({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral = false, compression = true, sharedFjallSession, }) {
+    static async new({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral = false, compression = true, sharedFjallKeyspace, }) {
         // The values store is created once here and shared across reopen. When a
-        // session is given (fuzz reset reuse) we wrap it instead of opening a new one.
-        const states = sharedFjallSession !== undefined
-            ? FjallHybridSerializedStates.fromSession(chainSpec, blake2b, sharedFjallSession)
+        // keyspace is given (fuzz reset reuse) we wrap it instead of opening a new one.
+        const states = sharedFjallKeyspace !== undefined
+            ? await FjallHybridSerializedStates.fromRoot(chainSpec, blake2b, sharedFjallKeyspace)
             : await FjallHybridSerializedStates.new({ spec: chainSpec, blake2b, dbPath, ephemeral });
         return new HybridWorkerConfig(nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, states);
     }

package/packages/workers/api-node/config.test.js

@@ -4,6 +4,7 @@ import { describe, it } from "node:test";
 import { Bytes } from "#@typeberry/bytes";
 import { codec } from "#@typeberry/codec";
 import { tinyChainSpec } from "#@typeberry/config";
+import { FjallRoot } from "#@typeberry/database-fjall";
 import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
 import { tryAsU32 } from "#@typeberry/numbers";
 import { configTransferList, FjallWorkerConfig, HybridWorkerConfig } from "./config.js";
@@ -56,6 +57,30 @@ describe("FjallWorkerConfig transfer list", () => {
             fs.rmSync(dbPath, { recursive: true, force: true });
         }
     });
+    it("can borrow a shared fjall root without closing it", async () => {
+        const blake2b = await Blake2b.createHasher();
+        const dbPath = fs.mkdtempSync("typeberry-fjall-worker-shared-");
+        const root = await FjallRoot.open(dbPath, { ephemeral: true });
+        const config = FjallWorkerConfig.new({
+            nodeName: "node",
+            chainSpec: spec,
+            workerParams: undefined,
+            dbPath,
+            blake2b,
+            sharedFjallKeyspace: root,
+        });
+        try {
+            const db = await config.openDatabase({ readonly: false });
+            await db.close();
+            await root.deletePartition("headers");
+            const headers = await root.writablePartition("headers");
+            assert.strictEqual(headers.get(Bytes.zero(HASH_SIZE).raw), null);
+        }
+        finally {
+            await root.close();
+            fs.rmSync(dbPath, { recursive: true, force: true });
+        }
+    });
 });
 describe("HybridWorkerConfig", () => {
     it("constructs and opens a fjall-backed hybrid db", async () => {
@@ -87,4 +112,35 @@ describe("HybridWorkerConfig", () => {
             fs.rmSync(dbPath, { recursive: true, force: true });
         }
     });
+    it("can borrow a shared fjall root for the values store", async () => {
+        const blake2b = await Blake2b.createHasher();
+        const dbPath = fs.mkdtempSync("typeberry-hybrid-fjall-shared-");
+        const root = await FjallRoot.open(dbPath, { ephemeral: true });
+        try {
+            const config = await HybridWorkerConfig.new({
+                nodeName: "node",
+                chainSpec: spec,
+                workerParams: undefined,
+                blake2b,
+                dbPath,
+                ephemeral: true,
+                sharedFjallKeyspace: root,
+            });
+            const db = await config.openDatabase({ readonly: false });
+            const states = db.getStatesDb();
+            try {
+                assert.notStrictEqual(db.getBlocksDb(), undefined);
+                assert.notStrictEqual(states, undefined);
+            }
+            finally {
+                await states.close();
+                await db.close();
+            }
+            await root.deletePartition("values");
+        }
+        finally {
+            await root.close();
+            fs.rmSync(dbPath, { recursive: true, force: true });
+        }
+    });
 });