@typeberry/lib 0.5.2 → 0.5.3-5a6cfcc

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/state/in-memory-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"in-memory-state.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state/in-memory-state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"in-memory-state.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state/in-memory-state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,QAAQ,EAMd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAS,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAEL,cAAc,EACd,cAAc,EAEd,KAAK,cAAc,EACnB,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAgC,KAAK,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAE5G,OAAO,EAA2B,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAoC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,KAAK,kBAAkB,EAAgC,MAAM,0BAA0B,CAAC;AACjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAA4B,KAAK,iBAAiB,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACtG,OAAO,EAAE,KAAK,OAAO,EAAgB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,eAAe,EAAkB,MAAM,eAAe,CAAC;AAEhE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,kBAAkB,EAA0B,MAAM,mBAAmB,CAAC;AACpF,OAAO,EACL,iBAAiB,EACjB,KAAK,kBAAkB,EACvB,YAAY,EACZ,kBAAkB,EAClB,WAAW,EACX,KAAK,UAAU,EAEhB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,KAAK,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAC7F,OAAO,EACL,KAAK,cAAc,EAOpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAkB,cAAc,EAAuB,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAwB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE1E,oBAAY,WAAW;IACrB,0DAA0D;IAC1D,gBAAgB,IAAI;IACpB,mDAAmD;IACnD,SAAS,IAAI;IACb,kDAAkD;IAClD,cAAc,IAAI;CACnB;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,SAAU,YAAW,OAAO;IAE7D,kBAAkB;IAClB,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,uBAAuB;IACvB,QAAQ,CAAC,IAAI,EAAE;QACb,sEAAsE;QACtE,IAAI,EAAE,kBAAkB,CAAC;QACzB,sEAAsE;QACtE,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC/D,sEAAsE;QACtE,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAC1E,sEAAsE;QACtE,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;KAC5C;;IAZD,kBAAkB;IACT,SAAS,EAAE,SAAS;IAC7B,uBAAuB;IACd,IAAI,EAAE;QACb,sEAAsE;QACtE,IAAI,EAAE,kBAAkB,CAAC;QACzB,sEAAsE;QACtE,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC/D,sEAAsE;QACtE,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAC1E,sEAAsE;QACtE,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;KAC5C;IAKH,OAAO,IAAI,kBAAkB;IAI7B,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAIhD,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO;IAIxC,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI;IAIjD,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,GAAG,kBAAkB,GAAG,IAAI;IAQzE,UAAU,IAAI,cAAc;IAU5B,8EAA8E;IAC9E,KAAK,IAAI,eAAe;IAWxB;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc;CA0C1D;AAED;;GAEG;AACH,qBAAa,aAAc,SAAQ,SAAU,YAAW,KAAK,EAAE,aAAa,EAAE,eAAe;IAwQzF,OAAO,CAAC,QAAQ,CAAC,SAAS;IAvQ5B,qEAAqE;IACrE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB;IAI3D;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAMrE;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC;IAmChG;;OAEG;IACH,gBAAgB,IAAI,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC;IAclD;;OAEG;IACH,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC;IAwB7E,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,aAAa;IAiCrB,OAAO,CAAC,eAAe;IA2DvB,OAAO,CAAC,cAAc;IAmCtB,sBAAsB,EAAE,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC;IAC/D,uBAAuB,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IACrD,iBAAiB,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IAC/C,oBAAoB,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IAClD,qBAAqB,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IACnD,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IACtD,SAAS,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACtC,UAAU,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACxC,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,cAAc,CAAC;IAC3B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,cAAc,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC9D,gBAAgB,EAAE,kBAAkB,CAAC;IACrC,SAAS,EAAE,oBAAoB,CAAC;IAChC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,qBAAqB,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;IACvD,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAE1C,gBAAgB,IAAI,SAAS,SAAS,EAAE;IAIxC,UAAU,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,GAAG,IAAI;IAIzC,SAAS,aACU,SAAS,EAAE,SAAS,EACrC,CAAC,EAAE,mBAAmB;IAyBxB,IAAI,IAAI,SAAS;IAIjB;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS;CA+G7B;AAED,+CAA+C;AAC/C,MAAM,MAAM,cAAc,GAAG;IAC3B,4BAA4B;IAC5B,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,yBAAyB;IACzB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,8BAA8B;IAC9B,aAAa,EAAE;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;CACtD,CAAC;AAEF,eAAO,MAAM,mBAAmB,6KAc9B,CAAC;AAEH,2DAA2D;AAC3D,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;AAEzD,eAAO,MAAM,gBAAgB,+aAE3B,CAAC;AAEH,0DAA0D;AAC1D,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;AAEjF,KAAK,UAAU,CAAC,CAAC,IAAI;KAElB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,KAAK,GAAG,CAAC;CAClD,CAAC,MAAM,CAAC,CAAC,CAAC"}

package/packages/jam/state/in-memory-state.js

@@ -5,8 +5,7 @@ import { asKnownSize, FixedSizeArray, HashDictionary, HashSet, SortedArray, Sort
 import { BANDERSNATCH_KEY_BYTES, BLS_KEY_BYTES, ED25519_KEY_BYTES } from "#@typeberry/crypto";
 import { BANDERSNATCH_RING_ROOT_BYTES } from "#@typeberry/crypto/bandersnatch.js";
 import { HASH_SIZE } from "#@typeberry/hash";
-import { tryAsU32 } from "#@typeberry/numbers";
-import { MAX_VALUE } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+import { MAX_VALUE_U32, tryAsU32 } from "#@typeberry/numbers";
 import { asOpaqueType, assertNever, check, OK, Result, WithDebug } from "#@typeberry/utils";
 import { accumulationOutputComparator } from "./accumulation-output.js";
 import { AUTHORIZATION_QUEUE_SIZE } from "./auth.js";
@@ -451,7 +450,7 @@ export class InMemoryState extends WithDebug {
                 manager: tryAsServiceId(0),
                 assigners: tryAsPerCore(new Array(spec.coresCount).fill(tryAsServiceId(0)), spec),
                 delegator: tryAsServiceId(0),
-                registrar: tryAsServiceId(MAX_VALUE),
+                registrar: tryAsServiceId(MAX_VALUE_U32),
                 autoAccumulateServices: new Map(),
             }),
             accumulationOutputLog: SortedArray.fromArray(accumulationOutputComparator, []),

package/packages/jam/state/test.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.utils.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state/test.utils.ts"],"names":[],"mappings":"AAqBA,OAAO,EAUL,aAAa,EAYd,MAAM,YAAY,CAAC;AAKpB,eAAO,MAAM,SAAS,QAAO,aAyT5B,CAAC;AAqCF,eAAO,MAAM,eAAe,QAK1B,CAAC;AAEH,eAAO,MAAM,UAAU,YAkHtB,CAAC"}
+{"version":3,"file":"test.utils.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state/test.utils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAUL,aAAa,EAYd,MAAM,YAAY,CAAC;AAKpB,eAAO,MAAM,SAAS,QAAO,aAyT5B,CAAC;AAqCF,eAAO,MAAM,eAAe,QAK1B,CAAC;AAEH,eAAO,MAAM,UAAU,YAkHtB,CAAC"}

package/packages/jam/state/test.utils.js

@@ -6,8 +6,7 @@ import { asKnownSize, FixedSizeArray, HashDictionary, HashSet, SortedArray, Sort
 import { tinyChainSpec } from "#@typeberry/config";
 import { BANDERSNATCH_RING_ROOT_BYTES } from "#@typeberry/crypto/bandersnatch.js";
 import { HASH_SIZE } from "#@typeberry/hash";
-import { tryAsU16, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
-import { MAX_VALUE } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+import { MAX_VALUE_U32, tryAsU16, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
 import { Compatibility, GpVersion } from "#@typeberry/utils";
 import { AUTHORIZATION_QUEUE_SIZE, AvailabilityAssignment, accumulationOutputComparator, BlockState, CoreStatistics, DisputesRecords, ENTROPY_ENTRIES, hashComparator, InMemoryService, InMemoryState, LookupHistoryItem, PreimageItem, PrivilegedServices, RecentBlocks, SafroleSealingKeysData, ServiceAccountInfo, ServiceStatistics, StatisticsData, tryAsPerCore, ValidatorData, ValidatorStatistics, } from "./index.js";
 const spec = tinyChainSpec;
@@ -271,7 +270,7 @@ export const testState = () => {
             manager: tryAsServiceId(0),
             assigners: tryAsPerCore(new Array(spec.coresCount).fill(tryAsServiceId(0)), spec),
             delegator: tryAsServiceId(0),
-            registrar: tryAsServiceId(MAX_VALUE),
+            registrar: tryAsServiceId(MAX_VALUE_U32),
             autoAccumulateServices: new Map(),
         }),
     });

package/packages/jam/transition/accumulate/accumulate-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accumulate-data.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AACpF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAoB,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAavC;;;;;GAKG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAqC;IAC5E,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAoC;IACzE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IACzC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA6B;gBAG/D,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,EAC9B,SAAS,EAAE,eAAe,EAAE,EAC5B,iCAAiC,EAAE,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC;IAwC/D;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAahC,oCAAoC;IACpC,OAAO,CAAC,eAAe;IAYvB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAmB1B;;OAEG;IAEH;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IA8CxB,0DAA0D;IAC1D,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,EAAE;IAI5C,2DAA2D;IAC3D,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,eAAe,EAAE;IAIrD,0EAA0E;IAC1E,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,GAAG;IAI3C,mDAAmD;IACnD,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU;IAI7C;;;;OAIG;IACH,aAAa,IAAI,SAAS,EAAE;CAG7B"}
+{"version":3,"file":"accumulate-data.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AACpF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAmC,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAavC;;;;;GAKG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAqC;IAC5E,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAoC;IACzE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IACzC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA6B;gBAG/D,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,EAC9B,SAAS,EAAE,eAAe,EAAE,EAC5B,iCAAiC,EAAE,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC;IAwC/D;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAahC,oCAAoC;IACpC,OAAO,CAAC,eAAe;IAYvB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAmB1B;;OAEG;IAEH;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IA8CxB,0DAA0D;IAC1D,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,EAAE;IAI5C,2DAA2D;IAC3D,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,eAAe,EAAE;IAIrD,0EAA0E;IAC1E,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,GAAG;IAI3C,mDAAmD;IACnD,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU;IAI7C;;;;OAIG;IACH,aAAa,IAAI,SAAS,EAAE;CAG7B"}

package/packages/jam/transition/accumulate/accumulate-data.js

@@ -1,6 +1,5 @@
 import { tryAsServiceGas } from "#@typeberry/block";
-import { sumU64, tryAsU32 } from "#@typeberry/numbers";
-import { MAX_VALUE_U64 } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+import { MAX_VALUE_U64, sumU64, tryAsU32 } from "#@typeberry/numbers";
 import { Operand } from "./operand.js";
 class AccumulateDataItem {
     operands;

package/packages/jam/transition/accumulate/accumulate-queue.test.js

@@ -3,7 +3,7 @@ import { tryAsCoreIndex, tryAsPerEpochBlock, tryAsServiceGas, tryAsServiceId, tr
 import { RefineContext, WorkPackageInfo } from "#@typeberry/block/refine-context.js";
 import { tryAsWorkItemsCount } from "#@typeberry/block/work-package.js";
 import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
-import { WorkExecResult, WorkExecResultKind, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
+import { WorkExecResult, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { asKnownSize, FixedSizeArray, HashSet } from "#@typeberry/collections";
 import { tinyChainSpec } from "#@typeberry/config";
@@ -43,7 +43,7 @@ describe("accumulate-queue", () => {
                     importedSegments: tryAsU32(0),
                 }),
                 payloadHash: Bytes.zero(HASH_SIZE).asOpaque(),
-                result: new WorkExecResult(WorkExecResultKind.ok, BytesBlob.empty()),
+                result: WorkExecResult.ok(BytesBlob.empty()),
                 serviceId: tryAsServiceId(0),
             }),
         ], tryAsWorkItemsCount(1)),

package/packages/jam/transition/accumulate/accumulate-utils.test.js

@@ -4,7 +4,7 @@ import { tryAsCoreIndex, tryAsServiceGas, tryAsServiceId, tryAsTimeSlot } from "
 import { RefineContext } from "#@typeberry/block/refine-context.js";
 import { tryAsWorkItemsCount } from "#@typeberry/block/work-package.js";
 import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
-import { WorkExecResult, WorkExecResultKind, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
+import { WorkExecResult, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { FixedSizeArray, HashSet } from "#@typeberry/collections";
 import { tinyChainSpec } from "#@typeberry/config";
@@ -52,7 +52,7 @@ describe("accumulate-utils", () => {
                         importedSegments: tryAsU32(0),
                     }),
                     payloadHash: Bytes.zero(HASH_SIZE).asOpaque(),
-                    result: new WorkExecResult(WorkExecResultKind.ok, BytesBlob.empty()),
+                    result: WorkExecResult.ok(BytesBlob.empty()),
                     serviceId: tryAsServiceId(0),
                 }),
             ], tryAsWorkItemsCount(1)),

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

@@ -1 +1 @@
-{"version":3,"file":"accumulate.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAIf,MAAM,kBAAkB,CAAC;AAM1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAA8B,MAAM,iBAAiB,CAAC;AAmB3E,OAAO,EAAyC,MAAM,EAAa,MAAM,kBAAkB,CAAC;AAM5F,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EAGrB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGtD,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAC9D,MAAM,MAAM,kBAAkB,GAAG,OAAO,kBAAkB,CAAC;AA2B3D,qBAAa,UAAU;aAEH,SAAS,EAAE,SAAS;aACpB,OAAO,EAAE,OAAO;aAChB,KAAK,EAAE,eAAe;aACtB,OAAO,EAAE,iBAAiB;gBAH1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,iBAAiB;IAO5C;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAkB7B;;;;OAIG;YACW,uBAAuB;IAyGrC;;;;OAIG;YACW,uBAAuB;IAoDrC;;;;;;;OAOG;YACW,4BAA4B;IA8D1C;;;;;;;OAOG;YACW,sBAAsB;IAsEpC,OAAO,CAAC,gBAAgB;IAuCxB,OAAO,CAAC,kBAAkB;IAsB1B;;;;;;;;;OASG;YACW,oBAAoB;IA6ClC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAkDlC;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAcnB;;;;;;OAMG;IACI,6BAA6B,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO;IAKhE,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;CAwGrH"}
+{"version":3,"file":"accumulate.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAIf,MAAM,kBAAkB,CAAC;AAM1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,KAAK,OAAO,EAA8B,MAAM,iBAAiB,CAAC;AAiB3E,OAAO,EAAyC,MAAM,EAAa,MAAM,kBAAkB,CAAC;AAM5F,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EAGrB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAC9D,MAAM,MAAM,kBAAkB,GAAG,OAAO,kBAAkB,CAAC;AA2B3D,qBAAa,UAAU;aAEH,SAAS,EAAE,SAAS;aACpB,OAAO,EAAE,OAAO;aAChB,KAAK,EAAE,eAAe;aACtB,OAAO,EAAE,iBAAiB;gBAH1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,iBAAiB;IAO5C;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAkB7B;;;;OAIG;YACW,uBAAuB;IAqGrC;;;;OAIG;YACW,uBAAuB;IAoDrC;;;;;;;OAOG;YACW,4BAA4B;IA8D1C;;;;;;;OAOG;YACW,sBAAsB;IAsEpC,OAAO,CAAC,gBAAgB;IAuCxB,OAAO,CAAC,kBAAkB;IAsB1B;;;;;;;;;OASG;YACW,oBAAoB;IA6ClC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAkDlC;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAcnB;;;;;;OAMG;IACI,6BAA6B,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO;IAKhE,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;CAwGrH"}

package/packages/jam/transition/accumulate/accumulate.js

@@ -3,12 +3,11 @@ import { W_C } from "#@typeberry/block/gp-constants.js";
 import { Bytes } from "#@typeberry/bytes";
 import { codec, Encoder } from "#@typeberry/codec";
 import { ArrayView, HashSet, SortedArray } from "#@typeberry/collections";
+import { PvmExecutor, ReturnStatus } from "#@typeberry/executor";
 import { HASH_SIZE } from "#@typeberry/hash";
 import { AccumulationStateUpdate, PartiallyUpdatedState, } from "#@typeberry/jam-host-calls/externalities/state-update.js";
 import { Logger } from "#@typeberry/logger";
-import { sumU64, tryAsU32 } from "#@typeberry/numbers";
-import { Status, tryAsGas } from "#@typeberry/pvm-interface";
-import { MAX_VALUE_U64 } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+import { MAX_VALUE_U64, sumU64, tryAsU32 } from "#@typeberry/numbers";
 import { accumulationOutputComparator, hashComparator, ServiceAccountInfo, tryAsPerCore, } from "#@typeberry/state";
 import { assertEmpty, Compatibility, GpVersion, Result, TestSuite } from "#@typeberry/utils";
 import { AccumulateExternalities } from "../externalities/accumulate-externalities.js";
@@ -18,7 +17,6 @@ import { AccumulateQueue, pruneQueue } from "./accumulate-queue.js";
 import { GAS_TO_INVOKE_WORK_REPORT, } from "./accumulate-state.js";
 import { generateNextServiceId, getWorkPackageHashes } from "./accumulate-utils.js";
 import { mergePerallelAccumulationResults, } from "./accumulation-result-merge-utils.js";
-import { PvmExecutor } from "./pvm-executor.js";
 export const ACCUMULATION_ERROR = "duplicate service created";
 var PvmInvocationError;
 (function (PvmInvocationError) {
@@ -102,28 +100,25 @@ export class Accumulate {
             serviceId,
             argsLength: tryAsU32(transfers.length + operands.length),
         });
-        const result = await executor.run(invocationArgs, tryAsGas(gas));
+        const result = await executor.run(invocationArgs, gas);
         const [newState, checkpoint] = partialState.getStateUpdates();
         /**
          * PVM invocation returned and error so we return the checkpoint
          *
          * https://graypaper.fluffylabs.dev/#/7e6ff6a/300002300002?v=0.6.7
          */
-        if (result.hasStatus()) {
-            const status = result.status;
-            if (status === Status.OOG || status === Status.PANIC) {
-                logger.trace `[${serviceId}] accumulate finished with ${Status[status]} reverting to checkpoint.`;
-                return Result.ok({ stateUpdate: checkpoint, consumedGas: tryAsServiceGas(result.consumedGas) });
-            }
-            logger.trace `[${serviceId}] accumulate finished with ${Status[status]}`;
+        if (result.status !== ReturnStatus.OK) {
+            logger.trace `[${serviceId}] accumulate finished with ${ReturnStatus[result.status]} reverting to checkpoint.`;
+            return Result.ok({ stateUpdate: checkpoint, consumedGas: tryAsServiceGas(result.consumedGas) });
         }
+        logger.trace `[${serviceId}] accumulate finished with ${ReturnStatus[result.status]}`;
         /**
          * PVM invocation returned a hash so we override whatever `yield` host call
          * provided.
          *
          * https://graypaper.fluffylabs.dev/#/7e6ff6a/301202301202?v=0.6.7
          */
-        if (result.hasMemorySlice() && result.memorySlice.length === HASH_SIZE) {
+        if (result.memorySlice.length === HASH_SIZE) {
             const memorySlice = Bytes.fromBlob(result.memorySlice, HASH_SIZE);
             newState.yieldedRoot = memorySlice.asOpaque();
         }

package/packages/jam/transition/accumulate/accumulate.test.js

@@ -5,7 +5,7 @@ import { MIN_PUBLIC_SERVICE_INDEX } from "#@typeberry/block/gp-constants.js";
 import { RefineContext } from "#@typeberry/block/refine-context.js";
 import { tryAsWorkItemsCount } from "#@typeberry/block/work-package.js";
 import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
-import { WorkExecResult, WorkExecResultKind, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
+import { WorkExecResult, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { asKnownSize, FixedSizeArray, HashDictionary, HashSet } from "#@typeberry/collections";
 import { PvmBackend, PvmBackendNames, tinyChainSpec } from "#@typeberry/config";
@@ -266,7 +266,7 @@ const createWorkReport = (workPackageHash, prerequisites = [], serviceId = tryAs
                 importedSegments: tryAsU32(0),
             }),
             payloadHash: Bytes.zero(HASH_SIZE).asOpaque(),
-            result: new WorkExecResult(WorkExecResultKind.ok, BytesBlob.empty()),
+            result: WorkExecResult.ok(BytesBlob.empty()),
             serviceId,
         }),
     ], tryAsWorkItemsCount(1)),

package/packages/jam/transition/accumulate/accumulation-result-merge-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accumulation-result-merge-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulation-result-merge-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AACpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAI1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,eAAe,EACtB,UAAU,EAAE,uBAAuB,EACnC,OAAO,EAAE,0BAA0B,GAClC,WAAW,CAab;AAED,KAAK,SAAS,GAAG,SAAS,CAAC;AAC3B,KAAK,WAAW,GAAG;IAAE,WAAW,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,uBAAuB,CAAA;CAAE,CAAC;AAGrF,MAAM,MAAM,0BAA0B,GAAG,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAErE,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,YAAY,EAAE,UAAU,CAAC;IACzB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC"}
+{"version":3,"file":"accumulation-result-merge-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulation-result-merge-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AACpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAG1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,eAAe,EACtB,UAAU,EAAE,uBAAuB,EACnC,OAAO,EAAE,0BAA0B,GAClC,WAAW,CAab;AAED,KAAK,SAAS,GAAG,SAAS,CAAC;AAC3B,KAAK,WAAW,GAAG;IAAE,WAAW,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,uBAAuB,CAAA;CAAE,CAAC;AAGrF,MAAM,MAAM,0BAA0B,GAAG,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAErE,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,YAAY,EAAE,UAAU,CAAC;IACzB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC"}

package/packages/jam/transition/accumulate/accumulation-result-merge-utils.js

@@ -1,7 +1,6 @@
 import { tryAsServiceGas } from "#@typeberry/block";
 import { AccumulationStateUpdate } from "#@typeberry/jam-host-calls";
-import { sumU64 } from "#@typeberry/numbers";
-import { MAX_VALUE_U64 } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+import { MAX_VALUE_U64, sumU64 } from "#@typeberry/numbers";
 import { PrivilegedServices, tryAsPerCore, UpdatePreimageKind } from "#@typeberry/state";
 export function mergePerallelAccumulationResults(chainSpec, state, inputState, results) {
     const mergeContext = createMergeContext(chainSpec, state, inputState, results);

package/packages/jam/transition/accumulate/accumulation-result-merge-utils.test.js

@@ -7,8 +7,7 @@ import { BANDERSNATCH_KEY_BYTES, BLS_KEY_BYTES, ED25519_KEY_BYTES } from "#@type
 import { HASH_SIZE } from "#@typeberry/hash";
 import { AccumulationStateUpdate, PendingTransfer } from "#@typeberry/jam-host-calls";
 import { TRANSFER_MEMO_BYTES } from "#@typeberry/jam-host-calls/externalities/partial-state.js";
-import { tryAsU32, tryAsU64 } from "#@typeberry/numbers";
-import { MAX_VALUE_U64 } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+import { MAX_VALUE_U64, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
 import { AUTHORIZATION_QUEUE_SIZE, InMemoryState, PreimageItem, PrivilegedServices, ServiceAccountInfo, StorageItem, tryAsPerCore, UpdatePreimage, UpdateService, UpdateStorage, VALIDATOR_META_BYTES, ValidatorData, } from "#@typeberry/state";
 import { deepEqual } from "#@typeberry/utils";
 import { mergePerallelAccumulationResults } from "./accumulation-result-merge-utils.js";

package/packages/jam/transition/accumulate/deferred-transfers.d.ts

@@ -1,7 +1,7 @@
 import { type EntropyHash, type ServiceId, type TimeSlot } from "#@typeberry/block";
 import type { ChainSpec, PvmBackend } from "#@typeberry/config";
 import type { Blake2b } from "#@typeberry/hash";
-import type { PendingTransfer } from "#@typeberry/jam-host-calls/externalities/pending-transfer.js";
+import type { PendingTransfer } from "#@typeberry/jam-host-calls";
 import { type ServicesUpdate, type State } from "#@typeberry/state";
 import { Result } from "#@typeberry/utils";
 import type { CountAndGasUsed } from "../statistics.js";

package/packages/jam/transition/accumulate/deferred-transfers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deferred-transfers.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/deferred-transfers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAmB,MAAM,kBAAkB,CAAC;AAGpG,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6DAA6D,CAAC;AAQnG,OAAO,EAAsB,KAAK,cAAc,EAAE,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAIxD,KAAK,sBAAsB,GAAG;IAC5B,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,6DAA6D;IAC7D,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,YAAY,GAAG,oBAAoB,CAAC,CAAC;AAEnG,MAAM,MAAM,uBAAuB,GAAG;IACpC,cAAc,EAAE,cAAc,CAAC;IAC/B,kBAAkB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;CACrD,CAAC;AAQF,oBAAY,0BAA0B;IACpC,sBAAsB,IAAI;IAC1B,mBAAmB,IAAI;CACxB;AAGD;;GAEG;AACH,qBAAa,iBAAiB;aAEV,SAAS,EAAE,SAAS;aACpB,OAAO,EAAE,OAAO;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAHJ,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EACf,KAAK,EAAE,sBAAsB,EAC7B,GAAG,EAAE,UAAU;IAG5B,UAAU,CAAC,EACf,gBAAgB,EAChB,QAAQ,EACR,cAAc,EAAE,mBAAmB,EACnC,OAAO,GACR,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,CAAC;CAuFjG"}
+{"version":3,"file":"deferred-transfers.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/deferred-transfers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAmB,MAAM,kBAAkB,CAAC;AAGpG,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,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAIjE,OAAO,EAAsB,KAAK,cAAc,EAAE,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxD,KAAK,sBAAsB,GAAG;IAC5B,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,6DAA6D;IAC7D,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,YAAY,GAAG,oBAAoB,CAAC,CAAC;AAEnG,MAAM,MAAM,uBAAuB,GAAG;IACpC,cAAc,EAAE,cAAc,CAAC;IAC/B,kBAAkB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;CACrD,CAAC;AAQF,oBAAY,0BAA0B;IACpC,sBAAsB,IAAI;IAC1B,mBAAmB,IAAI;CACxB;AAGD;;GAEG;AACH,qBAAa,iBAAiB;aAEV,SAAS,EAAE,SAAS;aACpB,OAAO,EAAE,OAAO;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAHJ,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EACf,KAAK,EAAE,sBAAsB,EAC7B,GAAG,EAAE,UAAU;IAG5B,UAAU,CAAC,EACf,gBAAgB,EAChB,QAAQ,EACR,cAAc,EAAE,mBAAmB,EACnC,OAAO,GACR,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,CAAC;CAuFjG"}

package/packages/jam/transition/accumulate/deferred-transfers.js

@@ -1,16 +1,15 @@
 import { tryAsServiceGas } from "#@typeberry/block";
 import { W_C } from "#@typeberry/block/gp-constants.js";
 import { codec, Encoder } from "#@typeberry/codec";
-import { AccumulationStateUpdate, PartiallyUpdatedState, } from "#@typeberry/jam-host-calls/externalities/state-update.js";
+import { PvmExecutor } from "#@typeberry/executor";
+import { AccumulationStateUpdate, PartiallyUpdatedState } from "#@typeberry/jam-host-calls";
 import { Logger } from "#@typeberry/logger";
 import { sumU64, tryAsU32 } from "#@typeberry/numbers";
-import { tryAsGas } from "#@typeberry/pvm-interface";
 import { ServiceAccountInfo } from "#@typeberry/state";
 import { Result } from "#@typeberry/utils";
 import { AccumulateExternalities } from "../externalities/accumulate-externalities.js";
 import { FetchExternalities } from "../externalities/fetch-externalities.js";
 import { uniquePreserveOrder } from "./accumulate-utils.js";
-import { PvmExecutor } from "./pvm-executor.js";
 const ARGS_CODEC = codec.object({
     timeslot: codec.varU32.asOpaque(),
     serviceId: codec.varU32.asOpaque(),
@@ -61,7 +60,7 @@ export class DeferredTransfers {
             partiallyUpdatedState.updateServiceInfo(serviceId, newInfo);
             const partialState = new AccumulateExternalities(this.chainSpec, this.blake2b, partiallyUpdatedState, serviceId, serviceId, timeslot);
             const fetchExternalities = FetchExternalities.createForOnTransfer({ entropy, transfers }, this.chainSpec);
-            let consumedGas = tryAsGas(0);
+            let consumedGas = tryAsServiceGas(0);
             const hasTransfers = transfers.length > 0;
             const isCodeCorrect = code !== null && code.length <= W_C;
             if (!hasTransfers || !isCodeCorrect) {
@@ -78,10 +77,10 @@ export class DeferredTransfers {
             else {
                 const executor = await PvmExecutor.createOnTransferExecutor(serviceId, code, { partialState, fetchExternalities }, this.pvm);
                 const args = Encoder.encodeObject(ARGS_CODEC, { timeslot, serviceId, transfersLength: tryAsU32(transfers.length) }, this.chainSpec);
-                const gas = transfers.reduce((acc, item) => acc + item.gas, 0n);
-                consumedGas = (await executor.run(args, tryAsGas(gas))).consumedGas;
+                const gas = tryAsServiceGas(transfers.reduce((acc, item) => acc + item.gas, 0n));
+                consumedGas = (await executor.run(args, gas)).consumedGas;
             }
-            transferStatistics.set(serviceId, { count: tryAsU32(transfers.length), gasUsed: tryAsServiceGas(consumedGas) });
+            transferStatistics.set(serviceId, { count: tryAsU32(transfers.length), gasUsed: consumedGas });
             const [updatedState] = partialState.getStateUpdates();
             currentStateUpdate = updatedState;
         }

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/jam/transition/disputes/disputes.test.data2.js

@@ -2,7 +2,7 @@
 import { tryAsCoreIndex, tryAsPerValidator, tryAsServiceGas, tryAsServiceId, tryAsTimeSlot } from "#@typeberry/block";
 import { RefineContext } from "#@typeberry/block/refine-context.js";
 import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
-import { WorkExecResult, WorkExecResultKind, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
+import { WorkExecResult, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { FixedSizeArray } from "#@typeberry/collections";
 import { tinyChainSpec } from "#@typeberry/config";
@@ -174,7 +174,7 @@ export function workReport(packageHash, coreIndex) {
                 codeHash: Bytes.zero(HASH_SIZE).asOpaque(),
                 payloadHash: Bytes.zero(HASH_SIZE).asOpaque(),
                 gas: tryAsServiceGas(42),
-                result: new WorkExecResult(WorkExecResultKind.ok, BytesBlob.parseBlob("0x010203")),
+                result: WorkExecResult.ok(BytesBlob.parseBlob("0x010203")),
                 load: WorkRefineLoad.create({
                     gasUsed: tryAsServiceGas(0),
                     importedSegments: tryAsU32(0),