@typeberry/jam 0.5.0-70ae055 → 0.5.0-7f94e30

package/index.js

@@ -163000,12 +163000,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) {
+            accumulate_logger.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.
@@ -163057,7 +163060,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_Encoder.encodeObject(ARGS_CODEC, {
             slot,
             serviceId,
@@ -163274,6 +163277,9 @@ class Accumulate {
                 ];
                 return resultEntry;
             });
+            if (this.options.accumulateSequentially === true) {
+                await promise;
+            }
             resultPromises[serviceIndex] = promise;
         }
         return Promise.all(resultPromises).then((results) => new Map(results));
@@ -163505,6 +163511,7 @@ class DeferredTransfers {
 
 
 
+
 ;// CONCATENATED MODULE: ./packages/jam/transition/authorization.ts
 
 
@@ -165940,22 +165947,23 @@ class Statistics {
         const newPreImagesSize = current[authorIndex].preImagesSize + preImagesSize;
         current[authorIndex].preImagesSize = numbers_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 = numbers_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 = numbers_tryAsU32(newGuaranteesCount);
         }
         for (const { validatorIndex } of extrinsic.assurances) {
             const newAssurancesCount = current[validatorIndex].assurances + 1;
@@ -166127,7 +166135,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;
@@ -166139,9 +166147,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);
     }
@@ -166229,8 +166237,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);
@@ -166244,7 +166251,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,
@@ -166304,6 +166311,8 @@ class OnChain {
             availableReports,
             accumulationStatistics,
             transferStatistics,
+            reporters: reporters,
+            currentValidatorData,
         });
         const { statistics, ...statisticsRest } = statisticsUpdate;
         assertEmpty(statisticsRest);
@@ -166555,7 +166564,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();
@@ -166708,11 +166717,11 @@ const blake2b = 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 hasher_TransitionHasher(await keccakHasher, await blake2b);
-    const importer = new Importer(chainSpec, interpreter, hasher, main_logger, blocks, states);
+    const importer = new Importer(chainSpec, pvm, hasher, main_logger, blocks, states);
     return {
         importer,
         db,