@typeberry/lib 0.1.1 → 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,29 +18,35 @@ 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 env = typeof process === "undefined" ? {} : process.env;
+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.GP_VERSION) ?? DEFAULT_VERSION;
-let CURRENT_SUITE = parseCurrentSuite(env.TEST_SUITE) ?? DEFAULT_SUITE;
+let CURRENT_VERSION = parseCurrentVersion(env$1.GP_VERSION) ?? DEFAULT_VERSION;
+let CURRENT_SUITE = parseCurrentSuite(env$1.TEST_SUITE) ?? DEFAULT_SUITE;
 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) {
@@ -200,6 +207,33 @@ class WithDebug {
     }
 }
 
+const env = typeof process === "undefined" ? {} : process.env;
+/**
+ * The function will produce relative path resolver that is adjusted
+ * for package location within the workspace.
+ *
+ * Example:
+ * $ npm start -w @typeberry/jam
+ *
+ * The above command will run `./bin/jam/index.js`, however we would
+ * still want relative paths to be resolved according to top-level workspace
+ * directory.
+ *
+ * So the caller, passes the absolute workspace path as argument and get's
+ * a function that can properly resolve relative paths.
+ *
+ * NOTE: the translation happens only for development build! When
+ * we build a single library from our project, we no longer mangle the paths.
+ */
+const workspacePathFix = env.NODE_ENV === "development"
+    ? (workspacePath) => (p) => {
+        if (p.startsWith("/")) {
+            return p;
+        }
+        return `${workspacePath}/${p}`;
+    }
+    : () => (p) => p;
+
 /**
  * @fileoverview `Opaque<Type, Token>` constructs a unique type which is a subset of Type with a
  * specified unique token Token. It means that base type cannot be assigned to unique type by accident.
@@ -552,7 +586,8 @@ var index$s = /*#__PURE__*/Object.freeze({
   isBrowser: isBrowser,
   measure: measure,
   resultToString: resultToString,
-  seeThrough: seeThrough
+  seeThrough: seeThrough,
+  workspacePathFix: workspacePathFix
 });
 
 /**
@@ -8012,6 +8047,23 @@ function parseLevel(lvl) {
 }
 
 // biome-ignore-all lint/suspicious/noConsole: logger
+function print(level, levelAndName, strings, data) {
+    if (level < levelAndName[0]) {
+        return;
+    }
+    const lvlText = Level[level].padEnd(5);
+    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);
+    }
+    else if (level === Level.ERROR) {
+        console.error(msg);
+    }
+    else {
+        console.info(msg);
+    }
+}
 /** An optimized logger that ignores `TRACE`, `DEBUG` and `LOG` messages.
  *
  * Use the `create` method to instantiate the right instance of a more specialized logger.
@@ -8042,109 +8094,91 @@ class ConsoleTransport {
     constructor(options) {
         this.options = options;
     }
-    insane(_moduleName, _val) {
+    insane(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    trace(_moduleName, _val) {
+    trace(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    log(_moduleName, _val) {
+    log(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    info(_moduleName, _val) {
+    info(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    warn(moduleName, val) {
-        this.push(Level.WARN, moduleName, val);
+    warn(levelAndName, strings, data) {
+        print(Level.WARN, levelAndName, strings, data);
     }
-    error(moduleName, val) {
-        this.push(Level.ERROR, moduleName, val);
-    }
-    push(level, moduleName, val) {
-        const shortModule = moduleName.replace(this.options.workingDir, "");
-        const configuredLevel = findLevel(this.options, moduleName);
-        const lvlText = Level[level].padEnd(5);
-        if (level < configuredLevel) {
-            return;
-        }
-        const msg = `${lvlText} [${shortModule}] ${val}`;
-        if (level === Level.WARN) {
-            console.warn(msg);
-        }
-        else if (level === Level.ERROR) {
-            console.error(msg);
-        }
-        else {
-            console.info(msg);
-        }
+    error(levelAndName, strings, data) {
+        print(Level.ERROR, levelAndName, strings, data);
     }
 }
 /**
  * Insane version of console logger - supports insane level.
  */
 class InsaneConsoleLogger extends ConsoleTransport {
-    insane(moduleName, val) {
-        this.push(Level.INSANE, moduleName, val);
+    insane(levelAndName, strings, data) {
+        print(Level.INSANE, levelAndName, strings, data);
     }
-    trace(moduleName, val) {
-        this.push(Level.TRACE, moduleName, val);
+    trace(levelAndName, strings, data) {
+        print(Level.TRACE, levelAndName, strings, data);
     }
-    log(moduleName, val) {
-        this.push(Level.LOG, moduleName, val);
+    log(levelAndName, strings, data) {
+        print(Level.LOG, levelAndName, strings, data);
     }
-    info(moduleName, val) {
-        this.push(Level.INFO, moduleName, val);
+    info(levelAndName, strings, data) {
+        print(Level.INFO, levelAndName, strings, data);
     }
 }
 /**
  * A basic version of console logger - printing everything.
  */
 class TraceConsoleTransport extends ConsoleTransport {
-    insane(_moduleName, _val) {
+    insane(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    trace(moduleName, val) {
-        this.push(Level.TRACE, moduleName, val);
+    trace(levelAndName, strings, data) {
+        print(Level.TRACE, levelAndName, strings, data);
     }
-    log(moduleName, val) {
-        this.push(Level.LOG, moduleName, val);
+    log(levelAndName, strings, data) {
+        print(Level.LOG, levelAndName, strings, data);
     }
-    info(moduleName, val) {
-        this.push(Level.INFO, moduleName, val);
+    info(levelAndName, strings, data) {
+        print(Level.INFO, levelAndName, strings, data);
     }
 }
 /**
  * An optimized version of the logger - completely ignores `TRACE` level calls.
  */
 class LogConsoleTransport extends ConsoleTransport {
-    insane(_moduleName, _val) {
+    insane(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    trace(_moduleName, _val) {
+    trace(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    log(moduleName, val) {
-        this.push(Level.LOG, moduleName, val);
+    log(levelAndName, strings, data) {
+        print(Level.LOG, levelAndName, strings, data);
     }
-    info(moduleName, val) {
-        this.push(Level.INFO, moduleName, val);
+    info(levelAndName, strings, data) {
+        print(Level.INFO, levelAndName, strings, data);
     }
 }
 /**
  * An optimized version of the logger - completely ignores `TRACE` & `DEBUG` level calls.
  */
 class InfoConsoleTransport extends ConsoleTransport {
-    insane(_moduleName, _val) {
+    insane(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    trace(_moduleName, _val) {
+    trace(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    log(_moduleName, _val) {
+    log(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    info(moduleName, val) {
-        this.push(Level.INFO, moduleName, val);
+    info(levelAndName, strings, data) {
+        print(Level.INFO, levelAndName, strings, data);
     }
 }
 
@@ -8177,11 +8211,6 @@ class Logger {
         const module = moduleName ?? fName;
         return new Logger(module.padStart(8, " "), GLOBAL_CONFIG);
     }
-    /**
-     * Return currently configured level for given module. */
-    static getLevel(moduleName) {
-        return findLevel(GLOBAL_CONFIG.options, moduleName);
-    }
     /**
      * Global configuration of all loggers.
      *
@@ -8212,33 +8241,46 @@ class Logger {
         const options = parseLoggerOptions(input, defaultLevel, workingDir);
         Logger.configureAllFromOptions(options);
     }
+    cachedLevelAndName;
     constructor(moduleName, config) {
         this.moduleName = moduleName;
         this.config = config;
     }
+    /** Return currently configured level for given module. */
+    getLevel() {
+        return this.getLevelAndName()[0];
+    }
+    getLevelAndName() {
+        if (this.cachedLevelAndName === undefined) {
+            const level = findLevel(this.config.options, this.moduleName);
+            const shortName = this.moduleName.replace(this.config.options.workingDir, "");
+            this.cachedLevelAndName = [level, shortName];
+        }
+        return this.cachedLevelAndName;
+    }
     /** Log a message with `INSANE` level. */
-    insane(val) {
-        this.config.transport.insane(this.moduleName, val);
+    insane(strings, ...data) {
+        this.config.transport.insane(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `TRACE` level. */
-    trace(val) {
-        this.config.transport.trace(this.moduleName, val);
+    trace(strings, ...data) {
+        this.config.transport.trace(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `DEBUG`/`LOG` level. */
-    log(val) {
-        this.config.transport.log(this.moduleName, val);
+    log(strings, ...data) {
+        this.config.transport.log(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `INFO` level. */
-    info(val) {
-        this.config.transport.info(this.moduleName, val);
+    info(strings, ...data) {
+        this.config.transport.info(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `WARN` level. */
-    warn(val) {
-        this.config.transport.warn(this.moduleName, val);
+    warn(strings, ...data) {
+        this.config.transport.warn(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `ERROR` level. */
-    error(val) {
-        this.config.transport.error(this.moduleName, val);
+    error(strings, ...data) {
+        this.config.transport.error(this.getLevelAndName(), strings, data);
     }
 }
 
@@ -8265,7 +8307,7 @@ class AuthorshipOptions {
     }
 }
 
-const logger$3 = Logger.new(undefined, "config");
+const logger$4 = Logger.new(undefined, "config");
 /** Development config. Will accept unsealed blocks for now. */
 const DEV_CONFIG = "dev";
 /** Default config file. */
@@ -8324,15 +8366,15 @@ class NodeConfiguration {
 }
 function loadConfig(configPath) {
     if (configPath === DEFAULT_CONFIG) {
-        logger$3.log("🔧 Loading DEFAULT config");
+        logger$4.log `🔧 Loading DEFAULT config`;
         return parseFromJson(configs.default, NodeConfiguration.fromJson);
     }
     if (configPath === DEV_CONFIG) {
-        logger$3.log("🔧 Loading DEV config");
+        logger$4.log `🔧 Loading DEV config`;
         return parseFromJson(configs.dev, NodeConfiguration.fromJson);
     }
     try {
-        logger$3.log(`🔧 Loading config from ${configPath}`);
+        logger$4.log `🔧 Loading config from ${configPath}`;
         const configFile = fs.readFileSync(configPath, "utf8");
         const parsed = JSON.parse(configFile);
         return parseFromJson(parsed, NodeConfiguration.fromJson);
@@ -12362,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;
@@ -14087,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;
@@ -14194,7 +14243,7 @@ var AccessType;
     AccessType[AccessType["READ"] = 0] = "READ";
     AccessType[AccessType["WRITE"] = 1] = "WRITE";
 })(AccessType || (AccessType = {}));
-// const logger = Logger.new(import.meta.filename, "pvm:mem");
+const logger$3 = Logger.new(undefined, "pvm:mem");
 class Memory {
     sbrkIndex;
     virtualSbrkIndex;
@@ -14225,7 +14274,7 @@ class Memory {
         if (bytes.length === 0) {
             return Result$1.ok(OK);
         }
-        // logger.insane(`MEM[${address}] <- ${BytesBlob.blobFrom(bytes)}`);
+        logger$3.insane `MEM[${address}] <- ${BytesBlob.blobFrom(bytes)}`;
         const pagesResult = this.getPages(address, bytes.length, AccessType.WRITE);
         if (pagesResult.isError) {
             return Result$1.error(pagesResult.error);
@@ -14292,7 +14341,7 @@ class Memory {
             currentPosition += bytesToRead;
             bytesLeft -= bytesToRead;
         }
-        // logger.insane(`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`);
+        logger$3.insane `MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`;
         return Result$1.ok(OK);
     }
     sbrk(length) {
@@ -14427,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();
             }
         }
@@ -16086,7 +16136,7 @@ class ProgramDecoder {
             return Result$1.ok(new ProgramDecoder(program));
         }
         catch (e) {
-            logger$2.error(`Invalid program: ${e}`);
+            logger$2.error `Invalid program: ${e}`;
             return Result$1.error(ProgramDecoderError.InvalidProgramError);
         }
     }
@@ -16211,7 +16261,7 @@ class Interpreter {
         const argsType = instructionArgumentTypeMap[currentInstruction] ?? ArgumentType.NO_ARGUMENTS;
         const argsResult = this.argsDecodingResults[argsType];
         this.argsDecoder.fillArgs(this.pc, argsResult);
-        logger$1.insane(`[PC: ${this.pc}] ${Instruction[currentInstruction]}`);
+        logger$1.insane `[PC: ${this.pc}] ${Instruction[currentInstruction]}`;
         if (!isValidInstruction) {
             this.instructionResult.status = Result.PANIC;
         }
@@ -16283,7 +16333,7 @@ class Interpreter {
                     this.status = Status.HOST;
                     break;
             }
-            logger$1.insane(`[PC: ${this.pc}] Status: ${Result[this.instructionResult.status]}`);
+            logger$1.insane `[PC: ${this.pc}] Status: ${Result[this.instructionResult.status]}`;
             return this.status;
         }
         this.pc = this.instructionResult.nextPc;
@@ -16517,7 +16567,7 @@ class HostCallsManager {
             return `r${idx}=${value} (0x${value.toString(16)})`;
         })
             .join(", ");
-        logger.insane(`[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`);
+        logger.insane `[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`;
     }
 }
 

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,9 +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 env = typeof process === "undefined" ? {} : process.env;
+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;
@@ -22,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 {
@@ -235,6 +240,33 @@ declare abstract class WithDebug {
   }
 }
 
+/**
+ * The function will produce relative path resolver that is adjusted
+ * for package location within the workspace.
+ *
+ * Example:
+ * $ npm start -w @typeberry/jam
+ *
+ * The above command will run `./bin/jam/index.js`, however we would
+ * still want relative paths to be resolved according to top-level workspace
+ * directory.
+ *
+ * So the caller, passes the absolute workspace path as argument and get's
+ * a function that can properly resolve relative paths.
+ *
+ * NOTE: the translation happens only for development build! When
+ * we build a single library from our project, we no longer mangle the paths.
+ */
+declare const workspacePathFix =
+  env.NODE_ENV === "development"
+    ? (workspacePath: string) => (p: string) => {
+        if (p.startsWith("/")) {
+          return p;
+        }
+        return `${workspacePath}/${p}`;
+      }
+    : () => (p: string) => p;
+
 /**
  * @fileoverview `Opaque<Type, Token>` constructs a unique type which is a subset of Type with a
  * specified unique token Token. It means that base type cannot be assigned to unique type by accident.
@@ -712,7 +744,6 @@ declare const index$s_assertNever: typeof assertNever;
 declare const index$s_callCompareFunction: typeof callCompareFunction;
 declare const index$s_check: typeof check;
 declare const index$s_deepEqual: typeof deepEqual;
-declare const index$s_env: typeof env;
 declare const index$s_getAllKeysSorted: typeof getAllKeysSorted;
 declare const index$s_inspect: typeof inspect;
 declare const index$s_isBrowser: typeof isBrowser;
@@ -726,8 +757,9 @@ declare const index$s_parseCurrentVersion: typeof parseCurrentVersion;
 declare const index$s_resultToString: typeof resultToString;
 declare const index$s_seeThrough: typeof seeThrough;
 declare const index$s_trimStack: typeof trimStack;
+declare const index$s_workspacePathFix: typeof workspacePathFix;
 declare namespace index$s {
-  export { index$s_ALL_VERSIONS_IN_ORDER as ALL_VERSIONS_IN_ORDER, index$s_CURRENT_SUITE as CURRENT_SUITE, index$s_CURRENT_VERSION as CURRENT_VERSION, index$s_Compatibility as Compatibility, index$s_DEFAULT_SUITE as DEFAULT_SUITE, index$s_DEFAULT_VERSION as DEFAULT_VERSION, index$s_ErrorsCollector as ErrorsCollector, index$s_GpVersion as GpVersion, Result$2 as Result, index$s_RichTaggedError as RichTaggedError, index$s_TEST_COMPARE_USING as TEST_COMPARE_USING, index$s_TestSuite as TestSuite, index$s_WithDebug as WithDebug, index$s___OPAQUE_TYPE__ as __OPAQUE_TYPE__, index$s_asOpaqueType as asOpaqueType, index$s_assertEmpty as assertEmpty, index$s_assertNever as assertNever, index$s_callCompareFunction as callCompareFunction, index$s_check as check, index$s_deepEqual as deepEqual, index$s_env as env, index$s_getAllKeysSorted as getAllKeysSorted, index$s_inspect as inspect, index$s_isBrowser as isBrowser, index$s_isResult as isResult, index$s_isTaggedError as isTaggedError, index$s_maybeTaggedErrorToString as maybeTaggedErrorToString, index$s_measure as measure, index$s_oomWarningPrinted as oomWarningPrinted, index$s_parseCurrentSuite as parseCurrentSuite, index$s_parseCurrentVersion as parseCurrentVersion, index$s_resultToString as resultToString, index$s_seeThrough as seeThrough, index$s_trimStack as trimStack };
+  export { index$s_ALL_VERSIONS_IN_ORDER as ALL_VERSIONS_IN_ORDER, index$s_CURRENT_SUITE as CURRENT_SUITE, index$s_CURRENT_VERSION as CURRENT_VERSION, index$s_Compatibility as Compatibility, index$s_DEFAULT_SUITE as DEFAULT_SUITE, index$s_DEFAULT_VERSION as DEFAULT_VERSION, index$s_ErrorsCollector as ErrorsCollector, index$s_GpVersion as GpVersion, Result$2 as Result, index$s_RichTaggedError as RichTaggedError, index$s_TEST_COMPARE_USING as TEST_COMPARE_USING, index$s_TestSuite as TestSuite, index$s_WithDebug as WithDebug, index$s___OPAQUE_TYPE__ as __OPAQUE_TYPE__, index$s_asOpaqueType as asOpaqueType, index$s_assertEmpty as assertEmpty, index$s_assertNever as assertNever, index$s_callCompareFunction as callCompareFunction, index$s_check as check, index$s_deepEqual as deepEqual, index$s_getAllKeysSorted as getAllKeysSorted, index$s_inspect as inspect, index$s_isBrowser as isBrowser, index$s_isResult as isResult, index$s_isTaggedError as isTaggedError, index$s_maybeTaggedErrorToString as maybeTaggedErrorToString, index$s_measure as measure, index$s_oomWarningPrinted as oomWarningPrinted, index$s_parseCurrentSuite as parseCurrentSuite, index$s_parseCurrentVersion as parseCurrentVersion, index$s_resultToString as resultToString, index$s_seeThrough as seeThrough, index$s_trimStack as trimStack, index$s_workspacePathFix as workspacePathFix };
   export type { index$s_DeepEqualOptions as DeepEqualOptions, index$s_EnumMapping as EnumMapping, index$s_ErrorResult as ErrorResult, index$s_OK as OK, index$s_OkResult as OkResult, index$s_Opaque as Opaque, index$s_StringLiteral as StringLiteral, index$s_TaggedError as TaggedError, index$s_TokenOf as TokenOf, index$s_Uninstantiable as Uninstantiable, index$s_WithOpaque as WithOpaque };
 }
 
@@ -7928,12 +7960,6 @@ declare class Logger {
     return new Logger(module.padStart(8, " "), GLOBAL_CONFIG);
   }
 
-  /**
-   * Return currently configured level for given module. */
-  static getLevel(moduleName: string): Level {
-    return findLevel(GLOBAL_CONFIG.options, moduleName);
-  }
-
   /**
    * Global configuration of all loggers.
    *
@@ -7968,39 +7994,55 @@ declare class Logger {
     Logger.configureAllFromOptions(options);
   }
 
+  private cachedLevelAndName?: readonly [Level, string];
+
   private constructor(
     private readonly moduleName: string,
     private readonly config: typeof GLOBAL_CONFIG,
   ) {}
 
+  /** Return currently configured level for given module. */
+  getLevel(): Level {
+    return this.getLevelAndName()[0];
+  }
+
+  private getLevelAndName(): readonly [Level, string] {
+    if (this.cachedLevelAndName === undefined) {
+      const level = findLevel(this.config.options, this.moduleName);
+      const shortName = this.moduleName.replace(this.config.options.workingDir, "");
+      this.cachedLevelAndName = [level, shortName];
+    }
+    return this.cachedLevelAndName;
+  }
+
   /** Log a message with `INSANE` level. */
-  insane(val: string) {
-    this.config.transport.insane(this.moduleName, val);
+  insane(strings: TemplateStringsArray, ...data: unknown[]) {
+    this.config.transport.insane(this.getLevelAndName(), strings, data);
   }
 
   /** Log a message with `TRACE` level. */
-  trace(val: string) {
-    this.config.transport.trace(this.moduleName, val);
+  trace(strings: TemplateStringsArray, ...data: unknown[]) {
+    this.config.transport.trace(this.getLevelAndName(), strings, data);
   }
 
   /** Log a message with `DEBUG`/`LOG` level. */
-  log(val: string) {
-    this.config.transport.log(this.moduleName, val);
+  log(strings: TemplateStringsArray, ...data: unknown[]) {
+    this.config.transport.log(this.getLevelAndName(), strings, data);
   }
 
   /** Log a message with `INFO` level. */
-  info(val: string) {
-    this.config.transport.info(this.moduleName, val);
+  info(strings: TemplateStringsArray, ...data: unknown[]) {
+    this.config.transport.info(this.getLevelAndName(), strings, data);
   }
 
   /** Log a message with `WARN` level. */
-  warn(val: string) {
-    this.config.transport.warn(this.moduleName, val);
+  warn(strings: TemplateStringsArray, ...data: unknown[]) {
+    this.config.transport.warn(this.getLevelAndName(), strings, data);
   }
 
   /** Log a message with `ERROR` level. */
-  error(val: string) {
-    this.config.transport.error(this.moduleName, val);
+  error(strings: TemplateStringsArray, ...data: unknown[]) {
+    this.config.transport.error(this.getLevelAndName(), strings, data);
   }
 }
 
@@ -8099,17 +8141,17 @@ declare class NodeConfiguration {
 
 declare function loadConfig(configPath: string): NodeConfiguration {
   if (configPath === DEFAULT_CONFIG) {
-    logger.log("🔧 Loading DEFAULT config");
+    logger.log`🔧 Loading DEFAULT config`;
     return parseFromJson(configs.default, NodeConfiguration.fromJson);
   }
 
   if (configPath === DEV_CONFIG) {
-    logger.log("🔧 Loading DEV config");
+    logger.log`🔧 Loading DEV config`;
     return parseFromJson(configs.dev, NodeConfiguration.fromJson);
   }
 
   try {
-    logger.log(`🔧 Loading config from ${configPath}`);
+    logger.log`🔧 Loading config from ${configPath}`;
     const configFile = fs.readFileSync(configPath, "utf8");
     const parsed = JSON.parse(configFile);
     return parseFromJson(parsed, NodeConfiguration.fromJson);
@@ -14446,8 +14488,6 @@ declare enum AccessType {
   WRITE = 1,
 }
 
-// const logger = Logger.new(import.meta.filename, "pvm:mem");
-
 declare class Memory {
   static fromInitialMemory(initialMemoryState: InitialMemoryState) {
     return new Memory(
@@ -14484,7 +14524,7 @@ declare class Memory {
       return Result.ok(OK);
     }
 
-    // logger.insane(`MEM[${address}] <- ${BytesBlob.blobFrom(bytes)}`);
+    logger.insane`MEM[${address}] <- ${BytesBlob.blobFrom(bytes)}`;
     const pagesResult = this.getPages(address, bytes.length, AccessType.WRITE);
 
     if (pagesResult.isError) {
@@ -14573,7 +14613,7 @@ declare class Memory {
       bytesLeft -= bytesToRead;
     }
 
-    // logger.insane(`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`);
+    logger.insane`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`;
     return Result.ok(OK);
   }
 
@@ -14740,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();
       }
     }
@@ -16536,7 +16577,7 @@ declare class ProgramDecoder {
     try {
       return Result.ok(new ProgramDecoder(program));
     } catch (e) {
-      logger.error(`Invalid program: ${e}`);
+      logger.error`Invalid program: ${e}`;
       return Result.error(ProgramDecoderError.InvalidProgramError);
     }
   }
@@ -16698,7 +16739,7 @@ declare class Interpreter {
     const argsResult = this.argsDecodingResults[argsType];
     this.argsDecoder.fillArgs(this.pc, argsResult);
 
-    logger.insane(`[PC: ${this.pc}] ${Instruction[currentInstruction]}`);
+    logger.insane`[PC: ${this.pc}] ${Instruction[currentInstruction]}`;
 
     if (!isValidInstruction) {
       this.instructionResult.status = Result.PANIC;
@@ -16775,7 +16816,7 @@ declare class Interpreter {
           this.status = Status.HOST;
           break;
       }
-      logger.insane(`[PC: ${this.pc}] Status: ${Result[this.instructionResult.status]}`);
+      logger.insane`[PC: ${this.pc}] Status: ${Result[this.instructionResult.status]}`;
       return this.status;
     }
 
@@ -17117,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,
     );
@@ -17514,7 +17550,7 @@ declare class HostCallsManager {
         return `r${idx}=${value} (0x${value.toString(16)})`;
       })
       .join(", ");
-    logger.insane(`[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`);
+    logger.insane`[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`;
   }
 }
 

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,29 +15,35 @@ 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 env = typeof process === "undefined" ? {} : process.env;
+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.GP_VERSION) ?? DEFAULT_VERSION;
-let CURRENT_SUITE = parseCurrentSuite(env.TEST_SUITE) ?? DEFAULT_SUITE;
+let CURRENT_VERSION = parseCurrentVersion(env$1.GP_VERSION) ?? DEFAULT_VERSION;
+let CURRENT_SUITE = parseCurrentSuite(env$1.TEST_SUITE) ?? DEFAULT_SUITE;
 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) {
@@ -197,6 +204,33 @@ class WithDebug {
     }
 }
 
+const env = typeof process === "undefined" ? {} : process.env;
+/**
+ * The function will produce relative path resolver that is adjusted
+ * for package location within the workspace.
+ *
+ * Example:
+ * $ npm start -w @typeberry/jam
+ *
+ * The above command will run `./bin/jam/index.js`, however we would
+ * still want relative paths to be resolved according to top-level workspace
+ * directory.
+ *
+ * So the caller, passes the absolute workspace path as argument and get's
+ * a function that can properly resolve relative paths.
+ *
+ * NOTE: the translation happens only for development build! When
+ * we build a single library from our project, we no longer mangle the paths.
+ */
+const workspacePathFix = env.NODE_ENV === "development"
+    ? (workspacePath) => (p) => {
+        if (p.startsWith("/")) {
+            return p;
+        }
+        return `${workspacePath}/${p}`;
+    }
+    : () => (p) => p;
+
 /**
  * @fileoverview `Opaque<Type, Token>` constructs a unique type which is a subset of Type with a
  * specified unique token Token. It means that base type cannot be assigned to unique type by accident.
@@ -549,7 +583,8 @@ var index$s = /*#__PURE__*/Object.freeze({
   isBrowser: isBrowser,
   measure: measure,
   resultToString: resultToString,
-  seeThrough: seeThrough
+  seeThrough: seeThrough,
+  workspacePathFix: workspacePathFix
 });
 
 /**
@@ -8009,6 +8044,23 @@ function parseLevel(lvl) {
 }
 
 // biome-ignore-all lint/suspicious/noConsole: logger
+function print(level, levelAndName, strings, data) {
+    if (level < levelAndName[0]) {
+        return;
+    }
+    const lvlText = Level[level].padEnd(5);
+    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);
+    }
+    else if (level === Level.ERROR) {
+        console.error(msg);
+    }
+    else {
+        console.info(msg);
+    }
+}
 /** An optimized logger that ignores `TRACE`, `DEBUG` and `LOG` messages.
  *
  * Use the `create` method to instantiate the right instance of a more specialized logger.
@@ -8039,109 +8091,91 @@ class ConsoleTransport {
     constructor(options) {
         this.options = options;
     }
-    insane(_moduleName, _val) {
+    insane(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    trace(_moduleName, _val) {
+    trace(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    log(_moduleName, _val) {
+    log(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    info(_moduleName, _val) {
+    info(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    warn(moduleName, val) {
-        this.push(Level.WARN, moduleName, val);
+    warn(levelAndName, strings, data) {
+        print(Level.WARN, levelAndName, strings, data);
     }
-    error(moduleName, val) {
-        this.push(Level.ERROR, moduleName, val);
-    }
-    push(level, moduleName, val) {
-        const shortModule = moduleName.replace(this.options.workingDir, "");
-        const configuredLevel = findLevel(this.options, moduleName);
-        const lvlText = Level[level].padEnd(5);
-        if (level < configuredLevel) {
-            return;
-        }
-        const msg = `${lvlText} [${shortModule}] ${val}`;
-        if (level === Level.WARN) {
-            console.warn(msg);
-        }
-        else if (level === Level.ERROR) {
-            console.error(msg);
-        }
-        else {
-            console.info(msg);
-        }
+    error(levelAndName, strings, data) {
+        print(Level.ERROR, levelAndName, strings, data);
     }
 }
 /**
  * Insane version of console logger - supports insane level.
  */
 class InsaneConsoleLogger extends ConsoleTransport {
-    insane(moduleName, val) {
-        this.push(Level.INSANE, moduleName, val);
+    insane(levelAndName, strings, data) {
+        print(Level.INSANE, levelAndName, strings, data);
     }
-    trace(moduleName, val) {
-        this.push(Level.TRACE, moduleName, val);
+    trace(levelAndName, strings, data) {
+        print(Level.TRACE, levelAndName, strings, data);
     }
-    log(moduleName, val) {
-        this.push(Level.LOG, moduleName, val);
+    log(levelAndName, strings, data) {
+        print(Level.LOG, levelAndName, strings, data);
     }
-    info(moduleName, val) {
-        this.push(Level.INFO, moduleName, val);
+    info(levelAndName, strings, data) {
+        print(Level.INFO, levelAndName, strings, data);
     }
 }
 /**
  * A basic version of console logger - printing everything.
  */
 class TraceConsoleTransport extends ConsoleTransport {
-    insane(_moduleName, _val) {
+    insane(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    trace(moduleName, val) {
-        this.push(Level.TRACE, moduleName, val);
+    trace(levelAndName, strings, data) {
+        print(Level.TRACE, levelAndName, strings, data);
     }
-    log(moduleName, val) {
-        this.push(Level.LOG, moduleName, val);
+    log(levelAndName, strings, data) {
+        print(Level.LOG, levelAndName, strings, data);
     }
-    info(moduleName, val) {
-        this.push(Level.INFO, moduleName, val);
+    info(levelAndName, strings, data) {
+        print(Level.INFO, levelAndName, strings, data);
     }
 }
 /**
  * An optimized version of the logger - completely ignores `TRACE` level calls.
  */
 class LogConsoleTransport extends ConsoleTransport {
-    insane(_moduleName, _val) {
+    insane(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    trace(_moduleName, _val) {
+    trace(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    log(moduleName, val) {
-        this.push(Level.LOG, moduleName, val);
+    log(levelAndName, strings, data) {
+        print(Level.LOG, levelAndName, strings, data);
     }
-    info(moduleName, val) {
-        this.push(Level.INFO, moduleName, val);
+    info(levelAndName, strings, data) {
+        print(Level.INFO, levelAndName, strings, data);
     }
 }
 /**
  * An optimized version of the logger - completely ignores `TRACE` & `DEBUG` level calls.
  */
 class InfoConsoleTransport extends ConsoleTransport {
-    insane(_moduleName, _val) {
+    insane(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    trace(_moduleName, _val) {
+    trace(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    log(_moduleName, _val) {
+    log(_levelAndName, _strings, _data) {
         /* no-op */
     }
-    info(moduleName, val) {
-        this.push(Level.INFO, moduleName, val);
+    info(levelAndName, strings, data) {
+        print(Level.INFO, levelAndName, strings, data);
     }
 }
 
@@ -8174,11 +8208,6 @@ class Logger {
         const module = moduleName ?? fName;
         return new Logger(module.padStart(8, " "), GLOBAL_CONFIG);
     }
-    /**
-     * Return currently configured level for given module. */
-    static getLevel(moduleName) {
-        return findLevel(GLOBAL_CONFIG.options, moduleName);
-    }
     /**
      * Global configuration of all loggers.
      *
@@ -8209,33 +8238,46 @@ class Logger {
         const options = parseLoggerOptions(input, defaultLevel, workingDir);
         Logger.configureAllFromOptions(options);
     }
+    cachedLevelAndName;
     constructor(moduleName, config) {
         this.moduleName = moduleName;
         this.config = config;
     }
+    /** Return currently configured level for given module. */
+    getLevel() {
+        return this.getLevelAndName()[0];
+    }
+    getLevelAndName() {
+        if (this.cachedLevelAndName === undefined) {
+            const level = findLevel(this.config.options, this.moduleName);
+            const shortName = this.moduleName.replace(this.config.options.workingDir, "");
+            this.cachedLevelAndName = [level, shortName];
+        }
+        return this.cachedLevelAndName;
+    }
     /** Log a message with `INSANE` level. */
-    insane(val) {
-        this.config.transport.insane(this.moduleName, val);
+    insane(strings, ...data) {
+        this.config.transport.insane(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `TRACE` level. */
-    trace(val) {
-        this.config.transport.trace(this.moduleName, val);
+    trace(strings, ...data) {
+        this.config.transport.trace(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `DEBUG`/`LOG` level. */
-    log(val) {
-        this.config.transport.log(this.moduleName, val);
+    log(strings, ...data) {
+        this.config.transport.log(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `INFO` level. */
-    info(val) {
-        this.config.transport.info(this.moduleName, val);
+    info(strings, ...data) {
+        this.config.transport.info(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `WARN` level. */
-    warn(val) {
-        this.config.transport.warn(this.moduleName, val);
+    warn(strings, ...data) {
+        this.config.transport.warn(this.getLevelAndName(), strings, data);
     }
     /** Log a message with `ERROR` level. */
-    error(val) {
-        this.config.transport.error(this.moduleName, val);
+    error(strings, ...data) {
+        this.config.transport.error(this.getLevelAndName(), strings, data);
     }
 }
 
@@ -8262,7 +8304,7 @@ class AuthorshipOptions {
     }
 }
 
-const logger$3 = Logger.new(import.meta.filename, "config");
+const logger$4 = Logger.new(import.meta.filename, "config");
 /** Development config. Will accept unsealed blocks for now. */
 const DEV_CONFIG = "dev";
 /** Default config file. */
@@ -8321,15 +8363,15 @@ class NodeConfiguration {
 }
 function loadConfig(configPath) {
     if (configPath === DEFAULT_CONFIG) {
-        logger$3.log("🔧 Loading DEFAULT config");
+        logger$4.log `🔧 Loading DEFAULT config`;
         return parseFromJson(configs.default, NodeConfiguration.fromJson);
     }
     if (configPath === DEV_CONFIG) {
-        logger$3.log("🔧 Loading DEV config");
+        logger$4.log `🔧 Loading DEV config`;
         return parseFromJson(configs.dev, NodeConfiguration.fromJson);
     }
     try {
-        logger$3.log(`🔧 Loading config from ${configPath}`);
+        logger$4.log `🔧 Loading config from ${configPath}`;
         const configFile = fs.readFileSync(configPath, "utf8");
         const parsed = JSON.parse(configFile);
         return parseFromJson(parsed, NodeConfiguration.fromJson);
@@ -12359,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;
@@ -14084,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;
@@ -14191,7 +14240,7 @@ var AccessType;
     AccessType[AccessType["READ"] = 0] = "READ";
     AccessType[AccessType["WRITE"] = 1] = "WRITE";
 })(AccessType || (AccessType = {}));
-// const logger = Logger.new(import.meta.filename, "pvm:mem");
+const logger$3 = Logger.new(import.meta.filename, "pvm:mem");
 class Memory {
     sbrkIndex;
     virtualSbrkIndex;
@@ -14222,7 +14271,7 @@ class Memory {
         if (bytes.length === 0) {
             return Result$1.ok(OK);
         }
-        // logger.insane(`MEM[${address}] <- ${BytesBlob.blobFrom(bytes)}`);
+        logger$3.insane `MEM[${address}] <- ${BytesBlob.blobFrom(bytes)}`;
         const pagesResult = this.getPages(address, bytes.length, AccessType.WRITE);
         if (pagesResult.isError) {
             return Result$1.error(pagesResult.error);
@@ -14289,7 +14338,7 @@ class Memory {
             currentPosition += bytesToRead;
             bytesLeft -= bytesToRead;
         }
-        // logger.insane(`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`);
+        logger$3.insane `MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`;
         return Result$1.ok(OK);
     }
     sbrk(length) {
@@ -14424,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();
             }
         }
@@ -16083,7 +16133,7 @@ class ProgramDecoder {
             return Result$1.ok(new ProgramDecoder(program));
         }
         catch (e) {
-            logger$2.error(`Invalid program: ${e}`);
+            logger$2.error `Invalid program: ${e}`;
             return Result$1.error(ProgramDecoderError.InvalidProgramError);
         }
     }
@@ -16208,7 +16258,7 @@ class Interpreter {
         const argsType = instructionArgumentTypeMap[currentInstruction] ?? ArgumentType.NO_ARGUMENTS;
         const argsResult = this.argsDecodingResults[argsType];
         this.argsDecoder.fillArgs(this.pc, argsResult);
-        logger$1.insane(`[PC: ${this.pc}] ${Instruction[currentInstruction]}`);
+        logger$1.insane `[PC: ${this.pc}] ${Instruction[currentInstruction]}`;
         if (!isValidInstruction) {
             this.instructionResult.status = Result.PANIC;
         }
@@ -16280,7 +16330,7 @@ class Interpreter {
                     this.status = Status.HOST;
                     break;
             }
-            logger$1.insane(`[PC: ${this.pc}] Status: ${Result[this.instructionResult.status]}`);
+            logger$1.insane `[PC: ${this.pc}] Status: ${Result[this.instructionResult.status]}`;
             return this.status;
         }
         this.pc = this.instructionResult.nextPc;
@@ -16514,7 +16564,7 @@ class HostCallsManager {
             return `r${idx}=${value} (0x${value.toString(16)})`;
         })
             .join(", ");
-        logger.insane(`[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`);
+        logger.insane `[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`;
     }
 }
 

package/package.json

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