@typeberry/lib 0.8.4-7cde74e → 0.8.4-7d1719f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.8.4-7cde74e",
+  "version": "0.8.4-7d1719f",
   "description": "Typeberry Library",
   "main": "./bin/lib/index.js",
   "types": "./bin/lib/index.d.ts",
@@ -216,6 +216,8 @@
     "#@typeberry/config-node/*": "./packages/jam/config-node/*",
     "#@typeberry/database": "./packages/jam/database/index.js",
     "#@typeberry/database/*": "./packages/jam/database/*",
+    "#@typeberry/database-fjall": "./packages/jam/database-fjall/index.js",
+    "#@typeberry/database-fjall/*": "./packages/jam/database-fjall/*",
     "#@typeberry/database-lmdb": "./packages/jam/database-lmdb/index.js",
     "#@typeberry/database-lmdb/*": "./packages/jam/database-lmdb/*",
     "#@typeberry/executor": "./packages/jam/executor/index.js",

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

@@ -0,0 +1,45 @@
+import type { HeaderHash, StateRootHash } from "#@typeberry/block";
+import type { ChainSpec } from "#@typeberry/config";
+import { type InitStatesDb, LeafDb, type StatesDb, StateUpdateError } from "#@typeberry/database";
+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";
+/**
+ * Hybrid serialized-states db (fjall variant).
+ *
+ * States (leafs) are kept in-memory, but large values are persisted to fjall.
+ * Reads go straight to fjall, which keeps its own (bounded) block cache.
+ * Designed for long fuzzing, used with pruning to keep heap usage bounded.
+ *
+ * Behaviourally identical to the LMDB hybrid db; differences are mechanical:
+ * construction is async, and value writes are ordered + flushed explicitly
+ * because fjall has no transaction primitive.
+ */
+export declare class HybridSerializedStates implements StatesDb<SerializedState<LeafDb>>, InitStatesDb<StateEntries> {
+    private readonly spec;
+    private readonly blake2b;
+    private readonly root;
+    private readonly values;
+    static new({ spec, blake2b, dbPath, ephemeral, }: {
+        spec: ChainSpec;
+        blake2b: Blake2b;
+        dbPath: string;
+        ephemeral?: boolean;
+    }): Promise<HybridSerializedStates>;
+    private readonly inMemStates;
+    private readonly valuesDb;
+    private constructor();
+    insertInitialState(headerHash: HeaderHash, entries: StateEntries): Promise<Result<OK, StateUpdateError>>;
+    updateAndSetState(header: HeaderHash, state: SerializedState<LeafDb>, update: Partial<State & ServicesUpdate>): Promise<Result<OK, StateUpdateError>>;
+    getStateRoot(state: SerializedState<LeafDb>): Promise<StateRootHash>;
+    getState(header: HeaderHash): SerializedState<LeafDb> | null;
+    markUnused(header: HeaderHash): void;
+    diskSizeInBytes(): number | null;
+    close(): Promise<void>;
+    /** Write new large values to fjall, then flush. */
+    private writeValues;
+    /** Read a value from fjall. */
+    private readValue;
+}
+//# sourceMappingURL=hybrid-states.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hybrid-states.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/hybrid-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,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,eAAe,EACf,KAAK,YAAY,EAGlB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAK9C;;;;;;;;;;GAUG;AACH,qBAAa,sBAAuB,YAAW,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC;IAsBxG,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;WAxBZ,GAAG,CAAC,EACf,IAAI,EACJ,OAAO,EACP,MAAM,EACN,SAAS,GACV,EAAE;QACD,IAAI,EAAE,SAAS,CAAC;QAChB,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAMnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyE;IAErG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC,OAAO;IASD,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAcxG,iBAAiB,CACrB,MAAM,EAAE,UAAU,EAClB,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;IAkBlC,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAI1E,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,IAAI;IAS5D,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAMpC,eAAe,IAAI,MAAM,GAAG,IAAI;IAI1B,KAAK;IAIX,mDAAmD;YACrC,WAAW;IAgBzB,+BAA+B;IAC/B,OAAO,CAAC,SAAS;CAOlB"}

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

@@ -0,0 +1,113 @@
+import { HashDictionary, SortedSet } from "#@typeberry/collections";
+import { LeafDb, StateUpdateError, updateLeafs, } from "#@typeberry/database";
+import { Logger } from "#@typeberry/logger";
+import { SerializedState, StateEntryUpdateAction, serializeStateUpdate, } from "#@typeberry/state-merkleization";
+import { leafComparator } from "#@typeberry/trie";
+import { OK, Result } from "#@typeberry/utils";
+import { FjallRoot, toUint8Array } from "./root.js";
+const logger = Logger.new(import.meta.filename, "db");
+/**
+ * Hybrid serialized-states db (fjall variant).
+ *
+ * States (leafs) are kept in-memory, but large values are persisted to fjall.
+ * Reads go straight to fjall, which keeps its own (bounded) block cache.
+ * Designed for long fuzzing, used with pruning to keep heap usage bounded.
+ *
+ * Behaviourally identical to the LMDB hybrid db; differences are mechanical:
+ * construction is async, and value writes are ordered + flushed explicitly
+ * because fjall has no transaction primitive.
+ */
+export class HybridSerializedStates {
+    spec;
+    blake2b;
+    root;
+    values;
+    static async new({ spec, blake2b, dbPath, ephemeral, }) {
+        const root = await FjallRoot.open(dbPath, { ephemeral });
+        const values = await root.partition("values");
+        return new HybridSerializedStates(spec, blake2b, root, values);
+    }
+    inMemStates = HashDictionary.new();
+    // A single shared values accessor reused by every `LeafDb` we hand out.
+    valuesDb;
+    constructor(spec, blake2b, root, values) {
+        this.spec = spec;
+        this.blake2b = blake2b;
+        this.root = root;
+        this.values = values;
+        this.valuesDb = { get: (key) => this.readValue(key) };
+    }
+    async insertInitialState(headerHash, entries) {
+        const { values, leafs } = updateLeafs(SortedSet.fromArray(leafComparator, []), this.blake2b, Array.from(entries, (x) => [StateEntryUpdateAction.Insert, x[0], x[1]]));
+        const res = await this.writeValues(values);
+        if (res.isError) {
+            return res;
+        }
+        this.inMemStates.set(headerHash, leafs);
+        return Result.ok(OK);
+    }
+    async updateAndSetState(header, state, update) {
+        const updatedValues = serializeStateUpdate(this.spec, this.blake2b, update);
+        // Clone the leaf set before mutating: the previous state keeps using its own.
+        const newLeafs = SortedSet.fromSortedArray(leafComparator, state.backend.leafs.array);
+        const { values, leafs } = updateLeafs(newLeafs, this.blake2b, updatedValues);
+        const res = await this.writeValues(values);
+        if (res.isError) {
+            // Leave the caller's state untouched: its new leaves would reference
+            // values that never reached disk.
+            return res;
+        }
+        // Re-create the lookup with the shared values accessor only once the new
+        // values are durably written.
+        state.updateBackend(LeafDb.fromLeaves(leafs, this.valuesDb));
+        this.inMemStates.set(header, leafs);
+        return Result.ok(OK);
+    }
+    async getStateRoot(state) {
+        return state.backend.getStateRoot(this.blake2b);
+    }
+    getState(header) {
+        const leafs = this.inMemStates.get(header);
+        if (leafs === undefined) {
+            return null;
+        }
+        const leafDb = LeafDb.fromLeaves(leafs, this.valuesDb);
+        return SerializedState.new(this.spec, this.blake2b, leafDb);
+    }
+    markUnused(header) {
+        // We only remove the state from memory - values are not pruned at all,
+        // but since they are stored on disk we should be safe.
+        this.inMemStates.delete(header);
+    }
+    diskSizeInBytes() {
+        return this.root.sizeInBytes();
+    }
+    async close() {
+        await this.root.close();
+    }
+    /** Write new large values to fjall, then flush. */
+    async writeValues(values) {
+        if (values.length === 0) {
+            return Result.ok(OK);
+        }
+        try {
+            for (const [hash, val] of values) {
+                await this.values.insert(hash.raw, val.raw);
+            }
+            await this.root.persist();
+        }
+        catch (e) {
+            logger.error `${e}`;
+            return Result.error(StateUpdateError.Commit, () => `Failed to commit values: ${e}`);
+        }
+        return Result.ok(OK);
+    }
+    /** Read a value from fjall. */
+    readValue(key) {
+        const val = toUint8Array(this.values.get(key.raw));
+        if (val === null) {
+            throw new Error(`Missing value at key: ${key}`);
+        }
+        return val;
+    }
+}

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

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

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

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

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

@@ -0,0 +1,83 @@
+import assert from "node:assert";
+import * as fs from "node:fs";
+import { afterEach, before, beforeEach, describe, it } from "node:test";
+import { Bytes, BytesBlob } from "#@typeberry/bytes";
+import { tinyChainSpec } from "#@typeberry/config";
+import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
+import { InMemoryState } from "#@typeberry/state";
+import { StateEntries } from "#@typeberry/state-merkleization";
+import { deepEqual, OK, Result } from "#@typeberry/utils";
+import { HybridSerializedStates } from "./hybrid-states.js";
+let blake2b;
+before(async () => {
+    blake2b = await Blake2b.createHasher();
+});
+function createTempDir(suffix = "fjall-hybrid") {
+    return fs.mkdtempSync(`typeberry-${suffix}`);
+}
+describe("Fjall hybrid serialized states", () => {
+    const spec = tinyChainSpec;
+    const headerHash = Bytes.zero(HASH_SIZE).asOpaque();
+    let dbPath = "";
+    beforeEach(() => {
+        dbPath = createTempDir();
+    });
+    afterEach(() => {
+        fs.rmSync(dbPath, { recursive: true });
+    });
+    it("round-trips an initial state through the on-disk values store", async () => {
+        const states = await HybridSerializedStates.new({ spec, blake2b, dbPath });
+        try {
+            const empty = InMemoryState.empty(spec);
+            const serialized = StateEntries.serializeInMemory(spec, blake2b, empty);
+            const expectedRoot = serialized.getRootHash(blake2b);
+            const res = await states.insertInitialState(headerHash, serialized);
+            deepEqual(res, Result.ok(OK));
+            const state = states.getState(headerHash);
+            assert.ok(state !== null);
+            const stateRoot = await states.getStateRoot(state);
+            assert.strictEqual(`${stateRoot}`, `${expectedRoot}`);
+            deepEqual(InMemoryState.copyFrom(spec, state, new Map()), empty);
+        }
+        finally {
+            await states.close();
+        }
+    });
+    it("reads large values back from disk", async () => {
+        const states = await HybridSerializedStates.new({ spec, blake2b, dbPath });
+        try {
+            // > 32 bytes => stored in the values db (not embedded in the leaf).
+            const big1 = BytesBlob.blobFromString("x".repeat(100));
+            const big2 = BytesBlob.blobFromString("y".repeat(100));
+            const key1 = Bytes.fill(HASH_SIZE, 1).asOpaque();
+            const key2 = Bytes.fill(HASH_SIZE, 2).asOpaque();
+            const entries = StateEntries.fromEntriesUnsafe([
+                [key1, big1],
+                [key2, big2],
+            ]);
+            const res = await states.insertInitialState(headerHash, entries);
+            deepEqual(res, Result.ok(OK));
+            const state = states.getState(headerHash);
+            assert.ok(state !== null);
+            assert.strictEqual(`${state.backend.get(key2)}`, `${big2}`);
+            assert.strictEqual(`${state.backend.get(key1)}`, `${big1}`);
+        }
+        finally {
+            await states.close();
+        }
+    });
+    it("drops the leaf set on markUnused while values stay on disk", async () => {
+        const states = await HybridSerializedStates.new({ spec, blake2b, dbPath });
+        try {
+            const empty = InMemoryState.empty(spec);
+            const serialized = StateEntries.serializeInMemory(spec, blake2b, empty);
+            await states.insertInitialState(headerHash, serialized);
+            assert.ok(states.getState(headerHash) !== null);
+            states.markUnused(headerHash);
+            assert.strictEqual(states.getState(headerHash), null);
+        }
+        finally {
+            await states.close();
+        }
+    });
+});

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

@@ -0,0 +1,3 @@
+export * from "./hybrid-states.js";
+export * from "./root.js";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC"}

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

@@ -0,0 +1,2 @@
+export * from "./hybrid-states.js";
+export * from "./root.js";

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

@@ -0,0 +1,52 @@
+import { type Partition } from "@fjall-js/fjall";
+export type { Partition };
+/**
+ * Normalize a value read from fjall (a Node `Buffer`) into a plain `Uint8Array`.
+ */
+export declare function toUint8Array(value: Buffer | null): Uint8Array | null;
+export type FjallRootOptions = {
+    /**
+     * When set, durability flushes (`persist`) are skipped entirely.
+     *
+     * Only safe for throwaway databases (e.g. the fuzz target, which wipes on
+     * every reset). Mirrors LMDB's `noSync`.
+     */
+    ephemeral?: boolean;
+};
+/**
+ * A thin abstraction over the fjall keyspace.
+ *
+ * Unlike LMDB (a memory-mapped B-tree), fjall is an LSM-tree that reads/writes
+ * through regular file I/O, so its working set is bounded by an explicit block
+ * cache rather than the whole mmap. LMDB has been causing oom issues because
+ * of that.
+ */
+export declare class FjallRoot {
+    private readonly keyspace;
+    /** Path of the underlying keyspace directory, used to report on-disk usage. */
+    private readonly dbPath;
+    private readonly options;
+    private constructor();
+    /** Open (or create) a fjall keyspace at the given path. */
+    static open(dbPath: string, options: FjallRootOptions): Promise<FjallRoot>;
+    /** Open (or create) a partition under this keyspace. */
+    partition(name: string): Promise<Partition>;
+    /**
+     * Flush the journal to disk so prior writes survive a crash.
+     *
+     * Call after a logically-complete unit of work (one block, one state commit).
+     * A no-op for ephemeral databases.
+     */
+    persist(): Promise<void>;
+    /**
+     * Apparent on-disk size of the keyspace directory, in bytes.
+     *
+     * Returns `null` if the directory cannot be walked (e.g. not yet created).
+     * Unlike LMDB's single `data.mdb`, a fjall keyspace is a directory of
+     * partition and journal files, so we sum it recursively.
+     */
+    sizeInBytes(): number | null;
+    /** Persist with `sync-all` and release the keyspace handle. */
+    close(): Promise<void>;
+}
+//# sourceMappingURL=root.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-fjall/root.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEtE,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAKpE;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;;;;;;GAOG;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,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC;IAKhF,wDAAwD;IAClD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAIjD;;;;;OAKG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B;;;;;;OAMG;IACH,WAAW,IAAI,MAAM,GAAG,IAAI;IAQ5B,+DAA+D;IACzD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}

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

@@ -0,0 +1,85 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { open } from "@fjall-js/fjall";
+/**
+ * Normalize a value read from fjall (a Node `Buffer`) into a plain `Uint8Array`.
+ */
+export function toUint8Array(value) {
+    if (value === null) {
+        return null;
+    }
+    return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
+}
+/**
+ * A thin abstraction over the fjall keyspace.
+ *
+ * Unlike LMDB (a memory-mapped B-tree), fjall is an LSM-tree that reads/writes
+ * through regular file I/O, so its working set is bounded by an explicit block
+ * cache rather than the whole mmap. LMDB has been causing oom issues because
+ * of that.
+ */
+export class FjallRoot {
+    keyspace;
+    dbPath;
+    options;
+    constructor(keyspace, 
+    /** Path of the underlying keyspace directory, used to report on-disk usage. */
+    dbPath, options) {
+        this.keyspace = keyspace;
+        this.dbPath = dbPath;
+        this.options = options;
+    }
+    /** Open (or create) a fjall keyspace at the given path. */
+    static async open(dbPath, options) {
+        const keyspace = await open(dbPath);
+        return new FjallRoot(keyspace, dbPath, options);
+    }
+    /** Open (or create) a partition under this keyspace. */
+    async partition(name) {
+        return this.keyspace.partition(name);
+    }
+    /**
+     * Flush the journal to disk so prior writes survive a crash.
+     *
+     * Call after a logically-complete unit of work (one block, one state commit).
+     * A no-op for ephemeral databases.
+     */
+    async persist() {
+        if (this.options.ephemeral === true) {
+            return;
+        }
+        await this.keyspace.persist();
+    }
+    /**
+     * Apparent on-disk size of the keyspace directory, in bytes.
+     *
+     * Returns `null` if the directory cannot be walked (e.g. not yet created).
+     * Unlike LMDB's single `data.mdb`, a fjall keyspace is a directory of
+     * partition and journal files, so we sum it recursively.
+     */
+    sizeInBytes() {
+        try {
+            return dirSizeInBytes(this.dbPath);
+        }
+        catch {
+            return null;
+        }
+    }
+    /** Persist with `sync-all` and release the keyspace handle. */
+    async close() {
+        await this.keyspace.close();
+    }
+}
+function dirSizeInBytes(dir) {
+    let total = 0;
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const full = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            total += dirSizeInBytes(full);
+        }
+        else if (entry.isFile()) {
+            total += fs.statSync(full).size;
+        }
+    }
+    return total;
+}

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;AAOrD,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;AAOF;;;;;;;;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,uBA2GxF"}
+{"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;AAOrD,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;AAWF;;;;;;;;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,uBAqHxF"}

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

@@ -14,6 +14,9 @@ import { mainImporter } from "./main-importer.js";
 const logger = Logger.new(import.meta.filename, "fuzztarget");
 /** Dedicated subdirectory under the configured base path that the fuzzer owns and wipes. */
 const FUZZ_DB_SUBDIR = "typeberry-fuzz-db";
+const FUZZ_DB_FJALL = "fjall-hybrid";
+const FUZZ_DB_LMDB = "lmdb-hybrid";
+const FUZZ_DB_OPTIONS = [FUZZ_DB_FJALL, FUZZ_DB_LMDB];
 /**
  * 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
@@ -50,6 +53,15 @@ export async function mainFuzz(fuzzConfig, withRelPath) {
     logHostEnvironment(logger);
     const { jamNodeConfig: config } = fuzzConfig;
     const fuzzDbBase = resolveFuzzDbBase(config.node.databaseBasePath);
+    const rawFuzzDb = process.env.JAM_FUZZ_DB?.trim() ?? "";
+    // Using experimental fjall-hybrid by default, with an option to test lmdb as well.
+    const hybridStateBackend = rawFuzzDb === "" ? FUZZ_DB_FJALL : rawFuzzDb;
+    if (!isValidStateBackend(hybridStateBackend)) {
+        throw new Error(`JAM_FUZZ_DB must be one of: ${FUZZ_DB_OPTIONS} (got: "${rawFuzzDb}").`);
+    }
+    if (fuzzDbBase !== undefined) {
+        logger.info `🗄️ Fuzz persistent backend: ${hybridStateBackend}.`;
+    }
     let runningNode = null;
     const chainSpec = getChainSpec(config.node.flavor);
     const closeFuzzTarget = startFuzzTarget(fuzzConfig.version, fuzzConfig.socket, {
@@ -106,7 +118,7 @@ export async function mainFuzz(fuzzConfig, withRelPath) {
                     // spec only, where values are big) bounds its on-disk/page-cache size.
                     // Tiny stays uncompressed since its db is small and speed matters more.
                     ephemeral: isPersistent,
-                    stateBackend: isPersistent ? "hybrid" : "lmdb",
+                    stateBackend: isPersistent ? hybridStateBackend : "lmdb",
                 });
             };
             if (fuzzDbBase !== undefined) {
@@ -136,3 +148,6 @@ export async function mainFuzz(fuzzConfig, withRelPath) {
         }
     };
 }
+function isValidStateBackend(val) {
+    return FUZZ_DB_OPTIONS.indexOf(val) !== -1;
+}

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

@@ -1,13 +1,16 @@
 import type { JamConfig } from "./jam-config.js";
 import type { NodeApi } from "./main.js";
+export type StateBackend = "lmdb" | "lmdb-hybrid" | "fjall-hybrid";
 export type ImporterOptions = {
     initGenesisFromAncestry?: boolean;
     dummyFinalityDepth?: number;
     pruneBlocks?: boolean;
-    /** Open the LMDB database without fsync/compression. Only safe for throwaway dbs (e.g. fuzzing). */
+    /** Open the database without fsync/compression. Only safe for throwaway dbs (e.g. fuzzing). */
     ephemeral?: boolean;
-    /** Persistent backend to use when `databaseBasePath` is set. Defaults to full LMDB. */
-    stateBackend?: "lmdb" | "hybrid";
+    /**
+     * Persistent backend to use when `databaseBasePath` is set. Defaults to full LMDB.
+     */
+    stateBackend?: StateBackend;
 };
 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":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oGAAoG;IACpG,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;CAClC,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":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,aAAa,GAAG,cAAc,CAAC;AAEnE,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;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,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

@@ -39,8 +39,8 @@ export async function mainImporter(config, withRelPath, options = {}) {
             blake2b,
             workerParams,
         })
-        : dbBackend === "hybrid"
-            ? HybridWorkerConfig.new({
+        : dbBackend === "lmdb-hybrid" || dbBackend === "fjall-hybrid"
+            ? await HybridWorkerConfig.new({
                 nodeName,
                 chainSpec,
                 blake2b,
@@ -48,6 +48,7 @@ export async function mainImporter(config, withRelPath, options = {}) {
                 workerParams,
                 ephemeral,
                 compression,
+                backend: dbBackend === "lmdb-hybrid" ? "lmdb" : "fjall",
             })
             : LmdbWorkerConfig.new({
                 nodeName,

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

@@ -71,13 +71,19 @@ export declare class InMemWorkerConfig<T = undefined> implements WorkerConfig<T,
         readonly: boolean;
     }): RootDb<BlocksDb, SerializedStatesDb>;
 }
+/** Persistent values store backing the hybrid config. */
+export type HybridBackend = "lmdb" | "fjall";
 /**
  * Hybrid worker config for the fuzz target: in-memory blocks and leaf sets,
- * but large values persisted to LMDB.
+ * but large values persisted to disk (LMDB or fjall, selected by `backend`).
+ *
+ * The fjall backend is opt-in so its performance can be compared against LMDB
+ * before committing to it. fjall opens its keyspace asynchronously, hence the
+ * async `new`.
  *
  * Like `InMemWorkerConfig`, the blocks and leaf sets are shared across the
  * open/close/reopen dance that genesis init performs, so `openDatabase`
- * returns the same instances and a no-op close. The LMDB root is opened once
+ * returns the same instances and a no-op close. The values store is opened once
  * here and closed by `HybridSerializedStates.close()` at importer teardown.
  *
  * In-process only: it holds shared mutable state (the in-memory leaf
@@ -92,7 +98,8 @@ export declare class HybridWorkerConfig<T = undefined> implements WorkerConfig<T
     readonly dbPath: string;
     readonly ephemeral: boolean;
     readonly compression: boolean;
-    static new<T>({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, }: {
+    private readonly states;
+    static new<T>({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, backend, }: {
         nodeName: string;
         chainSpec: ChainSpec;
         workerParams: T;
@@ -100,9 +107,9 @@ export declare class HybridWorkerConfig<T = undefined> implements WorkerConfig<T
         dbPath: string;
         ephemeral?: boolean;
         compression?: boolean;
-    }): HybridWorkerConfig<T>;
+        backend?: HybridBackend;
+    }): Promise<HybridWorkerConfig<T>>;
     private readonly blocks;
-    private readonly states;
     private constructor();
     openDatabase(_options?: {
         readonly: boolean;

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

@@ -1,7 +1,8 @@
 import { Decoder, Encoder } from "#@typeberry/codec";
 import { ChainSpec } from "#@typeberry/config";
 import { InMemoryBlocks, InMemorySerializedStates, } from "#@typeberry/database";
-import { HybridSerializedStates, LmdbBlocks, LmdbRoot, LmdbStates } from "#@typeberry/database-lmdb";
+import { HybridSerializedStates as FjallHybridSerializedStates } from "#@typeberry/database-fjall";
+import { LmdbBlocks, HybridSerializedStates as LmdbHybridSerializedStates, LmdbRoot, LmdbStates, } from "#@typeberry/database-lmdb";
 import { Blake2b } from "#@typeberry/hash";
 import { ThreadPort } from "./port.js";
 /** A worker config that's usable in node.js and uses LMDB database backend. */
@@ -110,11 +111,15 @@ export class InMemWorkerConfig {
 }
 /**
  * Hybrid worker config for the fuzz target: in-memory blocks and leaf sets,
- * but large values persisted to LMDB.
+ * but large values persisted to disk (LMDB or fjall, selected by `backend`).
+ *
+ * The fjall backend is opt-in so its performance can be compared against LMDB
+ * before committing to it. fjall opens its keyspace asynchronously, hence the
+ * async `new`.
  *
  * Like `InMemWorkerConfig`, the blocks and leaf sets are shared across the
  * open/close/reopen dance that genesis init performs, so `openDatabase`
- * returns the same instances and a no-op close. The LMDB root is opened once
+ * returns the same instances and a no-op close. The values store is opened once
  * here and closed by `HybridSerializedStates.close()` at importer teardown.
  *
  * In-process only: it holds shared mutable state (the in-memory leaf
@@ -129,12 +134,17 @@ export class HybridWorkerConfig {
     dbPath;
     ephemeral;
     compression;
-    static new({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral = false, compression = true, }) {
-        return new HybridWorkerConfig(nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression);
+    states;
+    static async new({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral = false, compression = true, backend = "lmdb", }) {
+        // fjall opens its keyspace asynchronously; LMDB is synchronous. Either way
+        // the values store is created once here and shared across reopen.
+        const states = backend === "fjall"
+            ? await FjallHybridSerializedStates.new({ spec: chainSpec, blake2b, dbPath, ephemeral })
+            : LmdbHybridSerializedStates.new({ spec: chainSpec, blake2b, dbPath, ephemeral, compression, readOnly: false });
+        return new HybridWorkerConfig(nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, states);
     }
     blocks;
-    states;
-    constructor(nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression = true) {
+    constructor(nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, states) {
         this.nodeName = nodeName;
         this.chainSpec = chainSpec;
         this.workerParams = workerParams;
@@ -142,22 +152,15 @@ export class HybridWorkerConfig {
         this.dbPath = dbPath;
         this.ephemeral = ephemeral;
         this.compression = compression;
+        this.states = states;
         this.blocks = InMemoryBlocks.new();
-        this.states = HybridSerializedStates.new({
-            spec: this.chainSpec,
-            blake2b: this.blake2b,
-            dbPath: this.dbPath,
-            ephemeral: this.ephemeral,
-            compression: this.compression,
-            readOnly: false,
-        });
     }
     openDatabase(_options = { readonly: true }) {
         return {
             getBlocksDb: () => this.blocks,
             getStatesDb: () => this.states,
-            // Leaf sets and blocks live in memory; the LMDB values store is closed
-            // via states.close() at importer teardown, so this is a no-op.
+            // Leaf sets and blocks live in memory; the values store is closed via
+            // states.close() at importer teardown, so this is a no-op.
             close: async () => { },
         };
     }

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

@@ -1,11 +1,12 @@
 import assert from "node:assert";
+import * as fs from "node:fs";
 import { describe, it } from "node:test";
 import { MessageChannel } from "node:worker_threads";
 import { codec } from "#@typeberry/codec";
 import { tinyChainSpec } from "#@typeberry/config";
 import { Blake2b } from "#@typeberry/hash";
 import { tryAsU32 } from "#@typeberry/numbers";
-import { configTransferList, LmdbWorkerConfig } from "./config.js";
+import { configTransferList, HybridWorkerConfig, LmdbWorkerConfig } from "./config.js";
 import { ThreadPort } from "./port.js";
 const spec = tinyChainSpec;
 describe("LmdbWorkerConfig transfer list", () => {
@@ -39,3 +40,39 @@ describe("LmdbWorkerConfig transfer list", () => {
         }
     });
 });
+describe("HybridWorkerConfig", () => {
+    // Both persistent backends must construct asynchronously and hand out a
+    // working db. fjall is the experimental backend we want to benchmark.
+    for (const backend of ["lmdb", "fjall"]) {
+        it(`constructs and opens a ${backend}-backed hybrid db`, async () => {
+            const blake2b = await Blake2b.createHasher();
+            const dbPath = fs.mkdtempSync(`typeberry-hybrid-${backend}-`);
+            try {
+                const config = await HybridWorkerConfig.new({
+                    nodeName: "node",
+                    chainSpec: spec,
+                    workerParams: undefined,
+                    blake2b,
+                    dbPath,
+                    ephemeral: true,
+                    backend,
+                });
+                const db = config.openDatabase({ readonly: false });
+                const states = db.getStatesDb();
+                try {
+                    assert.notStrictEqual(db.getBlocksDb(), undefined);
+                    assert.notStrictEqual(states, undefined);
+                }
+                finally {
+                    // The values store owns the on-disk resources (the no-op db.close()
+                    // does not), so close it explicitly to release the fjall keyspace.
+                    await states.close();
+                    await db.close();
+                }
+            }
+            finally {
+                fs.rmSync(dbPath, { recursive: true, force: true });
+            }
+        });
+    }
+});