@typeberry/lib 0.5.10-ec38e0b → 0.5.11-019e542

package/packages/jam/in-core/externalities/refine-fetch.test.js

@@ -0,0 +1,219 @@
+import assert from "node:assert";
+import { describe, it } from "node:test";
+import { tryAsServiceGas, tryAsServiceId, tryAsTimeSlot } from "#@typeberry/block";
+import { RefineContext } from "#@typeberry/block/refine-context.js";
+import { ImportSpec, WorkItem, WorkItemExtrinsicSpec } from "#@typeberry/block/work-item.js";
+import { SEGMENT_BYTES, tryAsSegmentIndex } from "#@typeberry/block/work-item-segment.js";
+import { tryAsWorkItemsCount, WorkPackage } from "#@typeberry/block/work-package.js";
+import { Bytes, BytesBlob } from "#@typeberry/bytes";
+import { Encoder } from "#@typeberry/codec";
+import { asKnownSize, FixedSizeArray } from "#@typeberry/collections";
+import { fullChainSpec, tinyChainSpec } from "#@typeberry/config";
+import { HASH_SIZE } from "#@typeberry/hash";
+import { tryAsU16, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
+import { buildWorkPackageFetchData } from "#@typeberry/transition/externalities/fetch-externalities.js";
+import { asOpaqueType } from "#@typeberry/utils";
+import { RefineFetchExternalities } from "./refine-fetch.js";
+const asExtrinsic = (bytes) => asOpaqueType(bytes);
+function buildWorkItem(overrides) {
+    const codeHash = Bytes.fill(HASH_SIZE, 7).asOpaque();
+    const imports = Array.from({ length: overrides.importCount ?? 0 }, (_, i) => ImportSpec.create({ treeRoot: Bytes.zero(HASH_SIZE), index: tryAsSegmentIndex(i) }));
+    const extrinsicSpecs = Array.from({ length: overrides.extrinsicCount ?? 0 }, () => WorkItemExtrinsicSpec.create({ hash: Bytes.zero(HASH_SIZE).asOpaque(), len: tryAsU32(0) }));
+    return WorkItem.create({
+        service: tryAsServiceId(overrides.service ?? 1),
+        codeHash,
+        payload: BytesBlob.blobFrom(new Uint8Array(overrides.payloadLen ?? 3).fill(0xab)),
+        refineGasLimit: tryAsServiceGas(1_000_000),
+        accumulateGasLimit: tryAsServiceGas(2_000_000),
+        importSegments: asKnownSize(imports),
+        extrinsic: extrinsicSpecs,
+        exportCount: tryAsU16(overrides.exportCount ?? 0),
+    });
+}
+function buildWorkPackage(items) {
+    return WorkPackage.create({
+        authToken: BytesBlob.blobFrom(new Uint8Array([1, 2, 3])),
+        authCodeHost: tryAsServiceId(42),
+        authCodeHash: Bytes.fill(HASH_SIZE, 9).asOpaque(),
+        authConfiguration: BytesBlob.blobFrom(new Uint8Array([4, 5, 6, 7])),
+        context: RefineContext.create({
+            anchor: Bytes.fill(HASH_SIZE, 1).asOpaque(),
+            stateRoot: Bytes.fill(HASH_SIZE, 2).asOpaque(),
+            beefyRoot: Bytes.fill(HASH_SIZE, 3).asOpaque(),
+            lookupAnchor: Bytes.fill(HASH_SIZE, 4).asOpaque(),
+            lookupAnchorSlot: tryAsTimeSlot(16),
+            prerequisites: [],
+        }),
+        items: FixedSizeArray.new(items, tryAsWorkItemsCount(items.length)),
+    });
+}
+function prepareRefineData(opts = {}) {
+    const chainSpec = opts.chainSpec ?? tinyChainSpec;
+    const items = opts.items ?? [buildWorkItem({})];
+    const workPackage = buildWorkPackage(items);
+    const packageData = buildWorkPackageFetchData(chainSpec, workPackage);
+    return new RefineFetchExternalities(chainSpec, {
+        packageData,
+        currentWorkItemIndex: opts.currentWorkItemIndex ?? 0,
+        imports: opts.imports ?? asKnownSize(items.map(() => [])),
+        extrinsics: opts.extrinsics ?? asKnownSize(items.map(() => [])),
+        authorizerTrace: opts.authorizerTrace ?? BytesBlob.empty(),
+    });
+}
+describe("RefineFetchExternalities", () => {
+    it("should return different constants for different chain specs", () => {
+        const tinyExt = prepareRefineData({ chainSpec: tinyChainSpec });
+        const fullExt = prepareRefineData({ chainSpec: fullChainSpec });
+        assert.notStrictEqual(tinyExt.constants().length, 0);
+        assert.notStrictEqual(fullExt.constants().length, 0);
+        assert.notDeepStrictEqual(tinyExt.constants(), fullExt.constants());
+    });
+    it("should return entropy H_0 (zero hash) per GP §B.3", () => {
+        const ext = prepareRefineData();
+        const entropy = ext.entropy();
+        assert.strictEqual(entropy.length, HASH_SIZE);
+        assert.ok(entropy.isEqualTo(Bytes.zero(HASH_SIZE).asOpaque()));
+    });
+    it("should return the supplied authorizer trace", () => {
+        const trace = BytesBlob.blobFrom(new Uint8Array([0xaa, 0xbb, 0xcc]));
+        const ext = prepareRefineData({ authorizerTrace: trace });
+        assert.deepStrictEqual(ext.authorizerTrace().raw, trace.raw);
+    });
+    it("should return an extrinsic by work item index and extrinsic index", () => {
+        const items = [buildWorkItem({}), buildWorkItem({ service: 2 })];
+        const extrinsics = asKnownSize([
+            [asExtrinsic(BytesBlob.blobFrom(new Uint8Array([1])))],
+            [
+                asExtrinsic(BytesBlob.blobFrom(new Uint8Array([2, 2]))),
+                asExtrinsic(BytesBlob.blobFrom(new Uint8Array([3, 3, 3]))),
+            ],
+        ]);
+        const ext = prepareRefineData({ items, extrinsics });
+        const other = ext.workItemExtrinsic(tryAsU64(1), tryAsU64(1));
+        assert.ok(other !== null);
+        assert.deepStrictEqual(other.raw, new Uint8Array([3, 3, 3]));
+    });
+    it("should return current item's extrinsic when workItem is null", () => {
+        const items = [buildWorkItem({}), buildWorkItem({ service: 2 })];
+        const extrinsics = asKnownSize([
+            [asExtrinsic(BytesBlob.blobFrom(new Uint8Array([9])))],
+            [asExtrinsic(BytesBlob.blobFrom(new Uint8Array([8])))],
+        ]);
+        const ext = prepareRefineData({ items, extrinsics, currentWorkItemIndex: 1 });
+        const mine = ext.workItemExtrinsic(null, tryAsU64(0));
+        assert.ok(mine !== null);
+        assert.deepStrictEqual(mine.raw, new Uint8Array([8]));
+    });
+    it("should return null for out-of-range extrinsic indices", () => {
+        const items = [buildWorkItem({})];
+        const extrinsics = asKnownSize([
+            [asExtrinsic(BytesBlob.blobFrom(new Uint8Array([1])))],
+        ]);
+        const ext = prepareRefineData({ items, extrinsics });
+        assert.strictEqual(ext.workItemExtrinsic(tryAsU64(5), tryAsU64(0)), null);
+        assert.strictEqual(ext.workItemExtrinsic(tryAsU64(0), tryAsU64(5)), null);
+        assert.strictEqual(ext.workItemExtrinsic(null, tryAsU64(5)), null);
+    });
+    it("should treat U64 indices above the safe-integer range as out of range", () => {
+        const items = [buildWorkItem({})];
+        const ext = prepareRefineData({ items });
+        const huge = tryAsU64(2n ** 53n); // first value > Number.MAX_SAFE_INTEGER
+        assert.strictEqual(ext.workItemExtrinsic(huge, tryAsU64(0)), null);
+        assert.strictEqual(ext.workItemExtrinsic(null, huge), null);
+        assert.strictEqual(ext.workItemImport(huge, tryAsU64(0)), null);
+        assert.strictEqual(ext.oneWorkItem(huge), null);
+        assert.strictEqual(ext.workItemPayload(huge), null);
+    });
+    it("should return an import segment by work item index and segment index", () => {
+        const items = [buildWorkItem({}), buildWorkItem({ service: 2 })];
+        const segBytes = new Uint8Array(SEGMENT_BYTES).fill(0x55);
+        const imports = asKnownSize([
+            [],
+            [{ index: tryAsSegmentIndex(0), data: Bytes.fromBlob(segBytes, SEGMENT_BYTES) }],
+        ]);
+        const ext = prepareRefineData({ items, imports });
+        const imp = ext.workItemImport(tryAsU64(1), tryAsU64(0));
+        assert.ok(imp !== null);
+        assert.deepStrictEqual(imp.raw, segBytes);
+    });
+    it("should return null for out-of-range import indices", () => {
+        const ext = prepareRefineData();
+        assert.strictEqual(ext.workItemImport(tryAsU64(10), tryAsU64(0)), null);
+        assert.strictEqual(ext.workItemImport(null, tryAsU64(10)), null);
+        assert.strictEqual(ext.workItemImport(tryAsU64(0), tryAsU64(10)), null);
+    });
+    it("should return encoded work package", () => {
+        const items = [buildWorkItem({})];
+        const ext = prepareRefineData({ items });
+        const expected = Encoder.encodeObject(WorkPackage.Codec, buildWorkPackage(items), tinyChainSpec);
+        assert.deepStrictEqual(ext.workPackage().raw, expected.raw);
+    });
+    it("should return auth configuration and auth token from the package", () => {
+        const ext = prepareRefineData();
+        assert.deepStrictEqual(ext.authConfiguration().raw, new Uint8Array([4, 5, 6, 7]));
+        assert.deepStrictEqual(ext.authToken().raw, new Uint8Array([1, 2, 3]));
+    });
+    it("should return encoded refine context", () => {
+        const ext = prepareRefineData();
+        const context = RefineContext.create({
+            anchor: Bytes.fill(HASH_SIZE, 1).asOpaque(),
+            stateRoot: Bytes.fill(HASH_SIZE, 2).asOpaque(),
+            beefyRoot: Bytes.fill(HASH_SIZE, 3).asOpaque(),
+            lookupAnchor: Bytes.fill(HASH_SIZE, 4).asOpaque(),
+            lookupAnchorSlot: tryAsTimeSlot(16),
+            prerequisites: [],
+        });
+        const expected = Encoder.encodeObject(RefineContext.Codec, context);
+        assert.deepStrictEqual(ext.refineContext().raw, expected.raw);
+    });
+    it("should return concatenated work item summaries (kind 11) with 62 bytes per item", () => {
+        const items = [
+            buildWorkItem({ service: 1, payloadLen: 7, exportCount: 2, importCount: 1, extrinsicCount: 0 }),
+            buildWorkItem({ service: 2, payloadLen: 4, exportCount: 0, importCount: 0, extrinsicCount: 3 }),
+        ];
+        const ext = prepareRefineData({ items });
+        const all = ext.allWorkItems();
+        assert.strictEqual(all.length, 62 * items.length);
+    });
+    it("should return a single work item summary (kind 12)", () => {
+        const items = [buildWorkItem({ service: 1 }), buildWorkItem({ service: 2, payloadLen: 10 })];
+        const ext = prepareRefineData({ items });
+        const one = ext.oneWorkItem(tryAsU64(1));
+        assert.ok(one !== null);
+        assert.strictEqual(one.length, 62);
+        // first 4 bytes are the service id (u32 LE).
+        const serviceId = new DataView(one.raw.buffer, one.raw.byteOffset, 4).getUint32(0, true);
+        assert.strictEqual(serviceId, 2);
+        // payload length is the last 4 bytes (u32 LE).
+        const payloadLen = new DataView(one.raw.buffer, one.raw.byteOffset + 58, 4).getUint32(0, true);
+        assert.strictEqual(payloadLen, 10);
+    });
+    it("should return null for one work item when index is out of range", () => {
+        const ext = prepareRefineData();
+        assert.strictEqual(ext.oneWorkItem(tryAsU64(99)), null);
+    });
+    it("should return the raw payload of a work item (kind 13)", () => {
+        const items = [buildWorkItem({ service: 1, payloadLen: 2 }), buildWorkItem({ service: 2, payloadLen: 5 })];
+        const ext = prepareRefineData({ items });
+        const payload = ext.workItemPayload(tryAsU64(1));
+        assert.ok(payload !== null);
+        assert.strictEqual(payload.length, 5);
+        assert.ok(payload.raw.every((x) => x === 0xab));
+    });
+    it("should return null for payload when index is out of range", () => {
+        const ext = prepareRefineData();
+        assert.strictEqual(ext.workItemPayload(tryAsU64(99)), null);
+    });
+    // guard against silent accidental changes to the helpers — tryAsU32 ensures
+    // encoded lengths match GP's S(w) spec.
+    it("uses unsigned little-endian u32 for payload length regardless of platform", () => {
+        const items = [buildWorkItem({ service: 1, payloadLen: 0x1234 })];
+        const ext = prepareRefineData({ items });
+        const one = ext.oneWorkItem(tryAsU64(0));
+        assert.ok(one !== null);
+        const payloadLen = new DataView(one.raw.buffer, one.raw.byteOffset + 58, 4).getUint32(0, true);
+        assert.strictEqual(payloadLen, 0x1234);
+        // tryAsU32 would throw on negative values
+        assert.doesNotThrow(() => tryAsU32(0x1234));
+    });
+});

package/packages/jam/in-core/externalities/refine.d.ts

@@ -3,8 +3,8 @@ import type { BytesBlob } from "#@typeberry/bytes";
 import type { PvmBackend } from "#@typeberry/config";
 import type { Blake2bHash } from "#@typeberry/hash";
 import { type MachineId, type MachineResult, type MemoryOperation, NoMachineError, type PagesError, type PeekPokeError, type ProgramCounter, type RefineExternalities, SegmentExportError, type ZeroVoidError } from "#@typeberry/jam-host-calls";
-import type { U64 } from "#@typeberry/numbers";
-import { type HostCallMemory, type HostCallRegisters } from "#@typeberry/pvm-host-calls";
+import { type U64 } from "#@typeberry/numbers";
+import { type HostCallMemory, HostCallRegisters } from "#@typeberry/pvm-host-calls";
 import { type BigGas } from "#@typeberry/pvm-interface";
 import { type ProgramDecoderError } from "#@typeberry/pvm-interpreter";
 import type { State } from "#@typeberry/state";
@@ -48,7 +48,7 @@ export declare class RefineExternalitiesImpl implements RefineExternalities {
     machinePeekFrom(_machineIndex: MachineId, _destinationStart: U64, _sourceStart: U64, _length: U64, _destination: HostCallMemory): Promise<Result<OK, PeekPokeError>>;
     machinePokeInto(_machineIndex: MachineId, _sourceStart: U64, _destinationStart: U64, _length: U64, _source: HostCallMemory): Promise<Result<OK, PeekPokeError>>;
     machineInit(code: BytesBlob, programCounter: ProgramCounter): Promise<Result<MachineId, ProgramDecoderError>>;
-    machineInvoke(_machineIndex: MachineId, _gas: BigGas, _registers: HostCallRegisters): Promise<Result<MachineResult, NoMachineError>>;
+    machineInvoke(machineIndex: MachineId, gas: BigGas, registers: HostCallRegisters): Promise<Result<MachineResult, NoMachineError>>;
     exportSegment(segment: Segment): Result<SegmentIndex, SegmentExportError>;
     historicalLookup(serviceId: ServiceId | null, hash: Blake2bHash): Promise<BytesBlob | null>;
 }

package/packages/jam/in-core/externalities/refine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refine.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/in-core/externalities/refine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"refine.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/in-core/externalities/refine.ts"],"names":[],"mappings":"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"}

package/packages/jam/in-core/externalities/refine.js

@@ -1,11 +1,14 @@
 import { MAX_NUMBER_OF_EXPORTS_WP, tryAsSegmentIndex, } from "#@typeberry/block";
 import { SortedArray } from "#@typeberry/collections";
 import { NoMachineError, SegmentExportError, tryAsMachineId, tryAsProgramCounter, } from "#@typeberry/jam-host-calls";
+import { tryAsU64 } from "#@typeberry/numbers";
 import { Ordering } from "#@typeberry/ordering";
-import { PvmInstanceManager } from "#@typeberry/pvm-host-calls";
-import { tryAsGas } from "#@typeberry/pvm-interface";
+import { HostCallRegisters, PvmInstanceManager } from "#@typeberry/pvm-host-calls";
+import { Status, tryAsBigGas, tryAsGas } from "#@typeberry/pvm-interface";
 import { ProgramDecoder } from "#@typeberry/pvm-interpreter";
 import { Result } from "#@typeberry/utils";
+/** Used when searching by MachineId only — the comparator ignores this field. */
+const NULL_INTERPRETER = undefined;
 const machineComparator = (a, b) => {
     if (a[0] < b[0]) {
         return Ordering.Less;
@@ -42,7 +45,7 @@ export class RefineExternalitiesImpl {
     }
     machineExpunge(machineIndex) {
         // We just care about machineIndex
-        const entry = this.machines.findExact([machineIndex, undefined]);
+        const entry = this.machines.findExact([machineIndex, NULL_INTERPRETER]);
         if (entry === undefined) {
             return Promise.resolve(Result.error(NoMachineError, () => `Machine not found (id: ${machineIndex})`));
         }
@@ -93,8 +96,33 @@ export class RefineExternalitiesImpl {
         this.machines.insert([machineId, innerPvm]);
         return Result.ok(machineId);
     }
-    machineInvoke(_machineIndex, _gas, _registers) {
-        throw new Error("Method not implemented.");
+    machineInvoke(machineIndex, gas, registers) {
+        const entry = this.machines.findExact([machineIndex, NULL_INTERPRETER]);
+        if (entry === undefined) {
+            return Promise.resolve(Result.error(NoMachineError, () => `Machine not found (id: ${machineIndex})`));
+        }
+        const innerPvm = entry[1];
+        // Prepare inner PVM
+        innerPvm.registers.setAllEncoded(registers.getEncoded());
+        innerPvm.gas.set(gas);
+        // Execute program
+        innerPvm.runProgram();
+        // Status
+        const status = innerPvm.getStatus();
+        const exitParam = innerPvm.getExitParam() ?? 0;
+        const remainingGas = tryAsBigGas(innerPvm.gas.get());
+        const outRegisters = HostCallRegisters.fromRaw(new Uint8Array(innerPvm.registers.getAllEncoded()));
+        let machineStatus;
+        if (status === Status.HOST) {
+            machineStatus = { status, hostCallIndex: tryAsU64(exitParam) };
+        }
+        else if (status === Status.FAULT) {
+            machineStatus = { status, address: tryAsU64(exitParam) };
+        }
+        else {
+            machineStatus = { status };
+        }
+        return Promise.resolve(Result.ok({ result: machineStatus, gas: remainingGas, registers: outRegisters }));
     }
     exportSegment(segment) {
         // https://graypaper.fluffylabs.dev/#/ab2cdbd/335d03335d03?v=0.7.2

package/packages/jam/in-core/externalities/refine.test.js

@@ -7,6 +7,8 @@ import { PvmBackend, tinyChainSpec } from "#@typeberry/config";
 import { HASH_SIZE } from "#@typeberry/hash";
 import { SegmentExportError, tryAsMachineId, tryAsProgramCounter } from "#@typeberry/jam-host-calls";
 import { tryAsU32, tryAsU64 } from "#@typeberry/numbers";
+import { HostCallRegisters } from "#@typeberry/pvm-host-calls";
+import { Status, tryAsBigGas } from "#@typeberry/pvm-interface";
 import { InMemoryService, InMemoryState, PreimageItem, ServiceAccountInfo } from "#@typeberry/state";
 import { RefineExternalitiesImpl } from "./refine.js";
 const MINIMAL_PROGRAM = new Uint8Array([0, 1, 1, 0, 0x00]);
@@ -34,7 +36,7 @@ function createMockState(services) {
             preimages.set(hash, item);
         }
         const serviceId = tryAsServiceId(svc.id);
-        serviceMap.set(serviceId, new InMemoryService(serviceId, {
+        serviceMap.set(serviceId, InMemoryService.new(serviceId, {
             info: ServiceAccountInfo.create({
                 codeHash: Bytes.zero(HASH_SIZE).asOpaque(),
                 balance: tryAsU64(1000000000n),
@@ -64,6 +66,9 @@ function createExt(overrides = {}) {
         ...overrides,
     });
 }
+function emptyRegisters() {
+    return HostCallRegisters.empty();
+}
 describe("RefineExternalitiesImpl", () => {
     describe("historicalLookup", () => {
         const PREIMAGE_HASH = "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
@@ -260,4 +265,64 @@ describe("RefineExternalitiesImpl", () => {
             assert.strictEqual(result.ok, tryAsProgramCounter(10));
         });
     });
+    describe("machineInvoke", () => {
+        it("should return NoMachineError for non-existent machine", async () => {
+            const ext = createExt();
+            const regs = emptyRegisters();
+            const result = await ext.machineInvoke(tryAsMachineId(999), tryAsBigGas(1000n), regs);
+            assert.strictEqual(result.isError, true);
+        });
+        it("should execute inner PVM and return PANIC for TRAP instruction", async () => {
+            const ext = createExt();
+            const code = BytesBlob.blobFrom(MINIMAL_PROGRAM);
+            const initResult = await ext.machineInit(code, tryAsProgramCounter(0));
+            assert.strictEqual(initResult.isOk, true);
+            const machineId = initResult.ok;
+            const regs = emptyRegisters();
+            const result = await ext.machineInvoke(machineId, tryAsBigGas(1000n), regs);
+            assert.strictEqual(result.isOk, true);
+            assert.strictEqual(result.ok.result.status, Status.PANIC);
+        });
+        it("should return OOG when gas is exhausted", async () => {
+            const ext = createExt();
+            const code = BytesBlob.blobFrom(MINIMAL_PROGRAM);
+            const initResult = await ext.machineInit(code, tryAsProgramCounter(0));
+            assert.strictEqual(initResult.isOk, true);
+            const machineId = initResult.ok;
+            const regs = emptyRegisters();
+            // With 0 gas, should immediately OOG
+            const result = await ext.machineInvoke(machineId, tryAsBigGas(0n), regs);
+            assert.strictEqual(result.isOk, true);
+            assert.strictEqual(result.ok.result.status, Status.OOG);
+        });
+        it("should pass registers to inner PVM and return them back", async () => {
+            const ext = createExt();
+            const code = BytesBlob.blobFrom(MINIMAL_PROGRAM);
+            const initResult = await ext.machineInit(code, tryAsProgramCounter(0));
+            assert.strictEqual(initResult.isOk, true);
+            const machineId = initResult.ok;
+            const regs = emptyRegisters();
+            regs.set(0, tryAsU64(0xdeadbeefn));
+            regs.set(5, tryAsU64(0xcafebaben));
+            const result = await ext.machineInvoke(machineId, tryAsBigGas(1000n), regs);
+            assert.strictEqual(result.isOk, true);
+            // Registers should be returned (TRAP doesn't modify registers)
+            assert.strictEqual(result.ok.registers.get(0), tryAsU64(0xdeadbeefn));
+            assert.strictEqual(result.ok.registers.get(5), tryAsU64(0xcafebaben));
+        });
+        it("should return remaining gas after execution", async () => {
+            const ext = createExt();
+            const code = BytesBlob.blobFrom(MINIMAL_PROGRAM);
+            const initResult = await ext.machineInit(code, tryAsProgramCounter(0));
+            assert.strictEqual(initResult.isOk, true);
+            const machineId = initResult.ok;
+            const regs = emptyRegisters();
+            const result = await ext.machineInvoke(machineId, tryAsBigGas(1000n), regs);
+            assert.strictEqual(result.isOk, true);
+            // TRAP costs 1 gas, so remaining should be 999
+            const remaining = Number(result.ok.gas);
+            assert.ok(remaining < 1000);
+            assert.ok(remaining >= 0);
+        });
+    });
 });

package/packages/jam/in-core/in-core.d.ts

@@ -7,8 +7,8 @@ import type { ChainSpec, PvmBackend } from "#@typeberry/config";
 import type { StatesDb } from "#@typeberry/database";
 import type { Blake2b, WithHash } from "#@typeberry/hash";
 import { Result } from "#@typeberry/utils";
-import { type ImportedSegment, type PerWorkItem } from "./refine.js";
-export type { ImportedSegment, PerWorkItem, RefineItemResult } from "./refine.js";
+import type { ImportedSegment, PerWorkItem } from "./externalities/index.js";
+export type { ImportedSegment, PerWorkItem };
 export type RefineResult = {
     report: WorkReport;
     exports: PerWorkItem<Segment[]>;
@@ -28,7 +28,8 @@ export declare class InCore {
     private readonly states;
     private readonly isAuthorized;
     private readonly refineItem;
-    constructor(chainSpec: ChainSpec, states: StatesDb, pvmBackend: PvmBackend, blake2b: Blake2b);
+    static new(chainSpec: ChainSpec, states: StatesDb, pvmBackend: PvmBackend, blake2b: Blake2b): InCore;
+    private constructor();
     /**
      * Work-report computation function.
      *

package/packages/jam/in-core/in-core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"in-core.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/in-core/in-core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAsB,KAAK,eAAe,EAAmB,MAAM,oCAAoC,CAAC;AAC/G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAmB,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG9E,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIzD,OAAO,EAAe,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAiC,MAAM,aAAa,CAAC;AAEpG,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAElF,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;CACjC,CAAC;AAEF,oBAAY,WAAW;IACrB,8EAA8E;IAC9E,YAAY,IAAI;IAChB,qFAAqF;IACrF,iBAAiB,IAAI;IACrB,wEAAwE;IACxE,uBAAuB,IAAI;IAC3B,2BAA2B;IAC3B,kBAAkB,IAAI;CACvB;AAID,qBAAa,MAAM;aAKC,SAAS,EAAE,SAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAGlB,SAAS,EAAE,SAAS,EACnB,MAAM,EAAE,QAAQ,EACjC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO;IAMlB;;;;;;;;;OASG;IACG,MAAM,CACV,kBAAkB,EAAE,QAAQ,CAAC,eAAe,EAAE,WAAW,CAAC,EAC1D,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,WAAW,CAAC,eAAe,EAAE,CAAC,EACvC,UAAU,EAAE,WAAW,CAAC,iBAAiB,EAAE,CAAC,GAC3C,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAwF7C,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAsDpC"}
+{"version":3,"file":"in-core.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/in-core/in-core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAsB,KAAK,eAAe,EAAmB,MAAM,oCAAoC,CAAC;AAC/G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAmB,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG9E,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAKzD,OAAO,EAAe,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE7E,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,CAAC;AAI7C,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;CACjC,CAAC;AAEF,oBAAY,WAAW;IACrB,8EAA8E;IAC9E,YAAY,IAAI;IAChB,qFAAqF;IACrF,iBAAiB,IAAI;IACrB,wEAAwE;IACxE,uBAAuB,IAAI;IAC3B,2BAA2B;IAC3B,kBAAkB,IAAI;CACvB;AAID,qBAAa,MAAM;aASC,SAAS,EAAE,SAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IATzB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IAEpC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IAI3F,OAAO;IAUP;;;;;;;;;OASG;IACG,MAAM,CACV,kBAAkB,EAAE,QAAQ,CAAC,eAAe,EAAE,WAAW,CAAC,EAC1D,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,WAAW,CAAC,eAAe,EAAE,CAAC,EACvC,UAAU,EAAE,WAAW,CAAC,iBAAiB,EAAE,CAAC,GAC3C,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAoF7C,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAsDpC"}

package/packages/jam/in-core/in-core.js

@@ -5,6 +5,7 @@ import { asKnownSize, FixedSizeArray } from "#@typeberry/collections";
 import { HASH_SIZE } from "#@typeberry/hash";
 import { Logger } from "#@typeberry/logger";
 import { tryAsU8, tryAsU16, tryAsU32 } from "#@typeberry/numbers";
+import { buildWorkPackageFetchData } from "#@typeberry/transition/externalities/fetch-externalities.js";
 import { assertEmpty, Result } from "#@typeberry/utils";
 import { AuthorizationError, IsAuthorized } from "./is-authorized.js";
 import { Refine } from "./refine.js";
@@ -25,6 +26,9 @@ export class InCore {
     states;
     isAuthorized;
     refineItem;
+    static new(chainSpec, states, pvmBackend, blake2b) {
+        return new InCore(chainSpec, states, pvmBackend, blake2b);
+    }
     constructor(chainSpec, states, pvmBackend, blake2b) {
         this.chainSpec = chainSpec;
         this.states = states;
@@ -43,8 +47,7 @@ export class InCore {
      */
     async refine(workPackageAndHash, core, imports, extrinsics) {
         const workPackageHash = workPackageAndHash.hash;
-        const { context, authToken, authCodeHash, authCodeHost, authConfiguration, items, ...rest } = workPackageAndHash.data;
-        assertEmpty(rest);
+        const { context, items } = workPackageAndHash.data;
         // TODO [ToDr] Verify BEEFY root
         // TODO [ToDr] Verify prerequisites
         logger.log `[core:${core}] Attempting to refine work package with ${items.length} items.`;
@@ -69,8 +72,10 @@ export class InCore {
         if (lookupState.timeslot !== context.lookupAnchorSlot) {
             return Result.error(RefineError.InvalidLookupAnchorSlot, () => `Lookup anchor slot does not match the one is state. Ours: ${lookupState.timeslot}, expected: ${context.lookupAnchorSlot}`);
         }
+        // Eagerly build the per-package fetch data so we pay the encoding cost
+        const packageFetchData = buildWorkPackageFetchData(this.chainSpec, workPackageAndHash.data);
         // Check authorization
-        const authResult = await this.isAuthorized.invoke(state, core, authToken, authCodeHost, authCodeHash, authConfiguration);
+        const authResult = await this.isAuthorized.invoke(state, core, packageFetchData);
         if (authResult.isError) {
             return Result.error(RefineError.AuthorizationError, () => `Authorization error: ${AuthorizationError[authResult.error]}: ${authResult.details()}.`);
         }
@@ -80,7 +85,7 @@ export class InCore {
         const refineResults = [];
         for (const [idx, item] of items.entries()) {
             logger.info `[core:${core}][i:${idx}] Refining item for service ${item.service}.`;
-            const result = await this.refineItem.invoke(state, lookupState, idx, item, imports, extrinsics, core, workPackageHash, exportOffset);
+            const result = await this.refineItem.invoke(state, lookupState, packageFetchData, idx, item, imports, extrinsics, core, workPackageHash, exportOffset, authResult.ok.authorizationOutput);
             refineResults.push(result);
             exportOffset += result.exports.length;
         }

package/packages/jam/in-core/in-core.test.js

@@ -26,7 +26,7 @@ function getAuthCodeHash() {
     return blake2b.hashBytes(AUTHORIZER_PVM).asOpaque();
 }
 function createService(serviceId, codeHash, code) {
-    return new InMemoryService(serviceId, {
+    return InMemoryService.new(serviceId, {
         info: ServiceAccountInfo.create({
             codeHash: codeHash.asOpaque(),
             balance: tryAsU64(10_000_000_000),
@@ -77,13 +77,13 @@ function hashWorkPackage(spec, workPackage) {
     const workPackageHash = blake2b
         .hashBytes(Encoder.encodeObject(WorkPackage.Codec, workPackage, spec))
         .asOpaque();
-    return new WithHash(workPackageHash, workPackage);
+    return WithHash.new(workPackageHash, workPackage);
 }
 describe("InCore", () => {
     it("should return StateMissing error when anchor block state is not in DB", async () => {
         const spec = tinyChainSpec;
-        const states = new InMemoryStates(spec);
-        const inCore = new InCore(spec, states, PvmBackend.BuiltIn, blake2b);
+        const states = InMemoryStates.new(spec);
+        const inCore = InCore.new(spec, states, PvmBackend.BuiltIn, blake2b);
         const anchorHash = Bytes.fill(HASH_SIZE, 1).asOpaque();
         const stateRoot = Bytes.zero(HASH_SIZE).asOpaque();
         const authCodeHash = getAuthCodeHash();
@@ -94,8 +94,8 @@ describe("InCore", () => {
     });
     it("should refine work package and produce a report when state is set up", async () => {
         const spec = tinyChainSpec;
-        const states = new InMemoryStates(spec);
-        const inCore = new InCore(spec, states, PvmBackend.BuiltIn, blake2b);
+        const states = InMemoryStates.new(spec);
+        const inCore = InCore.new(spec, states, PvmBackend.BuiltIn, blake2b);
         const authCodeHash = getAuthCodeHash();
         const anchorHash = Bytes.fill(HASH_SIZE, 1).asOpaque();
         const state = InMemoryState.partial(spec, {

package/packages/jam/in-core/is-authorized.d.ts

@@ -1,9 +1,10 @@
-import { type CodeHash, type CoreIndex, type ServiceGas, type ServiceId } from "#@typeberry/block";
+import { type CoreIndex, type ServiceGas } from "#@typeberry/block";
 import type { AuthorizerHash } from "#@typeberry/block/refine-context.js";
 import { BytesBlob } from "#@typeberry/bytes";
 import type { ChainSpec, PvmBackend } from "#@typeberry/config";
 import type { Blake2b } from "#@typeberry/hash";
 import type { State } from "#@typeberry/state";
+import type { WorkPackageFetchData } from "#@typeberry/transition/externalities/fetch-externalities.js";
 import { Result } from "#@typeberry/utils";
 export declare enum AuthorizationError {
     /** BAD: authorizer code not found (service or preimage missing). */
@@ -28,6 +29,6 @@ export declare class IsAuthorized {
     private readonly pvmBackend;
     private readonly blake2b;
     constructor(chainSpec: ChainSpec, pvmBackend: PvmBackend, blake2b: Blake2b);
-    invoke(state: State, coreIndex: CoreIndex, authToken: BytesBlob, authCodeHost: ServiceId, authCodeHash: CodeHash, authConfiguration: BytesBlob): Promise<Result<AuthorizationOk, AuthorizationError>>;
+    invoke(state: State, coreIndex: CoreIndex, packageFetchData: WorkPackageFetchData): Promise<Result<AuthorizationOk, AuthorizationError>>;
 }
 //# sourceMappingURL=is-authorized.d.ts.map

package/packages/jam/in-core/is-authorized.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-authorized.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/in-core/is-authorized.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AAEnH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,oBAAY,kBAAkB;IAC5B,oEAAoE;IACpE,YAAY,IAAI;IAChB,8CAA8C;IAC9C,UAAU,IAAI;IACd,uCAAuC;IACvC,SAAS,IAAI;CACd;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,EAAE,cAAc,CAAC;IAC/B,oBAAoB,EAAE,UAAU,CAAC;IACjC,mBAAmB,EAAE,SAAS,CAAC;CAChC,CAAC;AAMF;;;;GAIG;AACH,qBAAa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFP,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO;IAG7B,MAAM,CACV,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,SAAS,EACvB,YAAY,EAAE,QAAQ,EACtB,iBAAiB,EAAE,SAAS,GAC3B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;CA+DxD"}
+{"version":3,"file":"is-authorized.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/in-core/is-authorized.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAEpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAC;AACvG,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,oBAAY,kBAAkB;IAC5B,oEAAoE;IACpE,YAAY,IAAI;IAChB,8CAA8C;IAC9C,UAAU,IAAI;IACd,uCAAuC;IACvC,SAAS,IAAI;CACd;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,EAAE,cAAc,CAAC;IAC/B,oBAAoB,EAAE,UAAU,CAAC;IACjC,mBAAmB,EAAE,SAAS,CAAC;CAChC,CAAC;AAMF;;;;GAIG;AACH,qBAAa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFP,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO;IAG7B,MAAM,CACV,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,oBAAoB,GACrC,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;CAiExD"}

package/packages/jam/in-core/is-authorized.js

@@ -3,8 +3,8 @@ import { G_I, W_A } from "#@typeberry/block/gp-constants.js";
 import { BytesBlob } from "#@typeberry/bytes";
 import { codec, Encoder } from "#@typeberry/codec";
 import { PvmExecutor, ReturnStatus } from "#@typeberry/executor";
-import { IsAuthorizedFetchExternalities } from "#@typeberry/transition/externalities/is-authorized-fetch-externalities.js";
 import { Result } from "#@typeberry/utils";
+import { IsAuthorizedFetchExternalities } from "./externalities/index.js";
 export var AuthorizationError;
 (function (AuthorizationError) {
     /** BAD: authorizer code not found (service or preimage missing). */
@@ -31,7 +31,11 @@ export class IsAuthorized {
         this.pvmBackend = pvmBackend;
         this.blake2b = blake2b;
     }
-    async invoke(state, coreIndex, authToken, authCodeHost, authCodeHash, authConfiguration) {
+    async invoke(state, coreIndex, packageFetchData) {
+        const packageView = packageFetchData.packageView;
+        const authCodeHost = packageView.authCodeHost.materialize();
+        const authCodeHash = packageView.authCodeHash.materialize();
+        const authConfiguration = packageView.authConfiguration.materialize();
         // Look up the authorizer code from the auth code host service
         const service = state.getService(authCodeHost);
         // https://graypaper.fluffylabs.dev/#/ab2cdbd/2eca002eca00?v=0.7.2
@@ -48,10 +52,7 @@ export class IsAuthorized {
             return Result.error(AuthorizationError.CodeTooBig, () => `Auth code is too big: ${code.length} bytes vs ${W_A} max.`);
         }
         // Prepare fetch externalities and executor
-        const fetchExternalities = new IsAuthorizedFetchExternalities(this.chainSpec, {
-            authToken,
-            authConfiguration,
-        });
+        const fetchExternalities = new IsAuthorizedFetchExternalities(this.chainSpec, packageFetchData);
         const executor = await PvmExecutor.createIsAuthorizedExecutor(authCodeHost, code, { fetchExternalities }, this.pvmBackend);
         const args = Encoder.encodeObject(AUTH_ARGS_CODEC, {
             coreIndex,