@typeberry/lib 0.9.0-3f2c45b → 0.9.0-4a9f363

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/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();

package/packages/workers/jam-network/main.js

@@ -19,7 +19,7 @@ export async function main(config, comms, authorshipComms) {
     logger.trace `🛜 Network starting`;
     // Await the configuration object
     const chainSpec = config.chainSpec;
-    const db = config.openDatabase();
+    const db = await config.openDatabase();
     const blocks = db.getBlocksDb();
     const params = config.workerParams;
     const key = await ed25519.privateKey(params.key);