npm - @typeberry/lib - Versions diffs - 0.5.3-355fdf7 → 0.5.3-fb6e98a - Mend

@typeberry/lib 0.5.3-355fdf7 → 0.5.3-fb6e98a

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (76) hide show

package/packages/jam/rpc-validation/validation.js CHANGED Viewed

@@ -3,13 +3,15 @@ import z from "zod";
 export const JSON_RPC_VERSION = "2.0";
 export var validation;
 (function (validation) {
-    const u32 = z.number().int().min(0).max(0xffffffff);
+    const u16 = z.number().int().min(0).max(0xffff);
+    const u32 = z.number().int().min(0).max(0xffff_ffff);
     const uint8Array = z.custom((v) => v instanceof Uint8Array); // this is needed because a simple z.instanceof(Uint8Array) automatically narrows the type down to Uint8Array<ArrayBuffer> whereas our Bytes.raw are effectively Uint8Array<ArrayBufferLike>
     validation.hash = z.codec(z.base64(), uint8Array.refine((v) => v.length === HASH_SIZE, "Invalid hash length."), {
         decode: (v) => Uint8Array.from(Buffer.from(v, "base64")),
         encode: (v) => Buffer.from(v).toString("base64"),
     });
     validation.slot = u32;
+    validation.coreIndex = u16;
     validation.blobArray = z.codec(z.base64(), uint8Array, {
         decode: (v) => Uint8Array.from(Buffer.from(v, "base64")),
         encode: (v) => Buffer.from(v).toString("base64"),
@@ -21,6 +23,10 @@ export var validation;
         header_hash: validation.hash,
         slot: validation.slot,
     });
+    validation.refineResult = z.object({
+        report: validation.blobArray,
+        exports: validation.blobArray,
+    });
     validation.parameters = z.object({
         V1: z.object({
             deposit_per_account: z.number(),
@@ -70,7 +76,15 @@ export var validation;
         input: z.tuple([z.string()]),
         output: z.boolean(),
     };
-    validation.schemas = {
+    /** Non-standard typeberry extension methods. */
+    validation.customSchemas = {
+        typeberry_refineWorkPackage: {
+            input: z.tuple([validation.coreIndex, validation.blobArray, z.array(validation.blobArray)]),
+            output: validation.refineResult,
+        },
+    };
+    /** JIP-2 (standardized) methods */
+    validation.jip2Schemas = {
         beefyRoot: validation.notImplementedSchema,
         submitPreimage: validation.notImplementedSchema,
         submitWorkPackage: validation.notImplementedSchema,
@@ -162,6 +176,10 @@ export var validation;
         unsubscribeServiceValue: validation.unsubscribeSchema,
         unsubscribeStatistics: validation.unsubscribeSchema,
     };
+    validation.schemas = {
+        ...validation.customSchemas,
+        ...validation.jip2Schemas,
+    };
     validation.jsonRpcRequest = z.object({
         jsonrpc: z.literal(JSON_RPC_VERSION),
         method: z.string(),

package/packages/jam/state/in-memory-state.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"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,~~EAAY~~,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;~~AAExD~~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"}
1	+ {"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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
1	+ {"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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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;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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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;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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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;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 CHANGED Viewed

@@ -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.test.data2.js CHANGED Viewed

@@ -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),

package/packages/jam/transition/externalities/fetch-externalities.d.ts CHANGED Viewed

@@ -20,7 +20,8 @@ declare enum FetchContext {
     /** @deprecated since 0.7.1 */
     LegacyAccumulate = 1,
     /** @deprecated since 0.7.1 */
-    LegacyOnTransfer = 2
+    LegacyOnTransfer = 2,
+    Refine = 3
 }
 type LegacyAccumulateFetchData = {
     context: FetchContext.LegacyAccumulate;
@@ -38,6 +39,10 @@ type AccumulateFetchData = {
     transfers: PendingTransfer[];
     operands: Operand[];
 };
+type RefineFetchData = {
+    context: FetchContext.Refine;
+    entropy: undefined;
+};
 export declare class FetchExternalities implements general.IFetchExternalities {
     private fetchData;
     private chainSpec;
@@ -45,6 +50,7 @@ export declare class FetchExternalities implements general.IFetchExternalities {
     static createForPre071Accumulate(fetchData: Omit<LegacyAccumulateFetchData, "context">, chainSpec: ChainSpec): FetchExternalities;
     static createForAccumulate(fetchData: Omit<AccumulateFetchData, "context">, chainSpec: ChainSpec): FetchExternalities;
     static createForOnTransfer(fetchData: Omit<LegacyOnTransferFetchData, "context">, chainSpec: ChainSpec): FetchExternalities;
+    static createForRefine(fetchData: Omit<RefineFetchData, "context">, chainSpec: ChainSpec): FetchExternalities;
     constants(): BytesBlob;
     entropy(): BytesBlob | null;
     authorizerTrace(): BytesBlob | null;

package/packages/jam/transition/externalities/fetch-externalities.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fetch-externalities.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/externalities/fetch-externalities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAgC,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAQ5E,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAInD,aAAK,mBAAmB;IACtB,OAAO,IAAI;IACX,QAAQ,IAAI;CACb;AAED,MAAM,MAAM,iBAAiB,GACzB;IACE,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC;IAClC,KAAK,EAAE,OAAO,CAAC;CAChB,GACD;IACE,IAAI,EAAE,mBAAmB,CAAC,QAAQ,CAAC;IACnC,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AAgGN,aAAK,YAAY;IACf,UAAU,IAAI;IACd,8BAA8B;IAC9B,gBAAgB,IAAI;IACpB,8BAA8B;IAC9B,gBAAgB,IAAI;~~CACrB~~;AAED,KAAK,yBAAyB,GAAG;IAC/B,OAAO,EAAE,YAAY,CAAC,gBAAgB,CAAC;IACvC,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,OAAO,EAAE,YAAY,CAAC,gBAAgB,CAAC;IACvC,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC;IACjC,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB,CAAC;~~AAIF~~,qBAAa,kBAAmB,YAAW,OAAO,CAAC,mBAAmB;IAElE,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,SAAS;IAFnB,OAAO;~~IAIP~~,MAAM,CAAC,yBAAyB,CAC9B,SAAS,EAAE,IAAI,CAAC,yBAAyB,EAAE,SAAS,CAAC,EACrD,SAAS,EAAE,SAAS,GACnB,kBAAkB;IAIrB,MAAM,CAAC,mBAAmB,CACxB,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,EAC/C,SAAS,EAAE,SAAS,GACnB,kBAAkB;IAIrB,MAAM,CAAC,mBAAmB,CACxB,SAAS,EAAE,IAAI,CAAC,yBAAyB,EAAE,SAAS,CAAC,EACrD,SAAS,EAAE,SAAS,GACnB,kBAAkB;IAIrB,SAAS,IAAI,SAAS;IAItB,OAAO,IAAI,SAAS,GAAG,IAAI;IAS3B,eAAe,IAAI,SAAS,GAAG,IAAI;IAInC,iBAAiB,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAIvE,cAAc,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAIpE,WAAW,IAAI,SAAS,GAAG,IAAI;IAI/B,UAAU,IAAI,SAAS,GAAG,IAAI;IAI9B,kBAAkB,IAAI,SAAS,GAAG,IAAI;IAItC,aAAa,IAAI,SAAS,GAAG,IAAI;IAIjC,YAAY,IAAI,SAAS,GAAG,IAAI;IAIhC,WAAW,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAI7C,eAAe,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAIjD,WAAW,IAAI,SAAS,GAAG,IAAI;IAU/B,UAAU,CAAC,YAAY,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAoB/C,YAAY,IAAI,SAAS,GAAG,IAAI;IAUhC,WAAW,CAAC,aAAa,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAoBjD,uBAAuB,IAAI,SAAS,GAAG,IAAI;IAa3C,oBAAoB,CAAC,KAAK,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;CAuBnD"}
1	+ {"version":3,"file":"fetch-externalities.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/externalities/fetch-externalities.ts"],"names":[],"mappings":"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"}

package/packages/jam/transition/externalities/fetch-externalities.js CHANGED Viewed

@@ -106,6 +106,7 @@ var FetchContext;
     FetchContext[FetchContext["LegacyAccumulate"] = 1] = "LegacyAccumulate";
     /** @deprecated since 0.7.1 */
     FetchContext[FetchContext["LegacyOnTransfer"] = 2] = "LegacyOnTransfer";
+    FetchContext[FetchContext["Refine"] = 3] = "Refine";
 })(FetchContext || (FetchContext = {}));
 export class FetchExternalities {
     fetchData;
@@ -123,6 +124,9 @@ export class FetchExternalities {
     static createForOnTransfer(fetchData, chainSpec) {
         return new FetchExternalities({ context: FetchContext.LegacyOnTransfer, ...fetchData }, chainSpec);
     }
+    static createForRefine(fetchData, chainSpec) {
+        return new FetchExternalities({ context: FetchContext.Refine, ...fetchData }, chainSpec);
+    }
     constants() {
         return getEncodedConstants(this.chainSpec);
     }

package/packages/jam/transition/externalities/fetch-externalities.test.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
 import { tryAsServiceGas, tryAsServiceId } from "#@typeberry/block";
-import { WorkExecResult, WorkExecResultKind } from "#@typeberry/block/work-result.js";
+import { WorkExecResult } from "#@typeberry/block/work-result.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { codec, Encoder } from "#@typeberry/codec";
 import { fullChainSpec, tinyChainSpec } from "#@typeberry/config";
@@ -21,7 +21,7 @@ describe("fetch-externalities", () => {
                 exportsRoot: Bytes.fill(HASH_SIZE, i + 2).asOpaque(),
                 hash: Bytes.fill(HASH_SIZE, i + 4).asOpaque(),
                 payloadHash: Bytes.fill(HASH_SIZE, i + 5).asOpaque(),
-                result: new WorkExecResult(WorkExecResultKind.ok, BytesBlob.empty()),
+                result: WorkExecResult.ok(BytesBlob.empty()),
                 gas: tryAsServiceGas(1_000),
             }));
         }

package/packages/jam/transition/hasher.test.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { Credential, ReportGuarantee } from "#@typeberry/block/guarantees.js";
 import { RefineContext, WorkPackageInfo } from "#@typeberry/block/refine-context.js";
 import { SignedTicket, tryAsTicketAttempt } from "#@typeberry/block/tickets.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 { Decoder, Encoder } from "#@typeberry/codec";
 import { asKnownSize } from "#@typeberry/collections";
@@ -77,7 +77,7 @@ describe("TransitionHasher", () => {
                             importedSegments: tryAsU32(result.refine_load.imports),
                         }),
                         payloadHash: Bytes.parseBytes(result.payload_hash, HASH_SIZE).asOpaque(),
-                        result: new WorkExecResult(WorkExecResultKind.ok, BytesBlob.parseBlob(result.result.ok)),
+                        result: WorkExecResult.ok(BytesBlob.parseBlob(result.result.ok)),
                         serviceId: tryAsServiceId(result.service_id),
                     }))),
                     segmentRootLookup: report.segment_root_lookup.map((l) => WorkPackageInfo.create(l)),

package/packages/jam/transition/reports/test.utils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"test.utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/reports/test.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,QAAQ,EAOd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,UAAU,EAEV,KAAK,uBAAuB,EAE5B,eAAe,EAChB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAiB,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE/G,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAI7D,OAAO,EAAe,cAAc,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,KAAK,SAAS,EAAiB,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAKL,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAEtE,OAAO,KAAK,EAAqB,uBAAuB,EAAW,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EACL,sBAAsB,EAEtB,eAAe,EACf,aAAa,EAIb,aAAa,EACd,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAE1D,eAAO,MAAM,OAAO,iHAAyB,CAAC;AAE9C,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,gBAAgB,CAAC,EAAE,QAAQ,CAAC;IAC5B,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,aAAa,CAAC,EAAE,UAAU,EAAE,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAC5B,IAAI,EACJ,UAAU,EACV,WAAW,EACX,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,UAAU,GACX,EAAE,iBAAiB,GAAG,UAAU,~~CAwChC~~;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,SAAS,eAAe,EAAE,EACtC,EAAE,4BAAoC,EAAE,GAAE;IAAE,4BAA4B,CAAC,EAAE,OAAO,CAAA;CAAO,GACxF,uBAAuB,CAwBzB;AAED,wBAAsB,UAAU,CAAC,OAAO,GAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAM,oBAUnF;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,gBAAgB,cAKxE;AAED,KAAK,kBAAkB,GAAG;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACrC,iBAAiB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAC9C,mBAAmB,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC/C,sBAAsB,CAAC,EAAE,cAAc,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAC1E,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,iBAAS,eAAe,CAAC,EACvB,kBAA0B,EAC1B,QAAoB,EACpB,iBAAsB,EACtB,mBAAmC,EACnC,sBAA6C,EAC7C,uBAA+B,GAChC,GAAE,kBAAuB,GAAG,YAAY,CAqExC;AAsCD,eAAO,MAAM,iBAAiB,QAAO,sBAAsB,EAG1D,CAAC;AAEF,eAAO,MAAM,iBAAiB,QAAO,aAAa,EA0BxB,CAAC;AAE3B,eAAO,MAAM,eAAe,GAAI;;CAAkC,KAAG,GAAG,CAAC,SAAS,EAAE,eAAe,CA6BlG,CAAC"}
1	+ {"version":3,"file":"test.utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/reports/test.utils.ts"],"names":[],"mappings":"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"}

package/packages/jam/transition/reports/test.utils.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { Credential, GuaranteesExtrinsicBounds, guaranteesExtrinsicCodec, Report
 import { RefineContext } from "#@typeberry/block/refine-context.js";
 import { testWorkReportHex } from "#@typeberry/block/test-helpers.js";
 import { 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 { codec, Decoder } from "#@typeberry/codec";
 import { asKnownSize, FixedSizeArray, HashDictionary } from "#@typeberry/collections";
@@ -41,7 +41,7 @@ export function newWorkReport({ core, authorizer, anchorBlock, stateRoot, beefyR
             codeHash: x.codeHash,
             payloadHash: x.payloadHash,
             gas: x.gas,
-            result: resultSize !== undefined ? new WorkExecResult(WorkExecResultKind.ok, Bytes.fill(resultSize, 0)) : x.result,
+            result: resultSize !== undefined ? WorkExecResult.ok(Bytes.fill(resultSize, 0)) : x.result,
             load: WorkRefineLoad.create({
                 gasUsed: tryAsServiceGas(5),
                 importedSegments: tryAsU32(0),

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

@@ -1 +0,0 @@

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