@typeberry/lib 0.5.2-9afefa7 → 0.5.2-ab56433

package/packages/core/pvm-host-calls/host-call-memory.d.ts

@@ -1,8 +1,10 @@
 import { type U64 } from "#@typeberry/numbers";
 import type { IMemory, PageFault } from "#@typeberry/pvm-interface";
 import { OK, Result } from "#@typeberry/utils";
+import type { IoTracker } from "./ecalli-io-tracker.js";
 export declare class HostCallMemory {
     private readonly memory;
+    ioTracker: IoTracker | null;
     constructor(memory: IMemory);
     /**
      * Save some bytes into memory under given address.

package/packages/core/pvm-host-calls/host-call-memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host-call-memory.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-call-memory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE9C,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,OAAO;IAE5C;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC;IAYpE;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,GAAG,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC;CAWrE"}
+{"version":3,"file":"host-call-memory.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-call-memory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,qBAAa,cAAc;IAIb,OAAO,CAAC,QAAQ,CAAC,MAAM;IAF5B,SAAS,EAAE,SAAS,GAAG,IAAI,CAAQ;gBAEb,MAAM,EAAE,OAAO;IAE5C;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC;IAgBpE;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,GAAG,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC;CAerE"}

package/packages/core/pvm-host-calls/host-call-memory.js

@@ -2,6 +2,8 @@ import { tryAsU32 } from "#@typeberry/numbers";
 import { OK, Result } from "#@typeberry/utils";
 export class HostCallMemory {
     memory;
+    // Track successful memory reads and writes.
+    ioTracker = null;
     constructor(memory) {
         this.memory = memory;
     }
@@ -19,7 +21,11 @@ export class HostCallMemory {
         //
         // https://graypaper.fluffylabs.dev/#/ab2cdbd/25ed0025ed00?v=0.7.2
         const address = tryAsU32(Number(regAddress & 0xffffffffn));
-        return this.memory.store(address, bytes);
+        const result = this.memory.store(address, bytes);
+        if (result.isOk && this.ioTracker !== null) {
+            this.ioTracker.memWrite(address, bytes);
+        }
+        return result;
     }
     /**
      * Read some bytes from memory under given address.
@@ -35,6 +41,10 @@ export class HostCallMemory {
         //
         // NOTE we are taking the the lower U32 part of the register, hence it's safe.
         const address = tryAsU32(Number(regAddress & 0xffffffffn));
-        return this.memory.read(address, output);
+        const result = this.memory.read(address, output);
+        if (result.isOk && this.ioTracker !== null) {
+            this.ioTracker.memRead(address, output);
+        }
+        return result;
     }
 }

package/packages/core/pvm-host-calls/host-call-registers.d.ts

@@ -1,7 +1,10 @@
 import { type U64 } from "#@typeberry/numbers";
+import type { IoTracker } from "./ecalli-io-tracker.js";
 export declare class HostCallRegisters {
     private readonly bytes;
+    private readonly raw;
     private readonly registers;
+    ioTracker: IoTracker | null;
     constructor(bytes: Uint8Array);
     /** Get U64 register value. */
     get(registerIndex: number): U64;
@@ -9,5 +12,8 @@ export declare class HostCallRegisters {
     set(registerIndex: number, value: U64): void;
     /** Get all registers encoded into little-endian bytes. */
     getEncoded(): Uint8Array;
+    /** Ovewrite all encoded registers. */
+    setEncoded(bytes: Uint8Array): void;
+    toString(): string;
 }
 //# sourceMappingURL=host-call-registers.d.ts.map

package/packages/core/pvm-host-calls/host-call-registers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host-call-registers.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-call-registers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAGxD,qBAAa,iBAAiB;IAGhB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFlC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;gBAER,KAAK,EAAE,UAAU;IAI9C,8BAA8B;IAC9B,GAAG,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG;IAI/B,8BAA8B;IAC9B,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAIrC,0DAA0D;IAC1D,UAAU,IAAI,UAAU;CAGzB"}
+{"version":3,"file":"host-call-registers.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-call-registers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAGxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,qBAAa,iBAAiB;IAMhB,OAAO,CAAC,QAAQ,CAAC,KAAK;IALlC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IAE9B,SAAS,EAAE,SAAS,GAAG,IAAI,CAAQ;gBAEb,KAAK,EAAE,UAAU;IAK9C,8BAA8B;IAC9B,GAAG,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG;IAI/B,8BAA8B;IAC9B,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAOrC,0DAA0D;IAC1D,UAAU,IAAI,UAAU;IAIxB,sCAAsC;IACtC,UAAU,CAAC,KAAK,EAAE,UAAU;IAK5B,QAAQ;CAWT"}

package/packages/core/pvm-host-calls/host-call-registers.js

@@ -1,10 +1,15 @@
 import { tryAsU64 } from "#@typeberry/numbers";
 import { REGISTER_BYTE_SIZE } from "#@typeberry/pvm-interface";
+import { check } from "#@typeberry/utils";
 export class HostCallRegisters {
     bytes;
+    raw;
     registers;
+    // Track register modifications.
+    ioTracker = null;
     constructor(bytes) {
         this.bytes = bytes;
+        this.raw = bytes;
         this.registers = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
     }
     /** Get U64 register value. */
@@ -14,9 +19,28 @@ export class HostCallRegisters {
     /** Set U64 register value. */
     set(registerIndex, value) {
         this.registers.setBigUint64(registerIndex * REGISTER_BYTE_SIZE, value, true);
+        if (this.ioTracker !== null) {
+            this.ioTracker.setReg(registerIndex, value);
+        }
     }
     /** Get all registers encoded into little-endian bytes. */
     getEncoded() {
         return this.bytes;
     }
+    /** Ovewrite all encoded registers. */
+    setEncoded(bytes) {
+        check `${bytes.length === this.raw.length} Invalid registers array: ${bytes.length} vs ${this.raw.length}`;
+        this.raw.set(bytes, 0);
+    }
+    toString() {
+        const elementCount = this.raw.byteLength / REGISTER_BYTE_SIZE;
+        const values = new BigUint64Array(this.raw.buffer, this.raw.byteOffset, elementCount);
+        const entries = [];
+        for (const [idx, value] of values.entries()) {
+            if (value !== 0n) {
+                entries.push(`r${idx.toString().padStart(2, "0")}=${value.toString(16)}`);
+            }
+        }
+        return entries.join(" ");
+    }
 }

package/packages/core/pvm-host-calls/host-calls-executor.d.ts

@@ -0,0 +1,31 @@
+import { type Gas, Status } from "#@typeberry/pvm-interface";
+import { EcalliTraceLogger } from "./ecalli-trace-logger.js";
+import type { HostCalls } from "./host-calls.js";
+import type { PvmInstanceManager } from "./pvm-instance-manager.js";
+declare class ReturnValue {
+    consumedGas: Gas;
+    status: Status | null;
+    memorySlice: Uint8Array | null;
+    private constructor();
+    static fromStatus(consumedGas: Gas, status: Status): ReturnValue;
+    static fromMemorySlice(consumedGas: Gas, memorySlice: Uint8Array): ReturnValue;
+    hasMemorySlice(): this is this & {
+        status: null;
+        memorySlice: Uint8Array;
+    };
+    hasStatus(): this is this & {
+        status: Status;
+        memorySlice: null;
+    };
+}
+export declare class HostCallsExecutor {
+    private pvmInstanceManager;
+    private hostCalls;
+    private ioTracer;
+    constructor(pvmInstanceManager: PvmInstanceManager, hostCalls: HostCalls, ioTracer?: EcalliTraceLogger | null);
+    private getReturnValue;
+    private execute;
+    runProgram(program: Uint8Array, args: Uint8Array, initialPc: number, initialGas: Gas): Promise<ReturnValue>;
+}
+export {};
+//# sourceMappingURL=host-calls-executor.d.ts.map

package/packages/core/pvm-host-calls/host-calls-executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"host-calls-executor.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-calls-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAwB,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAI7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,cAAM,WAAW;IAEN,WAAW,EAAE,GAAG;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI;IACrB,WAAW,EAAE,UAAU,GAAG,IAAI;IAHvC,OAAO;IAWP,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;IAIlD,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU;IAIhE,cAAc,IAAI,IAAI,IAAI,IAAI,GAAG;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,WAAW,EAAE,UAAU,CAAA;KAAE;IAI1E,SAAS,IAAI,IAAI,IAAI,IAAI,GAAG;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,IAAI,CAAA;KAAE;CAGlE;AAED,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ;gBAFR,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,EAAE,SAAS,EACpB,QAAQ,GAAE,iBAAiB,GAAG,IAAiC;IAGzE,OAAO,CAAC,cAAc;YAoCR,OAAO;IAiFf,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;CAWlH"}

package/packages/core/pvm-host-calls/host-calls-executor.js

@@ -0,0 +1,137 @@
+import { Status } from "#@typeberry/pvm-interface";
+import { assertNever, check, safeAllocUint8Array } from "#@typeberry/utils";
+import { EcalliTraceLogger } from "./ecalli-trace-logger.js";
+import { PvmExecution, tryAsHostCallIndex } from "./host-call-handler.js";
+import { HostCallMemory } from "./host-call-memory.js";
+import { HostCallRegisters } from "./host-call-registers.js";
+class ReturnValue {
+    consumedGas;
+    status;
+    memorySlice;
+    constructor(consumedGas, status, memorySlice) {
+        this.consumedGas = consumedGas;
+        this.status = status;
+        this.memorySlice = memorySlice;
+        check `
+      ${(status === null && memorySlice !== null) || (status !== null && memorySlice === null)}
+      'status' and 'memorySlice' must not both be null or both be non-null — exactly one must be provided
+    `;
+    }
+    static fromStatus(consumedGas, status) {
+        return new ReturnValue(consumedGas, status, null);
+    }
+    static fromMemorySlice(consumedGas, memorySlice) {
+        return new ReturnValue(consumedGas, null, memorySlice);
+    }
+    hasMemorySlice() {
+        return this.memorySlice instanceof Uint8Array && this.status === null;
+    }
+    hasStatus() {
+        return !this.hasMemorySlice();
+    }
+}
+export class HostCallsExecutor {
+    pvmInstanceManager;
+    hostCalls;
+    ioTracer;
+    constructor(pvmInstanceManager, hostCalls, ioTracer = EcalliTraceLogger.create()) {
+        this.pvmInstanceManager = pvmInstanceManager;
+        this.hostCalls = hostCalls;
+        this.ioTracer = ioTracer;
+    }
+    getReturnValue(status, pvmInstance, registers, memory) {
+        const gasConsumed = pvmInstance.gas.used();
+        const pc = pvmInstance.getPC();
+        const gas = pvmInstance.gas.get();
+        if (status === Status.OOG) {
+            this.ioTracer?.logOog(pc, gas, registers);
+            return ReturnValue.fromStatus(gasConsumed, status);
+        }
+        if (status === Status.HALT) {
+            this.ioTracer?.logHalt(pc, gas, registers);
+            const address = registers.get(7);
+            const length = Number(registers.get(8) & 0xffffffffn);
+            const result = safeAllocUint8Array(length);
+            const loadResult = memory.loadInto(result, address);
+            if (loadResult.isError) {
+                return ReturnValue.fromMemorySlice(gasConsumed, new Uint8Array());
+            }
+            return ReturnValue.fromMemorySlice(gasConsumed, result);
+        }
+        this.ioTracer?.logPanic(pvmInstance.getExitParam() ?? 0, pc, gas, registers);
+        return ReturnValue.fromStatus(gasConsumed, Status.PANIC);
+    }
+    async execute(pvmInstance) {
+        const ioTracker = this.ioTracer?.tracker() ?? null;
+        const registers = new HostCallRegisters(pvmInstance.registers.getAllEncoded());
+        registers.ioTracker = ioTracker;
+        const memory = new HostCallMemory(pvmInstance.memory);
+        memory.ioTracker = ioTracker;
+        const gas = pvmInstance.gas;
+        // log start of execution (note the PVM initialisation should be logged already)
+        this.ioTracer?.logStart(pvmInstance.getPC(), pvmInstance.gas.get(), registers);
+        for (;;) {
+            // execute program as much as we can
+            pvmInstance.runProgram();
+            // and update the PVM state
+            registers.setEncoded(pvmInstance.registers.getAllEncoded());
+            const status = pvmInstance.getStatus();
+            const pc = pvmInstance.getPC();
+            const exitParam = pvmInstance.getExitParam() ?? -1;
+            if (status !== Status.HOST) {
+                return this.getReturnValue(status, pvmInstance, registers, memory);
+            }
+            // get the PVM state now
+            check `
+        ${exitParam !== -1}
+        "We know that the exit param is not null, because the status is 'Status.HOST'
+      `;
+            const hostCallIndex = tryAsHostCallIndex(exitParam);
+            // retrieve the host call
+            const hostCall = this.hostCalls.get(hostCallIndex);
+            const basicGasCost = typeof hostCall.basicGasCost === "number" ? hostCall.basicGasCost : hostCall.basicGasCost(registers);
+            // calculate gas
+            const gasBefore = gas.get();
+            const underflow = gas.sub(basicGasCost);
+            const pcLog = `[PC: ${pc}]`;
+            if (underflow) {
+                const gasAfterBasicGas = gas.get();
+                this.hostCalls.traceHostCall(`${pcLog} OOG`, hostCallIndex, hostCall, registers, gasAfterBasicGas);
+                this.ioTracer?.logSetGas(gasAfterBasicGas);
+                return this.getReturnValue(Status.OOG, pvmInstance, registers, memory);
+            }
+            this.ioTracer?.logEcalli(hostCallIndex, pc, gasBefore, registers);
+            this.hostCalls.traceHostCall(`${pcLog} Invoking`, hostCallIndex, hostCall, registers, gasBefore);
+            ioTracker?.clear();
+            const result = await hostCall.execute(gas, registers, memory);
+            const gasAfter = gas.get();
+            this.ioTracer?.logHostActions(ioTracker, gasBefore, gasAfter);
+            this.hostCalls.traceHostCall(result === undefined ? `${pcLog} Result` : `${pcLog} Status(${PvmExecution[result]})`, hostCallIndex, hostCall, registers, gasAfter);
+            pvmInstance.registers.setAllEncoded(registers.getEncoded());
+            if (result === PvmExecution.Halt) {
+                return this.getReturnValue(Status.HALT, pvmInstance, registers, memory);
+            }
+            if (result === PvmExecution.Panic) {
+                return this.getReturnValue(Status.PANIC, pvmInstance, registers, memory);
+            }
+            if (result === PvmExecution.OOG) {
+                return this.getReturnValue(Status.OOG, pvmInstance, registers, memory);
+            }
+            if (result === undefined) {
+                continue;
+            }
+            assertNever(result);
+        }
+    }
+    async runProgram(program, args, initialPc, initialGas) {
+        const pvmInstance = await this.pvmInstanceManager.getInstance();
+        pvmInstance.resetJam(program, args, initialPc, initialGas);
+        try {
+            this.ioTracer?.logProgram(program, args);
+            return await this.execute(pvmInstance);
+        }
+        finally {
+            this.pvmInstanceManager.releaseInstance(pvmInstance);
+        }
+    }
+}

package/packages/core/pvm-host-calls/host-calls.d.ts

@@ -1,29 +1,23 @@
-import { type Gas, Status } from "#@typeberry/pvm-interface";
-import type { HostCallsManager } from "./host-calls-manager.js";
-import type { InterpreterInstanceManager } from "./interpreter-instance-manager.js";
-declare class ReturnValue {
-    consumedGas: Gas;
-    status: Status | null;
-    memorySlice: Uint8Array | null;
-    private constructor();
-    static fromStatus(consumedGas: Gas, status: Status): ReturnValue;
-    static fromMemorySlice(consumedGas: Gas, memorySlice: Uint8Array): ReturnValue;
-    hasMemorySlice(): this is this & {
-        status: null;
-        memorySlice: Uint8Array;
-    };
-    hasStatus(): this is this & {
-        status: Status;
-        memorySlice: null;
-    };
-}
+import { type Gas } from "#@typeberry/pvm-interface";
+import { type HostCallHandler, type HostCallIndex, type PvmExecution } from "./host-call-handler.js";
+import type { HostCallRegisters } from "./host-call-registers.js";
+/** Container for all available host calls. */
 export declare class HostCalls {
-    private pvmInstanceManager;
-    private hostCalls;
-    constructor(pvmInstanceManager: InterpreterInstanceManager, hostCalls: HostCallsManager);
-    private getReturnValue;
-    private execute;
-    runProgram(program: Uint8Array, args: Uint8Array, initialPc: number, initialGas: Gas): Promise<ReturnValue>;
+    private readonly hostCalls;
+    private readonly missing;
+    constructor({ missing, handlers, }: {
+        missing: HostCallHandler;
+        handlers?: HostCallHandler[];
+    });
+    /** Get a host call by index. */
+    get(hostCallIndex: HostCallIndex): HostCallHandler;
+    traceHostCall(context: string, hostCallIndex: HostCallIndex, hostCallHandler: HostCallHandler, registers: HostCallRegisters, gas: Gas): void;
+}
+export declare class NoopMissing implements HostCallHandler {
+    index: number & import("@typeberry/numbers").WithBytesRepresentation<4> & import("@typeberry/utils").WithOpaque<"HostCallIndex[U32]">;
+    basicGasCost: number & import("@typeberry/numbers").WithBytesRepresentation<4> & import("@typeberry/utils").WithOpaque<"SmallGas[U32]">;
+    currentServiceId: import("@typeberry/numbers").U32;
+    tracedRegisters: never[];
+    execute(): Promise<undefined | PvmExecution>;
 }
-export {};
 //# sourceMappingURL=host-calls.d.ts.map

package/packages/core/pvm-host-calls/host-calls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host-calls.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-calls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAwB,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAKlF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAEpF,cAAM,WAAW;IAEN,WAAW,EAAE,GAAG;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI;IACrB,WAAW,EAAE,UAAU,GAAG,IAAI;IAHvC,OAAO;IAWP,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;IAIlD,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU;IAIhE,cAAc,IAAI,IAAI,IAAI,IAAI,GAAG;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,WAAW,EAAE,UAAU,CAAA;KAAE;IAI1E,SAAS,IAAI,IAAI,IAAI,IAAI,GAAG;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,IAAI,CAAA;KAAE;CAGlE;AACD,qBAAa,SAAS;IAElB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,SAAS;gBADT,kBAAkB,EAAE,0BAA0B,EAC9C,SAAS,EAAE,gBAAgB;IAGrC,OAAO,CAAC,cAAc;YA2BR,OAAO;IAiEf,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;CASlH"}
+{"version":3,"file":"host-calls.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-calls.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,GAAG,EAAiB,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,YAAY,EAElB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAIlE,8CAA8C;AAC9C,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6C;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAEb,EACV,OAAO,EACP,QAAa,GACd,EAAE;QACD,OAAO,EAAE,eAAe,CAAC;QACzB,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC;KAC9B;IASD,gCAAgC;IAChC,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,eAAe;IAIlD,aAAa,CACX,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,iBAAiB,EAC5B,GAAG,EAAE,GAAG;CAkBX;AAED,qBAAa,WAAY,YAAW,eAAe;IACjD,KAAK,iIAAmC;IACxC,YAAY,4HAAoB;IAChC,gBAAgB,mCAAe;IAC/B,eAAe,UAAM;IAEf,OAAO,IAAI,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;CAGnD"}

package/packages/core/pvm-host-calls/host-calls.js

@@ -1,119 +1,47 @@
-import { Status } from "#@typeberry/pvm-interface";
-import { assertNever, check, safeAllocUint8Array } from "#@typeberry/utils";
-import { PvmExecution, tryAsHostCallIndex } from "./host-call-handler.js";
-import { HostCallMemory } from "./host-call-memory.js";
-import { HostCallRegisters } from "./host-call-registers.js";
-class ReturnValue {
-    consumedGas;
-    status;
-    memorySlice;
-    constructor(consumedGas, status, memorySlice) {
-        this.consumedGas = consumedGas;
-        this.status = status;
-        this.memorySlice = memorySlice;
-        check `
-      ${(status === null && memorySlice !== null) || (status !== null && memorySlice === null)}
-      'status' and 'memorySlice' must not both be null or both be non-null — exactly one must be provided
-    `;
-    }
-    static fromStatus(consumedGas, status) {
-        return new ReturnValue(consumedGas, status, null);
-    }
-    static fromMemorySlice(consumedGas, memorySlice) {
-        return new ReturnValue(consumedGas, null, memorySlice);
-    }
-    hasMemorySlice() {
-        return this.memorySlice instanceof Uint8Array && this.status === null;
-    }
-    hasStatus() {
-        return !this.hasMemorySlice();
-    }
-}
+import { Level, Logger } from "#@typeberry/logger";
+import { tryAsU32 } from "#@typeberry/numbers";
+import { tryAsSmallGas } from "#@typeberry/pvm-interface";
+import { check } from "#@typeberry/utils";
+import { tryAsHostCallIndex, } from "./host-call-handler.js";
+const logger = Logger.new(import.meta.filename, "host-calls-pvm");
+/** Container for all available host calls. */
 export class HostCalls {
-    pvmInstanceManager;
-    hostCalls;
-    constructor(pvmInstanceManager, hostCalls) {
-        this.pvmInstanceManager = pvmInstanceManager;
-        this.hostCalls = hostCalls;
-    }
-    getReturnValue(status, pvmInstance) {
-        const gasConsumed = pvmInstance.gas.used();
-        if (status === Status.OOG) {
-            return ReturnValue.fromStatus(gasConsumed, status);
-        }
-        if (status === Status.HALT) {
-            const regs = new HostCallRegisters(pvmInstance.registers.getAllEncoded());
-            const memory = new HostCallMemory(pvmInstance.memory);
-            const address = regs.get(7);
-            // NOTE we are taking the the lower U32 part of the register, hence it's safe.
-            const length = Number(regs.get(8) & 0xffffffffn);
-            const result = safeAllocUint8Array(length);
-            const loadResult = memory.loadInto(result, address);
-            if (loadResult.isError) {
-                return ReturnValue.fromMemorySlice(gasConsumed, new Uint8Array());
-            }
-            return ReturnValue.fromMemorySlice(gasConsumed, result);
+    hostCalls = new Map();
+    missing;
+    constructor({ missing, handlers = [], }) {
+        this.missing = missing;
+        for (const handler of handlers) {
+            check `${this.hostCalls.get(handler.index) === undefined} Overwriting host call handler at index ${handler.index}`;
+            this.hostCalls.set(handler.index, handler);
         }
-        return ReturnValue.fromStatus(gasConsumed, Status.PANIC);
     }
-    async execute(pvmInstance) {
-        pvmInstance.runProgram();
-        for (;;) {
-            let status = pvmInstance.getStatus();
-            if (status !== Status.HOST) {
-                return this.getReturnValue(status, pvmInstance);
-            }
-            check `
-        ${pvmInstance.getExitParam() !== null}
-        "We know that the exit param is not null, because the status is 'Status.HOST'
-      `;
-            const hostCallIndex = pvmInstance.getExitParam() ?? -1;
-            const gas = pvmInstance.gas;
-            const regs = new HostCallRegisters(pvmInstance.registers.getAllEncoded());
-            const memory = new HostCallMemory(pvmInstance.memory);
-            const index = tryAsHostCallIndex(hostCallIndex);
-            const hostCall = this.hostCalls.get(index);
-            const gasBefore = gas.get();
-            // NOTE: `basicGasCost(regs)` function is for compatibility reasons: pre GP 0.7.2
-            const basicGasCost = typeof hostCall.basicGasCost === "number" ? hostCall.basicGasCost : hostCall.basicGasCost(regs);
-            const underflow = gas.sub(basicGasCost);
-            const pcLog = `[PC: ${pvmInstance.getPC()}]`;
-            if (underflow) {
-                this.hostCalls.traceHostCall(`${pcLog} OOG`, index, hostCall, regs, gas.get());
-                return ReturnValue.fromStatus(gas.used(), Status.OOG);
-            }
-            this.hostCalls.traceHostCall(`${pcLog} Invoking`, index, hostCall, regs, gasBefore);
-            const result = await hostCall.execute(gas, regs, memory);
-            this.hostCalls.traceHostCall(result === undefined ? `${pcLog} Result` : `${pcLog} Status(${PvmExecution[result]})`, index, hostCall, regs, gas.get());
-            pvmInstance.registers.setAllEncoded(regs.getEncoded());
-            if (result === PvmExecution.Halt) {
-                status = Status.HALT;
-                return this.getReturnValue(status, pvmInstance);
-            }
-            if (result === PvmExecution.Panic) {
-                status = Status.PANIC;
-                return this.getReturnValue(status, pvmInstance);
-            }
-            if (result === PvmExecution.OOG) {
-                status = Status.OOG;
-                return this.getReturnValue(status, pvmInstance);
-            }
-            if (result === undefined) {
-                pvmInstance.runProgram();
-                status = pvmInstance.getStatus();
-                continue;
-            }
-            assertNever(result);
-        }
+    /** Get a host call by index. */
+    get(hostCallIndex) {
+        return this.hostCalls.get(hostCallIndex) ?? this.missing;
     }
-    async runProgram(program, args, initialPc, initialGas) {
-        const pvmInstance = await this.pvmInstanceManager.getInstance();
-        pvmInstance.resetJam(program, args, initialPc, initialGas);
-        try {
-            return await this.execute(pvmInstance);
-        }
-        finally {
-            this.pvmInstanceManager.releaseInstance(pvmInstance);
+    traceHostCall(context, hostCallIndex, hostCallHandler, registers, gas) {
+        if (logger.getLevel() > Level.INSANE) {
+            return;
         }
+        const { currentServiceId } = hostCallHandler;
+        const requested = hostCallIndex !== hostCallHandler.index ? ` (${hostCallIndex})` : "";
+        const name = `${hostCallHandler.constructor.name}:${hostCallHandler.index}`;
+        const registerValues = hostCallHandler.tracedRegisters
+            .map((idx) => [idx.toString().padStart(2, "0"), registers.get(idx)])
+            .filter((v) => v[1] !== 0n)
+            .map(([idx, value]) => {
+            return `r${idx}=${value} (0x${value.toString(16)})`;
+        })
+            .join(", ");
+        logger.insane `[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`;
+    }
+}
+export class NoopMissing {
+    index = tryAsHostCallIndex(2 ** 32 - 1);
+    basicGasCost = tryAsSmallGas(0);
+    currentServiceId = tryAsU32(0);
+    tracedRegisters = [];
+    async execute() {
+        return;
     }
 }

package/packages/core/pvm-host-calls/index.d.ts

@@ -1,7 +1,8 @@
-export { type HostCallHandler, PvmExecution, traceRegisters, tryAsHostCallIndex } from "./host-call-handler.js";
-export { HostCallMemory } from "./host-call-memory.js";
-export { HostCallRegisters } from "./host-call-registers.js";
-export { HostCalls as PvmHostCallExtension } from "./host-calls.js";
-export { HostCallsManager as HostCalls } from "./host-calls-manager.js";
-export { InterpreterInstanceManager as PvmInstanceManager } from "./interpreter-instance-manager.js";
+export * from "./ecalli-trace-logger.js";
+export * from "./host-call-handler.js";
+export * from "./host-call-memory.js";
+export * from "./host-call-registers.js";
+export * from "./host-calls.js";
+export * from "./host-calls-executor.js";
+export * from "./pvm-instance-manager.js";
 //# sourceMappingURL=index.d.ts.map

package/packages/core/pvm-host-calls/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAChH,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,SAAS,IAAI,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,gBAAgB,IAAI,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,0BAA0B,IAAI,kBAAkB,EAAE,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC"}

package/packages/core/pvm-host-calls/index.js

@@ -1,6 +1,7 @@
-export { PvmExecution, traceRegisters, tryAsHostCallIndex } from "./host-call-handler.js";
-export { HostCallMemory } from "./host-call-memory.js";
-export { HostCallRegisters } from "./host-call-registers.js";
-export { HostCalls as PvmHostCallExtension } from "./host-calls.js";
-export { HostCallsManager as HostCalls } from "./host-calls-manager.js";
-export { InterpreterInstanceManager as PvmInstanceManager } from "./interpreter-instance-manager.js";
+export * from "./ecalli-trace-logger.js";
+export * from "./host-call-handler.js";
+export * from "./host-call-memory.js";
+export * from "./host-call-registers.js";
+export * from "./host-calls.js";
+export * from "./host-calls-executor.js";
+export * from "./pvm-instance-manager.js";

package/packages/core/pvm-host-calls/{interpreter-instance-manager.d.ts → pvm-instance-manager.d.ts}

@@ -1,11 +1,11 @@
 import { PvmBackend } from "#@typeberry/config";
 import type { IPvmInterpreter } from "#@typeberry/pvm-interface";
-export declare class InterpreterInstanceManager {
+export declare class PvmInstanceManager {
     private readonly instances;
     private waitingQueue;
     private constructor();
-    static new(interpreter: PvmBackend): Promise<InterpreterInstanceManager>;
+    static new(interpreter: PvmBackend): Promise<PvmInstanceManager>;
     getInstance(): Promise<IPvmInterpreter>;
     releaseInstance(pvm: IPvmInterpreter): void;
 }
-//# sourceMappingURL=interpreter-instance-manager.d.ts.map
+//# sourceMappingURL=pvm-instance-manager.d.ts.map

package/packages/core/pvm-host-calls/pvm-instance-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pvm-instance-manager.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/pvm-instance-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAQhE,qBAAa,kBAAkB;IAGT,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9C,OAAO,CAAC,YAAY,CAAmB;IAEvC,OAAO;WAEM,GAAG,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAmBhE,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAU7C,eAAe,CAAC,GAAG,EAAE,eAAe;CAOrC"}

package/packages/core/pvm-host-calls/{interpreter-instance-manager.js → pvm-instance-manager.js}

@@ -3,7 +3,7 @@ import { Interpreter } from "#@typeberry/pvm-interpreter";
 import { AnanasInterpreter } from "#@typeberry/pvm-interpreter-ananas";
 import { assertNever } from "#@typeberry/utils";
 // TODO [MaSo] Delete this & also make host calls independent from intepreters.
-export class InterpreterInstanceManager {
+export class PvmInstanceManager {
     instances;
     waitingQueue = [];
     constructor(instances) {
@@ -23,7 +23,7 @@ export class InterpreterInstanceManager {
             default:
                 assertNever(interpreter);
         }
-        return new InterpreterInstanceManager(instances);
+        return new PvmInstanceManager(instances);
     }
     async getInstance() {
         const instance = this.instances.pop();

package/packages/jam/safrole/bandersnatch-vrf.d.ts

@@ -8,12 +8,14 @@ import { type Opaque, Result } from "#@typeberry/utils";
 import type { BandernsatchWasm } from "./bandersnatch-wasm.js";
 declare const FUNCTIONS: {
     verifySeal: typeof verifySeal;
+    verifyHeaderSeals: typeof verifyHeaderSeals;
     verifyTickets: typeof verifyTickets;
     getRingCommitment: typeof getRingCommitment;
     generateSeal: typeof generateSeal;
     getVrfOutputHash: typeof getVrfOutputHash;
 };
 export default FUNCTIONS;
+declare function verifyHeaderSeals(bandersnatch: BandernsatchWasm, authorKey: BandersnatchKey, signature: BandersnatchVrfSignature, payload: BytesBlob, encodedUnsealedHeader: BytesBlob, entropySignature: BandersnatchVrfSignature, entropyPayloadPrefix: BytesBlob): Promise<Result<[EntropyHash, EntropyHash], null>>;
 declare function verifySeal(bandersnatch: BandernsatchWasm, authorKey: BandersnatchKey, signature: BandersnatchVrfSignature, payload: BytesBlob, encodedUnsealedHeader: BytesBlob): Promise<Result<EntropyHash, null>>;
 declare function getRingCommitment(bandersnatch: BandernsatchWasm, validators: BandersnatchKey[]): Promise<Result<BandersnatchRingRoot, null>>;
 declare function verifyTickets(bandersnatch: BandernsatchWasm, numberOfValidators: number, epochRoot: BandersnatchRingRoot, tickets: readonly SignedTicket[], entropy: EntropyHash): Promise<{

package/packages/jam/safrole/bandersnatch-vrf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bandersnatch-vrf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/bandersnatch-vrf.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAwB/D,QAAA,MAAM,SAAS;;;;;;CAMd,CAAC;AAKF,eAAe,SAAS,CAAC;AAEzB,iBAAe,UAAU,CACvB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,GAC/B,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAapC;AAED,iBAAS,iBAAiB,CACxB,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,eAAe,EAAE,GAC5B,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAmB7C;AAkBD,iBAAe,aAAa,CAC1B,YAAY,EAAE,gBAAgB,EAC9B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,EAAE,CAAC,CAqB3D;AAED,iBAAe,YAAY,CACzB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC,CAQjD;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAElE,iBAAe,gBAAgB,CAC7B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAQtC"}
+{"version":3,"file":"bandersnatch-vrf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/bandersnatch-vrf.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAwB/D,QAAA,MAAM,SAAS;;;;;;;CAOd,CAAC;AAKF,eAAe,SAAS,CAAC;AAEzB,iBAAe,iBAAiB,CAC9B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,EAChC,gBAAgB,EAAE,wBAAwB,EAC1C,oBAAoB,EAAE,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC,CAkBnD;AAED,iBAAe,UAAU,CACvB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,GAC/B,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAapC;AAED,iBAAS,iBAAiB,CACxB,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,eAAe,EAAE,GAC5B,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAmB7C;AAkBD,iBAAe,aAAa,CAC1B,YAAY,EAAE,gBAAgB,EAC9B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,EAAE,CAAC,CAqB3D;AAED,iBAAe,YAAY,CACzB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC,CAQjD;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAElE,iBAAe,gBAAgB,CAC7B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAQtC"}