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

package/index.js

@@ -4247,13 +4247,13 @@ var compatibility_GpVersion;
     GpVersion["V0_7_1"] = "0.7.1";
     GpVersion["V0_7_2"] = "0.7.2";
 })(compatibility_GpVersion || (compatibility_GpVersion = {}));
-var TestSuite;
+var compatibility_TestSuite;
 (function (TestSuite) {
     TestSuite["W3F_DAVXY"] = "w3f-davxy";
     TestSuite["JAMDUNA"] = "jamduna";
-})(TestSuite || (TestSuite = {}));
+})(compatibility_TestSuite || (compatibility_TestSuite = {}));
 const ALL_VERSIONS_IN_ORDER = [compatibility_GpVersion.V0_6_7, compatibility_GpVersion.V0_7_0, compatibility_GpVersion.V0_7_1, compatibility_GpVersion.V0_7_2];
-const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
+const DEFAULT_SUITE = compatibility_TestSuite.W3F_DAVXY;
 const DEFAULT_VERSION = compatibility_GpVersion.V0_7_2;
 const env = typeof process === "undefined" ? {} : process.env;
 let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
@@ -4273,12 +4273,12 @@ function parseCurrentSuite(env) {
     if (env === undefined) {
         return undefined;
     }
-    for (const s of Object.values(TestSuite)) {
+    for (const s of Object.values(compatibility_TestSuite)) {
         if (env === s) {
             return s;
         }
     }
-    throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
+    throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(compatibility_TestSuite)}`);
 }
 class compatibility_Compatibility {
     static override(version) {
@@ -12259,7 +12259,7 @@ class service_LookupHistoryItem {
 
 
 
-const codecServiceId = compatibility_Compatibility.isSuite(TestSuite.W3F_DAVXY) || compatibility_Compatibility.isSuite(TestSuite.JAMDUNA, compatibility_GpVersion.V0_6_7)
+const codecServiceId = compatibility_Compatibility.isSuite(compatibility_TestSuite.W3F_DAVXY) || compatibility_Compatibility.isSuite(compatibility_TestSuite.JAMDUNA, compatibility_GpVersion.V0_6_7)
     ? descriptors_codec.u32.asOpaque()
     : descriptors_codec.varU32.convert((s) => numbers_tryAsU32(s), (i) => common_tryAsServiceId(i));
 /**
@@ -17794,7 +17794,7 @@ class accumulate_externalities_AccumulateExternalities {
     updatedState;
     currentServiceId;
     currentTimeslot;
-    checkpointedState = null;
+    checkpointedState;
     /** `x_i`: next service id we are going to create. */
     nextNewServiceId;
     constructor(chainSpec, blake2b, updatedState, 
@@ -17805,13 +17805,14 @@ class accumulate_externalities_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];
     }
@@ -18346,7 +18347,7 @@ function bumpServiceId(serviceId) {
  */
 class operand_Operand extends WithDebug {
     // JamDuna uses a different order of operands.
-    static Codec = descriptors_codec.Class(operand_Operand, compatibility_Compatibility.isSuite(TestSuite.JAMDUNA)
+    static Codec = descriptors_codec.Class(operand_Operand, compatibility_Compatibility.isSuite(compatibility_TestSuite.JAMDUNA)
         ? {
             hash: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
             exportsRoot: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
@@ -24226,8 +24227,8 @@ var FetchKind;
 
 
 const info_IN_OUT_REG = 7;
-const OFFSET_REG = compatibility_Compatibility.isSuite(TestSuite.W3F_DAVXY) || compatibility_Compatibility.isGreaterOrEqual(compatibility_GpVersion.V0_7_2) ? 9 : 11;
-const LEN_REG = compatibility_Compatibility.isSuite(TestSuite.W3F_DAVXY) || compatibility_Compatibility.isGreaterOrEqual(compatibility_GpVersion.V0_7_2) ? 10 : 12;
+const OFFSET_REG = compatibility_Compatibility.isSuite(compatibility_TestSuite.W3F_DAVXY) || compatibility_Compatibility.isGreaterOrEqual(compatibility_GpVersion.V0_7_2) ? 9 : 11;
+const LEN_REG = compatibility_Compatibility.isSuite(compatibility_TestSuite.W3F_DAVXY) || compatibility_Compatibility.isGreaterOrEqual(compatibility_GpVersion.V0_7_2) ? 10 : 12;
 /**
  * Return info about some account.
  *
@@ -24942,9 +24943,25 @@ class accumulate_Accumulate {
             // https://graypaper.fluffylabs.dev/#/ab2cdbd/193b05193b05?v=0.7.2
             const serviceStatistics = statistics.get(serviceId) ?? { count: 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.isLessThan(GpVersion.V0_7_2) && count > 0) ||
-                (Compatibility.isGreaterOrEqual(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.isLessThan(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.isGreaterOrEqual(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.isSuite(TestSuite.W3F_DAVXY, GpVersion.V0_7_1) && (count > 0 || consumedGas > 0n);
+            if (shouldUpdateStatisticsPre072 || shouldUpdateStatisticsPost072 || shouldUpdateStatistics071DavxyTraces) {
                 serviceStatistics.count = tryAsU32(serviceStatistics.count + count);
                 serviceStatistics.gasUsed = tryAsServiceGas(serviceStatistics.gasUsed + consumedGas);
                 statistics.set(serviceId, serviceStatistics);
@@ -25176,9 +25193,8 @@ class deferred_transfers_DeferredTransfers {
                 consumedGas = (await executor.run(args, tryAsGas(gas))).consumedGas;
             }
             transferStatistics.set(serviceId, { count: tryAsU32(transfers.length), gasUsed: tryAsServiceGas(consumedGas) });
-            const [updatedState, checkpointedState] = partialState.getStateUpdates();
+            const [updatedState] = partialState.getStateUpdates();
             currentStateUpdate = updatedState;
-            check `${checkpointedState === null} On transfer cannot invoke checkpoint.`;
         }
         return Result.ok({
             // NOTE: we return only services, since it's impossible to update