@typeberry/lib 0.5.2 → 0.5.3

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/core/telemetry/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/telemetry",
-    "version": "0.5.2",
+    "version": "0.5.3",
     "description": "OpenTelemetry initialization utilities for Typeberry",
     "license": "MPL-2.0",
     "author": "Fluffy Labs",

package/packages/jam/node/main-importer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main-importer.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main-importer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAClC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,OAAO,CAAC,CA4ElB"}
+{"version":3,"file":"main-importer.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main-importer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAClC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,OAAO,CAAC,CA+ElB"}

package/packages/jam/node/main-importer.js

@@ -1,6 +1,6 @@
 import { Bytes } from "#@typeberry/bytes";
 import { PvmBackend } from "#@typeberry/config";
-import { initWasm } from "#@typeberry/crypto";
+import { bandersnatch, initWasm } from "#@typeberry/crypto";
 import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
 import { createImporter } from "#@typeberry/importer";
 import { CURRENT_SUITE, CURRENT_VERSION, Result, resultToString } from "#@typeberry/utils";
@@ -10,9 +10,11 @@ import packageJson from "./package.json" with { type: "json" };
 const zeroHash = Bytes.zero(HASH_SIZE).asOpaque();
 export async function mainImporter(config, withRelPath, options = {}) {
     await initWasm();
+    const bandesnatchNative = bandersnatch.checkNativeBindings();
     logger.info `🫐 Typeberry ${packageJson.version}. GP: ${CURRENT_VERSION} (${CURRENT_SUITE})`;
     logger.info `🎸 Starting importer: ${config.nodeName}.`;
     logger.info `🖥️ PVM Backend: ${PvmBackend[config.pvmBackend]}.`;
+    logger.info `🐇 Bandersnatch ${bandesnatchNative.isOk ? "native 🚀" : `using wasm: ${bandesnatchNative.error}`}`;
     const chainSpec = getChainSpec(config.node.flavor);
     const blake2b = await Blake2b.createHasher();
     const nodeName = config.nodeName;

package/packages/jam/node/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/node",
-    "version": "0.5.2",
+    "version": "0.5.3",
     "description": "The main typeberry node.",
     "main": "index.ts",
     "dependencies": {

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"}

package/packages/jam/safrole/bandersnatch-vrf.js

@@ -20,6 +20,7 @@ var ResultValues;
 const ringCommitmentCache = [];
 const FUNCTIONS = {
     verifySeal,
+    verifyHeaderSeals,
     verifyTickets,
     getRingCommitment,
     generateSeal,
@@ -29,6 +30,16 @@ const FUNCTIONS = {
 // Ideally we would just export functions and figure out how to mock
 // properly in ESM.
 export default FUNCTIONS;
+async function verifyHeaderSeals(bandersnatch, authorKey, signature, payload, encodedUnsealedHeader, entropySignature, entropyPayloadPrefix) {
+    const sealResult = await bandersnatch.verifyHeaderSeals(authorKey.raw, signature.raw, payload.raw, encodedUnsealedHeader.raw, entropySignature.raw, entropyPayloadPrefix.raw);
+    if (sealResult[RESULT_INDEX] === ResultValues.Error) {
+        return Result.error(null, () => "Bandersnatch VRF seal verification failed");
+    }
+    return Result.ok([
+        Bytes.fromBlob(sealResult.subarray(1, 33), HASH_SIZE).asOpaque(),
+        Bytes.fromBlob(sealResult.subarray(33), HASH_SIZE).asOpaque(),
+    ]);
+}
 async function verifySeal(bandersnatch, authorKey, signature, payload, encodedUnsealedHeader) {
     const sealResult = await bandersnatch.verifySeal(authorKey.raw, signature.raw, payload.raw, encodedUnsealedHeader.raw);
     if (sealResult[RESULT_INDEX] === ResultValues.Error) {

package/packages/jam/safrole/bandersnatch-vrf.test.js

@@ -27,7 +27,7 @@ describe("Bandersnatch verification", () => {
             const result = await bandersnatchVrf.getRingCommitment(await bandersnatchWasm, bandersnatchKeys);
             const expectedCommitment = Bytes.parseBytes("0x8387a131593447e4e1c3d4e220c322e42d33207fa77cd0fedb39fc3491479ca47a2d82295252e278fa3eec78185982ed82ae0c8fd691335e703d663fb5be02b3def15380789320636b2479beab5a03ccb3f0909ffea59d859fcdc7e187e45a8c92e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf", BANDERSNATCH_RING_ROOT_BYTES);
             assert.strictEqual(result.isOk, true);
-            assert.deepStrictEqual(result.ok, expectedCommitment);
+            assert.strictEqual(result.ok.toString(), expectedCommitment.toString());
         });
     });
     describe("verifyTickets", () => {
@@ -72,7 +72,7 @@ describe("Bandersnatch verification", () => {
             ].map((x) => Bytes.parseBytes(x, HASH_SIZE));
             const result = await bandersnatchVrf.verifyTickets(await bandersnatchWasm, bandersnatchKeys.length, commitment, tickets, entropy);
             assert.strictEqual(result.every((x) => x.isValid), true);
-            assert.deepStrictEqual(result.map((x) => x.entropyHash), expectedIds);
+            assert.deepStrictEqual(result.map((x) => x.entropyHash.toString()), expectedIds.map((x) => x.toString()));
         });
         it("should detect that one signature is incorrect", async () => {
             const tickets = [
@@ -97,7 +97,7 @@ describe("Bandersnatch verification", () => {
             ].map((x) => Bytes.parseBytes(x, HASH_SIZE));
             const result = await bandersnatchVrf.verifyTickets(await bandersnatchWasm, bandersnatchKeys.length, commitment, tickets, entropy);
             assert.deepStrictEqual(result.map((x) => x.isValid), [false, true, true]);
-            assert.deepStrictEqual(result.map((x) => x.entropyHash), expectedIds);
+            assert.deepStrictEqual(result.map((x) => x.entropyHash.toString()), expectedIds.map((x) => x.toString()));
         });
     });
     describe("verifySeal", () => {

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

@@ -2,6 +2,7 @@ export declare class BandernsatchWasm {
     private constructor();
     static new(): Promise<BandernsatchWasm>;
     verifySeal(authorKey: Uint8Array, signature: Uint8Array, payload: Uint8Array, auxData: Uint8Array): Promise<Uint8Array<ArrayBufferLike>>;
+    verifyHeaderSeals(authorKey: Uint8Array, headerSeal: Uint8Array, headerSealPayload: Uint8Array, unsealedHeader: Uint8Array, entropySeal: Uint8Array, entropyPayloadPrefix: Uint8Array): Promise<Uint8Array<ArrayBufferLike>>;
     getRingCommitment(keys: Uint8Array): Promise<Uint8Array<ArrayBufferLike>>;
     batchVerifyTicket(ringSize: number, commitment: Uint8Array, ticketsData: Uint8Array, contextLength: number): Promise<Uint8Array<ArrayBufferLike>>;
     generateSeal(authorKey: Uint8Array, input: Uint8Array, auxData: Uint8Array): Promise<Uint8Array<ArrayBufferLike>>;

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

@@ -1 +1 @@
-{"version":3,"file":"bandersnatch-wasm.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/bandersnatch-wasm.ts"],"names":[],"mappings":"AAEA,qBAAa,gBAAgB;IAC3B,OAAO;WAEM,GAAG;IAKV,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU;IAIjG,iBAAiB,CAAC,IAAI,EAAE,UAAU;IAIlC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM;IAI1G,YAAY,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU;IAI1E,gBAAgB,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU;CAGhE"}
+{"version":3,"file":"bandersnatch-wasm.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/bandersnatch-wasm.ts"],"names":[],"mappings":"AAEA,qBAAa,gBAAgB;IAC3B,OAAO;WAEM,GAAG;IAKV,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU;IAIjG,iBAAiB,CACrB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,UAAU,EACtB,iBAAiB,EAAE,UAAU,EAC7B,cAAc,EAAE,UAAU,EAC1B,WAAW,EAAE,UAAU,EACvB,oBAAoB,EAAE,UAAU;IAY5B,iBAAiB,CAAC,IAAI,EAAE,UAAU;IAIlC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM;IAI1G,YAAY,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU;IAI1E,gBAAgB,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU;CAGhE"}

package/packages/jam/safrole/bandersnatch-wasm.js

@@ -6,18 +6,21 @@ export class BandernsatchWasm {
         return new BandernsatchWasm();
     }
     async verifySeal(authorKey, signature, payload, auxData) {
-        return bandersnatchWasm.verify_seal(authorKey, signature, payload, auxData);
+        return bandersnatchWasm.verifySeal(authorKey, signature, payload, auxData);
+    }
+    async verifyHeaderSeals(authorKey, headerSeal, headerSealPayload, unsealedHeader, entropySeal, entropyPayloadPrefix) {
+        return bandersnatchWasm.verifyHeaderSeals(authorKey, headerSeal, headerSealPayload, unsealedHeader, entropySeal, entropyPayloadPrefix);
     }
     async getRingCommitment(keys) {
-        return bandersnatchWasm.ring_commitment(keys);
+        return bandersnatchWasm.ringCommitment(keys);
     }
     async batchVerifyTicket(ringSize, commitment, ticketsData, contextLength) {
-        return bandersnatchWasm.batch_verify_tickets(ringSize, commitment, ticketsData, contextLength);
+        return bandersnatchWasm.batchVerifyTickets(ringSize, commitment, ticketsData, contextLength);
     }
     async generateSeal(authorKey, input, auxData) {
-        return bandersnatchWasm.generate_seal(authorKey, input, auxData);
+        return bandersnatchWasm.generateSeal(authorKey, input, auxData);
     }
     async getVrfOutputHash(authorKey, input) {
-        return bandersnatchWasm.vrf_output_hash(authorKey, input);
+        return bandersnatchWasm.vrfOutputHash(authorKey, input);
     }
 }

package/packages/jam/safrole/safrole-seal.d.ts

@@ -8,8 +8,7 @@ export declare enum SafroleSealError {
     InvalidValidatorIndex = 0,
     InvalidValidator = 1,
     InvalidTicket = 2,
-    IncorrectSeal = 3,
-    IncorrectEntropySource = 4
+    IncorrectSeal = 3
 }
 export type SafroleSealState = Pick<State, "currentValidatorData" | "sealingKeySeries"> & {
     currentEntropy: EntropyHash;
@@ -22,7 +21,6 @@ export declare class SafroleSeal {
      * hence the state is passed as an argument for more control.
      */
     verifyHeaderSeal(headerView: HeaderView, state: SafroleSealState): Promise<Result<EntropyHash, SafroleSealError>>;
-    private verifySeal;
     /** Regular (non-fallback) mode of Safrole. */
     verifySealWithTicket(tickets: PerEpochBlock<Ticket>, timeSlot: TimeSlot, entropy: EntropyHash, validatorData: ValidatorData, headerView: HeaderView): Promise<Result<EntropyHash, SafroleSealError>>;
     /** Fallback mode of Safrole. */

package/packages/jam/safrole/safrole-seal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safrole-seal.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/safrole-seal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,QAAQ,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,oBAAY,gBAAgB;IAC1B,qBAAqB,IAAI;IACzB,gBAAgB,IAAI;IACpB,aAAa,IAAI;IACjB,aAAa,IAAI;IACjB,sBAAsB,IAAI;CAC3B;AAED,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,EAAE,sBAAsB,GAAG,kBAAkB,CAAC,GAAG;IACxF,cAAc,EAAE,WAAW,CAAC;CAC7B,CAAC;AAIF,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,GAAE,OAAO,CAAC,gBAAgB,CAA0B;IAC7F;;;OAGG;IACG,gBAAgB,CACpB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;YA6BnC,UAAU;IA0BxB,8CAA8C;IACxC,oBAAoB,CACxB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IA4BjD,gCAAgC;IAC1B,kBAAkB,CACtB,IAAI,EAAE,aAAa,CAAC,eAAe,CAAC,EACpC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;CA2BlD"}
+{"version":3,"file":"safrole-seal.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/safrole-seal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,QAAQ,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,oBAAY,gBAAgB;IAC1B,qBAAqB,IAAI;IACzB,gBAAgB,IAAI;IACpB,aAAa,IAAI;IACjB,aAAa,IAAI;CAClB;AAED,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,EAAE,sBAAsB,GAAG,kBAAkB,CAAC,GAAG;IACxF,cAAc,EAAE,WAAW,CAAC;CAC7B,CAAC;AAIF,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,GAAE,OAAO,CAAC,gBAAgB,CAA0B;IAC7F;;;OAGG;IACG,gBAAgB,CACpB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAuBjD,8CAA8C;IACxC,oBAAoB,CACxB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAmCjD,gCAAgC;IAC1B,kBAAkB,CACtB,IAAI,EAAE,aAAa,CAAC,eAAe,CAAC,EACpC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;CA8BlD"}

package/packages/jam/safrole/safrole-seal.js

@@ -12,7 +12,6 @@ export var SafroleSealError;
     SafroleSealError[SafroleSealError["InvalidValidator"] = 1] = "InvalidValidator";
     SafroleSealError[SafroleSealError["InvalidTicket"] = 2] = "InvalidTicket";
     SafroleSealError[SafroleSealError["IncorrectSeal"] = 3] = "IncorrectSeal";
-    SafroleSealError[SafroleSealError["IncorrectEntropySource"] = 4] = "IncorrectEntropySource";
 })(SafroleSealError || (SafroleSealError = {}));
 const BANDERSNATCH_ZERO_KEY = Bytes.zero(BANDERSNATCH_KEY_BYTES).asOpaque();
 export class SafroleSeal {
@@ -25,21 +24,6 @@ export class SafroleSeal {
      * hence the state is passed as an argument for more control.
      */
     async verifyHeaderSeal(headerView, state) {
-        const sealResult = await this.verifySeal(headerView, state);
-        if (sealResult.isError) {
-            return sealResult;
-        }
-        // verify entropySource
-        const payload = BytesBlob.blobFromParts(JAM_ENTROPY, sealResult.ok.raw);
-        const blockAuthorIndex = headerView.bandersnatchBlockAuthorIndex.materialize();
-        const blockAuthorKey = state.currentValidatorData.at(blockAuthorIndex)?.bandersnatch;
-        const entropySourceResult = await bandersnatchVrf.verifySeal(await this.bandersnatch, blockAuthorKey ?? BANDERSNATCH_ZERO_KEY, headerView.entropySource.materialize(), payload, BytesBlob.blobFromNumbers([]));
-        if (entropySourceResult.isError) {
-            return Result.error(SafroleSealError.IncorrectEntropySource, () => "Safrole: incorrect entropy source in header seal");
-        }
-        return Result.ok(entropySourceResult.ok);
-    }
-    async verifySeal(headerView, state) {
         // we use transitioned keys already
         const validatorIndex = headerView.bandersnatchBlockAuthorIndex.materialize();
         const authorKeys = state.currentValidatorData.at(validatorIndex);
@@ -58,17 +42,21 @@ export class SafroleSeal {
     async verifySealWithTicket(tickets, timeSlot, entropy, validatorData, headerView) {
         const index = timeSlot % tickets.length;
         const ticket = tickets.at(index);
-        const payload = BytesBlob.blobFromParts(JAM_TICKET_SEAL, entropy.raw, new Uint8Array([ticket?.attempt ?? 0]));
-        // verify seal correctness
+        if (ticket === undefined) {
+            return Result.error(SafroleSealError.IncorrectSeal, () => "Safrole: missing ticket");
+        }
+        const payload = BytesBlob.blobFromParts(JAM_TICKET_SEAL, entropy.raw, new Uint8Array([ticket.attempt]));
+        // verify seal and entropy source correctness
         const authorKey = validatorData.bandersnatch;
-        const result = await bandersnatchVrf.verifySeal(await this.bandersnatch, authorKey ?? BANDERSNATCH_ZERO_KEY, headerView.seal.materialize(), payload, encodeUnsealedHeader(headerView));
+        const result = await bandersnatchVrf.verifyHeaderSeals(await this.bandersnatch, authorKey ?? BANDERSNATCH_ZERO_KEY, headerView.seal.materialize(), payload, encodeUnsealedHeader(headerView), headerView.entropySource.materialize(), BytesBlob.blobFrom(JAM_ENTROPY));
         if (result.isError) {
             return Result.error(SafroleSealError.IncorrectSeal, () => "Safrole: incorrect seal with ticket");
         }
-        if (ticket === undefined || !ticket.id.isEqualTo(result.ok)) {
-            return Result.error(SafroleSealError.InvalidTicket, () => `Safrole: invalid ticket, expected ${ticket?.id} got ${result.ok}`);
+        const [sealOutput, entropyOutput] = result.ok;
+        if (!ticket.id.isEqualTo(sealOutput)) {
+            return Result.error(SafroleSealError.InvalidTicket, () => `Safrole: invalid ticket, expected ${ticket.id} got ${sealOutput}`);
         }
-        return Result.ok(result.ok);
+        return Result.ok(entropyOutput);
     }
     /** Fallback mode of Safrole. */
     async verifySealWithKeys(keys, timeSlot, entropy, authorKey, headerView) {
@@ -78,12 +66,13 @@ export class SafroleSeal {
         if (sealingKey === undefined || !sealingKey.isEqualTo(authorBandersnatchKey)) {
             return Result.error(SafroleSealError.InvalidValidator, () => `Invalid Validator. Expected: ${sealingKey}, got: ${authorKey.bandersnatch}`);
         }
-        // verify seal correctness
+        // verify seal and entropy source correctness
         const payload = BytesBlob.blobFromParts(JAM_FALLBACK_SEAL, entropy.raw);
-        const result = await bandersnatchVrf.verifySeal(await this.bandersnatch, authorBandersnatchKey, headerView.seal.materialize(), payload, encodeUnsealedHeader(headerView));
+        const result = await bandersnatchVrf.verifyHeaderSeals(await this.bandersnatch, authorBandersnatchKey, headerView.seal.materialize(), payload, encodeUnsealedHeader(headerView), headerView.entropySource.materialize(), BytesBlob.blobFrom(JAM_ENTROPY));
         if (result.isError) {
             return Result.error(SafroleSealError.IncorrectSeal, () => "Safrole: incorrect seal with keys");
         }
-        return Result.ok(result.ok);
+        const [_, entropyOutput] = result.ok;
+        return Result.ok(entropyOutput);
     }
 }

package/packages/jam/safrole/safrole-seal.test.js

@@ -35,11 +35,8 @@ describe("Safrole Seal verification", () => {
             sealingKeySeries: SEALING_KEYS,
             currentEntropy: Bytes.parseBytes("0x405c80c1f6a2d5a0f8dbc56996f04230221100d9500244648f02a795d7850eac", HASH_SIZE).asOpaque(),
         });
-        assert.deepStrictEqual(result, {
-            isError: false,
-            isOk: true,
-            ok: Bytes.parseBytes("0xc13af3d0cbdb7174590f34518e3beb05708935ceaee242e7ba11a94ca87bd007", HASH_SIZE).asOpaque(),
-        });
+        assert.strictEqual(result.isOk, true);
+        assert.strictEqual(result.ok.toString(), "0xc13af3d0cbdb7174590f34518e3beb05708935ceaee242e7ba11a94ca87bd007");
     });
     it("should verify a valid ticket seal and entropySource", async () => {
         // based on test-vectors/w3f-davxy_070/traces/safrole/00000002.json
@@ -63,11 +60,8 @@ describe("Safrole Seal verification", () => {
             sealingKeySeries: SEALING_KEYS,
             currentEntropy: Bytes.parseBytes("0x405c80c1f6a2d5a0f8dbc56996f04230221100d9500244648f02a795d7850eac", HASH_SIZE).asOpaque(),
         });
-        assert.deepStrictEqual(result, {
-            isError: false,
-            isOk: true,
-            ok: Bytes.parseBytes("0xc13af3d0cbdb7174590f34518e3beb05708935ceaee242e7ba11a94ca87bd007", HASH_SIZE).asOpaque(),
-        });
+        assert.strictEqual(result.isOk, true);
+        assert.strictEqual(result.ok.toString(), "0xc13af3d0cbdb7174590f34518e3beb05708935ceaee242e7ba11a94ca87bd007");
     });
 });
 const TEST_VALIDATOR_KEYS = tryAsPerValidator([

package/packages/jam/transition/accumulate/pvm-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pvm-executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/pvm-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAc,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0DAA0D,CAAC;AAM7F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAkBpD,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAChD,oBAAoB,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;CACpH,CAAC;AAEF,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3G,kBAAkB,EAAE,OAAO,CAAC,mBAAmB,CAAC;CACjD,CAAC;AASF;;GAEG;AACH,qBAAa,WAAW;IAKpB,OAAO,CAAC,WAAW;IAEnB,OAAO,CAAC,UAAU;IANpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAuB;IAC3C,OAAO,CAAC,SAAS,CAAY;IAE7B,OAAO;mBAac,cAAc;IAInC,8CAA8C;IAC9C,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAsBzC,6CAA6C;IAC7C,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAazC;;;;;;OAMG;IACG,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG;;;;;;;;;;;;;IAInC,yEAAyE;WAC5D,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,+BAA+B,EAC9C,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,UAAU;IAOjB,0EAA0E;WAC7D,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,+BAA+B,EAC9C,GAAG,EAAE,UAAU;CAMlB"}
+{"version":3,"file":"pvm-executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/pvm-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAc,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0DAA0D,CAAC;AAM7F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAkBpD,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAChD,oBAAoB,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;CACpH,CAAC;AAEF,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3G,kBAAkB,EAAE,OAAO,CAAC,mBAAmB,CAAC;CACjD,CAAC;AASF;;GAEG;AACH,qBAAa,WAAW;IAKpB,OAAO,CAAC,WAAW;IAEnB,OAAO,CAAC,UAAU;IANpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAoB;IACxC,OAAO,CAAC,SAAS,CAAY;IAE7B,OAAO;mBAac,cAAc;IAInC,8CAA8C;IAC9C,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAsBzC,6CAA6C;IAC7C,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAazC;;;;;;OAMG;IACG,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG;;;;;;;;;;;;;IAInC,yEAAyE;WAC5D,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,+BAA+B,EAC9C,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,UAAU;IAOjB,0EAA0E;WAC7D,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,+BAA+B,EAC9C,GAAG,EAAE,UAAU;CAMlB"}

package/packages/jam/transition/accumulate/pvm-executor.js

@@ -1,6 +1,6 @@
 import { accumulate, general } from "#@typeberry/jam-host-calls";
 import { tryAsProgramCounter, } from "#@typeberry/jam-host-calls/externalities/refine-externalities.js";
-import { HostCalls, PvmHostCallExtension, PvmInstanceManager } from "#@typeberry/pvm-host-calls";
+import { HostCalls, HostCallsExecutor, PvmInstanceManager } from "#@typeberry/pvm-host-calls";
 const ACCUMULATE_HOST_CALL_CLASSES = [
     accumulate.Bless,
     accumulate.Assign,
@@ -38,7 +38,7 @@ export class PvmExecutor {
             missing: new general.Missing(),
             handlers: hostCallHandlers,
         });
-        this.pvm = new PvmHostCallExtension(pvmInstanceManager, this.hostCalls);
+        this.pvm = new HostCallsExecutor(pvmInstanceManager, this.hostCalls);
     }
     static async prepareBackend(pvm) {
         return PvmInstanceManager.new(pvm);

package/packages/jam/transition/disputes/disputes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disputes.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/disputes/disputes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,OAAO,EAAkB,OAAO,EAA0B,MAAM,wBAAwB,CAAC;AACzF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAQ/C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAc9E,qBAAa,QAAQ;IAEjB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;aACR,KAAK,EAAE,aAAa;gBAFnB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EACjB,KAAK,EAAE,aAAa;IAGtC,OAAO,CAAC,cAAc;IAoDtB,OAAO,CAAC,YAAY;IA8DpB,OAAO,CAAC,cAAc;IA6DtB,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,4BAA4B;IAsBpC,OAAO,CAAC,yBAAyB;IAoCjC,OAAO,CAAC,0BAA0B;IA0BlC;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,yBAAyB;IAWjC,OAAO,CAAC,+BAA+B;IAoCvC,OAAO,CAAC,gBAAgB;IAWxB;;OAEG;IACG,UAAU,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CACpD,MAAM,CACJ;QACE,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QACnC,WAAW,EAAE,mBAAmB,CAAC;KAClC,EACD,iBAAiB,CAClB,CACF;CAwCF"}
+{"version":3,"file":"disputes.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/disputes/disputes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,OAAO,EAAkB,OAAO,EAA0B,MAAM,wBAAwB,CAAC;AACzF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAQ/C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAc9E,qBAAa,QAAQ;IAEjB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;aACR,KAAK,EAAE,aAAa;gBAFnB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EACjB,KAAK,EAAE,aAAa;IAGtC,OAAO,CAAC,cAAc;IAoDtB,OAAO,CAAC,YAAY;IA8DpB,OAAO,CAAC,cAAc;IA6DtB,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,4BAA4B;IAsBpC,OAAO,CAAC,yBAAyB;IAoCjC,OAAO,CAAC,0BAA0B;IA0BlC;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,yBAAyB;IAWjC,OAAO,CAAC,+BAA+B;IAoCvC,OAAO,CAAC,gBAAgB;IAaxB;;OAEG;IACG,UAAU,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CACpD,MAAM,CACJ;QACE,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QACnC,WAAW,EAAE,mBAAmB,CAAC;KAClC,EACD,iBAAiB,CAClB,CACF;CAwCF"}

package/packages/jam/transition/disputes/disputes.js

@@ -291,10 +291,11 @@ export class Disputes {
         const punishSetKeys = this.state.disputesRecords.punishSet;
         const currentValidatorKeys = this.state.currentValidatorData.map((v) => v.ed25519);
         const previousValidatorKeys = this.state.previousValidatorData.map((v) => v.ed25519);
-        const allValidatorKeys = currentValidatorKeys
-            .concat(previousValidatorKeys)
-            .filter((key) => !punishSetKeys.has(key));
-        return HashSet.from(allValidatorKeys);
+        const allValidatorKeysSet = HashSet.from(currentValidatorKeys.concat(previousValidatorKeys));
+        for (const key of punishSetKeys) {
+            allValidatorKeysSet.delete(key);
+        }
+        return allValidatorKeysSet;
     }
     /**
      * Transition the disputes and return a list of offenders.

package/packages/workers/block-authorship/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/block-authorship",
-    "version": "0.5.2",
+    "version": "0.5.3",
     "description": "A test block generator simulating blocks received over the network.",
     "main": "index.ts",
     "dependencies": {

package/packages/workers/importer/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/importer",
-    "version": "0.5.2",
+    "version": "0.5.3",
     "description": "A JAM block importer queue.",
     "main": "index.ts",
     "dependencies": {