@typeberry/jam 0.1.1-e48de40 → 0.1.2-3178190

package/README.md

@@ -15,6 +15,7 @@ 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)
 
 JAM Prize requirements
 

package/block-generator/index.js

@@ -3575,6 +3575,7 @@ var GpVersion;
     GpVersion["V0_6_7"] = "0.6.7";
     GpVersion["V0_7_0"] = "0.7.0";
     GpVersion["V0_7_1"] = "0.7.1-preview";
+    GpVersion["V0_7_2"] = "0.7.2-preview";
 })(GpVersion || (GpVersion = {}));
 var TestSuite;
 (function (TestSuite) {
@@ -3582,7 +3583,7 @@ var TestSuite;
     TestSuite["JAMDUNA"] = "jamduna";
 })(TestSuite || (TestSuite = {}));
 const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
-const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1];
+const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 const env = typeof process === "undefined" ? {} : process.env;
 const DEFAULT_VERSION = GpVersion.V0_7_0;
 let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
@@ -3591,20 +3592,26 @@ function parseCurrentVersion(env) {
     if (env === undefined) {
         return undefined;
     }
-    const version = env;
-    if (!Object.values(GpVersion).includes(version)) {
-        throw new Error(`Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`);
+    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}`);
     }
-    return version;
 }
 function parseCurrentSuite(env) {
     if (env === undefined)
         return undefined;
-    const val = env;
-    if (!Object.values(TestSuite).includes(val)) {
-        throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
+    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)}`);
     }
-    return val;
 }
 class Compatibility {
     static override(version) {
@@ -12980,8 +12987,8 @@ function print(level, levelAndName, strings, data) {
         return;
     }
     const lvlText = Level[level].padEnd(5);
-    const val = strings.map((v, idx) => `${v}${data[idx]}`);
-    const msg = `${lvlText} [${levelAndName[1]}] ${val}`;
+    const val = strings.map((v, idx) => `${v}${idx < data.length ? data[idx] : ""}`);
+    const msg = `${lvlText} [${levelAndName[1]}] ${val.join("")}`;
     if (level === Level.WARN) {
         console.warn(msg);
     }
@@ -15471,6 +15478,17 @@ class page_range_PageRange {
         }
         return new page_range_PageRange(start, length);
     }
+    /** Returns true if the page range is wrapped (`start` >= `end`) and is not empty */
+    isWrapped() {
+        return this.start >= this.end && !this.isEmpty();
+    }
+    /** Checks if given page number is within the range */
+    isInRange(page) {
+        if (this.isWrapped()) {
+            return page >= this.start || page < this.end;
+        }
+        return page >= this.start && page < this.end;
+    }
     /** Checks if a range is empty (`length === 0`) */
     isEmpty() {
         return this.length === 0;
@@ -15850,10 +15868,11 @@ class memory_builder_MemoryBuilder {
       startHeapIndex (${startHeapIndex}) has to be less than or equal to endHeapIndex (${endHeapIndex})
     `;
         this.ensureNotFinalized();
-        const range = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
-        const pages = PageRange.fromMemoryRange(range);
-        for (const pageNumber of pages) {
-            if (this.initialMemory.has(pageNumber)) {
+        const heapRange = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
+        const heapPagesRange = PageRange.fromMemoryRange(heapRange);
+        const initializedPageNumbers = Array.from(this.initialMemory.keys());
+        for (const pageNumber of initializedPageNumbers) {
+            if (heapPagesRange.isInRange(pageNumber)) {
                 throw new IncorrectSbrkIndex();
             }
         }