@typeberry/lib 0.9.0-6850f84 → 0.9.0-a723180

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

@@ -1,14 +1,18 @@
 import { Decoder, Encoder } from "#@typeberry/codec";
 import { ChainSpec } from "#@typeberry/config";
 import { InMemoryBlocks, InMemorySerializedStates, } from "#@typeberry/database";
-import { HybridSerializedStates as FjallHybridSerializedStates, FjallValuesSession } from "#@typeberry/database-fjall";
+import { FjallBlocks, HybridSerializedStates as FjallHybridSerializedStates, FjallRoot, FjallStates, FjallValuesSession, } 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";
 // Re-exported so the fuzz target can open one values session per run and reuse
 // it across resets (see `HybridWorkerConfig` / `mainFuzz`).
 export { FjallValuesSession };
-/** Worker config for node.js, backed by the LMDB database. */
+/**
+ * Worker config for node.js, backed by the LMDB database.
+ *
+ * @deprecated lmdb is retained as an explicit fallback. Use `FjallWorkerConfig` for regular nodes.
+ */
 export class LmdbWorkerConfig {
     nodeName;
     chainSpec;
@@ -22,10 +26,10 @@ export class LmdbWorkerConfig {
     }
     /** Restore node config from a transferable config object. */
     static async fromTransferable(decodeParams, config) {
-        const blake2b = await Blake2b.createHasher();
-        const chainSpec = ChainSpec.new(config.chainSpec);
-        const workerParams = Decoder.decodeObject(decodeParams, config.workerParams, chainSpec);
-        const ports = new Map(config.workerPorts.map(([name, port]) => [name, ThreadPort.fromTransferable(chainSpec, port)]));
+        if (config.databaseBackend !== "lmdb") {
+            throw new Error(`Expected lmdb worker config, got ${config.databaseBackend}.`);
+        }
+        const { blake2b, chainSpec, workerParams, ports } = await decodeTransferableConfig(decodeParams, config);
         return LmdbWorkerConfig.new({
             nodeName: config.nodeName,
             chainSpec,
@@ -48,7 +52,7 @@ export class LmdbWorkerConfig {
         this.ports = ports;
         this.ephemeral = ephemeral;
     }
-    openDatabase(options = { readonly: true }) {
+    async openDatabase(options = { readonly: true }) {
         const lmdb = LmdbRoot.new(this.dbPath, {
             readOnly: options.readonly,
             ephemeral: this.ephemeral,
@@ -62,14 +66,128 @@ export class LmdbWorkerConfig {
     /** Convert this config into a thread-transferable object. */
     intoTransferable(paramsCodec) {
         return {
+            databaseBackend: "lmdb",
+            nodeName: this.nodeName,
+            chainSpec: this.chainSpec,
+            workerParams: Encoder.encodeObject(paramsCodec, this.workerParams, this.chainSpec).raw,
+            dbPath: this.dbPath,
+            workerPorts: Array.from(this.ports.entries()).map(([name, port]) => [name, port.intoTransferable()]),
+        };
+    }
+}
+/** Worker config for node.js, backed by a shared fjall engine. */
+export class FjallWorkerConfig {
+    nodeName;
+    chainSpec;
+    workerParams;
+    dbPath;
+    blake2b;
+    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);
+    }
+    /** Restore node config from a transferable config object. */
+    static async fromTransferable(decodeParams, config) {
+        if (config.databaseBackend !== "fjall") {
+            throw new Error(`Expected fjall worker config, got ${config.databaseBackend}.`);
+        }
+        const { blake2b, chainSpec, workerParams, ports } = await decodeTransferableConfig(decodeParams, config);
+        return FjallWorkerConfig.new({
+            nodeName: config.nodeName,
+            chainSpec,
+            workerParams,
+            dbPath: config.dbPath,
+            blake2b,
+            ports,
+            cacheSizeBytes: config.cacheSizeBytes,
+        });
+    }
+    constructor(nodeName, chainSpec, workerParams, dbPath, blake2b, ports, 
+    // Kept for the fuzz/importer path. When set, persist() is skipped.
+    ephemeral = false, cacheSizeBytes = undefined) {
+        this.nodeName = nodeName;
+        this.chainSpec = chainSpec;
+        this.workerParams = workerParams;
+        this.dbPath = dbPath;
+        this.blake2b = blake2b;
+        this.ports = ports;
+        this.ephemeral = ephemeral;
+        this.cacheSizeBytes = cacheSizeBytes;
+    }
+    async openDatabase(options = { readonly: true }) {
+        const fjall = await FjallRoot.open(this.dbPath, {
+            readOnly: options.readonly,
+            ephemeral: this.ephemeral,
+            cacheSizeBytes: this.cacheSizeBytes,
+        });
+        let blocks = null;
+        let states = null;
+        try {
+            [blocks, states] = await Promise.all([
+                FjallBlocks.open(this.chainSpec, fjall),
+                FjallStates.open(this.chainSpec, this.blake2b, fjall),
+            ]);
+        }
+        catch (e) {
+            await fjall.close();
+            throw e;
+        }
+        return {
+            getBlocksDb: () => {
+                if (blocks === null) {
+                    throw new Error("Fjall database is closed.");
+                }
+                return blocks;
+            },
+            getStatesDb: () => {
+                if (states === null) {
+                    throw new Error("Fjall database is closed.");
+                }
+                return states;
+            },
+            close: async () => {
+                blocks = null;
+                states = null;
+                await fjall.close();
+            },
+        };
+    }
+    /** Convert this config into a thread-transferable object. */
+    intoTransferable(paramsCodec) {
+        return {
+            databaseBackend: "fjall",
             nodeName: this.nodeName,
             chainSpec: this.chainSpec,
             workerParams: Encoder.encodeObject(paramsCodec, this.workerParams, this.chainSpec).raw,
             dbPath: this.dbPath,
             workerPorts: Array.from(this.ports.entries()).map(([name, port]) => [name, port.intoTransferable()]),
+            cacheSizeBytes: this.cacheSizeBytes,
         };
     }
 }
+async function decodeTransferableConfig(decodeParams, config) {
+    const blake2b = await Blake2b.createHasher();
+    const chainSpec = ChainSpec.new(config.chainSpec);
+    const workerParams = Decoder.decodeObject(decodeParams, config.workerParams, chainSpec);
+    const ports = new Map(config.workerPorts.map(([name, port]) => [name, ThreadPort.fromTransferable(chainSpec, port)]));
+    return {
+        blake2b,
+        chainSpec,
+        workerParams,
+        ports,
+    };
+}
+/** Restore a persistent worker config from its transferable form. */
+export async function persistentConfigFromTransferable(decodeParams, config) {
+    switch (config.databaseBackend) {
+        case "lmdb":
+            return LmdbWorkerConfig.fromTransferable(decodeParams, config);
+        case "fjall":
+            return FjallWorkerConfig.fromTransferable(decodeParams, config);
+    }
+}
 /**
  * Collect the transferable objects (communication ports) embedded in a config.
  *
@@ -103,7 +221,7 @@ export class InMemWorkerConfig {
         this.blocks = InMemoryBlocks.new();
         this.states = InMemorySerializedStates.withHasher({ chainSpec, blake2b });
     }
-    openDatabase(_options = { readonly: true }) {
+    async openDatabase(_options = { readonly: true }) {
         // opening/closing db doesn't do anything, we persist the state.
         return {
             getBlocksDb: () => this.blocks,
@@ -159,7 +277,7 @@ export class HybridWorkerConfig {
         this.states = states;
         this.blocks = InMemoryBlocks.new();
     }
-    openDatabase(_options = { readonly: true }) {
+    async openDatabase(_options = { readonly: true }) {
         return {
             getBlocksDb: () => this.blocks,
             getStatesDb: () => this.states,

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

@@ -2,11 +2,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 { Bytes } from "#@typeberry/bytes";
 import { codec } from "#@typeberry/codec";
 import { tinyChainSpec } from "#@typeberry/config";
-import { Blake2b } from "#@typeberry/hash";
+import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
 import { tryAsU32 } from "#@typeberry/numbers";
-import { configTransferList, HybridWorkerConfig, LmdbWorkerConfig } from "./config.js";
+import { configTransferList, FjallWorkerConfig, HybridWorkerConfig, LmdbWorkerConfig } from "./config.js";
 import { ThreadPort } from "./port.js";
 const spec = tinyChainSpec;
 describe("LmdbWorkerConfig transfer list", () => {
@@ -40,6 +41,54 @@ describe("LmdbWorkerConfig transfer list", () => {
         }
     });
 });
+describe("FjallWorkerConfig transfer list", () => {
+    it("surfaces embedded worker ports and marks the backend", async () => {
+        const blake2b = await Blake2b.createHasher();
+        const [portA, portB] = ThreadPort.pair(spec);
+        const config = FjallWorkerConfig.new({
+            nodeName: "node",
+            chainSpec: spec,
+            workerParams: tryAsU32(7),
+            dbPath: "db",
+            blake2b,
+            ports: new Map([["authorship-network", portA]]),
+        });
+        try {
+            const transferable = config.intoTransferable(codec.varU32);
+            assert.strictEqual(transferable.databaseBackend, "fjall");
+            assert.strictEqual(configTransferList(transferable).length, 1);
+        }
+        finally {
+            portA.close();
+            portB.close();
+        }
+    });
+    it("opens writable and read-only handles over one shared fjall path", async () => {
+        const blake2b = await Blake2b.createHasher();
+        const dbPath = fs.mkdtempSync("typeberry-fjall-worker-");
+        const config = FjallWorkerConfig.new({
+            nodeName: "node",
+            chainSpec: spec,
+            workerParams: undefined,
+            dbPath,
+            blake2b,
+        });
+        let writer = null;
+        let reader = null;
+        try {
+            writer = await config.openDatabase({ readonly: false });
+            reader = await config.openDatabase({ readonly: true });
+            const best = Bytes.fill(HASH_SIZE, 9).asOpaque();
+            await writer.getBlocksDb().setBestHeaderHash(best);
+            assert.strictEqual(reader.getBlocksDb().getBestHeaderHash().toString(), best.toString());
+        }
+        finally {
+            await reader?.close();
+            await writer?.close();
+            fs.rmSync(dbPath, { recursive: true, force: true });
+        }
+    });
+});
 describe("HybridWorkerConfig", () => {
     // Both persistent backends must construct asynchronously and hand out a
     // working db. fjall is the experimental backend we want to benchmark.
@@ -57,7 +106,7 @@ describe("HybridWorkerConfig", () => {
                     ephemeral: true,
                     backend,
                 });
-                const db = config.openDatabase({ readonly: false });
+                const db = await config.openDatabase({ readonly: false });
                 const states = db.getStatesDb();
                 try {
                     assert.notStrictEqual(db.getBlocksDb(), undefined);

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

@@ -18,6 +18,7 @@ export declare class ThreadPort implements Port {
     static pair(spec: ChainSpec): [ThreadPort, ThreadPort];
     readonly threadId: number;
     private readonly events;
+    private readonly pendingMessages;
     static new(spec: ChainSpec, port: MessagePort): ThreadPort;
     private constructor();
     static fromTransferable(spec: ChainSpec, { port }: TransferablePort): ThreadPort;
@@ -28,5 +29,7 @@ export declare class ThreadPort implements Port {
     on<T>(event: string, codec: Codec<T>, callback: (msg: Envelope<T>) => void): () => void;
     once<T>(event: string, codec: Codec<T>, callback: (msg: Envelope<T>) => void): () => void;
     postMessage<T>(event: string, codec: Codec<T>, msg: Envelope<T>): void;
+    private queuePending;
+    private flushPending;
 }
 //# sourceMappingURL=port.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"port.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/port.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAA+B,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,KAAK,KAAK,EAAoB,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAErE,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAIF,qDAAqD;AACrD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AACF,qBAAa,UAAW,YAAW,IAAI;IAenC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAfvB,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC;IAMtD,SAAgB,QAAQ,SAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAE7C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW;IAI7C,OAAO;IAgBP,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,gBAAgB;IAInE,gBAAgB,IAAI,gBAAgB;IAIpC,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,cAAc;IAkBtB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI3C,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IASvF,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IASzF,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;CAWvE"}
+{"version":3,"file":"port.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/port.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAA+B,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,KAAK,KAAK,EAAoB,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAErE,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAIF,qDAAqD;AACrD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AACF,qBAAa,UAAW,YAAW,IAAI;IAgBnC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAhBvB,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC;IAMtD,SAAgB,QAAQ,SAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgC;IAEhE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW;IAI7C,OAAO;IAmBP,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,gBAAgB;IAInE,gBAAgB,IAAI,gBAAgB;IAIpC,KAAK,IAAI,IAAI;IAKb,OAAO,CAAC,cAAc;IAkBtB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI3C,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IAUvF,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IAoBzF,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;IAYtE,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,YAAY;CAUrB"}

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

@@ -2,7 +2,6 @@ import EventEmitter from "node:events";
 import { threadId } from "node:worker_threads";
 import { Decoder, Encoder } from "#@typeberry/codec";
 import { Logger } from "#@typeberry/logger";
-import { check } from "#@typeberry/utils";
 const MESSAGE_KEYS = ["eventName", "responseId", "data"];
 const logger = Logger.new(import.meta.filename, "workers/api");
 export class ThreadPort {
@@ -14,6 +13,7 @@ export class ThreadPort {
     }
     threadId = threadId;
     events = new EventEmitter();
+    pendingMessages = new Map();
     static new(spec, port) {
         return new ThreadPort(spec, port);
     }
@@ -26,7 +26,10 @@ export class ThreadPort {
                 return;
             }
             const { eventName, responseId, data } = input;
-            check `${this.events.listeners(eventName).length > 0} No listeners for received event ${eventName}!`;
+            if (this.events.listeners(eventName).length === 0) {
+                this.queuePending(input);
+                return;
+            }
             this.events.emit(eventName, responseId, data);
         });
     }
@@ -38,6 +41,7 @@ export class ThreadPort {
     }
     close() {
         this.port.close();
+        this.pendingMessages.clear();
     }
     createListener(codec, callback) {
         return (responseId, data) => {
@@ -64,12 +68,22 @@ export class ThreadPort {
     on(event, codec, callback) {
         const listener = this.createListener(codec, callback);
         this.events.on(event, listener);
+        this.flushPending(event, listener);
         return () => {
             this.events.off(event, listener);
         };
     }
     once(event, codec, callback) {
         const listener = this.createListener(codec, callback);
+        const pending = this.pendingMessages.get(event);
+        const pendingMessage = pending?.shift();
+        if (pending?.length === 0) {
+            this.pendingMessages.delete(event);
+        }
+        if (pendingMessage !== undefined) {
+            listener(pendingMessage.responseId, pendingMessage.data);
+            return () => { };
+        }
         this.events.once(event, listener);
         return () => {
             this.events.off(event, listener);
@@ -86,6 +100,21 @@ export class ThreadPort {
         // always returns owned uint8arrays.
         this.port.postMessage(message, [encoded.raw.buffer]);
     }
+    queuePending(msg) {
+        const pending = this.pendingMessages.get(msg.eventName) ?? [];
+        pending.push(msg);
+        this.pendingMessages.set(msg.eventName, pending);
+    }
+    flushPending(event, listener) {
+        const pending = this.pendingMessages.get(event);
+        if (pending === undefined) {
+            return;
+        }
+        this.pendingMessages.delete(event);
+        for (const msg of pending) {
+            listener(msg.responseId, msg.data);
+        }
+    }
 }
 function isMessage(data) {
     const isObject = data !== null && typeof data === "object";

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

@@ -36,4 +36,21 @@ describe("ThreadPort", () => {
             data: tryAsU32(42),
         });
     });
+    it("should deliver messages sent before the listener is attached", async () => {
+        const tx = ThreadPort.new(spec, channel.port1);
+        const rx = ThreadPort.new(spec, channel.port2);
+        tx.postMessage("hello", codec.varU32, {
+            responseId: "10",
+            data: tryAsU32(42),
+        });
+        await setTimeout(10);
+        let received = null;
+        rx.on("hello", codec.varU32, (msg) => {
+            received = msg;
+        });
+        assert.deepStrictEqual(received, {
+            responseId: "10",
+            data: tryAsU32(42),
+        });
+    });
 });

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

@@ -2,7 +2,7 @@ import { type MessagePort, Worker } from "node:worker_threads";
 import type { Decode, Encode } from "#@typeberry/codec";
 import { Listener } from "#@typeberry/listener";
 import type { Api, Internal, LousyProtocol } from "#@typeberry/workers-api/types.js";
-import { LmdbWorkerConfig, type TransferableConfig } from "./config.js";
+import { type PersistentWorkerConfig, type TransferableConfig } from "./config.js";
 /** Type of the control plane message. */
 export declare enum WorkerControlPlaneMsg {
     /** Transfers a communication port to some other thread. */
@@ -31,7 +31,7 @@ export type WorkerControlPlane = ({
 /**
  * Invoked by the main thread, to spawn a worker thread and initiate communication channel.
  */
-export declare function spawnWorker<To, From, Params>(protocol: LousyProtocol<To, From>, bootstrapPath: URL, config: LmdbWorkerConfig<Params>, paramsEncoder: Encode<Params>): {
+export declare function spawnWorker<To, From, Params>(protocol: LousyProtocol<To, From>, bootstrapPath: URL, config: PersistentWorkerConfig<Params>, paramsEncoder: Encode<Params>): {
     api: Api<typeof protocol>;
     worker: Worker;
     workerFinished: Promise<void>;
@@ -40,7 +40,7 @@ export declare function spawnWorker<To, From, Params>(protocol: LousyProtocol<To
  * Initialize worker thread by awaiting the config message.
  */
 export declare function initWorker<To, From, Params>(protocol: LousyProtocol<To, From>, paramsDecoder: Decode<Params>): Promise<{
-    config: LmdbWorkerConfig<Params>;
+    config: PersistentWorkerConfig<Params>;
     comms: Internal<typeof protocol>;
     threadComms: Listener<ThreadComms>;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,WAAW,EAAc,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAsB,gBAAgB,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAM5F,yCAAyC;AACzC,oBAAY,qBAAqB;IAC/B,2DAA2D;IAC3D,iBAAiB,IAAI;IACrB,sCAAsC;IACtC,MAAM,IAAI;CACX;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,0BAA0B;IAC1B,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AACF,yFAAyF;AACzF,MAAM,MAAM,kBAAkB,GAC1B,CAAC;IACC,wDAAwD;IACxD,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC;CAC/C,GAAG,WAAW,CAAC,GAChB;IACE,8EAA8E;IAC9E,IAAI,EAAE,qBAAqB,CAAC,MAAM,CAAC;IACnC,sCAAsC;IACtC,UAAU,EAAE,WAAW,CAAC;IACxB,4BAA4B;IAC5B,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AAeN;;GAEG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAC1C,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,EACjC,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAChC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,GAC5B;IACD,GAAG,EAAE,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAoCA;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAC/C,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,EACjC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,GAC5B,OAAO,CAAC;IACT,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACjC,KAAK,EAAE,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAC;IACjC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;CACpC,CAAC,CAmDD"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,WAAW,EAAc,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAEL,KAAK,sBAAsB,EAE3B,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AAMrB,yCAAyC;AACzC,oBAAY,qBAAqB;IAC/B,2DAA2D;IAC3D,iBAAiB,IAAI;IACrB,sCAAsC;IACtC,MAAM,IAAI;CACX;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,0BAA0B;IAC1B,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AACF,yFAAyF;AACzF,MAAM,MAAM,kBAAkB,GAC1B,CAAC;IACC,wDAAwD;IACxD,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC;CAC/C,GAAG,WAAW,CAAC,GAChB;IACE,8EAA8E;IAC9E,IAAI,EAAE,qBAAqB,CAAC,MAAM,CAAC;IACnC,sCAAsC;IACtC,UAAU,EAAE,WAAW,CAAC;IACxB,4BAA4B;IAC5B,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AAeN;;GAEG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAC1C,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,EACjC,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,sBAAsB,CAAC,MAAM,CAAC,EACtC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,GAC5B;IACD,GAAG,EAAE,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAoCA;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAC/C,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,EACjC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,GAC5B,OAAO,CAAC;IACT,MAAM,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,EAAE,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAC;IACjC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;CACpC,CAAC,CAwDD"}

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

@@ -3,7 +3,7 @@ import { Listener } from "#@typeberry/listener";
 import { Level, Logger } from "#@typeberry/logger";
 import { assertNever } from "#@typeberry/utils";
 import { Channel } from "#@typeberry/workers-api";
-import { configTransferList, LmdbWorkerConfig } from "./config.js";
+import { configTransferList, persistentConfigFromTransferable, } from "./config.js";
 import { logHeapLimit, workerResourceLimits } from "./host-environment.js";
 import { ThreadPort } from "./port.js";
 const logger = Logger.new(import.meta.filename, "workers");
@@ -70,13 +70,14 @@ export async function initWorker(protocol, paramsDecoder) {
     logger.trace `Worker ${protocol.name} starting.`;
     logHeapLimit(logger, protocol.name);
     return new Promise((resolve, reject) => {
-        if (parentPort === null) {
+        const workerParentPort = parentPort;
+        if (workerParentPort === null) {
             throw new Error(`Unable to start ${protocol.name} worker. Not running in a worker thread!`);
         }
-        parentPort.once("close", () => reject(new Error(`(${protocol.name}) parent port closed too early`)));
+        workerParentPort.once("close", () => reject(new Error(`(${protocol.name}) parent port closed too early`)));
         let isResolved = false;
         const threadComms = new Listener();
-        parentPort.on("message", async (msg) => {
+        workerParentPort.on("message", async (msg) => {
             if (!isControlPlane(msg)) {
                 logger.error `--> (${protocol.name}) received unexpected message: ${msg}`;
                 return;
@@ -93,14 +94,19 @@ export async function initWorker(protocol, paramsDecoder) {
                 }
                 logger.trace `--> (${protocol.name}) received configuration.`;
                 isResolved = true;
-                const config = await LmdbWorkerConfig.fromTransferable(paramsDecoder, msg.config);
-                const rxPort = ThreadPort.new(config.chainSpec, msg.parentPort);
-                const comms = Channel.rx(protocol, rxPort);
-                resolve({
-                    config,
-                    comms,
-                    threadComms,
-                });
+                try {
+                    const config = await persistentConfigFromTransferable(paramsDecoder, msg.config);
+                    const rxPort = ThreadPort.new(config.chainSpec, msg.parentPort);
+                    const comms = Channel.rx(protocol, rxPort);
+                    resolve({
+                        config,
+                        comms,
+                        threadComms,
+                    });
+                }
+                catch (e) {
+                    reject(e);
+                }
                 return;
             }
             assertNever(msg.kind);

package/packages/workers/block-authorship/main.js

@@ -18,7 +18,7 @@ export async function main(config, comms, networkingComms) {
     await initWasm();
     logger.info `🎁 Block Authorship running`;
     const chainSpec = config.chainSpec;
-    const db = config.openDatabase();
+    const db = await config.openDatabase();
     const blocks = db.getBlocksDb();
     const states = db.getStatesDb();
     const getBestState = () => {

package/packages/workers/importer/finality.d.ts

@@ -4,6 +4,10 @@ import type { BlocksDb } from "#@typeberry/database";
 export interface FinalityResult {
     /** The newly finalized block hash. */
     finalizedHash: HeaderHash;
+    /** All newly finalized block hashes, ancestor-first, ending at `finalizedHash`. */
+    finalizedChain: HeaderHash[];
+    /** Blocks that became finalized in this round, ancestor-first. */
+    newlyFinalizedHeaders: HeaderHash[];
     /** Block hashes whose states are no longer needed and can be pruned. */
     prunableStateHashes: HeaderHash[];
 }

package/packages/workers/importer/finality.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"finality.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/finality.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAKpD,qDAAqD;AACrD,MAAM,WAAW,cAAc;IAC7B,sCAAsC;IACtC,aAAa,EAAE,UAAU,CAAC;IAC1B,wEAAwE;IACxE,mBAAmB,EAAE,UAAU,EAAE,CAAC;CACnC;AAED,8DAA8D;AAC9D,MAAM,WAAW,SAAS;IACxB,8FAA8F;IAC9F,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,cAAc,GAAG,IAAI,CAAC;CAChE;AAKD;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,SAAS;IAS5C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IATxB,OAAO,CAAC,iBAAiB,CAAa;IACtC,OAAO,CAAC,WAAW,CAAe;IAElC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc;IAI9D,OAAO;IAQP,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,cAAc,GAAG,IAAI;CAyF/D"}
+{"version":3,"file":"finality.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/finality.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAKpD,qDAAqD;AACrD,MAAM,WAAW,cAAc;IAC7B,sCAAsC;IACtC,aAAa,EAAE,UAAU,CAAC;IAC1B,mFAAmF;IACnF,cAAc,EAAE,UAAU,EAAE,CAAC;IAC7B,kEAAkE;IAClE,qBAAqB,EAAE,UAAU,EAAE,CAAC;IACpC,wEAAwE;IACxE,mBAAmB,EAAE,UAAU,EAAE,CAAC;CACnC;AAED,8DAA8D;AAC9D,MAAM,WAAW,SAAS;IACxB,8FAA8F;IAC9F,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,cAAc,GAAG,IAAI,CAAC;CAChE;AAKD;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,SAAS;IAS5C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IATxB,OAAO,CAAC,iBAAiB,CAAa;IACtC,OAAO,CAAC,WAAW,CAAe;IAElC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc;IAI9D,OAAO;IAQP,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,cAAc,GAAG,IAAI;CAkG/D"}

package/packages/workers/importer/finality.js

@@ -71,15 +71,24 @@ export class DummyFinalizer {
         // The newly finalized block sits at index (length - 1 - depth).
         const finalizedIdx = extendedChain.length - 1 - this.depth;
         const finalizedHash = extendedChain[finalizedIdx];
+        // Everything up to (and including) that index becomes finalized now.
+        const finalizedChain = extendedChain.slice(0, finalizedIdx + 1);
         // Collect prunable hashes and rebuild the unfinalized set.
         // The previously finalized block's state is no longer needed.
         const prunable = [this.lastFinalizedHash];
+        const newlyFinalized = [];
         const newUnfinalized = [];
         for (const chain of this.unfinalized) {
             // Find the finalized block in this chain.
             const finIdx = chain.findIndex((h) => h.isEqualTo(finalizedHash));
             if (finIdx !== -1) {
                 // Chain contains the finalized block — it's still alive.
+                // Collect newly finalized blocks only once (forks share prefixes).
+                if (newlyFinalized.length === 0) {
+                    for (let i = 0; i <= finIdx; i++) {
+                        newlyFinalized.push(chain[i]);
+                    }
+                }
                 // Prune states for blocks before the finalized block.
                 for (let i = 0; i < finIdx; i++) {
                     prunable.push(chain[i]);
@@ -100,6 +109,6 @@ export class DummyFinalizer {
         }
         this.lastFinalizedHash = finalizedHash;
         this.unfinalized = newUnfinalized;
-        return { finalizedHash, prunableStateHashes: prunable };
+        return { finalizedHash, finalizedChain, newlyFinalizedHeaders: newlyFinalized, prunableStateHashes: prunable };
     }
 }

package/packages/workers/importer/finality.test.js

@@ -77,6 +77,8 @@ describe("DummyFinalizer", () => {
             const result = finalizer.onBlockImported(chain[6]);
             assertExists(result);
             assert.strictEqual(result.finalizedHash.isEqualTo(chain[3]), true);
+            // The whole prefix becomes finalized, ancestor-first.
+            assert.deepStrictEqual(result.finalizedChain.map((h) => h.toString()), chain.slice(0, 4).map((h) => h.toString()));
         });
         it("should prune prev finalized and depth predecessors on first finality", async () => {
             const db = InMemoryBlocks.new();
@@ -111,6 +113,7 @@ describe("DummyFinalizer", () => {
             const r1 = finalizer.onBlockImported(chain[4]);
             assertExists(r1);
             assert.strictEqual(r1.finalizedHash.isEqualTo(chain[2]), true);
+            assert.deepStrictEqual(r1.finalizedChain.map((h) => h.toString()), chain.slice(0, 3).map((h) => h.toString()));
             assert.strictEqual(r1.prunableStateHashes.length, 3);
             assert.ok(r1.prunableStateHashes[0].isEqualTo(genesis));
             assert.ok(r1.prunableStateHashes[1].isEqualTo(chain[0]));
@@ -122,6 +125,8 @@ describe("DummyFinalizer", () => {
             const r2 = finalizer.onBlockImported(chain[7]);
             assertExists(r2);
             assert.strictEqual(r2.finalizedHash.isEqualTo(chain[5]), true);
+            // Only the blocks finalized in this round, not the ones from r1.
+            assert.deepStrictEqual(r2.finalizedChain.map((h) => h.toString()), chain.slice(3, 6).map((h) => h.toString()));
             assert.strictEqual(r2.prunableStateHashes.length, 3);
             assert.ok(r2.prunableStateHashes[0].isEqualTo(chain[2]));
             assert.ok(r2.prunableStateHashes[1].isEqualTo(chain[3]));
@@ -204,6 +209,7 @@ describe("DummyFinalizer", () => {
             const result = finalizer.onBlockImported(a5);
             assertExists(result);
             assert.strictEqual(result.finalizedHash.isEqualTo(a3), true);
+            assert.deepStrictEqual(result.finalizedChain.map((h) => h.toString()), [a1, a2, a3].map((h) => h.toString()));
             // Fork B [B1, B2] is dead (doesn't contain A3). B1 and B2 should be pruned.
             // Also: genesis (prev finalized) and A1, A2 pruned (before A3 in chain A).
             const prunedStrings = result.prunableStateHashes.map((h) => h.toString());

package/packages/workers/importer/importer.d.ts.map

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

package/packages/workers/importer/importer.js

@@ -177,6 +177,9 @@ export class Importer {
             const pruneBlocks = this.options.pruneBlocks ?? false;
             this.logger
                 .info `🦭 Finalized: ${finality.finalizedHash.toStringTruncated()} (${finality.prunableStateHashes.length} to prune, blocks: ${pruneBlocks})`;
+            // Commit the finalized blocks BEFORE pruning: `markUnused` treats states
+            // with a pending value delta as dead forks and releases their values.
+            this.states.commitFinalized(finality.newlyFinalizedHeaders);
             for (const hash of finality.prunableStateHashes) {
                 this.states.markUnused(hash);
                 if (pruneBlocks) {

package/packages/workers/importer/main.d.ts

@@ -9,7 +9,7 @@ export type CreateImporterOptions = {
 };
 export declare function createImporter(config: Config, options?: CreateImporterOptions): Promise<{
     importer: Importer;
-    db: ReturnType<Config["openDatabase"]>;
+    db: Awaited<ReturnType<Config["openDatabase"]>>;
 }>;
 /**
  * The `BlockImporter` listens to `block` signals, where it expects

package/packages/workers/importer/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/main.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAMtE,MAAM,MAAM,MAAM,GAAG,YAAY,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAE/F,MAAM,MAAM,qBAAqB,GAAG;IAClC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC;IACT,QAAQ,EAAE,QAAQ,CAAC;IACnB,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;CACxC,CAAC,CA8BD;AAED;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,iBAwCjE"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/main.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAMtE,MAAM,MAAM,MAAM,GAAG,YAAY,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAE/F,MAAM,MAAM,qBAAqB,GAAG;IAClC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC;IACT,QAAQ,EAAE,QAAQ,CAAC;IACnB,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;CACjD,CAAC,CA8BD;AAED;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,iBAwCjE"}

package/packages/workers/importer/main.js

@@ -10,7 +10,7 @@ const keccakHasher = keccak.KeccakHasher.create();
 const blake2b = Blake2b.createHasher();
 export async function createImporter(config, options = {}) {
     const chainSpec = config.chainSpec;
-    const db = config.openDatabase({ readonly: false });
+    const db = await config.openDatabase({ readonly: false });
     const pvm = config.workerParams.pvm;
     const blocks = db.getBlocksDb();
     const states = db.getStatesDb();