@typeberry/lib 0.8.4-faebc7a → 0.9.0-c9f9e4d

package/packages/workers/importer/importer.js

@@ -33,7 +33,7 @@ export class Importer {
     options;
     events;
     /**
-     * Build an {@link Importer} connected to the best state loaded from `states`.
+     * Build an `Importer` connected to the best state loaded from `states`.
      *
      * Throws if the best state cannot be loaded — callers are expected to treat that
      * as a programmer error (the DB should be initialized before reaching here).
@@ -52,7 +52,7 @@ export class Importer {
         this.blocks = args.blocks;
         this.states = args.states;
         this.options = args.options ?? {};
-        this.events = args.events ?? ImporterStats.new(args.logger, () => this.states.diskSizeInBytes?.() ?? null);
+        this.events = args.events ?? ImporterStats.new(() => this.states.diskSizeInBytes?.() ?? null);
         this.metrics = metrics.createMetrics();
         this.verifier = BlockVerifier.new(args.hasher, args.blocks);
         this.stf = OnChain.assemble({
@@ -98,12 +98,12 @@ export class Importer {
             // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
             if (maybeBestHeader?.isOk) {
                 const bestHeader = maybeBestHeader.ok;
-                this.logger.info `🧊 Best block: #${timeSlot} (${bestHeader.hash})`;
+                this.logger.info `🧊 Best: #${timeSlot} (${bestHeader.hash.toStringTruncated()})`;
                 this.metrics.recordBlockImportComplete(duration, true);
             }
             else {
                 this.logger
-                    .log `❌ Rejected block #${timeSlot}: ${maybeBestHeader !== null ? resultToString(maybeBestHeader) : "exception"}`;
+                    .log `❌ Rejected #${timeSlot}: ${maybeBestHeader !== null ? resultToString(maybeBestHeader) : "exception"}`;
                 this.metrics.recordBlockImportComplete(duration, false);
             }
         }
@@ -176,7 +176,7 @@ export class Importer {
         if (finality !== null) {
             const pruneBlocks = this.options.pruneBlocks ?? false;
             this.logger
-                .info `🦭 Finalized block: ${finality.finalizedHash} (${finality.prunableStateHashes.length} to prune, blocks: ${pruneBlocks})`;
+                .info `🦭 Finalized: ${finality.finalizedHash.toStringTruncated()} (${finality.prunableStateHashes.length} to prune, blocks: ${pruneBlocks})`;
             for (const hash of finality.prunableStateHashes) {
                 this.states.markUnused(hash);
                 if (pruneBlocks) {

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

@@ -1,6 +1,5 @@
 import type { HeaderHash, TimeSlot } from "#@typeberry/block";
 import type { LeafDb } from "#@typeberry/database";
-import type { Logger } from "#@typeberry/logger";
 import type { SerializedState } from "#@typeberry/state-merkleization";
 /** Reports the current on-disk database size in bytes, or `null` when unknown. */
 export type DbSizeProvider = () => number | null;
@@ -17,7 +16,6 @@ export interface ImporterEventsListener {
     onStart(currentBestHeaderHash: HeaderHash, currentBestState: SerializedState<LeafDb>): void;
 }
 export declare class ImporterStats implements ImporterEventsListener {
-    private readonly logger;
     /** Reports the current on-disk database size in bytes, or `null` if unknown. */
     private readonly dbSizeInBytes;
     /** How often we are going to print the stats (i.e. every `maxBlocks` blocks) */
@@ -30,7 +28,7 @@ export declare class ImporterStats implements ImporterEventsListener {
     private totalTime;
     private totalBlocksPrev;
     private totalBlocks;
-    static new(logger: Logger, dbSizeInBytes?: DbSizeProvider): ImporterStats;
+    static new(dbSizeInBytes?: DbSizeProvider): ImporterStats;
     private constructor();
     onStart(currentBestHeaderHash: HeaderHash, currentBestState: SerializedState<LeafDb>): void;
     onBlockImportingStarted(timeSlot: TimeSlot): (isOk: boolean) => number;

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

@@ -1 +1 @@
-{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/stats.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,kFAAkF;AAClF,MAAM,MAAM,cAAc,GAAG,MAAM,MAAM,GAAG,IAAI,CAAC;AAWjD,6CAA6C;AAC7C,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC;IAEvE,qCAAqC;IACrC,OAAO,CAAC,qBAAqB,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;CAC7F;AAED,qBAAa,aAAc,YAAW,sBAAsB;IAaxD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,gFAAgF;IAChF,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,gFAAgF;IAChF,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,uFAAuF;IACvF,OAAO,CAAC,QAAQ,CAAC,SAAS;IAlB5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,WAAW,CAAK;IAExB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,GAAE,cAA2B;IAIrE,OAAO;IAUP,OAAO,CAAC,qBAAqB,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC;IAIpF,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,IAGhC,MAAM,OAAO;CAiCxB"}
+{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/stats.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAKtE,kFAAkF;AAClF,MAAM,MAAM,cAAc,GAAG,MAAM,MAAM,GAAG,IAAI,CAAC;AAWjD,6CAA6C;AAC7C,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC;IAEvE,qCAAqC;IACrC,OAAO,CAAC,qBAAqB,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;CAC7F;AAED,qBAAa,aAAc,YAAW,sBAAsB;IAaxD,gFAAgF;IAChF,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,gFAAgF;IAChF,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,uFAAuF;IACvF,OAAO,CAAC,QAAQ,CAAC,SAAS;IAjB5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiD;IACxE,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,WAAW,CAAK;IAExB,MAAM,CAAC,GAAG,CAAC,aAAa,GAAE,cAA2B;IAIrD,OAAO;IASP,OAAO,CAAC,qBAAqB,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC;IAIpF,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,IAGhC,MAAM,OAAO;CAiCxB"}

package/packages/workers/importer/stats.js

@@ -1,4 +1,6 @@
+import { Level, Logger } from "#@typeberry/logger";
 import { memoryTracker, now } from "#@typeberry/utils";
+const logger = Logger.new(import.meta.filename, "stats");
 /** Format a database size for the stats line, e.g. ` db=12.34GB`. Empty when unknown. */
 function formatDbSize(bytes) {
     if (bytes === null) {
@@ -8,50 +10,48 @@ function formatDbSize(bytes) {
     return mb >= 1024 ? ` db=${(mb / 1024).toFixed(2)}GB` : ` db=${mb.toFixed(1)}MB`;
 }
 export class ImporterStats {
-    logger;
     dbSizeInBytes;
     maxBlocks;
     maxTimeMs;
-    memory = memoryTracker();
+    memory = memoryTracker(logger.getLevel() < Level.INFO);
     showDiskStats = true;
     totalTimePrev = 0;
     totalTime = 0;
     totalBlocksPrev = 0;
     totalBlocks = 0;
-    static new(logger, dbSizeInBytes = () => null) {
-        return new ImporterStats(logger, dbSizeInBytes);
+    static new(dbSizeInBytes = () => null) {
+        return new ImporterStats(dbSizeInBytes);
     }
-    constructor(logger, 
+    constructor(
     /** Reports the current on-disk database size in bytes, or `null` if unknown. */
     dbSizeInBytes = () => null, 
     /** How often we are going to print the stats (i.e. every `maxBlocks` blocks) */
     maxBlocks = 100, 
     /** Alternatively print stats when we reach `${maxTimeMs}` of total block execution. */
     maxTimeMs = 5000) {
-        this.logger = logger;
         this.dbSizeInBytes = dbSizeInBytes;
         this.maxBlocks = maxBlocks;
         this.maxTimeMs = maxTimeMs;
     }
     onStart(currentBestHeaderHash, currentBestState) {
-        this.logger.info `😎 Best time slot: ${currentBestState.timeslot} (header hash: ${currentBestHeaderHash})`;
+        logger.info `😎 Best time slot: ${currentBestState.timeslot} (header hash: ${currentBestHeaderHash})`;
     }
     onBlockImportingStarted(timeSlot) {
         const start = now();
         return (isOk) => {
             const duration = now() - start;
             const label = isOk ? "import" : "reject";
-            this.logger.log `⏱️ ${label} #${timeSlot} took ${duration.toFixed(2)}ms`;
+            logger.log `⏱️ ${label} #${timeSlot} took ${duration.toFixed(2)}ms`;
             this.totalTime += duration;
             this.totalBlocks += 1;
             if (this.totalBlocks >= this.maxBlocks || this.totalTime >= this.maxTimeMs) {
                 // disk data (every second output)
                 if (this.showDiskStats) {
-                    this.logger.info `💾 disk at #${timeSlot}: ${formatDbSize(this.dbSizeInBytes())}`;
+                    logger.info `💾 disk at #${timeSlot}: ${formatDbSize(this.dbSizeInBytes())}`;
                 }
                 this.showDiskStats = !this.showDiskStats;
-                // memory
-                this.logger.info `📊 mem at #${timeSlot}: ${this.memory()}`;
+                // memory (memoryTracker's toString() is stateful — log it once)
+                logger.info `📊 mem at #${timeSlot}: ${this.memory}`;
                 // compute block statistics (rolling window of last two rounds)
                 const importedBlocks = this.totalBlocks + this.totalBlocksPrev;
                 const importTime = this.totalTime + this.totalTimePrev;
@@ -61,7 +61,7 @@ export class ImporterStats {
                 this.totalTimePrev = this.totalTime;
                 this.totalBlocks = 0;
                 this.totalTime = 0;
-                this.logger.info `⏱️ time at #${timeSlot}: ${blocksPerSecond.toFixed(2)}bps`;
+                logger.info ` ⏱️ speed at #${timeSlot}: ${blocksPerSecond.toFixed(2)}bps`;
             }
             return duration;
         };

package/packages/workers/jam-network/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/jam-network/main.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAO3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAI1E;;;;;;GAMG;AACH,wBAAsB,IAAI,CACxB,MAAM,EAAE,YAAY,CAAC,gBAAgB,CAAC,EACtC,KAAK,EAAE,kBAAkB,EACzB,eAAe,EAAE,eAAe,iBAwEjC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/jam-network/main.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAQ3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAI1E;;;;;;GAMG;AACH,wBAAsB,IAAI,CACxB,MAAM,EAAE,YAAY,CAAC,gBAAgB,CAAC,EACtC,KAAK,EAAE,kBAAkB,EACzB,eAAe,EAAE,eAAe,iBAgFjC"}

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

@@ -1,5 +1,7 @@
+import { Bytes } from "#@typeberry/bytes";
 import { parseBootnode } from "#@typeberry/config-node";
 import { ed25519, initWasm } from "#@typeberry/crypto";
+import { HASH_SIZE } from "#@typeberry/hash";
 import { setup } from "#@typeberry/jamnp-s";
 import { Logger } from "#@typeberry/logger";
 import { ValidationError } from "#@typeberry/ticket-pool";
@@ -50,12 +52,15 @@ export async function main(config, comms, authorshipComms) {
     // for an accept/reject decision. The wire protocol stays a simple bool; the
     // computed id stays inside authorship (it owns the verified pool).
     const ipcValidator = {
-        validate: async (epochIndex, ticket) => {
-            const ok = await authorshipComms.sendReceivedTickets({ epochIndex, ticket });
+        validate: async (epochIndex, tickets) => {
+            const ok = await authorshipComms.sendReceivedTickets({ epochIndex, tickets });
             if (!ok) {
                 return Result.error(ValidationError.InvalidProof, () => "authorship rejected the ticket");
             }
-            return Result.ok({ id: null });
+            return Result.ok(tickets.map((ticket) => ({
+                ticket,
+                id: Bytes.zero(HASH_SIZE).asOpaque(),
+            })));
         },
     };
     network.ticketTask.setTicketValidator(ipcValidator);

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

@@ -1 +0,0 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/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,oDAAoD;AACpD,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,SAAS;IACpB,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,wDAAwD;IACxD,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.test.d.ts

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

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"ticket-generator.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/ticket-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAGjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C,oBAAY,oBAAoB;IAC9B,sBAAsB,2BAA2B;IACjD,kBAAkB,uBAAuB;CAC1C;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,eAAe,EAAE,EAC3B,aAAa,EAAE,YAAY,EAAE,EAC7B,OAAO,EAAE,WAAW,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,oBAAoB,CAAC,CAAC,CAkCvD"}

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

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