@typeberry/lib 0.0.1-7996e00 → 0.0.1-8a792cb

package/index.d.ts

@@ -493,6 +493,8 @@ type DeepEqualOptions = {
   errorsCollector?: ErrorsCollector;
 };
 
+declare let oomWarningPrinted = false;
+
 /** Deeply compare `actual` and `expected` values. */
 declare function deepEqual<T>(
   actual: T | undefined,
@@ -525,7 +527,7 @@ declare function deepEqual<T>(
       try {
         assert.strictEqual(actualDisp, expectedDisp, message);
       } catch (e) {
-        if (isOoMWorkaroundNeeded) {
+        if (isOoMWorkaroundNeeded && !oomWarningPrinted) {
           console.warn(
             [
               "Stacktrace may be crappy because of a problem in nodejs.",
@@ -533,6 +535,7 @@ declare function deepEqual<T>(
               "Maybe we do not need it anymore",
             ].join("\n"),
           );
+          oomWarningPrinted = true;
         }
         throw e;
       }
@@ -786,13 +789,14 @@ declare const index$r_isResult: typeof isResult;
 declare const index$r_isTaggedError: typeof isTaggedError;
 declare const index$r_maybeTaggedErrorToString: typeof maybeTaggedErrorToString;
 declare const index$r_measure: typeof measure;
+declare const index$r_oomWarningPrinted: typeof oomWarningPrinted;
 declare const index$r_parseCurrentSuite: typeof parseCurrentSuite;
 declare const index$r_parseCurrentVersion: typeof parseCurrentVersion;
 declare const index$r_resultToString: typeof resultToString;
 declare const index$r_seeThrough: typeof seeThrough;
 declare const index$r_trimStack: typeof trimStack;
 declare namespace index$r {
-  export { index$r_ALL_VERSIONS_IN_ORDER as ALL_VERSIONS_IN_ORDER, index$r_CURRENT_SUITE as CURRENT_SUITE, index$r_CURRENT_VERSION as CURRENT_VERSION, index$r_Compatibility as Compatibility, index$r_DEFAULT_SUITE as DEFAULT_SUITE, index$r_DEFAULT_VERSION as DEFAULT_VERSION, index$r_ErrorsCollector as ErrorsCollector, index$r_GpVersion as GpVersion, Result$2 as Result, index$r_RichTaggedError as RichTaggedError, index$r_TEST_COMPARE_USING as TEST_COMPARE_USING, index$r_TestSuite as TestSuite, index$r_WithDebug as WithDebug, index$r___OPAQUE_TYPE__ as __OPAQUE_TYPE__, index$r_asOpaqueType as asOpaqueType, index$r_assertEmpty as assertEmpty, index$r_assertNever as assertNever, index$r_callCompareFunction as callCompareFunction, index$r_cast as cast, index$r_check as check, index$r_deepEqual as deepEqual, index$r_ensure as ensure, index$r_env as env, index$r_getAllKeysSorted as getAllKeysSorted, index$r_inspect as inspect, index$r_isBrowser as isBrowser, index$r_isResult as isResult, index$r_isTaggedError as isTaggedError, index$r_maybeTaggedErrorToString as maybeTaggedErrorToString, index$r_measure as measure, index$r_parseCurrentSuite as parseCurrentSuite, index$r_parseCurrentVersion as parseCurrentVersion, index$r_resultToString as resultToString, index$r_seeThrough as seeThrough, index$r_trimStack as trimStack };
+  export { index$r_ALL_VERSIONS_IN_ORDER as ALL_VERSIONS_IN_ORDER, index$r_CURRENT_SUITE as CURRENT_SUITE, index$r_CURRENT_VERSION as CURRENT_VERSION, index$r_Compatibility as Compatibility, index$r_DEFAULT_SUITE as DEFAULT_SUITE, index$r_DEFAULT_VERSION as DEFAULT_VERSION, index$r_ErrorsCollector as ErrorsCollector, index$r_GpVersion as GpVersion, Result$2 as Result, index$r_RichTaggedError as RichTaggedError, index$r_TEST_COMPARE_USING as TEST_COMPARE_USING, index$r_TestSuite as TestSuite, index$r_WithDebug as WithDebug, index$r___OPAQUE_TYPE__ as __OPAQUE_TYPE__, index$r_asOpaqueType as asOpaqueType, index$r_assertEmpty as assertEmpty, index$r_assertNever as assertNever, index$r_callCompareFunction as callCompareFunction, index$r_cast as cast, index$r_check as check, index$r_deepEqual as deepEqual, index$r_ensure as ensure, index$r_env as env, index$r_getAllKeysSorted as getAllKeysSorted, index$r_inspect as inspect, index$r_isBrowser as isBrowser, index$r_isResult as isResult, index$r_isTaggedError as isTaggedError, index$r_maybeTaggedErrorToString as maybeTaggedErrorToString, index$r_measure as measure, index$r_oomWarningPrinted as oomWarningPrinted, index$r_parseCurrentSuite as parseCurrentSuite, index$r_parseCurrentVersion as parseCurrentVersion, index$r_resultToString as resultToString, index$r_seeThrough as seeThrough, index$r_trimStack as trimStack };
   export type { index$r_DeepEqualOptions as DeepEqualOptions, index$r_EnumMapping as EnumMapping, index$r_ErrorResult as ErrorResult, index$r_OK as OK, index$r_OkResult as OkResult, index$r_Opaque as Opaque, index$r_StringLiteral as StringLiteral, index$r_TaggedError as TaggedError, index$r_TokenOf as TokenOf, index$r_Uninstantiable as Uninstantiable, index$r_WithOpaque as WithOpaque };
 }
 
@@ -8772,31 +8776,18 @@ declare const ignoreValueWithDefault = <T>(defaultValue: T) =>
  * https://graypaper.fluffylabs.dev/#/7e6ff6a/108301108301?v=0.6.7
  */
 declare class ServiceAccountInfo extends WithDebug {
-  static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)
-    ? codec.Class(ServiceAccountInfo, {
-        codeHash: codec.bytes(HASH_SIZE).asOpaque<CodeHash>(),
-        balance: codec.u64,
-        accumulateMinGas: codec.u64.convert((x) => x, tryAsServiceGas),
-        onTransferMinGas: codec.u64.convert((x) => x, tryAsServiceGas),
-        storageUtilisationBytes: codec.u64,
-        gratisStorage: codec.u64,
-        storageUtilisationCount: codec.u32,
-        created: codec.u32.convert((x) => x, tryAsTimeSlot),
-        lastAccumulation: codec.u32.convert((x) => x, tryAsTimeSlot),
-        parentService: codec.u32.convert((x) => x, tryAsServiceId),
-      })
-    : codec.Class(ServiceAccountInfo, {
-        codeHash: codec.bytes(HASH_SIZE).asOpaque<CodeHash>(),
-        balance: codec.u64,
-        accumulateMinGas: codec.u64.convert((x) => x, tryAsServiceGas),
-        onTransferMinGas: codec.u64.convert((x) => x, tryAsServiceGas),
-        storageUtilisationBytes: codec.u64,
-        storageUtilisationCount: codec.u32,
-        gratisStorage: ignoreValueWithDefault(tryAsU64(0)),
-        created: ignoreValueWithDefault(tryAsTimeSlot(0)),
-        lastAccumulation: ignoreValueWithDefault(tryAsTimeSlot(0)),
-        parentService: ignoreValueWithDefault(tryAsServiceId(0)),
-      });
+  static Codec = codec.Class(ServiceAccountInfo, {
+    codeHash: codec.bytes(HASH_SIZE).asOpaque<CodeHash>(),
+    balance: codec.u64,
+    accumulateMinGas: codec.u64.convert((x) => x, tryAsServiceGas),
+    onTransferMinGas: codec.u64.convert((x) => x, tryAsServiceGas),
+    storageUtilisationBytes: codec.u64,
+    gratisStorage: codec.u64,
+    storageUtilisationCount: codec.u32,
+    created: codec.u32.convert((x) => x, tryAsTimeSlot),
+    lastAccumulation: codec.u32.convert((x) => x, tryAsTimeSlot),
+    parentService: codec.u32.convert((x) => x, tryAsServiceId),
+  });
 
   static create(a: CodecRecord<ServiceAccountInfo>) {
     return new ServiceAccountInfo(
@@ -10390,7 +10381,7 @@ type StateCodec<T> = {
 
 /** Serialization for particular state entries. */
 declare namespace serialize {
-  /** C(1): https://graypaper.fluffylabs.dev/#/85129da/38a20138a201?v=0.6.3 */
+  /** C(1): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b15013b1501?v=0.6.7 */
   export const authPools: StateCodec<State["authPools"]> = {
     key: stateKeys.index(StateKeyIdx.Alpha),
     Codec: codecPerCore(
@@ -10403,7 +10394,7 @@ declare namespace serialize {
     extract: (s) => s.authPools,
   };
 
-  /** C(2): https://graypaper.fluffylabs.dev/#/85129da/38be0138be01?v=0.6.3 */
+  /** C(2): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b31013b3101?v=0.6.7 */
   export const authQueues: StateCodec<State["authQueues"]> = {
     key: stateKeys.index(StateKeyIdx.Phi),
     Codec: codecPerCore(
@@ -10414,7 +10405,6 @@ declare namespace serialize {
 
   /**
    * C(3): Recent blocks with compatibility
-   *  https://graypaper.fluffylabs.dev/#/85129da/38cb0138cb01?v=0.6.3
    *  https://graypaper.fluffylabs.dev/#/7e6ff6a/3b3e013b3e01?v=0.6.7
    */
   export const recentBlocks: StateCodec<State["recentBlocks"]> = {
@@ -10423,7 +10413,7 @@ declare namespace serialize {
     extract: (s) => s.recentBlocks,
   };
 
-  /** C(4): https://graypaper.fluffylabs.dev/#/85129da/38e60138e601?v=0.6.3 */
+  /** C(4): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b63013b6301?v=0.6.7 */
   export const safrole: StateCodec<SafroleData> = {
     key: stateKeys.index(StateKeyIdx.Gamma),
     Codec: SafroleData.Codec,
@@ -10436,63 +10426,63 @@ declare namespace serialize {
       }),
   };
 
-  /** C(5): https://graypaper.fluffylabs.dev/#/85129da/383d02383d02?v=0.6.3 */
+  /** C(5): https://graypaper.fluffylabs.dev/#/7e6ff6a/3bba013bba01?v=0.6.7 */
   export const disputesRecords: StateCodec<State["disputesRecords"]> = {
     key: stateKeys.index(StateKeyIdx.Psi),
     Codec: DisputesRecords.Codec,
     extract: (s) => s.disputesRecords,
   };
 
-  /** C(6): https://graypaper.fluffylabs.dev/#/85129da/387602387602?v=0.6.3 */
+  /** C(6): https://graypaper.fluffylabs.dev/#/7e6ff6a/3bf3013bf301?v=0.6.7 */
   export const entropy: StateCodec<State["entropy"]> = {
     key: stateKeys.index(StateKeyIdx.Eta),
     Codec: codecFixedSizeArray(codec.bytes(HASH_SIZE).asOpaque<EntropyHash>(), ENTROPY_ENTRIES),
     extract: (s) => s.entropy,
   };
 
-  /** C(7): https://graypaper.fluffylabs.dev/#/85129da/388302388302?v=0.6.3 */
+  /** C(7): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b00023b0002?v=0.6.7 */
   export const designatedValidators: StateCodec<State["designatedValidatorData"]> = {
     key: stateKeys.index(StateKeyIdx.Iota),
     Codec: codecPerValidator(ValidatorData.Codec),
     extract: (s) => s.designatedValidatorData,
   };
 
-  /** C(8): https://graypaper.fluffylabs.dev/#/85129da/389002389002?v=0.6.3 */
+  /** C(8): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b0d023b0d02?v=0.6.7 */
   export const currentValidators: StateCodec<State["currentValidatorData"]> = {
     key: stateKeys.index(StateKeyIdx.Kappa),
     Codec: codecPerValidator(ValidatorData.Codec),
     extract: (s) => s.currentValidatorData,
   };
 
-  /** C(9): https://graypaper.fluffylabs.dev/#/85129da/389d02389d02?v=0.6.3 */
+  /** C(9): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b1a023b1a02?v=0.6.7 */
   export const previousValidators: StateCodec<State["previousValidatorData"]> = {
     key: stateKeys.index(StateKeyIdx.Lambda),
     Codec: codecPerValidator(ValidatorData.Codec),
     extract: (s) => s.previousValidatorData,
   };
 
-  /** C(10): https://graypaper.fluffylabs.dev/#/85129da/38aa0238aa02?v=0.6.3 */
+  /** C(10): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b27023b2702?v=0.6.7 */
   export const availabilityAssignment: StateCodec<State["availabilityAssignment"]> = {
     key: stateKeys.index(StateKeyIdx.Rho),
     Codec: codecPerCore(codec.optional(AvailabilityAssignment.Codec)),
     extract: (s) => s.availabilityAssignment,
   };
 
-  /** C(11): https://graypaper.fluffylabs.dev/#/85129da/38c10238c102?v=0.6.3 */
+  /** C(11): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b3e023b3e02?v=0.6.7 */
   export const timeslot: StateCodec<State["timeslot"]> = {
     key: stateKeys.index(StateKeyIdx.Tau),
     Codec: codec.u32.asOpaque<TimeSlot>(),
     extract: (s) => s.timeslot,
   };
 
-  /** C(12): https://graypaper.fluffylabs.dev/#/85129da/38cf0238cf02?v=0.6.3 */
+  /** C(12): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b4c023b4c02?v=0.6.7 */
   export const privilegedServices: StateCodec<State["privilegedServices"]> = {
     key: stateKeys.index(StateKeyIdx.Chi),
     Codec: PrivilegedServices.Codec,
     extract: (s) => s.privilegedServices,
   };
 
-  /** C(13): https://graypaper.fluffylabs.dev/#/85129da/38e10238e102?v=0.6.3 */
+  /** C(13): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b5e023b5e02?v=0.6.7 */
   export const statistics: StateCodec<State["statistics"]> = {
     key: stateKeys.index(StateKeyIdx.Pi),
     Codec: StatisticsData.Codec,
@@ -10506,7 +10496,7 @@ declare namespace serialize {
     extract: (s) => s.accumulationQueue,
   };
 
-  /** C(15): https://graypaper.fluffylabs.dev/#/85129da/381903381903?v=0.6.3 */
+  /** C(15): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b96023b9602?v=0.6.7 */
   export const recentlyAccumulated: StateCodec<State["recentlyAccumulated"]> = {
     key: stateKeys.index(StateKeyIdx.Xi),
     Codec: codecPerEpochBlock(
@@ -12614,6 +12604,173 @@ declare const HostCallResult = {
   OK: tryAsU64(0n),
 } as const;
 
+declare enum Level {
+  INSANE = 1,
+  TRACE = 2,
+  LOG = 3,
+  INFO = 4,
+  WARN = 5,
+  ERROR = 6,
+}
+
+type Options = {
+  defaultLevel: Level;
+  workingDir: string;
+  modules: Map<string, Level>;
+};
+
+/**
+ * A function to parse logger definition (including modules) given as a string.
+ *
+ * Examples
+ *  - `info` - setup default logging level to `info`.
+ *  - `trace` - default logging level set to `trace`.
+ *  - `debug;consensus=trace` - default level is set to `debug/log`, but consensus is in trace mode.
+ */
+declare function parseLoggerOptions(input: string, defaultLevel: Level, workingDir?: string): Options {
+  const modules = new Map<string, Level>();
+  const parts = input.toLowerCase().split(",");
+  let defLevel = defaultLevel;
+
+  for (const p of parts) {
+    const clean = p.trim();
+    // skip empty objects (forgotten `,` removed)
+    if (clean.length === 0) {
+      continue;
+    }
+    // we just have the default level
+    if (clean.includes("=")) {
+      const [mod, lvl] = clean.split("=");
+      modules.set(mod.trim(), parseLevel(lvl.trim()));
+    } else {
+      defLevel = parseLevel(clean);
+    }
+  }
+
+  // TODO [ToDr] Fix dirname for workers.
+  const myDir = (import.meta.dirname ?? "").split("/");
+  myDir.pop();
+  myDir.pop();
+  return {
+    defaultLevel: defLevel,
+    modules,
+    workingDir: workingDir ?? myDir.join("/"),
+  };
+}
+
+declare const GLOBAL_CONFIG = {
+  options: DEFAULT_OPTIONS,
+  transport: ConsoleTransport.create(DEFAULT_OPTIONS.defaultLevel, DEFAULT_OPTIONS),
+};
+
+/**
+ * A logger instance.
+ */
+declare class Logger {
+  /**
+   * Create a new logger instance given filename and an optional module name.
+   *
+   * If the module name is not given, `fileName` becomes the module name.
+   * The module name can be composed from multiple parts separated with `/`.
+   *
+   * The logger will use a global configuration which can be changed using
+   * [`configureLogger`] function.
+   */
+  static new(fileName?: string, moduleName?: string) {
+    const fName = fileName ?? "unknown";
+    return new Logger(moduleName ?? fName, fName, 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.
+   *
+   * One can specify a default logging level (only logs with level >= default will be printed).
+   * It's also possible to configure per-module logging level that takes precedence
+   * over the default one.
+   *
+   * Changing the options affects all previously created loggers.
+   */
+  static configureAllFromOptions(options: Options) {
+    // find minimal level to optimise logging in case
+    // we don't care about low-level logs.
+    const minimalLevel = Array.from(options.modules.values()).reduce((level, modLevel) => {
+      return level < modLevel ? level : modLevel;
+    }, options.defaultLevel);
+
+    const transport = ConsoleTransport.create(minimalLevel, options);
+
+    // set the global config
+    GLOBAL_CONFIG.options = options;
+    GLOBAL_CONFIG.transport = transport;
+  }
+
+  /**
+   * Global configuration of all loggers.
+   *
+   * Parse configuration options from an input string typically obtained
+   * from environment variable `JAM_LOG`.
+   */
+  static configureAll(input: string, defaultLevel: Level, workingDir?: string) {
+    const options = parseLoggerOptions(input, defaultLevel, workingDir);
+    Logger.configureAllFromOptions(options);
+  }
+
+  constructor(
+    private readonly moduleName: string,
+    private readonly fileName: string,
+    private readonly config: typeof GLOBAL_CONFIG,
+  ) {}
+
+  /** Log a message with `INSANE` level. */
+  insane(val: string) {
+    this.config.transport.insane(this.moduleName, val);
+  }
+
+  /** Log a message with `TRACE` level. */
+  trace(val: string) {
+    this.config.transport.trace(this.moduleName, val);
+  }
+
+  /** Log a message with `DEBUG`/`LOG` level. */
+  log(val: string) {
+    this.config.transport.log(this.moduleName, val);
+  }
+
+  /** Log a message with `INFO` level. */
+  info(val: string) {
+    this.config.transport.info(this.moduleName, val);
+  }
+
+  /** Log a message with `WARN` level. */
+  warn(val: string) {
+    this.config.transport.warn(this.moduleName, val);
+  }
+
+  /** Log a message with `ERROR` level. */
+  error(val: string) {
+    this.config.transport.error(this.moduleName, val);
+  }
+}
+
+type index$9_Level = Level;
+declare const index$9_Level: typeof Level;
+type index$9_Logger = Logger;
+declare const index$9_Logger: typeof Logger;
+declare const index$9_parseLoggerOptions: typeof parseLoggerOptions;
+declare namespace index$9 {
+  export {
+    index$9_Level as Level,
+    index$9_Logger as Logger,
+    index$9_parseLoggerOptions as parseLoggerOptions,
+  };
+}
+
 /**
  * Mask class is an implementation of skip function defined in GP.
  *
@@ -13893,6 +14050,7 @@ declare enum AccessType {
   READ = 0,
   WRITE = 1,
 }
+
 declare class Memory {
   static fromInitialMemory(initialMemoryState: InitialMemoryState) {
     return new Memory(
@@ -13929,6 +14087,7 @@ declare class Memory {
       return Result.ok(OK);
     }
 
+    logger.insane(`MEM[${address}] <- ${BytesBlob.blobFrom(bytes)}`);
     const pagesResult = this.getPages(address, bytes.length, AccessType.WRITE);
 
     if (pagesResult.isError) {
@@ -14017,6 +14176,7 @@ declare class Memory {
       bytesLeft -= bytesToRead;
     }
 
+    logger.insane(`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`);
     return Result.ok(OK);
   }
 
@@ -15016,6 +15176,10 @@ declare class JumpTable {
     return new JumpTable(0, new Uint8Array());
   }
 
+  getSize() {
+    return this.indices.length;
+  }
+
   copyFrom(jt: JumpTable) {
     this.indices = jt.indices;
   }
@@ -15917,167 +16081,6 @@ declare class OneRegOneExtImmDispatcher {
   }
 }
 
-declare enum Level {
-  TRACE = 1,
-  LOG = 2,
-  INFO = 3,
-  WARN = 4,
-  ERROR = 5,
-}
-
-type Options = {
-  defaultLevel: Level;
-  workingDir: string;
-  modules: Map<string, Level>;
-};
-
-/**
- * A function to parse logger definition (including modules) given as a string.
- *
- * Examples
- *  - `info` - setup default logging level to `info`.
- *  - `trace` - default logging level set to `trace`.
- *  - `debug;consensus=trace` - default level is set to `debug/log`, but consensus is in trace mode.
- */
-declare function parseLoggerOptions(input: string, defaultLevel: Level, workingDir?: string): Options {
-  const modules = new Map<string, Level>();
-  const parts = input.toLowerCase().split(",");
-  let defLevel = defaultLevel;
-
-  for (const p of parts) {
-    const clean = p.trim();
-    // skip empty objects (forgotten `,` removed)
-    if (clean.length === 0) {
-      continue;
-    }
-    // we just have the default level
-    if (clean.includes("=")) {
-      const [mod, lvl] = clean.split("=");
-      modules.set(mod.trim(), parseLevel(lvl.trim()));
-    } else {
-      defLevel = parseLevel(clean);
-    }
-  }
-
-  // TODO [ToDr] Fix dirname for workers.
-  const myDir = (import.meta.dirname ?? "").split("/");
-  myDir.pop();
-  myDir.pop();
-  return {
-    defaultLevel: defLevel,
-    modules,
-    workingDir: workingDir ?? myDir.join("/"),
-  };
-}
-
-declare const GLOBAL_CONFIG = {
-  options: DEFAULT_OPTIONS,
-  transport: ConsoleTransport.create(DEFAULT_OPTIONS.defaultLevel, DEFAULT_OPTIONS),
-};
-
-/**
- * A logger instance.
- */
-declare class Logger {
-  /**
-   * Create a new logger instance given filename and an optional module name.
-   *
-   * If the module name is not given, `fileName` becomes the module name.
-   * The module name can be composed from multiple parts separated with `/`.
-   *
-   * The logger will use a global configuration which can be changed using
-   * [`configureLogger`] function.
-   */
-  static new(fileName?: string, moduleName?: string) {
-    const fName = fileName ?? "unknown";
-    return new Logger(moduleName ?? fName, fName, 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.
-   *
-   * One can specify a default logging level (only logs with level >= default will be printed).
-   * It's also possible to configure per-module logging level that takes precedence
-   * over the default one.
-   *
-   * Changing the options affects all previously created loggers.
-   */
-  static configureAllFromOptions(options: Options) {
-    // find minimal level to optimise logging in case
-    // we don't care about low-level logs.
-    const minimalLevel = Array.from(options.modules.values()).reduce((level, modLevel) => {
-      return level < modLevel ? level : modLevel;
-    }, options.defaultLevel);
-
-    const transport = ConsoleTransport.create(minimalLevel, options);
-
-    // set the global config
-    GLOBAL_CONFIG.options = options;
-    GLOBAL_CONFIG.transport = transport;
-  }
-
-  /**
-   * Global configuration of all loggers.
-   *
-   * Parse configuration options from an input string typically obtained
-   * from environment variable `JAM_LOG`.
-   */
-  static configureAll(input: string, defaultLevel: Level, workingDir?: string) {
-    const options = parseLoggerOptions(input, defaultLevel, workingDir);
-    Logger.configureAllFromOptions(options);
-  }
-
-  constructor(
-    private readonly moduleName: string,
-    private readonly fileName: string,
-    private readonly config: typeof GLOBAL_CONFIG,
-  ) {}
-
-  /** Log a message with `TRACE` level. */
-  trace(val: string) {
-    this.config.transport.trace(this.moduleName, this.fileName, val);
-  }
-
-  /** Log a message with `DEBUG`/`LOG` level. */
-  log(val: string) {
-    this.config.transport.log(this.moduleName, this.fileName, val);
-  }
-
-  /** Log a message with `INFO` level. */
-  info(val: string) {
-    this.config.transport.info(this.moduleName, this.fileName, val);
-  }
-
-  /** Log a message with `WARN` level. */
-  warn(val: string) {
-    this.config.transport.warn(this.moduleName, this.fileName, val);
-  }
-
-  /** Log a message with `ERROR` level. */
-  error(val: string) {
-    this.config.transport.error(this.moduleName, this.fileName, val);
-  }
-}
-
-type index$9_Level = Level;
-declare const index$9_Level: typeof Level;
-type index$9_Logger = Logger;
-declare const index$9_Logger: typeof Logger;
-declare const index$9_parseLoggerOptions: typeof parseLoggerOptions;
-declare namespace index$9 {
-  export {
-    index$9_Level as Level,
-    index$9_Logger as Logger,
-    index$9_parseLoggerOptions as parseLoggerOptions,
-  };
-}
-
 declare enum ProgramDecoderError {
   InvalidProgramError = 0,
 }
@@ -16160,6 +16163,8 @@ type InterpreterOptions = {
   useSbrkGas?: boolean;
 };
 
+declare const logger = Logger.new(import.meta.filename, "pvm");
+
 declare class Interpreter {
   private readonly useSbrkGas: boolean;
   private registers = new Registers();
@@ -16295,6 +16300,8 @@ declare class Interpreter {
     const argsResult = this.argsDecodingResults[argsType];
     this.argsDecoder.fillArgs(this.pc, argsResult);
 
+    logger.insane(`[PC: ${this.pc}] ${Instruction[currentInstruction]}`);
+
     if (!isValidInstruction) {
       this.instructionResult.status = Result.PANIC;
     } else {
@@ -16370,6 +16377,7 @@ declare class Interpreter {
           this.status = Status.HOST;
           break;
       }
+      logger.insane(`[PC: ${this.pc}] Status: ${Result[this.instructionResult.status]}`);
       return this.status;
     }
 
@@ -16441,13 +16449,14 @@ declare const index$8_Registers: typeof Registers;
 type index$8_SbrkIndex = SbrkIndex;
 type index$8_SmallGas = SmallGas;
 declare const index$8_gasCounter: typeof gasCounter;
+declare const index$8_logger: typeof logger;
 declare const index$8_tryAsBigGas: typeof tryAsBigGas;
 declare const index$8_tryAsGas: typeof tryAsGas;
 declare const index$8_tryAsMemoryIndex: typeof tryAsMemoryIndex;
 declare const index$8_tryAsSbrkIndex: typeof tryAsSbrkIndex;
 declare const index$8_tryAsSmallGas: typeof tryAsSmallGas;
 declare namespace index$8 {
-  export { index$8_Interpreter as Interpreter, index$8_Memory as Memory, index$8_MemoryBuilder as MemoryBuilder, index$8_Registers as Registers, index$8_gasCounter as gasCounter, index$8_tryAsBigGas as tryAsBigGas, index$8_tryAsGas as tryAsGas, index$8_tryAsMemoryIndex as tryAsMemoryIndex, index$8_tryAsSbrkIndex as tryAsSbrkIndex, index$8_tryAsSmallGas as tryAsSmallGas };
+  export { index$8_Interpreter as Interpreter, index$8_Memory as Memory, index$8_MemoryBuilder as MemoryBuilder, index$8_Registers as Registers, index$8_gasCounter as gasCounter, index$8_logger as logger, index$8_tryAsBigGas as tryAsBigGas, index$8_tryAsGas as tryAsGas, index$8_tryAsMemoryIndex as tryAsMemoryIndex, index$8_tryAsSbrkIndex as tryAsSbrkIndex, index$8_tryAsSmallGas as tryAsSmallGas };
   export type { index$8_BigGas as BigGas, index$8_Gas as Gas, index$8_GasCounter as GasCounter, index$8_InterpreterOptions as InterpreterOptions, index$8_MemoryIndex as MemoryIndex, index$8_SbrkIndex as SbrkIndex, index$8_SmallGas as SmallGas };
 }
 
@@ -16585,7 +16594,7 @@ declare class HostCallsManager {
         return `r${idx}=${value} (0x${value.toString(16)})`;
       })
       .join(", ");
-    logger.trace(`[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`);
+    logger.insane(`[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`);
   }
 }
 
@@ -16706,14 +16715,15 @@ declare class HostCalls {
       const gasCost = typeof hostCall.gasCost === "number" ? hostCall.gasCost : hostCall.gasCost(regs);
       const underflow = gas.sub(gasCost);
 
+      const pcLog = `[PC: ${pvmInstance.getPC()}]`;
       if (underflow) {
-        this.hostCalls.traceHostCall("OOG", index, hostCall, regs, gas.get());
+        this.hostCalls.traceHostCall(`${pcLog} OOG`, index, hostCall, regs, gas.get());
         return ReturnValue.fromStatus(pvmInstance.getGasConsumed(), Status.OOG);
       }
-      this.hostCalls.traceHostCall("Invoking", index, hostCall, regs, gasBefore);
+      this.hostCalls.traceHostCall(`${pcLog} Invoking`, index, hostCall, regs, gasBefore);
       const result = await hostCall.execute(gas, regs, memory);
       this.hostCalls.traceHostCall(
-        result === undefined ? "Result" : `Status(${PvmExecution[result]})`,
+        result === undefined ? `${pcLog} Result` : `${pcLog} Status(${PvmExecution[result]})`,
         index,
         hostCall,
         regs,
@@ -16725,8 +16735,18 @@ declare class HostCalls {
         return this.getReturnValue(status, pvmInstance);
       }
 
-      pvmInstance.runProgram();
-      status = pvmInstance.getStatus();
+      if (result === PvmExecution.Panic) {
+        status = Status.PANIC;
+        return this.getReturnValue(status, pvmInstance);
+      }
+
+      if (result === undefined) {
+        pvmInstance.runProgram();
+        status = pvmInstance.getStatus();
+        continue;
+      }
+
+      assertNever(result);
     }
   }
 

package/index.js

@@ -373,6 +373,7 @@ function callCompareFunction(object) {
     }
     return object;
 }
+let oomWarningPrinted = false;
 /** Deeply compare `actual` and `expected` values. */
 function deepEqual(actual, expected, { context = [], errorsCollector, ignore = [] } = {}) {
     const ctx = Array.isArray(context) ? context : [context];
@@ -398,12 +399,13 @@ function deepEqual(actual, expected, { context = [], errorsCollector, ignore = [
                 assert.strictEqual(actualDisp, expectedDisp, message);
             }
             catch (e) {
-                if (isOoMWorkaroundNeeded) {
+                if (isOoMWorkaroundNeeded && !oomWarningPrinted) {
                     console.warn([
                         "Stacktrace may be crappy because of a problem in nodejs.",
                         "Use older version than 22.12.0 or check this issue: https://github.com/nodejs/node/issues/57242",
                         "Maybe we do not need it anymore",
                     ].join("\n"));
+                    oomWarningPrinted = true;
                 }
                 throw e;
             }
@@ -8535,31 +8537,18 @@ class ServiceAccountInfo extends WithDebug {
     created;
     lastAccumulation;
     parentService;
-    static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)
-        ? codec$1.Class(ServiceAccountInfo, {
-            codeHash: codec$1.bytes(HASH_SIZE).asOpaque(),
-            balance: codec$1.u64,
-            accumulateMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
-            onTransferMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
-            storageUtilisationBytes: codec$1.u64,
-            gratisStorage: codec$1.u64,
-            storageUtilisationCount: codec$1.u32,
-            created: codec$1.u32.convert((x) => x, tryAsTimeSlot),
-            lastAccumulation: codec$1.u32.convert((x) => x, tryAsTimeSlot),
-            parentService: codec$1.u32.convert((x) => x, tryAsServiceId),
-        })
-        : codec$1.Class(ServiceAccountInfo, {
-            codeHash: codec$1.bytes(HASH_SIZE).asOpaque(),
-            balance: codec$1.u64,
-            accumulateMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
-            onTransferMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
-            storageUtilisationBytes: codec$1.u64,
-            storageUtilisationCount: codec$1.u32,
-            gratisStorage: ignoreValueWithDefault(tryAsU64(0)),
-            created: ignoreValueWithDefault(tryAsTimeSlot(0)),
-            lastAccumulation: ignoreValueWithDefault(tryAsTimeSlot(0)),
-            parentService: ignoreValueWithDefault(tryAsServiceId(0)),
-        });
+    static Codec = codec$1.Class(ServiceAccountInfo, {
+        codeHash: codec$1.bytes(HASH_SIZE).asOpaque(),
+        balance: codec$1.u64,
+        accumulateMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
+        onTransferMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
+        storageUtilisationBytes: codec$1.u64,
+        gratisStorage: codec$1.u64,
+        storageUtilisationCount: codec$1.u32,
+        created: codec$1.u32.convert((x) => x, tryAsTimeSlot),
+        lastAccumulation: codec$1.u32.convert((x) => x, tryAsTimeSlot),
+        parentService: codec$1.u32.convert((x) => x, tryAsServiceId),
+    });
     static create(a) {
         return new ServiceAccountInfo(a.codeHash, a.balance, a.accumulateMinGas, a.onTransferMinGas, a.storageUtilisationBytes, a.gratisStorage, a.storageUtilisationCount, a.created, a.lastAccumulation, a.parentService);
     }
@@ -9715,7 +9704,7 @@ function legacyServiceNested(serviceId, hash) {
 /** Serialization for particular state entries. */
 var serialize;
 (function (serialize) {
-    /** C(1): https://graypaper.fluffylabs.dev/#/85129da/38a20138a201?v=0.6.3 */
+    /** C(1): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b15013b1501?v=0.6.7 */
     serialize.authPools = {
         key: stateKeys.index(StateKeyIdx.Alpha),
         Codec: codecPerCore(codecKnownSizeArray(codec$1.bytes(HASH_SIZE).asOpaque(), {
@@ -9725,7 +9714,7 @@ var serialize;
         })),
         extract: (s) => s.authPools,
     };
-    /** C(2): https://graypaper.fluffylabs.dev/#/85129da/38be0138be01?v=0.6.3 */
+    /** C(2): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b31013b3101?v=0.6.7 */
     serialize.authQueues = {
         key: stateKeys.index(StateKeyIdx.Phi),
         Codec: codecPerCore(codecFixedSizeArray(codec$1.bytes(HASH_SIZE).asOpaque(), AUTHORIZATION_QUEUE_SIZE)),
@@ -9733,7 +9722,6 @@ var serialize;
     };
     /**
      * C(3): Recent blocks with compatibility
-     *  https://graypaper.fluffylabs.dev/#/85129da/38cb0138cb01?v=0.6.3
      *  https://graypaper.fluffylabs.dev/#/7e6ff6a/3b3e013b3e01?v=0.6.7
      */
     serialize.recentBlocks = {
@@ -9741,7 +9729,7 @@ var serialize;
         Codec: RecentBlocksHistory.Codec,
         extract: (s) => s.recentBlocks,
     };
-    /** C(4): https://graypaper.fluffylabs.dev/#/85129da/38e60138e601?v=0.6.3 */
+    /** C(4): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b63013b6301?v=0.6.7 */
     serialize.safrole = {
         key: stateKeys.index(StateKeyIdx.Gamma),
         Codec: SafroleData.Codec,
@@ -9752,55 +9740,55 @@ var serialize;
             ticketsAccumulator: s.ticketsAccumulator,
         }),
     };
-    /** C(5): https://graypaper.fluffylabs.dev/#/85129da/383d02383d02?v=0.6.3 */
+    /** C(5): https://graypaper.fluffylabs.dev/#/7e6ff6a/3bba013bba01?v=0.6.7 */
     serialize.disputesRecords = {
         key: stateKeys.index(StateKeyIdx.Psi),
         Codec: DisputesRecords.Codec,
         extract: (s) => s.disputesRecords,
     };
-    /** C(6): https://graypaper.fluffylabs.dev/#/85129da/387602387602?v=0.6.3 */
+    /** C(6): https://graypaper.fluffylabs.dev/#/7e6ff6a/3bf3013bf301?v=0.6.7 */
     serialize.entropy = {
         key: stateKeys.index(StateKeyIdx.Eta),
         Codec: codecFixedSizeArray(codec$1.bytes(HASH_SIZE).asOpaque(), ENTROPY_ENTRIES),
         extract: (s) => s.entropy,
     };
-    /** C(7): https://graypaper.fluffylabs.dev/#/85129da/388302388302?v=0.6.3 */
+    /** C(7): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b00023b0002?v=0.6.7 */
     serialize.designatedValidators = {
         key: stateKeys.index(StateKeyIdx.Iota),
         Codec: codecPerValidator(ValidatorData.Codec),
         extract: (s) => s.designatedValidatorData,
     };
-    /** C(8): https://graypaper.fluffylabs.dev/#/85129da/389002389002?v=0.6.3 */
+    /** C(8): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b0d023b0d02?v=0.6.7 */
     serialize.currentValidators = {
         key: stateKeys.index(StateKeyIdx.Kappa),
         Codec: codecPerValidator(ValidatorData.Codec),
         extract: (s) => s.currentValidatorData,
     };
-    /** C(9): https://graypaper.fluffylabs.dev/#/85129da/389d02389d02?v=0.6.3 */
+    /** C(9): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b1a023b1a02?v=0.6.7 */
     serialize.previousValidators = {
         key: stateKeys.index(StateKeyIdx.Lambda),
         Codec: codecPerValidator(ValidatorData.Codec),
         extract: (s) => s.previousValidatorData,
     };
-    /** C(10): https://graypaper.fluffylabs.dev/#/85129da/38aa0238aa02?v=0.6.3 */
+    /** C(10): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b27023b2702?v=0.6.7 */
     serialize.availabilityAssignment = {
         key: stateKeys.index(StateKeyIdx.Rho),
         Codec: codecPerCore(codec$1.optional(AvailabilityAssignment.Codec)),
         extract: (s) => s.availabilityAssignment,
     };
-    /** C(11): https://graypaper.fluffylabs.dev/#/85129da/38c10238c102?v=0.6.3 */
+    /** C(11): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b3e023b3e02?v=0.6.7 */
     serialize.timeslot = {
         key: stateKeys.index(StateKeyIdx.Tau),
         Codec: codec$1.u32.asOpaque(),
         extract: (s) => s.timeslot,
     };
-    /** C(12): https://graypaper.fluffylabs.dev/#/85129da/38cf0238cf02?v=0.6.3 */
+    /** C(12): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b4c023b4c02?v=0.6.7 */
     serialize.privilegedServices = {
         key: stateKeys.index(StateKeyIdx.Chi),
         Codec: PrivilegedServices.Codec,
         extract: (s) => s.privilegedServices,
     };
-    /** C(13): https://graypaper.fluffylabs.dev/#/85129da/38e10238e102?v=0.6.3 */
+    /** C(13): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b5e023b5e02?v=0.6.7 */
     serialize.statistics = {
         key: stateKeys.index(StateKeyIdx.Pi),
         Codec: StatisticsData.Codec,
@@ -9812,7 +9800,7 @@ var serialize;
         Codec: codecPerEpochBlock(readonlyArray(codec$1.sequenceVarLen(NotYetAccumulatedReport.Codec))),
         extract: (s) => s.accumulationQueue,
     };
-    /** C(15): https://graypaper.fluffylabs.dev/#/85129da/381903381903?v=0.6.3 */
+    /** C(15): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b96023b9602?v=0.6.7 */
     serialize.recentlyAccumulated = {
         key: stateKeys.index(StateKeyIdx.Xi),
         Codec: codecPerEpochBlock(codec$1.sequenceVarLen(codec$1.bytes(HASH_SIZE).asOpaque()).convert((x) => Array.from(x), (x) => HashSet.from(x))),
@@ -12842,11 +12830,12 @@ var index$a = /*#__PURE__*/Object.freeze({
 
 var Level;
 (function (Level) {
-    Level[Level["TRACE"] = 1] = "TRACE";
-    Level[Level["LOG"] = 2] = "LOG";
-    Level[Level["INFO"] = 3] = "INFO";
-    Level[Level["WARN"] = 4] = "WARN";
-    Level[Level["ERROR"] = 5] = "ERROR";
+    Level[Level["INSANE"] = 1] = "INSANE";
+    Level[Level["TRACE"] = 2] = "TRACE";
+    Level[Level["LOG"] = 3] = "LOG";
+    Level[Level["INFO"] = 4] = "INFO";
+    Level[Level["WARN"] = 5] = "WARN";
+    Level[Level["ERROR"] = 6] = "ERROR";
 })(Level || (Level = {}));
 /**
  * Find a configured log level for given module.
@@ -12915,7 +12904,7 @@ function parseLoggerOptions(input, defaultLevel, workingDir) {
 function parseLevel(lvl) {
     const typedLvl = lvl === "debug" ? "LOG" : lvl.toUpperCase();
     if (Level[typedLvl] === undefined) {
-        throw new Error(`Unknown logging level: "${lvl}". Use one of "trace", "debug", "log","info", "warn", "error"`);
+        throw new Error(`Unknown logging level: "${lvl}". Use one of "trace", "debug", "log","info", "warn", "error" or "insane"`);
     }
     return Level[typedLvl];
 }
@@ -12931,6 +12920,10 @@ class ConsoleTransport {
      * `minimalLevel`.
      */
     static create(minimalLevel, options) {
+        // optimised transports if we don't care about trace/log levels
+        if (minimalLevel === Level.INSANE) {
+            return new InsaneConsoleLogger(options);
+        }
         // optimised transports if we don't care about trace/log levels
         if (minimalLevel === Level.TRACE) {
             return new TraceConsoleTransport(options);
@@ -12946,30 +12939,32 @@ class ConsoleTransport {
     constructor(options) {
         this.options = options;
     }
-    trace(_moduleName, _fileName, _val) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    log(_moduleName, _fileName, _val) {
+    trace(_moduleName, _val) {
         /* no-op */
     }
-    info(_moduleName, _fileName, _val) {
+    log(_moduleName, _val) {
         /* no-op */
     }
-    warn(moduleName, fileName, val) {
-        this.push(Level.WARN, moduleName, fileName, val);
+    info(_moduleName, _val) {
+        /* no-op */
+    }
+    warn(moduleName, val) {
+        this.push(Level.WARN, moduleName, val);
     }
-    error(moduleName, fileName, val) {
-        this.push(Level.ERROR, moduleName, fileName, val);
+    error(moduleName, val) {
+        this.push(Level.ERROR, moduleName, val);
     }
-    push(level, moduleName, fileName, val) {
-        const shortName = fileName.replace(this.options.workingDir, "");
+    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}\n\t@ ${shortName}`;
+        const msg = `${lvlText} [${shortModule}] ${val}`;
         if (level === Level.WARN) {
             console.warn(msg);
         }
@@ -12981,46 +12976,72 @@ class ConsoleTransport {
         }
     }
 }
+/**
+ * Insane version of console logger - supports insane level.
+ */
+class InsaneConsoleLogger extends ConsoleTransport {
+    insane(moduleName, val) {
+        this.push(Level.INSANE, moduleName, val);
+    }
+    trace(moduleName, val) {
+        this.push(Level.TRACE, moduleName, val);
+    }
+    log(moduleName, val) {
+        this.push(Level.LOG, moduleName, val);
+    }
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
+    }
+}
 /**
  * A basic version of console logger - printing everything.
  */
 class TraceConsoleTransport extends ConsoleTransport {
-    trace(moduleName, fileName, val) {
-        this.push(Level.TRACE, moduleName, fileName, val);
+    insane(_moduleName, _val) {
+        /* no-op */
+    }
+    trace(moduleName, val) {
+        this.push(Level.TRACE, moduleName, val);
     }
-    log(moduleName, fileName, val) {
-        this.push(Level.LOG, moduleName, fileName, val);
+    log(moduleName, val) {
+        this.push(Level.LOG, moduleName, val);
     }
-    info(moduleName, fileName, val) {
-        this.push(Level.INFO, moduleName, fileName, val);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 /**
  * An optimized version of the logger - completely ignores `TRACE` level calls.
  */
 class LogConsoleTransport extends ConsoleTransport {
-    trace(_moduleName, _fileName, _val) {
+    insane(_moduleName, _val) {
         /* no-op */
     }
-    log(moduleName, fileName, val) {
-        this.push(Level.LOG, moduleName, fileName, val);
+    trace(_moduleName, _val) {
+        /* no-op */
+    }
+    log(moduleName, val) {
+        this.push(Level.LOG, moduleName, val);
     }
-    info(moduleName, fileName, val) {
-        this.push(Level.INFO, moduleName, fileName, val);
+    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 {
-    trace(_moduleName, _fileName, _val) {
+    insane(_moduleName, _val) {
+        /* no-op */
+    }
+    trace(_moduleName, _val) {
         /* no-op */
     }
-    log(_moduleName, _fileName, _val) {
+    log(_moduleName, _val) {
         /* no-op */
     }
-    info(moduleName, fileName, val) {
-        this.push(Level.INFO, moduleName, fileName, val);
+    info(moduleName, val) {
+        this.push(Level.INFO, moduleName, val);
     }
 }
 
@@ -13093,25 +13114,29 @@ class Logger {
         this.fileName = fileName;
         this.config = config;
     }
+    /** Log a message with `INSANE` level. */
+    insane(val) {
+        this.config.transport.insane(this.moduleName, val);
+    }
     /** Log a message with `TRACE` level. */
     trace(val) {
-        this.config.transport.trace(this.moduleName, this.fileName, val);
+        this.config.transport.trace(this.moduleName, val);
     }
     /** Log a message with `DEBUG`/`LOG` level. */
     log(val) {
-        this.config.transport.log(this.moduleName, this.fileName, val);
+        this.config.transport.log(this.moduleName, val);
     }
     /** Log a message with `INFO` level. */
     info(val) {
-        this.config.transport.info(this.moduleName, this.fileName, val);
+        this.config.transport.info(this.moduleName, val);
     }
     /** Log a message with `WARN` level. */
     warn(val) {
-        this.config.transport.warn(this.moduleName, this.fileName, val);
+        this.config.transport.warn(this.moduleName, val);
     }
     /** Log a message with `ERROR` level. */
     error(val) {
-        this.config.transport.error(this.moduleName, this.fileName, val);
+        this.config.transport.error(this.moduleName, val);
     }
 }
 
@@ -14667,6 +14692,7 @@ var AccessType;
     AccessType[AccessType["READ"] = 0] = "READ";
     AccessType[AccessType["WRITE"] = 1] = "WRITE";
 })(AccessType || (AccessType = {}));
+const logger$3 = Logger.new(undefined, "pvm:mem");
 class Memory {
     sbrkIndex;
     virtualSbrkIndex;
@@ -14697,6 +14723,7 @@ class Memory {
         if (bytes.length === 0) {
             return Result$1.ok(OK);
         }
+        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);
@@ -14763,6 +14790,7 @@ class Memory {
             currentPosition += bytesToRead;
             bytesLeft -= bytesToRead;
         }
+        logger$3.insane(`MEM[${startAddress}] => ${BytesBlob.blobFrom(result)}`);
         return Result$1.ok(OK);
     }
     sbrk(length) {
@@ -16492,12 +16520,15 @@ class JumpTable {
     static empty() {
         return new JumpTable(0, new Uint8Array());
     }
+    getSize() {
+        return this.indices.length;
+    }
     copyFrom(jt) {
         this.indices = jt.indices;
     }
 }
 
-const logger$1 = Logger.new(undefined, "pvm-interpreter");
+const logger$2 = Logger.new(undefined, "pvm-interpreter");
 var ProgramDecoderError;
 (function (ProgramDecoderError) {
     ProgramDecoderError[ProgramDecoderError["InvalidProgramError"] = 0] = "InvalidProgramError";
@@ -16547,12 +16578,13 @@ class ProgramDecoder {
             return Result$1.ok(new ProgramDecoder(program));
         }
         catch (e) {
-            logger$1.error(`Invalid program: ${e}`);
+            logger$2.error(`Invalid program: ${e}`);
             return Result$1.error(ProgramDecoderError.InvalidProgramError);
         }
     }
 }
 
+const logger$1 = Logger.new(undefined, "pvm");
 class Interpreter {
     useSbrkGas;
     registers = new Registers();
@@ -16670,6 +16702,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]}`);
         if (!isValidInstruction) {
             this.instructionResult.status = Result.PANIC;
         }
@@ -16741,6 +16774,7 @@ class Interpreter {
                     this.status = Status.HOST;
                     break;
             }
+            logger$1.insane(`[PC: ${this.pc}] Status: ${Result[this.instructionResult.status]}`);
             return this.status;
         }
         this.pc = this.instructionResult.nextPc;
@@ -17163,19 +17197,28 @@ class HostCalls {
             const gasBefore = gas.get();
             const gasCost = typeof hostCall.gasCost === "number" ? hostCall.gasCost : hostCall.gasCost(regs);
             const underflow = gas.sub(gasCost);
+            const pcLog = `[PC: ${pvmInstance.getPC()}]`;
             if (underflow) {
-                this.hostCalls.traceHostCall("OOG", index, hostCall, regs, gas.get());
+                this.hostCalls.traceHostCall(`${pcLog} OOG`, index, hostCall, regs, gas.get());
                 return ReturnValue.fromStatus(pvmInstance.getGasConsumed(), Status.OOG);
             }
-            this.hostCalls.traceHostCall("Invoking", index, hostCall, regs, gasBefore);
+            this.hostCalls.traceHostCall(`${pcLog} Invoking`, index, hostCall, regs, gasBefore);
             const result = await hostCall.execute(gas, regs, memory);
-            this.hostCalls.traceHostCall(result === undefined ? "Result" : `Status(${PvmExecution[result]})`, index, hostCall, regs, gas.get());
+            this.hostCalls.traceHostCall(result === undefined ? `${pcLog} Result` : `${pcLog} Status(${PvmExecution[result]})`, index, hostCall, regs, gas.get());
             if (result === PvmExecution.Halt) {
                 status = Status.HALT;
                 return this.getReturnValue(status, pvmInstance);
             }
-            pvmInstance.runProgram();
-            status = pvmInstance.getStatus();
+            if (result === PvmExecution.Panic) {
+                status = Status.PANIC;
+                return this.getReturnValue(status, pvmInstance);
+            }
+            if (result === undefined) {
+                pvmInstance.runProgram();
+                status = pvmInstance.getStatus();
+                continue;
+            }
+            assertNever(result);
         }
     }
     async runProgram(rawProgram, initialPc, initialGas, maybeRegisters, maybeMemory) {
@@ -17245,7 +17288,7 @@ class HostCallsManager {
             return `r${idx}=${value} (0x${value.toString(16)})`;
         })
             .join(", ");
-        logger.trace(`[${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.0.1-7996e00",
+  "version": "0.0.1-8a792cb",
   "main": "index.js",
   "author": "Fluffy Labs",
   "license": "MPL-2.0"