@typeberry/lib 0.1.1-e48de40 → 0.1.1

package/index.cjs

@@ -18,10 +18,10 @@ var TestSuite;
 })(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$1 = typeof process === "undefined" ? {} : process.env;
+const env = typeof process === "undefined" ? {} : process.env;
 const DEFAULT_VERSION = GpVersion.V0_7_0;
-let CURRENT_VERSION = parseCurrentVersion(env$1.GP_VERSION) ?? DEFAULT_VERSION;
-let CURRENT_SUITE = parseCurrentSuite(env$1.TEST_SUITE) ?? DEFAULT_SUITE;
+let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
+let CURRENT_SUITE = parseCurrentSuite(env.TEST_SUITE) ?? DEFAULT_SUITE;
 function parseCurrentVersion(env) {
     if (env === undefined) {
         return undefined;
@@ -200,33 +200,6 @@ 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.
@@ -579,8 +552,7 @@ var index$s = /*#__PURE__*/Object.freeze({
   isBrowser: isBrowser,
   measure: measure,
   resultToString: resultToString,
-  seeThrough: seeThrough,
-  workspacePathFix: workspacePathFix
+  seeThrough: seeThrough
 });
 
 /**
@@ -8040,23 +8012,6 @@ 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}${data[idx]}`);
-    const msg = `${lvlText} [${levelAndName[1]}] ${val}`;
-    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.
@@ -8087,91 +8042,109 @@ class ConsoleTransport {
     constructor(options) {
         this.options = options;
     }
-    insane(_levelAndName, _strings, _data) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    trace(_levelAndName, _strings, _data) {
+    trace(_moduleName, _val) {
         /* no-op */
     }
-    log(_levelAndName, _strings, _data) {
+    log(_moduleName, _val) {
         /* no-op */
     }
-    info(_levelAndName, _strings, _data) {
+    info(_moduleName, _val) {
         /* no-op */
     }
-    warn(levelAndName, strings, data) {
-        print(Level.WARN, levelAndName, strings, data);
+    warn(moduleName, val) {
+        this.push(Level.WARN, moduleName, val);
     }
-    error(levelAndName, strings, data) {
-        print(Level.ERROR, 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);
+        }
     }
 }
 /**
  * Insane version of console logger - supports insane level.
  */
 class InsaneConsoleLogger extends ConsoleTransport {
-    insane(levelAndName, strings, data) {
-        print(Level.INSANE, levelAndName, strings, data);
+    insane(moduleName, val) {
+        this.push(Level.INSANE, moduleName, val);
     }
-    trace(levelAndName, strings, data) {
-        print(Level.TRACE, levelAndName, strings, data);
+    trace(moduleName, val) {
+        this.push(Level.TRACE, moduleName, val);
     }
-    log(levelAndName, strings, data) {
-        print(Level.LOG, levelAndName, strings, data);
+    log(moduleName, val) {
+        this.push(Level.LOG, moduleName, val);
     }
-    info(levelAndName, strings, data) {
-        print(Level.INFO, levelAndName, strings, data);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 /**
  * A basic version of console logger - printing everything.
  */
 class TraceConsoleTransport extends ConsoleTransport {
-    insane(_levelAndName, _strings, _data) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    trace(levelAndName, strings, data) {
-        print(Level.TRACE, levelAndName, strings, data);
+    trace(moduleName, val) {
+        this.push(Level.TRACE, moduleName, val);
     }
-    log(levelAndName, strings, data) {
-        print(Level.LOG, levelAndName, strings, data);
+    log(moduleName, val) {
+        this.push(Level.LOG, moduleName, val);
     }
-    info(levelAndName, strings, data) {
-        print(Level.INFO, levelAndName, strings, data);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 /**
  * An optimized version of the logger - completely ignores `TRACE` level calls.
  */
 class LogConsoleTransport extends ConsoleTransport {
-    insane(_levelAndName, _strings, _data) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    trace(_levelAndName, _strings, _data) {
+    trace(_moduleName, _val) {
         /* no-op */
     }
-    log(levelAndName, strings, data) {
-        print(Level.LOG, levelAndName, strings, data);
+    log(moduleName, val) {
+        this.push(Level.LOG, moduleName, val);
     }
-    info(levelAndName, strings, data) {
-        print(Level.INFO, levelAndName, strings, data);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 /**
  * An optimized version of the logger - completely ignores `TRACE` & `DEBUG` level calls.
  */
 class InfoConsoleTransport extends ConsoleTransport {
-    insane(_levelAndName, _strings, _data) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    trace(_levelAndName, _strings, _data) {
+    trace(_moduleName, _val) {
         /* no-op */
     }
-    log(_levelAndName, _strings, _data) {
+    log(_moduleName, _val) {
         /* no-op */
     }
-    info(levelAndName, strings, data) {
-        print(Level.INFO, levelAndName, strings, data);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 
@@ -8204,6 +8177,11 @@ 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.
      *
@@ -8234,46 +8212,33 @@ 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(strings, ...data) {
-        this.config.transport.insane(this.getLevelAndName(), strings, data);
+    insane(val) {
+        this.config.transport.insane(this.moduleName, val);
     }
     /** Log a message with `TRACE` level. */
-    trace(strings, ...data) {
-        this.config.transport.trace(this.getLevelAndName(), strings, data);
+    trace(val) {
+        this.config.transport.trace(this.moduleName, val);
     }
     /** Log a message with `DEBUG`/`LOG` level. */
-    log(strings, ...data) {
-        this.config.transport.log(this.getLevelAndName(), strings, data);
+    log(val) {
+        this.config.transport.log(this.moduleName, val);
     }
     /** Log a message with `INFO` level. */
-    info(strings, ...data) {
-        this.config.transport.info(this.getLevelAndName(), strings, data);
+    info(val) {
+        this.config.transport.info(this.moduleName, val);
     }
     /** Log a message with `WARN` level. */
-    warn(strings, ...data) {
-        this.config.transport.warn(this.getLevelAndName(), strings, data);
+    warn(val) {
+        this.config.transport.warn(this.moduleName, val);
     }
     /** Log a message with `ERROR` level. */
-    error(strings, ...data) {
-        this.config.transport.error(this.getLevelAndName(), strings, data);
+    error(val) {
+        this.config.transport.error(this.moduleName, val);
     }
 }
 
@@ -8300,7 +8265,7 @@ class AuthorshipOptions {
     }
 }
 
-const logger$4 = Logger.new(undefined, "config");
+const logger$3 = Logger.new(undefined, "config");
 /** Development config. Will accept unsealed blocks for now. */
 const DEV_CONFIG = "dev";
 /** Default config file. */
@@ -8359,15 +8324,15 @@ class NodeConfiguration {
 }
 function loadConfig(configPath) {
     if (configPath === DEFAULT_CONFIG) {
-        logger$4.log `🔧 Loading DEFAULT config`;
+        logger$3.log("🔧 Loading DEFAULT config");
         return parseFromJson(configs.default, NodeConfiguration.fromJson);
     }
     if (configPath === DEV_CONFIG) {
-        logger$4.log `🔧 Loading DEV config`;
+        logger$3.log("🔧 Loading DEV config");
         return parseFromJson(configs.dev, NodeConfiguration.fromJson);
     }
     try {
-        logger$4.log `🔧 Loading config from ${configPath}`;
+        logger$3.log(`🔧 Loading config from ${configPath}`);
         const configFile = fs.readFileSync(configPath, "utf8");
         const parsed = JSON.parse(configFile);
         return parseFromJson(parsed, NodeConfiguration.fromJson);
@@ -14229,7 +14194,7 @@ var AccessType;
     AccessType[AccessType["READ"] = 0] = "READ";
     AccessType[AccessType["WRITE"] = 1] = "WRITE";
 })(AccessType || (AccessType = {}));
-const logger$3 = Logger.new(undefined, "pvm:mem");
+// const logger = Logger.new(import.meta.filename, "pvm:mem");
 class Memory {
     sbrkIndex;
     virtualSbrkIndex;
@@ -14260,7 +14225,7 @@ class Memory {
         if (bytes.length === 0) {
             return Result$1.ok(OK);
         }
-        logger$3.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) {
             return Result$1.error(pagesResult.error);
@@ -14327,7 +14292,7 @@ class Memory {
             currentPosition += bytesToRead;
             bytesLeft -= bytesToRead;
         }
-        logger$3.insane `MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`;
+        // logger.insane(`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`);
         return Result$1.ok(OK);
     }
     sbrk(length) {
@@ -16121,7 +16086,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);
         }
     }
@@ -16246,7 +16211,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;
         }
@@ -16318,7 +16283,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;
@@ -16552,7 +16517,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

@@ -12,6 +12,8 @@ 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 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;
@@ -233,33 +235,6 @@ 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.
@@ -737,6 +712,7 @@ 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;
@@ -750,9 +726,8 @@ 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_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 { 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 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 };
 }
 
@@ -7953,6 +7928,12 @@ 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.
    *
@@ -7987,55 +7968,39 @@ 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(strings: TemplateStringsArray, ...data: unknown[]) {
-    this.config.transport.insane(this.getLevelAndName(), strings, data);
+  insane(val: string) {
+    this.config.transport.insane(this.moduleName, val);
   }
 
   /** Log a message with `TRACE` level. */
-  trace(strings: TemplateStringsArray, ...data: unknown[]) {
-    this.config.transport.trace(this.getLevelAndName(), strings, data);
+  trace(val: string) {
+    this.config.transport.trace(this.moduleName, val);
   }
 
   /** Log a message with `DEBUG`/`LOG` level. */
-  log(strings: TemplateStringsArray, ...data: unknown[]) {
-    this.config.transport.log(this.getLevelAndName(), strings, data);
+  log(val: string) {
+    this.config.transport.log(this.moduleName, val);
   }
 
   /** Log a message with `INFO` level. */
-  info(strings: TemplateStringsArray, ...data: unknown[]) {
-    this.config.transport.info(this.getLevelAndName(), strings, data);
+  info(val: string) {
+    this.config.transport.info(this.moduleName, val);
   }
 
   /** Log a message with `WARN` level. */
-  warn(strings: TemplateStringsArray, ...data: unknown[]) {
-    this.config.transport.warn(this.getLevelAndName(), strings, data);
+  warn(val: string) {
+    this.config.transport.warn(this.moduleName, val);
   }
 
   /** Log a message with `ERROR` level. */
-  error(strings: TemplateStringsArray, ...data: unknown[]) {
-    this.config.transport.error(this.getLevelAndName(), strings, data);
+  error(val: string) {
+    this.config.transport.error(this.moduleName, val);
   }
 }
 
@@ -8134,17 +8099,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);
@@ -14481,6 +14446,8 @@ declare enum AccessType {
   WRITE = 1,
 }
 
+// const logger = Logger.new(import.meta.filename, "pvm:mem");
+
 declare class Memory {
   static fromInitialMemory(initialMemoryState: InitialMemoryState) {
     return new Memory(
@@ -14517,7 +14484,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) {
@@ -14606,7 +14573,7 @@ declare class Memory {
       bytesLeft -= bytesToRead;
     }
 
-    logger.insane`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`;
+    // logger.insane(`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`);
     return Result.ok(OK);
   }
 
@@ -16569,7 +16536,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);
     }
   }
@@ -16731,7 +16698,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;
@@ -16808,7 +16775,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;
     }
 
@@ -17547,7 +17514,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

@@ -15,10 +15,10 @@ var TestSuite;
 })(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$1 = typeof process === "undefined" ? {} : process.env;
+const env = typeof process === "undefined" ? {} : process.env;
 const DEFAULT_VERSION = GpVersion.V0_7_0;
-let CURRENT_VERSION = parseCurrentVersion(env$1.GP_VERSION) ?? DEFAULT_VERSION;
-let CURRENT_SUITE = parseCurrentSuite(env$1.TEST_SUITE) ?? DEFAULT_SUITE;
+let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
+let CURRENT_SUITE = parseCurrentSuite(env.TEST_SUITE) ?? DEFAULT_SUITE;
 function parseCurrentVersion(env) {
     if (env === undefined) {
         return undefined;
@@ -197,33 +197,6 @@ 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.
@@ -576,8 +549,7 @@ var index$s = /*#__PURE__*/Object.freeze({
   isBrowser: isBrowser,
   measure: measure,
   resultToString: resultToString,
-  seeThrough: seeThrough,
-  workspacePathFix: workspacePathFix
+  seeThrough: seeThrough
 });
 
 /**
@@ -8037,23 +8009,6 @@ 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}${data[idx]}`);
-    const msg = `${lvlText} [${levelAndName[1]}] ${val}`;
-    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.
@@ -8084,91 +8039,109 @@ class ConsoleTransport {
     constructor(options) {
         this.options = options;
     }
-    insane(_levelAndName, _strings, _data) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    trace(_levelAndName, _strings, _data) {
+    trace(_moduleName, _val) {
         /* no-op */
     }
-    log(_levelAndName, _strings, _data) {
+    log(_moduleName, _val) {
         /* no-op */
     }
-    info(_levelAndName, _strings, _data) {
+    info(_moduleName, _val) {
         /* no-op */
     }
-    warn(levelAndName, strings, data) {
-        print(Level.WARN, levelAndName, strings, data);
+    warn(moduleName, val) {
+        this.push(Level.WARN, moduleName, val);
     }
-    error(levelAndName, strings, data) {
-        print(Level.ERROR, 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);
+        }
     }
 }
 /**
  * Insane version of console logger - supports insane level.
  */
 class InsaneConsoleLogger extends ConsoleTransport {
-    insane(levelAndName, strings, data) {
-        print(Level.INSANE, levelAndName, strings, data);
+    insane(moduleName, val) {
+        this.push(Level.INSANE, moduleName, val);
     }
-    trace(levelAndName, strings, data) {
-        print(Level.TRACE, levelAndName, strings, data);
+    trace(moduleName, val) {
+        this.push(Level.TRACE, moduleName, val);
     }
-    log(levelAndName, strings, data) {
-        print(Level.LOG, levelAndName, strings, data);
+    log(moduleName, val) {
+        this.push(Level.LOG, moduleName, val);
     }
-    info(levelAndName, strings, data) {
-        print(Level.INFO, levelAndName, strings, data);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 /**
  * A basic version of console logger - printing everything.
  */
 class TraceConsoleTransport extends ConsoleTransport {
-    insane(_levelAndName, _strings, _data) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    trace(levelAndName, strings, data) {
-        print(Level.TRACE, levelAndName, strings, data);
+    trace(moduleName, val) {
+        this.push(Level.TRACE, moduleName, val);
     }
-    log(levelAndName, strings, data) {
-        print(Level.LOG, levelAndName, strings, data);
+    log(moduleName, val) {
+        this.push(Level.LOG, moduleName, val);
     }
-    info(levelAndName, strings, data) {
-        print(Level.INFO, levelAndName, strings, data);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 /**
  * An optimized version of the logger - completely ignores `TRACE` level calls.
  */
 class LogConsoleTransport extends ConsoleTransport {
-    insane(_levelAndName, _strings, _data) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    trace(_levelAndName, _strings, _data) {
+    trace(_moduleName, _val) {
         /* no-op */
     }
-    log(levelAndName, strings, data) {
-        print(Level.LOG, levelAndName, strings, data);
+    log(moduleName, val) {
+        this.push(Level.LOG, moduleName, val);
     }
-    info(levelAndName, strings, data) {
-        print(Level.INFO, levelAndName, strings, data);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 /**
  * An optimized version of the logger - completely ignores `TRACE` & `DEBUG` level calls.
  */
 class InfoConsoleTransport extends ConsoleTransport {
-    insane(_levelAndName, _strings, _data) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    trace(_levelAndName, _strings, _data) {
+    trace(_moduleName, _val) {
         /* no-op */
     }
-    log(_levelAndName, _strings, _data) {
+    log(_moduleName, _val) {
         /* no-op */
     }
-    info(levelAndName, strings, data) {
-        print(Level.INFO, levelAndName, strings, data);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 
@@ -8201,6 +8174,11 @@ 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.
      *
@@ -8231,46 +8209,33 @@ 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(strings, ...data) {
-        this.config.transport.insane(this.getLevelAndName(), strings, data);
+    insane(val) {
+        this.config.transport.insane(this.moduleName, val);
     }
     /** Log a message with `TRACE` level. */
-    trace(strings, ...data) {
-        this.config.transport.trace(this.getLevelAndName(), strings, data);
+    trace(val) {
+        this.config.transport.trace(this.moduleName, val);
     }
     /** Log a message with `DEBUG`/`LOG` level. */
-    log(strings, ...data) {
-        this.config.transport.log(this.getLevelAndName(), strings, data);
+    log(val) {
+        this.config.transport.log(this.moduleName, val);
     }
     /** Log a message with `INFO` level. */
-    info(strings, ...data) {
-        this.config.transport.info(this.getLevelAndName(), strings, data);
+    info(val) {
+        this.config.transport.info(this.moduleName, val);
     }
     /** Log a message with `WARN` level. */
-    warn(strings, ...data) {
-        this.config.transport.warn(this.getLevelAndName(), strings, data);
+    warn(val) {
+        this.config.transport.warn(this.moduleName, val);
     }
     /** Log a message with `ERROR` level. */
-    error(strings, ...data) {
-        this.config.transport.error(this.getLevelAndName(), strings, data);
+    error(val) {
+        this.config.transport.error(this.moduleName, val);
     }
 }
 
@@ -8297,7 +8262,7 @@ class AuthorshipOptions {
     }
 }
 
-const logger$4 = Logger.new(import.meta.filename, "config");
+const logger$3 = Logger.new(import.meta.filename, "config");
 /** Development config. Will accept unsealed blocks for now. */
 const DEV_CONFIG = "dev";
 /** Default config file. */
@@ -8356,15 +8321,15 @@ class NodeConfiguration {
 }
 function loadConfig(configPath) {
     if (configPath === DEFAULT_CONFIG) {
-        logger$4.log `🔧 Loading DEFAULT config`;
+        logger$3.log("🔧 Loading DEFAULT config");
         return parseFromJson(configs.default, NodeConfiguration.fromJson);
     }
     if (configPath === DEV_CONFIG) {
-        logger$4.log `🔧 Loading DEV config`;
+        logger$3.log("🔧 Loading DEV config");
         return parseFromJson(configs.dev, NodeConfiguration.fromJson);
     }
     try {
-        logger$4.log `🔧 Loading config from ${configPath}`;
+        logger$3.log(`🔧 Loading config from ${configPath}`);
         const configFile = fs.readFileSync(configPath, "utf8");
         const parsed = JSON.parse(configFile);
         return parseFromJson(parsed, NodeConfiguration.fromJson);
@@ -14226,7 +14191,7 @@ var AccessType;
     AccessType[AccessType["READ"] = 0] = "READ";
     AccessType[AccessType["WRITE"] = 1] = "WRITE";
 })(AccessType || (AccessType = {}));
-const logger$3 = Logger.new(import.meta.filename, "pvm:mem");
+// const logger = Logger.new(import.meta.filename, "pvm:mem");
 class Memory {
     sbrkIndex;
     virtualSbrkIndex;
@@ -14257,7 +14222,7 @@ class Memory {
         if (bytes.length === 0) {
             return Result$1.ok(OK);
         }
-        logger$3.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) {
             return Result$1.error(pagesResult.error);
@@ -14324,7 +14289,7 @@ class Memory {
             currentPosition += bytesToRead;
             bytesLeft -= bytesToRead;
         }
-        logger$3.insane `MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`;
+        // logger.insane(`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`);
         return Result$1.ok(OK);
     }
     sbrk(length) {
@@ -16118,7 +16083,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);
         }
     }
@@ -16243,7 +16208,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;
         }
@@ -16315,7 +16280,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;
@@ -16549,7 +16514,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-e48de40",
+  "version": "0.1.1",
   "main": "index.js",
   "author": "Fluffy Labs",
   "license": "MPL-2.0",