@typeberry/jam 0.1.1-135f62f → 0.1.1-b537c8b

package/importer/index.js

@@ -23352,6 +23352,7 @@ class Accumulate {
         const serviceIds = accumulateData.getServiceIds();
         let gasCost = common_tryAsServiceGas(0);
         let currentState = inputStateUpdate;
+        const currentManager = (inputStateUpdate.privilegedServices ?? this.state.privilegedServices).manager;
         for (const serviceId of serviceIds) {
             const checkpoint = AccumulationStateUpdate.copyFrom(currentState);
             const { consumedGas, stateUpdate } = await this.accumulateSingleService(serviceId, accumulateData.getOperands(serviceId), accumulateData.getGasCost(serviceId), slot, entropy, currentState);
@@ -23361,6 +23362,21 @@ class Accumulate {
             serviceStatistics.gasUsed = common_tryAsServiceGas(serviceStatistics.gasUsed + consumedGas);
             statistics.set(serviceId, serviceStatistics);
             currentState = stateUpdate === null ? checkpoint : stateUpdate;
+            if (Compatibility.is(GpVersion.V0_7_0) && serviceId === currentManager) {
+                const newV = currentState.privilegedServices?.validatorsManager;
+                if (currentState.privilegedServices !== null && newV !== undefined && serviceIds.includes(newV)) {
+                    accumulate_logger.info("Entering completely incorrect code that probably reverts validatorsManager change. This is valid in 0.7.0 only and incorrect in 0.7.1+");
+                    // Since serviceIds already contains newV, this service gets accumulated twice.
+                    // To avoid double-counting, we skip stats and gas cost tracking here.
+                    // We need this accumulation to get the correct `validatorsManager`
+                    const { stateUpdate } = await this.accumulateSingleService(newV, accumulateData.getOperands(newV), accumulateData.getGasCost(newV), slot, entropy, checkpoint);
+                    const correctV = stateUpdate?.privilegedServices?.validatorsManager ?? this.state.privilegedServices.validatorsManager;
+                    currentState.privilegedServices = PrivilegedServices.create({
+                        ...currentState.privilegedServices,
+                        validatorsManager: correctV,
+                    });
+                }
+            }
         }
         return {
             state: currentState,