@typeberry/lib 0.5.11 → 0.6.0-40f6423

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.5.11",
+  "version": "0.6.0-40f6423",
   "description": "Typeberry Library",
   "main": "./bin/lib/index.js",
   "types": "./bin/lib/index.d.ts",
@@ -264,7 +264,7 @@
     "#@typeberry/jam-network/*": "./packages/workers/jam-network/*"
   },
   "dependencies": {
-    "@fluffylabs/anan-as": "^1.1.5",
+    "@fluffylabs/anan-as": "^1.3.0",
     "@noble/ed25519": "2.2.3",
     "hash-wasm": "4.12.0",
     "@typeberry/native": "0.2.0-74dd7d7",

package/packages/core/pvm-interpreter-ananas/index.js

@@ -109,7 +109,7 @@ export class AnanasInterpreter {
         const programArr = lowerBytes(program);
         const argsArr = lowerBytes(args);
         this.gas.initialGas = gas;
-        this.instance.resetJAM(programArr, pc, BigInt(gas), argsArr, true);
+        this.instance.resetJAM(programArr, pc, BigInt(gas), argsArr, true, false);
     }
     resetGeneric(program, _pc, gas) {
         const programArr = lowerBytes(program);

package/packages/jam/jamnp-s/tasks/ticket-distribution.d.ts

@@ -29,6 +29,13 @@ export declare class TicketDistributionTask {
      * Deduplicates tickets based on signature.
      */
     addTicket(epochIndex: Epoch, ticket: SignedTicket): void;
+    private onTicketReceivedCallback;
+    /**
+     * Register a callback that validates a received ticket.
+     * The ticket is only added to the redistribution pool if the callback returns `true`.
+     * This prevents redistribution of invalid tickets (e.g. those with a tampered `attempt` field).
+     */
+    setOnTicketReceived(cb: (epochIndex: Epoch, ticket: SignedTicket) => Promise<boolean>): void;
     private onTicketReceived;
 }
 //# sourceMappingURL=ticket-distribution.d.ts.map

package/packages/jam/jamnp-s/tasks/ticket-distribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ticket-distribution.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/tasks/ticket-distribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAe1D;;;;;;GAMG;AACH,qBAAa,sBAAsB;IAuB/B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAvB9B,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS;IAgBzF,yDAAyD;IACzD,OAAO,CAAC,cAAc,CAA0D;IAChF,+DAA+D;IAC/D,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO;IAKP;;OAEG;IACH,oBAAoB;IAkDpB;;;;OAIG;IACH,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY;IAgCjD,OAAO,CAAC,gBAAgB;CAKzB"}
+{"version":3,"file":"ticket-distribution.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/tasks/ticket-distribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAe1D;;;;;;GAMG;AACH,qBAAa,sBAAsB;IAuB/B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAvB9B,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS;IAgBzF,yDAAyD;IACzD,OAAO,CAAC,cAAc,CAA0D;IAChF,+DAA+D;IAC/D,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO;IAKP;;OAEG;IACH,oBAAoB;IAkDpB;;;;OAIG;IACH,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY;IAsCjD,OAAO,CAAC,wBAAwB,CAAgF;IAEhH;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,OAAO,CAAC;IAIrF,OAAO,CAAC,gBAAgB;CAsBzB"}

package/packages/jam/jamnp-s/tasks/ticket-distribution.js

@@ -82,8 +82,13 @@ export class TicketDistributionTask {
      * Deduplicates tickets based on signature.
      */
     addTicket(epochIndex, ticket) {
-        // Check if epoch changed - if so, clear old tickets
-        if (this.currentEpoch !== null && this.currentEpoch !== epochIndex) {
+        // Drop tickets for older epochs (can happen when a delayed validation callback completes
+        // after the epoch has already advanced — accepting it would roll back currentEpoch).
+        if (this.currentEpoch !== null && epochIndex < this.currentEpoch) {
+            return;
+        }
+        // Epoch advanced — clear old tickets
+        if (this.currentEpoch !== null && epochIndex > this.currentEpoch) {
             logger.log `[addTicket] Epoch changed from ${this.currentEpoch} to ${epochIndex}, clearing ${this.pendingTickets.length} old tickets`;
             this.pendingTickets = [];
             // Note: We don't need to clear aux data for all peers here.
@@ -107,9 +112,37 @@ export class TicketDistributionTask {
             logger.info `[addTicket] Added ticket for epoch ${epochIndex}, total: ${this.pendingTickets.length}`;
         }
     }
+    onTicketReceivedCallback = null;
+    /**
+     * Register a callback that validates a received ticket.
+     * The ticket is only added to the redistribution pool if the callback returns `true`.
+     * This prevents redistribution of invalid tickets (e.g. those with a tampered `attempt` field).
+     */
+    setOnTicketReceived(cb) {
+        this.onTicketReceivedCallback = cb;
+    }
     onTicketReceived(epochIndex, ticket) {
         logger.trace `Received ticket for epoch ${epochIndex}, attempt ${ticket.attempt}`;
-        // Add to pending queue for potential re-distribution
-        this.addTicket(epochIndex, ticket);
+        if (this.onTicketReceivedCallback !== null) {
+            // Validate first; only redistribute if valid to avoid spreading tampered tickets.
+            // Wrap with Promise.resolve().then() to catch both sync throws and async rejections.
+            const cb = this.onTicketReceivedCallback;
+            Promise.resolve()
+                .then(() => cb(epochIndex, ticket))
+                .then((isValid) => {
+                if (isValid) {
+                    this.addTicket(epochIndex, ticket);
+                }
+                else {
+                    logger.warn `Dropping invalid ticket for epoch ${epochIndex} (validation failed)`;
+                }
+            })
+                .catch((error) => {
+                logger.error `Error validating ticket for epoch ${epochIndex}, attempt ${ticket.attempt}: ${error}`;
+            });
+        }
+        else {
+            this.addTicket(epochIndex, ticket);
+        }
     }
 }

package/packages/jam/jamnp-s/tasks/ticket-distribution.test.js

@@ -208,7 +208,7 @@ describe("TicketDistributionTask", () => {
         peer1.ticketTask.addTicket(TEST_EPOCH, ticket);
         peer1.ticketTask.maintainDistribution();
         await tick();
-        // Self receives the ticket (via onTicketReceived -> addTicket)
+        // Self receives the ticket (via onTicketReceived -> addTicket, no callback set)
         assert.strictEqual(self.receivedTickets.length, 1);
         // Self should re-distribute to peer2 (and peer1, but peer1 already has it)
         self.ticketTask.maintainDistribution();
@@ -217,4 +217,43 @@ describe("TicketDistributionTask", () => {
         assert.strictEqual(peer2.receivedTickets.length, 1);
         assert.deepStrictEqual(peer2.receivedTickets[0].ticket, ticket);
     });
+    it("should NOT redistribute ticket if validation callback returns false", async () => {
+        const self = await init("self");
+        const peer1 = await init("peer1");
+        const peer2 = await init("peer2");
+        self.openConnection(peer1);
+        self.openConnection(peer2);
+        await tick();
+        // Validation always rejects
+        self.ticketTask.setOnTicketReceived(async () => false);
+        const ticket = createTestTicket(0);
+        peer1.ticketTask.addTicket(TEST_EPOCH, ticket);
+        peer1.ticketTask.maintainDistribution();
+        await tick();
+        // self.addTicket was NOT called (callback returned false), so nothing to redistribute
+        assert.strictEqual(self.receivedTickets.length, 0);
+        self.ticketTask.maintainDistribution();
+        await tick();
+        assert.strictEqual(peer2.receivedTickets.length, 0);
+    });
+    it("should redistribute ticket if validation callback returns true", async () => {
+        const self = await init("self");
+        const peer1 = await init("peer1");
+        const peer2 = await init("peer2");
+        self.openConnection(peer1);
+        self.openConnection(peer2);
+        await tick();
+        // Validation always accepts
+        self.ticketTask.setOnTicketReceived(async () => true);
+        const ticket = createTestTicket(0);
+        peer1.ticketTask.addTicket(TEST_EPOCH, ticket);
+        peer1.ticketTask.maintainDistribution();
+        await tick();
+        // self.addTicket WAS called (callback returned true)
+        assert.strictEqual(self.receivedTickets.length, 1);
+        self.ticketTask.maintainDistribution();
+        await tick();
+        assert.strictEqual(peer2.receivedTickets.length, 1);
+        assert.deepStrictEqual(peer2.receivedTickets[0].ticket, ticket);
+    });
 });

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

@@ -1,5 +1,6 @@
-import { Block, type TimeSlot, type ValidatorIndex } from "#@typeberry/block";
+import { Block, type EntropyHash, type TimeSlot, type ValidatorIndex } from "#@typeberry/block";
 import { type BlockView } from "#@typeberry/block/block.js";
+import type { SignedTicket } from "#@typeberry/block/tickets.js";
 import { BytesBlob } from "#@typeberry/bytes";
 import type { ChainSpec } from "#@typeberry/config";
 import { type BandersnatchSecretSeed } from "#@typeberry/crypto";
@@ -38,7 +39,10 @@ export declare class Generator {
     static new(args: GeneratorArgs): Generator;
     private constructor();
     private getLastHeaderAndState;
-    nextBlockView(validatorIndex: ValidatorIndex, bandersnatchSecret: BandersnatchSecretSeed, sealPayload: BlockSealInput, timeSlot: TimeSlot): Promise<BlockView>;
+    nextBlockView(validatorIndex: ValidatorIndex, bandersnatchSecret: BandersnatchSecretSeed, sealPayload: BlockSealInput, timeSlot: TimeSlot, pendingTickets?: {
+        ticket: SignedTicket;
+        id: EntropyHash;
+    }[]): Promise<BlockView>;
     /**
      * Returns y(H_S) part of the VRF signature.
      *
@@ -50,6 +54,21 @@ export declare class Generator {
      * data (i.e. the `aux_data`) so we are able to compute it beforehand.
      */
     private getEntropyHash;
-    nextBlock(validatorIndex: ValidatorIndex, bandersnatchSecret: BandersnatchSecretSeed, sealPayload: BlockSealInput, timeSlot: TimeSlot): Promise<Block>;
+    /**
+     * Selects tickets to include in the extrinsic from the pending pool.
+     *
+     * Tickets were already verified at receipt time (IDs pre-computed). This method:
+     * 1. Filters out tickets whose IDs are already in `state.ticketsAccumulator` (already processed).
+     * 2. Sorts remaining tickets by ID ascending (required by Safrole).
+     * 3. Deduplicates by ID (pool dedup is best-effort; reorgs can produce duplicates).
+     * 4. Returns at most `chainSpec.maxTicketsPerExtrinsic` tickets.
+     *
+     * Called only during the contest period (slotInEpoch < contestLength).
+     */
+    private prepareTicketsExtrinsic;
+    nextBlock(validatorIndex: ValidatorIndex, bandersnatchSecret: BandersnatchSecretSeed, sealPayload: BlockSealInput, timeSlot: TimeSlot, pendingTickets?: {
+        ticket: SignedTicket;
+        id: EntropyHash;
+    }[]): Promise<Block>;
 }
 //# sourceMappingURL=generator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAIL,KAAK,QAAQ,EACb,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,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,GACjB,OAAO,CAAC,SAAS,CAAC;IAKrB;;;;;;;;;OASG;YACW,cAAc;IAiBtB,SAAS,CACb,cAAc,EAAE,cAAc,EAC9B,kBAAkB,EAAE,sBAAsB,EAC1C,WAAW,EAAE,cAAc,EAC3B,QAAQ,EAAE,QAAQ;CAgGrB"}
+{"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.js

@@ -2,6 +2,7 @@ import { Block, encodeUnsealedHeader, Header, reencodeAsView, } from "#@typeberr
 import { Extrinsic } from "#@typeberry/block/block.js";
 import { DisputesExtrinsic } from "#@typeberry/block/disputes.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
+import { HashSet } from "#@typeberry/collections/hash-set.js";
 import { BANDERSNATCH_VRF_SIGNATURE_BYTES } from "#@typeberry/crypto";
 import { Logger } from "#@typeberry/logger";
 import { Safrole } from "#@typeberry/safrole";
@@ -44,8 +45,8 @@ export class Generator {
             lastState,
         };
     }
-    async nextBlockView(validatorIndex, bandersnatchSecret, sealPayload, timeSlot) {
-        const newBlock = await this.nextBlock(validatorIndex, bandersnatchSecret, sealPayload, timeSlot);
+    async nextBlockView(validatorIndex, bandersnatchSecret, sealPayload, timeSlot, pendingTickets = []) {
+        const newBlock = await this.nextBlock(validatorIndex, bandersnatchSecret, sealPayload, timeSlot, pendingTickets);
         return reencodeAsView(Block.Codec, newBlock, this.chainSpec);
     }
     /**
@@ -65,7 +66,37 @@ export class Generator {
         }
         return entropyHashResult;
     }
-    async nextBlock(validatorIndex, bandersnatchSecret, sealPayload, timeSlot) {
+    /**
+     * Selects tickets to include in the extrinsic from the pending pool.
+     *
+     * Tickets were already verified at receipt time (IDs pre-computed). This method:
+     * 1. Filters out tickets whose IDs are already in `state.ticketsAccumulator` (already processed).
+     * 2. Sorts remaining tickets by ID ascending (required by Safrole).
+     * 3. Deduplicates by ID (pool dedup is best-effort; reorgs can produce duplicates).
+     * 4. Returns at most `chainSpec.maxTicketsPerExtrinsic` tickets.
+     *
+     * Called only during the contest period (slotInEpoch < contestLength).
+     */
+    prepareTicketsExtrinsic(pendingTickets, state) {
+        if (pendingTickets.length === 0) {
+            return [];
+        }
+        // Tickets are already verified at receipt time — just filter, sort and slice.
+        // Build a set of ticket IDs already in the state accumulator for fast lookup.
+        const accumulatedIds = HashSet.from(state.ticketsAccumulator.map((t) => t.id));
+        const filtered = pendingTickets.filter(({ id }) => !accumulatedIds.has(id));
+        // Sort by ID ascending
+        filtered.sort((a, b) => a.id.compare(b.id).value);
+        // Deduplicate by ID (pool dedup is best-effort; state may produce duplicates across reorgs)
+        const deduped = [];
+        for (const item of filtered) {
+            if (deduped.length === 0 || !deduped[deduped.length - 1].id.isEqualTo(item.id)) {
+                deduped.push(item);
+            }
+        }
+        return deduped.slice(0, this.chainSpec.maxTicketsPerExtrinsic).map(({ ticket }) => ticket);
+    }
+    async nextBlock(validatorIndex, bandersnatchSecret, sealPayload, timeSlot, pendingTickets = []) {
         this.metrics.recordBlockAuthoringStarted(timeSlot);
         const startTime = now();
         // fetch latest data from the db.
@@ -85,9 +116,12 @@ export class Generator {
         // retrieve data from previous block
         const hasher = TransitionHasher.new(this.keccakHasher, this.blake2b);
         const stateRoot = this.states.getStateRoot(lastState);
-        // TODO create extrinsic
+        const slotInEpoch = timeSlot % this.chainSpec.epochLength;
+        const isContestPeriod = slotInEpoch < this.chainSpec.contestLength;
+        // Include tickets only during contest period
+        const ticketsForExtrinsic = isContestPeriod ? await this.prepareTicketsExtrinsic(pendingTickets, lastState) : [];
         const extrinsic = Extrinsic.create({
-            tickets: asOpaqueType([]),
+            tickets: asOpaqueType(ticketsForExtrinsic),
             preimages: [],
             guarantees: asOpaqueType([]),
             assurances: asOpaqueType([]),

package/packages/workers/block-authorship/generator.test.js

@@ -1,9 +1,10 @@
 import { afterEach, beforeEach, describe, it, mock } from "node:test";
 import { Block, DisputesExtrinsic, EpochMarker, Extrinsic, Header, tryAsTimeSlot, tryAsValidatorIndex, ValidatorKeys, } from "#@typeberry/block";
+import { SignedTicket, Ticket, tryAsTicketAttempt } from "#@typeberry/block/tickets.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { asKnownSize, FixedSizeArray } from "#@typeberry/collections";
 import { tinyChainSpec } from "#@typeberry/config";
-import { BANDERSNATCH_KEY_BYTES, BANDERSNATCH_VRF_SIGNATURE_BYTES, BLS_KEY_BYTES, ED25519_KEY_BYTES, initWasm, } from "#@typeberry/crypto";
+import { BANDERSNATCH_KEY_BYTES, BANDERSNATCH_PROOF_BYTES, BANDERSNATCH_VRF_SIGNATURE_BYTES, BLS_KEY_BYTES, ED25519_KEY_BYTES, initWasm, } from "#@typeberry/crypto";
 import { BANDERSNATCH_RING_ROOT_BYTES } from "#@typeberry/crypto/bandersnatch.js";
 import { Blake2b, HASH_SIZE, keccak } from "#@typeberry/hash";
 import bandersnatchVrf from "#@typeberry/safrole/bandersnatch-vrf.js";
@@ -174,6 +175,206 @@ describe("Generator", () => {
             });
             deepEqual(block, expectedBlock);
         });
+        it("should include sorted tickets during contest period", async () => {
+            // tinyChainSpec: contestLength = 10, so slot 1 is in contest period (1 < 10)
+            const state = createMockState(0);
+            const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
+            const statesDb = createMockStatesDb(state);
+            const generator = Generator.new({
+                chainSpec: tinyChainSpec,
+                bandersnatch,
+                keccakHasher,
+                blake2b,
+                blocks: blocksDb,
+                states: statesDb,
+            });
+            // Create two tickets with different signatures
+            const sig1 = Bytes.zero(BANDERSNATCH_PROOF_BYTES);
+            sig1.raw[0] = 1;
+            const sig2 = Bytes.zero(BANDERSNATCH_PROOF_BYTES);
+            sig2.raw[0] = 2;
+            const ticket1 = SignedTicket.create({
+                attempt: tryAsTicketAttempt(0),
+                signature: sig1.asOpaque(),
+            });
+            const ticket2 = SignedTicket.create({
+                attempt: tryAsTicketAttempt(0),
+                signature: sig2.asOpaque(),
+            });
+            // ticket2 gets smaller ID (0x01...) and ticket1 gets larger ID (0x02...)
+            // so the sorted order should be [ticket2, ticket1]
+            const id1 = Bytes.fill(HASH_SIZE, 0x02).asOpaque();
+            const id2 = Bytes.fill(HASH_SIZE, 0x01).asOpaque();
+            const validatorIndex = tryAsValidatorIndex(0);
+            // Slot 1 is in contest period (1 < contestLength=10)
+            const timeSlot = tryAsTimeSlot(1);
+            // IDs are now pre-computed before passing to nextBlock
+            const block = await generator.nextBlock(validatorIndex, MOCK_BANDERSNATCH_SECRET, MOCK_SEAL_PAYLOAD, timeSlot, [
+                { ticket: ticket1, id: id1 },
+                { ticket: ticket2, id: id2 },
+            ]);
+            // Tickets should be sorted by ID ascending: ticket2 (id=0x01) before ticket1 (id=0x02)
+            const tickets = block.extrinsic.tickets;
+            deepEqual(tickets.length, 2);
+            deepEqual(tickets[0].signature, sig2.asOpaque());
+            deepEqual(tickets[1].signature, sig1.asOpaque());
+        });
+        it("should exclude tickets outside contest period", async () => {
+            // tinyChainSpec: contestLength = 10, epochLength = 12
+            // Slot 10 is outside contest period (10 >= 10)
+            const state = createMockState(9);
+            const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
+            const statesDb = createMockStatesDb(state);
+            const generator = Generator.new({
+                chainSpec: tinyChainSpec,
+                bandersnatch,
+                keccakHasher,
+                blake2b,
+                blocks: blocksDb,
+                states: statesDb,
+            });
+            const sig1 = Bytes.zero(BANDERSNATCH_PROOF_BYTES);
+            const ticket1 = SignedTicket.create({
+                attempt: tryAsTicketAttempt(0),
+                signature: sig1.asOpaque(),
+            });
+            const validatorIndex = tryAsValidatorIndex(0);
+            // Slot 10 is NOT in contest period (10 >= contestLength=10)
+            const timeSlot = tryAsTimeSlot(10);
+            const mockId = Bytes.fill(HASH_SIZE, 0x01).asOpaque();
+            const block = await generator.nextBlock(validatorIndex, MOCK_BANDERSNATCH_SECRET, MOCK_SEAL_PAYLOAD, timeSlot, [
+                { ticket: ticket1, id: mockId },
+            ]);
+            // No tickets should be included outside contest period
+            const tickets = block.extrinsic.tickets;
+            deepEqual(tickets.length, 0);
+        });
+        it("should filter out tickets already in ticketsAccumulator", async () => {
+            // Build a state that already has ticket with id=0x01 in its accumulator
+            const accumulatedId = Bytes.fill(HASH_SIZE, 0x01).asOpaque();
+            const accumulatedTicket = Ticket.create({
+                id: accumulatedId,
+                attempt: tryAsTicketAttempt(0),
+            });
+            const state = {
+                ...createMockState(0),
+                ticketsAccumulator: asKnownSize([accumulatedTicket]),
+            };
+            const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
+            const statesDb = createMockStatesDb(state);
+            const generator = Generator.new({
+                chainSpec: tinyChainSpec,
+                bandersnatch,
+                keccakHasher,
+                blake2b,
+                blocks: blocksDb,
+                states: statesDb,
+            });
+            const sig1 = Bytes.zero(BANDERSNATCH_PROOF_BYTES);
+            sig1.raw[0] = 1;
+            const sig2 = Bytes.zero(BANDERSNATCH_PROOF_BYTES);
+            sig2.raw[0] = 2;
+            const ticketAlreadyAccumulated = SignedTicket.create({
+                attempt: tryAsTicketAttempt(0),
+                signature: sig1.asOpaque(),
+            });
+            const ticketNew = SignedTicket.create({
+                attempt: tryAsTicketAttempt(0),
+                signature: sig2.asOpaque(),
+            });
+            // id=0x01 is already in accumulator, id=0x02 is new
+            const idAccumulated = Bytes.fill(HASH_SIZE, 0x01).asOpaque();
+            const idNew = Bytes.fill(HASH_SIZE, 0x02).asOpaque();
+            const validatorIndex = tryAsValidatorIndex(0);
+            const timeSlot = tryAsTimeSlot(1); // inside contest period
+            const block = await generator.nextBlock(validatorIndex, MOCK_BANDERSNATCH_SECRET, MOCK_SEAL_PAYLOAD, timeSlot, [
+                { ticket: ticketAlreadyAccumulated, id: idAccumulated },
+                { ticket: ticketNew, id: idNew },
+            ]);
+            // Only the new ticket (not in accumulator) should be included
+            const tickets = block.extrinsic.tickets;
+            deepEqual(tickets.length, 1);
+            deepEqual(tickets[0].signature, sig2.asOpaque());
+        });
+        it("should deduplicate tickets by ID", async () => {
+            const state = createMockState(0);
+            const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
+            const statesDb = createMockStatesDb(state);
+            const generator = Generator.new({
+                chainSpec: tinyChainSpec,
+                bandersnatch,
+                keccakHasher,
+                blake2b,
+                blocks: blocksDb,
+                states: statesDb,
+            });
+            const sig1 = Bytes.zero(BANDERSNATCH_PROOF_BYTES);
+            sig1.raw[0] = 1;
+            const sig2 = Bytes.zero(BANDERSNATCH_PROOF_BYTES);
+            sig2.raw[0] = 2;
+            // Two different SignedTicket objects but with the same ID (e.g. duplicate from reorg)
+            const ticketA = SignedTicket.create({
+                attempt: tryAsTicketAttempt(0),
+                signature: sig1.asOpaque(),
+            });
+            const ticketB = SignedTicket.create({
+                attempt: tryAsTicketAttempt(0),
+                signature: sig2.asOpaque(),
+            });
+            const duplicateId = Bytes.fill(HASH_SIZE, 0x05).asOpaque();
+            const validatorIndex = tryAsValidatorIndex(0);
+            const timeSlot = tryAsTimeSlot(1);
+            const block = await generator.nextBlock(validatorIndex, MOCK_BANDERSNATCH_SECRET, MOCK_SEAL_PAYLOAD, timeSlot, [
+                { ticket: ticketA, id: duplicateId },
+                { ticket: ticketB, id: duplicateId }, // same ID — should be deduplicated
+            ]);
+            const tickets = block.extrinsic.tickets;
+            deepEqual(tickets.length, 1);
+            // First occurrence is kept after sort (both have same ID, ticketA comes first)
+            deepEqual(tickets[0].signature, sig1.asOpaque());
+        });
+        it("should include at most maxTicketsPerExtrinsic tickets", async () => {
+            // tinyChainSpec.maxTicketsPerExtrinsic = 3
+            const state = createMockState(0);
+            const blocksDb = createMockBlocksDb(MOCK_PARENT_HASH);
+            const statesDb = createMockStatesDb(state);
+            const generator = Generator.new({
+                chainSpec: tinyChainSpec,
+                bandersnatch,
+                keccakHasher,
+                blake2b,
+                blocks: blocksDb,
+                states: statesDb,
+            });
+            // Create 4 tickets — only 3 should be included (lowest IDs win)
+            const makeTicket = (sigByte, idByte) => {
+                const sig = Bytes.zero(BANDERSNATCH_PROOF_BYTES);
+                sig.raw[0] = sigByte;
+                return {
+                    ticket: SignedTicket.create({ attempt: tryAsTicketAttempt(0), signature: sig.asOpaque() }),
+                    id: Bytes.fill(HASH_SIZE, idByte).asOpaque(),
+                    sig: sig.asOpaque(),
+                };
+            };
+            const t1 = makeTicket(1, 0x01); // lowest ID
+            const t2 = makeTicket(2, 0x02);
+            const t3 = makeTicket(3, 0x03);
+            const t4 = makeTicket(4, 0x04); // highest ID — should be excluded
+            const validatorIndex = tryAsValidatorIndex(0);
+            const timeSlot = tryAsTimeSlot(1);
+            const block = await generator.nextBlock(validatorIndex, MOCK_BANDERSNATCH_SECRET, MOCK_SEAL_PAYLOAD, timeSlot, [
+                { ticket: t4.ticket, id: t4.id }, // pass out-of-order to verify sorting
+                { ticket: t2.ticket, id: t2.id },
+                { ticket: t3.ticket, id: t3.id },
+                { ticket: t1.ticket, id: t1.id },
+            ]);
+            const tickets = block.extrinsic.tickets;
+            deepEqual(tickets.length, 3); // maxTicketsPerExtrinsic = 3
+            // Should include the 3 lowest IDs, sorted ascending
+            deepEqual(tickets[0].signature, t1.sig);
+            deepEqual(tickets[1].signature, t2.sig);
+            deepEqual(tickets[2].signature, t3.sig);
+        });
         it("should create block with epoch marker at epoch boundary", async () => {
             // tinyChainSpec.epochLength = 12, so:
             // - timeslot 11 is last slot of epoch 0

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

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/main.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAgB3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAK9E,KAAK,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AAkBlD,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,iBAsPpG"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/main.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAiB3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAK9E,KAAK,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AAwBlD,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,iBAiapG"}