@typeberry/lib 0.8.4-9502983 → 0.8.4-faebc7a

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

@@ -13,9 +13,11 @@ import bandersnatchVrf from "#@typeberry/safrole/bandersnatch-vrf.js";
 import { BandernsatchWasm } from "#@typeberry/safrole/bandersnatch-wasm.js";
 import { JAM_FALLBACK_SEAL, JAM_TICKET_SEAL } from "#@typeberry/safrole/constants.js";
 import { SafroleSealingKeysKind } from "#@typeberry/state";
+import { VerifiedTicketPool } from "#@typeberry/ticket-pool";
 import { asOpaqueType, Result } from "#@typeberry/utils";
 import { Generator } from "./generator.js";
 import { generateTickets } from "./ticket-generator.js";
+import { BandersnatchTicketValidator } from "./ticket-validator.js";
 const logger = Logger.new(import.meta.filename, "author");
 export async function main(config, comms, networkingComms) {
     await initWasm();
@@ -181,78 +183,16 @@ export async function main(config, comms, networkingComms) {
         }
         return Result.ok(state.sealingKeySeries);
     }
-    // Ticket pool: epochIndex -> {ticket, id}[]
-    // IDs (entropyHash) are computed at receipt time via verifyTickets(), enabling O(1) dedup by ID.
-    const ticketPool = new Map();
-    const ticketIdSets = new Map();
-    /**
-     * Adds pre-verified tickets to the in-memory ticket pool for the given epoch.
-     *
-     * Clears the pool when the epoch changes (we only ever need tickets for one epoch at a time).
-     * Deduplicates by ticket ID using a HashSet for O(1) lookup — prevents double-counting
-     * tickets received from multiple peers or via both CE-131 and CE-132 paths.
-     */
-    function addToPool(epochIndex, verifiedTickets) {
-        if (ticketPool.size > 0 && !ticketPool.has(epochIndex)) {
-            ticketPool.clear();
-            ticketIdSets.clear();
-        }
-        const existing = ticketPool.get(epochIndex) ?? [];
-        let idSet = ticketIdSets.get(epochIndex) ?? null;
-        if (idSet === null) {
-            idSet = HashSet.new();
-            ticketIdSets.set(epochIndex, idSet);
-        }
-        for (const entry of verifiedTickets) {
-            if (!idSet.has(entry.id)) {
-                existing.push(entry);
-                idSet.insert(entry.id);
-            }
-        }
-        ticketPool.set(epochIndex, existing);
-    }
-    /**
-     * Returns the correct tickets entropy for verification given the current state.
-     *
-     * When `state` is from epoch E-1 (i.e. we haven't produced epoch E's first block yet),
-     * the ticket entropy for epoch E is at index 1 (not yet shifted).
-     * After the epoch transition it moves to index 2.
-     */
-    function getTicketEntropy(epochIndex, state) {
-        const stateEpoch = Math.floor(state.timeslot / chainSpec.epochLength);
-        return epochIndex > stateEpoch ? state.entropy[1] : state.entropy[2];
-    }
-    /**
-     * Verifies tickets against the ring commitment and current epoch entropy, then adds valid
-     * ones to the pool with their computed IDs.
-     *
-     * Called both for own generated tickets and for tickets relayed from peers.
-     * Verification computes the ticket ID (entropyHash) which is then used for
-     * deduplication in the pool and later when building the extrinsic.
-     */
-    async function verifyAndAddToPool(epochIndex, tickets, state) {
-        const results = await bandersnatchVrf.verifyTickets(bandersnatch, state.designatedValidatorData.length, state.epochRoot, tickets, getTicketEntropy(epochIndex, state));
-        if (results.length !== tickets.length) {
-            logger.error `verifyTickets returned ${results.length} results for ${tickets.length} tickets`;
-            return false;
-        }
-        const verified = tickets
-            .map((ticket, i) => ({ ticket, id: results[i].entropyHash }))
-            .filter((_, i) => results[i].isValid);
-        addToPool(epochIndex, verified);
-        return verified.length > 0;
-    }
+    // Verified tickets for the current epoch, keyed by entropy hash (ticket id).
+    // Tickets enter via `validator.validate(...)` which both verifies and inserts.
+    const verifiedPool = new VerifiedTicketPool();
+    const ticketValidator = new BandersnatchTicketValidator(bandersnatch, chainSpec, verifiedPool, () => states.getState(blocks.getBestHeaderHash()));
     // Receive a single ticket from peers (via jam-network worker).
     // Returns true if the ticket passed validation so jam-network can decide whether to redistribute it.
     networkingComms.setOnReceivedTickets(async ({ epochIndex, ticket }) => {
         logger.log `Received ticket from peer for epoch ${epochIndex}`;
-        const hash = blocks.getBestHeaderHash();
-        const state = states.getState(hash);
-        if (state === null) {
-            logger.warn `Cannot verify received ticket: no state available`;
-            return false;
-        }
-        return await verifyAndAddToPool(epochIndex, [ticket], state);
+        const result = await ticketValidator.validate(epochIndex, ticket);
+        return result.isOk;
     });
     const isFastForward = config.workerParams.isFastForward;
     let lastGeneratedSlot = startTimeSlot;
@@ -301,8 +241,10 @@ export async function main(config, comms, networkingComms) {
                 }
                 else {
                     logger.log `Generated ${ticketsResult.ok.length} tickets for epoch ${epoch}. Distributing...`;
-                    // Verify own tickets to get IDs, then add to pool
-                    await verifyAndAddToPool(epoch, ticketsResult.ok, state);
+                    // Verify own tickets (validator stores them in the pool with computed ids).
+                    for (const ticket of ticketsResult.ok) {
+                        await ticketValidator.validate(epoch, ticket);
+                    }
                     // Send directly to network worker (bypasses main thread)
                     await networkingComms.sendTickets({ epochIndex: epoch, tickets: ticketsResult.ok });
                 }
@@ -328,6 +270,12 @@ export async function main(config, comms, networkingComms) {
             }
             await buildTicketAuthorshipCache(selingKeySeriesResult.ok, entropy);
         }
+        // On every epoch boundary, push the authoritative ticket pool to networking so it
+        // can replace its redistribution set; this keeps the two sides from drifting.
+        if (isNewEpoch) {
+            const dumpTickets = verifiedPool.getForEpoch(epoch).map((entry) => entry.ticket);
+            await networkingComms.sendReplaceTicketPool({ epochIndex: epoch, tickets: dumpTickets });
+        }
         const sealData = getSealData(selingKeySeriesResult.ok, keys, timeSlot, entropy);
         if (sealData !== null && currentValidatorData !== null) {
             const { key, sealPayload } = sealData;
@@ -336,8 +284,10 @@ export async function main(config, comms, networkingComms) {
                 continue;
             }
             logger.log `Attempting to create a block using ${sealData.logId} located at validator index ${validatorIndex}.`;
-            const currentEpochTickets = ticketPool.get(epoch) ?? [];
-            const newBlock = await generator.nextBlockView(validatorIndex, key.bandersnatchSecret, sealPayload, timeSlot, currentEpochTickets);
+            const currentEpochTickets = verifiedPool.getForEpoch(epoch);
+            const newBlock = await generator.nextBlockView(validatorIndex, key.bandersnatchSecret, sealPayload, timeSlot, 
+            // VerifiedTicket has the same `{ ticket, id }` shape the generator expects.
+            [...currentEpochTickets]);
             counter += 1;
             lastGeneratedSlot = timeSlot;
             logger.trace `Sending block ${counter}`;

package/packages/workers/block-authorship/ticket-validator.d.ts

@@ -0,0 +1,32 @@
+import type { Epoch } from "#@typeberry/block";
+import type { SignedTicket } from "#@typeberry/block/tickets.js";
+import type { ChainSpec } from "#@typeberry/config";
+import type { BandernsatchWasm } from "#@typeberry/safrole/bandersnatch-wasm.js";
+import type { State } from "#@typeberry/state";
+import { type TicketValidator, type ValidatedTicket, ValidationError, type VerifiedTicketPool } from "#@typeberry/ticket-pool";
+import { Result } from "#@typeberry/utils";
+/**
+ * Real {@link TicketValidator} implementation that verifies a ticket against the ring
+ * commitment and current epoch entropy using bandersnatch, then stores the verified
+ * ticket (with its computed id) into the supplied {@link VerifiedTicketPool}.
+ *
+ * `getState` is a thunk because state advances continuously while validation is in
+ * flight; we want the latest available state for each call.
+ */
+export declare class BandersnatchTicketValidator implements TicketValidator {
+    private readonly bandersnatch;
+    private readonly chainSpec;
+    private readonly pool;
+    private readonly getState;
+    constructor(bandersnatch: BandernsatchWasm, chainSpec: ChainSpec, pool: VerifiedTicketPool, getState: () => State | null);
+    validate(epochIndex: Epoch, ticket: SignedTicket): Promise<Result<ValidatedTicket, ValidationError>>;
+    /**
+     * Returns the correct tickets entropy for verification given the current state.
+     *
+     * When `state` is from epoch E-1 (i.e. we haven't produced epoch E's first block yet),
+     * the ticket entropy for epoch E is at index 1 (not yet shifted). After the epoch
+     * transition it moves to index 2.
+     */
+    private getTicketEntropy;
+}
+//# sourceMappingURL=ticket-validator.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ticket-validator.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/ticket-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,eAAe,EAEf,KAAK,kBAAkB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C;;;;;;;GAOG;AACH,qBAAa,2BAA4B,YAAW,eAAe;IAE/D,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAHR,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,MAAM,KAAK,GAAG,IAAI;IAGzC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IA+B1G;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB;CAIzB"}

package/packages/workers/block-authorship/ticket-validator.js

@@ -0,0 +1,56 @@
+import { Logger } from "#@typeberry/logger";
+import bandersnatchVrf from "#@typeberry/safrole/bandersnatch-vrf.js";
+import { ValidationError, } from "#@typeberry/ticket-pool";
+import { Result } from "#@typeberry/utils";
+const logger = Logger.new(import.meta.filename, "ticket-validator");
+/**
+ * Real {@link TicketValidator} implementation that verifies a ticket against the ring
+ * commitment and current epoch entropy using bandersnatch, then stores the verified
+ * ticket (with its computed id) into the supplied {@link VerifiedTicketPool}.
+ *
+ * `getState` is a thunk because state advances continuously while validation is in
+ * flight; we want the latest available state for each call.
+ */
+export class BandersnatchTicketValidator {
+    bandersnatch;
+    chainSpec;
+    pool;
+    getState;
+    constructor(bandersnatch, chainSpec, pool, getState) {
+        this.bandersnatch = bandersnatch;
+        this.chainSpec = chainSpec;
+        this.pool = pool;
+        this.getState = getState;
+    }
+    async validate(epochIndex, ticket) {
+        const state = this.getState();
+        if (state === null) {
+            return Result.error(ValidationError.ValidatorUnavailable, () => "no state available");
+        }
+        const entropy = this.getTicketEntropy(epochIndex, state);
+        // Batch verifier: a single `isValid` covers the whole batch and `tickets` holds the
+        // computed id per input ticket. We only ever pass one ticket here.
+        const { isValid, tickets } = await bandersnatchVrf.verifyTickets(this.bandersnatch, state.designatedValidatorData.length, state.epochRoot, [ticket], entropy);
+        if (tickets.length !== 1) {
+            logger.error `verifyTickets returned ${tickets.length} results for 1 ticket`;
+            return Result.error(ValidationError.ValidatorUnavailable, () => "verifier returned unexpected result count");
+        }
+        if (!isValid) {
+            return Result.error(ValidationError.InvalidProof, () => "bandersnatch proof rejected");
+        }
+        const verified = { ticket, id: tickets[0] };
+        this.pool.add(epochIndex, [verified]);
+        return Result.ok({ id: tickets[0] });
+    }
+    /**
+     * Returns the correct tickets entropy for verification given the current state.
+     *
+     * When `state` is from epoch E-1 (i.e. we haven't produced epoch E's first block yet),
+     * the ticket entropy for epoch E is at index 1 (not yet shifted). After the epoch
+     * transition it moves to index 2.
+     */
+    getTicketEntropy(epochIndex, state) {
+        const stateEpoch = Math.floor(state.timeslot / this.chainSpec.epochLength);
+        return epochIndex > stateEpoch ? state.entropy[1] : state.entropy[2];
+    }
+}

package/packages/workers/comms-authorship-network/protocol.d.ts

@@ -21,6 +21,16 @@ export declare const protocol: import("@typeberry/workers-api").LousyProtocol<{
         }>>;
         response: import("@typeberry/codec").Descriptor<void, void>;
     };
+    replaceTicketPool: {
+        request: import("@typeberry/codec").Descriptor<TicketsMessage, import("@typeberry/codec").ViewOf<TicketsMessage, {
+            epochIndex: import("@typeberry/codec").Descriptor<number & import("@typeberry/numbers").WithBytesRepresentation<4> & import("@typeberry/utils").WithOpaque<"Epoch">, import("@typeberry/bytes").Bytes<4>>;
+            tickets: import("@typeberry/codec").Descriptor<import("@typeberry/block").SignedTicket[], import("@typeberry/codec").SequenceView<import("@typeberry/block").SignedTicket, import("@typeberry/codec").ViewOf<import("@typeberry/block").SignedTicket, {
+                attempt: import("@typeberry/codec").Descriptor<number & import("@typeberry/numbers").WithBytesRepresentation<1> & import("@typeberry/utils").WithOpaque<"TicketAttempt[u8]">, import("@typeberry/numbers").U32>;
+                signature: import("@typeberry/codec").Descriptor<import("@typeberry/bytes").Bytes<784> & import("@typeberry/utils").WithOpaque<"BandersnatchRingSignature">, import("@typeberry/bytes").Bytes<784>>;
+            }>>>;
+        }>>;
+        response: import("@typeberry/codec").Descriptor<void, void>;
+    };
 }, {
     receivedTickets: {
         request: import("@typeberry/codec").Descriptor<ReceivedTicketMessage, import("@typeberry/codec").ViewOf<ReceivedTicketMessage, {

package/packages/workers/comms-authorship-network/protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/comms-authorship-network/protocol.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAkB,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE7E;;;GAGG;AACH,eAAO,MAAM,uBAAuB,uBAAuB,CAAC;AAE5D;;;;GAIG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;EAiBnB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC;AACnD,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/comms-authorship-network/protocol.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAkB,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE7E;;;GAGG;AACH,eAAO,MAAM,uBAAuB,uBAAuB,CAAC;AAE5D;;;;GAIG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwBnB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC;AACnD,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAC"}

package/packages/workers/comms-authorship-network/protocol.js

@@ -12,12 +12,19 @@ export const AUTHORSHIP_NETWORK_PORT = "authorship-network";
  * This bypasses the main thread for ticket distribution, reducing latency.
  */
 export const protocol = createProtocol("authorship-network", {
-    // Messages from block-authorship to jam-network
+    // Messages from block-authorship to jam-network.
     toWorker: {
+        // Newly generated own tickets; networking should add them to its redistribution pool.
         tickets: {
             request: TicketsMessage.Codec,
             response: codec.nothing,
         },
+        // Authoritative pool snapshot for the given epoch; networking replaces its local
+        // pool with these tickets (one-way, source of truth lives in block-authorship).
+        replaceTicketPool: {
+            request: TicketsMessage.Codec,
+            response: codec.nothing,
+        },
     },
     // Messages from jam-network to block-authorship (one ticket per relay).
     // Response indicates whether the ticket passed validation — used by jam-network

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

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

@@ -2,6 +2,8 @@ import { parseBootnode } from "#@typeberry/config-node";
 import { ed25519, initWasm } from "#@typeberry/crypto";
 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 +40,25 @@ 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, ticket) => {
+            const ok = await authorshipComms.sendReceivedTickets({ epochIndex, ticket });
+            if (!ok) {
+                return Result.error(ValidationError.InvalidProof, () => "authorship rejected the ticket");
+            }
+            return Result.ok({ id: null });
+        },
+    };
+    network.ticketTask.setTicketValidator(ipcValidator);
     await network.network.start();
     // stop the network when the worker is finishing.
     await waitForFinish;