@typeberry/lib 0.1.1-e48de40 → 0.1.2-3178190

package/index.cjs

@@ -10,6 +10,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) {
@@ -17,7 +18,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$1 = typeof process === "undefined" ? {} : process.env;
 const DEFAULT_VERSION = GpVersion.V0_7_0;
 let CURRENT_VERSION = parseCurrentVersion(env$1.GP_VERSION) ?? DEFAULT_VERSION;
@@ -26,20 +27,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) {
@@ -8045,8 +8052,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);
     }
@@ -12397,16 +12404,12 @@ class PartiallyUpdatedState {
      *
      * NOTE the info may be updated compared to what is in the state.
      *
-     * Takes into account newly created services as well.
+     * Takes into account ejected and newly created services as well.
      */
     getServiceInfo(destination) {
         if (destination === null) {
             return null;
         }
-        const isEjected = this.stateUpdate.services.servicesRemoved.some((x) => x === destination);
-        if (isEjected) {
-            return null;
-        }
         const maybeNewService = this.stateUpdate.services.servicesUpdates.find((update) => update.serviceId === destination);
         if (maybeNewService !== undefined) {
             return maybeNewService.action.account;
@@ -14122,6 +14125,17 @@ class PageRange {
         }
         return new 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;
@@ -14462,10 +14476,11 @@ class 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();
             }
         }

package/index.d.ts

@@ -2,6 +2,7 @@ declare enum GpVersion {
   V0_6_7 = "0.6.7",
   V0_7_0 = "0.7.0",
   V0_7_1 = "0.7.1-preview",
+  V0_7_2 = "0.7.2-preview",
 }
 
 declare enum TestSuite {
@@ -11,7 +12,7 @@ declare enum TestSuite {
 
 declare const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
 
-declare const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1];
+declare const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 declare const DEFAULT_VERSION = GpVersion.V0_7_0;
 declare let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
 declare let CURRENT_SUITE = parseCurrentSuite(env.TEST_SUITE) ?? DEFAULT_SUITE;
@@ -20,24 +21,30 @@ declare function parseCurrentVersion(env?: string): GpVersion | undefined {
   if (env === undefined) {
     return undefined;
   }
-  const version = env as GpVersion;
-  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;
 }
 
 declare function parseCurrentSuite(env?: string): TestSuite | undefined {
   if (env === undefined) return undefined;
-  const val = env as TestSuite;
-  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;
 }
 
 declare class Compatibility {
@@ -14773,11 +14780,12 @@ declare class MemoryBuilder {
     `;
     this.ensureNotFinalized();
 
-    const range = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
-    const pages = PageRange.fromMemoryRange(range);
+    const heapRange = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
+    const heapPagesRange = PageRange.fromMemoryRange(heapRange);
+    const initializedPageNumbers = Array.from(this.initialMemory.keys());
 
-    for (const pageNumber of pages) {
-      if (this.initialMemory.has(pageNumber)) {
+    for (const pageNumber of initializedPageNumbers) {
+      if (heapPagesRange.isInRange(pageNumber)) {
         throw new IncorrectSbrkIndex();
       }
     }
@@ -17150,18 +17158,13 @@ declare class PartiallyUpdatedState<T extends StateSlice = StateSlice> {
    *
    * NOTE the info may be updated compared to what is in the state.
    *
-   * Takes into account newly created services as well.
+   * Takes into account ejected and newly created services as well.
    */
   getServiceInfo(destination: ServiceId | null): ServiceAccountInfo | null {
     if (destination === null) {
       return null;
     }
 
-    const isEjected = this.stateUpdate.services.servicesRemoved.some((x) => x === destination);
-    if (isEjected) {
-      return null;
-    }
-
     const maybeNewService = this.stateUpdate.services.servicesUpdates.find(
       (update) => update.serviceId === destination,
     );

package/index.js

@@ -7,6 +7,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) {
@@ -14,7 +15,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$1 = typeof process === "undefined" ? {} : process.env;
 const DEFAULT_VERSION = GpVersion.V0_7_0;
 let CURRENT_VERSION = parseCurrentVersion(env$1.GP_VERSION) ?? DEFAULT_VERSION;
@@ -23,20 +24,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) {
@@ -8042,8 +8049,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);
     }
@@ -12394,16 +12401,12 @@ class PartiallyUpdatedState {
      *
      * NOTE the info may be updated compared to what is in the state.
      *
-     * Takes into account newly created services as well.
+     * Takes into account ejected and newly created services as well.
      */
     getServiceInfo(destination) {
         if (destination === null) {
             return null;
         }
-        const isEjected = this.stateUpdate.services.servicesRemoved.some((x) => x === destination);
-        if (isEjected) {
-            return null;
-        }
         const maybeNewService = this.stateUpdate.services.servicesUpdates.find((update) => update.serviceId === destination);
         if (maybeNewService !== undefined) {
             return maybeNewService.action.account;
@@ -14119,6 +14122,17 @@ class PageRange {
         }
         return new 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;
@@ -14459,10 +14473,11 @@ class 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();
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.1.1-e48de40",
+  "version": "0.1.2-3178190",
   "main": "index.js",
   "author": "Fluffy Labs",
   "license": "MPL-2.0",