@typeberry/lib 0.8.3 → 0.8.4-9587022

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.8.3",
+  "version": "0.8.4-9587022",
   "description": "Typeberry Library",
   "main": "./bin/lib/index.js",
   "types": "./bin/lib/index.d.ts",

package/packages/core/utils/debug.d.ts

@@ -39,8 +39,18 @@ export declare function assertNever(value: never): never;
 export declare function assertEmpty<T extends Record<string, never>>(value: T): void;
 /** Debug print an object. */
 export declare function inspect<T>(val: T): string;
-/** Utility function to measure time taken for some operation [ms]. */
-export declare function measure(id: string): () => string;
+/**
+ * Utility function to measure time taken for some operation [ms].
+ *
+ * To reduce allocations, each timer can only track one entry.
+ *
+ */
+export declare function measure(id: string): () => {
+    id: string;
+    start: number;
+    duration(): number;
+    toString(): string;
+};
 /**
  * Format current process memory usage as a human readable string.
  *

package/packages/core/utils/debug.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../../../../packages/core/utils/debug.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,YAExB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG,cAA6F,CAAC;AAE9G;;;;;;;;;GASG;AACH,wBAAgB,KAAK,CACnB,OAAO,EAAE,oBAAoB,EAC7B,SAAS,EAAE,OAAO,EAClB,GAAG,IAAI,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,SAAS,IAAI,IAAI,CAO3B;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAE/C;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,QAKpE;AAED,6BAA6B;AAC7B,wBAAgB,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,MAAM,CAEzC;AAkED,sEAAsE;AACtE,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,gBAGjC;AAcD;;;;;;;GAOG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAMpC;AAED,+CAA+C;AAC/C,wBAAgB,aAAa,IAAI,MAAM,MAAM,CAc5C;AAED,mFAAmF;AACnF,8BAAsB,SAAS;IAC7B,QAAQ;CAGT;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;;EAMpC"}
+{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../../../../packages/core/utils/debug.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,YAExB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG,cAA6F,CAAC;AAE9G;;;;;;;;;GASG;AACH,wBAAgB,KAAK,CACnB,OAAO,EAAE,oBAAoB,EAC7B,SAAS,EAAE,OAAO,EAClB,GAAG,IAAI,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,SAAS,IAAI,IAAI,CAO3B;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAE/C;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,QAKpE;AAED,6BAA6B;AAC7B,wBAAgB,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,MAAM,CAEzC;AAkED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM;;;;;EAgBjC;AAcD;;;;;;;GAOG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAMpC;AAED,+CAA+C;AAC/C,wBAAgB,aAAa,IAAI,MAAM,MAAM,CAc5C;AAED,mFAAmF;AACnF,8BAAsB,SAAS;IAC7B,QAAQ;CAGT;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;;EAMpC"}

package/packages/core/utils/debug.js

@@ -108,14 +108,31 @@ function inspectInternal(val, seen) {
     v += oneLine ? "}" : "\n}";
     return v;
 }
-/** Utility function to measure time taken for some operation [ms]. */
+/**
+ * Utility function to measure time taken for some operation [ms].
+ *
+ * To reduce allocations, each timer can only track one entry.
+ *
+ */
 export function measure(id) {
-    const start = now();
-    return () => `${id} took ${(now() - start).toFixed(2)}ms`;
+    const response = {
+        id,
+        start: 0,
+        duration() {
+            return now() - this.start;
+        },
+        toString() {
+            return `${this.id} took ${(this.duration()).toFixed(2)}ms`;
+        },
+    };
+    return () => {
+        response.start = now();
+        return response;
+    };
 }
 const BYTES_IN_MB = 1024 * 1024;
 const toMb = (bytes) => (bytes / BYTES_IN_MB).toFixed(1);
-const signedMb = (bytes) => `${bytes >= 0 ? "+" : "-"}${toMb(bytes)}`;
+const signedMb = (bytes) => `${bytes >= 0 ? "+" : ""}${toMb(bytes)}`;
 /** Raw process memory usage, or `null` in environments without `process` (e.g. browser). */
 function rawMemoryUsage() {
     if (isBrowser() || typeof process.memoryUsage !== "function") {

package/packages/jam/safrole/bandersnatch-vrf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bandersnatch-vrf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/bandersnatch-vrf.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAsB,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAwB/D,QAAA,MAAM,SAAS;;;;;;;;CAQd,CAAC;AAKF,eAAe,SAAS,CAAC;AAEzB,iBAAe,iBAAiB,CAC9B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,EAChC,gBAAgB,EAAE,wBAAwB,EAC1C,oBAAoB,EAAE,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC,CAkBnD;AAED,iBAAe,UAAU,CACvB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,GAC/B,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAapC;AAED,iBAAS,iBAAiB,CACxB,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,eAAe,EAAE,GAC5B,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAmB7C;AAkBD,iBAAe,aAAa,CAC1B,YAAY,EAAE,gBAAgB,EAC9B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,EAAE,CAAC,CAqB3D;AAED,iBAAe,YAAY,CACzB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC,CAQjD;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAElE,iBAAe,gBAAgB,CAC7B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAQtC;AAKD;;GAEG;AACH,iBAAe,eAAe,CAC5B,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,eAAe,EAAE,EAC3B,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,WAAW,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,CA0CvC"}
+{"version":3,"file":"bandersnatch-vrf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/bandersnatch-vrf.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAsB,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAwC/D,QAAA,MAAM,SAAS;;;;;;;;CAQd,CAAC;AAKF,eAAe,SAAS,CAAC;AAIzB,iBAAe,iBAAiB,CAC9B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,EAChC,gBAAgB,EAAE,wBAAwB,EAC1C,oBAAoB,EAAE,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC,CAkBnD;AAED,iBAAe,UAAU,CACvB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,GAC/B,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAapC;AAED,iBAAS,iBAAiB,CACxB,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,eAAe,EAAE,GAC5B,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAe7C;AAmBD,iBAAe,aAAa,CAC1B,YAAY,EAAE,gBAAgB,EAC9B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,EAAE,CAAC,CAqB3D;AAGD,iBAAe,YAAY,CACzB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC,CAQjD;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAGlE,iBAAe,gBAAgB,CAC7B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAQtC;AAKD;;GAEG;AACH,iBAAe,eAAe,CAC5B,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,eAAe,EAAE,EAC3B,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,WAAW,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,CA0CvC"}

package/packages/jam/safrole/bandersnatch-vrf.js

@@ -17,8 +17,23 @@ var ResultValues;
  * to overcome that we cache the results of getting ring commitment.
  * Note we can also tentatively populate this cache, before we even
  * reach the epoch change block.
+ *
+ * Keep number of entries low here, since matching is done by fully
+ * comparing the keys.
+ * To avoid array re-allocation we keep it's size constant and use
+ * index.
  */
-const ringCommitmentCache = [];
+let ringCommitmentIndex = 0;
+const ringCommitmentCache = [
+    {
+        keys: BytesBlob.empty(),
+        value: Promise.resolve(Result.error(null, () => "")),
+    },
+    {
+        keys: BytesBlob.empty(),
+        value: Promise.resolve(Result.error(null, () => "")),
+    },
+];
 const FUNCTIONS = {
     verifySeal,
     verifyHeaderSeals,
@@ -32,10 +47,11 @@ const FUNCTIONS = {
 // Ideally we would just export functions and figure out how to mock
 // properly in ESM.
 export default FUNCTIONS;
+const VRF_SEAL_VERIFICATION_FAILED = () => "Bandersnatch VRF seal verification failed";
 async function verifyHeaderSeals(bandersnatch, authorKey, signature, payload, encodedUnsealedHeader, entropySignature, entropyPayloadPrefix) {
     const sealResult = await bandersnatch.verifyHeaderSeals(authorKey.raw, signature.raw, payload.raw, encodedUnsealedHeader.raw, entropySignature.raw, entropyPayloadPrefix.raw);
     if (sealResult[RESULT_INDEX] === ResultValues.Error) {
-        return Result.error(null, () => "Bandersnatch VRF seal verification failed");
+        return Result.error(null, VRF_SEAL_VERIFICATION_FAILED);
     }
     return Result.ok([
         Bytes.fromBlob(sealResult.subarray(1, 33), HASH_SIZE).asOpaque(),
@@ -45,33 +61,30 @@ async function verifyHeaderSeals(bandersnatch, authorKey, signature, payload, en
 async function verifySeal(bandersnatch, authorKey, signature, payload, encodedUnsealedHeader) {
     const sealResult = await bandersnatch.verifySeal(authorKey.raw, signature.raw, payload.raw, encodedUnsealedHeader.raw);
     if (sealResult[RESULT_INDEX] === ResultValues.Error) {
-        return Result.error(null, () => "Bandersnatch VRF seal verification failed");
+        return Result.error(null, VRF_SEAL_VERIFICATION_FAILED);
     }
     return Result.ok(Bytes.fromBlob(sealResult.subarray(1), HASH_SIZE).asOpaque());
 }
 function getRingCommitment(bandersnatch, validators) {
     const keys = BytesBlob.blobFromParts(validators.map((x) => x.raw));
-    // We currently compare the large bytes blob, but the number of entries in the cache
-    // must be low. If the cache ever grows larger, we should rather consider hashing the keys.
-    const MAX_CACHE_ENTRIES = 3;
     const cacheEntry = ringCommitmentCache.find((v) => v.keys.isEqualTo(keys));
     if (cacheEntry !== undefined) {
         return cacheEntry.value;
     }
     const value = getRingCommitmentNoCache(bandersnatch, keys);
-    ringCommitmentCache.push({
+    ringCommitmentCache[ringCommitmentIndex] = {
         keys,
         value,
-    });
-    if (ringCommitmentCache.length > MAX_CACHE_ENTRIES) {
-        ringCommitmentCache.shift();
-    }
+    };
+    // move the index to point at next entry to override.
+    ringCommitmentIndex = (ringCommitmentIndex + 1) % ringCommitmentCache.length;
     return value;
 }
+const RING_COMMITMENT_FAILED = () => "Bandersnatch ring commitment calculation failed";
 async function getRingCommitmentNoCache(bandersnatch, keys) {
     const commitmentResult = await bandersnatch.getRingCommitment(keys.raw);
     if (commitmentResult[RESULT_INDEX] === ResultValues.Error) {
-        return Result.error(null, () => "Bandersnatch ring commitment calculation failed");
+        return Result.error(null, RING_COMMITMENT_FAILED);
     }
     return Result.ok(Bytes.fromBlob(commitmentResult.subarray(1), BANDERSNATCH_RING_ROOT_BYTES).asOpaque());
 }
@@ -87,17 +100,19 @@ async function verifyTickets(bandersnatch, numberOfValidators, epochRoot, ticket
         entropyHash: Bytes.fromBlob(result.raw.subarray(1, TICKET_RESULT_LENGTH), HASH_SIZE).asOpaque(),
     }));
 }
+const SEAL_FAILED_ERROR = () => "Seal generation failed";
 async function generateSeal(bandersnatch, authorKey, input, auxData) {
     const result = await bandersnatch.generateSeal(authorKey.raw, input.raw, auxData.raw);
     if (result[RESULT_INDEX] === ResultValues.Error) {
-        return Result.error(null, () => "Seal generation failed");
+        return Result.error(null, SEAL_FAILED_ERROR);
     }
     return Result.ok(Bytes.fromBlob(result.subarray(1), BANDERSNATCH_VRF_SIGNATURE_BYTES).asOpaque());
 }
+const VRF_OUTPUT_FAILED = () => "VRF output hash generation failed";
 async function getVrfOutputHash(bandersnatch, authorKey, input) {
     const result = await bandersnatch.getVrfOutputHash(authorKey.raw, input.raw);
     if (result[RESULT_INDEX] === ResultValues.Error) {
-        return Result.error(null, () => "VRF output hash generation failed");
+        return Result.error(null, VRF_OUTPUT_FAILED);
     }
     return Result.ok(Bytes.fromBlob(result.subarray(1), HASH_SIZE).asOpaque());
 }

package/packages/jam/transition/chain-stf.d.ts

@@ -6,7 +6,7 @@ import type { DisputesErrorCode } from "#@typeberry/disputes/disputes-error-code
 import type { SafroleErrorCode, SafroleStateUpdate } from "#@typeberry/safrole/safrole.js";
 import { type SafroleSealError } from "#@typeberry/safrole/safrole-seal.js";
 import type { State, WithStateView } from "#@typeberry/state";
-import { type ErrorResult, Result, type TaggedError } from "#@typeberry/utils";
+import { type ErrorResult, measure, Result, type TaggedError } from "#@typeberry/utils";
 import { type ACCUMULATION_ERROR, type AccumulateOptions, type AccumulateStateUpdate } from "./accumulate/index.js";
 import { type AssurancesError, type AssurancesStateUpdate } from "./assurances.js";
 import { type AuthorizationStateUpdate } from "./authorization.js";
@@ -59,6 +59,7 @@ export declare class OnChain {
     readonly chainSpec: ChainSpec;
     readonly state: State & WithStateView;
     readonly hasher: TransitionHasher;
+    readonly measureAccumulate: ReturnType<typeof measure>;
     /** Wire up a full on-chain STF from its dependencies. */
     static assemble(args: {
         chainSpec: ChainSpec;

package/packages/jam/transition/chain-stf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain-stf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/chain-stf.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chain-stf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/chain-stf.ts"],"names":[],"mappings":"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"}

package/packages/jam/transition/chain-stf.js

@@ -84,6 +84,7 @@ export class OnChain {
     chainSpec;
     state;
     hasher;
+    measureAccumulate;
     /** Wire up a full on-chain STF from its dependencies. */
     static assemble(args) {
         return new OnChain(args.chainSpec, args.state, args.hasher, args.options, args.headerChain);
@@ -104,14 +105,25 @@ export class OnChain {
         this.accumulateOutput = new AccumulateOutput();
         this.preimages = new Preimages(state, hasher.blake2b);
         this.authorization = new Authorization(chainSpec, state);
+        this.measureAccumulate = measure(`import:accumulate (${PvmBackend[options.pvm]})`);
     }
     /** Pre-populate things worth caching for the next epoch. */
     async prepareForNextEpoch() {
         if (await this.isReadyForNextEpoch) {
             return;
         }
+        const timeslot = this.state.timeslot;
+        logger.log `#${timeslot} preparing for next epoch`;
         const ready = this.safrole.prepareValidatorKeysForNextEpoch(this.state.disputesRecords.punishSet);
-        this.isReadyForNextEpoch = ready.then((_) => true);
+        this.isReadyForNextEpoch = ready.then((x) => {
+            if (x.isOk) {
+                logger.log `#${timeslot} next epoch ready`;
+            }
+            else {
+                logger.log `#${timeslot} ${x.details()}`;
+            }
+            return true;
+        });
     }
     async verifySeal(timeSlot, block) {
         const sealState = this.safrole.getSafroleSealState(timeSlot);
@@ -205,14 +217,14 @@ export class OnChain {
         }
         const { preimages, ...preimagesRest } = preimagesResult.ok;
         assertEmpty(preimagesRest);
-        const timerAccumulate = measure(`import:accumulate (${PvmBackend[this.accumulate.options.pvm]})`);
+        const timerAccumulate = this.measureAccumulate();
         // accumulate
         const accumulateResult = await this.accumulate.transition({
             slot: timeSlot,
             reports: availableReports,
             entropy: entropy[0],
         });
-        logger.log `${timerAccumulate()}`;
+        logger.log `#${timeSlot} ${timerAccumulate}`;
         if (accumulateResult.isError) {
             return stfError(StfErrorKind.Accumulate, accumulateResult);
         }

package/packages/workers/importer/events-logger.d.ts

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

package/packages/workers/importer/events-logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"events-logger.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/events-logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,6CAA6C;AAC7C,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC;IAEvE,qCAAqC;IACrC,OAAO,CAAC,qBAAqB,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;CAC7F;AAED,qBAAa,aAAc,YAAW,sBAAsB;IAYxD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,gFAAgF;IAChF,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,uFAAuF;IACvF,OAAO,CAAC,QAAQ,CAAC,SAAS;IAf5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,WAAW,CAAK;IAExB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM;IAIzB,OAAO;IAQP,OAAO,CAAC,qBAAqB,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC;IAIpF,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,IAGhC,MAAM,OAAO;CA0BxB"}

package/packages/workers/importer/events-logger.js

@@ -0,0 +1,50 @@
+import { memoryTracker, now } from "#@typeberry/utils";
+export class ImporterStats {
+    logger;
+    maxBlocks;
+    maxTimeMs;
+    memory = memoryTracker();
+    totalTimePrev = 0;
+    totalTime = 0;
+    totalBlocksPrev = 0;
+    totalBlocks = 0;
+    static new(logger) {
+        return new ImporterStats(logger);
+    }
+    constructor(logger, 
+    /** How often we are going to print the stats (i.e. every `maxBlocks` blocks) */
+    maxBlocks = 100, 
+    /** Alternatively print stats when we reach `${maxTimeMs}` of total block execution. */
+    maxTimeMs = 5000) {
+        this.logger = logger;
+        this.maxBlocks = maxBlocks;
+        this.maxTimeMs = maxTimeMs;
+    }
+    onStart(currentBestHeaderHash, currentBestState) {
+        this.logger.info `😎 Best time slot: ${currentBestState.timeslot} (header hash: ${currentBestHeaderHash})`;
+    }
+    onBlockImportingStarted(timeSlot) {
+        const start = now();
+        return (isOk) => {
+            const duration = now() - start;
+            const label = isOk ? "import" : "reject";
+            this.logger.log `⏱️ ${label} #${timeSlot} took ${duration.toFixed(2)}ms`;
+            this.totalTime += duration;
+            this.totalBlocks += 1;
+            if (this.totalBlocks >= this.maxBlocks || this.totalTime >= this.maxTimeMs) {
+                this.logger.info `📊 mem at #${timeSlot}: ${this.memory()}`;
+                // compute block statistics (rolling window of last two rounds)
+                const importedBlocks = this.totalBlocks + this.totalBlocksPrev;
+                const importTime = this.totalTime + this.totalTimePrev;
+                const blocksPerSecond = (importedBlocks / importTime) * 1000;
+                // carry over current round
+                this.totalBlocksPrev = this.totalBlocks;
+                this.totalTimePrev = this.totalTime;
+                this.totalBlocks = 0;
+                this.totalTime = 0;
+                this.logger.info `⏱️ time at #${timeSlot}: ${blocksPerSecond.toFixed(2)}bps`;
+            }
+            return duration;
+        };
+    }
+}

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

@@ -8,6 +8,7 @@ import type { TransitionHasher } from "#@typeberry/transition";
 import { BlockVerifierError } from "#@typeberry/transition/block-verifier.js";
 import { type StfError } from "#@typeberry/transition/chain-stf.js";
 import { Result, type TaggedError } from "#@typeberry/utils";
+import { type ImporterEventsListener } from "./events-logger.js";
 import type { Finalizer } from "./finality.js";
 export declare enum ImporterErrorKind {
     Verifier = 0,
@@ -29,6 +30,7 @@ export type ImporterArgs = {
     blocks: BlocksDb;
     states: StatesDb<SerializedState<LeafDb>>;
     options?: ImporterOptions;
+    events?: ImporterEventsListener;
 };
 export declare class Importer {
     private readonly verifier;
@@ -36,12 +38,12 @@ export declare class Importer {
     private readonly state;
     private currentHash;
     private readonly metrics;
-    private readonly memory;
     private readonly hasher;
     private readonly logger;
     private readonly blocks;
     private readonly states;
     private readonly options;
+    private readonly events;
     /**
      * Build an {@link Importer} connected to the best state loaded from `states`.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/importer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/importer.ts"],"names":[],"mappings":"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,EAA6B,MAAM,EAAkB,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACvG,OAAO,EAAE,KAAK,sBAAsB,EAAiB,MAAM,oBAAoB,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG/C,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;IAClC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,mDAAmD;AACnD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,SAAS,CAAC;IAChB,GAAG,EAAE,UAAU,CAAC;IAChB,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,sBAAsB,CAAC;CACjC,CAAC;AAQF,qBAAa,QAAQ;IACnB,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;IAEnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAEhD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,GAAG,QAAQ;IASzC,OAAO;IAyBP,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;YA2B9F,mBAAmB;IA6FjC,oBAAoB;IAMpB,gBAAgB;IAIhB,eAAe,CAAC,UAAU,EAAE,UAAU;IAKhC,KAAK;CAIZ"}

package/packages/workers/importer/importer.js

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