@typeberry/lib 0.5.10-ec38e0b → 0.5.11-10b197e

package/packages/jam/fuzz-proto/v1/handler.js

@@ -8,6 +8,9 @@ export class FuzzTarget {
     sender;
     spec;
     sessionFeatures = 0;
+    static new(msgHandler, sender, spec) {
+        return new FuzzTarget(msgHandler, sender, spec);
+    }
     constructor(msgHandler, sender, spec) {
         this.msgHandler = msgHandler;
         this.sender = sender;

package/packages/jam/fuzz-proto/v1/handler.test.js

@@ -70,7 +70,7 @@ describe("FuzzV1Target Handler", () => {
                 value: responsePeerInfo,
             };
             mockMessageHandler.getPeerInfo.mock.mockImplementation(async () => responsePeerInfo);
-            const fuzzTarget = new FuzzTarget(mockMessageHandler, mockSender, spec);
+            const fuzzTarget = FuzzTarget.new(mockMessageHandler, mockSender, spec);
             const testMessage = encode(incomingMessage);
             await fuzzTarget.onSocketMessage(testMessage);
             // Verify handshake completion and feature negotiation
@@ -116,7 +116,7 @@ describe("FuzzV1Target Handler", () => {
                 value: expectedStateRoot,
             };
             mockMessageHandler.initialize.mock.mockImplementation(async () => expectedStateRoot);
-            const fuzzTarget = new FuzzTarget(mockMessageHandler, mockSender, spec);
+            const fuzzTarget = FuzzTarget.new(mockMessageHandler, mockSender, spec);
             await completeHandshake(mockMessageHandler, mockSender, fuzzTarget);
             mockSender._sentData = []; // Clear handshake response
             const testMessage = encode(incomingMessage);
@@ -144,7 +144,7 @@ describe("FuzzV1Target Handler", () => {
                 value: expectedStateRoot,
             };
             mockMessageHandler.importBlock.mock.mockImplementation(async () => Result.ok(expectedStateRoot));
-            const fuzzTarget = new FuzzTarget(mockMessageHandler, mockSender, spec);
+            const fuzzTarget = FuzzTarget.new(mockMessageHandler, mockSender, spec);
             await completeHandshake(mockMessageHandler, mockSender, fuzzTarget);
             mockSender._sentData = []; // Clear handshake response
             const testMessage = encode(incomingMessage);
@@ -169,7 +169,7 @@ describe("FuzzV1Target Handler", () => {
                 value: expectedError,
             };
             mockMessageHandler.importBlock.mock.mockImplementation(async () => Result.error(expectedError, () => "Test: ImportBlock error"));
-            const fuzzTarget = new FuzzTarget(mockMessageHandler, mockSender, spec);
+            const fuzzTarget = FuzzTarget.new(mockMessageHandler, mockSender, spec);
             await completeHandshake(mockMessageHandler, mockSender, fuzzTarget);
             mockSender._sentData = []; // Clear handshake response
             const testMessage = encode(incomingMessage);
@@ -205,7 +205,7 @@ describe("FuzzV1Target Handler", () => {
                 value: keyValues,
             };
             mockMessageHandler.getSerializedState.mock.mockImplementation(async () => keyValues);
-            const fuzzTarget = new FuzzTarget(mockMessageHandler, mockSender, spec);
+            const fuzzTarget = FuzzTarget.new(mockMessageHandler, mockSender, spec);
             await completeHandshake(mockMessageHandler, mockSender, fuzzTarget);
             mockSender._sentData = []; // Clear handshake response
             const testMessage = encode(incomingMessage);
@@ -227,7 +227,7 @@ describe("FuzzV1Target Handler", () => {
                 type: MessageType.StateRoot,
                 value: stateRoot,
             };
-            const fuzzTarget = new FuzzTarget(mockMessageHandler, mockSender, spec);
+            const fuzzTarget = FuzzTarget.new(mockMessageHandler, mockSender, spec);
             await completeHandshake(mockMessageHandler, mockSender, fuzzTarget);
             mockSender._sentData = []; // Clear handshake response
             const testMessage = encode(incomingMessage);
@@ -248,7 +248,7 @@ describe("FuzzV1Target Handler", () => {
                 type: MessageType.State,
                 value: keyValues,
             };
-            const fuzzTarget = new FuzzTarget(mockMessageHandler, mockSender, spec);
+            const fuzzTarget = FuzzTarget.new(mockMessageHandler, mockSender, spec);
             await completeHandshake(mockMessageHandler, mockSender, fuzzTarget);
             mockSender._sentData = []; // Clear handshake response
             const testMessage = encode(incomingMessage);
@@ -264,7 +264,7 @@ describe("FuzzV1Target Handler", () => {
                 type: MessageType.Error,
                 value: error,
             };
-            const fuzzTarget = new FuzzTarget(mockMessageHandler, mockSender, spec);
+            const fuzzTarget = FuzzTarget.new(mockMessageHandler, mockSender, spec);
             await completeHandshake(mockMessageHandler, mockSender, fuzzTarget);
             mockSender._sentData = []; // Clear handshake response
             const testMessage = encode(incomingMessage);
@@ -277,7 +277,7 @@ describe("FuzzV1Target Handler", () => {
         it("should handle decoding error gracefully", async () => {
             const mockMessageHandler = new MockV1MessageHandler();
             const mockSender = new MockSender();
-            const fuzzTarget = new FuzzTarget(mockMessageHandler, mockSender, spec);
+            const fuzzTarget = FuzzTarget.new(mockMessageHandler, mockSender, spec);
             // Create malformed message with valid length prefix but invalid data
             const malformedMessage = new Uint8Array(8);
             const dataView = new DataView(malformedMessage.buffer);
@@ -300,7 +300,7 @@ describe("FuzzV1Target Handler", () => {
         return Decoder.decodeObject(messageCodec, data, spec);
     }
     async function completeHandshake(mockMessageHandler, mockSender, fuzzTarget) {
-        const target = fuzzTarget ?? new FuzzTarget(mockMessageHandler, mockSender, spec);
+        const target = fuzzTarget ?? FuzzTarget.new(mockMessageHandler, mockSender, spec);
         const inputPeerInfo = PeerInfo.create({
             fuzzVersion: tryAsU8(1),
             features: tryAsU32(Features.Ancestry),

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

@@ -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;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;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;IAwF7C,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAsDpC"}

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

@@ -25,6 +25,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;

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.test.js

@@ -20,7 +20,7 @@ before(async () => {
 const AUTHORIZER_PVM = BytesBlob.blobFrom(readFileSync(resolve(import.meta.dirname, "fixtures/authorizer.pvm")));
 const AUTH_SERVICE_ID = tryAsServiceId(42);
 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),
@@ -96,7 +96,7 @@ describe("IsAuthorized", () => {
     it("should fail when auth code preimage is missing", async () => {
         const authCodeHash = getAuthCodeHash();
         // Service exists but with no preimages
-        const emptyService = new InMemoryService(AUTH_SERVICE_ID, {
+        const emptyService = InMemoryService.new(AUTH_SERVICE_ID, {
             info: ServiceAccountInfo.create({
                 codeHash: Bytes.zero(HASH_SIZE).asOpaque(),
                 balance: tryAsU64(0),

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

@@ -161,7 +161,7 @@ export class Refine {
     }
     createRefineExternalities(args) {
         // TODO [ToDr] Pass all required fetch data
-        const fetchExternalities = new RefineFetchExternalities(this.chainSpec);
+        const fetchExternalities = RefineFetchExternalities.new(this.chainSpec);
         const refine = RefineExternalitiesImpl.create({
             currentServiceId: args.currentServiceId,
             lookupState: args.lookupState,

package/packages/jam/jam-host-calls/accumulate/assign.d.ts

@@ -16,7 +16,8 @@ export declare class Assign 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]">;
     tracedRegisters: (number & import("@typeberry/utils").WithOpaque<"register index">)[];
-    constructor(currentServiceId: ServiceId, partialState: PartialState, chainSpec: ChainSpec);
+    static new(currentServiceId: ServiceId, partialState: PartialState, chainSpec: ChainSpec): Assign;
+    private constructor();
     execute(_gas: IGasCounter, regs: HostCallRegisters, memory: HostCallMemory): Promise<undefined | PvmExecution>;
 }
 //# sourceMappingURL=assign.d.ts.map

package/packages/jam/jam-host-calls/accumulate/assign.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assign.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jam-host-calls/accumulate/assign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAkB,MAAM,kBAAkB,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAE,YAAY,EAAsC,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,0BAA0B,CAAC;AAG3E,OAAO,EAAE,KAAK,YAAY,EAAyB,MAAM,mCAAmC,CAAC;AAO7F;;;;GAIG;AACH,qBAAa,MAAO,YAAW,eAAe;aAM1B,gBAAgB,EAAE,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAP5B,KAAK,iIAA0B;IAC/B,YAAY,4HAAqB;IACjC,eAAe,uEAAiC;gBAG9B,gBAAgB,EAAE,SAAS,EAC1B,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS;IAGjC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;CAkDrH"}
+{"version":3,"file":"assign.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jam-host-calls/accumulate/assign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAkB,MAAM,kBAAkB,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAE,YAAY,EAAsC,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,0BAA0B,CAAC;AAG3E,OAAO,EAAE,KAAK,YAAY,EAAyB,MAAM,mCAAmC,CAAC;AAO7F;;;;GAIG;AACH,qBAAa,MAAO,YAAW,eAAe;aAU1B,gBAAgB,EAAE,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAX5B,KAAK,iIAA0B;IAC/B,YAAY,4HAAqB;IACjC,eAAe,uEAAiC;IAEhD,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS;IAIxF,OAAO;IAMD,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;CAkDrH"}

package/packages/jam/jam-host-calls/accumulate/assign.js

@@ -23,6 +23,9 @@ export class Assign {
     index = tryAsHostCallIndex(15);
     basicGasCost = tryAsSmallGas(10);
     tracedRegisters = traceRegisters(IN_OUT_REG, 8);
+    static new(currentServiceId, partialState, chainSpec) {
+        return new Assign(currentServiceId, partialState, chainSpec);
+    }
     constructor(currentServiceId, partialState, chainSpec) {
         this.currentServiceId = currentServiceId;
         this.partialState = partialState;

package/packages/jam/jam-host-calls/accumulate/assign.test.js

@@ -18,7 +18,6 @@ import { Result } from "#@typeberry/utils";
 import { UpdatePrivilegesError } from "../externalities/partial-state.js";
 import { PartialStateMock } from "../externalities/partial-state-mock.js";
 import { HostCallResult } from "../general/results.js";
-import { emptyRegistersBuffer } from "../utils.js";
 import { Assign } from "./assign.js";
 const gas = gasCounter(tryAsGas(0));
 const RESULT_REG = 7;
@@ -27,7 +26,7 @@ const AUTH_QUEUE_START_REG = 8;
 const AUTH_MANAGER_REG = 9;
 function prepareRegsAndMemory(coreIndex, authQueue, { skipAuthQueue = false, assigners = null } = {}) {
     const memStart = 2 ** 16;
-    const registers = new HostCallRegisters(emptyRegistersBuffer());
+    const registers = HostCallRegisters.empty();
     registers.set(CORE_INDEX_REG, tryAsU64(coreIndex));
     registers.set(AUTH_QUEUE_START_REG, tryAsU64(memStart));
     if (assigners !== null) {
@@ -43,7 +42,7 @@ function prepareRegsAndMemory(coreIndex, authQueue, { skipAuthQueue = false, ass
     if (!skipAuthQueue) {
         builder.setReadablePages(tryAsMemoryIndex(memStart), tryAsMemoryIndex(memStart + PAGE_SIZE), data.raw);
     }
-    const memory = new HostCallMemory(builder.finalize(tryAsMemoryIndex(0), tryAsSbrkIndex(0)));
+    const memory = HostCallMemory.new(builder.finalize(tryAsMemoryIndex(0), tryAsSbrkIndex(0)));
     return {
         registers,
         memory,
@@ -53,7 +52,7 @@ describe("HostCalls: Assign", () => {
     it("should assign authorization queue to a core", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
-        const assign = new Assign(serviceId, accumulate, tinyChainSpec);
+        const assign = Assign.new(serviceId, accumulate, tinyChainSpec);
         const { registers, memory } = prepareRegsAndMemory(tryAsCoreIndex(0), [
             Bytes.fill(HASH_SIZE, 1),
             Bytes.fill(HASH_SIZE, 2),
@@ -79,7 +78,7 @@ describe("HostCalls: Assign", () => {
     it("should return an error if core index is too large", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
-        const assign = new Assign(serviceId, accumulate, tinyChainSpec);
+        const assign = Assign.new(serviceId, accumulate, tinyChainSpec);
         const { registers, memory } = prepareRegsAndMemory(tryAsCoreIndex(3), []);
         // when
         const result = await assign.execute(gas, registers, memory);
@@ -91,7 +90,7 @@ describe("HostCalls: Assign", () => {
     it("should return an error if core index is waay too large", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
-        const assign = new Assign(serviceId, accumulate, tinyChainSpec);
+        const assign = Assign.new(serviceId, accumulate, tinyChainSpec);
         const { registers, memory } = prepareRegsAndMemory(tryAsCoreIndex(3), []);
         registers.set(CORE_INDEX_REG, tryAsU64(2 ** 16 + 3));
         // when
@@ -104,7 +103,7 @@ describe("HostCalls: Assign", () => {
     it("should return panic if data not readable", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
-        const assign = new Assign(serviceId, accumulate, tinyChainSpec);
+        const assign = Assign.new(serviceId, accumulate, tinyChainSpec);
         const { registers, memory } = prepareRegsAndMemory(tryAsCoreIndex(3), [], { skipAuthQueue: true });
         // when
         const result = await assign.execute(gas, registers, memory);
@@ -116,7 +115,7 @@ describe("HostCalls: Assign", () => {
         const accumulate = new PartialStateMock();
         accumulate.authQueueResponse = Result.error(UpdatePrivilegesError.UnprivilegedService, () => "Test: unprivileged service attempting assign");
         const serviceId = tryAsServiceId(10_000);
-        const assign = new Assign(serviceId, accumulate, tinyChainSpec);
+        const assign = Assign.new(serviceId, accumulate, tinyChainSpec);
         const { registers, memory } = prepareRegsAndMemory(tryAsCoreIndex(0), [], { assigners: 0 });
         // when
         const result = await assign.execute(gas, registers, memory);
@@ -129,7 +128,7 @@ describe("HostCalls: Assign", () => {
         const accumulate = new PartialStateMock();
         accumulate.authQueueResponse = Result.error(UpdatePrivilegesError.InvalidServiceId, () => "Test: invalid service ID for assign");
         const serviceId = tryAsServiceId(10_000);
-        const assign = new Assign(serviceId, accumulate, tinyChainSpec);
+        const assign = Assign.new(serviceId, accumulate, tinyChainSpec);
         const { registers, memory } = prepareRegsAndMemory(tryAsCoreIndex(0), [], { assigners: null });
         // when
         const result = await assign.execute(gas, registers, memory);

package/packages/jam/jam-host-calls/accumulate/bless.d.ts

@@ -16,7 +16,8 @@ export declare class Bless 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]">;
     tracedRegisters: (number & import("@typeberry/utils").WithOpaque<"register index">)[];
-    constructor(currentServiceId: ServiceId, partialState: PartialState, chainSpec: ChainSpec);
+    static new(currentServiceId: ServiceId, partialState: PartialState, chainSpec: ChainSpec): Bless;
+    private constructor();
     execute(_gas: IGasCounter, regs: HostCallRegisters, memory: HostCallMemory): Promise<undefined | PvmExecution>;
 }
 //# sourceMappingURL=bless.d.ts.map

package/packages/jam/jam-host-calls/accumulate/bless.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bless.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jam-host-calls/accumulate/bless.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AAEpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAE,YAAY,EAAsC,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,0BAA0B,CAAC;AAG3E,OAAO,EAAE,KAAK,YAAY,EAAyB,MAAM,mCAAmC,CAAC;AAkB7F;;;;GAIG;AACH,qBAAa,KAAM,YAAW,eAAe;aAMzB,gBAAgB,EAAE,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAP5B,KAAK,iIAA0B;IAC/B,YAAY,4HAAqB;IACjC,eAAe,uEAAgD;gBAG7C,gBAAgB,EAAE,SAAS,EAC1B,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS;IAGjC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;CAkFrH"}
+{"version":3,"file":"bless.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jam-host-calls/accumulate/bless.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AAEpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAE,YAAY,EAAsC,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,0BAA0B,CAAC;AAG3E,OAAO,EAAE,KAAK,YAAY,EAAyB,MAAM,mCAAmC,CAAC;AAkB7F;;;;GAIG;AACH,qBAAa,KAAM,YAAW,eAAe;aAUzB,gBAAgB,EAAE,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAX5B,KAAK,iIAA0B;IAC/B,YAAY,4HAAqB;IACjC,eAAe,uEAAgD;IAE/D,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS;IAIxF,OAAO;IAMD,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;CAkFrH"}

package/packages/jam/jam-host-calls/accumulate/bless.js

@@ -26,6 +26,9 @@ export class Bless {
     index = tryAsHostCallIndex(14);
     basicGasCost = tryAsSmallGas(10);
     tracedRegisters = traceRegisters(IN_OUT_REG, 8, 9, 10, 11, 12);
+    static new(currentServiceId, partialState, chainSpec) {
+        return new Bless(currentServiceId, partialState, chainSpec);
+    }
     constructor(currentServiceId, partialState, chainSpec) {
         this.currentServiceId = currentServiceId;
         this.partialState = partialState;

package/packages/jam/jam-host-calls/accumulate/bless.test.js

@@ -15,7 +15,6 @@ import { deepEqual, Result } from "#@typeberry/utils";
 import { UpdatePrivilegesError } from "../externalities/partial-state.js";
 import { PartialStateMock } from "../externalities/partial-state-mock.js";
 import { HostCallResult } from "../general/results.js";
-import { emptyRegistersBuffer } from "../utils.js";
 import { Bless } from "./bless.js";
 const gas = gasCounter(tryAsGas(0));
 const RESULT_REG = 7;
@@ -40,7 +39,7 @@ function prepareAuthorizers() {
 function prepareRegsAndMemory(entries, authorizerData, { skipDictionary = false, skipAuth = false, manager, validator, registrar, } = {}) {
     const memAuthStart = 2 ** 24;
     const memStart = 2 ** 16;
-    const registers = new HostCallRegisters(emptyRegistersBuffer());
+    const registers = HostCallRegisters.empty();
     registers.set(MANAGER_REG, manager ?? tryAsU64(5));
     registers.set(AUTHORIZATION_REG, tryAsU64(memAuthStart));
     registers.set(VALIDATOR_REG, validator ?? tryAsU64(20));
@@ -61,7 +60,7 @@ function prepareRegsAndMemory(entries, authorizerData, { skipDictionary = false,
     if (!skipAuth) {
         builder.setReadablePages(tryAsMemoryIndex(memAuthStart), tryAsMemoryIndex(memAuthStart + PAGE_SIZE), dataAuth.raw);
     }
-    const memory = new HostCallMemory(builder.finalize(tryAsMemoryIndex(0), tryAsSbrkIndex(0)));
+    const memory = HostCallMemory.new(builder.finalize(tryAsMemoryIndex(0), tryAsSbrkIndex(0)));
     return {
         registers,
         memory,
@@ -71,7 +70,7 @@ describe("HostCalls: Bless", () => {
     it("should set new privileged services and auto-accumulate services", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
-        const bless = new Bless(serviceId, accumulate, tinyChainSpec);
+        const bless = Bless.new(serviceId, accumulate, tinyChainSpec);
         const entries = prepareServiceGasMap();
         const authorizers = prepareAuthorizers();
         const { registers, memory } = prepareRegsAndMemory(entries, authorizers);
@@ -93,7 +92,7 @@ describe("HostCalls: Bless", () => {
     it("should return panic when dictionary is not readable", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
-        const bless = new Bless(serviceId, accumulate, tinyChainSpec);
+        const bless = Bless.new(serviceId, accumulate, tinyChainSpec);
         const entries = prepareServiceGasMap();
         const authorizers = prepareAuthorizers();
         const { registers, memory } = prepareRegsAndMemory(entries, authorizers, { skipDictionary: true });
@@ -106,7 +105,7 @@ describe("HostCalls: Bless", () => {
     it("should return panic when authorizers are not readable", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
-        const bless = new Bless(serviceId, accumulate, tinyChainSpec);
+        const bless = Bless.new(serviceId, accumulate, tinyChainSpec);
         const entries = prepareServiceGasMap();
         const authorizers = prepareAuthorizers();
         const { registers, memory } = prepareRegsAndMemory(entries, authorizers, { skipAuth: true });
@@ -119,7 +118,7 @@ describe("HostCalls: Bless", () => {
     it("should auto-accumulate services when dictionary is out of order", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
-        const bless = new Bless(serviceId, accumulate, tinyChainSpec);
+        const bless = Bless.new(serviceId, accumulate, tinyChainSpec);
         const entries = prepareServiceGasMap();
         entries.push([tryAsServiceId(5), tryAsServiceGas(10_000)]);
         const authorizers = prepareAuthorizers();
@@ -142,7 +141,7 @@ describe("HostCalls: Bless", () => {
     it("should auto-accumulate services when dictionary contains duplicates", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
-        const bless = new Bless(serviceId, accumulate, tinyChainSpec);
+        const bless = Bless.new(serviceId, accumulate, tinyChainSpec);
         const entries = prepareServiceGasMap();
         entries.push(entries[entries.length - 1]);
         const authorizers = prepareAuthorizers();
@@ -166,7 +165,7 @@ describe("HostCalls: Bless", () => {
         const accumulate = new PartialStateMock();
         accumulate.privilegedServicesResponse = Result.error(UpdatePrivilegesError.UnprivilegedService, () => "Test: unprivileged service attempting bless");
         const serviceId = tryAsServiceId(11_000);
-        const bless = new Bless(serviceId, accumulate, tinyChainSpec);
+        const bless = Bless.new(serviceId, accumulate, tinyChainSpec);
         const entries = prepareServiceGasMap();
         const authorizers = prepareAuthorizers();
         const { registers, memory } = prepareRegsAndMemory(entries, authorizers);
@@ -181,7 +180,7 @@ describe("HostCalls: Bless", () => {
         const accumulate = new PartialStateMock();
         accumulate.privilegedServicesResponse = Result.error(UpdatePrivilegesError.InvalidServiceId, () => "Test: invalid manager service ID for bless");
         const serviceId = tryAsServiceId(11_000);
-        const bless = new Bless(serviceId, accumulate, tinyChainSpec);
+        const bless = Bless.new(serviceId, accumulate, tinyChainSpec);
         const entries = prepareServiceGasMap();
         const authorizers = prepareAuthorizers();
         const { registers, memory } = prepareRegsAndMemory(entries, authorizers, { manager: tryAsU64(MAX_VALUE_U64) });
@@ -196,7 +195,7 @@ describe("HostCalls: Bless", () => {
         const accumulate = new PartialStateMock();
         accumulate.privilegedServicesResponse = Result.error(UpdatePrivilegesError.InvalidServiceId, () => "Test: invalid validator service ID for bless");
         const serviceId = tryAsServiceId(11_000);
-        const bless = new Bless(serviceId, accumulate, tinyChainSpec);
+        const bless = Bless.new(serviceId, accumulate, tinyChainSpec);
         const entries = prepareServiceGasMap();
         const authorizers = prepareAuthorizers();
         const { registers, memory } = prepareRegsAndMemory(entries, authorizers, { validator: tryAsU64(MAX_VALUE_U64) });
@@ -211,7 +210,7 @@ describe("HostCalls: Bless", () => {
         const accumulate = new PartialStateMock();
         accumulate.privilegedServicesResponse = Result.error(UpdatePrivilegesError.InvalidServiceId, () => "Test: invalid registrar service ID for bless");
         const serviceId = tryAsServiceId(11_000);
-        const bless = new Bless(serviceId, accumulate, tinyChainSpec);
+        const bless = Bless.new(serviceId, accumulate, tinyChainSpec);
         const entries = prepareServiceGasMap();
         const authorizers = prepareAuthorizers();
         const { registers, memory } = prepareRegsAndMemory(entries, authorizers, { registrar: tryAsU64(MAX_VALUE_U64) });