@typeberry/jam 0.2.0-4c80c6d → 0.2.0-5659c51

package/bootstrap-importer.mjs

@@ -14753,7 +14753,7 @@ class AccumulateExternalities {
     updatedState;
     currentServiceId;
     currentTimeslot;
-    checkpointedState = null;
+    checkpointedState;
     /** `x_i`: next service id we are going to create. */
     nextNewServiceId;
     constructor(chainSpec, blake2b, updatedState, 
@@ -14764,13 +14764,14 @@ class AccumulateExternalities {
         this.updatedState = updatedState;
         this.currentServiceId = currentServiceId;
         this.currentTimeslot = currentTimeslot;
+        this.checkpointedState = AccumulationStateUpdate.copyFrom(updatedState.stateUpdate);
         this.nextNewServiceId = this.getNextAvailableServiceId(nextNewServiceIdCandidate);
         const service = this.updatedState.getServiceInfo(this.currentServiceId);
         if (service === null) {
             throw new Error(`Invalid state initialization. Service info missing for ${this.currentServiceId}.`);
         }
     }
-    /** Return the underlying state update and checkpointed state (if any). */
+    /** Return the underlying state update and checkpointed state. */
     getStateUpdates() {
         return [this.updatedState.stateUpdate, this.checkpointedState];
     }
@@ -22719,9 +22720,25 @@ class Accumulate {
             // https://graypaper.fluffylabs.dev/#/ab2cdbd/193b05193b05?v=0.7.2
             const serviceStatistics = statistics.get(serviceId) ?? { count: numbers_tryAsU32(0), gasUsed: tryAsServiceGas(0) };
             const count = accumulateData.getReportsLength(serviceId);
-            // [0.7.1]: do not update statistics, if the service only had incoming transfers
-            if ((compatibility_Compatibility.isLessThan(compatibility_GpVersion.V0_7_2) && count > 0) ||
-                (compatibility_Compatibility.isGreaterOrEqual(compatibility_GpVersion.V0_7_2) && (count > 0 || consumedGas > 0n))) {
+            /**
+             * [0.7.1]: We do not update statistics, if the service only had incoming transfers
+             *
+             * https://graypaper.fluffylabs.dev/#/1c979cb/18ae0318ae03?v=0.7.1
+             */
+            const shouldUpdateStatisticsPre072 = compatibility_Compatibility.isLessThan(compatibility_GpVersion.V0_7_2) && count > 0;
+            /**
+             * [0.7.2]: We update statistics if anything is changed
+             *
+             * https://graypaper.fluffylabs.dev/#/ab2cdbd/18d00318dd03?v=0.7.2
+             */
+            const shouldUpdateStatisticsPost072 = compatibility_Compatibility.isGreaterOrEqual(compatibility_GpVersion.V0_7_2) && (count > 0 || consumedGas > 0n);
+            /**
+             * [0.7.1]: Tests are in version 0.7.1 but expect this change from 0.7.2
+             *
+             * https://github.com/davxy/jam-test-vectors/pull/104
+             */
+            const shouldUpdateStatistics071DavxyTraces = compatibility_Compatibility.isSuite(TestSuite.W3F_DAVXY, compatibility_GpVersion.V0_7_1) && (count > 0 || consumedGas > 0n);
+            if (shouldUpdateStatisticsPre072 || shouldUpdateStatisticsPost072 || shouldUpdateStatistics071DavxyTraces) {
                 serviceStatistics.count = numbers_tryAsU32(serviceStatistics.count + count);
                 serviceStatistics.gasUsed = tryAsServiceGas(serviceStatistics.gasUsed + consumedGas);
                 statistics.set(serviceId, serviceStatistics);
@@ -22953,9 +22970,8 @@ class DeferredTransfers {
                 consumedGas = (await executor.run(args, tryAsGas(gas))).consumedGas;
             }
             transferStatistics.set(serviceId, { count: numbers_tryAsU32(transfers.length), gasUsed: tryAsServiceGas(consumedGas) });
-            const [updatedState, checkpointedState] = partialState.getStateUpdates();
+            const [updatedState] = partialState.getStateUpdates();
             currentStateUpdate = updatedState;
-            debug_check `${checkpointedState === null} On transfer cannot invoke checkpoint.`;
         }
         return Result.ok({
             // NOTE: we return only services, since it's impossible to update