@typeberry/lib 0.11.0-6310ba4 → 0.11.0-9d838d3

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

@@ -8,25 +8,23 @@ 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");
 /** 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, "fjall", "lmdb"];
-/** Subdirectory (under the fuzzer's db dir) holding the reused fjall values keyspace. */
-const FUZZ_FJALL_VALUES_SUBDIR = "values-session";
+const FUZZ_DB_OPTIONS = [FUZZ_DB_FJALL, "fjall"];
+/** 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
@@ -64,7 +62,6 @@ export async function mainFuzz(fuzzConfig, withRelPath) {
     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}").`);
@@ -73,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.
@@ -144,46 +140,68 @@ export async function mainFuzz(fuzzConfig, withRelPath) {
                         // also turns on compression further down, so the big values do not grow the
                         // db too much. Tiny stays uncompressed, its db is small and speed matters more.
                         ephemeral: isPersistent,
-                        stateBackend: isPersistent ? hybridStateBackend : "lmdb",
-                        // 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,
+                        stateBackend: isPersistent ? hybridStateBackend : "fjall",
+                        // 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 {
-                            // All other backends ("fjall", "lmdb", "lmdb-hybrid"): 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();
@@ -212,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}`);
             }
@@ -223,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,25 +1,20 @@
-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 = "lmdb" | "fjall" | "lmdb-hybrid" | "fjall-hybrid";
+export type StateBackend = "fjall" | "fjall-hybrid";
 export type ImporterOptions = {
     initGenesisFromAncestry?: boolean;
     dummyFinalityDepth?: number;
     pruneBlocks?: boolean;
     /** Open the database without fsync/compression. Only safe for throwaway dbs (e.g. fuzzing). */
     ephemeral?: boolean;
-    /**
-     * Persistent backend used when `databaseBasePath` is set. Defaults to config's backend (fjall unless overridden).
-     *
-     * lmdb and lmdb-hybrid are deprecated and retained as explicit fallbacks.
-     */
+    /** 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,EAKxB,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,MAAM,GAAG,OAAO,GAAG,aAAa,GAAG,cAAc,CAAC;AAE7E,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;;;;OAIG;IACH,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,CAoHlB"}
+{"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

@@ -1,12 +1,12 @@
 import { Bytes } from "#@typeberry/bytes";
 import { PvmBackend } from "#@typeberry/config";
-import { KnownChainSpec, RegularStateBackend } from "#@typeberry/config-node";
+import { KnownChainSpec } from "#@typeberry/config-node";
 import { bandersnatch, initWasm } from "#@typeberry/crypto";
 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, LmdbWorkerConfig, } 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 = {}) {
@@ -18,13 +18,8 @@ export async function mainImporter(config, withRelPath, options = {}) {
     logger.info `🐇 Bandersnatch ${bandesnatchNative.isOk ? "native 🚀" : `using wasm: ${bandesnatchNative.error}`}`;
     // Single source of truth for the states db backend: drives both the log line
     // below and the worker config picked further down.
-    const dbBackend = config.node.databaseBasePath === undefined
-        ? "in-memory"
-        : (options.stateBackend ?? config.node.stateBackend ?? RegularStateBackend.Fjall);
+    const dbBackend = config.node.databaseBasePath === undefined ? "in-memory" : (options.stateBackend ?? "fjall");
     logger.info `🗄️ States DB: ${dbBackend}.`;
-    if (dbBackend === "lmdb" || dbBackend === "lmdb-hybrid") {
-        logger.warn `🗄️ The ${dbBackend} state backend is deprecated. Use fjall unless you need a temporary fallback.`;
-    }
     const chainSpec = getChainSpec(config.node.flavor);
     const blake2b = await Blake2b.createHasher();
     const nodeName = config.nodeName;
@@ -44,7 +39,7 @@ export async function mainImporter(config, withRelPath, options = {}) {
             blake2b,
             workerParams,
         })
-        : dbBackend === "lmdb-hybrid" || dbBackend === "fjall-hybrid"
+        : dbBackend === "fjall-hybrid"
             ? await HybridWorkerConfig.new({
                 nodeName,
                 chainSpec,
@@ -53,26 +48,17 @@ export async function mainImporter(config, withRelPath, options = {}) {
                 workerParams,
                 ephemeral,
                 compression,
-                backend: dbBackend === "lmdb-hybrid" ? "lmdb" : "fjall",
-                sharedFjallSession: options.sharedFjallSession,
+                sharedFjallKeyspace: options.sharedFjallKeyspace,
             })
-            : dbBackend === "fjall"
-                ? FjallWorkerConfig.new({
-                    nodeName,
-                    chainSpec,
-                    blake2b,
-                    dbPath,
-                    workerParams,
-                    ephemeral,
-                })
-                : LmdbWorkerConfig.new({
-                    nodeName,
-                    chainSpec,
-                    blake2b,
-                    dbPath,
-                    workerParams,
-                    ephemeral,
-                });
+            : FjallWorkerConfig.new({
+                nodeName,
+                chainSpec,
+                blake2b,
+                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}`;
     const rootDb = await workerConfig.openDatabase({ readonly: false });

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

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAc,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEzF,OAAO,EAAE,KAAK,SAAS,EAAc,MAAM,mBAAmB,CAAC;AAgB/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAkC,MAAM,EAAW,MAAM,kBAAkB,CAAC;AAYnF,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAWhE,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;IAChE,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;IACtE,oBAAoB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAsB,IAAI,CACxB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAClC,SAAS,EAAE,SAAS,GAAG,IAAI,GAC1B,OAAO,CAAC,OAAO,CAAC,CA2LlB"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAc,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEzF,OAAO,EAAE,KAAK,SAAS,EAAc,MAAM,mBAAmB,CAAC;AAe/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAkC,MAAM,EAAW,MAAM,kBAAkB,CAAC;AAWnF,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAWhE,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;IAChE,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;IACtE,oBAAoB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAsB,IAAI,CACxB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAClC,SAAS,EAAE,SAAS,GAAG,IAAI,GAC1B,OAAO,CAAC,OAAO,CAAC,CAuLlB"}

package/packages/jam/node/main.js

@@ -1,7 +1,6 @@
 import { isMainThread } from "node:worker_threads";
 import { AUTHORSHIP_NETWORK_PORT } from "#@typeberry/comms-authorship-network";
 import { PvmBackend } from "#@typeberry/config";
-import { RegularStateBackend } from "#@typeberry/config-node";
 import { initWasm } from "#@typeberry/crypto";
 import { deriveBandersnatchSecretKey, deriveEd25519SecretKey, trivialSeed, } from "#@typeberry/crypto/key-derivation.js";
 import { Blake2b } from "#@typeberry/hash";
@@ -11,7 +10,7 @@ import { Listener } from "#@typeberry/listener";
 import { tryAsU16, tryAsU32 } from "#@typeberry/numbers";
 import { CURRENT_SUITE, CURRENT_VERSION, Result, version } from "#@typeberry/utils";
 import { DirectPort, DirectWorkerConfig } from "#@typeberry/workers-api";
-import { FjallWorkerConfig, InMemWorkerConfig, LmdbWorkerConfig, logHostEnvironment, ThreadPort, } from "#@typeberry/workers-api-node";
+import { FjallWorkerConfig, InMemWorkerConfig, logHostEnvironment, ThreadPort, } from "#@typeberry/workers-api-node";
 import { getChainSpec, getDatabasePath, initializeDatabase, logger } from "./common.js";
 import { initializeExtensions } from "./extensions.js";
 import * as metrics from "./metrics.js";
@@ -30,12 +29,9 @@ export async function main(config, withRelPath, telemetry) {
     const blake2b = await Blake2b.createHasher();
     const nodeName = config.nodeName;
     const isInMemory = config.node.databaseBasePath === undefined;
-    logger.info `🗄️ States DB: ${isInMemory ? "in-memory" : config.node.stateBackend}.`;
-    if (!isInMemory && config.node.stateBackend === RegularStateBackend.Lmdb) {
-        logger.warn `🗄️ The lmdb state backend is deprecated. Use state_backend="fjall" unless you need a temporary fallback.`;
-    }
+    logger.info `🗄️ States DB: ${isInMemory ? "in-memory" : "fjall"}.`;
     const { dbPath, genesisHeaderHash } = getDatabasePath(blake2b, nodeName, config.node.chainSpec.genesisHeader, withRelPath(config.node.databaseBasePath ?? "<in-memory>"));
-    const baseConfig = { nodeName, chainSpec, blake2b, dbPath, stateBackend: config.node.stateBackend };
+    const baseConfig = { nodeName, chainSpec, blake2b, dbPath };
     const importerParams = {
         ...baseConfig,
         workerParams: ImporterConfig.create({
@@ -63,9 +59,8 @@ export async function main(config, withRelPath, telemetry) {
         throw e;
     }
     // fjall-js shares the engine explicitly and requires every handle to close.
-    // Keep lmdb's historical main-thread handle open until shutdown.
     let mainRootDb = rootDb;
-    if (!importerConfig.isInMemory && config.node.stateBackend === RegularStateBackend.Fjall) {
+    if (!importerConfig.isInMemory) {
         await rootDb.close();
         mainRootDb = null;
     }
@@ -241,11 +236,6 @@ const initNetwork = async (importer, params, baseConfig, genesisHeaderHash, netw
     });
     return { closeNetwork: finish, networkApi: network, networkWorker: worker };
 };
-function createPersistentWorkerConfig({ stateBackend, ...params }) {
-    switch (stateBackend) {
-        case RegularStateBackend.Fjall:
-            return FjallWorkerConfig.new(params);
-        case RegularStateBackend.Lmdb:
-            return LmdbWorkerConfig.new(params);
-    }
+function createPersistentWorkerConfig(params) {
+    return FjallWorkerConfig.new(params);
 }

package/packages/jam/rpc/test/e2e-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e-server.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/rpc/test/e2e-server.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAM7C,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,SAAe,sBA6B/E"}
+{"version":3,"file":"e2e-server.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/rpc/test/e2e-server.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAM7C,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,SAAe,sBA0B/E"}

package/packages/jam/rpc/test/e2e-server.js

@@ -1,10 +1,10 @@
 import { PvmBackend } from "#@typeberry/config";
-import { loadConfig, NODE_DEFAULTS, RegularStateBackend } from "#@typeberry/config-node";
+import { loadConfig, NODE_DEFAULTS } from "#@typeberry/config-node";
 import { Blake2b } from "#@typeberry/hash";
 import { getChainSpec, getDatabasePath } from "#@typeberry/node";
 import { validation } from "#@typeberry/rpc-validation";
 import { workspacePathFix } from "#@typeberry/utils";
-import { FjallWorkerConfig, LmdbWorkerConfig } from "#@typeberry/workers-api-node";
+import { FjallWorkerConfig } from "#@typeberry/workers-api-node";
 import { handlers } from "../src/handlers.js";
 import { RpcServer } from "../src/server.js";
 const DEFAULT_PORT = 19800;
@@ -25,8 +25,6 @@ export async function startTestRpcServer(configPath, port = DEFAULT_PORT) {
         dbPath,
         blake2b,
     };
-    const rootDb = nodeConfig.stateBackend === RegularStateBackend.Fjall
-        ? await FjallWorkerConfig.new(dbConfigParams).openDatabase({ readonly: true })
-        : await LmdbWorkerConfig.new(dbConfigParams).openDatabase({ readonly: true });
+    const rootDb = await FjallWorkerConfig.new(dbConfigParams).openDatabase({ readonly: true });
     return RpcServer.new(port, rootDb, spec, blake2b, PvmBackend.Ananas, handlers, validation.schemas);
 }

package/packages/jam/rpc/test/e2e.js

@@ -94,7 +94,7 @@ describe("JSON RPC Client-Server E2E", { concurrency: false }, () => {
         // TODO [ToDr] We should probably do a little bit better in terms of
         // tracking recently active services. Some options for the future:
         // 1. Use InMemoryDb for RPC E2E tests.
-        // 2. Store additional service metadata in LMDB
+        // 2. Store additional service metadata in the database.
         // 3. Cache the state object, so that accessed services would be returned here.
         assert.deepStrictEqual(result, []);
     });

package/packages/jam/state-merkleization/index.d.ts

@@ -19,7 +19,7 @@
  *        (incomplete in-memory view).
  *     - `SerializedState<LeafDb>`: Disk-backed trie storage-leaf nodes live on
  *        disk and load on demand; cheap to update (no data duplication) and re-compute
- *        the `stateRoot`. Used in LMDB.
+ *        the `stateRoot`.
  *     - `SerializedState<StateEntries>`: serialized state represented as a simple in-memory
  *        hashmap of `key -> value` entries.
  */

package/packages/jam/state-merkleization/index.js

@@ -19,7 +19,7 @@
  *        (incomplete in-memory view).
  *     - `SerializedState<LeafDb>`: Disk-backed trie storage-leaf nodes live on
  *        disk and load on demand; cheap to update (no data duplication) and re-compute
- *        the `stateRoot`. Used in LMDB.
+ *        the `stateRoot`.
  *     - `SerializedState<StateEntries>`: serialized state represented as a simple in-memory
  *        hashmap of `key -> value` entries.
  */

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

@@ -2,46 +2,15 @@ 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 = "lmdb" | "fjall";
+export type PersistentBackend = "fjall";
 /** Transferable worker config for persistent regular-node workers. */
-export type PersistentWorkerConfig<T> = LmdbWorkerConfig<T> | FjallWorkerConfig<T>;
-/**
- * Worker config for node.js, backed by the LMDB database.
- *
- * @deprecated lmdb is retained as an explicit fallback. Use `FjallWorkerConfig` for regular nodes.
- */
-export declare class LmdbWorkerConfig<T = void> implements WorkerConfig<T, BlocksDb, SerializedStatesDb> {
-    readonly nodeName: string;
-    readonly chainSpec: ChainSpec;
-    readonly workerParams: T;
-    readonly dbPath: string;
-    readonly blake2b: Blake2b;
-    readonly ports: Map<string, ThreadPort>;
-    readonly ephemeral: boolean;
-    static new<T>({ nodeName, chainSpec, workerParams, dbPath, blake2b, ports, ephemeral, }: {
-        nodeName: string;
-        chainSpec: ChainSpec;
-        workerParams: T;
-        dbPath: string;
-        blake2b: Blake2b;
-        ports?: Map<string, ThreadPort>;
-        ephemeral?: boolean;
-    }): LmdbWorkerConfig<T>;
-    /** Restore node config from a transferable config object. */
-    static fromTransferable<T>(decodeParams: Decode<T>, config: TransferableConfig): Promise<LmdbWorkerConfig<T>>;
-    private constructor();
-    openDatabase(options?: {
-        readonly: boolean;
-    }): Promise<RootDb<BlocksDb, SerializedStatesDb>>;
-    /** Convert this config into a thread-transferable object. */
-    intoTransferable(paramsCodec: Encode<T>): TransferableConfig;
-}
+export type PersistentWorkerConfig<T> = FjallWorkerConfig<T>;
 /** Worker config for node.js, backed by a shared fjall engine. */
 export declare class FjallWorkerConfig<T = void> implements WorkerConfig<T, BlocksDb, SerializedStatesDb> {
     readonly nodeName: string;
@@ -52,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;
@@ -61,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>>;
@@ -115,11 +86,10 @@ export declare class InMemWorkerConfig<T = undefined> implements WorkerConfig<T,
     }): Promise<RootDb<BlocksDb, SerializedStatesDb>>;
 }
 /** Persistent values store backing the hybrid config. */
-export type HybridBackend = "lmdb" | "fjall";
+export type HybridBackend = "fjall";
 /**
  * Hybrid worker config for the fuzz target: in-memory blocks and leaf sets,
- * but large values persisted to disk. The `backend` picks where the values go
- * (lmdb or fjall).
+ * but large values persisted to disk via fjall.
  *
  * fjall opens its keyspace asynchronously, that is why `new` here is async.
  *
@@ -141,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, backend, sharedFjallSession, }: {
+    static new<T>({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, sharedFjallKeyspace, }: {
         nodeName: string;
         chainSpec: ChainSpec;
         workerParams: T;
@@ -149,14 +119,12 @@ export declare class HybridWorkerConfig<T = undefined> implements WorkerConfig<T
         dbPath: string;
         ephemeral?: boolean;
         compression?: boolean;
-        backend?: HybridBackend;
         /**
-         * 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. Ignored
-         * unless `backend === "fjall"`.
+         * 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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"}