@typeberry/lib 0.5.3-fb6e98a → 0.5.4-9233977

package/packages/jam/transition/reports/verify-basic.js

@@ -1,4 +1,5 @@
 import { MAX_REPORT_DEPENDENCIES } from "#@typeberry/block/gp-constants.js";
+import { isWorkItemsCount, MAX_NUMBER_OF_WORK_ITEMS, MIN_NUMBER_OF_WORK_ITEMS } from "#@typeberry/block/work-package.js";
 import { WorkExecResultKind } from "#@typeberry/block/work-result.js";
 import { OK, Result } from "#@typeberry/utils";
 import { ReportsError } from "./error.js";
@@ -11,6 +12,15 @@ export const MAX_WORK_REPORT_SIZE_BYTES = 48 * 2 ** 10;
 export function verifyReportsBasic(input) {
     for (const guarantee of input) {
         const reportView = guarantee.view().report.view();
+        /**
+         * Make sure number of results is within correct range.
+         */
+        if (!isWorkItemsCount(reportView.results.view().length)) {
+            return Result.error(ReportsError.InvalidWorkItemsCount, () => `Number of work results is invalid.
+          Got: ${reportView.results.view().length},
+          expected between ${MIN_NUMBER_OF_WORK_ITEMS} and ${MAX_NUMBER_OF_WORK_ITEMS}
+          `);
+        }
         /**
          * We limit the sum of the number of items in the
          * segment-root lookup dictionary and the number of

package/packages/jam/transition/reports/verify-basic.test.js

@@ -2,8 +2,10 @@ import { describe, it } from "node:test";
 import { tryAsTimeSlot } from "#@typeberry/block";
 import { ReportGuarantee } from "#@typeberry/block/guarantees.js";
 import { Bytes } from "#@typeberry/bytes";
+import { FixedSizeArray } from "#@typeberry/collections";
 import { tinyChainSpec } from "#@typeberry/config";
 import { HASH_SIZE } from "#@typeberry/hash";
+import { tryAsU8 } from "#@typeberry/numbers";
 import { asOpaqueType, deepEqual, OK } from "#@typeberry/utils";
 import { ReportsError } from "./error.js";
 import { guaranteesAsView, newCredential, newWorkReport } from "./test.utils.js";
@@ -44,6 +46,33 @@ describe("Reports.verifyReportsBasic", () => {
             details: () => "Work report at 0 too big. Got 0 + 49153, max: 49152",
         });
     });
+    it("should reject if report has invalid number of work results (0)", () => {
+        // Create a minimal work report with 0 results by manually constructing it
+        const emptyResults = FixedSizeArray.new([], tryAsU8(0));
+        const report = newWorkReport({ core: 0 });
+        // Bypass the type system to set 0 results
+        const invalidReport = {
+            ...report,
+            results: emptyResults,
+        };
+        const guarantees = guaranteesAsView(tinyChainSpec, [
+            ReportGuarantee.create({
+                slot: tryAsTimeSlot(10),
+                report: invalidReport,
+                credentials: asOpaqueType([0, 3].map((x) => newCredential(x))),
+            }),
+        ]);
+        const result = verifyReportsBasic(guarantees);
+        deepEqual(result, {
+            isOk: false,
+            isError: true,
+            error: ReportsError.InvalidWorkItemsCount,
+            details: () => `Number of work results is invalid.
+          Got: 0,
+          expected between 1 and 16
+          `,
+        });
+    });
     it("should verify correctly", () => {
         const guarantees = guaranteesAsView(tinyChainSpec, [
             ReportGuarantee.create({

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":"AAyBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAI9E,KAAK,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AAkBlD,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,iBAyIlE"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/main.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAI9E,KAAK,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AAkBlD,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,iBAgKlE"}

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

@@ -86,6 +86,8 @@ export async function main(config, comms) {
         }
         return Result.ok(state.sealingKeySeries);
     }
+    const isFastForward = config.workerParams.isFastForward;
+    let lastGeneratedSlot = startTimeSlot;
     while (!isFinished) {
         const hash = blocks.getBestHeaderHash();
         const state = states.getState(hash);
@@ -93,10 +95,20 @@ export async function main(config, comms) {
         if (state === null) {
             continue;
         }
-        const time = getTime();
-        /** Assuming `slotDuration` is 6 sec it is safe till year 2786. If `slotDuration` is 1 sec then it is safe till 2106   */
-        const timeSlot = tryAsTimeSlot(Number(time / 1000n / BigInt(chainSpec.slotDuration)));
         const lastTimeSlot = state.timeslot;
+        /**
+         * In fastForward mode, use simulated time (next slot after current state).
+         * In normal mode, use wall clock time.
+         * Assuming `slotDuration` is 6 sec it is safe till year 2786.
+         * If `slotDuration` is 1 sec then it is safe till 2106.
+         */
+        const timeSlot = isFastForward === true
+            ? tryAsTimeSlot(lastTimeSlot + 1)
+            : tryAsTimeSlot(Number(getTime() / 1000n / BigInt(chainSpec.slotDuration)));
+        // In fastForward mode, skip if we already generated for this slot (waiting for import)
+        if (isFastForward === true && timeSlot <= lastGeneratedSlot) {
+            continue;
+        }
         const isNewEpoch = isEpochChanged(lastTimeSlot, timeSlot);
         const selingKeySeriesResult = await getSealingKeySeries(isNewEpoch, timeSlot, state);
         if (selingKeySeriesResult.isError) {
@@ -113,10 +125,17 @@ export async function main(config, comms) {
             const sealPayload = getSealPayload(selingKeySeriesResult.ok, entropy);
             const newBlock = await generator.nextBlockView(validatorIndex, key.bandersnatchSecret, sealPayload, timeSlot);
             counter += 1;
+            lastGeneratedSlot = timeSlot;
             logger.trace `Sending block ${counter}`;
             await comms.sendBlock(newBlock);
         }
-        await setTimeout(chainSpec.slotDuration * 1000);
+        else if (isFastForward === true) {
+            // In fast-forward mode, if this slot is not ours, wait briefly for other validators to produce blocks
+            await setTimeout(10);
+        }
+        if (isFastForward === false) {
+            await setTimeout(chainSpec.slotDuration * 1000);
+        }
     }
     logger.info `🎁 Block Authorship finished. Closing channel.`;
     await db.close();

package/packages/workers/block-authorship/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/block-authorship",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "description": "A test block generator simulating blocks received over the network.",
     "main": "index.ts",
     "dependencies": {

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

@@ -275,13 +275,15 @@ export declare class ValidatorSecrets {
 }
 export declare class BlockAuthorshipConfig {
     readonly keys: ValidatorSecrets[];
+    readonly isFastForward: boolean;
     static Codec: import("@typeberry/codec").Descriptor<BlockAuthorshipConfig, import("@typeberry/codec").ViewOf<BlockAuthorshipConfig, {
         keys: import("@typeberry/codec").Descriptor<ValidatorSecrets[], import("@typeberry/codec").SequenceView<ValidatorSecrets, import("@typeberry/codec").ViewOf<ValidatorSecrets, {
             bandersnatch: import("@typeberry/codec").Descriptor<import("@typeberry/bytes").Bytes<32> & import("@typeberry/utils").WithOpaque<"BandersnatchSecretSeed">, import("@typeberry/bytes").Bytes<32>>;
             ed25519: import("@typeberry/codec").Descriptor<import("@typeberry/bytes").Bytes<32> & import("@typeberry/utils").WithOpaque<"Ed25519SecretSeed">, import("@typeberry/bytes").Bytes<32>>;
         }>>>;
+        isFastForward: import("@typeberry/codec").Descriptor<boolean, boolean>;
     }>>;
-    static create({ keys }: CodecRecord<BlockAuthorshipConfig>): BlockAuthorshipConfig;
+    static create({ keys, isFastForward }: CodecRecord<BlockAuthorshipConfig>): BlockAuthorshipConfig;
     private constructor();
 }
 //# sourceMappingURL=protocol.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAEL,KAAK,sBAAsB,EAE3B,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,GAAG,EAAkB,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEjF,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAC;AAC1D,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC;AAEhD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAanB,CAAC;AAEH,qBAAa,gBAAgB;aAWT,YAAY,EAAE,sBAAsB;aACpC,OAAO,EAAE,iBAAiB;IAX5C,MAAM,CAAC,KAAK;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC;IAItE,OAAO;CAIR;AAED,qBAAa,qBAAqB;aASI,IAAI,EAAE,gBAAgB,EAAE;IAR5D,MAAM,CAAC,KAAK;;;;;QAET;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,qBAAqB,CAAC;IAI1D,OAAO;CACR"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAEL,KAAK,sBAAsB,EAE3B,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,GAAG,EAAkB,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEjF,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAC;AAC1D,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC;AAEhD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAanB,CAAC;AAEH,qBAAa,gBAAgB;aAWT,YAAY,EAAE,sBAAsB;aACpC,OAAO,EAAE,iBAAiB;IAX5C,MAAM,CAAC,KAAK;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC;IAItE,OAAO;CAIR;AAED,qBAAa,qBAAqB;aAWd,IAAI,EAAE,gBAAgB,EAAE;aACxB,aAAa,EAAE,OAAO;IAXxC,MAAM,CAAC,KAAK;;;;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,WAAW,CAAC,qBAAqB,CAAC;IAIzE,OAAO;CAIR"}

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

@@ -33,13 +33,16 @@ export class ValidatorSecrets {
 }
 export class BlockAuthorshipConfig {
     keys;
+    isFastForward;
     static Codec = codec.Class(BlockAuthorshipConfig, {
         keys: codec.sequenceVarLen(ValidatorSecrets.Codec),
+        isFastForward: codec.bool,
     });
-    static create({ keys }) {
-        return new BlockAuthorshipConfig(keys);
+    static create({ keys, isFastForward }) {
+        return new BlockAuthorshipConfig(keys, isFastForward);
     }
-    constructor(keys) {
+    constructor(keys, isFastForward) {
         this.keys = keys;
+        this.isFastForward = isFastForward;
     }
 }

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":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,aAAa,EAAiB,MAAM,kBAAkB,CAAC;AACvH,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAiB,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,EAA0B,KAAK,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAkC,MAAM,EAAkB,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG5G,oBAAY,iBAAiB;IAC3B,QAAQ,IAAI;IACZ,GAAG,IAAI;IACP,MAAM,IAAI;CACX;AAED,MAAM,MAAM,aAAa,GACrB,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,GAC3D,WAAW,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,GAC5C,WAAW,CAAC,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAO5D,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,qBAAa,QAAQ;IAajB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhB1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAG9B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA0B;IAEhD,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2C;gBAGjE,IAAI,EAAE,SAAS,EACf,GAAG,EAAE,UAAU,EACE,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EACzC,OAAO,GAAE,eAAoB;IAkBhD,6DAA6D;IAChD,mBAAmB;IASnB,wBAAwB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAQzF,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,aAAa,CAAC,CAAC;YAwB9F,mBAAmB;IAkFjC,oBAAoB;IAMpB,gBAAgB;IAIhB,eAAe,CAAC,UAAU,EAAE,UAAU;IAKhC,KAAK;CAIZ"}
+{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/importer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,aAAa,EAAiB,MAAM,kBAAkB,CAAC;AACvH,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAiB,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,EAA0B,KAAK,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAkC,MAAM,EAAkB,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG5G,oBAAY,iBAAiB;IAC3B,QAAQ,IAAI;IACZ,GAAG,IAAI;IACP,MAAM,IAAI;CACX;AAED,MAAM,MAAM,aAAa,GACrB,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,GAC3D,WAAW,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,GAC5C,WAAW,CAAC,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAO5D,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,qBAAa,QAAQ;IAajB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhB1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAG9B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA0B;IAEhD,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2C;gBAGjE,IAAI,EAAE,SAAS,EACf,GAAG,EAAE,UAAU,EACE,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EACzC,OAAO,GAAE,eAAoB;IAkBhD,6DAA6D;IAChD,mBAAmB;IAQnB,wBAAwB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAQzF,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,aAAa,CAAC,CAAC;YAwB9F,mBAAmB;IAkFjC,oBAAoB;IAMpB,gBAAgB;IAIhB,eAAe,CAAC,UAAU,EAAE,UAAU;IAKhC,KAAK;CAIZ"}

package/packages/workers/importer/importer.js

@@ -52,7 +52,6 @@ export class Importer {
             this.logger.error `Unable to prepare for next epoch: ${e}`;
         }
     }
-    // TODO [ToDr] import block and get state root
     async importBlockWithStateRoot(block) {
         const res = await this.importBlock(block);
         if (res.isOk) {

package/packages/workers/importer/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/importer",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "description": "A JAM block importer queue.",
     "main": "index.ts",
     "dependencies": {