@typeberry/lib 0.8.3 → 0.8.4-70b1490

package/packages/workers/comms-authorship-network/tickets-message.js

@@ -17,20 +17,3 @@ export class TicketsMessage extends WithDebug {
         this.tickets = tickets;
     }
 }
-/** Single-ticket message sent from jam-network to block-authorship (one ticket per peer relay). */
-export class ReceivedTicketMessage extends WithDebug {
-    epochIndex;
-    ticket;
-    static Codec = codec.Class(ReceivedTicketMessage, {
-        epochIndex: codec.u32.asOpaque(),
-        ticket: SignedTicket.Codec,
-    });
-    static create({ epochIndex, ticket }) {
-        return new ReceivedTicketMessage(epochIndex, ticket);
-    }
-    constructor(epochIndex, ticket) {
-        super();
-        this.epochIndex = epochIndex;
-        this.ticket = ticket;
-    }
-}

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

@@ -9,6 +9,7 @@ import { BlockVerifierError } from "#@typeberry/transition/block-verifier.js";
 import { type StfError } from "#@typeberry/transition/chain-stf.js";
 import { Result, type TaggedError } from "#@typeberry/utils";
 import type { Finalizer } from "./finality.js";
+import { type ImporterEventsListener } from "./stats.js";
 export declare enum ImporterErrorKind {
     Verifier = 0,
     Stf = 1,
@@ -20,7 +21,7 @@ export type ImporterOptions = {
     finalizer?: Finalizer;
     pruneBlocks?: boolean;
 };
-/** Construction arguments for {@link Importer}. */
+/** Construction arguments for `Importer`. */
 export type ImporterArgs = {
     spec: ChainSpec;
     pvm: PvmBackend;
@@ -29,6 +30,7 @@ export type ImporterArgs = {
     blocks: BlocksDb;
     states: StatesDb<SerializedState<LeafDb>>;
     options?: ImporterOptions;
+    events?: ImporterEventsListener;
 };
 export declare class Importer {
     private readonly verifier;
@@ -36,14 +38,14 @@ export declare class Importer {
     private readonly state;
     private currentHash;
     private readonly metrics;
-    private readonly memory;
     private readonly hasher;
     private readonly logger;
     private readonly blocks;
     private readonly states;
     private readonly options;
+    private readonly 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).

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

@@ -2,8 +2,9 @@ import { tryAsTimeSlot } from "#@typeberry/block";
 import { WithHash } from "#@typeberry/hash";
 import { BlockVerifier, BlockVerifierError } from "#@typeberry/transition/block-verifier.js";
 import { DbHeaderChain, OnChain } from "#@typeberry/transition/chain-stf.js";
-import { measure, memoryTracker, now, Result, resultToString, } from "#@typeberry/utils";
+import { measure, Result, resultToString } from "#@typeberry/utils";
 import * as metrics from "./metrics.js";
+import { ImporterStats } from "./stats.js";
 export var ImporterErrorKind;
 (function (ImporterErrorKind) {
     ImporterErrorKind[ImporterErrorKind["Verifier"] = 0] = "Verifier";
@@ -11,6 +12,12 @@ export var ImporterErrorKind;
     ImporterErrorKind[ImporterErrorKind["Update"] = 2] = "Update";
 })(ImporterErrorKind || (ImporterErrorKind = {}));
 const importerError = (kind, nested) => Result.taggedError(ImporterErrorKind, kind, nested);
+const MEASURE = {
+    importVerify: measure("import:verify"),
+    importStf: measure("import:stf"),
+    importState: measure("import:state"),
+    importDb: measure("import:db"),
+};
 export class Importer {
     verifier;
     stf;
@@ -19,14 +26,14 @@ export class Importer {
     // Hash of the block that we have the posterior state for in `state`.
     currentHash;
     metrics;
-    memory = memoryTracker();
     hasher;
     logger;
     blocks;
     states;
     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).
@@ -45,6 +52,7 @@ export class Importer {
         this.blocks = args.blocks;
         this.states = args.states;
         this.options = args.options ?? {};
+        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({
@@ -57,7 +65,7 @@ export class Importer {
         this.state = state;
         this.currentHash = currentBestHeaderHash;
         this.prepareForNextEpoch();
-        args.logger.info `😎 Best time slot: ${state.timeslot} (header hash: ${currentBestHeaderHash})`;
+        this.events.onStart(currentBestHeaderHash, state);
     }
     /** Do some extra work for preparation for the next epoch. */
     async prepareForNextEpoch() {
@@ -76,42 +84,44 @@ export class Importer {
         return res;
     }
     async importBlock(block) {
-        const timer = measure("importBlock");
         const timeSlot = extractTimeSlot(block);
+        const onEnd = this.events.onBlockImportingStarted(timeSlot);
         this.metrics.recordBlockImportingStarted(timeSlot);
-        const startTime = now();
-        const maybeBestHeader = await this.importBlockInternal(block);
-        const duration = now() - startTime;
-        if (maybeBestHeader.isOk) {
-            if (timeSlot % 100 === 0) {
-                this.logger.info `📊 mem #${timeSlot}: ${this.memory()}`;
-            }
-            const bestHeader = maybeBestHeader.ok;
-            this.logger.info `🧊 Best block: #${timeSlot} (${bestHeader.hash})`;
-            this.logger.log `${timer()}`;
-            this.metrics.recordBlockImportComplete(duration, true);
+        let maybeBestHeader = null;
+        try {
+            maybeBestHeader = await this.importBlockInternal(block);
             return maybeBestHeader;
         }
-        this.logger.log `❌ Rejected block #${timeSlot}: ${resultToString(maybeBestHeader)}`;
-        this.logger.log `${timer()}`;
-        this.metrics.recordBlockImportComplete(duration, false);
-        return maybeBestHeader;
+        finally {
+            const isOk = maybeBestHeader?.isOk ?? false;
+            const duration = onEnd(isOk);
+            // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
+            if (maybeBestHeader?.isOk) {
+                const bestHeader = maybeBestHeader.ok;
+                this.logger.info `🧊 Best: #${timeSlot} (${bestHeader.hash.toStringTruncated()})`;
+                this.metrics.recordBlockImportComplete(duration, true);
+            }
+            else {
+                this.logger
+                    .log `❌ Rejected #${timeSlot}: ${maybeBestHeader !== null ? resultToString(maybeBestHeader) : "exception"}`;
+                this.metrics.recordBlockImportComplete(duration, false);
+            }
+        }
     }
     async importBlockInternal(block) {
         const logger = this.logger;
         logger.log `🧱 Attempting to import a new block`;
-        const timerVerify = measure("import:verify");
-        const verifyStart = now();
+        const timerVerify = MEASURE.importVerify();
         const hash = await this.verifier.verifyBlock(block, {
             skipParentAndStateRoot: this.options.initGenesisFromAncestry ?? false,
         });
-        const verifyDuration = now() - verifyStart;
-        logger.log `${timerVerify()}`;
         if (hash.isError) {
+            logger.log `${timerVerify}`;
             this.metrics.recordBlockVerificationFailed(resultToString(hash));
             return importerError(ImporterErrorKind.Verifier, hash);
         }
-        this.metrics.recordBlockVerified(verifyDuration);
+        logger.log `${hash.ok} ${timerVerify}`;
+        this.metrics.recordBlockVerified(timerVerify.duration());
         // TODO [ToDr] This is incomplete/temporary fork support!
         const parentHash = block.header.view().parentHeaderHash.materialize();
         if (!this.currentHash.isEqualTo(parentHash)) {
@@ -130,19 +140,17 @@ export class Importer {
         const timeSlot = block.header.view().timeSlotIndex.materialize();
         const headerHash = hash.ok;
         logger.log `🧱 Verified block: Got hash ${headerHash} for block at slot ${timeSlot}.`;
-        const timerStf = measure("import:stf");
-        const stfStart = now();
+        const timerStf = MEASURE.importStf();
         const res = await this.stf.transition(block, headerHash);
-        const stfDuration = now() - stfStart;
-        logger.log `${timerStf()}`;
+        logger.log `${headerHash} ${timerStf}`;
         if (res.isError) {
             this.metrics.recordBlockExecutionFailed(resultToString(res));
             return importerError(ImporterErrorKind.Stf, res);
         }
-        this.metrics.recordBlockExecuted(stfDuration, 0);
+        this.metrics.recordBlockExecuted(timerStf.duration(), 0);
         // modify the state
         const update = res.ok;
-        const timerState = measure("import:state");
+        const timerState = MEASURE.importState();
         const updateResult = await this.states.updateAndSetState(headerHash, this.state, update);
         if (updateResult.isError) {
             logger.error `🧱 Unable to update state: ${resultToString(updateResult)}`;
@@ -150,9 +158,9 @@ export class Importer {
         }
         this.prepareForNextEpoch();
         this.currentHash = headerHash;
-        logger.log `${timerState()}`;
+        logger.log `${timerState}`;
         // insert new state and the block to DB.
-        const timerDb = measure("import:db");
+        const timerDb = MEASURE.importDb();
         const writeBlocks = this.blocks.insertBlock(WithHash.new(headerHash, block));
         // Computation of the state root may happen asynchronously,
         // but we still need to wait for it before next block can be imported
@@ -160,7 +168,7 @@ export class Importer {
         logger.log `🧱 Storing post-state-root for ${headerHash}: ${stateRoot}.`;
         const writeStateRoot = this.blocks.setPostStateRoot(headerHash, stateRoot);
         await Promise.all([writeBlocks, writeStateRoot]);
-        logger.log `${timerDb()}`;
+        logger.log `${headerHash} ${timerDb}`;
         // finally update the best block
         await this.blocks.setBestHeaderHash(headerHash);
         // check for finality and prune old states (and optionally blocks)
@@ -168,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

@@ -0,0 +1,36 @@
+import type { HeaderHash, TimeSlot } from "#@typeberry/block";
+import type { LeafDb } from "#@typeberry/database";
+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;
+/** Events happening during block imports. */
+export interface ImporterEventsListener {
+    /**
+     * Invoked when we start importing a block.
+     *
+     * Must return a callback that will be triggered at the end of block import.
+     * The callback is expected to return duration between start and end events.
+     */
+    onBlockImportingStarted(timeSlot: TimeSlot): (isOk: boolean) => number;
+    /** Initial state of the importer. */
+    onStart(currentBestHeaderHash: HeaderHash, currentBestState: SerializedState<LeafDb>): void;
+}
+export declare class ImporterStats implements ImporterEventsListener {
+    /** 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) */
+    private readonly maxBlocks;
+    /** Alternatively print stats when we reach `${maxTimeMs}` of total block execution. */
+    private readonly maxTimeMs;
+    private readonly memory;
+    private showDiskStats;
+    private totalTimePrev;
+    private totalTime;
+    private totalBlocksPrev;
+    private totalBlocks;
+    static new(dbSizeInBytes?: DbSizeProvider): ImporterStats;
+    private constructor();
+    onStart(currentBestHeaderHash: HeaderHash, currentBestState: SerializedState<LeafDb>): void;
+    onBlockImportingStarted(timeSlot: TimeSlot): (isOk: boolean) => number;
+}
+//# sourceMappingURL=stats.d.ts.map

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

@@ -0,0 +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;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

@@ -0,0 +1,69 @@
+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) {
+        return "";
+    }
+    const mb = bytes / (1024 * 1024);
+    return mb >= 1024 ? ` db=${(mb / 1024).toFixed(2)}GB` : ` db=${mb.toFixed(1)}MB`;
+}
+export class ImporterStats {
+    dbSizeInBytes;
+    maxBlocks;
+    maxTimeMs;
+    memory = memoryTracker(logger.getLevel() < Level.INFO);
+    showDiskStats = true;
+    totalTimePrev = 0;
+    totalTime = 0;
+    totalBlocksPrev = 0;
+    totalBlocks = 0;
+    static new(dbSizeInBytes = () => null) {
+        return new ImporterStats(dbSizeInBytes);
+    }
+    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.dbSizeInBytes = dbSizeInBytes;
+        this.maxBlocks = maxBlocks;
+        this.maxTimeMs = maxTimeMs;
+    }
+    onStart(currentBestHeaderHash, currentBestState) {
+        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";
+            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) {
+                    logger.info `💾 disk at #${timeSlot}: ${formatDbSize(this.dbSizeInBytes())}`;
+                }
+                this.showDiskStats = !this.showDiskStats;
+                // 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;
+                const blocksPerSecond = (importedBlocks / importTime) * 1000;
+                // carry over current round
+                this.totalBlocksPrev = this.totalBlocks;
+                this.totalTimePrev = this.totalTime;
+                this.totalBlocks = 0;
+                this.totalTime = 0;
+                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":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAK3E,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,iBAyDjC"}
+{"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,7 +1,11 @@
+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";
+import { Result } from "#@typeberry/utils";
 const logger = Logger.new(import.meta.filename, "net");
 /**
  * JAM networking worker.
@@ -38,11 +42,28 @@ export async function main(config, comms, authorshipComms) {
             network.ticketTask.addTicket(epochIndex, ticket);
         }
     });
-    // Relay tickets received from peers back to block-authorship (one ticket at a time).
-    // Returns the validation result so ticket-distribution knows whether to redistribute.
-    network.ticketTask.setOnTicketReceived(async (epochIndex, ticket) => {
-        return await authorshipComms.sendReceivedTickets({ epochIndex, ticket });
+    // Authorship pushes the authoritative ticket pool on epoch boundaries; networking
+    // replaces its redistribution pool wholesale so the two sides cannot drift.
+    authorshipComms.setOnReplaceTicketPool(async ({ epochIndex, tickets }) => {
+        logger.log `Replacing redistribution pool from block-authorship for epoch ${epochIndex} (${tickets.length} tickets)`;
+        network.ticketTask.replacePool(epochIndex, tickets);
     });
+    // Validator that hands a received ticket to block-authorship over IPC and waits
+    // 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, tickets) => {
+            const ok = await authorshipComms.sendReceivedTickets({ epochIndex, tickets });
+            if (!ok) {
+                return Result.error(ValidationError.InvalidProof, () => "authorship rejected the ticket");
+            }
+            return Result.ok(tickets.map((ticket) => ({
+                ticket,
+                id: Bytes.zero(HASH_SIZE).asOpaque(),
+            })));
+        },
+    };
+    network.ticketTask.setTicketValidator(ipcValidator);
     await network.network.start();
     // stop the network when the worker is finishing.
     await waitForFinish;

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":""}