@typeberry/jam 0.2.0-5746fdc → 0.2.0-663eeb1

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;
@@ -3615,12 +3618,13 @@ class bytes_BytesBlob {
     }
     /** Display a hex-encoded version of this byte blob, but truncated if it's large. */
     toStringTruncated() {
+        const bytes = `${this.raw.length} ${this.raw.length === 1 ? "byte" : "bytes"}`;
         if (this.raw.length > 32) {
             const start = bytesToHexString(this.raw.subarray(0, 16));
             const end = bytesToHexString(this.raw.subarray(this.raw.length - 16));
-            return `${start}...${end.substring(2)} (${this.raw.length} bytes)`;
+            return `${start}...${end.substring(2)} (${bytes})`;
         }
-        return this.toString();
+        return `${this.toString()} (${bytes})`;
     }
     toJSON() {
         return this.toString();
@@ -7355,6 +7359,8 @@ const EC_SEGMENT_SIZE = 4104;
  * Additional data that has to be passed to the codec to correctly parse incoming bytes.
  */
 class ChainSpec extends WithDebug {
+    /** Human-readable name of the chain spec. */
+    name;
     /** Number of validators. */
     validatorsCount;
     /** 1/3 of number of validators */
@@ -7397,6 +7403,7 @@ class ChainSpec extends WithDebug {
     maxLookupAnchorAge;
     constructor(data) {
         super();
+        this.name = data.name;
         this.validatorsCount = data.validatorsCount;
         this.thirdOfValidators = numbers_tryAsU16(Math.floor(data.validatorsCount / 3));
         this.validatorsSuperMajority = numbers_tryAsU16(Math.floor(data.validatorsCount / 3) * 2 + 1);
@@ -7417,6 +7424,7 @@ class ChainSpec extends WithDebug {
 }
 /** Set of values for "tiny" chain as defined in JAM test vectors. */
 const tinyChainSpec = new ChainSpec({
+    name: "tiny",
     validatorsCount: numbers_tryAsU16(6),
     coresCount: numbers_tryAsU16(2),
     epochLength: numbers_tryAsU32(12),
@@ -7438,6 +7446,7 @@ const tinyChainSpec = new ChainSpec({
  * Please note that only validatorsCount and epochLength are "full", the rest is copied from "tiny".
  */
 const fullChainSpec = new ChainSpec({
+    name: "full",
     validatorsCount: numbers_tryAsU16(1023),
     coresCount: numbers_tryAsU16(341),
     epochLength: numbers_tryAsU32(600),
@@ -9013,7 +9022,6 @@ function reencodeAsView(codec, object, chainSpec) {
 
 
 
-
 /** Helper function to create most used hashes in the block */
 class TransitionHasher {
     context;
@@ -9062,15 +9070,6 @@ class TransitionHasher {
         const encoded = bytes_BytesBlob.blobFromParts([et.raw, ep.raw, eg.raw, ea.raw, ed.raw]);
         return new WithHashAndBytes(this.blake2b.hashBytes(encoded).asOpaque(), extrinsicView, encoded);
     }
-    /** Creates hash for given WorkPackage */
-    workPackage(workPackage) {
-        return this.encode(WorkPackage.Codec, workPackage);
-    }
-    encode(codec, data) {
-        // TODO [ToDr] Use already allocated encoding destination and hash bytes from some arena.
-        const encoded = Encoder.encodeObject(codec, data, this.context);
-        return new WithHashAndBytes(this.blake2b.hashBytes(encoded).asOpaque(), data, encoded);
-    }
 }
 
 ;// CONCATENATED MODULE: ./packages/jam/state/accumulation-output.ts
@@ -9105,7 +9104,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
@@ -10131,26 +10130,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
  */
@@ -10168,7 +10147,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);
@@ -10431,6 +10412,15 @@ class InMemoryService extends WithDebug {
             }),
         };
     }
+    /** Return identical `InMemoryService` which does not share any references. */
+    clone() {
+        return new InMemoryService(this.serviceId, {
+            info: ServiceAccountInfo.create(this.data.info),
+            preimages: HashDictionary.fromEntries(Array.from(this.data.preimages.entries())),
+            lookupHistory: HashDictionary.fromEntries(Array.from(this.data.lookupHistory.entries()).map(([k, v]) => [k, v.slice()])),
+            storage: new Map(this.data.storage.entries()),
+        });
+    }
     /**
      * Create a new in-memory service from another state service
      * by copying all given entries.
@@ -10801,7 +10791,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(),
@@ -10849,7 +10839,6 @@ var PreimagesErrorCode;
     PreimagesErrorCode["PreimagesNotSortedUnique"] = "preimages_not_sorted_unique";
     PreimagesErrorCode["AccountNotFound"] = "account_not_found";
 })(PreimagesErrorCode || (PreimagesErrorCode = {}));
-// TODO [SeKo] consider whether this module is the right place to remove expired preimages
 class Preimages {
     state;
     blake2b;