@typeberry/lib 0.5.3 → 0.5.4-b101fe6

package/packages/jam/transition/statistics.test.js

@@ -93,7 +93,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -116,7 +115,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -137,7 +135,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -217,7 +214,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -240,7 +236,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -264,7 +259,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -292,7 +286,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -330,7 +323,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -355,7 +347,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -380,7 +371,6 @@ describe("Statistics", () => {
                 incomingReports,
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -405,7 +395,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -430,7 +419,6 @@ describe("Statistics", () => {
                 incomingReports: asKnownSize([]),
                 availableReports,
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -460,7 +448,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics: new Map(),
-                transferStatistics: new Map(),
                 currentValidatorData,
                 reporters,
             });
@@ -486,33 +473,6 @@ describe("Statistics", () => {
                 incomingReports: [],
                 availableReports: [],
                 accumulationStatistics,
-                transferStatistics: new Map(),
-                currentValidatorData,
-                reporters,
-            });
-            const state = copyAndUpdateState(statistics.state, update);
-            assert.deepEqual(state.statistics.services.get(serviceIndex), expectedStatistics);
-        });
-        it("should update on transfer score of service statistics based on on transfer statistics", () => {
-            const { statistics, currentSlot, validatorIndex, serviceIndex, serviceStatistics, currentValidatorData, reporters, } = prepareData({
-                previousSlot: 0,
-                currentSlot: 1,
-            });
-            const transferStatistics = new Map([[tryAsServiceId(0), countGasUsed(3, 7n)]]);
-            const expectedStatistics = {
-                ...serviceStatistics.get(serviceIndex),
-                onTransfersCount: 3,
-                onTransfersGasUsed: 7n,
-            };
-            assert.deepEqual(statistics.state.statistics.services.get(serviceIndex), serviceStatistics.get(serviceIndex));
-            const update = statistics.transition({
-                slot: currentSlot,
-                authorIndex: validatorIndex,
-                extrinsic: getExtrinsic(),
-                incomingReports: [],
-                availableReports: [],
-                accumulationStatistics: new Map(),
-                transferStatistics,
                 currentValidatorData,
                 reporters,
             });

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

package/packages/jam/transition/accumulate/deferred-transfers.d.ts

@@ -1,36 +0,0 @@
-import { type EntropyHash, type ServiceId, type TimeSlot } from "#@typeberry/block";
-import type { ChainSpec, PvmBackend } from "#@typeberry/config";
-import type { Blake2b } from "#@typeberry/hash";
-import type { PendingTransfer } from "#@typeberry/jam-host-calls/externalities/pending-transfer.js";
-import { type ServicesUpdate, type State } from "#@typeberry/state";
-import { Result } from "#@typeberry/utils";
-import type { CountAndGasUsed } from "../statistics.js";
-type DeferredTransfersInput = {
-    pendingTransfers: PendingTransfer[];
-    timeslot: TimeSlot;
-    servicesUpdate: ServicesUpdate;
-    /** eta0' (after Safrole STF) - it is not eta0 from state! */
-    entropy: EntropyHash;
-};
-export type DeferredTransfersState = Pick<State, "timeslot" | "getService" | "privilegedServices">;
-export type DeferredTransfersResult = {
-    servicesUpdate: ServicesUpdate;
-    transferStatistics: Map<ServiceId, CountAndGasUsed>;
-};
-export declare enum DeferredTransfersErrorCode {
-    ServiceBalanceOverflow = 1,
-    ServiceInfoNotExist = 2
-}
-/**
- * https://graypaper.fluffylabs.dev/#/7e6ff6a/18df0118df01?v=0.6.7
- */
-export declare class DeferredTransfers {
-    readonly chainSpec: ChainSpec;
-    readonly blake2b: Blake2b;
-    private readonly state;
-    private readonly pvm;
-    constructor(chainSpec: ChainSpec, blake2b: Blake2b, state: DeferredTransfersState, pvm: PvmBackend);
-    transition({ pendingTransfers, timeslot, servicesUpdate: inputServicesUpdate, entropy, }: DeferredTransfersInput): Promise<Result<DeferredTransfersResult, DeferredTransfersErrorCode>>;
-}
-export {};
-//# sourceMappingURL=deferred-transfers.d.ts.map

package/packages/jam/transition/accumulate/deferred-transfers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deferred-transfers.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/deferred-transfers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAmB,MAAM,kBAAkB,CAAC;AAGpG,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6DAA6D,CAAC;AAQnG,OAAO,EAAsB,KAAK,cAAc,EAAE,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAIxD,KAAK,sBAAsB,GAAG;IAC5B,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,6DAA6D;IAC7D,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,YAAY,GAAG,oBAAoB,CAAC,CAAC;AAEnG,MAAM,MAAM,uBAAuB,GAAG;IACpC,cAAc,EAAE,cAAc,CAAC;IAC/B,kBAAkB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;CACrD,CAAC;AAQF,oBAAY,0BAA0B;IACpC,sBAAsB,IAAI;IAC1B,mBAAmB,IAAI;CACxB;AAGD;;GAEG;AACH,qBAAa,iBAAiB;aAEV,SAAS,EAAE,SAAS;aACpB,OAAO,EAAE,OAAO;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAHJ,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EACf,KAAK,EAAE,sBAAsB,EAC7B,GAAG,EAAE,UAAU;IAG5B,UAAU,CAAC,EACf,gBAAgB,EAChB,QAAQ,EACR,cAAc,EAAE,mBAAmB,EACnC,OAAO,GACR,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,CAAC;CAuFjG"}

package/packages/jam/transition/accumulate/deferred-transfers.js

@@ -1,95 +0,0 @@
-import { tryAsServiceGas } from "#@typeberry/block";
-import { W_C } from "#@typeberry/block/gp-constants.js";
-import { codec, Encoder } from "#@typeberry/codec";
-import { AccumulationStateUpdate, PartiallyUpdatedState, } from "#@typeberry/jam-host-calls/externalities/state-update.js";
-import { Logger } from "#@typeberry/logger";
-import { sumU64, tryAsU32 } from "#@typeberry/numbers";
-import { tryAsGas } from "#@typeberry/pvm-interface";
-import { ServiceAccountInfo } from "#@typeberry/state";
-import { Result } from "#@typeberry/utils";
-import { AccumulateExternalities } from "../externalities/accumulate-externalities.js";
-import { FetchExternalities } from "../externalities/fetch-externalities.js";
-import { uniquePreserveOrder } from "./accumulate-utils.js";
-import { PvmExecutor } from "./pvm-executor.js";
-const ARGS_CODEC = codec.object({
-    timeslot: codec.varU32.asOpaque(),
-    serviceId: codec.varU32.asOpaque(),
-    transfersLength: codec.varU32,
-});
-export var DeferredTransfersErrorCode;
-(function (DeferredTransfersErrorCode) {
-    DeferredTransfersErrorCode[DeferredTransfersErrorCode["ServiceBalanceOverflow"] = 1] = "ServiceBalanceOverflow";
-    DeferredTransfersErrorCode[DeferredTransfersErrorCode["ServiceInfoNotExist"] = 2] = "ServiceInfoNotExist";
-})(DeferredTransfersErrorCode || (DeferredTransfersErrorCode = {}));
-const logger = Logger.new(import.meta.filename, "deferred-transfers");
-/**
- * https://graypaper.fluffylabs.dev/#/7e6ff6a/18df0118df01?v=0.6.7
- */
-export class DeferredTransfers {
-    chainSpec;
-    blake2b;
-    state;
-    pvm;
-    constructor(chainSpec, blake2b, state, pvm) {
-        this.chainSpec = chainSpec;
-        this.blake2b = blake2b;
-        this.state = state;
-        this.pvm = pvm;
-    }
-    async transition({ pendingTransfers, timeslot, servicesUpdate: inputServicesUpdate, entropy, }) {
-        // https://graypaper.fluffylabs.dev/#/7e6ff6a/187a03187a03?v=0.6.7
-        const transferStatistics = new Map();
-        const services = uniquePreserveOrder(pendingTransfers.map((x) => x.destination));
-        let currentStateUpdate = AccumulationStateUpdate.new(inputServicesUpdate);
-        for (const serviceId of services) {
-            const partiallyUpdatedState = new PartiallyUpdatedState(this.state, currentStateUpdate);
-            // https://graypaper.fluffylabs.dev/#/38c4e62/18750318ae03?v=0.7.0
-            const transfers = pendingTransfers
-                .filter((pendingTransfer) => pendingTransfer.destination === serviceId)
-                .toSorted((a, b) => a.source - b.source);
-            const info = partiallyUpdatedState.getServiceInfo(serviceId);
-            if (info === null) {
-                return Result.error(DeferredTransfersErrorCode.ServiceInfoNotExist, () => `Deferred transfers: service info not found for ${serviceId}`);
-            }
-            const codeHash = info.codeHash;
-            const code = partiallyUpdatedState.getPreimage(serviceId, codeHash.asOpaque());
-            const newBalance = sumU64(info.balance, ...transfers.map((item) => item.amount));
-            if (newBalance.overflow) {
-                return Result.error(DeferredTransfersErrorCode.ServiceBalanceOverflow, () => `Deferred transfers: balance overflow for service ${serviceId}`);
-            }
-            const newInfo = ServiceAccountInfo.create({ ...info, balance: newBalance.value });
-            partiallyUpdatedState.updateServiceInfo(serviceId, newInfo);
-            const partialState = new AccumulateExternalities(this.chainSpec, this.blake2b, partiallyUpdatedState, serviceId, serviceId, timeslot);
-            const fetchExternalities = FetchExternalities.createForOnTransfer({ entropy, transfers }, this.chainSpec);
-            let consumedGas = tryAsGas(0);
-            const hasTransfers = transfers.length > 0;
-            const isCodeCorrect = code !== null && code.length <= W_C;
-            if (!hasTransfers || !isCodeCorrect) {
-                if (code === null) {
-                    logger.trace `Skipping ON_TRANSFER execution for service ${serviceId} because code is null`;
-                }
-                else if (!hasTransfers) {
-                    logger.trace `Skipping ON_TRANSFER execution for service ${serviceId} because there are no transfers`;
-                }
-                else {
-                    logger.trace `Skipping ON_TRANSFER execution for service ${serviceId} because code is too long`;
-                }
-            }
-            else {
-                const executor = await PvmExecutor.createOnTransferExecutor(serviceId, code, { partialState, fetchExternalities }, this.pvm);
-                const args = Encoder.encodeObject(ARGS_CODEC, { timeslot, serviceId, transfersLength: tryAsU32(transfers.length) }, this.chainSpec);
-                const gas = transfers.reduce((acc, item) => acc + item.gas, 0n);
-                consumedGas = (await executor.run(args, tryAsGas(gas))).consumedGas;
-            }
-            transferStatistics.set(serviceId, { count: tryAsU32(transfers.length), gasUsed: tryAsServiceGas(consumedGas) });
-            const [updatedState] = partialState.getStateUpdates();
-            currentStateUpdate = updatedState;
-        }
-        return Result.ok({
-            // NOTE: we return only services, since it's impossible to update
-            // anything else during `on_transfer` call.
-            servicesUpdate: currentStateUpdate.services,
-            transferStatistics,
-        });
-    }
-}

package/packages/jam/transition/accumulate/pvm-executor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pvm-executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/pvm-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAc,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0DAA0D,CAAC;AAM7F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAkBpD,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAChD,oBAAoB,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;CACpH,CAAC;AAEF,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3G,kBAAkB,EAAE,OAAO,CAAC,mBAAmB,CAAC;CACjD,CAAC;AASF;;GAEG;AACH,qBAAa,WAAW;IAKpB,OAAO,CAAC,WAAW;IAEnB,OAAO,CAAC,UAAU;IANpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAoB;IACxC,OAAO,CAAC,SAAS,CAAY;IAE7B,OAAO;mBAac,cAAc;IAInC,8CAA8C;IAC9C,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAsBzC,6CAA6C;IAC7C,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAazC;;;;;;OAMG;IACG,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG;;;;;;;;;;;;;IAInC,yEAAyE;WAC5D,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,+BAA+B,EAC9C,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,UAAU;IAOjB,0EAA0E;WAC7D,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,+BAA+B,EAC9C,GAAG,EAAE,UAAU;CAMlB"}