@typeberry/lib 0.8.4-faebc7a → 0.9.0-1c3f157

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/{generator.d.ts → block-generator.d.ts}

@@ -18,7 +18,7 @@ import { type Opaque } from "#@typeberry/utils";
  *
  */
 export type BlockSealInput = Opaque<BytesBlob, "Seal">;
-/** Construction arguments for {@link Generator}. */
+/** Construction arguments for `BlockGenerator`. */
 export type GeneratorArgs = {
     chainSpec: ChainSpec;
     bandersnatch: BandernsatchWasm;
@@ -27,7 +27,7 @@ export type GeneratorArgs = {
     blocks: BlocksDb;
     states: StatesDb;
 };
-export declare class Generator {
+export declare class BlockGenerator {
     private readonly metrics;
     readonly chainSpec: ChainSpec;
     readonly bandersnatch: BandernsatchWasm;
@@ -35,8 +35,8 @@ export declare class Generator {
     readonly blake2b: Blake2b;
     private readonly blocks;
     private readonly states;
-    /** Build a {@link Generator} from its collaborators. */
-    static new(args: GeneratorArgs): Generator;
+    /** Build a block generator from its collaborators. */
+    static new(args: GeneratorArgs): BlockGenerator;
     private constructor();
     private getLastHeaderAndState;
     nextBlockView(validatorIndex: ValidatorIndex, bandersnatchSecret: BandersnatchSecretSeed, sealPayload: BlockSealInput, timeSlot: TimeSlot, pendingTickets?: {
@@ -71,4 +71,4 @@ export declare class Generator {
         id: EntropyHash;
     }[]): Promise<Block>;
 }
-//# sourceMappingURL=generator.d.ts.map
+//# sourceMappingURL=block-generator.d.ts.map

package/packages/workers/block-authorship/block-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"block-generator.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/block-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,KAAK,WAAW,EAIhB,KAAK,QAAQ,EACb,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2BAA2B,CAAC;AAEtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAoC,KAAK,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAClG,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAGhF,OAAO,EAAqB,KAAK,MAAM,EAAU,MAAM,kBAAkB,CAAC;AAM1E;;;;;;;;GAQG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAEvD,mDAAmD;AACnD,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,gBAAgB,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2C;IAEnE,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,SAAgB,YAAY,EAAE,gBAAgB,CAAC;IAC/C,SAAgB,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC;IAClD,SAAgB,OAAO,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAElC,sDAAsD;IACtD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa;IAI9B,OAAO;IAUP,OAAO,CAAC,qBAAqB;IAYvB,aAAa,CACjB,cAAc,EAAE,cAAc,EAC9B,kBAAkB,EAAE,sBAAsB,EAC1C,WAAW,EAAE,cAAc,EAC3B,QAAQ,EAAE,QAAQ,EAClB,cAAc,GAAE;QAAE,MAAM,EAAE,YAAY,CAAC;QAAC,EAAE,EAAE,WAAW,CAAA;KAAE,EAAO,GAC/D,OAAO,CAAC,SAAS,CAAC;IAKrB;;;;;;;;;OASG;YACW,cAAc;IAiB5B;;;;;;;;;;OAUG;IACH,OAAO,CAAC,uBAAuB;IA4BzB,SAAS,CACb,cAAc,EAAE,cAAc,EAC9B,kBAAkB,EAAE,sBAAsB,EAC1C,WAAW,EAAE,cAAc,EAC3B,QAAQ,EAAE,QAAQ,EAClB,cAAc,GAAE;QAAE,MAAM,EAAE,YAAY,CAAC;QAAC,EAAE,EAAE,WAAW,CAAA;KAAE,EAAO;CAqGnE"}

package/packages/workers/block-authorship/{generator.js → block-generator.js}

@@ -13,7 +13,7 @@ import { asOpaqueType, now, Result } from "#@typeberry/utils";
 import * as metrics from "./metrics.js";
 const EMPTY_AUX_DATA = BytesBlob.empty();
 const logger = Logger.new(import.meta.filename, "author");
-export class Generator {
+export class BlockGenerator {
     metrics;
     chainSpec;
     bandersnatch;
@@ -21,9 +21,9 @@ export class Generator {
     blake2b;
     blocks;
     states;
-    /** Build a {@link Generator} from its collaborators. */
+    /** Build a block generator from its collaborators. */
     static new(args) {
-        return new Generator(args);
+        return new BlockGenerator(args);
     }
     constructor(args) {
         this.chainSpec = args.chainSpec;

package/packages/workers/block-authorship/block-generator.test.d.ts

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

package/packages/workers/block-authorship/block-generator.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"block-generator.test.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/block-generator.test.ts"],"names":[],"mappings":""}

package/packages/workers/block-authorship/{generator.test.js → block-generator.test.js}

@@ -13,7 +13,7 @@ import { JAM_FALLBACK_SEAL } from "#@typeberry/safrole/constants.js";
 import { VALIDATOR_META_BYTES, ValidatorData } from "#@typeberry/state";
 import { SafroleSealingKeysKind } from "#@typeberry/state/safrole-data.js";
 import { asOpaqueType, deepEqual, Result } from "#@typeberry/utils";
-import { Generator } from "./generator.js";
+import { BlockGenerator } from "./block-generator.js";
 // Test validator data - need 6 validators to match tinyChainSpec.validatorsCount
 const validatorDataArray = [
     {
@@ -157,7 +157,7 @@ describe("Generator", () => {
             const state = createMockState(0);
             const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
             const statesDb = createMockStatesDb(state);
-            const generator = Generator.new({
+            const generator = BlockGenerator.new({
                 chainSpec: tinyChainSpec,
                 bandersnatch,
                 keccakHasher,
@@ -180,7 +180,7 @@ describe("Generator", () => {
             const state = createMockState(0);
             const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
             const statesDb = createMockStatesDb(state);
-            const generator = Generator.new({
+            const generator = BlockGenerator.new({
                 chainSpec: tinyChainSpec,
                 bandersnatch,
                 keccakHasher,
@@ -225,7 +225,7 @@ describe("Generator", () => {
             const state = createMockState(9);
             const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
             const statesDb = createMockStatesDb(state);
-            const generator = Generator.new({
+            const generator = BlockGenerator.new({
                 chainSpec: tinyChainSpec,
                 bandersnatch,
                 keccakHasher,
@@ -262,7 +262,7 @@ describe("Generator", () => {
             };
             const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
             const statesDb = createMockStatesDb(state);
-            const generator = Generator.new({
+            const generator = BlockGenerator.new({
                 chainSpec: tinyChainSpec,
                 bandersnatch,
                 keccakHasher,
@@ -300,7 +300,7 @@ describe("Generator", () => {
             const state = createMockState(0);
             const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
             const statesDb = createMockStatesDb(state);
-            const generator = Generator.new({
+            const generator = BlockGenerator.new({
                 chainSpec: tinyChainSpec,
                 bandersnatch,
                 keccakHasher,
@@ -338,7 +338,7 @@ describe("Generator", () => {
             const state = createMockState(0);
             const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
             const statesDb = createMockStatesDb(state);
-            const generator = Generator.new({
+            const generator = BlockGenerator.new({
                 chainSpec: tinyChainSpec,
                 bandersnatch,
                 keccakHasher,
@@ -384,7 +384,7 @@ describe("Generator", () => {
             const state = createMockState(lastSlotOfEpoch0);
             const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
             const statesDb = createMockStatesDb(state);
-            const generator = Generator.new({
+            const generator = BlockGenerator.new({
                 chainSpec: tinyChainSpec,
                 bandersnatch,
                 keccakHasher,

package/packages/workers/block-authorship/epoch-authoring-slots.d.ts

@@ -0,0 +1,35 @@
+import type { EntropyHash } from "#@typeberry/block";
+import type { ChainSpec } from "#@typeberry/config";
+import type { BandersnatchKey, BandersnatchSecretSeed, Ed25519Key, Ed25519SecretSeed } from "#@typeberry/crypto";
+import type { BandernsatchWasm } from "#@typeberry/safrole/bandersnatch-wasm.js";
+import { type SafroleSealingKeys } from "#@typeberry/state";
+import type { BlockSealInput } from "./block-generator.js";
+import type { ValidatorSecrets } from "./protocol.js";
+type ValidatorPrivateKeys = {
+    bandersnatchSecret: BandersnatchSecretSeed;
+    ed25519Secret: Ed25519SecretSeed;
+};
+type ValidatorPublicKeys = {
+    bandersnatchPublic: BandersnatchKey;
+    ed25519Public: Ed25519Key;
+};
+type ValidatorKeys = ValidatorPrivateKeys & ValidatorPublicKeys;
+export type SlotSealData = {
+    key: ValidatorKeys;
+    sealPayload: BlockSealInput;
+    logId: string;
+};
+/** A helper class to figure out in which slots in the next epoch we are authoring blocks. */
+export declare class EpochAuthoringSlots {
+    private readonly ticketsPerValidator;
+    private readonly bandersnatch;
+    private readonly keys;
+    static new(chainSpec: ChainSpec, bandersnatch: BandernsatchWasm, ownedSecrets: readonly ValidatorSecrets[]): Promise<EpochAuthoringSlots>;
+    private constructor();
+    getValidatorKeys(): ValidatorKeys[];
+    getBandersnatchPublicKeys(): (import("@typeberry/bytes").Bytes<32> & import("@typeberry/utils").WithOpaque<"BandersnatchKey">)[];
+    getOurSlotsInKeySeries(sealingKeySeries: SafroleSealingKeys, entropy: EntropyHash): Promise<Array<SlotSealData | null>>;
+    private getOwnTicketIds;
+}
+export {};
+//# sourceMappingURL=epoch-authoring-slots.d.ts.map

package/packages/workers/block-authorship/epoch-authoring-slots.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"epoch-authoring-slots.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/epoch-authoring-slots.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGhH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,OAAO,EAAE,KAAK,kBAAkB,EAA0B,MAAM,kBAAkB,CAAC;AAEnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtD,KAAK,oBAAoB,GAAG;IAC1B,kBAAkB,EAAE,sBAAsB,CAAC;IAC3C,aAAa,EAAE,iBAAiB,CAAC;CAClC,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,kBAAkB,EAAE,eAAe,CAAC;IACpC,aAAa,EAAE,UAAU,CAAC;CAC3B,CAAC;AAEF,KAAK,aAAa,GAAG,oBAAoB,GAAG,mBAAmB,CAAC;AAEhE,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,aAAa,CAAC;IACnB,WAAW,EAAE,cAAc,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,6FAA6F;AAC7F,qBAAa,mBAAmB;IAY5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,IAAI;WAbV,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,gBAAgB,EAAE;IAUhH,OAAO;IAMP,gBAAgB;IAIhB,yBAAyB;IAInB,sBAAsB,CAC1B,gBAAgB,EAAE,kBAAkB,EACpC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;YAuBxB,eAAe;CAmB9B"}

package/packages/workers/block-authorship/epoch-authoring-slots.js

@@ -0,0 +1,86 @@
+import { BytesBlob } from "#@typeberry/bytes";
+import { HashDictionary } from "#@typeberry/collections";
+import { deriveBandersnatchPublicKey, deriveEd25519PublicKey } from "#@typeberry/crypto/key-derivation.js";
+import bandersnatchVrf from "#@typeberry/safrole/bandersnatch-vrf.js";
+import { JAM_FALLBACK_SEAL, JAM_TICKET_SEAL } from "#@typeberry/safrole/constants.js";
+import { SafroleSealingKeysKind } from "#@typeberry/state";
+import { asOpaqueType } from "#@typeberry/utils";
+/** A helper class to figure out in which slots in the next epoch we are authoring blocks. */
+export class EpochAuthoringSlots {
+    ticketsPerValidator;
+    bandersnatch;
+    keys;
+    static async new(chainSpec, bandersnatch, ownedSecrets) {
+        const keys = await derivePublicKeys(ownedSecrets);
+        const keysDictionary = new HashDictionary();
+        for (const key of keys) {
+            keysDictionary.set(key.bandersnatchPublic, key);
+        }
+        return new EpochAuthoringSlots(chainSpec.ticketsPerValidator, bandersnatch, keysDictionary);
+    }
+    constructor(ticketsPerValidator, bandersnatch, keys) {
+        this.ticketsPerValidator = ticketsPerValidator;
+        this.bandersnatch = bandersnatch;
+        this.keys = keys;
+    }
+    getValidatorKeys() {
+        return Array.from(this.keys.values());
+    }
+    getBandersnatchPublicKeys() {
+        return Array.from(this.keys.keys());
+    }
+    async getOurSlotsInKeySeries(sealingKeySeries, entropy) {
+        // Fallback (keys) mode. Just find keys that match ours.
+        if (sealingKeySeries.kind === SafroleSealingKeysKind.Keys) {
+            const sealPayload = getFallbackSealPayload(entropy);
+            return sealingKeySeries.keys.map((author) => {
+                const key = this.keys.get(author);
+                if (key === undefined) {
+                    return null;
+                }
+                return {
+                    key,
+                    sealPayload,
+                    logId: `key ${key.bandersnatchPublic.toStringTruncated()}`,
+                };
+            });
+        }
+        // Tickets mode. Generate own VrfOutputHash for our tickets (cheap) and check if it matches.
+        const ownTickets = await this.getOwnTicketIds(entropy);
+        const slots = sealingKeySeries.tickets.map((ticket) => ownTickets.get(ticket.id.asOpaque()) ?? null);
+        return slots;
+    }
+    async getOwnTicketIds(entropy) {
+        // generate our own tickets first
+        const ownTickets = new HashDictionary();
+        for (let attempt = 0; attempt < this.ticketsPerValidator; attempt++) {
+            const sealPayload = getTicketSealPayload(entropy, attempt);
+            for (const key of this.keys.values()) {
+                const result = await bandersnatchVrf.getVrfOutputHash(this.bandersnatch, key.bandersnatchSecret, sealPayload);
+                if (result.isOk) {
+                    const ticketId = result.ok.asOpaque();
+                    ownTickets.set(ticketId, {
+                        key,
+                        sealPayload,
+                        logId: `ticket ${ticketId} (attempt ${attempt})`,
+                    });
+                }
+            }
+        }
+        return ownTickets;
+    }
+}
+function derivePublicKeys(keys) {
+    return Promise.all(keys.map(async (secrets) => ({
+        bandersnatchSecret: secrets.bandersnatch,
+        bandersnatchPublic: deriveBandersnatchPublicKey(secrets.bandersnatch),
+        ed25519Secret: secrets.ed25519,
+        ed25519Public: await deriveEd25519PublicKey(secrets.ed25519),
+    })));
+}
+function getTicketSealPayload(entropy, attempt) {
+    return asOpaqueType(BytesBlob.blobFromParts(JAM_TICKET_SEAL, entropy.raw, new Uint8Array([attempt])));
+}
+function getFallbackSealPayload(entropy) {
+    return asOpaqueType(BytesBlob.blobFromParts(JAM_FALLBACK_SEAL, entropy.raw));
+}

package/packages/workers/block-authorship/epoch-tracker.d.ts

@@ -0,0 +1,29 @@
+import { type EntropyHash, type Epoch, type TimeSlot } from "#@typeberry/block";
+import type { ChainSpec } from "#@typeberry/config";
+import type { Blake2b } from "#@typeberry/hash";
+import type { Logger } from "#@typeberry/logger";
+import type { BandernsatchWasm } from "#@typeberry/safrole/bandersnatch-wasm.js";
+import { type SafroleSealingKeys, type State } from "#@typeberry/state";
+import { Result } from "#@typeberry/utils";
+import { EpochAuthoringSlots, type SlotSealData } from "./epoch-authoring-slots.js";
+import type { ValidatorSecrets } from "./protocol.js";
+/** Per-epoch data computed once when entering (or resuming into) an epoch. */
+export type EpochData = {
+    epoch: Epoch;
+    epochLength: number;
+    sealingKeySeries: SafroleSealingKeys;
+    entropy: EntropyHash;
+    slots: Array<SlotSealData | null>;
+};
+export declare class EpochTracker {
+    private readonly chainSpec;
+    private readonly blake2bHasher;
+    readonly authoring: EpochAuthoringSlots;
+    static new(chainSpec: ChainSpec, bandersnatch: BandernsatchWasm, blake2bHasher: Blake2b, keys: readonly ValidatorSecrets[]): Promise<EpochTracker>;
+    private constructor();
+    isEpochChanged(stateTimeSlot: TimeSlot, newTimeSlot: TimeSlot): boolean;
+    getEpochData(logger: Logger, state: State, newTimeSlot: TimeSlot): Promise<Result<EpochData, string>>;
+    private getSealingKeySeries;
+    private logEpochAuthorshipInfo;
+}
+//# sourceMappingURL=epoch-tracker.d.ts.map

package/packages/workers/block-authorship/epoch-tracker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"epoch-tracker.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/epoch-tracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,KAAK,EAAE,KAAK,QAAQ,EAAc,MAAM,kBAAkB,CAAC;AAC3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,KAAK,kBAAkB,EAA0B,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtD,8EAA8E;AAC9E,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,kBAAkB,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;CACnC,CAAC;AAEF,qBAAa,YAAY;IAYrB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;aACd,SAAS,EAAE,mBAAmB;WAbnC,GAAG,CACd,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,gBAAgB,EAC9B,aAAa,EAAE,OAAO,EACtB,IAAI,EAAE,SAAS,gBAAgB,EAAE;IAMnC,OAAO;IAMP,cAAc,CAAC,aAAa,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO;IAOjE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YA+B7F,mBAAmB;IAejC,OAAO,CAAC,sBAAsB;CAe/B"}