@typeberry/jam 0.3.1 → 0.4.0-203a18d

package/bootstrap-importer.mjs

@@ -7100,11 +7100,9 @@ function sequenceViewFixLen(type, { fixedLength }) {
 
 /** Helper function to create most used hashes in the block */
 class TransitionHasher {
-    context;
     keccakHasher;
     blake2b;
-    constructor(context, keccakHasher, blake2b) {
-        this.context = context;
+    constructor(keccakHasher, blake2b) {
         this.keccakHasher = keccakHasher;
         this.blake2b = blake2b;
     }
@@ -20816,13 +20814,11 @@ class AccumulateDataItem {
  * - gas cost and reports length for each service (statistics)
  */
 class AccumulateData {
-    autoAccumulateServicesByServiceId;
     reportsDataByServiceId;
     transfersByServiceId;
     serviceIds;
     gasLimitByServiceId;
     constructor(reports, transfers, autoAccumulateServicesByServiceId) {
-        this.autoAccumulateServicesByServiceId = autoAccumulateServicesByServiceId;
         const serviceIdsFromAutoAccumulate = new Set(autoAccumulateServicesByServiceId.keys());
         const { reportsDataByServiceId, serviceIds: serviceIdsFromReports, gasLimitByServiceId: reportsGasLimitByServiceId, } = this.transformReports(reports);
         this.reportsDataByServiceId = reportsDataByServiceId;
@@ -21142,12 +21138,12 @@ function createMergeContext(chainSpec, state, inputState, results) {
 }
 function updatePrivilegedService(currentServiceId, serviceIdUpdatedByManager, selfUpdatedServiceId) {
     if (currentServiceId === serviceIdUpdatedByManager) {
-        return serviceIdUpdatedByManager;
+        return selfUpdatedServiceId;
     }
-    return selfUpdatedServiceId;
+    return serviceIdUpdatedByManager;
 }
 function mergePrivilegedServices(mergeContext, [serviceId, { stateUpdate }]) {
-    const { outputState, currentPrivilegedServices, chainSpec } = mergeContext;
+    const { outputState, currentPrivilegedServices, chainSpec, privilegedServicesUpdatedByManager } = mergeContext;
     const currentManager = currentPrivilegedServices.manager;
     const currentRegistrar = currentPrivilegedServices.registrar;
     const currentDelegator = currentPrivilegedServices.delegator;
@@ -21165,28 +21161,35 @@ function mergePrivilegedServices(mergeContext, [serviceId, { stateUpdate }]) {
             });
         }
         if (serviceId === currentRegistrar) {
-            const newRegistrar = updatePrivilegedService(currentPrivilegedServices.registrar, outputState.privilegedServices.registrar, privilegedServices.registrar);
+            const newRegistrar = updatePrivilegedService(currentPrivilegedServices.registrar, privilegedServicesUpdatedByManager.registrar, privilegedServices.registrar);
             outputState.privilegedServices = PrivilegedServices.create({
                 ...outputState.privilegedServices,
                 registrar: newRegistrar,
             });
         }
         if (serviceId === currentDelegator) {
-            const newDelegator = updatePrivilegedService(currentPrivilegedServices.delegator, outputState.privilegedServices.delegator, privilegedServices.delegator);
+            const newDelegator = updatePrivilegedService(currentPrivilegedServices.delegator, privilegedServicesUpdatedByManager.delegator, privilegedServices.delegator);
             outputState.privilegedServices = PrivilegedServices.create({
                 ...outputState.privilegedServices,
                 delegator: newDelegator,
             });
         }
-        const assignersFromOutputState = outputState.privilegedServices;
-        const newAssigners = currentAssigners.map((currentAssigner, coreIndex) => serviceId === currentAssigner
-            ? updatePrivilegedService(currentPrivilegedServices.assigners[coreIndex], assignersFromOutputState.assigners[coreIndex], privilegedServices.assigners[coreIndex])
-            : currentAssigner);
-        const newAssignersPerCore = tryAsPerCore(newAssigners, chainSpec);
-        outputState.privilegedServices = PrivilegedServices.create({
-            ...outputState.privilegedServices,
-            assigners: newAssignersPerCore,
+        let shouldUpdateAssigners = false;
+        const newAssigners = currentAssigners.map((currentAssigner, coreIndex) => {
+            if (serviceId === currentAssigner) {
+                const newAssigner = updatePrivilegedService(currentPrivilegedServices.assigners[coreIndex], privilegedServicesUpdatedByManager.assigners[coreIndex], privilegedServices.assigners[coreIndex]);
+                shouldUpdateAssigners = shouldUpdateAssigners || newAssigner !== currentAssigner;
+                return newAssigner;
+            }
+            return currentAssigner;
         });
+        if (shouldUpdateAssigners) {
+            const newAssignersPerCore = tryAsPerCore(newAssigners, chainSpec);
+            outputState.privilegedServices = PrivilegedServices.create({
+                ...outputState.privilegedServices,
+                assigners: newAssignersPerCore,
+            });
+        }
     }
 }
 function mergeValidatorsData(mergeContext, [serviceId, { stateUpdate }]) {
@@ -22968,19 +22971,19 @@ class Accumulate {
         for (let serviceIndex = 0; serviceIndex < serviceIdsLength; serviceIndex += 1) {
             const serviceId = serviceIds[serviceIndex];
             const checkpoint = AccumulationStateUpdate.copyFrom(inputStateUpdate);
-            const promise = this.accumulateSingleService(serviceId, accumulateData.getTransfers(serviceId), accumulateData.getOperands(serviceId), accumulateData.getGasLimit(serviceId), slot, entropy, AccumulationStateUpdate.copyFrom(inputStateUpdate)).then(({ consumedGas, stateUpdate }) => ({
-                consumedGas,
-                stateUpdate: stateUpdate === null ? checkpoint : stateUpdate,
-            }));
+            const promise = this.accumulateSingleService(serviceId, accumulateData.getTransfers(serviceId), accumulateData.getOperands(serviceId), accumulateData.getGasLimit(serviceId), slot, entropy, AccumulationStateUpdate.copyFrom(inputStateUpdate)).then(({ consumedGas, stateUpdate }) => {
+                const resultEntry = [
+                    serviceId,
+                    {
+                        consumedGas,
+                        stateUpdate: stateUpdate === null ? checkpoint : stateUpdate,
+                    },
+                ];
+                return resultEntry;
+            });
             resultPromises[serviceIndex] = promise;
         }
-        return Promise.all(resultPromises).then((results) => {
-            const map = new Map();
-            for (let serviceIndex = 0; serviceIndex < serviceIdsLength; serviceIndex += 1) {
-                map.set(serviceIds[serviceIndex], results[serviceIndex]);
-            }
-            return map;
-        });
+        return Promise.all(resultPromises).then((results) => new Map(results));
     }
     /**
      * A method that updates `recentlyAccumulated`, `accumulationQueue` and `timeslot` in state
@@ -23069,9 +23072,10 @@ class Accumulate {
         const _gasCost = gasCost;
         assertEmpty(rest);
         const accumulated = accumulatableReports.subview(0, accumulatedReports);
-        const { yieldedRoot, services, transfers: _transfers, validatorsData, privilegedServices, authorizationQueues, ...stateUpdateRest } = state;
+        const { yieldedRoot, services, transfers, validatorsData, privilegedServices, authorizationQueues, ...stateUpdateRest } = state;
         assertEmpty(stateUpdateRest);
-        // yielded root is retrieved after each pvm invocation so we can ignore it here
+        // transfers and yielded root are retrieved after each pvm invocation so we can ignore it here
+        const _transfers = transfers;
         const _yieldedRoot = yieldedRoot;
         if (this.hasDuplicatedServiceIdCreated(services.created)) {
             accumulate_logger.trace `Duplicated Service creation detected. Block is invalid.`;
@@ -25002,7 +25006,7 @@ async function createImporter(config) {
     const interpreter = config.workerParams.pvm;
     const blocks = db.getBlocksDb();
     const states = db.getStatesDb();
-    const hasher = new TransitionHasher(chainSpec, await keccakHasher, await blake2b);
+    const hasher = new TransitionHasher(await keccakHasher, await blake2b);
     const importer = new Importer(chainSpec, interpreter, hasher, main_logger, blocks, states);
     return {
         importer,