@typeberry/lib 0.5.0-70ae055 → 0.5.0-793dce7

package/index.js

@@ -1581,7 +1581,7 @@ function addSizeHints(a, b) {
     };
 }
 const DEFAULT_START_LENGTH = 512; // 512B
-const MAX_LENGTH$1 = 10 * 1024 * 1024; // 10MB
+const MAX_LENGTH$1 = 20 * 1024 * 1024; // 20MB
 /**
  * JAM encoder.
  */
@@ -1934,7 +1934,7 @@ class Encoder {
             if (options.silent) {
                 return;
             }
-            throw new Error(`The encoded size would reach the maximum of ${MAX_LENGTH$1}.`);
+            throw new Error(`The encoded size (${newLength}) would reach the maximum of ${MAX_LENGTH$1}.`);
         }
         if (newLength > this.destination.length) {
             // we can try to resize the underlying buffer
@@ -6775,7 +6775,7 @@ class Credential extends WithDebug {
 /**
  * Tuple of work-report, a credential and it's corresponding timeslot.
  *
- * https://graypaper.fluffylabs.dev/#/579bd12/147102149102
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/15df00150301?v=0.7.2
  */
 class ReportGuarantee extends WithDebug {
     report;
@@ -6803,7 +6803,7 @@ class ReportGuarantee extends WithDebug {
      * validator index and a signature.
      * Credentials must be ordered by their validator index.
      *
-     * https://graypaper.fluffylabs.dev/#/579bd12/14b90214bb02
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/152b01152d01?v=0.7.2
      */
     credentials) {
         super();
@@ -7580,7 +7580,7 @@ const workExecResultFromJson = json.object({
     code_oversize: json.optional(json.fromAny(() => null)),
     output_oversize: json.optional(json.fromAny(() => null)),
 }, (val) => {
-    const { ok, out_of_gas, panic, bad_code, code_oversize } = val;
+    const { ok, out_of_gas, panic, bad_code, code_oversize, output_oversize } = val;
     if (ok !== undefined) {
         return new WorkExecResult(tryAsU32(WorkExecResultKind.ok), ok);
     }
@@ -7596,7 +7596,7 @@ const workExecResultFromJson = json.object({
     if (code_oversize === null) {
         return new WorkExecResult(tryAsU32(WorkExecResultKind.codeOversize));
     }
-    if (val.output_oversize === null) {
+    if (output_oversize === null) {
         return new WorkExecResult(tryAsU32(WorkExecResultKind.digestTooBig));
     }
     throw new Error("Invalid WorkExecResult");
@@ -8708,8 +8708,6 @@ const W_B = Compatibility.isGreaterOrEqual(GpVersion.V0_7_2) ? 13_791_360 : 13_7
 const W_C = 4_000_000;
 /** `W_M`: The maximum number of imports in a work-package. */
 const W_M = 3_072;
-/** `W_R`: The maximum total size of all output blobs in a work-report, in octets. */
-const W_R = 49_152;
 /** `W_T`: The size of a transfer memo in octets. */
 const W_T = 128;
 /** `W_M`: The maximum number of exports in a work-package. */
@@ -20475,6 +20473,103 @@ function signingPayload$1(blake2b, anchor, blob) {
     return BytesBlob.blobFromParts(JAM_AVAILABLE, blake2b.hashBytes(BytesBlob.blobFromParts(anchor.raw, blob.raw)).raw);
 }
 
+/** Error that may happen during reports processing. */
+var ReportsError;
+(function (ReportsError) {
+    /** Core index is greater than the number of available cores. */
+    ReportsError[ReportsError["BadCoreIndex"] = 0] = "BadCoreIndex";
+    /** The report slot is greater than the current block slot. */
+    ReportsError[ReportsError["FutureReportSlot"] = 1] = "FutureReportSlot";
+    /** Report is too old to be considered. */
+    ReportsError[ReportsError["ReportEpochBeforeLast"] = 2] = "ReportEpochBeforeLast";
+    /** Not enough credentials for the guarantee. */
+    ReportsError[ReportsError["InsufficientGuarantees"] = 3] = "InsufficientGuarantees";
+    /** Guarantees are not ordered by the core index. */
+    ReportsError[ReportsError["OutOfOrderGuarantee"] = 4] = "OutOfOrderGuarantee";
+    /** Credentials of guarantors are not sorted or unique. */
+    ReportsError[ReportsError["NotSortedOrUniqueGuarantors"] = 5] = "NotSortedOrUniqueGuarantors";
+    /** Validator in credentials is assigned to a different core. */
+    ReportsError[ReportsError["WrongAssignment"] = 6] = "WrongAssignment";
+    /** There is a report pending availability on that core already. */
+    ReportsError[ReportsError["CoreEngaged"] = 7] = "CoreEngaged";
+    /** Anchor block is not found in recent blocks. */
+    ReportsError[ReportsError["AnchorNotRecent"] = 8] = "AnchorNotRecent";
+    /** Service not foubd. */
+    ReportsError[ReportsError["BadServiceId"] = 9] = "BadServiceId";
+    /** Service code hash does not match the current one. */
+    ReportsError[ReportsError["BadCodeHash"] = 10] = "BadCodeHash";
+    /** Pre-requisite work package is missing in either recent blocks or lookup extrinsic. */
+    ReportsError[ReportsError["DependencyMissing"] = 11] = "DependencyMissing";
+    /** Results for the same package are in more than one report. */
+    ReportsError[ReportsError["DuplicatePackage"] = 12] = "DuplicatePackage";
+    /** Anchor block declared state root does not match the one we have in recent blocks. */
+    ReportsError[ReportsError["BadStateRoot"] = 13] = "BadStateRoot";
+    /** BEEFY super hash mmr mismatch. */
+    ReportsError[ReportsError["BadBeefyMmrRoot"] = 14] = "BadBeefyMmrRoot";
+    /** The authorization hash is not found in the authorization pool. */
+    ReportsError[ReportsError["CoreUnauthorized"] = 15] = "CoreUnauthorized";
+    /** Validator index is greater than the number of validators. */
+    ReportsError[ReportsError["BadValidatorIndex"] = 16] = "BadValidatorIndex";
+    /** Total gas of work report is too high. */
+    ReportsError[ReportsError["WorkReportGasTooHigh"] = 17] = "WorkReportGasTooHigh";
+    /** Work item has is smaller than required minimal accumulation gas of a service. */
+    ReportsError[ReportsError["ServiceItemGasTooLow"] = 18] = "ServiceItemGasTooLow";
+    /** The report has too many dependencies (prerequisites and/or segment-root lookups). */
+    ReportsError[ReportsError["TooManyDependencies"] = 19] = "TooManyDependencies";
+    /** Segment root lookup block has invalid time slot or is not found in the header chain. */
+    ReportsError[ReportsError["SegmentRootLookupInvalid"] = 20] = "SegmentRootLookupInvalid";
+    /** Signature in credentials is invalid. */
+    ReportsError[ReportsError["BadSignature"] = 21] = "BadSignature";
+    /** Size of authorizer output and all work-item successful output blobs is too big. */
+    ReportsError[ReportsError["WorkReportTooBig"] = 22] = "WorkReportTooBig";
+    /** Contains guarantee from validator that is proven to be an offender. */
+    ReportsError[ReportsError["BannedValidator"] = 23] = "BannedValidator";
+})(ReportsError || (ReportsError = {}));
+
+/**
+ * `W_R = 48 * 2**10`: The maximum total size of all output blobs in a work-report, in octets.
+ *
+ * https://graypaper.fluffylabs.dev/#/5f542d7/41a60041aa00?v=0.6.2
+ */
+const MAX_WORK_REPORT_SIZE_BYTES = 48 * 2 ** 10;
+function verifyReportsBasic(input) {
+    for (const guarantee of input) {
+        const reportView = guarantee.view().report.view();
+        /**
+         * We limit the sum of the number of items in the
+         * segment-root lookup dictionary and the number of
+         * prerequisites to J = 8:
+         *
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/13fd0113ff01?v=0.7.2
+         */
+        const noOfPrerequisites = reportView.context.view().prerequisites.view().length;
+        const noOfSegmentRootLookups = reportView.segmentRootLookup.view().length;
+        if (noOfPrerequisites + noOfSegmentRootLookups > MAX_REPORT_DEPENDENCIES) {
+            return Result$1.error(ReportsError.TooManyDependencies, () => `Report at ${reportView.coreIndex.materialize()} has too many dependencies. Got ${noOfPrerequisites} + ${noOfSegmentRootLookups}, max: ${MAX_REPORT_DEPENDENCIES}`);
+        }
+        /**
+         * In order to ensure fair use of a block’s extrinsic space,
+         * work-reports are limited in the maximum total size of the
+         * successful output blobs together with the authorizer output
+         * blob, effectively limiting their overall size:
+         *
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/14a80014ab00?v=0.7.2
+         */
+        // adding is safe here, since the total-encoded size of the report
+        // is limited as well. Even though we just have a view, the size
+        // should have been verified earlier.
+        const authOutputSize = reportView.authorizationOutput.view().length;
+        let totalOutputsSize = 0;
+        for (const item of reportView.results.view()) {
+            totalOutputsSize += item.view().result.view().okBlob?.raw.length ?? 0;
+        }
+        if (authOutputSize + totalOutputsSize > MAX_WORK_REPORT_SIZE_BYTES) {
+            return Result$1.error(ReportsError.WorkReportTooBig, () => `Work report at ${reportView.coreIndex.materialize()} too big. Got ${authOutputSize} + ${totalOutputsSize}, max: ${MAX_WORK_REPORT_SIZE_BYTES}`);
+        }
+    }
+    return Result$1.ok(OK);
+}
+
 var TransferOperandKind;
 (function (TransferOperandKind) {
     TransferOperandKind[TransferOperandKind["OPERAND"] = 0] = "OPERAND";
@@ -20586,7 +20681,7 @@ function getEncodedConstants(chainSpec) {
         W_E: tryAsU32(chainSpec.erasureCodedPieceSize),
         W_M: tryAsU32(W_M),
         W_P: tryAsU32(chainSpec.numberECPiecesPerSegment),
-        W_R: tryAsU32(W_R),
+        W_R: tryAsU32(MAX_WORK_REPORT_SIZE_BYTES),
         W_T: tryAsU32(W_T),
         W_X: tryAsU32(W_X),
         Y: tryAsU32(chainSpec.contestLength),
@@ -21323,12 +21418,15 @@ class Accumulate {
     chainSpec;
     blake2b;
     state;
-    pvm;
-    constructor(chainSpec, blake2b, state, pvm) {
+    options;
+    constructor(chainSpec, blake2b, state, options) {
         this.chainSpec = chainSpec;
         this.blake2b = blake2b;
         this.state = state;
-        this.pvm = pvm;
+        this.options = options;
+        if (options.accumulateSequentially === true) {
+            logger$5.warn `⚠️ Parallel accumulation is disabled. Running in sequential mode.`;
+        }
     }
     /**
      * Returns an index that determines how many WorkReports can be processed before exceeding a given gasLimit.
@@ -21380,7 +21478,7 @@ class Accumulate {
             serviceExternalities: partialState,
             fetchExternalities,
         };
-        const executor = await PvmExecutor.createAccumulateExecutor(serviceId, code, externalities, this.chainSpec, this.pvm);
+        const executor = await PvmExecutor.createAccumulateExecutor(serviceId, code, externalities, this.chainSpec, this.options.pvm);
         const invocationArgs = Encoder.encodeObject(ARGS_CODEC$1, {
             slot,
             serviceId,
@@ -21597,6 +21695,9 @@ class Accumulate {
                 ];
                 return resultEntry;
             });
+            if (this.options.accumulateSequentially === true) {
+                await promise;
+            }
             resultPromises[serviceIndex] = promise;
         }
         return Promise.all(resultPromises).then((results) => new Map(results));
@@ -21905,7 +22006,7 @@ class BlockVerifier {
             }
         }
         // Check if extrinsic is valid.
-        // https://graypaper.fluffylabs.dev/#/cc517d7/0cba000cba00?v=0.6.5
+        // https://graypaper.fluffylabs.dev/#/ab2cdbd/0cba000cba00?v=0.7.2
         const extrinsicHash = headerView.extrinsicHash.materialize();
         const extrinsicMerkleCommitment = this.hasher.extrinsic(block.extrinsic.view());
         if (!extrinsicHash.isEqualTo(extrinsicMerkleCommitment.hash)) {
@@ -23231,59 +23332,6 @@ class RecentHistory {
     }
 }
 
-/** Error that may happen during reports processing. */
-var ReportsError;
-(function (ReportsError) {
-    /** Core index is greater than the number of available cores. */
-    ReportsError[ReportsError["BadCoreIndex"] = 0] = "BadCoreIndex";
-    /** The report slot is greater than the current block slot. */
-    ReportsError[ReportsError["FutureReportSlot"] = 1] = "FutureReportSlot";
-    /** Report is too old to be considered. */
-    ReportsError[ReportsError["ReportEpochBeforeLast"] = 2] = "ReportEpochBeforeLast";
-    /** Not enough credentials for the guarantee. */
-    ReportsError[ReportsError["InsufficientGuarantees"] = 3] = "InsufficientGuarantees";
-    /** Guarantees are not ordered by the core index. */
-    ReportsError[ReportsError["OutOfOrderGuarantee"] = 4] = "OutOfOrderGuarantee";
-    /** Credentials of guarantors are not sorted or unique. */
-    ReportsError[ReportsError["NotSortedOrUniqueGuarantors"] = 5] = "NotSortedOrUniqueGuarantors";
-    /** Validator in credentials is assigned to a different core. */
-    ReportsError[ReportsError["WrongAssignment"] = 6] = "WrongAssignment";
-    /** There is a report pending availability on that core already. */
-    ReportsError[ReportsError["CoreEngaged"] = 7] = "CoreEngaged";
-    /** Anchor block is not found in recent blocks. */
-    ReportsError[ReportsError["AnchorNotRecent"] = 8] = "AnchorNotRecent";
-    /** Service not foubd. */
-    ReportsError[ReportsError["BadServiceId"] = 9] = "BadServiceId";
-    /** Service code hash does not match the current one. */
-    ReportsError[ReportsError["BadCodeHash"] = 10] = "BadCodeHash";
-    /** Pre-requisite work package is missing in either recent blocks or lookup extrinsic. */
-    ReportsError[ReportsError["DependencyMissing"] = 11] = "DependencyMissing";
-    /** Results for the same package are in more than one report. */
-    ReportsError[ReportsError["DuplicatePackage"] = 12] = "DuplicatePackage";
-    /** Anchor block declared state root does not match the one we have in recent blocks. */
-    ReportsError[ReportsError["BadStateRoot"] = 13] = "BadStateRoot";
-    /** BEEFY super hash mmr mismatch. */
-    ReportsError[ReportsError["BadBeefyMmrRoot"] = 14] = "BadBeefyMmrRoot";
-    /** The authorization hash is not found in the authorization pool. */
-    ReportsError[ReportsError["CoreUnauthorized"] = 15] = "CoreUnauthorized";
-    /** Validator index is greater than the number of validators. */
-    ReportsError[ReportsError["BadValidatorIndex"] = 16] = "BadValidatorIndex";
-    /** Total gas of work report is too high. */
-    ReportsError[ReportsError["WorkReportGasTooHigh"] = 17] = "WorkReportGasTooHigh";
-    /** Work item has is smaller than required minimal accumulation gas of a service. */
-    ReportsError[ReportsError["ServiceItemGasTooLow"] = 18] = "ServiceItemGasTooLow";
-    /** The report has too many dependencies (prerequisites and/or segment-root lookups). */
-    ReportsError[ReportsError["TooManyDependencies"] = 19] = "TooManyDependencies";
-    /** Segment root lookup block has invalid time slot or is not found in the header chain. */
-    ReportsError[ReportsError["SegmentRootLookupInvalid"] = 20] = "SegmentRootLookupInvalid";
-    /** Signature in credentials is invalid. */
-    ReportsError[ReportsError["BadSignature"] = 21] = "BadSignature";
-    /** Size of authorizer output and all work-item successful output blobs is too big. */
-    ReportsError[ReportsError["WorkReportTooBig"] = 22] = "WorkReportTooBig";
-    /** Contains guarantee from validator that is proven to be an offender. */
-    ReportsError[ReportsError["BannedValidator"] = 23] = "BannedValidator";
-})(ReportsError || (ReportsError = {}));
-
 const ENTROPY_BYTES = 32;
 /**
  * Deterministic variant of the Fisher–Yates shuffle function
@@ -23332,17 +23380,17 @@ var index$5 = /*#__PURE__*/Object.freeze({
  * reports for it. This is borne out with V= 1023 validators
  * and C = 341 cores, since V/C = 3. The core index assigned to
  * each of the validators, as well as the validators’ Ed25519
- * keys are denoted by G.
+ * keys are denoted by M.
  *
- * https://graypaper.fluffylabs.dev/#/5f542d7/147601147e01
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/144c02145402?v=0.7.2
  */
 /**
  * Returns core assignments for each validator index.
  *
- * https://graypaper.fluffylabs.dev/#/5f542d7/14fd0114fd01
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/155300155d00?v=0.7.2
  */
 function generateCoreAssignment(spec, blake2b, 
-/** https://graypaper.fluffylabs.dev/#/5f542d7/149601149601 */
+/** https://graypaper.fluffylabs.dev/#/ab2cdbd/147102147102?v=0.7.2 */
 eta2entropy, 
 /** timeslot */
 slot) {
@@ -23352,7 +23400,7 @@ slot) {
 function rotationIndex(slot, rotationPeriod) {
     return asOpaqueType(Math.floor(slot / rotationPeriod));
 }
-/** https://graypaper.fluffylabs.dev/#/5f542d7/14c00114c001 */
+/** https://graypaper.fluffylabs.dev/#/ab2cdbd/151900151900?v=0.7.2 */
 function permute(blake2b, entropy, slot, spec) {
     const shift = rotationIndex(tryAsTimeSlot(slot % spec.epochLength), spec.rotationPeriod);
     const initialAssignment = Array(spec.validatorsCount)
@@ -23367,58 +23415,14 @@ function permute(blake2b, entropy, slot, spec) {
     // we are sure this is PerValidator, since that's the array we create earlier.
     return asKnownSize(coreAssignment);
 }
-/** https://graypaper.fluffylabs.dev/#/5f542d7/14a50114a501 */
+/** https://graypaper.fluffylabs.dev/#/ab2cdbd/148002148002?v=0.7.2 */
 function rotate(cores, n, noOfCores) {
     // modulo `noOfCores` guarantees that we're within `CoreIndex` range.
     return cores.map((x) => asOpaqueType((x + n) % noOfCores));
 }
 
-/**
- * `W_R = 48 * 2**10`: The maximum total size of all output blobs in a work-report, in octets.
- *
- * https://graypaper.fluffylabs.dev/#/5f542d7/41a60041aa00?v=0.6.2
- */
-const MAX_WORK_REPORT_SIZE_BYTES = 48 * 2 ** 10;
-function verifyReportsBasic(input) {
-    for (const guarantee of input) {
-        const reportView = guarantee.view().report.view();
-        /**
-         * We limit the sum of the number of items in the
-         * segment-root lookup dictionary and the number of
-         * prerequisites to J = 8:
-         *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/13ab0013ad00?v=0.6.2
-         */
-        const noOfPrerequisites = reportView.context.view().prerequisites.view().length;
-        const noOfSegmentRootLookups = reportView.segmentRootLookup.view().length;
-        if (noOfPrerequisites + noOfSegmentRootLookups > MAX_REPORT_DEPENDENCIES) {
-            return Result$1.error(ReportsError.TooManyDependencies, () => `Report at ${reportView.coreIndex.materialize()} has too many dependencies. Got ${noOfPrerequisites} + ${noOfSegmentRootLookups}, max: ${MAX_REPORT_DEPENDENCIES}`);
-        }
-        /**
-         * In order to ensure fair use of a block’s extrinsic space,
-         * work-reports are limited in the maximum total size of the
-         * successful output blobs together with the authorizer output
-         * blob, effectively limiting their overall size:
-         *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/141d00142000?v=0.6.2
-         */
-        // adding is safe here, since the total-encoded size of the report
-        // is limited as well. Even though we just have a view, the size
-        // should have been verified earlier.
-        const authOutputSize = reportView.authorizationOutput.view().length;
-        let totalOutputsSize = 0;
-        for (const item of reportView.results.view()) {
-            totalOutputsSize += item.view().result.view().okBlob?.raw.length ?? 0;
-        }
-        if (authOutputSize + totalOutputsSize > MAX_WORK_REPORT_SIZE_BYTES) {
-            return Result$1.error(ReportsError.WorkReportTooBig, () => `Work report at ${reportView.coreIndex.materialize()} too big. Got ${authOutputSize} + ${totalOutputsSize}, max: ${MAX_WORK_REPORT_SIZE_BYTES}`);
-        }
-    }
-    return Result$1.ok(OK);
-}
-
 const logger$3 = Logger.new(import.meta.filename, "stf:reports");
-/** https://graypaper.fluffylabs.dev/#/7e6ff6a/15eb0115eb01?v=0.6.7 */
+/** https://graypaper.fluffylabs.dev/#/ab2cdbd/158202158202?v=0.7.2 */
 function verifyContextualValidity(input, state, headerChain, maxLookupAnchorAge) {
     const contexts = [];
     // hashes of work packages reported in this extrinsic
@@ -23440,8 +23444,11 @@ function verifyContextualValidity(input, state, headerChain, maxLookupAnchorAge)
             if (service === null) {
                 return Result$1.error(ReportsError.BadServiceId, () => `No service with id: ${result.serviceId}`);
             }
-            // check service code hash
-            // https://graypaper.fluffylabs.dev/#/5f542d7/154b02154b02
+            /**
+             * Check service code hash
+             *
+             * https://graypaper.fluffylabs.dev/#/ab2cdbd/150804150804?v=0.7.2
+             */
             if (!result.codeHash.isEqualTo(service.getInfo().codeHash)) {
                 return Result$1.error(ReportsError.BadCodeHash, () => `Service (${result.serviceId}) code hash mismatch. Got: ${result.codeHash}, expected: ${service.getInfo().codeHash}`);
             }
@@ -23451,7 +23458,7 @@ function verifyContextualValidity(input, state, headerChain, maxLookupAnchorAge)
      * There must be no duplicate work-package hashes (i.e.
      * two work-reports of the same package).
      *
-     * https://graypaper.fluffylabs.dev/#/5f542d7/151f01152101
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/159c02159e02?v=0.7.2
      */
     if (currentWorkPackages.size !== input.guarantees.length) {
         return Result$1.error(ReportsError.DuplicatePackage, () => "Duplicate work package detected.");
@@ -23505,7 +23512,7 @@ function verifyContextualValidity(input, state, headerChain, maxLookupAnchorAge)
     }
     return Result$1.ok(currentWorkPackages);
 }
-/** https://graypaper.fluffylabs.dev/#/7e6ff6a/152502152502?v=0.6.7 */
+/** https://graypaper.fluffylabs.dev/#/ab2cdbd/15cd0215cd02?v=0.7.2 */
 function verifyRefineContexts(minLookupSlot, contexts, recentBlocksPartialUpdate, headerChain) {
     // TODO [ToDr] [opti] This could be cached and updated efficiently between runs.
     const recentBlocks = HashDictionary.new();
@@ -23516,9 +23523,9 @@ function verifyRefineContexts(minLookupSlot, contexts, recentBlocksPartialUpdate
         /**
          * We require that the anchor block be within the last H
          * blocks and that its details be correct by ensuring that it
-         * appears within our most recent blocks β †:
+         * appears within our most recent blocks β†:
          *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/152801152b01
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/15ad0215af02?v=0.7.2
          */
         const recentBlock = recentBlocks.get(context.anchor);
         if (recentBlock === undefined) {
@@ -23537,7 +23544,7 @@ function verifyRefineContexts(minLookupSlot, contexts, recentBlocksPartialUpdate
          * We require that each lookup-anchor block be within the
          * last L timeslots.
          *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/154601154701
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/15ce0215cf02?v=0.7.2
          */
         if (context.lookupAnchorSlot < minLookupSlot) {
             return Result$1.error(ReportsError.SegmentRootLookupInvalid, () => `Lookup anchor slot's too old. Got: ${context.lookupAnchorSlot}, minimal: ${minLookupSlot}`);
@@ -23548,7 +23555,7 @@ function verifyRefineContexts(minLookupSlot, contexts, recentBlocksPartialUpdate
          * on-chain state and must be checked by virtue of retaini
          * ing the series of the last L headers as the ancestor set A.
          *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/155c01155f01
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/15e40215e702?v=0.7.2
          */
         const isInChain = recentBlocks.has(context.lookupAnchor) ||
             headerChain.isAncestor(context.lookupAnchorSlot, context.lookupAnchor, context.anchor);
@@ -23571,7 +23578,7 @@ function verifyDependencies({ currentWorkPackages, recentlyReported, prerequisit
          * segment-root lookup, be either in the extrinsic or in our
          * recent history.
          *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/15ca0115cd01
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/156b03156e03?v=0.7.2
          */
         for (const preReqHash of dependencies) {
             if (currentWorkPackages.has(preReqHash)) {
@@ -23600,7 +23607,7 @@ function verifyWorkPackagesUniqueness(workPackageHashes, state) {
     /**
      * Make sure that the package does not appear anywhere in the pipeline.
      *
-     * https://graypaper.fluffylabs.dev/#/5f542d7/159101159101
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/152803152803?v=0.7.2
      */
     // TODO [ToDr] [opti] this most likely should be cached and either
     // re-computed on invalidity or we could maintain additional
@@ -23641,9 +23648,9 @@ function verifyCredentials(guarantees,
 workReportHashes, slot, getGuarantorAssignment) {
     /**
      * Collect signatures payload for later verification
-     * and construct the `reporters set R` from that data.
+     * and construct the `reporters set G` from that data.
      *
-     * https://graypaper.fluffylabs.dev/#/5f542d7/15cf0015cf00
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/153002153002?v=0.7.2
      */
     const signaturesToVerify = [];
     const headerTimeSlot = slot;
@@ -23657,7 +23664,7 @@ workReportHashes, slot, getGuarantorAssignment) {
          * The credential is a sequence of two or three tuples of a
          * unique validator index and a signature.
          *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/14b90214bb02
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/152b01152d01?v=0.7.2
          */
         const credentialsView = guaranteeView.credentials.view();
         if (credentialsView.length < REQUIRED_CREDENTIALS_RANGE[0] ||
@@ -23687,7 +23694,8 @@ workReportHashes, slot, getGuarantorAssignment) {
             }
             /**
              * Verify core assignment.
-             * https://graypaper.fluffylabs.dev/#/5f542d7/14e40214e602
+             *
+             * https://graypaper.fluffylabs.dev/#/ab2cdbd/155201155401?v=0.7.2
              */
             if (guarantorData.core !== coreIndex) {
                 return Result$1.error(ReportsError.WrongAssignment, () => `Invalid core assignment for validator ${validatorIndex}. Expected: ${guarantorData.core}, got: ${coreIndex}`);
@@ -23706,7 +23714,7 @@ const JAM_GUARANTEE = BytesBlob.blobFromString("jam_guarantee").raw;
  * The signature [...] whose message is the serialization of the hash
  * of the work-report.
  *
- * https://graypaper.fluffylabs.dev/#/5f542d7/155200155200
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/15a20115a201?v=0.7.2
  */
 function signingPayload(hash) {
     return BytesBlob.blobFromParts(JAM_GUARANTEE, hash.raw);
@@ -23717,7 +23725,7 @@ function verifyReportsOrder(input, chainSpec) {
      * The core index of each guarantee must be unique and
      * guarantees must be in ascending order of this.
      *
-     * https://graypaper.fluffylabs.dev/#/5f542d7/146902146a02
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/15d60015d700?v=0.7.2
      */
     const noOfCores = chainSpec.coresCount;
     let lastCoreIndex = -1;
@@ -23746,7 +23754,7 @@ function verifyPostSignatureChecks(input, availabilityAssignment, authPools, ser
          * No reports may be placed on cores with a report pending
          * availability on it.
          *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/15ea0015ea00
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/155002155002?v=0.7.2
          */
         if (availabilityAssignment[coreIndex] !== null) {
             return Result$1.error(ReportsError.CoreEngaged, () => `Report pending availability at core: ${coreIndex}`);
@@ -23756,7 +23764,7 @@ function verifyPostSignatureChecks(input, availabilityAssignment, authPools, ser
          * in the authorizer pool of the core on which the work is
          * reported.
          *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/15eb0015ed00
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/155102155302?v=0.7.2
          */
         const authorizerHash = report.authorizerHash;
         const authorizerPool = authPools.get(coreIndex);
@@ -23766,10 +23774,10 @@ function verifyPostSignatureChecks(input, availabilityAssignment, authPools, ser
         }
         /**
          * We require that the gas allotted for accumulation of each
-         * work item in each work-report respects its service’s
+         * work-digest in each work-report respects its service’s
          * minimum gas requirements.
          *
-         * https://graypaper.fluffylabs.dev/#/5f542d7/15f80015fa00
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/156602156802?v=0.7.2
          */
         for (const result of report.results) {
             const service = services(result.serviceId);
@@ -23841,10 +23849,11 @@ class Reports {
         /**
          * ρ′ - equivalent to ρ‡, except where the extrinsic replaced
          * an entry. In the case an entry is replaced, the new value
-         * includes the present time τ ′ allowing for the value to be
+         * includes the present time τ' allowing for the value to be
          * replaced without respect to its availability once sufficient
          * time has elapsed.
-         * https://graypaper.fluffylabs.dev/#/1c979cb/161e00165900?v=0.7.1
+         *
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/161e00165900?v=0.7.2
          */
         const availabilityAssignment = input.assurancesAvailAssignment.slice();
         for (const guarantee of input.guarantees) {
@@ -23902,7 +23911,7 @@ class Reports {
      * Get the guarantor assignment (both core and validator data)
      * depending on the rotation.
      *
-     * https://graypaper.fluffylabs.dev/#/5f542d7/158200158200
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/15df0115df01?v=0.7.2
      */
     getGuarantorAssignment(headerTimeSlot, guaranteeTimeSlot, newEntropy) {
         const epochLength = this.chainSpec.epochLength;
@@ -23910,7 +23919,7 @@ class Reports {
         const headerRotation = rotationIndex(headerTimeSlot, rotationPeriod);
         const guaranteeRotation = rotationIndex(guaranteeTimeSlot, rotationPeriod);
         const minTimeSlot = Math.max(0, headerRotation - 1) * rotationPeriod;
-        // https://graypaper.fluffylabs.dev/#/5f542d7/155e00156900
+        // https://graypaper.fluffylabs.dev/#/ab2cdbd/15980115be01?v=0.7.2
         if (guaranteeTimeSlot > headerTimeSlot) {
             return Result$1.error(ReportsError.FutureReportSlot, () => `Report slot is in future. Block ${headerTimeSlot}, Report: ${guaranteeTimeSlot}`);
         }
@@ -23918,7 +23927,7 @@ class Reports {
             return Result$1.error(ReportsError.ReportEpochBeforeLast, () => `Report slot is too old. Block ${headerTimeSlot}, Report: ${guaranteeTimeSlot}`);
         }
         // TODO [ToDr] [opti] below code needs cache.
-        // The `G` and `G*` sets should only be computed once per rotation.
+        // The `M` and `M*` sets should only be computed once per rotation.
         // Default data for the current rotation
         let entropy = newEntropy[2];
         let validatorData = this.state.currentValidatorData;
@@ -23935,7 +23944,7 @@ class Reports {
             }
         }
         // we know which entropy, timeSlot and validatorData should be used,
-        // so we can compute `G` or `G*` here.
+        // so we can compute `M` or `M*` here.
         const coreAssignment = generateCoreAssignment(this.chainSpec, this.blake2b, entropy, timeSlot);
         return Result$1.ok(zip(coreAssignment, validatorData, (core, validator) => ({
             core,
@@ -24103,22 +24112,23 @@ class Statistics {
         const newPreImagesSize = current[authorIndex].preImagesSize + preImagesSize;
         current[authorIndex].preImagesSize = tryAsU32(newPreImagesSize);
         /**
-         * * NOTE [MaSi] Please note I don't use Kappa' here. If I understand correctly we don't need it.
-         * Kappa' is not needed because we can use validator indexes directly from guarantees extrinsic.
-         * I asked a question to ensure it is true but I didn't get any response yet:
-         * https://github.com/w3f/jamtestvectors/pull/28#discussion_r190723700
+         * Update guarantees
          *
-         * https://graypaper.fluffylabs.dev/#/1c979cb/19a00119a801?v=0.7.1
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/19ea0119f201?v=0.7.2
          */
-        const incrementedGuarantors = new Set();
-        for (const guarantee of extrinsic.guarantees) {
-            for (const { validatorIndex } of guarantee.credentials) {
-                if (!incrementedGuarantors.has(validatorIndex)) {
-                    const newGuaranteesCount = current[validatorIndex].guarantees + 1;
-                    current[validatorIndex].guarantees = tryAsU32(newGuaranteesCount);
-                    incrementedGuarantors.add(validatorIndex);
-                }
+        const validatorKeys = input.currentValidatorData.map((v) => v.ed25519);
+        for (const reporter of input.reporters) {
+            const index = validatorKeys.findIndex((x) => x.isEqualTo(reporter));
+            if (index === -1) {
+                /**
+                 * it should never happen because:
+                 * 1. the extrinsic is verified in reports transition
+                 * 2. we use current validators set from safrole
+                 */
+                continue;
             }
+            const newGuaranteesCount = current[index].guarantees + 1;
+            current[index].guarantees = tryAsU32(newGuaranteesCount);
         }
         for (const { validatorIndex } of extrinsic.assurances) {
             const newAssurancesCount = current[validatorIndex].assurances + 1;
@@ -24273,7 +24283,7 @@ class OnChain {
     // chapter 13: https://graypaper.fluffylabs.dev/#/68eaa1f/18b60118b601?v=0.6.4
     statistics;
     isReadyForNextEpoch = Promise.resolve(false);
-    constructor(chainSpec, state, hasher, pvm, headerChain) {
+    constructor(chainSpec, state, hasher, options, headerChain) {
         this.chainSpec = chainSpec;
         this.state = state;
         this.hasher = hasher;
@@ -24285,9 +24295,9 @@ class OnChain {
         this.disputes = new Disputes(chainSpec, hasher.blake2b, state);
         this.reports = new Reports(chainSpec, hasher.blake2b, state, headerChain);
         this.assurances = new Assurances(chainSpec, state, hasher.blake2b);
-        this.accumulate = new Accumulate(chainSpec, hasher.blake2b, state, pvm);
+        this.accumulate = new Accumulate(chainSpec, hasher.blake2b, state, options);
         this.accumulateOutput = new AccumulateOutput();
-        this.deferredTransfers = new DeferredTransfers(chainSpec, hasher.blake2b, state, pvm);
+        this.deferredTransfers = new DeferredTransfers(chainSpec, hasher.blake2b, state, options.pvm);
         this.preimages = new Preimages(state, hasher.blake2b);
         this.authorization = new Authorization(chainSpec, state);
     }
@@ -24375,8 +24385,7 @@ class OnChain {
         if (reportsResult.isError) {
             return stfError(StfErrorKind.Reports, reportsResult);
         }
-        // NOTE `reporters` are unused
-        const { reported: workPackages, reporters: _, stateUpdate: reportsUpdate, ...reportsRest } = reportsResult.ok;
+        const { reported: workPackages, reporters, stateUpdate: reportsUpdate, ...reportsRest } = reportsResult.ok;
         assertEmpty(reportsRest);
         const { availabilityAssignment: reportsAvailAssignment, ...reportsUpdateRest } = reportsUpdate;
         assertEmpty(reportsUpdateRest);
@@ -24390,7 +24399,7 @@ class OnChain {
         }
         const { preimages, ...preimagesRest } = preimagesResult.ok;
         assertEmpty(preimagesRest);
-        const timerAccumulate = measure(`import:accumulate (${PvmBackend[this.accumulate.pvm]})`);
+        const timerAccumulate = measure(`import:accumulate (${PvmBackend[this.accumulate.options.pvm]})`);
         // accumulate
         const accumulateResult = await this.accumulate.transition({
             slot: timeSlot,
@@ -24450,6 +24459,8 @@ class OnChain {
             availableReports,
             accumulationStatistics,
             transferStatistics,
+            reporters: reporters,
+            currentValidatorData,
         });
         const { statistics, ...statisticsRest } = statisticsUpdate;
         assertEmpty(statisticsRest);
@@ -25492,7 +25503,7 @@ class Importer {
             throw new Error(`Unable to load best state from header hash: ${currentBestHeaderHash}.`);
         }
         this.verifier = new BlockVerifier(hasher, blocks);
-        this.stf = new OnChain(spec, state, hasher, pvm, DbHeaderChain.new(blocks));
+        this.stf = new OnChain(spec, state, hasher, { pvm, accumulateSequentially: false }, DbHeaderChain.new(blocks));
         this.state = state;
         this.currentHash = currentBestHeaderHash;
         this.prepareForNextEpoch();
@@ -25638,11 +25649,11 @@ const blake2b = Blake2b.createHasher();
 async function createImporter(config) {
     const chainSpec = config.chainSpec;
     const db = config.openDatabase({ readonly: false });
-    const interpreter = config.workerParams.pvm;
+    const pvm = config.workerParams.pvm;
     const blocks = db.getBlocksDb();
     const states = db.getStatesDb();
     const hasher = new TransitionHasher(await keccakHasher, await blake2b);
-    const importer = new Importer(chainSpec, interpreter, hasher, logger$1, blocks, states);
+    const importer = new Importer(chainSpec, pvm, hasher, logger$1, blocks, states);
     return {
         importer,
         db,