@typeberry/jam 0.2.0-0303f5b → 0.2.0-0e2cdac

package/README.md

@@ -14,8 +14,8 @@ Gray Paper compliance can be controlled via `GP_VERSION` environment variable.
 
 - [x] 0.6.7
 - [x] 0.7.0
-- [ ] 0.7.1 (partial)
-- [ ] 0.7.2 (partial)
+- [x] 0.7.1
+- [x] 0.7.2
 
 JAM Prize requirements
 
@@ -75,7 +75,7 @@ $ docker run typeberry
 $ docker run typeberry --config /app/configs/typeberry-dev.json --node-name my-node
 
 # Run with environment variables (e.g., for logging)
-$ docker run -e JAM_LOG=trace GP_VERSION=0.7.0 typeberry
+$ docker run -e JAM_LOG=trace GP_VERSION=0.7.2 typeberry
 
 # Run with volume mounts for persistent data
 $ docker run -v $(pwd)/database:/app/database typeberry

package/bootstrap-generator.mjs

@@ -2869,44 +2869,40 @@ var GpVersion;
     GpVersion["V0_6_7"] = "0.6.7";
     GpVersion["V0_7_0"] = "0.7.0";
     GpVersion["V0_7_1"] = "0.7.1";
-    GpVersion["V0_7_2"] = "0.7.2-preview";
+    GpVersion["V0_7_2"] = "0.7.2";
 })(GpVersion || (GpVersion = {}));
 var TestSuite;
 (function (TestSuite) {
     TestSuite["W3F_DAVXY"] = "w3f-davxy";
     TestSuite["JAMDUNA"] = "jamduna";
 })(TestSuite || (TestSuite = {}));
+const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
-const DEFAULT_VERSION = GpVersion.V0_7_1;
+const DEFAULT_VERSION = GpVersion.V0_7_2;
 const env = typeof process === "undefined" ? {} : process.env;
 let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
 let CURRENT_SUITE = parseCurrentSuite(env.TEST_SUITE) ?? DEFAULT_SUITE;
-const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 function parseCurrentVersion(env) {
     if (env === undefined) {
         return undefined;
     }
-    switch (env) {
-        case GpVersion.V0_6_7:
-        case GpVersion.V0_7_0:
-        case GpVersion.V0_7_1:
-        case GpVersion.V0_7_2:
-            return env;
-        default:
-            throw new Error(`Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`);
+    for (const v of Object.values(GpVersion)) {
+        if (env === v) {
+            return v;
+        }
     }
+    throw new Error(`Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`);
 }
 function parseCurrentSuite(env) {
     if (env === undefined) {
         return undefined;
     }
-    switch (env) {
-        case TestSuite.W3F_DAVXY:
-        case TestSuite.JAMDUNA:
-            return env;
-        default:
-            throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
+    for (const s of Object.values(TestSuite)) {
+        if (env === s) {
+            return s;
+        }
     }
+    throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
 }
 class Compatibility {
     static override(version) {
@@ -3067,6 +3063,13 @@ class WithDebug {
         return debug_inspect(this);
     }
 }
+function lazyInspect(obj) {
+    return {
+        toString() {
+            return debug_inspect(obj);
+        },
+    };
+}
 
 ;// CONCATENATED MODULE: ./packages/core/utils/dev.ts
 const dev_env = typeof process === "undefined" ? {} : process.env;
@@ -7453,10 +7456,23 @@ const fullChainSpec = new ChainSpec({
     maxLookupAnchorAge: numbers_tryAsU32(14_400),
 });
 
+;// CONCATENATED MODULE: ./packages/jam/config/pvm-backend.ts
+/** Implemented PVM Backends names in THE SAME ORDER as enum. */
+const PvmBackendNames = (/* unused pure expression or super */ null && (["built-in", "ananas"]));
+/** Implemented PVM Backends to choose from. */
+var PvmBackend;
+(function (PvmBackend) {
+    /** Built-in aka. Typeberry 🫐 interpreter. */
+    PvmBackend[PvmBackend["BuiltIn"] = 0] = "BuiltIn";
+    /** Ananas 🍍 interpreter. */
+    PvmBackend[PvmBackend["Ananas"] = 1] = "Ananas";
+})(PvmBackend || (PvmBackend = {}));
+
 ;// CONCATENATED MODULE: ./packages/jam/config/index.ts
 
 
 
+
 ;// CONCATENATED MODULE: ./packages/jam/block/codec.ts
 
 
@@ -9092,7 +9108,7 @@ function accumulationOutputComparator(a, b) {
     if (result > 0) {
         return Ordering.Greater;
     }
-    return Ordering.Equal;
+    return a.output.compare(b.output);
 }
 
 ;// CONCATENATED MODULE: ./packages/jam/block/gp-constants.ts
@@ -10118,26 +10134,6 @@ class InMemoryStateView {
 
 
 
-/** Dictionary entry of services that auto-accumulate every block. */
-class AutoAccumulate {
-    service;
-    gasLimit;
-    static Codec = descriptors_codec.Class(AutoAccumulate, {
-        service: descriptors_codec.u32.asOpaque(),
-        gasLimit: descriptors_codec.u64.asOpaque(),
-    });
-    static create({ service, gasLimit }) {
-        return new AutoAccumulate(service, gasLimit);
-    }
-    constructor(
-    /** Service id that auto-accumulates. */
-    service, 
-    /** Gas limit for auto-accumulation. */
-    gasLimit) {
-        this.service = service;
-        this.gasLimit = gasLimit;
-    }
-}
 /**
  * https://graypaper.fluffylabs.dev/#/ab2cdbd/114402114402?v=0.7.2
  */
@@ -10155,7 +10151,9 @@ class PrivilegedServices {
         registrar: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
             ? descriptors_codec.u32.asOpaque()
             : ignoreValueWithDefault(tryAsServiceId(2 ** 32 - 1)),
-        autoAccumulateServices: readonlyArray(descriptors_codec.sequenceVarLen(AutoAccumulate.Codec)),
+        autoAccumulateServices: descriptors_codec.dictionary(descriptors_codec.u32.asOpaque(), descriptors_codec.u64.asOpaque(), {
+            sortKeys: (a, b) => a - b,
+        }),
     });
     static create(a) {
         return new PrivilegedServices(a.manager, a.delegator, a.registrar, a.assigners, a.autoAccumulateServices);
@@ -10788,7 +10786,7 @@ class InMemoryState extends WithDebug {
                 assigners: tryAsPerCore(new Array(spec.coresCount).fill(tryAsServiceId(0)), spec),
                 delegator: tryAsServiceId(0),
                 registrar: tryAsServiceId(MAX_VALUE),
-                autoAccumulateServices: [],
+                autoAccumulateServices: new Map(),
             }),
             accumulationOutputLog: SortedArray.fromArray(accumulationOutputComparator, []),
             services: new Map(),