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

package/index.cjs

@@ -21326,12 +21326,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.
@@ -21383,7 +21386,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,
@@ -21600,6 +21603,9 @@ class Accumulate {
                 ];
                 return resultEntry;
             });
+            if (this.options.accumulateSequentially === true) {
+                await promise;
+            }
             resultPromises[serviceIndex] = promise;
         }
         return Promise.all(resultPromises).then((results) => new Map(results));
@@ -24106,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;
@@ -24276,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;
@@ -24288,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);
     }
@@ -24378,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);
@@ -24393,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,
@@ -24453,6 +24459,8 @@ class OnChain {
             availableReports,
             accumulationStatistics,
             transferStatistics,
+            reporters: reporters,
+            currentValidatorData,
         });
         const { statistics, ...statisticsRest } = statisticsUpdate;
         assertEmpty(statisticsRest);
@@ -25495,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();
@@ -25641,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,

package/index.d.ts

@@ -9215,6 +9215,8 @@ type Input = {
      * https://graypaper.fluffylabs.dev/#/cc517d7/18dd0018dd00?v=0.6.5
      */
     transferStatistics: Map<ServiceId, CountAndGasUsed>;
+    reporters: readonly Ed25519Key[];
+    currentValidatorData: State["currentValidatorData"];
 };
 type CountAndGasUsed = {
     count: U32;
@@ -9281,14 +9283,19 @@ type AccumulateResult = {
     accumulationOutputLog: SortedArray<AccumulationOutput>;
 };
 
+type AccumulateOptions = {
+    pvm: PvmBackend;
+    accumulateSequentially: boolean;
+};
+
 declare const ACCUMULATION_ERROR = "duplicate service created";
 type ACCUMULATION_ERROR = typeof ACCUMULATION_ERROR;
 declare class Accumulate {
     readonly chainSpec: ChainSpec;
     readonly blake2b: Blake2b;
     readonly state: AccumulateState;
-    readonly pvm: PvmBackend;
-    constructor(chainSpec: ChainSpec, blake2b: Blake2b, state: AccumulateState, pvm: PvmBackend);
+    readonly options: AccumulateOptions;
+    constructor(chainSpec: ChainSpec, blake2b: Blake2b, state: AccumulateState, options: AccumulateOptions);
     /**
      * Returns an index that determines how many WorkReports can be processed before exceeding a given gasLimit.
      *
@@ -9850,7 +9857,7 @@ declare class OnChain {
     private readonly authorization;
     private readonly statistics;
     private isReadyForNextEpoch;
-    constructor(chainSpec: ChainSpec, state: State & WithStateView, hasher: TransitionHasher, pvm: PvmBackend, headerChain: HeaderChain);
+    constructor(chainSpec: ChainSpec, state: State & WithStateView, hasher: TransitionHasher, options: AccumulateOptions, headerChain: HeaderChain);
     /** Pre-populate things worth caching for the next epoch. */
     prepareForNextEpoch(): Promise<void>;
     private verifySeal;
@@ -10038,6 +10045,7 @@ type index$7_ACCUMULATION_ERROR = ACCUMULATION_ERROR;
 type index$7_Accumulate = Accumulate;
 declare const index$7_Accumulate: typeof Accumulate;
 type index$7_AccumulateInput = AccumulateInput;
+type index$7_AccumulateOptions = AccumulateOptions;
 type index$7_AccumulateResult = AccumulateResult;
 type index$7_AccumulateRoot = AccumulateRoot;
 type index$7_AccumulateState = AccumulateState;
@@ -10112,7 +10120,7 @@ declare const index$7_copyAndUpdateState: typeof copyAndUpdateState;
 declare const index$7_stfError: typeof stfError;
 declare namespace index$7 {
   export { index$7_Accumulate as Accumulate, index$7_Assurances as Assurances, index$7_AssurancesError as AssurancesError, index$7_Authorization as Authorization, index$7_BlockVerifier as BlockVerifier, index$7_BlockVerifierError as BlockVerifierError, index$7_DbHeaderChain as DbHeaderChain, index$7_DeferredTransfers as DeferredTransfers, index$7_DeferredTransfersErrorCode as DeferredTransfersErrorCode, index$7_Disputes as Disputes, index$7_GAS_TO_INVOKE_WORK_REPORT as GAS_TO_INVOKE_WORK_REPORT, index$7_OnChain as OnChain, index$7_Preimages as Preimages, index$7_PreimagesErrorCode as PreimagesErrorCode, index$7_REPORT_TIMEOUT_GRACE_PERIOD as REPORT_TIMEOUT_GRACE_PERIOD, index$7_RecentHistory as RecentHistory, index$7_Reports as Reports, index$7_ReportsError as ReportsError, index$7_Statistics as Statistics, index$7_StfErrorKind as StfErrorKind, index$7_TransitionHasher as TransitionHasher, index$7_copyAndUpdateState as copyAndUpdateState, index$8 as externalities, index$7_stfError as stfError };
-  export type { index$7_ACCUMULATION_ERROR as ACCUMULATION_ERROR, index$7_AccumulateInput as AccumulateInput, index$7_AccumulateResult as AccumulateResult, index$7_AccumulateRoot as AccumulateRoot, index$7_AccumulateState as AccumulateState, index$7_AccumulateStateUpdate as AccumulateStateUpdate, index$7_AssurancesInput as AssurancesInput, index$7_AssurancesState as AssurancesState, index$7_AssurancesStateUpdate as AssurancesStateUpdate, index$7_AuthorizationInput as AuthorizationInput, index$7_AuthorizationState as AuthorizationState, index$7_AuthorizationStateUpdate as AuthorizationStateUpdate, index$7_CountAndGasUsed as CountAndGasUsed, index$7_DeferredTransfersResult as DeferredTransfersResult, index$7_DeferredTransfersState as DeferredTransfersState, index$7_DisputesState as DisputesState, index$7_DisputesStateUpdate as DisputesStateUpdate, index$7_HeaderChain as HeaderChain, index$7_Input as Input, index$7_Ok as Ok, index$7_PreimagesInput as PreimagesInput, index$7_PreimagesState as PreimagesState, index$7_PreimagesStateUpdate as PreimagesStateUpdate, index$7_RecentHistoryInput as RecentHistoryInput, index$7_RecentHistoryPartialInput as RecentHistoryPartialInput, index$7_RecentHistoryState as RecentHistoryState, index$7_RecentHistoryStateUpdate as RecentHistoryStateUpdate, index$7_ReportsInput as ReportsInput, index$7_ReportsOutput as ReportsOutput, index$7_ReportsState as ReportsState, index$7_ReportsStateUpdate as ReportsStateUpdate, index$7_StatisticsState as StatisticsState, index$7_StatisticsStateUpdate as StatisticsStateUpdate, index$7_StfError as StfError };
+  export type { index$7_ACCUMULATION_ERROR as ACCUMULATION_ERROR, index$7_AccumulateInput as AccumulateInput, index$7_AccumulateOptions as AccumulateOptions, index$7_AccumulateResult as AccumulateResult, index$7_AccumulateRoot as AccumulateRoot, index$7_AccumulateState as AccumulateState, index$7_AccumulateStateUpdate as AccumulateStateUpdate, index$7_AssurancesInput as AssurancesInput, index$7_AssurancesState as AssurancesState, index$7_AssurancesStateUpdate as AssurancesStateUpdate, index$7_AuthorizationInput as AuthorizationInput, index$7_AuthorizationState as AuthorizationState, index$7_AuthorizationStateUpdate as AuthorizationStateUpdate, index$7_CountAndGasUsed as CountAndGasUsed, index$7_DeferredTransfersResult as DeferredTransfersResult, index$7_DeferredTransfersState as DeferredTransfersState, index$7_DisputesState as DisputesState, index$7_DisputesStateUpdate as DisputesStateUpdate, index$7_HeaderChain as HeaderChain, index$7_Input as Input, index$7_Ok as Ok, index$7_PreimagesInput as PreimagesInput, index$7_PreimagesState as PreimagesState, index$7_PreimagesStateUpdate as PreimagesStateUpdate, index$7_RecentHistoryInput as RecentHistoryInput, index$7_RecentHistoryPartialInput as RecentHistoryPartialInput, index$7_RecentHistoryState as RecentHistoryState, index$7_RecentHistoryStateUpdate as RecentHistoryStateUpdate, index$7_ReportsInput as ReportsInput, index$7_ReportsOutput as ReportsOutput, index$7_ReportsState as ReportsState, index$7_ReportsStateUpdate as ReportsStateUpdate, index$7_StatisticsState as StatisticsState, index$7_StatisticsStateUpdate as StatisticsStateUpdate, index$7_StfError as StfError };
 }
 
 declare enum ImporterErrorKind {

package/index.js

@@ -21323,12 +21323,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 +21383,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 +21600,9 @@ class Accumulate {
                 ];
                 return resultEntry;
             });
+            if (this.options.accumulateSequentially === true) {
+                await promise;
+            }
             resultPromises[serviceIndex] = promise;
         }
         return Promise.all(resultPromises).then((results) => new Map(results));
@@ -24103,22 +24109,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 +24280,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 +24292,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 +24382,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 +24396,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 +24456,8 @@ class OnChain {
             availableReports,
             accumulationStatistics,
             transferStatistics,
+            reporters: reporters,
+            currentValidatorData,
         });
         const { statistics, ...statisticsRest } = statisticsUpdate;
         assertEmpty(statisticsRest);
@@ -25492,7 +25500,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 +25646,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.5.0-70ae055",
+  "version": "0.5.0-7f94e30",
   "main": "index.js",
   "author": "Fluffy Labs",
   "license": "MPL-2.0",