@typeberry/jam 0.1.3-ca63b35 → 0.2.0-0a3dfd4

package/bootstrap-importer.mjs

@@ -2753,7 +2753,7 @@ module.exports = __nccwpck_require__.p + "e2fdc1b646378dd96eda.js?ed25519_wasm_b
 
 /***/ }),
 
-/***/ 185:
+/***/ 566:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 module.exports = __nccwpck_require__.p + "ccf8ada94096a8f232f5.js?reed_solomon_wasm_bg.wasm";
@@ -3452,7 +3452,7 @@ async function __wbg_init(module_or_path) {
 	if (wasm !== void 0) return wasm;
 	if (typeof module_or_path !== "undefined") if (Object.getPrototypeOf(module_or_path) === Object.prototype) ({module_or_path} = module_or_path);
 	else console.warn("using deprecated parameters for the initialization function; pass a single object instead");
-	if (typeof module_or_path === "undefined") module_or_path = new URL(/* asset import */ __nccwpck_require__(185), __nccwpck_require__.b);
+	if (typeof module_or_path === "undefined") module_or_path = new URL(/* asset import */ __nccwpck_require__(566), __nccwpck_require__.b);
 	const imports = __wbg_get_imports();
 	if (typeof module_or_path === "string" || typeof Request === "function" && module_or_path instanceof Request || typeof URL === "function" && module_or_path instanceof URL) module_or_path = fetch(module_or_path);
 	__wbg_init_memory(imports);
@@ -3540,7 +3540,7 @@ var GpVersion;
 (function (GpVersion) {
     GpVersion["V0_6_7"] = "0.6.7";
     GpVersion["V0_7_0"] = "0.7.0";
-    GpVersion["V0_7_1"] = "0.7.1-preview";
+    GpVersion["V0_7_1"] = "0.7.1";
     GpVersion["V0_7_2"] = "0.7.2-preview";
 })(GpVersion || (GpVersion = {}));
 var TestSuite;
@@ -3549,11 +3549,11 @@ var TestSuite;
     TestSuite["JAMDUNA"] = "jamduna";
 })(TestSuite || (TestSuite = {}));
 const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
-const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
+const DEFAULT_VERSION = GpVersion.V0_7_1;
 const env = typeof process === "undefined" ? {} : process.env;
-const DEFAULT_VERSION = GpVersion.V0_7_0;
 let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
 let CURRENT_SUITE = parseCurrentSuite(env.TEST_SUITE) ?? DEFAULT_SUITE;
+const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 function parseCurrentVersion(env) {
     if (env === undefined) {
         return undefined;
@@ -3840,7 +3840,7 @@ function resultToString(res) {
     if (res.isOk) {
         return `OK: ${typeof res.ok === "symbol" ? res.ok.toString() : res.ok}`;
     }
-    return `${res.details}\nError: ${maybeTaggedErrorToString(res.error)}`;
+    return `${res.details()}\nError: ${maybeTaggedErrorToString(res.error)}`;
 }
 /** An indication of two possible outcomes returned from a function. */
 const result_Result = {
@@ -3854,7 +3854,7 @@ const result_Result = {
         };
     },
     /** Create new [`Result`] with `Error` status. */
-    error: (error, details = "") => {
+    error: (error, details) => {
         debug_check `${error !== undefined} 'Error' type cannot be undefined.`;
         return {
             isOk: false,
@@ -3973,7 +3973,7 @@ function deepEqual(actual, expected, { context = [], errorsCollector, ignore = [
         }
         if (actual.isError && expected.isError) {
             deepEqual(actual.error, expected.error, { context: ctx.concat(["error"]), errorsCollector: errors, ignore });
-            deepEqual(actual.details, expected.details, {
+            deepEqual(actual.details(), expected.details(), {
                 context: ctx.concat(["details"]),
                 errorsCollector: errors,
                 // display details when error does not match
@@ -4521,7 +4521,7 @@ const BANDERSNATCH_KEY_BYTES = 32;
 /** Bandersnatch VRF signature size */
 const BANDERSNATCH_VRF_SIGNATURE_BYTES = 96;
 /** Bandersnatch ring commitment size */
-const BANDERSNATCH_RING_ROOT_BYTES = 144;
+const bandersnatch_BANDERSNATCH_RING_ROOT_BYTES = 144;
 /** Bandersnatch proof size */
 const BANDERSNATCH_PROOF_BYTES = 784;
 /** BLS public key size. */
@@ -6198,6 +6198,9 @@ class ObjectView {
     toString() {
         return `View<${this.materializedConstructor.name}>(cache: ${this.cache.size})`;
     }
+    [TEST_COMPARE_USING]() {
+        return this.materialize();
+    }
 }
 /**
  * A lazy-evaluated decoder of a sequence.
@@ -6330,7 +6333,7 @@ const TYPICAL_DICTIONARY_LENGTH = 32;
  *       It's not true in a general case, but should be good enough for us.
  *
  */
-function readonlyArray(desc) {
+function descriptors_readonlyArray(desc) {
     return desc.convert((x) => {
         debug_check `
         ${Array.isArray(x)}
@@ -6492,7 +6495,15 @@ var descriptors_codec;
     /** Custom encoding / decoding logic. */
     codec.custom = ({ name, sizeHint = { bytes: 0, isExact: false }, }, encode, decode, skip) => Descriptor.new(name, sizeHint, encode, decode, skip);
     /** Choose a descriptor depending on the encoding/decoding context. */
-    codec.select = ({ name, sizeHint, }, chooser) => Descriptor.withView(name, sizeHint, (e, x) => chooser(e.getContext()).encode(e, x), (d) => chooser(d.getContext()).decode(d), (s) => chooser(s.decoder.getContext()).skip(s), chooser(null).View);
+    codec.select = ({ name, sizeHint, }, chooser) => {
+        const Self = chooser(null);
+        return Descriptor.withView(name, sizeHint, (e, x) => chooser(e.getContext()).encode(e, x), (d) => chooser(d.getContext()).decode(d), (s) => chooser(s.decoder.getContext()).skip(s), hasUniqueView(Self)
+            ? codec.select({
+                name: Self.View.name,
+                sizeHint: Self.View.sizeHint,
+            }, (ctx) => chooser(ctx).View)
+            : Self.View);
+    };
     /**
      * A descriptor for a more complex POJO.
      *
@@ -7610,9 +7621,9 @@ function codecWithContext(chooser) {
 /** Codec for a known-size array with length validation. */
 const codecKnownSizeArray = (val, options, _id) => {
     if ("fixedLength" in options) {
-        return readonlyArray(descriptors_codec.sequenceFixLen(val, options.fixedLength)).convert(seeThrough, sized_array_asKnownSize);
+        return descriptors_readonlyArray(descriptors_codec.sequenceFixLen(val, options.fixedLength)).convert(seeThrough, sized_array_asKnownSize);
     }
-    return readonlyArray(descriptors_codec.sequenceVarLen(val, options)).convert(seeThrough, sized_array_asKnownSize);
+    return descriptors_readonlyArray(descriptors_codec.sequenceVarLen(val, options)).convert(seeThrough, sized_array_asKnownSize);
 };
 /** Codec for a fixed-size array with length validation. */
 const codecFixedSizeArray = (val, len) => {
@@ -7749,7 +7760,7 @@ function tryAsPerValidator(array, spec) {
   `;
     return sized_array_asKnownSize(array);
 }
-const codecPerValidator = (val) => codecWithContext((context) => {
+const common_codecPerValidator = (val) => codecWithContext((context) => {
     return codecKnownSizeArray(val, {
         fixedLength: context.validatorsCount,
     });
@@ -7876,7 +7887,7 @@ class Verdict extends WithDebug {
         workReportHash: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
         votesEpoch: descriptors_codec.u32.asOpaque(),
         votes: codecWithContext((context) => {
-            return readonlyArray(descriptors_codec.sequenceFixLen(Judgement.Codec, context.validatorsSuperMajority)).convert(seeThrough, sized_array_asKnownSize);
+            return descriptors_readonlyArray(descriptors_codec.sequenceFixLen(Judgement.Codec, context.validatorsSuperMajority)).convert(seeThrough, sized_array_asKnownSize);
         }),
     });
     static create({ workReportHash, votesEpoch, votes }) {
@@ -8568,7 +8579,7 @@ const WorkReportCodec = descriptors_codec.Class(WorkReportNoCodec, {
     authorizerHash: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
     authorizationGasUsed: descriptors_codec.varU64.asOpaque(),
     authorizationOutput: descriptors_codec.blob,
-    segmentRootLookup: readonlyArray(descriptors_codec.sequenceVarLen(WorkPackageInfo.Codec)),
+    segmentRootLookup: descriptors_readonlyArray(descriptors_codec.sequenceVarLen(WorkPackageInfo.Codec)),
     results: descriptors_codec.sequenceVarLen(WorkResult.Codec).convert((x) => x, (items) => FixedSizeArray.new(items, tryAsWorkItemsCount(items.length))),
 });
 const WorkReportCodecPre070 = descriptors_codec.Class(WorkReportNoCodec, {
@@ -8582,7 +8593,7 @@ const WorkReportCodecPre070 = descriptors_codec.Class(WorkReportNoCodec, {
     }),
     authorizerHash: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
     authorizationOutput: descriptors_codec.blob,
-    segmentRootLookup: readonlyArray(descriptors_codec.sequenceVarLen(WorkPackageInfo.Codec)),
+    segmentRootLookup: descriptors_readonlyArray(descriptors_codec.sequenceVarLen(WorkPackageInfo.Codec)),
     results: descriptors_codec.sequenceVarLen(WorkResult.Codec).convert((x) => x, (items) => FixedSizeArray.new(items, tryAsWorkItemsCount(items.length))),
     authorizationGasUsed: descriptors_codec.varU64.asOpaque(),
 });
@@ -8700,16 +8711,16 @@ class SignedTicket extends WithDebug {
     }
 }
 /** Anonymous? entry into the ticket contest. */
-class Ticket extends WithDebug {
+class tickets_Ticket extends WithDebug {
     id;
     attempt;
-    static Codec = descriptors_codec.Class(Ticket, {
+    static Codec = descriptors_codec.Class(tickets_Ticket, {
         id: descriptors_codec.bytes(hash_HASH_SIZE),
         // TODO [ToDr] we should verify that attempt is either 0|1|2.
         attempt: descriptors_codec.u8.asOpaque(),
     });
     static create({ id, attempt }) {
-        return new Ticket(id, attempt);
+        return new tickets_Ticket(id, attempt);
     }
     constructor(
     /**
@@ -8778,7 +8789,7 @@ class ValidatorKeys extends WithDebug {
 class TicketsMarker extends WithDebug {
     tickets;
     static Codec = descriptors_codec.Class(TicketsMarker, {
-        tickets: codecPerEpochBlock(Ticket.Codec),
+        tickets: codecPerEpochBlock(tickets_Ticket.Codec),
     });
     static create({ tickets }) {
         return new TicketsMarker(tickets);
@@ -8802,7 +8813,7 @@ class EpochMarker extends WithDebug {
     static Codec = descriptors_codec.Class(EpochMarker, {
         entropy: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
         ticketsEntropy: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
-        validators: codecPerValidator(ValidatorKeys.Codec),
+        validators: common_codecPerValidator(ValidatorKeys.Codec),
     });
     static create({ entropy, ticketsEntropy, validators }) {
         return new EpochMarker(entropy, ticketsEntropy, validators);
@@ -9074,6 +9085,19 @@ function emptyBlock(slot = tryAsTimeSlot(0)) {
     });
 }
 
+;// CONCATENATED MODULE: ./packages/jam/block/utils.ts
+
+/**
+ * Take an input data and re-encode that data as view.
+ *
+ * NOTE: this function should NEVER be used in any production code,
+ * it's only a test helper.
+ */
+function reencodeAsView(codec, object, chainSpec) {
+    const encoded = encoder_Encoder.encodeObject(codec, object, chainSpec);
+    return decoder_Decoder.decodeObject(codec.View, encoded, chainSpec);
+}
+
 ;// CONCATENATED MODULE: ./packages/jam/block/index.ts
 
 
@@ -9092,6 +9116,7 @@ function emptyBlock(slot = tryAsTimeSlot(0)) {
 
 
 
+
 ;// CONCATENATED MODULE: ./packages/jam/database-lmdb/blocks.ts
 
 
@@ -9443,10 +9468,129 @@ function accumulationOutputComparator(a, b) {
     return Ordering.Equal;
 }
 
+;// CONCATENATED MODULE: ./packages/jam/block/gp-constants.ts
+
+
+/**
+ * This file lists all of the constants defined in the GrayPaper appendix.
+ *
+ * NOTE: Avoid using the constants directly, prefer "named" constants defined
+ * in a semantical proximity to where they are used.
+ *
+ * NOTE: This file will most likely be removed in the future. The constants
+ * here are only temporarily for convenience. When we figure out better names
+ * and places for these this file will be eradicated.
+ *
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/442300442300?v=0.7.2
+ */
+/** `G_I`: The gas allocated to invoke a work-package’s Is-Authorized logic. */
+const G_I = 50_000_000;
+/** `I`: Maximum number of work items in a package. */
+const gp_constants_I = (/* unused pure expression or super */ null && (MAX_NUMBER_OF_WORK_ITEMS));
+/** `O`: Maximum number of items in the authorizations pool. */
+const O = 8;
+/** `Q`: The number of items in the authorizations queue. */
+const Q = 80;
+/** `S`: The maximum number of entries in the accumulation queue. */
+const S = 1024;
+/** `T`: The maximum number of extrinsics in a work-package. */
+const T = 128;
+/** `W_A`: The maximum size of is-authorized code in octets. */
+const W_A = 64_000;
+/** `W_B`: The maximum size of the concatenated variable-size blobs, extrinsics and imported segments of a work-package, in octets */
+const W_B = Compatibility.isGreaterOrEqual(GpVersion.V0_7_2) ? 13_791_360 : 13_794_305;
+/** `W_C`: The maximum size of service code in octets. */
+const W_C = 4_000_000;
+/** `W_M`: The maximum number of imports in a work-package. */
+const W_M = 3_072;
+/** `W_R`: The maximum total size of all output blobs in a work-report, in octets. */
+const W_R = 49_152;
+/** `W_T`: The size of a transfer memo in octets. */
+const W_T = 128;
+/** `W_M`: The maximum number of exports in a work-package. */
+const W_X = 3_072;
+// TODO [ToDr] Not sure where these should live yet :(
+/**
+ * `S`: The minimum public service index.
+ * Services of indices below these may only be created by the Registrar.
+ *
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/447a00447a00?v=0.7.2
+ */
+const MIN_PUBLIC_SERVICE_INDEX = 2 ** 16;
+/**
+ * `J`: The maximum sum of dependency items in a work-report.
+ *
+ * https://graypaper.fluffylabs.dev/#/5f542d7/416a00416a00?v=0.6.2
+ */
+const MAX_REPORT_DEPENDENCIES = 8;
+
+;// CONCATENATED MODULE: ./packages/jam/state/accumulation-queue.ts
+
+
+
+
+
+
+
+/**
+ * Ready (i.e. available and/or audited) but not-yet-accumulated work-reports.
+ *
+ * https://graypaper.fluffylabs.dev/#/5f542d7/165300165400
+ */
+class NotYetAccumulatedReport extends WithDebug {
+    report;
+    dependencies;
+    static Codec = descriptors_codec.Class(NotYetAccumulatedReport, {
+        report: WorkReport.Codec,
+        dependencies: codecKnownSizeArray(descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(), {
+            typicalLength: MAX_REPORT_DEPENDENCIES / 2,
+            maxLength: MAX_REPORT_DEPENDENCIES,
+            minLength: 0,
+        }),
+    });
+    static create({ report, dependencies }) {
+        return new NotYetAccumulatedReport(report, dependencies);
+    }
+    constructor(
+    /**
+     * Each of these were made available at most one epoch ago
+     * but have or had unfulfilled dependencies.
+     */
+    report, 
+    /**
+     * Alongside the work-report itself, we retain its un-accumulated
+     * dependencies, a set of work-package hashes.
+     *
+     * https://graypaper.fluffylabs.dev/#/5f542d7/165800165800
+     */
+    dependencies) {
+        super();
+        this.report = report;
+        this.dependencies = dependencies;
+    }
+}
+const accumulationQueueCodec = codecPerEpochBlock(descriptors_readonlyArray(descriptors_codec.sequenceVarLen(NotYetAccumulatedReport.Codec)));
+
+;// CONCATENATED MODULE: ./packages/jam/state/common.ts
+
+
+/** Check if given array has correct length before casting to the opaque type. */
+function tryAsPerCore(array, spec) {
+    debug_check `
+    ${array.length === spec.coresCount}
+    Invalid per-core array length. Expected ${spec.coresCount}, got: ${array.length}
+  `;
+    return opaque_asOpaqueType(array);
+}
+const codecPerCore = (val) => codecWithContext((context) => {
+    return codecKnownSizeArray(val, { fixedLength: context.coresCount });
+});
+
 ;// CONCATENATED MODULE: ./packages/jam/state/assurances.ts
 
 
 
+
 /**
  * Assignment of particular work report to a core.
  *
@@ -9475,27 +9619,30 @@ class AvailabilityAssignment extends WithDebug {
         this.timeout = timeout;
     }
 }
+const availabilityAssignmentsCodec = codecPerCore(descriptors_codec.optional(AvailabilityAssignment.Codec));
 
-;// CONCATENATED MODULE: ./packages/jam/state/common.ts
+;// CONCATENATED MODULE: ./packages/jam/state/auth.ts
 
 
-/** Check if given array has correct length before casting to the opaque type. */
-function tryAsPerCore(array, spec) {
-    debug_check `
-    ${array.length === spec.coresCount}
-    Invalid per-core array length. Expected ${spec.coresCount}, got: ${array.length}
-  `;
-    return opaque_asOpaqueType(array);
-}
-const codecPerCore = (val) => codecWithContext((context) => {
-    return codecKnownSizeArray(val, { fixedLength: context.coresCount });
-});
+
+
+
+/** `O`: Maximal authorization pool size. */
+const MAX_AUTH_POOL_SIZE = O;
+/** `Q`: Size of the authorization queue. */
+const AUTHORIZATION_QUEUE_SIZE = Q;
+const authPoolsCodec = codecPerCore(codecKnownSizeArray(descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(), {
+    minLength: 0,
+    maxLength: MAX_AUTH_POOL_SIZE,
+    typicalLength: MAX_AUTH_POOL_SIZE,
+}));
+const authQueuesCodec = codecPerCore(codecFixedSizeArray(descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(), AUTHORIZATION_QUEUE_SIZE));
 
 ;// CONCATENATED MODULE: ./packages/jam/state/disputes.ts
 
 
 
-const sortedSetCodec = () => readonlyArray(descriptors_codec.sequenceVarLen(descriptors_codec.bytes(hash_HASH_SIZE))).convert((input) => input.array, (output) => {
+const sortedSetCodec = () => descriptors_readonlyArray(descriptors_codec.sequenceVarLen(descriptors_codec.bytes(hash_HASH_SIZE))).convert((input) => input.array, (output) => {
     const typed = output.map((x) => x.asOpaque());
     return SortedSet.fromSortedArray(hashComparator, typed);
 });
@@ -9557,65 +9704,6 @@ function hashComparator(a, b) {
     return a.compare(b);
 }
 
-;// CONCATENATED MODULE: ./packages/jam/block/gp-constants.ts
-
-/**
- * This file lists all of the constants defined in the GrayPaper appendix.
- *
- * NOTE: Avoid using the constants directly, prefer "named" constants defined
- * in a semantical proximity to where they are used.
- *
- * NOTE: This file will most likely be removed in the future. The constants
- * here are only temporarily for convenience. When we figure out better names
- * and places for these this file will be eradicated.
- *
- * https://graypaper.fluffylabs.dev/#/579bd12/413000413000
- */
-/** `G_I`: The gas allocated to invoke a work-package’s Is-Authorized logic. */
-const G_I = 50_000_000;
-/** `I`: Maximum number of work items in a package. */
-const gp_constants_I = (/* unused pure expression or super */ null && (MAX_NUMBER_OF_WORK_ITEMS));
-/** `O`: Maximum number of items in the authorizations pool. */
-const O = 8;
-/** `Q`: The number of items in the authorizations queue. */
-const Q = 80;
-/** `S`: The maximum number of entries in the accumulation queue. */
-const S = 1024;
-/** `T`: The maximum number of extrinsics in a work-package. */
-const T = 128;
-/** `W_A`: The maximum size of is-authorized code in octets. */
-const W_A = 64_000;
-/** `W_B`: The maximum size of an encoded work-package with extrinsic data and imports. */
-const W_B = 13_794_305;
-/** `W_C`: The maximum size of service code in octets. */
-const W_C = 4_000_000;
-/** `W_M`: The maximum number of imports in a work-package. */
-const W_M = 3_072;
-/** `W_R`: The maximum total size of all output blobs in a work-report, in octets. */
-const W_R = 49_152;
-/** `W_T`: The size of a transfer memo in octets. */
-const W_T = 128;
-/** `W_M`: The maximum number of exports in a work-package. */
-const W_X = 3_072;
-// TODO [ToDr] Not sure where these should live yet :(
-/**
- * `S`: The minimum public service index.
- * Services of indices below these may only be created by the Registrar.
- *
- * https://graypaper.fluffylabs.dev/#/ab2cdbd/447a00447a00?v=0.7.2
- */
-const MIN_PUBLIC_SERVICE_INDEX = 2 ** 16;
-/**
- * `J`: The maximum sum of dependency items in a work-report.
- *
- * https://graypaper.fluffylabs.dev/#/5f542d7/416a00416a00?v=0.6.2
- */
-const MAX_REPORT_DEPENDENCIES = 8;
-/** `Q`: Size of the authorization queue. */
-const AUTHORIZATION_QUEUE_SIZE = Q;
-/** `O`: Maximal authorization pool size. */
-const MAX_AUTH_POOL_SIZE = O;
-
 ;// CONCATENATED MODULE: ./packages/core/pvm-interpreter/ops/math-consts.ts
 const MAX_VALUE = 4294967295;
 const math_consts_MAX_VALUE_U64 = (/* unused pure expression or super */ null && (2n ** 63n));
@@ -9623,7 +9711,7 @@ const MIN_VALUE = -(2 ** 31);
 const MAX_SHIFT_U32 = 32;
 const MAX_SHIFT_U64 = 64n;
 
-;// CONCATENATED MODULE: ./packages/jam/state/service.ts
+;// CONCATENATED MODULE: ./packages/jam/state/recent-blocks.ts
 
 
 
@@ -9631,26 +9719,270 @@ const MAX_SHIFT_U64 = 64n;
 
 
 /**
- * `B_S`: The basic minimum balance which all services require.
- *
- * https://graypaper.fluffylabs.dev/#/7e6ff6a/445800445800?v=0.6.7
- */
-const BASE_SERVICE_BALANCE = 100n;
-/**
- * `B_I`: The additional minimum balance required per item of elective service state.
+ * `H = 8`: The size of recent history, in blocks.
  *
- * https://graypaper.fluffylabs.dev/#/7e6ff6a/445000445000?v=0.6.7
+ * https://graypaper.fluffylabs.dev/#/579bd12/416300416500
  */
-const ELECTIVE_ITEM_BALANCE = 10n;
+const MAX_RECENT_HISTORY = 8;
+/** Recent history of a single block. */
+class BlockState extends WithDebug {
+    headerHash;
+    accumulationResult;
+    postStateRoot;
+    reported;
+    static Codec = descriptors_codec.Class(BlockState, {
+        headerHash: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
+        accumulationResult: descriptors_codec.bytes(hash_HASH_SIZE),
+        postStateRoot: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
+        reported: codecHashDictionary(WorkPackageInfo.Codec, (x) => x.workPackageHash),
+    });
+    static create({ headerHash, accumulationResult, postStateRoot, reported }) {
+        return new BlockState(headerHash, accumulationResult, postStateRoot, reported);
+    }
+    constructor(
+    /** Header hash. */
+    headerHash, 
+    /** Merkle mountain belt of accumulation result. */
+    accumulationResult, 
+    /** Posterior state root filled in with a 1-block delay. */
+    postStateRoot, 
+    /** Reported work packages (no more than number of cores). */
+    reported) {
+        super();
+        this.headerHash = headerHash;
+        this.accumulationResult = accumulationResult;
+        this.postStateRoot = postStateRoot;
+        this.reported = reported;
+    }
+}
 /**
- * `B_L`: The additional minimum balance required per octet of elective service state.
+ * Recent history of blocks.
  *
- * https://graypaper.fluffylabs.dev/#/7e6ff6a/445400445400?v=0.6.7
+ * https://graypaper.fluffylabs.dev/#/7e6ff6a/0fc9010fc901?v=0.6.7
  */
-const ELECTIVE_BYTE_BALANCE = 1n;
-const zeroSizeHint = {
-    bytes: 0,
-    isExact: true,
+class RecentBlocks extends WithDebug {
+    blocks;
+    accumulationLog;
+    static Codec = descriptors_codec.Class(RecentBlocks, {
+        blocks: codecKnownSizeArray(BlockState.Codec, {
+            minLength: 0,
+            maxLength: MAX_RECENT_HISTORY,
+            typicalLength: MAX_RECENT_HISTORY,
+        }),
+        accumulationLog: descriptors_codec.object({
+            peaks: descriptors_readonlyArray(descriptors_codec.sequenceVarLen(descriptors_codec.optional(descriptors_codec.bytes(hash_HASH_SIZE)))),
+        }),
+    });
+    static empty() {
+        return new RecentBlocks(sized_array_asKnownSize([]), {
+            peaks: [],
+        });
+    }
+    static create(a) {
+        return new RecentBlocks(a.blocks, a.accumulationLog);
+    }
+    constructor(
+    /**
+     * Most recent blocks.
+     * https://graypaper.fluffylabs.dev/#/7e6ff6a/0fea010fea01?v=0.6.7
+     */
+    blocks, 
+    /**
+     * Accumulation output log.
+     * https://graypaper.fluffylabs.dev/#/7e6ff6a/0f02020f0202?v=0.6.7
+     */
+    accumulationLog) {
+        super();
+        this.blocks = blocks;
+        this.accumulationLog = accumulationLog;
+    }
+}
+
+;// CONCATENATED MODULE: ./packages/jam/state/recently-accumulated.ts
+
+
+
+
+const recentlyAccumulatedCodec = codecPerEpochBlock(descriptors_codec.sequenceVarLen(descriptors_codec.bytes(hash_HASH_SIZE).asOpaque()).convert((x) => Array.from(x), (x) => HashSet.from(x)));
+
+;// CONCATENATED MODULE: ./packages/jam/state/validator-data.ts
+
+
+
+
+/**
+ * Fixed size of validator metadata.
+ *
+ * https://graypaper.fluffylabs.dev/#/5f542d7/0d55010d5501
+ */
+const VALIDATOR_META_BYTES = 128;
+/**
+ * Details about validators' identity.
+ *
+ * https://graypaper.fluffylabs.dev/#/5f542d7/0d4b010d4c01
+ */
+class validator_data_ValidatorData extends WithDebug {
+    bandersnatch;
+    ed25519;
+    bls;
+    metadata;
+    static Codec = descriptors_codec.Class(validator_data_ValidatorData, {
+        bandersnatch: descriptors_codec.bytes(BANDERSNATCH_KEY_BYTES).asOpaque(),
+        ed25519: descriptors_codec.bytes(ED25519_KEY_BYTES).asOpaque(),
+        bls: descriptors_codec.bytes(BLS_KEY_BYTES).asOpaque(),
+        metadata: descriptors_codec.bytes(VALIDATOR_META_BYTES),
+    });
+    static create({ ed25519, bandersnatch, bls, metadata }) {
+        return new validator_data_ValidatorData(bandersnatch, ed25519, bls, metadata);
+    }
+    constructor(
+    /** Bandersnatch public key. */
+    bandersnatch, 
+    /** ED25519 key data. */
+    ed25519, 
+    /** BLS public key. */
+    bls, 
+    /** Validator-defined additional metdata. */
+    metadata) {
+        super();
+        this.bandersnatch = bandersnatch;
+        this.ed25519 = ed25519;
+        this.bls = bls;
+        this.metadata = metadata;
+    }
+}
+const validatorsDataCodec = common_codecPerValidator(validator_data_ValidatorData.Codec);
+
+;// CONCATENATED MODULE: ./packages/jam/state/safrole-data.ts
+
+
+
+
+
+
+
+
+
+
+
+var SafroleSealingKeysKind;
+(function (SafroleSealingKeysKind) {
+    SafroleSealingKeysKind[SafroleSealingKeysKind["Tickets"] = 0] = "Tickets";
+    SafroleSealingKeysKind[SafroleSealingKeysKind["Keys"] = 1] = "Keys";
+})(SafroleSealingKeysKind || (SafroleSealingKeysKind = {}));
+const codecBandersnatchKey = descriptors_codec.bytes(BANDERSNATCH_KEY_BYTES).asOpaque();
+class safrole_data_SafroleSealingKeysData extends WithDebug {
+    kind;
+    keys;
+    tickets;
+    static Codec = codecWithContext((context) => {
+        return descriptors_codec.custom({
+            name: "SafroleSealingKeys",
+            sizeHint: { bytes: 1 + hash_HASH_SIZE * context.epochLength, isExact: false },
+        }, (e, x) => {
+            e.varU32(numbers_tryAsU32(x.kind));
+            if (x.kind === SafroleSealingKeysKind.Keys) {
+                e.sequenceFixLen(codecBandersnatchKey, x.keys);
+            }
+            else {
+                e.sequenceFixLen(tickets_Ticket.Codec, x.tickets);
+            }
+        }, (d) => {
+            const epochLength = context.epochLength;
+            const kind = d.varU32();
+            if (kind === SafroleSealingKeysKind.Keys) {
+                const keys = d.sequenceFixLen(codecBandersnatchKey, epochLength);
+                return safrole_data_SafroleSealingKeysData.keys(tryAsPerEpochBlock(keys, context));
+            }
+            if (kind === SafroleSealingKeysKind.Tickets) {
+                const tickets = d.sequenceFixLen(tickets_Ticket.Codec, epochLength);
+                return safrole_data_SafroleSealingKeysData.tickets(tryAsPerEpochBlock(tickets, context));
+            }
+            throw new Error(`Unexpected safrole sealing keys kind: ${kind}`);
+        }, (s) => {
+            const kind = s.decoder.varU32();
+            if (kind === SafroleSealingKeysKind.Keys) {
+                s.sequenceFixLen(codecBandersnatchKey, context.epochLength);
+                return;
+            }
+            if (kind === SafroleSealingKeysKind.Tickets) {
+                s.sequenceFixLen(tickets_Ticket.Codec, context.epochLength);
+                return;
+            }
+            throw new Error(`Unexpected safrole sealing keys kind: ${kind}`);
+        });
+    });
+    static keys(keys) {
+        return new safrole_data_SafroleSealingKeysData(SafroleSealingKeysKind.Keys, keys, undefined);
+    }
+    static tickets(tickets) {
+        return new safrole_data_SafroleSealingKeysData(SafroleSealingKeysKind.Tickets, undefined, tickets);
+    }
+    constructor(kind, keys, tickets) {
+        super();
+        this.kind = kind;
+        this.keys = keys;
+        this.tickets = tickets;
+    }
+}
+class SafroleData {
+    nextValidatorData;
+    epochRoot;
+    sealingKeySeries;
+    ticketsAccumulator;
+    static Codec = descriptors_codec.Class(SafroleData, {
+        nextValidatorData: common_codecPerValidator(validator_data_ValidatorData.Codec),
+        epochRoot: descriptors_codec.bytes(bandersnatch_BANDERSNATCH_RING_ROOT_BYTES).asOpaque(),
+        sealingKeySeries: safrole_data_SafroleSealingKeysData.Codec,
+        ticketsAccumulator: descriptors_readonlyArray(descriptors_codec.sequenceVarLen(tickets_Ticket.Codec)).convert(seeThrough, sized_array_asKnownSize),
+    });
+    static create({ nextValidatorData, epochRoot, sealingKeySeries, ticketsAccumulator }) {
+        return new SafroleData(nextValidatorData, epochRoot, sealingKeySeries, ticketsAccumulator);
+    }
+    constructor(
+    /** gamma_k */
+    nextValidatorData, 
+    /** gamma_z */
+    epochRoot, 
+    /** gamma_s */
+    sealingKeySeries, 
+    /** gamma_a */
+    ticketsAccumulator) {
+        this.nextValidatorData = nextValidatorData;
+        this.epochRoot = epochRoot;
+        this.sealingKeySeries = sealingKeySeries;
+        this.ticketsAccumulator = ticketsAccumulator;
+    }
+}
+
+;// CONCATENATED MODULE: ./packages/jam/state/service.ts
+
+
+
+
+
+
+/**
+ * `B_S`: The basic minimum balance which all services require.
+ *
+ * https://graypaper.fluffylabs.dev/#/7e6ff6a/445800445800?v=0.6.7
+ */
+const BASE_SERVICE_BALANCE = 100n;
+/**
+ * `B_I`: The additional minimum balance required per item of elective service state.
+ *
+ * https://graypaper.fluffylabs.dev/#/7e6ff6a/445000445000?v=0.6.7
+ */
+const ELECTIVE_ITEM_BALANCE = 10n;
+/**
+ * `B_L`: The additional minimum balance required per octet of elective service state.
+ *
+ * https://graypaper.fluffylabs.dev/#/7e6ff6a/445400445400?v=0.6.7
+ */
+const ELECTIVE_BYTE_BALANCE = 1n;
+const zeroSizeHint = {
+    bytes: 0,
+    isExact: true,
 };
 /** 0-byte read, return given default value */
 const ignoreValueWithDefault = (defaultValue) => Descriptor.new("ignoreValue", zeroSizeHint, (_e, _v) => { }, (_d) => defaultValue, (_s) => { });
@@ -9813,358 +10145,418 @@ class LookupHistoryItem {
     }
 }
 
-;// CONCATENATED MODULE: ./packages/jam/state/privileged-services.ts
+;// CONCATENATED MODULE: ./packages/jam/state/statistics.ts
 
 
 
 
 
-/** Dictionary entry of services that auto-accumulate every block. */
-class AutoAccumulate {
-    service;
-    gasLimit;
-    static Codec = descriptors_codec.Class(AutoAccumulate, {
-        service: descriptors_codec.u32.asOpaque(),
-        gasLimit: descriptors_codec.u64.asOpaque(),
+
+const codecServiceId = Compatibility.isSuite(TestSuite.W3F_DAVXY) || Compatibility.isSuite(TestSuite.JAMDUNA, GpVersion.V0_6_7)
+    ? descriptors_codec.u32.asOpaque()
+    : descriptors_codec.varU32.convert((s) => numbers_tryAsU32(s), (i) => tryAsServiceId(i));
+/**
+ * Activity Record of a single validator.
+ *
+ * https://graypaper.fluffylabs.dev/#/579bd12/183701183701
+ */
+class ValidatorStatistics {
+    blocks;
+    tickets;
+    preImages;
+    preImagesSize;
+    guarantees;
+    assurances;
+    static Codec = descriptors_codec.Class(ValidatorStatistics, {
+        blocks: descriptors_codec.u32,
+        tickets: descriptors_codec.u32,
+        preImages: descriptors_codec.u32,
+        preImagesSize: descriptors_codec.u32,
+        guarantees: descriptors_codec.u32,
+        assurances: descriptors_codec.u32,
     });
-    static create({ service, gasLimit }) {
-        return new AutoAccumulate(service, gasLimit);
+    static create({ blocks, tickets, preImages, preImagesSize, guarantees, assurances, }) {
+        return new ValidatorStatistics(blocks, tickets, preImages, preImagesSize, guarantees, assurances);
     }
     constructor(
-    /** Service id that auto-accumulates. */
-    service, 
-    /** Gas limit for auto-accumulation. */
-    gasLimit) {
-        this.service = service;
-        this.gasLimit = gasLimit;
-    }
-}
-/**
- * https://graypaper.fluffylabs.dev/#/ab2cdbd/114402114402?v=0.7.2
- */
-class PrivilegedServices {
-    manager;
-    delegator;
-    registrar;
-    assigners;
-    autoAccumulateServices;
-    /** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bbd023bcb02?v=0.7.2 */
-    static Codec = descriptors_codec.Class(PrivilegedServices, {
-        manager: descriptors_codec.u32.asOpaque(),
-        assigners: codecPerCore(descriptors_codec.u32.asOpaque()),
-        delegator: descriptors_codec.u32.asOpaque(),
-        registrar: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? descriptors_codec.u32.asOpaque()
-            : ignoreValueWithDefault(tryAsServiceId(2 ** 32 - 1)),
-        autoAccumulateServices: readonlyArray(descriptors_codec.sequenceVarLen(AutoAccumulate.Codec)),
-    });
-    static create(a) {
-        return new PrivilegedServices(a.manager, a.delegator, a.registrar, a.assigners, a.autoAccumulateServices);
+    /** The number of blocks produced by the validator. */
+    blocks, 
+    /** The number of tickets introduced by the validator. */
+    tickets, 
+    /** The number of preimages introduced by the validator. */
+    preImages, 
+    /** The total number of octets across all preimages introduced by the validator. */
+    preImagesSize, 
+    /** The number of reports guaranteed by the validator. */
+    guarantees, 
+    /** The number of availability assurances made by the validator. */
+    assurances) {
+        this.blocks = blocks;
+        this.tickets = tickets;
+        this.preImages = preImages;
+        this.preImagesSize = preImagesSize;
+        this.guarantees = guarantees;
+        this.assurances = assurances;
     }
-    constructor(
-    /**
-     * `χ_M`: Manages alteration of χ from block to block,
-     * as well as bestow services with storage deposit credits.
-     * https://graypaper.fluffylabs.dev/#/ab2cdbd/111502111902?v=0.7.2
-     */
-    manager, 
-    /** `χ_V`: Managers validator keys. */
-    delegator, 
-    /**
-     * `χ_R`: Manages the creation of services in protected range.
-     *
-     * https://graypaper.fluffylabs.dev/#/ab2cdbd/111b02111d02?v=0.7.2
-     */
-    registrar, 
-    /** `χ_A`: Manages authorization queue one for each core. */
-    assigners, 
-    /** `χ_Z`: Dictionary of services that auto-accumulate every block with their gas limit. */
-    autoAccumulateServices) {
-        this.manager = manager;
-        this.delegator = delegator;
-        this.registrar = registrar;
-        this.assigners = assigners;
-        this.autoAccumulateServices = autoAccumulateServices;
+    static empty() {
+        const zero = numbers_tryAsU32(0);
+        return new ValidatorStatistics(zero, zero, zero, zero, zero, zero);
     }
 }
-
-;// CONCATENATED MODULE: ./packages/jam/state/recent-blocks.ts
-
-
-
-
-
-
+const codecVarU16 = descriptors_codec.varU32.convert((i) => numbers_tryAsU32(i), (o) => numbers_tryAsU16(o));
+/** Encode/decode unsigned gas. */
+const codecVarGas = descriptors_codec.varU64.convert((g) => numbers_tryAsU64(g), (i) => tryAsServiceGas(i));
 /**
- * `H = 8`: The size of recent history, in blocks.
+ * Single core statistics.
+ * Updated per block, based on incoming work reports (`w`).
  *
- * https://graypaper.fluffylabs.dev/#/579bd12/416300416500
+ * https://graypaper.fluffylabs.dev/#/68eaa1f/18f10318f103?v=0.6.4
+ * https://github.com/gavofyork/graypaper/blob/9bffb08f3ea7b67832019176754df4fb36b9557d/text/statistics.tex#L65
  */
-const MAX_RECENT_HISTORY = 8;
-/** Recent history of a single block. */
-class BlockState extends WithDebug {
-    headerHash;
-    accumulationResult;
-    postStateRoot;
-    reported;
-    static Codec = descriptors_codec.Class(BlockState, {
-        headerHash: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
-        accumulationResult: descriptors_codec.bytes(hash_HASH_SIZE),
-        postStateRoot: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
-        reported: codecHashDictionary(WorkPackageInfo.Codec, (x) => x.workPackageHash),
-    });
-    static create({ headerHash, accumulationResult, postStateRoot, reported }) {
-        return new BlockState(headerHash, accumulationResult, postStateRoot, reported);
+class CoreStatistics {
+    dataAvailabilityLoad;
+    popularity;
+    imports;
+    exports;
+    extrinsicSize;
+    extrinsicCount;
+    bundleSize;
+    gasUsed;
+    static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_7_0)
+        ? descriptors_codec.Class(CoreStatistics, {
+            dataAvailabilityLoad: descriptors_codec.varU32,
+            popularity: codecVarU16,
+            imports: codecVarU16,
+            extrinsicCount: codecVarU16,
+            extrinsicSize: descriptors_codec.varU32,
+            exports: codecVarU16,
+            bundleSize: descriptors_codec.varU32,
+            gasUsed: codecVarGas,
+        })
+        : descriptors_codec.Class(CoreStatistics, {
+            dataAvailabilityLoad: descriptors_codec.varU32,
+            popularity: codecVarU16,
+            imports: codecVarU16,
+            exports: codecVarU16,
+            extrinsicSize: descriptors_codec.varU32,
+            extrinsicCount: codecVarU16,
+            bundleSize: descriptors_codec.varU32,
+            gasUsed: codecVarGas,
+        });
+    static create(v) {
+        return new CoreStatistics(v.dataAvailabilityLoad, v.popularity, v.imports, v.exports, v.extrinsicSize, v.extrinsicCount, v.bundleSize, v.gasUsed);
     }
     constructor(
-    /** Header hash. */
-    headerHash, 
-    /** Merkle mountain belt of accumulation result. */
-    accumulationResult, 
-    /** Posterior state root filled in with a 1-block delay. */
-    postStateRoot, 
-    /** Reported work packages (no more than number of cores). */
-    reported) {
-        super();
-        this.headerHash = headerHash;
-        this.accumulationResult = accumulationResult;
-        this.postStateRoot = postStateRoot;
-        this.reported = reported;
-    }
-}
-class RecentBlocks extends WithDebug {
-    blocks;
-    accumulationLog;
-    static Codec = descriptors_codec.Class(RecentBlocks, {
-        blocks: codecKnownSizeArray(BlockState.Codec, {
-            minLength: 0,
-            maxLength: MAX_RECENT_HISTORY,
-            typicalLength: MAX_RECENT_HISTORY,
-        }),
-        accumulationLog: descriptors_codec.object({
-            peaks: readonlyArray(descriptors_codec.sequenceVarLen(descriptors_codec.optional(descriptors_codec.bytes(hash_HASH_SIZE)))),
-        }),
-    });
-    static create(a) {
-        return new RecentBlocks(a.blocks, a.accumulationLog);
+    /** `d` */
+    dataAvailabilityLoad, 
+    /** `p` */
+    popularity, 
+    /** `i` */
+    imports, 
+    /** `e` */
+    exports, 
+    /** `z` */
+    extrinsicSize, 
+    /** `x` */
+    extrinsicCount, 
+    /** `b` */
+    bundleSize, 
+    /** `u` */
+    gasUsed) {
+        this.dataAvailabilityLoad = dataAvailabilityLoad;
+        this.popularity = popularity;
+        this.imports = imports;
+        this.exports = exports;
+        this.extrinsicSize = extrinsicSize;
+        this.extrinsicCount = extrinsicCount;
+        this.bundleSize = bundleSize;
+        this.gasUsed = gasUsed;
     }
-    constructor(
-    /**
-     * Most recent blocks.
-     * https://graypaper.fluffylabs.dev/#/7e6ff6a/0fea010fea01?v=0.6.7
-     */
-    blocks, 
-    /**
-     * Accumulation output log.
-     * https://graypaper.fluffylabs.dev/#/7e6ff6a/0f02020f0202?v=0.6.7
-     */
-    accumulationLog) {
-        super();
-        this.blocks = blocks;
-        this.accumulationLog = accumulationLog;
+    static empty() {
+        const zero = numbers_tryAsU32(0);
+        const zero16 = numbers_tryAsU16(0);
+        const zeroGas = tryAsServiceGas(0);
+        return new CoreStatistics(zero, zero16, zero16, zero16, zero, zero16, zero, zeroGas);
     }
 }
 /**
- * Recent history of blocks.
+ * Service statistics.
+ * Updated per block, based on available work reports (`W`).
  *
- * https://graypaper.fluffylabs.dev/#/7e6ff6a/0fc9010fc901?v=0.6.7
+ * https://graypaper.fluffylabs.dev/#/1c979cb/199802199802?v=0.7.1
  */
-class RecentBlocksHistory extends WithDebug {
-    current;
-    static Codec = Descriptor.new("RecentBlocksHistory", RecentBlocks.Codec.sizeHint, (encoder, value) => RecentBlocks.Codec.encode(encoder, value.asCurrent()), (decoder) => {
-        const recentBlocks = RecentBlocks.Codec.decode(decoder);
-        return RecentBlocksHistory.create(recentBlocks);
-    }, (skip) => {
-        return RecentBlocks.Codec.skip(skip);
+class ServiceStatistics {
+    providedCount;
+    providedSize;
+    refinementCount;
+    refinementGasUsed;
+    imports;
+    exports;
+    extrinsicSize;
+    extrinsicCount;
+    accumulateCount;
+    accumulateGasUsed;
+    onTransfersCount;
+    onTransfersGasUsed;
+    static Codec = Compatibility.selectIfGreaterOrEqual({
+        fallback: descriptors_codec.Class(ServiceStatistics, {
+            providedCount: codecVarU16,
+            providedSize: descriptors_codec.varU32,
+            refinementCount: descriptors_codec.varU32,
+            refinementGasUsed: codecVarGas,
+            imports: codecVarU16,
+            exports: codecVarU16,
+            extrinsicSize: descriptors_codec.varU32,
+            extrinsicCount: codecVarU16,
+            accumulateCount: descriptors_codec.varU32,
+            accumulateGasUsed: codecVarGas,
+            onTransfersCount: descriptors_codec.varU32,
+            onTransfersGasUsed: codecVarGas,
+        }),
+        versions: {
+            [GpVersion.V0_7_0]: descriptors_codec.Class(ServiceStatistics, {
+                providedCount: codecVarU16,
+                providedSize: descriptors_codec.varU32,
+                refinementCount: descriptors_codec.varU32,
+                refinementGasUsed: codecVarGas,
+                imports: codecVarU16,
+                extrinsicCount: codecVarU16,
+                extrinsicSize: descriptors_codec.varU32,
+                exports: codecVarU16,
+                accumulateCount: descriptors_codec.varU32,
+                accumulateGasUsed: codecVarGas,
+                onTransfersCount: descriptors_codec.varU32,
+                onTransfersGasUsed: codecVarGas,
+            }),
+            [GpVersion.V0_7_1]: descriptors_codec.Class(ServiceStatistics, {
+                providedCount: codecVarU16,
+                providedSize: descriptors_codec.varU32,
+                refinementCount: descriptors_codec.varU32,
+                refinementGasUsed: codecVarGas,
+                imports: codecVarU16,
+                extrinsicCount: codecVarU16,
+                extrinsicSize: descriptors_codec.varU32,
+                exports: codecVarU16,
+                accumulateCount: descriptors_codec.varU32,
+                accumulateGasUsed: codecVarGas,
+                onTransfersCount: ignoreValueWithDefault(numbers_tryAsU32(0)),
+                onTransfersGasUsed: ignoreValueWithDefault(tryAsServiceGas(0)),
+            }),
+        },
     });
-    static create(recentBlocks) {
-        return new RecentBlocksHistory(recentBlocks);
+    static create(v) {
+        return new ServiceStatistics(v.providedCount, v.providedSize, v.refinementCount, v.refinementGasUsed, v.imports, v.exports, v.extrinsicSize, v.extrinsicCount, v.accumulateCount, v.accumulateGasUsed, v.onTransfersCount, v.onTransfersGasUsed);
+    }
+    constructor(
+    /** `p.0` */
+    providedCount, 
+    /** `p.1` */
+    providedSize, 
+    /** `r.0` */
+    refinementCount, 
+    /** `r.1` */
+    refinementGasUsed, 
+    /** `i` */
+    imports, 
+    /** `e` */
+    exports, 
+    /** `z` */
+    extrinsicSize, 
+    /** `x` */
+    extrinsicCount, 
+    /** `a.0` */
+    accumulateCount, 
+    /** `a.1` */
+    accumulateGasUsed, 
+    /** `t.0` @deprecated since 0.7.1 */
+    onTransfersCount, 
+    /** `t.1` @deprecated since 0.7.1 */
+    onTransfersGasUsed) {
+        this.providedCount = providedCount;
+        this.providedSize = providedSize;
+        this.refinementCount = refinementCount;
+        this.refinementGasUsed = refinementGasUsed;
+        this.imports = imports;
+        this.exports = exports;
+        this.extrinsicSize = extrinsicSize;
+        this.extrinsicCount = extrinsicCount;
+        this.accumulateCount = accumulateCount;
+        this.accumulateGasUsed = accumulateGasUsed;
+        this.onTransfersCount = onTransfersCount;
+        this.onTransfersGasUsed = onTransfersGasUsed;
     }
     static empty() {
-        return RecentBlocksHistory.create(RecentBlocks.create({
-            blocks: sized_array_asKnownSize([]),
-            accumulationLog: { peaks: [] },
-        }));
+        const zero = numbers_tryAsU32(0);
+        const zero16 = numbers_tryAsU16(0);
+        const zeroGas = tryAsServiceGas(0);
+        return new ServiceStatistics(zero16, zero, zero, zeroGas, zero16, zero16, zero, zero16, zero, zeroGas, zero, zeroGas);
     }
-    /**
-     * Returns the block's BEEFY super peak.
-     */
-    static accumulationResult(block) {
-        return block.accumulationResult;
+}
+/** `pi`: Statistics of each validator, cores statistics and services statistics. */
+class StatisticsData {
+    current;
+    previous;
+    cores;
+    services;
+    static Codec = descriptors_codec.Class(StatisticsData, {
+        current: common_codecPerValidator(ValidatorStatistics.Codec),
+        previous: common_codecPerValidator(ValidatorStatistics.Codec),
+        cores: codecPerCore(CoreStatistics.Codec),
+        services: descriptors_codec.dictionary(codecServiceId, ServiceStatistics.Codec, {
+            sortKeys: (a, b) => a - b,
+        }),
+    });
+    static create(v) {
+        return new StatisticsData(v.current, v.previous, v.cores, v.services);
     }
-    constructor(current) {
-        super();
+    constructor(current, previous, cores, services) {
         this.current = current;
-    }
-    /** History of recent blocks with maximum size of `MAX_RECENT_HISTORY` */
-    get blocks() {
-        if (this.current !== null) {
-            return this.current.blocks;
-        }
-        throw new Error("RecentBlocksHistory is in invalid state");
-    }
-    asCurrent() {
-        if (this.current === null) {
-            throw new Error("Cannot access current RecentBlocks format");
-        }
-        return this.current;
-    }
-    updateBlocks(blocks) {
-        if (this.current !== null) {
-            return RecentBlocksHistory.create(RecentBlocks.create({
-                ...this.current,
-                blocks: opaque_asOpaqueType(blocks),
-            }));
-        }
-        throw new Error("RecentBlocksHistory is in invalid state. Cannot be updated!");
+        this.previous = previous;
+        this.cores = cores;
+        this.services = services;
     }
 }
 
-;// CONCATENATED MODULE: ./packages/jam/state/validator-data.ts
+;// CONCATENATED MODULE: ./packages/jam/state/in-memory-state-view.ts
 
 
 
-/**
- * Fixed size of validator metadata.
- *
- * https://graypaper.fluffylabs.dev/#/5f542d7/0d55010d5501
- */
-const VALIDATOR_META_BYTES = 128;
-/**
- * Details about validators' identity.
- *
- * https://graypaper.fluffylabs.dev/#/5f542d7/0d4b010d4c01
- */
-class ValidatorData extends WithDebug {
-    bandersnatch;
-    ed25519;
-    bls;
-    metadata;
-    static Codec = descriptors_codec.Class(ValidatorData, {
-        bandersnatch: descriptors_codec.bytes(BANDERSNATCH_KEY_BYTES).asOpaque(),
-        ed25519: descriptors_codec.bytes(ED25519_KEY_BYTES).asOpaque(),
-        bls: descriptors_codec.bytes(BLS_KEY_BYTES).asOpaque(),
-        metadata: descriptors_codec.bytes(VALIDATOR_META_BYTES),
-    });
-    static create({ ed25519, bandersnatch, bls, metadata }) {
-        return new ValidatorData(bandersnatch, ed25519, bls, metadata);
-    }
-    constructor(
-    /** Bandersnatch public key. */
-    bandersnatch, 
-    /** ED25519 key data. */
-    ed25519, 
-    /** BLS public key. */
-    bls, 
-    /** Validator-defined additional metdata. */
-    metadata) {
-        super();
-        this.bandersnatch = bandersnatch;
-        this.ed25519 = ed25519;
-        this.bls = bls;
-        this.metadata = metadata;
-    }
-}
 
-;// CONCATENATED MODULE: ./packages/jam/state/safrole-data.ts
 
 
 
 
 
 
+class InMemoryStateView {
+    chainSpec;
+    state;
+    constructor(chainSpec, state) {
+        this.chainSpec = chainSpec;
+        this.state = state;
+    }
+    availabilityAssignmentView() {
+        return reencodeAsView(availabilityAssignmentsCodec, this.state.availabilityAssignment, this.chainSpec);
+    }
+    designatedValidatorDataView() {
+        return reencodeAsView(validatorsDataCodec, this.state.designatedValidatorData, this.chainSpec);
+    }
+    currentValidatorDataView() {
+        return reencodeAsView(validatorsDataCodec, this.state.currentValidatorData, this.chainSpec);
+    }
+    previousValidatorDataView() {
+        return reencodeAsView(validatorsDataCodec, this.state.previousValidatorData, this.chainSpec);
+    }
+    authPoolsView() {
+        return reencodeAsView(authPoolsCodec, this.state.authPools, this.chainSpec);
+    }
+    authQueuesView() {
+        return reencodeAsView(authQueuesCodec, this.state.authQueues, this.chainSpec);
+    }
+    recentBlocksView() {
+        return reencodeAsView(RecentBlocks.Codec, this.state.recentBlocks, this.chainSpec);
+    }
+    statisticsView() {
+        return reencodeAsView(StatisticsData.Codec, this.state.statistics, this.chainSpec);
+    }
+    accumulationQueueView() {
+        return reencodeAsView(accumulationQueueCodec, this.state.accumulationQueue, this.chainSpec);
+    }
+    recentlyAccumulatedView() {
+        return reencodeAsView(recentlyAccumulatedCodec, this.state.recentlyAccumulated, this.chainSpec);
+    }
+    safroleDataView() {
+        // TODO [ToDr] Consider exposting `safrole` from state
+        // instead of individual fields
+        const safrole = SafroleData.create({
+            nextValidatorData: this.state.nextValidatorData,
+            epochRoot: this.state.epochRoot,
+            sealingKeySeries: this.state.sealingKeySeries,
+            ticketsAccumulator: this.state.ticketsAccumulator,
+        });
+        return reencodeAsView(SafroleData.Codec, safrole, this.chainSpec);
+    }
+    getServiceInfoView(id) {
+        const service = this.state.getService(id);
+        if (service === null) {
+            return null;
+        }
+        return reencodeAsView(ServiceAccountInfo.Codec, service.getInfo(), this.chainSpec);
+    }
+}
 
+;// CONCATENATED MODULE: ./packages/jam/state/privileged-services.ts
 
 
 
 
-var SafroleSealingKeysKind;
-(function (SafroleSealingKeysKind) {
-    SafroleSealingKeysKind[SafroleSealingKeysKind["Tickets"] = 0] = "Tickets";
-    SafroleSealingKeysKind[SafroleSealingKeysKind["Keys"] = 1] = "Keys";
-})(SafroleSealingKeysKind || (SafroleSealingKeysKind = {}));
-const codecBandersnatchKey = descriptors_codec.bytes(BANDERSNATCH_KEY_BYTES).asOpaque();
-class SafroleSealingKeysData extends WithDebug {
-    kind;
-    keys;
-    tickets;
-    static Codec = codecWithContext((context) => {
-        return descriptors_codec.custom({
-            name: "SafroleSealingKeys",
-            sizeHint: { bytes: 1 + hash_HASH_SIZE * context.epochLength, isExact: false },
-        }, (e, x) => {
-            e.varU32(numbers_tryAsU32(x.kind));
-            if (x.kind === SafroleSealingKeysKind.Keys) {
-                e.sequenceFixLen(codecBandersnatchKey, x.keys);
-            }
-            else {
-                e.sequenceFixLen(Ticket.Codec, x.tickets);
-            }
-        }, (d) => {
-            const epochLength = context.epochLength;
-            const kind = d.varU32();
-            if (kind === SafroleSealingKeysKind.Keys) {
-                const keys = d.sequenceFixLen(codecBandersnatchKey, epochLength);
-                return SafroleSealingKeysData.keys(tryAsPerEpochBlock(keys, context));
-            }
-            if (kind === SafroleSealingKeysKind.Tickets) {
-                const tickets = d.sequenceFixLen(Ticket.Codec, epochLength);
-                return SafroleSealingKeysData.tickets(tryAsPerEpochBlock(tickets, context));
-            }
-            throw new Error(`Unexpected safrole sealing keys kind: ${kind}`);
-        }, (s) => {
-            const kind = s.decoder.varU32();
-            if (kind === SafroleSealingKeysKind.Keys) {
-                s.sequenceFixLen(codecBandersnatchKey, context.epochLength);
-                return;
-            }
-            if (kind === SafroleSealingKeysKind.Tickets) {
-                s.sequenceFixLen(Ticket.Codec, context.epochLength);
-                return;
-            }
-            throw new Error(`Unexpected safrole sealing keys kind: ${kind}`);
-        });
+
+/** Dictionary entry of services that auto-accumulate every block. */
+class AutoAccumulate {
+    service;
+    gasLimit;
+    static Codec = descriptors_codec.Class(AutoAccumulate, {
+        service: descriptors_codec.u32.asOpaque(),
+        gasLimit: descriptors_codec.u64.asOpaque(),
     });
-    static keys(keys) {
-        return new SafroleSealingKeysData(SafroleSealingKeysKind.Keys, keys, undefined);
-    }
-    static tickets(tickets) {
-        return new SafroleSealingKeysData(SafroleSealingKeysKind.Tickets, undefined, tickets);
+    static create({ service, gasLimit }) {
+        return new AutoAccumulate(service, gasLimit);
     }
-    constructor(kind, keys, tickets) {
-        super();
-        this.kind = kind;
-        this.keys = keys;
-        this.tickets = tickets;
+    constructor(
+    /** Service id that auto-accumulates. */
+    service, 
+    /** Gas limit for auto-accumulation. */
+    gasLimit) {
+        this.service = service;
+        this.gasLimit = gasLimit;
     }
 }
-class SafroleData {
-    nextValidatorData;
-    epochRoot;
-    sealingKeySeries;
-    ticketsAccumulator;
-    static Codec = descriptors_codec.Class(SafroleData, {
-        nextValidatorData: codecPerValidator(ValidatorData.Codec),
-        epochRoot: descriptors_codec.bytes(BANDERSNATCH_RING_ROOT_BYTES).asOpaque(),
-        sealingKeySeries: SafroleSealingKeysData.Codec,
-        ticketsAccumulator: readonlyArray(descriptors_codec.sequenceVarLen(Ticket.Codec)).convert(seeThrough, sized_array_asKnownSize),
+/**
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/114402114402?v=0.7.2
+ */
+class PrivilegedServices {
+    manager;
+    delegator;
+    registrar;
+    assigners;
+    autoAccumulateServices;
+    /** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bbd023bcb02?v=0.7.2 */
+    static Codec = descriptors_codec.Class(PrivilegedServices, {
+        manager: descriptors_codec.u32.asOpaque(),
+        assigners: codecPerCore(descriptors_codec.u32.asOpaque()),
+        delegator: descriptors_codec.u32.asOpaque(),
+        registrar: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
+            ? descriptors_codec.u32.asOpaque()
+            : ignoreValueWithDefault(tryAsServiceId(2 ** 32 - 1)),
+        autoAccumulateServices: descriptors_readonlyArray(descriptors_codec.sequenceVarLen(AutoAccumulate.Codec)),
     });
-    static create({ nextValidatorData, epochRoot, sealingKeySeries, ticketsAccumulator }) {
-        return new SafroleData(nextValidatorData, epochRoot, sealingKeySeries, ticketsAccumulator);
+    static create(a) {
+        return new PrivilegedServices(a.manager, a.delegator, a.registrar, a.assigners, a.autoAccumulateServices);
     }
     constructor(
-    /** gamma_k */
-    nextValidatorData, 
-    /** gamma_z */
-    epochRoot, 
-    /** gamma_s */
-    sealingKeySeries, 
-    /** gamma_a */
-    ticketsAccumulator) {
-        this.nextValidatorData = nextValidatorData;
-        this.epochRoot = epochRoot;
-        this.sealingKeySeries = sealingKeySeries;
-        this.ticketsAccumulator = ticketsAccumulator;
+    /**
+     * `χ_M`: Manages alteration of χ from block to block,
+     * as well as bestow services with storage deposit credits.
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/111502111902?v=0.7.2
+     */
+    manager, 
+    /** `χ_V`: Managers validator keys. */
+    delegator, 
+    /**
+     * `χ_R`: Manages the creation of services in protected range.
+     *
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/111b02111d02?v=0.7.2
+     */
+    registrar, 
+    /** `χ_A`: Manages authorization queue one for each core. */
+    assigners, 
+    /** `χ_Z`: Dictionary of services that auto-accumulate every block with their gas limit. */
+    autoAccumulateServices) {
+        this.manager = manager;
+        this.delegator = delegator;
+        this.registrar = registrar;
+        this.assigners = assigners;
+        this.autoAccumulateServices = autoAccumulateServices;
     }
 }
 
@@ -10205,31 +10597,29 @@ var UpdatePreimageKind;
  * 3. Update `LookupHistory` with given value.
  */
 class UpdatePreimage {
-    serviceId;
     action;
-    constructor(serviceId, action) {
-        this.serviceId = serviceId;
+    constructor(action) {
         this.action = action;
     }
     /** A preimage is provided. We should update the lookuphistory and add the preimage to db. */
-    static provide({ serviceId, preimage, slot, }) {
-        return new UpdatePreimage(serviceId, {
+    static provide({ preimage, slot }) {
+        return new UpdatePreimage({
             kind: UpdatePreimageKind.Provide,
             preimage,
             slot,
         });
     }
     /** The preimage should be removed completely from the database. */
-    static remove({ serviceId, hash, length }) {
-        return new UpdatePreimage(serviceId, {
+    static remove({ hash, length }) {
+        return new UpdatePreimage({
             kind: UpdatePreimageKind.Remove,
             hash,
             length,
         });
     }
     /** Update the lookup history of some preimage or add a new one (request). */
-    static updateOrAdd({ serviceId, lookupHistory }) {
-        return new UpdatePreimage(serviceId, {
+    static updateOrAdd({ lookupHistory }) {
+        return new UpdatePreimage({
             kind: UpdatePreimageKind.UpdateOrAdd,
             item: lookupHistory,
         });
@@ -10266,23 +10656,21 @@ var UpdateServiceKind;
     UpdateServiceKind[UpdateServiceKind["Create"] = 1] = "Create";
 })(UpdateServiceKind || (UpdateServiceKind = {}));
 /**
- * Update service info of a particular `ServiceId` or create a new one.
+ * Update service info or create a new one.
  */
 class UpdateService {
-    serviceId;
     action;
-    constructor(serviceId, action) {
-        this.serviceId = serviceId;
+    constructor(action) {
         this.action = action;
     }
-    static update({ serviceId, serviceInfo }) {
-        return new UpdateService(serviceId, {
+    static update({ serviceInfo }) {
+        return new UpdateService({
             kind: UpdateServiceKind.Update,
             account: serviceInfo,
         });
     }
-    static create({ serviceId, serviceInfo, lookupHistory, }) {
-        return new UpdateService(serviceId, {
+    static create({ serviceInfo, lookupHistory, }) {
+        return new UpdateService({
             kind: UpdateServiceKind.Create,
             account: serviceInfo,
             lookupHistory,
@@ -10299,288 +10687,31 @@ var UpdateStorageKind;
 })(UpdateStorageKind || (UpdateStorageKind = {}));
 /**
  * Update service storage item.
- *
- * Can either create/modify an entry or remove it.
- */
-class UpdateStorage {
-    serviceId;
-    action;
-    constructor(serviceId, action) {
-        this.serviceId = serviceId;
-        this.action = action;
-    }
-    static set({ serviceId, storage }) {
-        return new UpdateStorage(serviceId, { kind: UpdateStorageKind.Set, storage });
-    }
-    static remove({ serviceId, key }) {
-        return new UpdateStorage(serviceId, { kind: UpdateStorageKind.Remove, key });
-    }
-    get key() {
-        if (this.action.kind === UpdateStorageKind.Remove) {
-            return this.action.key;
-        }
-        return this.action.storage.key;
-    }
-    get value() {
-        if (this.action.kind === UpdateStorageKind.Remove) {
-            return null;
-        }
-        return this.action.storage.value;
-    }
-}
-
-;// CONCATENATED MODULE: ./packages/jam/state/statistics.ts
-
-
-
-
-
-const codecServiceId = Compatibility.isSuite(TestSuite.W3F_DAVXY) || Compatibility.isSuite(TestSuite.JAMDUNA, GpVersion.V0_6_7)
-    ? descriptors_codec.u32.asOpaque()
-    : descriptors_codec.varU32.convert((s) => numbers_tryAsU32(s), (i) => tryAsServiceId(i));
-/**
- * Activity Record of a single validator.
- *
- * https://graypaper.fluffylabs.dev/#/579bd12/183701183701
- */
-class ValidatorStatistics {
-    blocks;
-    tickets;
-    preImages;
-    preImagesSize;
-    guarantees;
-    assurances;
-    static Codec = descriptors_codec.Class(ValidatorStatistics, {
-        blocks: descriptors_codec.u32,
-        tickets: descriptors_codec.u32,
-        preImages: descriptors_codec.u32,
-        preImagesSize: descriptors_codec.u32,
-        guarantees: descriptors_codec.u32,
-        assurances: descriptors_codec.u32,
-    });
-    static create({ blocks, tickets, preImages, preImagesSize, guarantees, assurances, }) {
-        return new ValidatorStatistics(blocks, tickets, preImages, preImagesSize, guarantees, assurances);
-    }
-    constructor(
-    /** The number of blocks produced by the validator. */
-    blocks, 
-    /** The number of tickets introduced by the validator. */
-    tickets, 
-    /** The number of preimages introduced by the validator. */
-    preImages, 
-    /** The total number of octets across all preimages introduced by the validator. */
-    preImagesSize, 
-    /** The number of reports guaranteed by the validator. */
-    guarantees, 
-    /** The number of availability assurances made by the validator. */
-    assurances) {
-        this.blocks = blocks;
-        this.tickets = tickets;
-        this.preImages = preImages;
-        this.preImagesSize = preImagesSize;
-        this.guarantees = guarantees;
-        this.assurances = assurances;
-    }
-    static empty() {
-        const zero = numbers_tryAsU32(0);
-        return new ValidatorStatistics(zero, zero, zero, zero, zero, zero);
-    }
-}
-const codecVarU16 = descriptors_codec.varU32.convert((i) => numbers_tryAsU32(i), (o) => numbers_tryAsU16(o));
-/** Encode/decode unsigned gas. */
-const codecVarGas = descriptors_codec.varU64.convert((g) => numbers_tryAsU64(g), (i) => tryAsServiceGas(i));
-/**
- * Single core statistics.
- * Updated per block, based on incoming work reports (`w`).
- *
- * https://graypaper.fluffylabs.dev/#/68eaa1f/18f10318f103?v=0.6.4
- * https://github.com/gavofyork/graypaper/blob/9bffb08f3ea7b67832019176754df4fb36b9557d/text/statistics.tex#L65
- */
-class CoreStatistics {
-    dataAvailabilityLoad;
-    popularity;
-    imports;
-    exports;
-    extrinsicSize;
-    extrinsicCount;
-    bundleSize;
-    gasUsed;
-    static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_7_0)
-        ? descriptors_codec.Class(CoreStatistics, {
-            dataAvailabilityLoad: descriptors_codec.varU32,
-            popularity: codecVarU16,
-            imports: codecVarU16,
-            extrinsicCount: codecVarU16,
-            extrinsicSize: descriptors_codec.varU32,
-            exports: codecVarU16,
-            bundleSize: descriptors_codec.varU32,
-            gasUsed: codecVarGas,
-        })
-        : descriptors_codec.Class(CoreStatistics, {
-            dataAvailabilityLoad: descriptors_codec.varU32,
-            popularity: codecVarU16,
-            imports: codecVarU16,
-            exports: codecVarU16,
-            extrinsicSize: descriptors_codec.varU32,
-            extrinsicCount: codecVarU16,
-            bundleSize: descriptors_codec.varU32,
-            gasUsed: codecVarGas,
-        });
-    static create(v) {
-        return new CoreStatistics(v.dataAvailabilityLoad, v.popularity, v.imports, v.exports, v.extrinsicSize, v.extrinsicCount, v.bundleSize, v.gasUsed);
-    }
-    constructor(
-    /** `d` */
-    dataAvailabilityLoad, 
-    /** `p` */
-    popularity, 
-    /** `i` */
-    imports, 
-    /** `e` */
-    exports, 
-    /** `z` */
-    extrinsicSize, 
-    /** `x` */
-    extrinsicCount, 
-    /** `b` */
-    bundleSize, 
-    /** `u` */
-    gasUsed) {
-        this.dataAvailabilityLoad = dataAvailabilityLoad;
-        this.popularity = popularity;
-        this.imports = imports;
-        this.exports = exports;
-        this.extrinsicSize = extrinsicSize;
-        this.extrinsicCount = extrinsicCount;
-        this.bundleSize = bundleSize;
-        this.gasUsed = gasUsed;
-    }
-    static empty() {
-        const zero = numbers_tryAsU32(0);
-        const zero16 = numbers_tryAsU16(0);
-        const zeroGas = tryAsServiceGas(0);
-        return new CoreStatistics(zero, zero16, zero16, zero16, zero, zero16, zero, zeroGas);
-    }
-}
-/**
- * Service statistics.
- * Updated per block, based on available work reports (`W`).
- *
- * https://graypaper.fluffylabs.dev/#/68eaa1f/185104185104?v=0.6.4
- * https://github.com/gavofyork/graypaper/blob/9bffb08f3ea7b67832019176754df4fb36b9557d/text/statistics.tex#L77
- */
-class ServiceStatistics {
-    providedCount;
-    providedSize;
-    refinementCount;
-    refinementGasUsed;
-    imports;
-    exports;
-    extrinsicSize;
-    extrinsicCount;
-    accumulateCount;
-    accumulateGasUsed;
-    onTransfersCount;
-    onTransfersGasUsed;
-    static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_7_0)
-        ? descriptors_codec.Class(ServiceStatistics, {
-            providedCount: codecVarU16,
-            providedSize: descriptors_codec.varU32,
-            refinementCount: descriptors_codec.varU32,
-            refinementGasUsed: codecVarGas,
-            imports: codecVarU16,
-            extrinsicCount: codecVarU16,
-            extrinsicSize: descriptors_codec.varU32,
-            exports: codecVarU16,
-            accumulateCount: descriptors_codec.varU32,
-            accumulateGasUsed: codecVarGas,
-            onTransfersCount: descriptors_codec.varU32,
-            onTransfersGasUsed: codecVarGas,
-        })
-        : descriptors_codec.Class(ServiceStatistics, {
-            providedCount: codecVarU16,
-            providedSize: descriptors_codec.varU32,
-            refinementCount: descriptors_codec.varU32,
-            refinementGasUsed: codecVarGas,
-            imports: codecVarU16,
-            exports: codecVarU16,
-            extrinsicSize: descriptors_codec.varU32,
-            extrinsicCount: codecVarU16,
-            accumulateCount: descriptors_codec.varU32,
-            accumulateGasUsed: codecVarGas,
-            onTransfersCount: descriptors_codec.varU32,
-            onTransfersGasUsed: codecVarGas,
-        });
-    static create(v) {
-        return new ServiceStatistics(v.providedCount, v.providedSize, v.refinementCount, v.refinementGasUsed, v.imports, v.exports, v.extrinsicSize, v.extrinsicCount, v.accumulateCount, v.accumulateGasUsed, v.onTransfersCount, v.onTransfersGasUsed);
-    }
-    constructor(
-    /** `p.0` */
-    providedCount, 
-    /** `p.1` */
-    providedSize, 
-    /** `r.0` */
-    refinementCount, 
-    /** `r.1` */
-    refinementGasUsed, 
-    /** `i` */
-    imports, 
-    /** `e` */
-    exports, 
-    /** `z` */
-    extrinsicSize, 
-    /** `x` */
-    extrinsicCount, 
-    /** `a.0` */
-    accumulateCount, 
-    /** `a.1` */
-    accumulateGasUsed, 
-    /** `t.0` */
-    onTransfersCount, 
-    /** `t.1` */
-    onTransfersGasUsed) {
-        this.providedCount = providedCount;
-        this.providedSize = providedSize;
-        this.refinementCount = refinementCount;
-        this.refinementGasUsed = refinementGasUsed;
-        this.imports = imports;
-        this.exports = exports;
-        this.extrinsicSize = extrinsicSize;
-        this.extrinsicCount = extrinsicCount;
-        this.accumulateCount = accumulateCount;
-        this.accumulateGasUsed = accumulateGasUsed;
-        this.onTransfersCount = onTransfersCount;
-        this.onTransfersGasUsed = onTransfersGasUsed;
+ *
+ * Can either create/modify an entry or remove it.
+ */
+class UpdateStorage {
+    action;
+    constructor(action) {
+        this.action = action;
     }
-    static empty() {
-        const zero = numbers_tryAsU32(0);
-        const zero16 = numbers_tryAsU16(0);
-        const zeroGas = tryAsServiceGas(0);
-        return new ServiceStatistics(zero16, zero, zero, zeroGas, zero16, zero16, zero, zero16, zero, zeroGas, zero, zeroGas);
+    static set({ storage }) {
+        return new UpdateStorage({ kind: UpdateStorageKind.Set, storage });
     }
-}
-/** `pi`: Statistics of each validator, cores statistics and services statistics. */
-class StatisticsData {
-    current;
-    previous;
-    cores;
-    services;
-    static Codec = descriptors_codec.Class(StatisticsData, {
-        current: codecPerValidator(ValidatorStatistics.Codec),
-        previous: codecPerValidator(ValidatorStatistics.Codec),
-        cores: codecPerCore(CoreStatistics.Codec),
-        services: descriptors_codec.dictionary(codecServiceId, ServiceStatistics.Codec, {
-            sortKeys: (a, b) => a - b,
-        }),
-    });
-    static create(v) {
-        return new StatisticsData(v.current, v.previous, v.cores, v.services);
+    static remove({ key }) {
+        return new UpdateStorage({ kind: UpdateStorageKind.Remove, key });
     }
-    constructor(current, previous, cores, services) {
-        this.current = current;
-        this.previous = previous;
-        this.cores = cores;
-        this.services = services;
+    get key() {
+        if (this.action.kind === UpdateStorageKind.Remove) {
+            return this.action.key;
+        }
+        return this.action.storage.key;
+    }
+    get value() {
+        if (this.action.kind === UpdateStorageKind.Remove) {
+            return null;
+        }
+        return this.action.storage.value;
     }
 }
 
@@ -10605,6 +10736,7 @@ class StatisticsData {
 
 
 
+
 
 
 var in_memory_state_UpdateError;
@@ -10705,10 +10837,11 @@ class InMemoryService extends WithDebug {
 /**
  * A special version of state, stored fully in-memory.
  */
-class InMemoryState extends WithDebug {
+class in_memory_state_InMemoryState extends WithDebug {
+    chainSpec;
     /** Create a new `InMemoryState` by providing all required fields. */
-    static create(state) {
-        return new InMemoryState(state);
+    static new(chainSpec, state) {
+        return new in_memory_state_InMemoryState(chainSpec, state);
     }
     /**
      * Create a new `InMemoryState` with a partial state override.
@@ -10717,14 +10850,14 @@ class InMemoryState extends WithDebug {
      * not-necessarily coherent values.
      */
     static partial(spec, partial) {
-        const state = InMemoryState.empty(spec);
+        const state = in_memory_state_InMemoryState.empty(spec);
         Object.assign(state, partial);
         return state;
     }
     /**
      * Create a new `InMemoryState` from some other state object.
      */
-    static copyFrom(other, servicesData) {
+    static copyFrom(chainSpec, other, servicesData) {
         const services = new Map();
         for (const [id, entries] of servicesData.entries()) {
             const service = other.getService(id);
@@ -10734,7 +10867,7 @@ class InMemoryState extends WithDebug {
             const inMemService = InMemoryService.copyFrom(service, entries);
             services.set(id, inMemService);
         }
-        return InMemoryState.create({
+        return in_memory_state_InMemoryState.new(chainSpec, {
             availabilityAssignment: other.availabilityAssignment,
             accumulationQueue: other.accumulationQueue,
             designatedValidatorData: other.designatedValidatorData,
@@ -10775,12 +10908,12 @@ class InMemoryState extends WithDebug {
      * Modify the state and apply a single state update.
      */
     applyUpdate(update) {
-        const { servicesRemoved, servicesUpdates, preimages, storage, ...rest } = update;
+        const { removed, created: _, updated, preimages, storage, ...rest } = update;
         // just assign all other variables
         Object.assign(this, rest);
         // and update the services state
         let result;
-        result = this.updateServices(servicesUpdates);
+        result = this.updateServices(updated);
         if (result.isError) {
             return result;
         }
@@ -10792,7 +10925,7 @@ class InMemoryState extends WithDebug {
         if (result.isError) {
             return result;
         }
-        this.removeServices(servicesRemoved);
+        this.removeServices(removed);
         return result_Result.ok(result_OK);
     }
     removeServices(servicesRemoved) {
@@ -10801,89 +10934,102 @@ class InMemoryState extends WithDebug {
             this.services.delete(serviceId);
         }
     }
-    updateStorage(storage) {
-        for (const { serviceId, action } of storage ?? []) {
-            const { kind } = action;
-            const service = this.services.get(serviceId);
-            if (service === undefined) {
-                return result_Result.error(in_memory_state_UpdateError.NoService, `Attempting to update storage of non-existing service: ${serviceId}`);
-            }
-            if (kind === UpdateStorageKind.Set) {
-                const { key, value } = action.storage;
-                service.data.storage.set(key.toString(), StorageItem.create({ key, value }));
-            }
-            else if (kind === UpdateStorageKind.Remove) {
-                const { key } = action;
-                debug_check `
+    updateStorage(storageUpdates) {
+        if (storageUpdates === undefined) {
+            return result_Result.ok(result_OK);
+        }
+        for (const [serviceId, updates] of storageUpdates.entries()) {
+            for (const update of updates) {
+                const { kind } = update.action;
+                const service = this.services.get(serviceId);
+                if (service === undefined) {
+                    return result_Result.error(in_memory_state_UpdateError.NoService, () => `Attempting to update storage of non-existing service: ${serviceId}`);
+                }
+                if (kind === UpdateStorageKind.Set) {
+                    const { key, value } = update.action.storage;
+                    service.data.storage.set(key.toString(), StorageItem.create({ key, value }));
+                }
+                else if (kind === UpdateStorageKind.Remove) {
+                    const { key } = update.action;
+                    debug_check `
           ${service.data.storage.has(key.toString())}
-          Attempting to remove non-existing storage item at ${serviceId}: ${action.key}
+          Attempting to remove non-existing storage item at ${serviceId}: ${update.action.key}
         `;
-                service.data.storage.delete(key.toString());
-            }
-            else {
-                debug_assertNever(kind);
+                    service.data.storage.delete(key.toString());
+                }
+                else {
+                    debug_assertNever(kind);
+                }
             }
         }
         return result_Result.ok(result_OK);
     }
-    updatePreimages(preimages) {
-        for (const { serviceId, action } of preimages ?? []) {
+    updatePreimages(preimagesUpdates) {
+        if (preimagesUpdates === undefined) {
+            return result_Result.ok(result_OK);
+        }
+        for (const [serviceId, updates] of preimagesUpdates.entries()) {
             const service = this.services.get(serviceId);
             if (service === undefined) {
-                return result_Result.error(in_memory_state_UpdateError.NoService, `Attempting to update preimage of non-existing service: ${serviceId}`);
-            }
-            const { kind } = action;
-            if (kind === UpdatePreimageKind.Provide) {
-                const { preimage, slot } = action;
-                if (service.data.preimages.has(preimage.hash)) {
-                    return result_Result.error(in_memory_state_UpdateError.PreimageExists, `Overwriting existing preimage at ${serviceId}: ${preimage}`);
-                }
-                service.data.preimages.set(preimage.hash, preimage);
-                if (slot !== null) {
-                    const lookupHistory = service.data.lookupHistory.get(preimage.hash);
-                    const length = numbers_tryAsU32(preimage.blob.length);
-                    const lookup = new LookupHistoryItem(preimage.hash, length, tryAsLookupHistorySlots([slot]));
-                    if (lookupHistory === undefined) {
-                        // no lookup history for that preimage at all (edge case, should be requested)
-                        service.data.lookupHistory.set(preimage.hash, [lookup]);
+                return result_Result.error(in_memory_state_UpdateError.NoService, () => `Attempting to update preimage of non-existing service: ${serviceId}`);
+            }
+            for (const update of updates) {
+                const { kind } = update.action;
+                if (kind === UpdatePreimageKind.Provide) {
+                    const { preimage, slot } = update.action;
+                    if (service.data.preimages.has(preimage.hash)) {
+                        return result_Result.error(in_memory_state_UpdateError.PreimageExists, () => `Overwriting existing preimage at ${serviceId}: ${preimage}`);
+                    }
+                    service.data.preimages.set(preimage.hash, preimage);
+                    if (slot !== null) {
+                        const lookupHistory = service.data.lookupHistory.get(preimage.hash);
+                        const length = numbers_tryAsU32(preimage.blob.length);
+                        const lookup = new LookupHistoryItem(preimage.hash, length, tryAsLookupHistorySlots([slot]));
+                        if (lookupHistory === undefined) {
+                            // no lookup history for that preimage at all (edge case, should be requested)
+                            service.data.lookupHistory.set(preimage.hash, [lookup]);
+                        }
+                        else {
+                            // insert or replace exiting entry
+                            const index = lookupHistory.map((x) => x.length).indexOf(length);
+                            lookupHistory.splice(index, index === -1 ? 0 : 1, lookup);
+                        }
                     }
-                    else {
-                        // insert or replace exiting entry
-                        const index = lookupHistory.map((x) => x.length).indexOf(length);
-                        lookupHistory.splice(index, index === -1 ? 0 : 1, lookup);
+                }
+                else if (kind === UpdatePreimageKind.Remove) {
+                    const { hash, length } = update.action;
+                    service.data.preimages.delete(hash);
+                    const history = service.data.lookupHistory.get(hash) ?? [];
+                    const idx = history.map((x) => x.length).indexOf(length);
+                    if (idx !== -1) {
+                        history.splice(idx, 1);
                     }
                 }
-            }
-            else if (kind === UpdatePreimageKind.Remove) {
-                const { hash, length } = action;
-                service.data.preimages.delete(hash);
-                const history = service.data.lookupHistory.get(hash) ?? [];
-                const idx = history.map((x) => x.length).indexOf(length);
-                if (idx !== -1) {
-                    history.splice(idx, 1);
+                else if (kind === UpdatePreimageKind.UpdateOrAdd) {
+                    const { item } = update.action;
+                    const history = service.data.lookupHistory.get(item.hash) ?? [];
+                    const existingIdx = history.map((x) => x.length).indexOf(item.length);
+                    const removeCount = existingIdx === -1 ? 0 : 1;
+                    history.splice(existingIdx, removeCount, item);
+                    service.data.lookupHistory.set(item.hash, history);
+                }
+                else {
+                    debug_assertNever(kind);
                 }
-            }
-            else if (kind === UpdatePreimageKind.UpdateOrAdd) {
-                const { item } = action;
-                const history = service.data.lookupHistory.get(item.hash) ?? [];
-                const existingIdx = history.map((x) => x.length).indexOf(item.length);
-                const removeCount = existingIdx === -1 ? 0 : 1;
-                history.splice(existingIdx, removeCount, item);
-                service.data.lookupHistory.set(item.hash, history);
-            }
-            else {
-                debug_assertNever(kind);
             }
         }
         return result_Result.ok(result_OK);
     }
     updateServices(servicesUpdates) {
-        for (const { serviceId, action } of servicesUpdates ?? []) {
-            const { kind, account } = action;
+        if (servicesUpdates === undefined) {
+            return result_Result.ok(result_OK);
+        }
+        for (const [serviceId, update] of servicesUpdates.entries()) {
+            const { kind, account } = update.action;
             if (kind === UpdateServiceKind.Create) {
-                const { lookupHistory } = action;
+                const { lookupHistory } = update.action;
                 if (this.services.has(serviceId)) {
-                    return result_Result.error(in_memory_state_UpdateError.DuplicateService, `${serviceId} already exists!`);
+                    return result_Result.error(in_memory_state_UpdateError.DuplicateService, () => `${serviceId} already exists!`);
                 }
                 this.services.set(serviceId, new InMemoryService(serviceId, {
                     info: account,
@@ -10895,7 +11041,7 @@ class InMemoryState extends WithDebug {
             else if (kind === UpdateServiceKind.Update) {
                 const existingService = this.services.get(serviceId);
                 if (existingService === undefined) {
-                    return result_Result.error(in_memory_state_UpdateError.NoService, `Cannot update ${serviceId} because it does not exist.`);
+                    return result_Result.error(in_memory_state_UpdateError.NoService, () => `Cannot update ${serviceId} because it does not exist.`);
                 }
                 existingService.data.info = account;
             }
@@ -10931,8 +11077,9 @@ class InMemoryState extends WithDebug {
     getService(id) {
         return this.services.get(id) ?? null;
     }
-    constructor(s) {
+    constructor(chainSpec, s) {
         super();
+        this.chainSpec = chainSpec;
         this.availabilityAssignment = s.availabilityAssignment;
         this.designatedValidatorData = s.designatedValidatorData;
         this.nextValidatorData = s.nextValidatorData;
@@ -10954,31 +11101,34 @@ class InMemoryState extends WithDebug {
         this.accumulationOutputLog = s.accumulationOutputLog;
         this.services = s.services;
     }
+    view() {
+        return new InMemoryStateView(this.chainSpec, this);
+    }
     /**
      * Create an empty and possibly incoherent `InMemoryState`.
      */
     static empty(spec) {
-        return new InMemoryState({
+        return new in_memory_state_InMemoryState(spec, {
             availabilityAssignment: tryAsPerCore(Array.from({ length: spec.coresCount }, () => null), spec),
-            designatedValidatorData: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => ValidatorData.create({
+            designatedValidatorData: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => validator_data_ValidatorData.create({
                 bandersnatch: bytes_Bytes.zero(BANDERSNATCH_KEY_BYTES).asOpaque(),
                 bls: bytes_Bytes.zero(BLS_KEY_BYTES).asOpaque(),
                 ed25519: bytes_Bytes.zero(ED25519_KEY_BYTES).asOpaque(),
                 metadata: bytes_Bytes.zero(VALIDATOR_META_BYTES).asOpaque(),
             })), spec),
-            nextValidatorData: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => ValidatorData.create({
+            nextValidatorData: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => validator_data_ValidatorData.create({
                 bandersnatch: bytes_Bytes.zero(BANDERSNATCH_KEY_BYTES).asOpaque(),
                 bls: bytes_Bytes.zero(BLS_KEY_BYTES).asOpaque(),
                 ed25519: bytes_Bytes.zero(ED25519_KEY_BYTES).asOpaque(),
                 metadata: bytes_Bytes.zero(VALIDATOR_META_BYTES).asOpaque(),
             })), spec),
-            currentValidatorData: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => ValidatorData.create({
+            currentValidatorData: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => validator_data_ValidatorData.create({
                 bandersnatch: bytes_Bytes.zero(BANDERSNATCH_KEY_BYTES).asOpaque(),
                 bls: bytes_Bytes.zero(BLS_KEY_BYTES).asOpaque(),
                 ed25519: bytes_Bytes.zero(ED25519_KEY_BYTES).asOpaque(),
                 metadata: bytes_Bytes.zero(VALIDATOR_META_BYTES).asOpaque(),
             })), spec),
-            previousValidatorData: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => ValidatorData.create({
+            previousValidatorData: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => validator_data_ValidatorData.create({
                 bandersnatch: bytes_Bytes.zero(BANDERSNATCH_KEY_BYTES).asOpaque(),
                 bls: bytes_Bytes.zero(BLS_KEY_BYTES).asOpaque(),
                 ed25519: bytes_Bytes.zero(ED25519_KEY_BYTES).asOpaque(),
@@ -10994,7 +11144,7 @@ class InMemoryState extends WithDebug {
             entropy: FixedSizeArray.fill(() => bytes_Bytes.zero(hash_HASH_SIZE).asOpaque(), ENTROPY_ENTRIES),
             authPools: tryAsPerCore(Array.from({ length: spec.coresCount }, () => sized_array_asKnownSize([])), spec),
             authQueues: tryAsPerCore(Array.from({ length: spec.coresCount }, () => FixedSizeArray.fill(() => bytes_Bytes.zero(hash_HASH_SIZE).asOpaque(), AUTHORIZATION_QUEUE_SIZE)), spec),
-            recentBlocks: RecentBlocksHistory.empty(),
+            recentBlocks: RecentBlocks.empty(),
             statistics: StatisticsData.create({
                 current: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => ValidatorStatistics.empty()), spec),
                 previous: tryAsPerValidator(Array.from({ length: spec.validatorsCount }, () => ValidatorStatistics.empty()), spec),
@@ -11004,8 +11154,8 @@ class InMemoryState extends WithDebug {
             accumulationQueue: tryAsPerEpochBlock(Array.from({ length: spec.epochLength }, () => []), spec),
             recentlyAccumulated: tryAsPerEpochBlock(Array.from({ length: spec.epochLength }, () => HashSet.new()), spec),
             ticketsAccumulator: sized_array_asKnownSize([]),
-            sealingKeySeries: SafroleSealingKeysData.keys(tryAsPerEpochBlock(Array.from({ length: spec.epochLength }, () => bytes_Bytes.zero(BANDERSNATCH_KEY_BYTES).asOpaque()), spec)),
-            epochRoot: bytes_Bytes.zero(BANDERSNATCH_RING_ROOT_BYTES).asOpaque(),
+            sealingKeySeries: safrole_data_SafroleSealingKeysData.keys(tryAsPerEpochBlock(Array.from({ length: spec.epochLength }, () => bytes_Bytes.zero(BANDERSNATCH_KEY_BYTES).asOpaque()), spec)),
+            epochRoot: bytes_Bytes.zero(bandersnatch_BANDERSNATCH_RING_ROOT_BYTES).asOpaque(),
             privilegedServices: PrivilegedServices.create({
                 manager: tryAsServiceId(0),
                 assigners: tryAsPerCore(new Array(spec.coresCount).fill(tryAsServiceId(0)), spec),
@@ -11045,51 +11195,10 @@ const serviceDataCodec = descriptors_codec.dictionary(descriptors_codec.u32.asOp
 
 
 
-;// CONCATENATED MODULE: ./packages/jam/state/not-yet-accumulated.ts
-
-
 
 
 
 
-/**
- * Ready (i.e. available and/or audited) but not-yet-accumulated work-reports.
- *
- * https://graypaper.fluffylabs.dev/#/5f542d7/165300165400
- */
-class NotYetAccumulatedReport extends WithDebug {
-    report;
-    dependencies;
-    static Codec = descriptors_codec.Class(NotYetAccumulatedReport, {
-        report: WorkReport.Codec,
-        dependencies: codecKnownSizeArray(descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(), {
-            typicalLength: MAX_REPORT_DEPENDENCIES / 2,
-            maxLength: MAX_REPORT_DEPENDENCIES,
-            minLength: 0,
-        }),
-    });
-    static create({ report, dependencies }) {
-        return new NotYetAccumulatedReport(report, dependencies);
-    }
-    constructor(
-    /**
-     * Each of these were made available at most one epoch ago
-     * but have or had unfulfilled dependencies.
-     */
-    report, 
-    /**
-     * Alongside the work-report itself, we retain its un-accumulated
-     * dependencies, a set of work-package hashes.
-     *
-     * https://graypaper.fluffylabs.dev/#/5f542d7/165800165800
-     */
-    dependencies) {
-        super();
-        this.report = report;
-        this.dependencies = dependencies;
-    }
-}
-
 ;// CONCATENATED MODULE: ./packages/jam/state-merkleization/serialize.ts
 
 
@@ -11102,26 +11211,19 @@ class NotYetAccumulatedReport extends WithDebug {
 
 
 
-
-
-
 /** Serialization for particular state entries. */
-var serialize;
+var serialize_serialize;
 (function (serialize) {
     /** C(1): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b15013b1501?v=0.6.7 */
     serialize.authPools = {
         key: stateKeys.index(StateKeyIdx.Alpha),
-        Codec: codecPerCore(codecKnownSizeArray(descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(), {
-            minLength: 0,
-            maxLength: MAX_AUTH_POOL_SIZE,
-            typicalLength: MAX_AUTH_POOL_SIZE,
-        })),
+        Codec: authPoolsCodec,
         extract: (s) => s.authPools,
     };
     /** C(2): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b31013b3101?v=0.6.7 */
     serialize.authQueues = {
         key: stateKeys.index(StateKeyIdx.Phi),
-        Codec: codecPerCore(codecFixedSizeArray(descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(), AUTHORIZATION_QUEUE_SIZE)),
+        Codec: authQueuesCodec,
         extract: (s) => s.authQueues,
     };
     /**
@@ -11130,7 +11232,7 @@ var serialize;
      */
     serialize.recentBlocks = {
         key: stateKeys.index(StateKeyIdx.Beta),
-        Codec: RecentBlocksHistory.Codec,
+        Codec: RecentBlocks.Codec,
         extract: (s) => s.recentBlocks,
     };
     /** C(4): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b63013b6301?v=0.6.7 */
@@ -11159,25 +11261,25 @@ var serialize;
     /** C(7): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b00023b0002?v=0.6.7 */
     serialize.designatedValidators = {
         key: stateKeys.index(StateKeyIdx.Iota),
-        Codec: codecPerValidator(ValidatorData.Codec),
+        Codec: validatorsDataCodec,
         extract: (s) => s.designatedValidatorData,
     };
     /** C(8): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b0d023b0d02?v=0.6.7 */
     serialize.currentValidators = {
         key: stateKeys.index(StateKeyIdx.Kappa),
-        Codec: codecPerValidator(ValidatorData.Codec),
+        Codec: validatorsDataCodec,
         extract: (s) => s.currentValidatorData,
     };
     /** C(9): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b1a023b1a02?v=0.6.7 */
     serialize.previousValidators = {
         key: stateKeys.index(StateKeyIdx.Lambda),
-        Codec: codecPerValidator(ValidatorData.Codec),
+        Codec: validatorsDataCodec,
         extract: (s) => s.previousValidatorData,
     };
     /** C(10): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b27023b2702?v=0.6.7 */
     serialize.availabilityAssignment = {
         key: stateKeys.index(StateKeyIdx.Rho),
-        Codec: codecPerCore(descriptors_codec.optional(AvailabilityAssignment.Codec)),
+        Codec: availabilityAssignmentsCodec,
         extract: (s) => s.availabilityAssignment,
     };
     /** C(11): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b3e023b3e02?v=0.6.7 */
@@ -11201,13 +11303,13 @@ var serialize;
     /** C(14): https://graypaper.fluffylabs.dev/#/1c979cb/3bf0023bf002?v=0.7.1 */
     serialize.accumulationQueue = {
         key: stateKeys.index(StateKeyIdx.Omega),
-        Codec: codecPerEpochBlock(readonlyArray(descriptors_codec.sequenceVarLen(NotYetAccumulatedReport.Codec))),
+        Codec: accumulationQueueCodec,
         extract: (s) => s.accumulationQueue,
     };
     /** C(15): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b96023b9602?v=0.6.7 */
     serialize.recentlyAccumulated = {
         key: stateKeys.index(StateKeyIdx.Xi),
-        Codec: codecPerEpochBlock(descriptors_codec.sequenceVarLen(descriptors_codec.bytes(hash_HASH_SIZE).asOpaque()).convert((x) => Array.from(x), (x) => HashSet.from(x))),
+        Codec: recentlyAccumulatedCodec,
         extract: (s) => s.recentlyAccumulated,
     };
     /** C(16): https://graypaper.fluffylabs.dev/#/38c4e62/3b46033b4603?v=0.7.0 */
@@ -11236,9 +11338,9 @@ var serialize;
     /** https://graypaper.fluffylabs.dev/#/85129da/387603387603?v=0.6.3 */
     serialize.serviceLookupHistory = (blake2b, serviceId, hash, len) => ({
         key: stateKeys.serviceLookupHistory(blake2b, serviceId, hash, len),
-        Codec: readonlyArray(descriptors_codec.sequenceVarLen(descriptors_codec.u32)),
+        Codec: descriptors_readonlyArray(descriptors_codec.sequenceVarLen(descriptors_codec.u32)),
     });
-})(serialize || (serialize = {}));
+})(serialize_serialize || (serialize_serialize = {}));
 /**
  * Just dump the entire terminal blob as-is.
  *
@@ -11248,6 +11350,87 @@ var serialize;
  */
 const dumpCodec = Descriptor.new("Dump", { bytes: 64, isExact: false }, (e, v) => e.bytes(bytes_Bytes.fromBlob(v.raw, v.raw.length)), (d) => bytes_BytesBlob.blobFrom(d.bytes(d.source.length - d.bytesRead()).raw), (s) => s.bytes(s.decoder.source.length - s.decoder.bytesRead()));
 
+;// CONCATENATED MODULE: ./packages/jam/state-merkleization/serialized-state-view.ts
+
+
+class SerializedStateView {
+    spec;
+    backend;
+    recentlyUsedServices;
+    viewCache;
+    constructor(spec, backend, 
+    /** Best-effort list of recently active services. */
+    recentlyUsedServices, viewCache) {
+        this.spec = spec;
+        this.backend = backend;
+        this.recentlyUsedServices = recentlyUsedServices;
+        this.viewCache = viewCache;
+    }
+    retrieveView({ key, Codec }, description) {
+        const cached = this.viewCache.get(key);
+        if (cached !== undefined) {
+            return cached;
+        }
+        const bytes = this.backend.get(key);
+        if (bytes === null) {
+            throw new Error(`Required state entry for ${description} is missing!. Accessing view of key: ${key}`);
+        }
+        // NOTE [ToDr] we are not using `Decoder.decodeObject` here because
+        // it needs to get to the end of the data (skip), yet that's expensive.
+        // we assume that the state data is correct and coherent anyway, so
+        // for performance reasons we simply create the view here.
+        const d = decoder_Decoder.fromBytesBlob(bytes);
+        d.attachContext(this.spec);
+        const view = Codec.View.decode(d);
+        this.viewCache.set(key, view);
+        return view;
+    }
+    availabilityAssignmentView() {
+        return this.retrieveView(serialize_serialize.availabilityAssignment, "availabilityAssignmentView");
+    }
+    designatedValidatorDataView() {
+        return this.retrieveView(serialize_serialize.designatedValidators, "designatedValidatorsView");
+    }
+    currentValidatorDataView() {
+        return this.retrieveView(serialize_serialize.currentValidators, "currentValidatorsView");
+    }
+    previousValidatorDataView() {
+        return this.retrieveView(serialize_serialize.previousValidators, "previousValidatorsView");
+    }
+    authPoolsView() {
+        return this.retrieveView(serialize_serialize.authPools, "authPoolsView");
+    }
+    authQueuesView() {
+        return this.retrieveView(serialize_serialize.authQueues, "authQueuesView");
+    }
+    recentBlocksView() {
+        return this.retrieveView(serialize_serialize.recentBlocks, "recentBlocksView");
+    }
+    statisticsView() {
+        return this.retrieveView(serialize_serialize.statistics, "statisticsView");
+    }
+    accumulationQueueView() {
+        return this.retrieveView(serialize_serialize.accumulationQueue, "accumulationQueueView");
+    }
+    recentlyAccumulatedView() {
+        return this.retrieveView(serialize_serialize.recentlyAccumulated, "recentlyAccumulatedView");
+    }
+    safroleDataView() {
+        return this.retrieveView(serialize_serialize.safrole, "safroleDataView");
+    }
+    getServiceInfoView(id) {
+        const serviceData = serialize_serialize.serviceData(id);
+        const bytes = this.backend.get(serviceData.key);
+        if (bytes === null) {
+            return null;
+        }
+        if (!this.recentlyUsedServices.includes(id)) {
+            this.recentlyUsedServices.push(id);
+        }
+        return decoder_Decoder.decodeObject(serviceData.Codec.View, bytes, this.spec);
+    }
+}
+
 ;// CONCATENATED MODULE: ./packages/jam/state-merkleization/serialized-state.ts
 
 
@@ -11256,6 +11439,8 @@ const dumpCodec = Descriptor.new("Dump", { bytes: 64, isExact: false }, (e, v) =
 
 
 
+
+
 /**
  * State object which reads it's entries from some backend.
  *
@@ -11268,7 +11453,7 @@ class serialized_state_SerializedState {
     spec;
     blake2b;
     backend;
-    _recentServiceIds;
+    recentlyUsedServices;
     /** Create a state-like object from collection of serialized entries. */
     static fromStateEntries(spec, blake2b, state, recentServices = []) {
         return new serialized_state_SerializedState(spec, blake2b, state, recentServices);
@@ -11277,106 +11462,120 @@ class serialized_state_SerializedState {
     static new(spec, blake2b, db, recentServices = []) {
         return new serialized_state_SerializedState(spec, blake2b, db, recentServices);
     }
+    dataCache = hash_dictionary_HashDictionary.new();
+    viewCache = hash_dictionary_HashDictionary.new();
     constructor(spec, blake2b, backend, 
     /** Best-effort list of recently active services. */
-    _recentServiceIds) {
+    recentlyUsedServices) {
         this.spec = spec;
         this.blake2b = blake2b;
         this.backend = backend;
-        this._recentServiceIds = _recentServiceIds;
+        this.recentlyUsedServices = recentlyUsedServices;
     }
     /** Comparing the serialized states, just means comparing their backends. */
     [TEST_COMPARE_USING]() {
         return this.backend;
     }
+    /** Return a non-decoding version of the state. */
+    view() {
+        return new SerializedStateView(this.spec, this.backend, this.recentlyUsedServices, this.viewCache);
+    }
     // TODO [ToDr] Temporary method to update the state,
     // without changing references.
     updateBackend(newBackend) {
         this.backend = newBackend;
+        this.dataCache = hash_dictionary_HashDictionary.new();
+        this.viewCache = hash_dictionary_HashDictionary.new();
     }
     recentServiceIds() {
-        return this._recentServiceIds;
+        return this.recentlyUsedServices;
     }
     getService(id) {
-        const serviceData = this.retrieveOptional(serialize.serviceData(id));
+        const serviceData = this.retrieveOptional(serialize_serialize.serviceData(id));
         if (serviceData === undefined) {
             return null;
         }
-        if (!this._recentServiceIds.includes(id)) {
-            this._recentServiceIds.push(id);
+        if (!this.recentlyUsedServices.includes(id)) {
+            this.recentlyUsedServices.push(id);
         }
         return new SerializedService(this.blake2b, id, serviceData, (key) => this.retrieveOptional(key));
     }
-    retrieve({ key, Codec }, description) {
-        const bytes = this.backend.get(key);
-        if (bytes === null) {
-            throw new Error(`Required state entry for ${description} is missing!. Accessing key: ${key}`);
+    retrieve(k, description) {
+        const data = this.retrieveOptional(k);
+        if (data === undefined) {
+            throw new Error(`Required state entry for ${description} is missing!. Accessing key: ${k.key}`);
         }
-        return decoder_Decoder.decodeObject(Codec, bytes, this.spec);
+        return data;
     }
     retrieveOptional({ key, Codec }) {
+        const cached = this.dataCache.get(key);
+        if (cached !== undefined) {
+            return cached;
+        }
         const bytes = this.backend.get(key);
         if (bytes === null) {
             return undefined;
         }
-        return decoder_Decoder.decodeObject(Codec, bytes, this.spec);
+        const data = decoder_Decoder.decodeObject(Codec, bytes, this.spec);
+        this.dataCache.set(key, data);
+        return data;
     }
     get availabilityAssignment() {
-        return this.retrieve(serialize.availabilityAssignment, "availabilityAssignment");
+        return this.retrieve(serialize_serialize.availabilityAssignment, "availabilityAssignment");
     }
     get designatedValidatorData() {
-        return this.retrieve(serialize.designatedValidators, "designatedValidatorData");
+        return this.retrieve(serialize_serialize.designatedValidators, "designatedValidatorData");
     }
     get nextValidatorData() {
-        return this.retrieve(serialize.safrole, "safroleData.nextValidatorData").nextValidatorData;
+        return this.retrieve(serialize_serialize.safrole, "safroleData.nextValidatorData").nextValidatorData;
     }
     get currentValidatorData() {
-        return this.retrieve(serialize.currentValidators, "currentValidators");
+        return this.retrieve(serialize_serialize.currentValidators, "currentValidators");
     }
     get previousValidatorData() {
-        return this.retrieve(serialize.previousValidators, "previousValidators");
+        return this.retrieve(serialize_serialize.previousValidators, "previousValidators");
     }
     get disputesRecords() {
-        return this.retrieve(serialize.disputesRecords, "disputesRecords");
+        return this.retrieve(serialize_serialize.disputesRecords, "disputesRecords");
     }
     get timeslot() {
-        return this.retrieve(serialize.timeslot, "timeslot");
+        return this.retrieve(serialize_serialize.timeslot, "timeslot");
     }
     get entropy() {
-        return this.retrieve(serialize.entropy, "entropy");
+        return this.retrieve(serialize_serialize.entropy, "entropy");
     }
     get authPools() {
-        return this.retrieve(serialize.authPools, "authPools");
+        return this.retrieve(serialize_serialize.authPools, "authPools");
     }
     get authQueues() {
-        return this.retrieve(serialize.authQueues, "authQueues");
+        return this.retrieve(serialize_serialize.authQueues, "authQueues");
     }
     get recentBlocks() {
-        return this.retrieve(serialize.recentBlocks, "recentBlocks");
+        return this.retrieve(serialize_serialize.recentBlocks, "recentBlocks");
     }
     get statistics() {
-        return this.retrieve(serialize.statistics, "statistics");
+        return this.retrieve(serialize_serialize.statistics, "statistics");
     }
     get accumulationQueue() {
-        return this.retrieve(serialize.accumulationQueue, "accumulationQueue");
+        return this.retrieve(serialize_serialize.accumulationQueue, "accumulationQueue");
     }
     get recentlyAccumulated() {
-        return this.retrieve(serialize.recentlyAccumulated, "recentlyAccumulated");
+        return this.retrieve(serialize_serialize.recentlyAccumulated, "recentlyAccumulated");
     }
     get ticketsAccumulator() {
-        return this.retrieve(serialize.safrole, "safroleData.ticketsAccumulator").ticketsAccumulator;
+        return this.retrieve(serialize_serialize.safrole, "safroleData.ticketsAccumulator").ticketsAccumulator;
     }
     get sealingKeySeries() {
-        return this.retrieve(serialize.safrole, "safrole.sealingKeySeries").sealingKeySeries;
+        return this.retrieve(serialize_serialize.safrole, "safrole.sealingKeySeries").sealingKeySeries;
     }
     get epochRoot() {
-        return this.retrieve(serialize.safrole, "safrole.epochRoot").epochRoot;
+        return this.retrieve(serialize_serialize.safrole, "safrole.epochRoot").epochRoot;
     }
     get privilegedServices() {
-        return this.retrieve(serialize.privilegedServices, "privilegedServices");
+        return this.retrieve(serialize_serialize.privilegedServices, "privilegedServices");
     }
     get accumulationOutputLog() {
-        return this.retrieve(serialize.accumulationOutputLog, "accumulationOutputLog");
+        return this.retrieve(serialize_serialize.accumulationOutputLog, "accumulationOutputLog");
     }
 }
 /** Service data representation on a serialized state. */
@@ -11405,9 +11604,9 @@ class SerializedService {
             serviceIdAndKey.set(numbers_u32AsLeBytes(this.serviceId));
             serviceIdAndKey.set(rawKey.raw, SERVICE_ID_BYTES);
             const key = opaque_asOpaqueType(bytes_BytesBlob.blobFrom(this.blake2b.hashBytes(serviceIdAndKey).raw));
-            return this.retrieveOptional(serialize.serviceStorage(this.blake2b, this.serviceId, key)) ?? null;
+            return this.retrieveOptional(serialize_serialize.serviceStorage(this.blake2b, this.serviceId, key)) ?? null;
         }
-        return this.retrieveOptional(serialize.serviceStorage(this.blake2b, this.serviceId, rawKey)) ?? null;
+        return this.retrieveOptional(serialize_serialize.serviceStorage(this.blake2b, this.serviceId, rawKey)) ?? null;
     }
     /**
      * Check if preimage is present in the DB.
@@ -11416,15 +11615,15 @@ class SerializedService {
      */
     hasPreimage(hash) {
         // TODO [ToDr] consider optimizing to avoid fetching the whole data.
-        return this.retrieveOptional(serialize.servicePreimages(this.blake2b, this.serviceId, hash)) !== undefined;
+        return this.retrieveOptional(serialize_serialize.servicePreimages(this.blake2b, this.serviceId, hash)) !== undefined;
     }
     /** Retrieve preimage from the DB. */
     getPreimage(hash) {
-        return this.retrieveOptional(serialize.servicePreimages(this.blake2b, this.serviceId, hash)) ?? null;
+        return this.retrieveOptional(serialize_serialize.servicePreimages(this.blake2b, this.serviceId, hash)) ?? null;
     }
     /** Retrieve preimage lookup history. */
     getLookupHistory(hash, len) {
-        const rawSlots = this.retrieveOptional(serialize.serviceLookupHistory(this.blake2b, this.serviceId, hash, len));
+        const rawSlots = this.retrieveOptional(serialize_serialize.serviceLookupHistory(this.blake2b, this.serviceId, hash, len));
         if (rawSlots === undefined) {
             return null;
         }
@@ -12089,7 +12288,6 @@ function getKeccakTrieHasher(hasher) {
 
 
 
-
 /** What should be done with that key? */
 var StateEntryUpdateAction;
 (function (StateEntryUpdateAction) {
@@ -12105,83 +12303,95 @@ function* serializeStateUpdate(spec, blake2b, update) {
     yield* serializeBasicKeys(spec, update);
     const encode = (codec, val) => encoder_Encoder.encodeObject(codec, val, spec);
     // then let's proceed with service updates
-    yield* serializeServiceUpdates(update.servicesUpdates, encode, blake2b);
+    yield* serializeServiceUpdates(update.updated, encode, blake2b);
     yield* serializePreimages(update.preimages, encode, blake2b);
     yield* serializeStorage(update.storage, blake2b);
-    yield* serializeRemovedServices(update.servicesRemoved);
+    yield* serializeRemovedServices(update.removed);
 }
 function* serializeRemovedServices(servicesRemoved) {
-    for (const serviceId of servicesRemoved ?? []) {
+    if (servicesRemoved === undefined) {
+        return;
+    }
+    for (const serviceId of servicesRemoved) {
         // TODO [ToDr] what about all data associated with a service?
-        const codec = serialize.serviceData(serviceId);
+        const codec = serialize_serialize.serviceData(serviceId);
         yield [StateEntryUpdateAction.Remove, codec.key, EMPTY_BLOB];
     }
 }
-function* serializeStorage(storage, blake2b) {
-    for (const { action, serviceId } of storage ?? []) {
-        switch (action.kind) {
-            case UpdateStorageKind.Set: {
-                const key = action.storage.key;
-                const codec = serialize.serviceStorage(blake2b, serviceId, key);
-                yield [StateEntryUpdateAction.Insert, codec.key, action.storage.value];
-                break;
-            }
-            case UpdateStorageKind.Remove: {
-                const key = action.key;
-                const codec = serialize.serviceStorage(blake2b, serviceId, key);
-                yield [StateEntryUpdateAction.Remove, codec.key, EMPTY_BLOB];
-                break;
+function* serializeStorage(storageUpdates, blake2b) {
+    if (storageUpdates === undefined) {
+        return;
+    }
+    for (const [serviceId, updates] of storageUpdates.entries()) {
+        for (const { action } of updates) {
+            switch (action.kind) {
+                case UpdateStorageKind.Set: {
+                    const key = action.storage.key;
+                    const codec = serialize_serialize.serviceStorage(blake2b, serviceId, key);
+                    yield [StateEntryUpdateAction.Insert, codec.key, action.storage.value];
+                    break;
+                }
+                case UpdateStorageKind.Remove: {
+                    const key = action.key;
+                    const codec = serialize_serialize.serviceStorage(blake2b, serviceId, key);
+                    yield [StateEntryUpdateAction.Remove, codec.key, EMPTY_BLOB];
+                    break;
+                }
             }
-            default:
-                debug_assertNever(action);
         }
     }
 }
-function* serializePreimages(preimages, encode, blake2b) {
-    for (const { action, serviceId } of preimages ?? []) {
-        switch (action.kind) {
-            case UpdatePreimageKind.Provide: {
-                const { hash, blob } = action.preimage;
-                const codec = serialize.servicePreimages(blake2b, serviceId, hash);
-                yield [StateEntryUpdateAction.Insert, codec.key, blob];
-                if (action.slot !== null) {
-                    const codec2 = serialize.serviceLookupHistory(blake2b, serviceId, hash, numbers_tryAsU32(blob.length));
-                    yield [
-                        StateEntryUpdateAction.Insert,
-                        codec2.key,
-                        encode(codec2.Codec, tryAsLookupHistorySlots([action.slot])),
-                    ];
+function* serializePreimages(preimagesUpdates, encode, blake2b) {
+    if (preimagesUpdates === undefined) {
+        return;
+    }
+    for (const [serviceId, updates] of preimagesUpdates.entries()) {
+        for (const { action } of updates) {
+            switch (action.kind) {
+                case UpdatePreimageKind.Provide: {
+                    const { hash, blob } = action.preimage;
+                    const codec = serialize_serialize.servicePreimages(blake2b, serviceId, hash);
+                    yield [StateEntryUpdateAction.Insert, codec.key, blob];
+                    if (action.slot !== null) {
+                        const codec2 = serialize_serialize.serviceLookupHistory(blake2b, serviceId, hash, numbers_tryAsU32(blob.length));
+                        yield [
+                            StateEntryUpdateAction.Insert,
+                            codec2.key,
+                            encode(codec2.Codec, tryAsLookupHistorySlots([action.slot])),
+                        ];
+                    }
+                    break;
+                }
+                case UpdatePreimageKind.UpdateOrAdd: {
+                    const { hash, length, slots } = action.item;
+                    const codec = serialize_serialize.serviceLookupHistory(blake2b, serviceId, hash, length);
+                    yield [StateEntryUpdateAction.Insert, codec.key, encode(codec.Codec, slots)];
+                    break;
+                }
+                case UpdatePreimageKind.Remove: {
+                    const { hash, length } = action;
+                    const codec = serialize_serialize.servicePreimages(blake2b, serviceId, hash);
+                    yield [StateEntryUpdateAction.Remove, codec.key, EMPTY_BLOB];
+                    const codec2 = serialize_serialize.serviceLookupHistory(blake2b, serviceId, hash, length);
+                    yield [StateEntryUpdateAction.Remove, codec2.key, EMPTY_BLOB];
+                    break;
                 }
-                break;
-            }
-            case UpdatePreimageKind.UpdateOrAdd: {
-                const { hash, length, slots } = action.item;
-                const codec = serialize.serviceLookupHistory(blake2b, serviceId, hash, length);
-                yield [StateEntryUpdateAction.Insert, codec.key, encode(codec.Codec, slots)];
-                break;
-            }
-            case UpdatePreimageKind.Remove: {
-                const { hash, length } = action;
-                const codec = serialize.servicePreimages(blake2b, serviceId, hash);
-                yield [StateEntryUpdateAction.Remove, codec.key, EMPTY_BLOB];
-                const codec2 = serialize.serviceLookupHistory(blake2b, serviceId, hash, length);
-                yield [StateEntryUpdateAction.Remove, codec2.key, EMPTY_BLOB];
-                break;
             }
-            default:
-                debug_assertNever(action);
         }
     }
 }
 function* serializeServiceUpdates(servicesUpdates, encode, blake2b) {
-    for (const { action, serviceId } of servicesUpdates ?? []) {
+    if (servicesUpdates === undefined) {
+        return;
+    }
+    for (const [serviceId, { action }] of servicesUpdates.entries()) {
         // new service being created or updated
-        const codec = serialize.serviceData(serviceId);
+        const codec = serialize_serialize.serviceData(serviceId);
         yield [StateEntryUpdateAction.Insert, codec.key, encode(codec.Codec, action.account)];
         // additional lookup history update
         if (action.kind === UpdateServiceKind.Create && action.lookupHistory !== null) {
             const { lookupHistory } = action;
-            const codec2 = serialize.serviceLookupHistory(blake2b, serviceId, lookupHistory.hash, lookupHistory.length);
+            const codec2 = serialize_serialize.serviceLookupHistory(blake2b, serviceId, lookupHistory.hash, lookupHistory.length);
             yield [StateEntryUpdateAction.Insert, codec2.key, encode(codec2.Codec, lookupHistory.slots)];
         }
     }
@@ -12191,53 +12401,53 @@ function* serializeBasicKeys(spec, update) {
         return [StateEntryUpdateAction.Insert, codec.key, encoder_Encoder.encodeObject(codec.Codec, val, spec)];
     }
     if (update.authPools !== undefined) {
-        yield doSerialize(update.authPools, serialize.authPools); // C(1)
+        yield doSerialize(update.authPools, serialize_serialize.authPools); // C(1)
     }
     if (update.authQueues !== undefined) {
-        yield doSerialize(update.authQueues, serialize.authQueues); // C(2)
+        yield doSerialize(update.authQueues, serialize_serialize.authQueues); // C(2)
     }
     if (update.recentBlocks !== undefined) {
-        yield doSerialize(update.recentBlocks, serialize.recentBlocks); // C(3)
+        yield doSerialize(update.recentBlocks, serialize_serialize.recentBlocks); // C(3)
     }
     const safroleData = getSafroleData(update.nextValidatorData, update.epochRoot, update.sealingKeySeries, update.ticketsAccumulator);
     if (safroleData !== undefined) {
-        yield doSerialize(safroleData, serialize.safrole); // C(4)
+        yield doSerialize(safroleData, serialize_serialize.safrole); // C(4)
     }
     if (update.disputesRecords !== undefined) {
-        yield doSerialize(update.disputesRecords, serialize.disputesRecords); // C(5)
+        yield doSerialize(update.disputesRecords, serialize_serialize.disputesRecords); // C(5)
     }
     if (update.entropy !== undefined) {
-        yield doSerialize(update.entropy, serialize.entropy); // C(6)
+        yield doSerialize(update.entropy, serialize_serialize.entropy); // C(6)
     }
     if (update.designatedValidatorData !== undefined) {
-        yield doSerialize(update.designatedValidatorData, serialize.designatedValidators); // C(7)
+        yield doSerialize(update.designatedValidatorData, serialize_serialize.designatedValidators); // C(7)
     }
     if (update.currentValidatorData !== undefined) {
-        yield doSerialize(update.currentValidatorData, serialize.currentValidators); // C(8)
+        yield doSerialize(update.currentValidatorData, serialize_serialize.currentValidators); // C(8)
     }
     if (update.previousValidatorData !== undefined) {
-        yield doSerialize(update.previousValidatorData, serialize.previousValidators); // C(9)
+        yield doSerialize(update.previousValidatorData, serialize_serialize.previousValidators); // C(9)
     }
     if (update.availabilityAssignment !== undefined) {
-        yield doSerialize(update.availabilityAssignment, serialize.availabilityAssignment); // C(10)
+        yield doSerialize(update.availabilityAssignment, serialize_serialize.availabilityAssignment); // C(10)
     }
     if (update.timeslot !== undefined) {
-        yield doSerialize(update.timeslot, serialize.timeslot); // C(11)
+        yield doSerialize(update.timeslot, serialize_serialize.timeslot); // C(11)
     }
     if (update.privilegedServices !== undefined) {
-        yield doSerialize(update.privilegedServices, serialize.privilegedServices); // C(12)
+        yield doSerialize(update.privilegedServices, serialize_serialize.privilegedServices); // C(12)
     }
     if (update.statistics !== undefined) {
-        yield doSerialize(update.statistics, serialize.statistics); // C(13)
+        yield doSerialize(update.statistics, serialize_serialize.statistics); // C(13)
     }
     if (update.accumulationQueue !== undefined) {
-        yield doSerialize(update.accumulationQueue, serialize.accumulationQueue); // C(14)
+        yield doSerialize(update.accumulationQueue, serialize_serialize.accumulationQueue); // C(14)
     }
     if (update.recentlyAccumulated !== undefined) {
-        yield doSerialize(update.recentlyAccumulated, serialize.recentlyAccumulated); // C(15)
+        yield doSerialize(update.recentlyAccumulated, serialize_serialize.recentlyAccumulated); // C(15)
     }
     if (update.accumulationOutputLog !== undefined) {
-        yield doSerialize(update.accumulationOutputLog, serialize.accumulationOutputLog); // C(16)
+        yield doSerialize(update.accumulationOutputLog, serialize_serialize.accumulationOutputLog); // C(16)
     }
 }
 function getSafroleData(nextValidatorData, epochRoot, sealingKeySeries, ticketsAccumulator) {
@@ -12350,41 +12560,41 @@ function convertInMemoryStateToDictionary(spec, blake2b, state) {
     function doSerialize(codec) {
         serialized.set(codec.key, encoder_Encoder.encodeObject(codec.Codec, codec.extract(state), spec));
     }
-    doSerialize(serialize.authPools); // C(1)
-    doSerialize(serialize.authQueues); // C(2)
-    doSerialize(serialize.recentBlocks); // C(3)
-    doSerialize(serialize.safrole); // C(4)
-    doSerialize(serialize.disputesRecords); // C(5)
-    doSerialize(serialize.entropy); // C(6)
-    doSerialize(serialize.designatedValidators); // C(7)
-    doSerialize(serialize.currentValidators); // C(8)
-    doSerialize(serialize.previousValidators); // C(9)
-    doSerialize(serialize.availabilityAssignment); // C(10)
-    doSerialize(serialize.timeslot); // C(11)
-    doSerialize(serialize.privilegedServices); // C(12)
-    doSerialize(serialize.statistics); // C(13)
-    doSerialize(serialize.accumulationQueue); // C(14)
-    doSerialize(serialize.recentlyAccumulated); // C(15)
-    doSerialize(serialize.accumulationOutputLog); // C(16)
+    doSerialize(serialize_serialize.authPools); // C(1)
+    doSerialize(serialize_serialize.authQueues); // C(2)
+    doSerialize(serialize_serialize.recentBlocks); // C(3)
+    doSerialize(serialize_serialize.safrole); // C(4)
+    doSerialize(serialize_serialize.disputesRecords); // C(5)
+    doSerialize(serialize_serialize.entropy); // C(6)
+    doSerialize(serialize_serialize.designatedValidators); // C(7)
+    doSerialize(serialize_serialize.currentValidators); // C(8)
+    doSerialize(serialize_serialize.previousValidators); // C(9)
+    doSerialize(serialize_serialize.availabilityAssignment); // C(10)
+    doSerialize(serialize_serialize.timeslot); // C(11)
+    doSerialize(serialize_serialize.privilegedServices); // C(12)
+    doSerialize(serialize_serialize.statistics); // C(13)
+    doSerialize(serialize_serialize.accumulationQueue); // C(14)
+    doSerialize(serialize_serialize.recentlyAccumulated); // C(15)
+    doSerialize(serialize_serialize.accumulationOutputLog); // C(16)
     // services
     for (const [serviceId, service] of state.services.entries()) {
         // data
-        const { key, Codec } = serialize.serviceData(serviceId);
+        const { key, Codec } = serialize_serialize.serviceData(serviceId);
         serialized.set(key, encoder_Encoder.encodeObject(Codec, service.getInfo()));
         // preimages
         for (const preimage of service.data.preimages.values()) {
-            const { key, Codec } = serialize.servicePreimages(blake2b, serviceId, preimage.hash);
+            const { key, Codec } = serialize_serialize.servicePreimages(blake2b, serviceId, preimage.hash);
             serialized.set(key, encoder_Encoder.encodeObject(Codec, preimage.blob));
         }
         // storage
         for (const storage of service.data.storage.values()) {
-            const { key, Codec } = serialize.serviceStorage(blake2b, serviceId, storage.key);
+            const { key, Codec } = serialize_serialize.serviceStorage(blake2b, serviceId, storage.key);
             serialized.set(key, encoder_Encoder.encodeObject(Codec, storage.value));
         }
         // lookup history
         for (const lookupHistoryList of service.data.lookupHistory.values()) {
             for (const lookupHistory of lookupHistoryList) {
-                const { key, Codec } = serialize.serviceLookupHistory(blake2b, serviceId, lookupHistory.hash, lookupHistory.length);
+                const { key, Codec } = serialize_serialize.serviceLookupHistory(blake2b, serviceId, lookupHistory.hash, lookupHistory.length);
                 serialized.set(key, encoder_Encoder.encodeObject(Codec, lookupHistory.slots.slice()));
             }
         }
@@ -12434,6 +12644,7 @@ function loadState(spec, blake2b, entries) {
 
 
 
+
 ;// CONCATENATED MODULE: ./packages/jam/database/leaf-db.ts
 
 
@@ -12460,13 +12671,13 @@ class LeafDb {
      */
     static fromLeavesBlob(blob, db) {
         if (blob.length % TRIE_NODE_BYTES !== 0) {
-            return result_Result.error(LeafDbError.InvalidLeafData, `${blob.length} is not a multiply of ${TRIE_NODE_BYTES}: ${blob}`);
+            return result_Result.error(LeafDbError.InvalidLeafData, () => `${blob.length} is not a multiply of ${TRIE_NODE_BYTES}: ${blob}`);
         }
         const leaves = SortedSet.fromArray(leafComparator, []);
         for (const nodeData of blob.chunks(TRIE_NODE_BYTES)) {
             const node = new TrieNode(nodeData.raw);
             if (node.getNodeType() === NodeType.Branch) {
-                return result_Result.error(LeafDbError.InvalidLeafData, `Branch node detected: ${nodeData}`);
+                return result_Result.error(LeafDbError.InvalidLeafData, () => `Branch node detected: ${nodeData}`);
             }
             leaves.insert(node.asLeafNode());
         }
@@ -12592,7 +12803,7 @@ const codecMap = (value, extractKey, { typicalLength = TYPICAL_DICTIONARY_LENGTH
 const lookupHistoryItemCodec = descriptors_codec.object({
     hash: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
     length: descriptors_codec.u32,
-    slots: readonlyArray(descriptors_codec.sequenceVarLen(descriptors_codec.u32.asOpaque())).convert(seeThrough, tryAsLookupHistorySlots),
+    slots: descriptors_readonlyArray(descriptors_codec.sequenceVarLen(descriptors_codec.u32.asOpaque())).convert(seeThrough, tryAsLookupHistorySlots),
 }, "LookupHistoryItem", ({ hash, length, slots }) => new LookupHistoryItem(hash, length, slots));
 const lookupHistoryEntryCodec = descriptors_codec.object({
     key: descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(),
@@ -12635,7 +12846,11 @@ class ServiceWithCodec extends InMemoryService {
         return new ServiceWithCodec(serviceId, data);
     }
 }
-const in_memory_state_codec_inMemoryStateCodec = descriptors_codec.Class(InMemoryState, {
+const in_memory_state_codec_inMemoryStateCodec = (spec) => codec.Class(class State extends InMemoryState {
+    static create(data) {
+        return InMemoryState.new(spec, data);
+    }
+}, {
     // alpha
     authPools: serialize.authPools.Codec,
     // phi
@@ -12645,11 +12860,11 @@ const in_memory_state_codec_inMemoryStateCodec = descriptors_codec.Class(InMemor
     // gamma_k
     nextValidatorData: codecPerValidator(ValidatorData.Codec),
     // gamma_z
-    epochRoot: descriptors_codec.bytes(BANDERSNATCH_RING_ROOT_BYTES).asOpaque(),
+    epochRoot: codec.bytes(BANDERSNATCH_RING_ROOT_BYTES).asOpaque(),
     // gamma_s
     sealingKeySeries: SafroleSealingKeysData.Codec,
     // gamma_a
-    ticketsAccumulator: readonlyArray(descriptors_codec.sequenceVarLen(Ticket.Codec)).convert((x) => x, sized_array_asKnownSize),
+    ticketsAccumulator: readonlyArray(codec.sequenceVarLen(Ticket.Codec)).convert((x) => x, asKnownSize),
     // psi
     disputesRecords: serialize.disputesRecords.Codec,
     // eta
@@ -12675,7 +12890,7 @@ const in_memory_state_codec_inMemoryStateCodec = descriptors_codec.Class(InMemor
     // theta
     accumulationOutputLog: serialize.accumulationOutputLog.Codec,
     // delta
-    services: descriptors_codec.dictionary(descriptors_codec.u32.asOpaque(), ServiceWithCodec.Codec, {
+    services: codec.dictionary(codec.u32.asOpaque(), ServiceWithCodec.Codec, {
         sortKeys: (a, b) => a - b,
     }),
 });
@@ -12722,7 +12937,7 @@ class InMemoryStates {
     }
     /** Insert a full state into the database. */
     async insertState(headerHash, state) {
-        const encoded = Encoder.encodeObject(inMemoryStateCodec, state, this.spec);
+        const encoded = Encoder.encodeObject(inMemoryStateCodec(this.spec), state, this.spec);
         this.db.set(headerHash, encoded);
         return Result.ok(OK);
     }
@@ -12731,7 +12946,7 @@ class InMemoryStates {
         if (encodedState === undefined) {
             return null;
         }
-        return Decoder.decodeObject(inMemoryStateCodec, encodedState, this.spec);
+        return Decoder.decodeObject(inMemoryStateCodec(this.spec), encodedState, this.spec);
     }
 }
 
@@ -13181,7 +13396,7 @@ class LmdbStates {
         }
         catch (e) {
             logger.error `${e}`;
-            return result_Result.error(StateUpdateError.Commit);
+            return result_Result.error(StateUpdateError.Commit, () => `Failed to commit state update: ${e}`);
         }
         return result_Result.ok(result_OK);
     }
@@ -13839,21 +14054,21 @@ class TransitionHasher {
      */
     extrinsic(extrinsicView) {
         // https://graypaper.fluffylabs.dev/#/cc517d7/0cfb000cfb00?v=0.6.5
-        const guarantees = extrinsicView.guarantees
+        const guaranteesCount = numbers_tryAsU32(extrinsicView.guarantees.view().length);
+        const countEncoded = encoder_Encoder.encodeObject(descriptors_codec.varU32, guaranteesCount);
+        const guaranteesBlobs = extrinsicView.guarantees
             .view()
             .map((g) => g.view())
-            .map((guarantee) => {
+            .reduce((aggregated, guarantee) => {
             const reportHash = this.blake2b.hashBytes(guarantee.report.encoded()).asOpaque();
-            return bytes_BytesBlob.blobFromParts([
-                reportHash.raw,
-                guarantee.slot.encoded().raw,
-                guarantee.credentials.encoded().raw,
-            ]);
-        });
-        const guaranteeBlob = encoder_Encoder.encodeObject(descriptors_codec.sequenceVarLen(dumpCodec), guarantees, this.context);
+            aggregated.push(reportHash.raw);
+            aggregated.push(guarantee.slot.encoded().raw);
+            aggregated.push(guarantee.credentials.encoded().raw);
+            return aggregated;
+        }, [countEncoded.raw]);
         const et = this.blake2b.hashBytes(extrinsicView.tickets.encoded()).asOpaque();
         const ep = this.blake2b.hashBytes(extrinsicView.preimages.encoded()).asOpaque();
-        const eg = this.blake2b.hashBytes(guaranteeBlob).asOpaque();
+        const eg = this.blake2b.hashBlobs(guaranteesBlobs).asOpaque();
         const ea = this.blake2b.hashBytes(extrinsicView.assurances.encoded()).asOpaque();
         const ed = this.blake2b.hashBytes(extrinsicView.disputes.encoded()).asOpaque();
         const encoded = bytes_BytesBlob.blobFromParts([et.raw, ep.raw, eg.raw, ea.raw, ed.raw]);
@@ -13901,32 +14116,33 @@ class Preimages {
             }
             if (prevPreimage.requester > currPreimage.requester ||
                 currPreimage.blob.compare(prevPreimage.blob).isLessOrEqual()) {
-                return result_Result.error(PreimagesErrorCode.PreimagesNotSortedUnique);
+                return result_Result.error(PreimagesErrorCode.PreimagesNotSortedUnique, () => `Preimages not sorted/unique at index ${i}`);
             }
         }
         const { preimages, slot } = input;
-        const pendingChanges = [];
+        const pendingChanges = new Map();
         // select preimages for integration
         for (const preimage of preimages) {
             const { requester, blob } = preimage;
             const hash = this.blake2b.hashBytes(blob).asOpaque();
             const service = this.state.getService(requester);
             if (service === null) {
-                return result_Result.error(PreimagesErrorCode.AccountNotFound);
+                return result_Result.error(PreimagesErrorCode.AccountNotFound, () => `Service not found: ${requester}`);
             }
             const hasPreimage = service.hasPreimage(hash);
             const slots = service.getLookupHistory(hash, numbers_tryAsU32(blob.length));
             // https://graypaper.fluffylabs.dev/#/5f542d7/181800181900
             // https://graypaper.fluffylabs.dev/#/5f542d7/116f0011a500
             if (hasPreimage || slots === null || !LookupHistoryItem.isRequested(slots)) {
-                return result_Result.error(PreimagesErrorCode.PreimageUnneeded);
+                return result_Result.error(PreimagesErrorCode.PreimageUnneeded, () => `Preimage unneeded: requester=${requester}, hash=${hash}, hasPreimage=${hasPreimage}, isRequested=${slots !== null && LookupHistoryItem.isRequested(slots)}`);
             }
             // https://graypaper.fluffylabs.dev/#/5f542d7/18c00018f300
-            pendingChanges.push(UpdatePreimage.provide({
-                serviceId: requester,
+            const updates = pendingChanges.get(requester) ?? [];
+            updates.push(UpdatePreimage.provide({
                 preimage: PreimageItem.create({ hash, blob }),
                 slot,
             }));
+            pendingChanges.set(requester, updates);
         }
         return result_Result.ok({
             preimages: pendingChanges,
@@ -13964,7 +14180,7 @@ class BlockVerifier {
         const headerHash = this.hasher.header(headerView);
         // check if current block is already imported
         if (this.blocks.getHeader(headerHash.hash) !== null) {
-            return result_Result.error(BlockVerifierError.AlreadyImported, `Block ${headerHash.hash} is already imported.`);
+            return result_Result.error(BlockVerifierError.AlreadyImported, () => `Block ${headerHash.hash} is already imported.`);
         }
         // Check if parent block exists.
         // https://graypaper.fluffylabs.dev/#/cc517d7/0c82000c8200?v=0.6.5
@@ -13974,14 +14190,14 @@ class BlockVerifier {
         if (!parentHash.isEqualTo(block_verifier_ZERO_HASH)) {
             const parentBlock = this.blocks.getHeader(parentHash);
             if (parentBlock === null) {
-                return result_Result.error(BlockVerifierError.ParentNotFound, `Parent ${parentHash.toString()} not found`);
+                return result_Result.error(BlockVerifierError.ParentNotFound, () => `Parent ${parentHash.toString()} not found`);
             }
             // Check if the time slot index is consecutive and not from future.
             // https://graypaper.fluffylabs.dev/#/cc517d7/0c02010c0201?v=0.6.5
             const timeslot = headerView.timeSlotIndex.materialize();
             const parentTimeslot = parentBlock.timeSlotIndex.materialize();
             if (timeslot <= parentTimeslot) {
-                return result_Result.error(BlockVerifierError.InvalidTimeSlot, `Invalid time slot index: ${timeslot}, expected > ${parentTimeslot}`);
+                return result_Result.error(BlockVerifierError.InvalidTimeSlot, () => `Invalid time slot index: ${timeslot}, expected > ${parentTimeslot}`);
             }
         }
         // Check if extrinsic is valid.
@@ -13989,17 +14205,17 @@ class BlockVerifier {
         const extrinsicHash = headerView.extrinsicHash.materialize();
         const extrinsicMerkleCommitment = this.hasher.extrinsic(block.extrinsic.view());
         if (!extrinsicHash.isEqualTo(extrinsicMerkleCommitment.hash)) {
-            return result_Result.error(BlockVerifierError.InvalidExtrinsic, `Invalid extrinsic hash: ${extrinsicHash.toString()}, expected ${extrinsicMerkleCommitment.hash.toString()}`);
+            return result_Result.error(BlockVerifierError.InvalidExtrinsic, () => `Invalid extrinsic hash: ${extrinsicHash.toString()}, expected ${extrinsicMerkleCommitment.hash.toString()}`);
         }
         // Check if the state root is valid.
         // https://graypaper.fluffylabs.dev/#/cc517d7/0c18010c1801?v=0.6.5
         const stateRoot = headerView.priorStateRoot.materialize();
         const posteriorStateRoot = this.blocks.getPostStateRoot(parentHash);
         if (posteriorStateRoot === null) {
-            return result_Result.error(BlockVerifierError.StateRootNotFound, `Posterior state root ${parentHash.toString()} not found`);
+            return result_Result.error(BlockVerifierError.StateRootNotFound, () => `Posterior state root ${parentHash.toString()} not found`);
         }
         if (!stateRoot.isEqualTo(posteriorStateRoot)) {
-            return result_Result.error(BlockVerifierError.InvalidStateRoot, `Invalid prior state root: ${stateRoot.toString()}, expected ${posteriorStateRoot.toString()} (ours)`);
+            return result_Result.error(BlockVerifierError.InvalidStateRoot, () => `Invalid prior state root: ${stateRoot.toString()}, expected ${posteriorStateRoot.toString()} (ours)`);
         }
         return result_Result.ok(headerHash.hash);
     }
@@ -14124,7 +14340,7 @@ class Disputes {
         // check if culprits are sorted by key
         // https://graypaper.fluffylabs.dev/#/579bd12/12c50112c601
         if (!isUniqueSortedBy(disputes.culprits, "key")) {
-            return result_Result.error(DisputesErrorCode.CulpritsNotSortedUnique);
+            return result_Result.error(DisputesErrorCode.CulpritsNotSortedUnique, () => "Culprits are not uniquely sorted by key");
         }
         const culpritsLength = disputes.culprits.length;
         for (let i = 0; i < culpritsLength; i++) {
@@ -14133,24 +14349,24 @@ class Disputes {
             // https://graypaper.fluffylabs.dev/#/579bd12/125501125501
             const isInPunishSet = this.state.disputesRecords.asDictionaries().punishSet.has(key);
             if (isInPunishSet) {
-                return result_Result.error(DisputesErrorCode.OffenderAlreadyReported);
+                return result_Result.error(DisputesErrorCode.OffenderAlreadyReported, () => `Offender already reported: culprit ${i}, key=${key}`);
             }
             // check if the guarantor key is correct
             // https://graypaper.fluffylabs.dev/#/85129da/125501125501?v=0.6.3
             if (!allValidatorKeys.has(key)) {
-                return result_Result.error(DisputesErrorCode.BadGuarantorKey);
+                return result_Result.error(DisputesErrorCode.BadGuarantorKey, () => `Bad guarantor key: culprit ${i}, key=${key}`);
             }
             // verify if the culprit will be in new bad set
             // https://graypaper.fluffylabs.dev/#/579bd12/124601124601
             const isInNewBadSet = newItems.asDictionaries().badSet.has(workReportHash);
             if (!isInNewBadSet) {
-                return result_Result.error(DisputesErrorCode.CulpritsVerdictNotBad);
+                return result_Result.error(DisputesErrorCode.CulpritsVerdictNotBad, () => `Culprit verdict not bad: culprit ${i}, work report=${workReportHash}`);
             }
             // verify culprit signature
             // https://graypaper.fluffylabs.dev/#/579bd12/125c01125c01
             const result = verificationResult.culprits[i];
             if (!result?.isValid) {
-                return result_Result.error(DisputesErrorCode.BadSignature, `Invalid signature for culprit: ${i}`);
+                return result_Result.error(DisputesErrorCode.BadSignature, () => `Invalid signature for culprit: ${i}`);
             }
         }
         return result_Result.ok(null);
@@ -14159,7 +14375,7 @@ class Disputes {
         // check if faults are sorted by key
         // https://graypaper.fluffylabs.dev/#/579bd12/12c50112c601
         if (!isUniqueSortedBy(disputes.faults, "key")) {
-            return result_Result.error(DisputesErrorCode.FaultsNotSortedUnique);
+            return result_Result.error(DisputesErrorCode.FaultsNotSortedUnique, () => "Faults are not uniquely sorted by key");
         }
         const faultsLength = disputes.faults.length;
         for (let i = 0; i < faultsLength; i++) {
@@ -14168,12 +14384,12 @@ class Disputes {
             // https://graypaper.fluffylabs.dev/#/579bd12/12a20112a201
             const isInPunishSet = this.state.disputesRecords.asDictionaries().punishSet.has(key);
             if (isInPunishSet) {
-                return result_Result.error(DisputesErrorCode.OffenderAlreadyReported);
+                return result_Result.error(DisputesErrorCode.OffenderAlreadyReported, () => `Offender already reported: fault ${i}, key=${key}`);
             }
             // check if the auditor key is correct
             // https://graypaper.fluffylabs.dev/#/85129da/12a20112a201?v=0.6.3
             if (!allValidatorKeys.has(key)) {
-                return result_Result.error(DisputesErrorCode.BadAuditorKey);
+                return result_Result.error(DisputesErrorCode.BadAuditorKey, () => `Bad auditor key: fault ${i}, key=${key}`);
             }
             // verify if the fault will be included in new good/bad set
             // it may be not correct as in GP there is "iff" what means it should be rather
@@ -14185,14 +14401,14 @@ class Disputes {
                 const isInNewGoodSet = goodSet.has(workReportHash);
                 const isInNewBadSet = badSet.has(workReportHash);
                 if (isInNewGoodSet || !isInNewBadSet) {
-                    return result_Result.error(DisputesErrorCode.FaultVerdictWrong);
+                    return result_Result.error(DisputesErrorCode.FaultVerdictWrong, () => `Fault verdict wrong: fault ${i}, work report=${workReportHash}, inGood=${isInNewGoodSet}, inBad=${isInNewBadSet}`);
                 }
             }
             // verify fault signature. Verification was done earlier, here we only check the result.
             // https://graypaper.fluffylabs.dev/#/579bd12/12a90112a901
             const result = verificationResult.faults[i];
             if (!result.isValid) {
-                return result_Result.error(DisputesErrorCode.BadSignature, `Invalid signature for fault: ${i}`);
+                return result_Result.error(DisputesErrorCode.BadSignature, () => `Invalid signature for fault: ${i}`);
             }
         }
         return result_Result.ok(null);
@@ -14201,32 +14417,32 @@ class Disputes {
         // check if verdicts are correctly sorted
         // https://graypaper.fluffylabs.dev/#/579bd12/12c40112c401
         if (!isUniqueSortedBy(disputes.verdicts, "workReportHash")) {
-            return result_Result.error(DisputesErrorCode.VerdictsNotSortedUnique);
+            return result_Result.error(DisputesErrorCode.VerdictsNotSortedUnique, () => "Verdicts are not uniquely sorted by work report hash");
         }
         // check if judgement are correctly sorted
         // https://graypaper.fluffylabs.dev/#/579bd12/123702123802
         if (disputes.verdicts.some((verdict) => !isUniqueSortedByIndex(verdict.votes))) {
-            return result_Result.error(DisputesErrorCode.JudgementsNotSortedUnique);
+            return result_Result.error(DisputesErrorCode.JudgementsNotSortedUnique, () => "Judgements are not uniquely sorted by index");
         }
         const currentEpoch = Math.floor(this.state.timeslot / this.chainSpec.epochLength);
         let voteSignatureIndex = 0;
         for (const { votesEpoch, votes } of disputes.verdicts) {
             // https://graypaper.fluffylabs.dev/#/579bd12/12bb0012bc00
             if (votesEpoch !== currentEpoch && votesEpoch + 1 !== currentEpoch) {
-                return result_Result.error(DisputesErrorCode.BadJudgementAge);
+                return result_Result.error(DisputesErrorCode.BadJudgementAge, () => `Bad judgement age: epoch=${votesEpoch}, current=${currentEpoch}`);
             }
             const k = votesEpoch === currentEpoch ? this.state.currentValidatorData : this.state.previousValidatorData;
             for (const { index } of votes) {
                 const key = k[index]?.ed25519;
                 // no particular GP fragment but I think we don't believe in ghosts
                 if (key === undefined) {
-                    return result_Result.error(DisputesErrorCode.BadValidatorIndex);
+                    return result_Result.error(DisputesErrorCode.BadValidatorIndex, () => `Bad validator index: ${index} in epoch ${votesEpoch}`);
                 }
                 // verify vote signature. Verification was done earlier, here we only check the result.
                 // https://graypaper.fluffylabs.dev/#/579bd12/12cd0012cd00
                 const result = verificationResult.judgements[voteSignatureIndex];
                 if (!result.isValid) {
-                    return result_Result.error(DisputesErrorCode.BadSignature, `Invalid signature for judgement: ${voteSignatureIndex}`);
+                    return result_Result.error(DisputesErrorCode.BadSignature, () => `Invalid signature for judgement: ${voteSignatureIndex}`);
                 }
                 voteSignatureIndex += 1;
             }
@@ -14242,7 +14458,7 @@ class Disputes {
             const isInBadSet = badSet.has(verdict.workReportHash);
             const isInWonkySet = wonkySet.has(verdict.workReportHash);
             if (isInGoodSet || isInBadSet || isInWonkySet) {
-                return result_Result.error(DisputesErrorCode.AlreadyJudged);
+                return result_Result.error(DisputesErrorCode.AlreadyJudged, () => `Work report already judged: ${verdict.workReportHash}`);
             }
         }
         return result_Result.ok(null);
@@ -14273,7 +14489,7 @@ class Disputes {
                 // https://graypaper.fluffylabs.dev/#/579bd12/12f10212fc02
                 const f = disputes.faults.find((x) => x.workReportHash.isEqualTo(r));
                 if (f === undefined) {
-                    return result_Result.error(DisputesErrorCode.NotEnoughFaults);
+                    return result_Result.error(DisputesErrorCode.NotEnoughFaults, () => `Not enough faults for work report: ${r}`);
                 }
             }
             else if (sum === 0) {
@@ -14282,13 +14498,13 @@ class Disputes {
                 const c1 = disputes.culprits.find((x) => x.workReportHash.isEqualTo(r));
                 const c2 = disputes.culprits.findLast((x) => x.workReportHash.isEqualTo(r));
                 if (c1 === c2) {
-                    return result_Result.error(DisputesErrorCode.NotEnoughCulprits);
+                    return result_Result.error(DisputesErrorCode.NotEnoughCulprits, () => `Not enough culprits for work report: ${r}`);
                 }
             }
             else if (sum !== this.chainSpec.thirdOfValidators) {
                 // positive votes count is not correct
                 // https://graypaper.fluffylabs.dev/#/579bd12/125002128102
-                return result_Result.error(DisputesErrorCode.BadVoteSplit);
+                return result_Result.error(DisputesErrorCode.BadVoteSplit, () => `Bad vote split: sum=${sum}, expected=${this.chainSpec.thirdOfValidators} for work report ${r}`);
             }
         }
         return result_Result.ok(null);
@@ -14376,7 +14592,7 @@ class Disputes {
                 const validator = k[j.index];
                 // no particular GP fragment but I think we don't believe in ghosts
                 if (validator === undefined) {
-                    return result_Result.error(DisputesErrorCode.BadValidatorIndex);
+                    return result_Result.error(DisputesErrorCode.BadValidatorIndex, () => `Bad validator index in signature verification: ${j.index}`);
                 }
                 const key = validator.ed25519;
                 // verify vote signature
@@ -14484,7 +14700,7 @@ const ringCommitmentCache = [];
 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) {
-        return result_Result.error(null);
+        return result_Result.error(null, () => "Bandersnatch VRF seal verification failed");
     }
     return result_Result.ok(bytes_Bytes.fromBlob(sealResult.subarray(1), hash_HASH_SIZE).asOpaque());
 }
@@ -14510,9 +14726,9 @@ function getRingCommitment(bandersnatch, validators) {
 async function getRingCommitmentNoCache(bandersnatch, keys) {
     const commitmentResult = await bandersnatch.getRingCommitment(keys.raw);
     if (commitmentResult[RESULT_INDEX] === ResultValues.Error) {
-        return result_Result.error(null);
+        return result_Result.error(null, () => "Bandersnatch ring commitment calculation failed");
     }
-    return result_Result.ok(bytes_Bytes.fromBlob(commitmentResult.subarray(1), BANDERSNATCH_RING_ROOT_BYTES).asOpaque());
+    return result_Result.ok(bytes_Bytes.fromBlob(commitmentResult.subarray(1), bandersnatch_BANDERSNATCH_RING_ROOT_BYTES).asOpaque());
 }
 // One byte for result discriminator (`ResultValues`) and the rest is entropy hash.
 const TICKET_RESULT_LENGTH = 1 + hash_HASH_SIZE;
@@ -14666,7 +14882,7 @@ class Safrole {
              * https://graypaper.fluffylabs.dev/#/5f542d7/0ea2000ea200
              */
             if (isOffender) {
-                return ValidatorData.create({
+                return validator_data_ValidatorData.create({
                     bandersnatch: bytes_Bytes.zero(BANDERSNATCH_KEY_BYTES).asOpaque(),
                     ed25519: bytes_Bytes.zero(ED25519_KEY_BYTES).asOpaque(),
                     bls: bytes_Bytes.zero(BLS_KEY_BYTES).asOpaque(),
@@ -14685,7 +14901,7 @@ class Safrole {
                 epochRoot: epochRootResult.ok,
             });
         }
-        return result_Result.error(SafroleErrorCode.IncorrectData);
+        return result_Result.error(SafroleErrorCode.IncorrectData, () => "Safrole: failed to get epoch root for validator keys");
     }
     /**
      * Ticket sequencer that is used in standard mode
@@ -14744,13 +14960,13 @@ class Safrole {
         if (this.isNextEpoch(timeslot) &&
             m >= this.chainSpec.contestLength &&
             this.state.ticketsAccumulator.length === this.chainSpec.epochLength) {
-            return SafroleSealingKeysData.tickets(this.outsideInSequencer(this.state.ticketsAccumulator).tickets);
+            return safrole_data_SafroleSealingKeysData.tickets(this.outsideInSequencer(this.state.ticketsAccumulator).tickets);
         }
         if (this.isSameEpoch(timeslot)) {
             return this.state.sealingKeySeries;
         }
         // TODO [MaSi]: the result of fallback sequencer should be cached
-        return SafroleSealingKeysData.keys(this.fallbackKeySequencer(newEntropy, newValidators));
+        return safrole_data_SafroleSealingKeysData.keys(this.fallbackKeySequencer(newEntropy, newValidators));
     }
     /**
      * Returns epoch markers if the epoch is changed and null otherwise
@@ -14776,10 +14992,10 @@ class Safrole {
         for (let i = 1; i < ticketsLength; i++) {
             const order = tickets[i - 1].id.compare(tickets[i].id);
             if (order.isEqual()) {
-                return result_Result.error(SafroleErrorCode.DuplicateTicket);
+                return result_Result.error(SafroleErrorCode.DuplicateTicket, () => `Safrole: duplicate ticket found at index ${i}`);
             }
             if (order.isGreater()) {
-                return result_Result.error(SafroleErrorCode.BadTicketOrder);
+                return result_Result.error(SafroleErrorCode.BadTicketOrder, () => `Safrole: bad ticket order at index ${i}`);
             }
         }
         return result_Result.ok(null);
@@ -14806,7 +15022,7 @@ class Safrole {
             attempt: ticket.attempt,
         }));
         if (!verificationResult.every((x) => x.isValid)) {
-            return result_Result.error(SafroleErrorCode.BadTicketProof);
+            return result_Result.error(SafroleErrorCode.BadTicketProof, () => "Safrole: invalid ticket proof in extrinsic");
         }
         /**
          * Verify if tickets are sorted and unique
@@ -14815,7 +15031,7 @@ class Safrole {
          */
         const ticketsVerifcationResult = this.verifyTickets(tickets);
         if (ticketsVerifcationResult.isError) {
-            return result_Result.error(ticketsVerifcationResult.error);
+            return result_Result.error(ticketsVerifcationResult.error, ticketsVerifcationResult.details);
         }
         if (this.isEpochChanged(timeslot)) {
             return result_Result.ok(tickets);
@@ -14824,7 +15040,7 @@ class Safrole {
         const ticketsFromExtrinsic = SortedSet.fromSortedArray(ticketComparator, tickets);
         const mergedTickets = SortedSet.fromTwoSortedCollections(ticketsFromState, ticketsFromExtrinsic);
         if (ticketsFromState.length + ticketsFromExtrinsic.length !== mergedTickets.length) {
-            return result_Result.error(SafroleErrorCode.DuplicateTicket);
+            return result_Result.error(SafroleErrorCode.DuplicateTicket, () => "Safrole: duplicate ticket when merging state and extrinsic tickets");
         }
         /**
          * Remove tickets if size of accumulator exceeds E (epoch length).
@@ -14893,24 +15109,24 @@ class Safrole {
     }
     async transition(input) {
         if (this.state.timeslot >= input.slot) {
-            return result_Result.error(SafroleErrorCode.BadSlot);
+            return result_Result.error(SafroleErrorCode.BadSlot, () => `Safrole: bad slot, state timeslot ${this.state.timeslot} >= input slot ${input.slot}`);
         }
         if (!this.isExtrinsicLengthValid(input.slot, input.extrinsic)) {
-            return result_Result.error(SafroleErrorCode.UnexpectedTicket);
+            return result_Result.error(SafroleErrorCode.UnexpectedTicket, () => `Safrole: unexpected ticket, invalid extrinsic length ${input.extrinsic.length}`);
         }
         if (!this.areTicketAttemptsValid(input.extrinsic)) {
-            return result_Result.error(SafroleErrorCode.BadTicketAttempt);
+            return result_Result.error(SafroleErrorCode.BadTicketAttempt, () => "Safrole: bad ticket attempt value in extrinsic");
         }
         const validatorKeysResult = await this.getValidatorKeys(input.slot, input.punishSet);
         if (validatorKeysResult.isError) {
-            return result_Result.error(validatorKeysResult.error);
+            return result_Result.error(validatorKeysResult.error, validatorKeysResult.details);
         }
         const { nextValidatorData, currentValidatorData, previousValidatorData, epochRoot } = validatorKeysResult.ok;
         const entropy = this.getEntropy(input.slot, input.entropy);
         const sealingKeySeries = this.getSlotKeySequence(input.slot, currentValidatorData, entropy[2]);
         const newTicketsAccumulatorResult = await this.getNewTicketAccumulator(input.slot, input.extrinsic, this.state.nextValidatorData, epochRoot, entropy[2]);
         if (newTicketsAccumulatorResult.isError) {
-            return result_Result.error(newTicketsAccumulatorResult.error);
+            return result_Result.error(newTicketsAccumulatorResult.error, newTicketsAccumulatorResult.details);
         }
         const stateUpdate = {
             nextValidatorData,
@@ -14944,14 +15160,14 @@ function compareWithEncoding(chainSpec, error, actual, expected, codec) {
     if (actual === null || expected === null) {
         // if one of them is `null`, both need to be.
         if (actual !== expected) {
-            return result_Result.error(error, `${SafroleErrorCode[error]} Expected: ${expected}, got: ${actual}`);
+            return result_Result.error(error, () => `${SafroleErrorCode[error]} Expected: ${expected}, got: ${actual}`);
         }
         return result_Result.ok(result_OK);
     }
     // compare the literal encoding.
     const encoded = encoder_Encoder.encodeObject(codec, actual, chainSpec);
     if (!encoded.isEqualTo(expected.encoded())) {
-        return result_Result.error(error, `${SafroleErrorCode[error]} Expected: ${expected.encoded()}, got: ${encoded}`);
+        return result_Result.error(error, () => `${SafroleErrorCode[error]} Expected: ${expected.encoded()}, got: ${encoded}`);
     }
     return result_Result.ok(result_OK);
 }
@@ -14994,55 +15210,54 @@ class SafroleSeal {
         const blockAuthorKey = state.currentValidatorData.at(blockAuthorIndex)?.bandersnatch;
         const entropySourceResult = await bandersnatch_vrf.verifySeal(await this.bandersnatch, blockAuthorKey ?? BANDERSNATCH_ZERO_KEY, headerView.entropySource.materialize(), payload, bytes_BytesBlob.blobFromNumbers([]));
         if (entropySourceResult.isError) {
-            return result_Result.error(SafroleSealError.IncorrectEntropySource);
+            return result_Result.error(SafroleSealError.IncorrectEntropySource, () => "Safrole: incorrect entropy source in header seal");
         }
         return result_Result.ok(entropySourceResult.ok);
     }
     async verifySeal(headerView, state) {
         // we use transitioned keys already
-        const validators = state.currentValidatorData;
         const validatorIndex = headerView.bandersnatchBlockAuthorIndex.materialize();
-        const authorKey = validators[validatorIndex];
-        if (authorKey === undefined) {
-            return result_Result.error(SafroleSealError.InvalidValidatorIndex);
+        const authorKeys = state.currentValidatorData.at(validatorIndex);
+        if (authorKeys === undefined) {
+            return result_Result.error(SafroleSealError.InvalidValidatorIndex, () => `Safrole: invalid validator index ${validatorIndex}`);
         }
         const timeSlot = headerView.timeSlotIndex.materialize();
         const sealingKeys = state.sealingKeySeries;
         const entropy = state.currentEntropy;
         if (sealingKeys.kind === SafroleSealingKeysKind.Tickets) {
-            return await this.verifySealWithTicket(sealingKeys.tickets, timeSlot, entropy, validators, validatorIndex, headerView);
+            return await this.verifySealWithTicket(sealingKeys.tickets, timeSlot, entropy, authorKeys, headerView);
         }
-        return await this.verifySealWithKeys(sealingKeys.keys, authorKey, timeSlot, entropy, validators, validatorIndex, headerView);
+        return await this.verifySealWithKeys(sealingKeys.keys, timeSlot, entropy, authorKeys, headerView);
     }
     /** Regular (non-fallback) mode of Safrole. */
-    async verifySealWithTicket(tickets, timeSlot, entropy, validators, validatorIndex, headerView) {
+    async verifySealWithTicket(tickets, timeSlot, entropy, validatorData, headerView) {
         const index = timeSlot % tickets.length;
-        const { id, attempt } = tickets[index];
-        const payload = bytes_BytesBlob.blobFromParts(JAM_TICKET_SEAL, entropy.raw, new Uint8Array([attempt]));
+        const ticket = tickets.at(index);
+        const payload = bytes_BytesBlob.blobFromParts(JAM_TICKET_SEAL, entropy.raw, new Uint8Array([ticket?.attempt ?? 0]));
         // verify seal correctness
-        const authorKey = validators.at(validatorIndex)?.bandersnatch;
+        const authorKey = validatorData.bandersnatch;
         const result = await bandersnatch_vrf.verifySeal(await this.bandersnatch, authorKey ?? BANDERSNATCH_ZERO_KEY, headerView.seal.materialize(), payload, encodeUnsealedHeader(headerView));
         if (result.isError) {
-            return result_Result.error(SafroleSealError.IncorrectSeal);
+            return result_Result.error(SafroleSealError.IncorrectSeal, () => "Safrole: incorrect seal with ticket");
         }
-        if (!id.isEqualTo(result.ok)) {
-            return result_Result.error(SafroleSealError.InvalidTicket);
+        if (ticket === undefined || !ticket.id.isEqualTo(result.ok)) {
+            return result_Result.error(SafroleSealError.InvalidTicket, () => `Safrole: invalid ticket, expected ${ticket?.id} got ${result.ok}`);
         }
         return result_Result.ok(result.ok);
     }
     /** Fallback mode of Safrole. */
-    async verifySealWithKeys(keys, authorKey, timeSlot, entropy, validators, validatorIndex, headerView) {
+    async verifySealWithKeys(keys, timeSlot, entropy, authorKey, headerView) {
         const index = timeSlot % keys.length;
-        const sealingKey = keys[index];
-        if (!sealingKey.isEqualTo(authorKey.bandersnatch)) {
-            return result_Result.error(SafroleSealError.InvalidValidator, `Invalid Validator. Expected: ${sealingKey}, got: ${authorKey.bandersnatch}`);
+        const sealingKey = keys.at(index);
+        const authorBandersnatchKey = authorKey.bandersnatch;
+        if (sealingKey === undefined || !sealingKey.isEqualTo(authorBandersnatchKey)) {
+            return result_Result.error(SafroleSealError.InvalidValidator, () => `Invalid Validator. Expected: ${sealingKey}, got: ${authorKey.bandersnatch}`);
         }
         // verify seal correctness
         const payload = bytes_BytesBlob.blobFromParts(JAM_FALLBACK_SEAL, entropy.raw);
-        const blockAuthorKey = validators.at(validatorIndex)?.bandersnatch;
-        const result = await bandersnatch_vrf.verifySeal(await this.bandersnatch, blockAuthorKey ?? BANDERSNATCH_ZERO_KEY, headerView.seal.materialize(), payload, encodeUnsealedHeader(headerView));
+        const result = await bandersnatch_vrf.verifySeal(await this.bandersnatch, authorBandersnatchKey, headerView.seal.materialize(), payload, encodeUnsealedHeader(headerView));
         if (result.isError) {
-            return result_Result.error(SafroleSealError.IncorrectSeal);
+            return result_Result.error(SafroleSealError.IncorrectSeal, () => "Safrole: incorrect seal with keys");
         }
         return result_Result.ok(result.ok);
     }
@@ -15085,6 +15300,14 @@ async function getRootHash(yieldedRoots) {
 
 
 const InsufficientFundsError = "insufficient funds";
+/** Deep clone of a map with array. */
+function deepCloneMapWithArray(map) {
+    const cloned = [];
+    for (const [k, v] of map.entries()) {
+        cloned.push([k, v.slice()]);
+    }
+    return new Map(cloned);
+}
 /**
  * State updates that currently accumulating service produced.
  *
@@ -15114,10 +15337,11 @@ class AccumulationStateUpdate {
     /** Create new empty state update. */
     static empty() {
         return new AccumulationStateUpdate({
-            servicesUpdates: [],
-            servicesRemoved: [],
-            preimages: [],
-            storage: [],
+            created: [],
+            updated: new Map(),
+            removed: [],
+            preimages: new Map(),
+            storage: new Map(),
         }, []);
     }
     /** Create a state update with some existing, yet uncommited services updates. */
@@ -15129,10 +15353,13 @@ class AccumulationStateUpdate {
     /** Create a copy of another `StateUpdate`. Used by checkpoints. */
     static copyFrom(from) {
         const serviceUpdates = {
-            servicesUpdates: [...from.services.servicesUpdates],
-            servicesRemoved: [...from.services.servicesRemoved],
-            preimages: [...from.services.preimages],
-            storage: [...from.services.storage],
+            // shallow copy
+            created: [...from.services.created],
+            updated: new Map(from.services.updated),
+            removed: [...from.services.removed],
+            // deep copy
+            preimages: deepCloneMapWithArray(from.services.preimages),
+            storage: deepCloneMapWithArray(from.services.storage),
         };
         const transfers = [...from.transfers];
         const update = new AccumulationStateUpdate(serviceUpdates, transfers, new Map(from.yieldedRoots));
@@ -15151,6 +15378,12 @@ class AccumulationStateUpdate {
         }
         return update;
     }
+    /** Retrieve and clear pending transfers. */
+    takeTransfers() {
+        const transfers = this.transfers;
+        this.transfers = [];
+        return transfers;
+    }
 }
 class PartiallyUpdatedState {
     state;
@@ -15174,9 +15407,9 @@ class PartiallyUpdatedState {
         if (destination === null) {
             return null;
         }
-        const maybeNewService = this.stateUpdate.services.servicesUpdates.find((update) => update.serviceId === destination);
-        if (maybeNewService !== undefined) {
-            return maybeNewService.action.account;
+        const maybeUpdatedServiceInfo = this.stateUpdate.services.updated.get(destination);
+        if (maybeUpdatedServiceInfo !== undefined) {
+            return maybeUpdatedServiceInfo.action.account;
         }
         const maybeService = this.state.getService(destination);
         if (maybeService === null) {
@@ -15185,7 +15418,8 @@ class PartiallyUpdatedState {
         return maybeService.getInfo();
     }
     getStorage(serviceId, rawKey) {
-        const item = this.stateUpdate.services.storage.find((x) => x.serviceId === serviceId && x.key.isEqualTo(rawKey));
+        const storages = this.stateUpdate.services.storage.get(serviceId) ?? [];
+        const item = storages.find((x) => x.key.isEqualTo(rawKey));
         if (item !== undefined) {
             return item.value;
         }
@@ -15200,10 +15434,11 @@ class PartiallyUpdatedState {
      * the existence in `preimages` map.
      */
     hasPreimage(serviceId, hash) {
-        const providedPreimage = this.stateUpdate.services.preimages.find(
+        const preimages = this.stateUpdate.services.preimages.get(serviceId) ?? [];
+        const providedPreimage = preimages.find(
         // we ignore the action here, since if there is <any> update on that
         // hash it means it has to exist, right?
-        (p) => p.serviceId === serviceId && p.hash.isEqualTo(hash));
+        (p) => p.hash.isEqualTo(hash));
         if (providedPreimage !== undefined) {
             return true;
         }
@@ -15216,7 +15451,8 @@ class PartiallyUpdatedState {
     }
     getPreimage(serviceId, hash) {
         // TODO [ToDr] Should we verify availability here?
-        const freshlyProvided = this.stateUpdate.services.preimages.find((x) => x.serviceId === serviceId && x.hash.isEqualTo(hash));
+        const preimages = this.stateUpdate.services.preimages.get(serviceId) ?? [];
+        const freshlyProvided = preimages.find((x) => x.hash.isEqualTo(hash));
         if (freshlyProvided !== undefined && freshlyProvided.action.kind === UpdatePreimageKind.Provide) {
             return freshlyProvided.action.preimage.blob;
         }
@@ -15225,10 +15461,11 @@ class PartiallyUpdatedState {
     }
     /** Get status of a preimage of current service taking into account any updates. */
     getLookupHistory(currentTimeslot, serviceId, hash, length) {
+        const preimages = this.stateUpdate.services.preimages.get(serviceId) ?? [];
         // TODO [ToDr] This is most likely wrong. We may have `provide` and `remove` within
         // the same state update. We should however switch to proper "updated state"
         // representation soon.
-        const updatedPreimage = this.stateUpdate.services.preimages.findLast((update) => update.serviceId === serviceId && update.hash.isEqualTo(hash) && BigInt(update.length) === length);
+        const updatedPreimage = preimages.findLast((update) => update.hash.isEqualTo(hash) && BigInt(update.length) === length);
         const stateFallback = () => {
             // fallback to state lookup
             const service = this.state.getService(serviceId);
@@ -15265,14 +15502,15 @@ class PartiallyUpdatedState {
     /* State update functions. */
     updateStorage(serviceId, key, value) {
         const update = value === null
-            ? UpdateStorage.remove({ serviceId, key })
+            ? UpdateStorage.remove({ key })
             : UpdateStorage.set({
-                serviceId,
                 storage: StorageItem.create({ key, value }),
             });
-        const index = this.stateUpdate.services.storage.findIndex((x) => x.serviceId === update.serviceId && x.key.isEqualTo(key));
+        const storages = this.stateUpdate.services.storage.get(serviceId) ?? [];
+        const index = storages.findIndex((x) => x.key.isEqualTo(key));
         const count = index === -1 ? 0 : 1;
-        this.stateUpdate.services.storage.splice(index, count, update);
+        storages.splice(index, count, update);
+        this.stateUpdate.services.storage.set(serviceId, storages);
     }
     /**
      * Update a preimage.
@@ -15280,8 +15518,10 @@ class PartiallyUpdatedState {
      * Note we store all previous entries as well, since there might be a sequence of:
      * `provide` -> `remove` and both should update the end state somehow.
      */
-    updatePreimage(newUpdate) {
-        this.stateUpdate.services.preimages.push(newUpdate);
+    updatePreimage(serviceId, newUpdate) {
+        const updatePreimages = this.stateUpdate.services.preimages.get(serviceId) ?? [];
+        updatePreimages.push(newUpdate);
+        this.stateUpdate.services.preimages.set(serviceId, updatePreimages);
     }
     updateServiceStorageUtilisation(serviceId, items, bytes, serviceInfo) {
         debug_check `${items >= 0} storageUtilisationCount has to be a positive number, got: ${items}`;
@@ -15290,11 +15530,11 @@ class PartiallyUpdatedState {
         const overflowBytes = !isU64(bytes);
         // TODO [ToDr] this is not specified in GP, but it seems sensible.
         if (overflowItems || overflowBytes) {
-            return result_Result.error(InsufficientFundsError);
+            return result_Result.error(InsufficientFundsError, () => `Storage utilisation overflow: items=${overflowItems}, bytes=${overflowBytes}`);
         }
         const thresholdBalance = ServiceAccountInfo.calculateThresholdBalance(items, bytes, serviceInfo.gratisStorage);
         if (serviceInfo.balance < thresholdBalance) {
-            return result_Result.error(InsufficientFundsError);
+            return result_Result.error(InsufficientFundsError, () => `Service balance (${serviceInfo.balance}) below threshold (${thresholdBalance})`);
         }
         // Update service info with new details.
         this.updateServiceInfo(serviceId, ServiceAccountInfo.create({
@@ -15305,20 +15545,23 @@ class PartiallyUpdatedState {
         return result_Result.ok(result_OK);
     }
     updateServiceInfo(serviceId, newInfo) {
-        const idx = this.stateUpdate.services.servicesUpdates.findIndex((x) => x.serviceId === serviceId);
-        const toRemove = idx === -1 ? 0 : 1;
-        const existingItem = this.stateUpdate.services.servicesUpdates[idx];
-        if (existingItem?.action.kind === UpdateServiceKind.Create) {
-            this.stateUpdate.services.servicesUpdates.splice(idx, toRemove, UpdateService.create({
-                serviceId,
+        const existingUpdate = this.stateUpdate.services.updated.get(serviceId);
+        if (existingUpdate?.action.kind === UpdateServiceKind.Create) {
+            this.stateUpdate.services.updated.set(serviceId, UpdateService.create({
                 serviceInfo: newInfo,
-                lookupHistory: existingItem.action.lookupHistory,
+                lookupHistory: existingUpdate.action.lookupHistory,
             }));
             return;
         }
-        this.stateUpdate.services.servicesUpdates.splice(idx, toRemove, UpdateService.update({
-            serviceId,
+        this.stateUpdate.services.updated.set(serviceId, UpdateService.update({
+            serviceInfo: newInfo,
+        }));
+    }
+    createService(serviceId, newInfo, newLookupHistory) {
+        this.stateUpdate.services.created.push(serviceId);
+        this.stateUpdate.services.updated.set(serviceId, UpdateService.create({
             serviceInfo: newInfo,
+            lookupHistory: newLookupHistory,
         }));
     }
     getPrivilegedServices() {
@@ -16794,7 +17037,7 @@ class ReadablePage extends MemoryPage {
     loadInto(result, startIndex, length) {
         const endIndex = startIndex + length;
         if (endIndex > PAGE_SIZE) {
-            return result_Result.error(PageFault.fromMemoryIndex(this.start + PAGE_SIZE));
+            return result_Result.error(PageFault.fromMemoryIndex(this.start + PAGE_SIZE), () => `Page fault: read beyond page boundary at ${this.start + PAGE_SIZE}`);
         }
         const bytes = this.data.subarray(startIndex, endIndex);
         // we zero the bytes, since data might not yet be initialized at `endIndex`.
@@ -16803,7 +17046,7 @@ class ReadablePage extends MemoryPage {
         return result_Result.ok(result_OK);
     }
     storeFrom(_address, _data) {
-        return result_Result.error(PageFault.fromMemoryIndex(this.start, true));
+        return result_Result.error(PageFault.fromMemoryIndex(this.start, true), () => `Page fault: attempted to write to read-only page at ${this.start}`);
     }
     setData(pageIndex, data) {
         this.data.set(data, pageIndex);
@@ -16837,7 +17080,7 @@ class WriteablePage extends MemoryPage {
     loadInto(result, startIndex, length) {
         const endIndex = startIndex + length;
         if (endIndex > PAGE_SIZE) {
-            return result_Result.error(PageFault.fromMemoryIndex(this.start + PAGE_SIZE));
+            return result_Result.error(PageFault.fromMemoryIndex(this.start + PAGE_SIZE), () => `Page fault: read beyond page boundary at ${this.start + PAGE_SIZE}`);
         }
         const bytes = this.view.subarray(startIndex, endIndex);
         // we zero the bytes, since the view might not yet be initialized at `endIndex`.
@@ -16923,7 +17166,7 @@ class Memory {
         memory_logger.insane `MEM[${address}] <- ${bytes_BytesBlob.blobFrom(bytes)}`;
         const pagesResult = this.getPages(address, bytes.length, AccessType.WRITE);
         if (pagesResult.isError) {
-            return result_Result.error(pagesResult.error);
+            return result_Result.error(pagesResult.error, pagesResult.details);
         }
         const pages = pagesResult.ok;
         let currentPosition = address;
@@ -16948,14 +17191,14 @@ class Memory {
         const pages = [];
         for (const pageNumber of pageRange) {
             if (pageNumber < RESERVED_NUMBER_OF_PAGES) {
-                return result_Result.error(PageFault.fromPageNumber(pageNumber, true));
+                return result_Result.error(PageFault.fromPageNumber(pageNumber, true), () => `Page fault: attempted to access reserved page ${pageNumber}`);
             }
             const page = this.memory.get(pageNumber);
             if (page === undefined) {
-                return result_Result.error(PageFault.fromPageNumber(pageNumber));
+                return result_Result.error(PageFault.fromPageNumber(pageNumber), () => `Page fault: page ${pageNumber} not allocated`);
             }
             if (accessType === AccessType.WRITE && !page.isWriteable()) {
-                return result_Result.error(PageFault.fromPageNumber(pageNumber, true));
+                return result_Result.error(PageFault.fromPageNumber(pageNumber, true), () => `Page fault: attempted to write to read-only page ${pageNumber}`);
             }
             pages.push(page);
         }
@@ -16973,7 +17216,7 @@ class Memory {
         }
         const pagesResult = this.getPages(startAddress, result.length, AccessType.READ);
         if (pagesResult.isError) {
-            return result_Result.error(pagesResult.error);
+            return result_Result.error(pagesResult.error, pagesResult.details);
         }
         const pages = pagesResult.ok;
         let currentPosition = startAddress;
@@ -18912,7 +19155,7 @@ class ProgramDecoder {
         }
         catch (e) {
             program_decoder_logger.error `Invalid program: ${e}`;
-            return result_Result.error(ProgramDecoderError.InvalidProgramError);
+            return result_Result.error(ProgramDecoderError.InvalidProgramError, () => `Program decoder error: ${e}`);
         }
     }
 }
@@ -19190,6 +19433,24 @@ class Interpreter {
     getMemoryPage(pageNumber) {
         return this.memory.getPageDump(tryAsPageNumber(pageNumber));
     }
+    calculateBlockGasCost() {
+        const codeLength = this.code.length;
+        const blocks = new Map();
+        let currentBlock = "0";
+        let gasCost = 0;
+        const getNextIstructionIndex = (index) => index + 1 + this.mask.getNoOfBytesToNextInstruction(index + 1);
+        for (let index = 0; index < codeLength; index = getNextIstructionIndex(index)) {
+            const instruction = this.code[index];
+            if (this.basicBlocks.isBeginningOfBasicBlock(index)) {
+                blocks.set(currentBlock, gasCost);
+                currentBlock = index.toString();
+                gasCost = 0;
+            }
+            gasCost += instructionGasMap[instruction];
+        }
+        blocks.set(currentBlock, gasCost);
+        return blocks;
+    }
 }
 
 ;// CONCATENATED MODULE: ./packages/core/pvm-interpreter/index.ts
@@ -19637,10 +19898,10 @@ class AccumulateExternalities {
             const len = existingPreimage.slots.length;
             // https://graypaper.fluffylabs.dev/#/9a08063/380901380901?v=0.6.6
             if (len === PreimageStatusKind.Requested) {
-                return result_Result.error(RequestPreimageError.AlreadyRequested);
+                return result_Result.error(RequestPreimageError.AlreadyRequested, () => `Preimage already requested: hash=${hash}`);
             }
             if (len === PreimageStatusKind.Available || len === PreimageStatusKind.Reavailable) {
-                return result_Result.error(RequestPreimageError.AlreadyAvailable);
+                return result_Result.error(RequestPreimageError.AlreadyAvailable, () => `Preimage already available: hash=${hash}`);
             }
             // TODO [ToDr] Not sure if we should update the service info in that case,
             // but for now we let that case fall-through.
@@ -19665,15 +19926,13 @@ class AccumulateExternalities {
         const clampedLength = clampU64ToU32(length);
         if (existingPreimage === null) {
             // https://graypaper.fluffylabs.dev/#/9a08063/38a60038a600?v=0.6.6
-            this.updatedState.updatePreimage(UpdatePreimage.updateOrAdd({
-                serviceId: this.currentServiceId,
+            this.updatedState.updatePreimage(this.currentServiceId, UpdatePreimage.updateOrAdd({
                 lookupHistory: new LookupHistoryItem(hash, clampedLength, tryAsLookupHistorySlots([])),
             }));
         }
         else {
             /** https://graypaper.fluffylabs.dev/#/9a08063/38ca0038ca00?v=0.6.6 */
-            this.updatedState.updatePreimage(UpdatePreimage.updateOrAdd({
-                serviceId: this.currentServiceId,
+            this.updatedState.updatePreimage(this.currentServiceId, UpdatePreimage.updateOrAdd({
                 lookupHistory: new LookupHistoryItem(hash, clampedLength, tryAsLookupHistorySlots([...existingPreimage.slots, this.currentTimeslot])),
             }));
         }
@@ -19683,7 +19942,7 @@ class AccumulateExternalities {
         const serviceId = this.currentServiceId;
         const status = this.updatedState.getLookupHistory(this.currentTimeslot, this.currentServiceId, hash, length);
         if (status === null) {
-            return result_Result.error(ForgetPreimageError.NotFound);
+            return result_Result.error(ForgetPreimageError.NotFound, () => `Preimage not found: hash=${hash}, length=${length}`);
         }
         const s = slotsToPreimageStatus(status.slots);
         const updateStorageUtilisation = () => {
@@ -19696,10 +19955,9 @@ class AccumulateExternalities {
         if (s.status === PreimageStatusKind.Requested) {
             const res = updateStorageUtilisation();
             if (res.isError) {
-                return result_Result.error(ForgetPreimageError.StorageUtilisationError);
+                return result_Result.error(ForgetPreimageError.StorageUtilisationError, res.details);
             }
-            this.updatedState.updatePreimage(UpdatePreimage.remove({
-                serviceId,
+            this.updatedState.updatePreimage(serviceId, UpdatePreimage.remove({
                 hash: status.hash,
                 length: status.length,
             }));
@@ -19712,21 +19970,19 @@ class AccumulateExternalities {
             if (y < t - this.chainSpec.preimageExpungePeriod) {
                 const res = updateStorageUtilisation();
                 if (res.isError) {
-                    return result_Result.error(ForgetPreimageError.StorageUtilisationError);
+                    return result_Result.error(ForgetPreimageError.StorageUtilisationError, res.details);
                 }
-                this.updatedState.updatePreimage(UpdatePreimage.remove({
-                    serviceId,
+                this.updatedState.updatePreimage(serviceId, UpdatePreimage.remove({
                     hash: status.hash,
                     length: status.length,
                 }));
                 return result_Result.ok(result_OK);
             }
-            return result_Result.error(ForgetPreimageError.NotExpired);
+            return result_Result.error(ForgetPreimageError.NotExpired, () => `Preimage not expired: y=${y}, timeslot=${t}, period=${this.chainSpec.preimageExpungePeriod}`);
         }
         // https://graypaper.fluffylabs.dev/#/9a08063/38c80138c801?v=0.6.6
         if (s.status === PreimageStatusKind.Available) {
-            this.updatedState.updatePreimage(UpdatePreimage.updateOrAdd({
-                serviceId,
+            this.updatedState.updatePreimage(serviceId, UpdatePreimage.updateOrAdd({
                 lookupHistory: new LookupHistoryItem(status.hash, status.length, tryAsLookupHistorySlots([s.data[0], t])),
             }));
             return result_Result.ok(result_OK);
@@ -19735,13 +19991,12 @@ class AccumulateExternalities {
         if (s.status === PreimageStatusKind.Reavailable) {
             const y = s.data[1];
             if (y < t - this.chainSpec.preimageExpungePeriod) {
-                this.updatedState.updatePreimage(UpdatePreimage.updateOrAdd({
-                    serviceId,
+                this.updatedState.updatePreimage(serviceId, UpdatePreimage.updateOrAdd({
                     lookupHistory: new LookupHistoryItem(status.hash, status.length, tryAsLookupHistorySlots([s.data[2], t])),
                 }));
                 return result_Result.ok(result_OK);
             }
-            return result_Result.error(ForgetPreimageError.NotExpired);
+            return result_Result.error(ForgetPreimageError.NotExpired, () => `Preimage not expired: y=${y}, timeslot=${t}, period=${this.chainSpec.preimageExpungePeriod}`);
         }
         debug_assertNever(s);
     }
@@ -19750,17 +20005,17 @@ class AccumulateExternalities {
         const destination = this.getServiceInfo(destinationId);
         /** https://graypaper.fluffylabs.dev/#/9a08063/370401370401?v=0.6.6 */
         if (destination === null || destinationId === null) {
-            return result_Result.error(TransferError.DestinationNotFound);
+            return result_Result.error(TransferError.DestinationNotFound, () => `Destination service not found: ${destinationId}`);
         }
         /** https://graypaper.fluffylabs.dev/#/9a08063/371301371301?v=0.6.6 */
         if (gas < destination.onTransferMinGas) {
-            return result_Result.error(TransferError.GasTooLow);
+            return result_Result.error(TransferError.GasTooLow, () => `Gas ${gas} below minimum ${destination.onTransferMinGas}`);
         }
         /** https://graypaper.fluffylabs.dev/#/9a08063/371b01371b01?v=0.6.6 */
         const newBalance = source.balance - amount;
         const thresholdBalance = ServiceAccountInfo.calculateThresholdBalance(source.storageUtilisationCount, source.storageUtilisationBytes, source.gratisStorage);
         if (newBalance < thresholdBalance) {
-            return result_Result.error(TransferError.BalanceBelowThreshold);
+            return result_Result.error(TransferError.BalanceBelowThreshold, () => `Balance ${newBalance} below threshold ${thresholdBalance}`);
         }
         // outgoing transfer
         this.updatedState.stateUpdate.transfers.push(PendingTransfer.create({
@@ -19787,7 +20042,7 @@ class AccumulateExternalities {
         // check if we are priviledged to set gratis storage
         // https://graypaper.fluffylabs.dev/#/7e6ff6a/369203369603?v=0.6.7
         if (gratisStorage !== numbers_tryAsU64(0) && this.currentServiceId !== this.updatedState.getPrivilegedServices().manager) {
-            return result_Result.error(NewServiceError.UnprivilegedService);
+            return result_Result.error(NewServiceError.UnprivilegedService, () => `Service ${this.currentServiceId} not privileged to set gratis storage`);
         }
         // check if we have enough balance
         // https://graypaper.fluffylabs.dev/#/7e6ff6a/369e0336a303?v=0.6.7
@@ -19796,7 +20051,7 @@ class AccumulateExternalities {
         const thresholdForCurrent = ServiceAccountInfo.calculateThresholdBalance(currentService.storageUtilisationCount, currentService.storageUtilisationBytes, currentService.gratisStorage);
         const balanceLeftForCurrent = currentService.balance - thresholdForNew;
         if (balanceLeftForCurrent < thresholdForCurrent || bytes.overflow) {
-            return result_Result.error(NewServiceError.InsufficientFunds);
+            return result_Result.error(NewServiceError.InsufficientFunds, () => `Insufficient funds: balance=${currentService.balance}, required=${thresholdForNew}, overflow=${bytes.overflow}`);
         }
         // `a`: https://graypaper.fluffylabs.dev/#/ab2cdbd/366b02366d02?v=0.7.2
         const newAccount = ServiceAccountInfo.create({
@@ -19823,15 +20078,11 @@ class AccumulateExternalities {
                 // NOTE: It's safe to cast to `Number` here, bcs here service ID cannot be bigger than 2**16
                 const newServiceId = tryAsServiceId(Number(wantedServiceId));
                 if (this.getServiceInfo(newServiceId) !== null) {
-                    return result_Result.error(NewServiceError.RegistrarServiceIdAlreadyTaken);
+                    return result_Result.error(NewServiceError.RegistrarServiceIdAlreadyTaken, () => `Service ID ${newServiceId} already taken`);
                 }
                 // add the new service with selected ID
                 // https://graypaper.fluffylabs.dev/#/ab2cdbd/36be0336c003?v=0.7.2
-                this.updatedState.stateUpdate.services.servicesUpdates.push(UpdateService.create({
-                    serviceId: newServiceId,
-                    serviceInfo: newAccount,
-                    lookupHistory: newLookupItem,
-                }));
+                this.updatedState.createService(newServiceId, newAccount, newLookupItem);
                 // update the balance of current service
                 // https://graypaper.fluffylabs.dev/#/ab2cdbd/36c20336c403?v=0.7.2
                 this.updatedState.updateServiceInfo(this.currentServiceId, updatedCurrentAccount);
@@ -19842,12 +20093,8 @@ class AccumulateExternalities {
         }
         const newServiceId = this.nextNewServiceId;
         // add the new service
-        // https://graypaper.fluffylabs.dev/#/ab2cdbd/36e70336e903?v=0.7.2
-        this.updatedState.stateUpdate.services.servicesUpdates.push(UpdateService.create({
-            serviceId: newServiceId,
-            serviceInfo: newAccount,
-            lookupHistory: newLookupItem,
-        }));
+        // https://graypaper.fluffylabs.dev/#/7e6ff6a/36cb0236cb02?v=0.6.7
+        this.updatedState.createService(newServiceId, newAccount, newLookupItem);
         // update the balance of current service
         // https://graypaper.fluffylabs.dev/#/ab2cdbd/36ec0336ee03?v=0.7.2
         this.updatedState.updateServiceInfo(this.currentServiceId, updatedCurrentAccount);
@@ -19871,7 +20118,7 @@ class AccumulateExternalities {
         const currentDelegator = this.updatedState.getPrivilegedServices().delegator;
         if (currentDelegator !== this.currentServiceId) {
             accumulate_externalities_logger.trace `Current service id (${this.currentServiceId}) is not a validators manager. (expected: ${currentDelegator}) and cannot update validators data. Ignoring`;
-            return result_Result.error(UnprivilegedError);
+            return result_Result.error(UnprivilegedError, () => `Service ${this.currentServiceId} is not delegator (expected: ${currentDelegator})`);
         }
         this.updatedState.stateUpdate.validatorsData = validatorsData;
         return result_Result.ok(result_OK);
@@ -19886,33 +20133,87 @@ class AccumulateExternalities {
         const currentAssigners = this.updatedState.getPrivilegedServices().assigners[coreIndex];
         if (currentAssigners !== this.currentServiceId) {
             accumulate_externalities_logger.trace `Current service id (${this.currentServiceId}) is not an auth manager of core ${coreIndex} (expected: ${currentAssigners}) and cannot update authorization queue.`;
-            return result_Result.error(UpdatePrivilegesError.UnprivilegedService);
+            return result_Result.error(UpdatePrivilegesError.UnprivilegedService, () => `Service ${this.currentServiceId} not assigner for core ${coreIndex} (expected: ${currentAssigners})`);
         }
         if (assigners === null && Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
             accumulate_externalities_logger.trace `The new auth manager is not a valid service id.`;
-            return result_Result.error(UpdatePrivilegesError.InvalidServiceId);
+            return result_Result.error(UpdatePrivilegesError.InvalidServiceId, () => `New auth manager is null for core ${coreIndex}`);
         }
         this.updatedState.stateUpdate.authorizationQueues.set(coreIndex, authQueue);
         return result_Result.ok(result_OK);
     }
+    updatePrivilegedServiceId(
+    // The id that privileged service wants to be updated to
+    newId, 
+    // Current id of privileged service (updated state)
+    currentId, { 
+    // is current service id a manager (can update anything)
+    isManager, 
+    // is current service attempting to update itself (privileged are owned)
+    isSelf, 
+    // is the service id already changed in this block
+    isAlreadyChanged, }) {
+        if (isManager) {
+            return newId;
+        }
+        // current service can update itself, only if it was a privileged
+        // service at the start of the block. I.e. owned privileges cannot
+        // be transfered multiple times in a block.
+        if (isSelf && !isAlreadyChanged) {
+            return newId;
+        }
+        return currentId;
+    }
     updatePrivilegedServices(manager, authorizers, delegator, registrar, autoAccumulate) {
         /** https://graypaper.fluffylabs.dev/#/7e6ff6a/36d90036de00?v=0.6.7 */
-        const currentManager = this.updatedState.getPrivilegedServices().manager;
-        if (currentManager !== this.currentServiceId) {
-            return result_Result.error(UpdatePrivilegesError.UnprivilegedService);
-        }
-        if (manager === null || delegator === null) {
-            return result_Result.error(UpdatePrivilegesError.InvalidServiceId, "Either manager or delegator is not valid service id.");
+        const current = this.updatedState.getPrivilegedServices();
+        const isManager = current.manager === this.currentServiceId;
+        if (Compatibility.isLessThan(GpVersion.V0_7_1)) {
+            if (!isManager) {
+                return result_Result.error(UpdatePrivilegesError.UnprivilegedService, () => `Service ${this.currentServiceId} is not manager`);
+            }
+            if (manager === null || delegator === null) {
+                return result_Result.error(UpdatePrivilegesError.InvalidServiceId, () => "Either manager or delegator is not a valid service id.");
+            }
+            this.updatedState.stateUpdate.privilegedServices = PrivilegedServices.create({
+                manager,
+                assigners: authorizers,
+                delegator: delegator,
+                registrar: registrar ?? tryAsServiceId(0),
+                autoAccumulateServices: autoAccumulate.map(([service, gasLimit]) => AutoAccumulate.create({ service, gasLimit })),
+            });
+            return result_Result.ok(result_OK);
         }
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) && registrar === null) {
-            return result_Result.error(UpdatePrivilegesError.InvalidServiceId, "Register manager is not valid service id.");
+        const original = this.updatedState.state.privilegedServices;
+        if (manager === null || delegator === null || registrar === null) {
+            return result_Result.error(UpdatePrivilegesError.InvalidServiceId, () => "Either manager or delegator or registrar is not a valid service id.");
         }
+        const newDelegator = this.updatePrivilegedServiceId(delegator, current.delegator, {
+            isManager,
+            isSelf: this.currentServiceId === current.delegator,
+            isAlreadyChanged: current.delegator !== original.delegator,
+        });
+        const newRegistrar = this.updatePrivilegedServiceId(registrar, current.registrar, {
+            isManager,
+            isSelf: this.currentServiceId === current.registrar,
+            isAlreadyChanged: current.registrar !== original.registrar,
+        });
+        const newAssigners = current.assigners.map((currentAssigner, index) => this.updatePrivilegedServiceId(authorizers[index], currentAssigner, {
+            isManager,
+            isSelf: this.currentServiceId === currentAssigner,
+            isAlreadyChanged: currentAssigner !== original.assigners[index],
+        }));
+        const newManager = isManager ? manager : current.manager;
+        const newAutoAccumulateServices = isManager
+            ? autoAccumulate.map(([service, gasLimit]) => AutoAccumulate.create({ service, gasLimit }))
+            : current.autoAccumulateServices;
+        // finally update the privileges
         this.updatedState.stateUpdate.privilegedServices = PrivilegedServices.create({
-            manager,
-            assigners: authorizers,
-            delegator,
-            registrar: registrar ?? tryAsServiceId(0), // introduced in 0.7.1
-            autoAccumulateServices: autoAccumulate.map(([service, gasLimit]) => AutoAccumulate.create({ service, gasLimit })),
+            manager: newManager,
+            assigners: tryAsPerCore(newAssigners, this.chainSpec),
+            delegator: newDelegator,
+            registrar: newRegistrar,
+            autoAccumulateServices: newAutoAccumulateServices,
         });
         return result_Result.ok(result_OK);
     }
@@ -19925,23 +20226,22 @@ class AccumulateExternalities {
         // TODO [ToDr] what about newly created services?
         const service = serviceId === null ? null : this.updatedState.state.getService(serviceId);
         if (service === null || serviceId === null) {
-            return result_Result.error(ProvidePreimageError.ServiceNotFound);
+            return result_Result.error(ProvidePreimageError.ServiceNotFound, () => `Service not found: ${serviceId}`);
         }
         // calculating the hash
         const preimageHash = this.blake2b.hashBytes(preimage).asOpaque();
         // checking service internal lookup
         const stateLookup = this.updatedState.getLookupHistory(this.currentTimeslot, serviceId, preimageHash, numbers_tryAsU64(preimage.length));
         if (stateLookup === null || !LookupHistoryItem.isRequested(stateLookup)) {
-            return result_Result.error(ProvidePreimageError.WasNotRequested);
+            return result_Result.error(ProvidePreimageError.WasNotRequested, () => `Preimage was not requested: hash=${preimageHash}, service=${serviceId}`);
         }
         // checking already provided preimages
         const hasPreimage = this.updatedState.hasPreimage(serviceId, preimageHash);
         if (hasPreimage) {
-            return result_Result.error(ProvidePreimageError.AlreadyProvided);
+            return result_Result.error(ProvidePreimageError.AlreadyProvided, () => `Preimage already provided: hash=${preimageHash}, service=${serviceId}`);
         }
         // setting up the new preimage
-        this.updatedState.updatePreimage(UpdatePreimage.provide({
-            serviceId,
+        this.updatedState.updatePreimage(serviceId, UpdatePreimage.provide({
             preimage: PreimageItem.create({
                 hash: preimageHash,
                 blob: preimage,
@@ -19953,31 +20253,31 @@ class AccumulateExternalities {
     eject(destination, previousCodeHash) {
         const service = this.getServiceInfo(destination);
         if (service === null || destination === null) {
-            return result_Result.error(EjectError.InvalidService, "Service missing");
+            return result_Result.error(EjectError.InvalidService, () => "Service missing");
         }
         const currentService = this.getCurrentServiceInfo();
         // check if the service expects to be ejected by us:
         const expectedCodeHash = bytes_Bytes.zero(hash_HASH_SIZE).asOpaque();
         writeServiceIdAsLeBytes(this.currentServiceId, expectedCodeHash.raw);
         if (!service.codeHash.isEqualTo(expectedCodeHash)) {
-            return result_Result.error(EjectError.InvalidService, "Invalid code hash");
+            return result_Result.error(EjectError.InvalidService, () => "Invalid code hash");
         }
         // make sure the service only has required number of storage items?
         if (service.storageUtilisationCount !== REQUIRED_NUMBER_OF_STORAGE_ITEMS_FOR_EJECT) {
-            return result_Result.error(EjectError.InvalidPreimage, "Too many storage items");
+            return result_Result.error(EjectError.InvalidPreimage, () => "Too many storage items");
         }
         // storage items length
         const l = numbers_tryAsU64(maxU64(service.storageUtilisationBytes, LOOKUP_HISTORY_ENTRY_BYTES) - LOOKUP_HISTORY_ENTRY_BYTES);
         // check if we have a preimage with the entire storage.
         const [isPreviousCodeExpired, errorReason] = this.isPreviousCodeExpired(destination, previousCodeHash, l);
         if (!isPreviousCodeExpired) {
-            return result_Result.error(EjectError.InvalidPreimage, `Previous code available: ${errorReason}`);
+            return result_Result.error(EjectError.InvalidPreimage, () => `Previous code available: ${errorReason}`);
         }
         // compute new balance of the service.
         const newBalance = sumU64(currentService.balance, service.balance);
         // TODO [ToDr] what to do in case of overflow?
         if (newBalance.overflow) {
-            return result_Result.error(EjectError.InvalidService, "Balance overflow");
+            return result_Result.error(EjectError.InvalidService, () => "Balance overflow");
         }
         // update current service.
         this.updatedState.updateServiceInfo(this.currentServiceId, ServiceAccountInfo.create({
@@ -19985,11 +20285,13 @@ class AccumulateExternalities {
             balance: newBalance.value,
         }));
         // and finally add an ejected service.
-        this.updatedState.stateUpdate.services.servicesRemoved.push(destination);
+        this.updatedState.stateUpdate.services.removed.push(destination);
         // take care of the code preimage and its lookup history
         // Safe, because we know the preimage is valid, and it's the code of the service, which is bounded by maximal service code size anyway (much smaller than 2**32 bytes).
         const preimageLength = numbers_tryAsU32(Number(l));
-        this.updatedState.stateUpdate.services.preimages.push(UpdatePreimage.remove({ serviceId: destination, hash: previousCodeHash, length: preimageLength }));
+        const preimages = this.updatedState.stateUpdate.services.preimages.get(destination) ?? [];
+        preimages.push(UpdatePreimage.remove({ hash: previousCodeHash, length: preimageLength }));
+        this.updatedState.stateUpdate.services.preimages.set(destination, preimages);
         return result_Result.ok(result_OK);
     }
     read(serviceId, rawKey) {
@@ -20170,10 +20472,10 @@ class Assurances {
         for (const assurance of assurances) {
             const { anchor, validatorIndex, bitfield } = assurance;
             if (!anchor.isEqualTo(input.parentHash)) {
-                return result_Result.error(AssurancesError.InvalidAnchor, `anchor: expected: ${input.parentHash}, got ${anchor}`);
+                return result_Result.error(AssurancesError.InvalidAnchor, () => `anchor: expected: ${input.parentHash}, got ${anchor}`);
             }
             if (prevValidatorIndex >= validatorIndex) {
-                return result_Result.error(AssurancesError.InvalidOrder, `order: expected: ${prevValidatorIndex + 1}, got: ${validatorIndex}`);
+                return result_Result.error(AssurancesError.InvalidOrder, () => `order: expected: ${prevValidatorIndex + 1}, got: ${validatorIndex}`);
             }
             prevValidatorIndex = assurance.validatorIndex;
             debug_check `${bitfield.bitLength === coresCount} Invalid bitfield length of ${bitfield.bitLength}`;
@@ -20196,7 +20498,7 @@ class Assurances {
              * https://graypaper.fluffylabs.dev/#/579bd12/14e90014ea00
              */
             if (noOfAssurances > 0 && !isReportPending) {
-                return result_Result.error(AssurancesError.NoReportPending, `no report pending for core ${c} yet we got an assurance`);
+                return result_Result.error(AssurancesError.NoReportPending, () => `no report pending for core ${c} yet we got an assurance`);
             }
             /**
              * Remove work report if it's became available or timed out.
@@ -20242,7 +20544,7 @@ class Assurances {
             const v = assurance.view();
             const key = validatorData[v.validatorIndex.materialize()];
             if (key === undefined) {
-                return result_Result.error(AssurancesError.InvalidValidatorIndex);
+                return result_Result.error(AssurancesError.InvalidValidatorIndex, () => `Invalid validator index: ${v.validatorIndex.materialize()}`);
             }
             signatures.push({
                 signature: v.signature.materialize(),
@@ -20254,7 +20556,7 @@ class Assurances {
         const isAllSignaturesValid = signaturesValid.every((x) => x);
         if (!isAllSignaturesValid) {
             const invalidIndices = signaturesValid.reduce((acc, isValid, idx) => (isValid ? acc : acc.concat(idx)), []);
-            return result_Result.error(AssurancesError.InvalidSignature, `invalid signatures at ${invalidIndices.join(", ")}`);
+            return result_Result.error(AssurancesError.InvalidSignature, () => `invalid signatures at ${invalidIndices.join(", ")}`);
         }
         return result_Result.ok(result_OK);
     }
@@ -20865,7 +21167,7 @@ class HostCallMemory {
             return result_Result.ok(result_OK);
         }
         if (address + numbers_tryAsU64(bytes.length) > MEMORY_SIZE) {
-            return result_Result.error(new OutOfBounds());
+            return result_Result.error(new OutOfBounds(), () => `Memory access out of bounds: address ${address} + length ${bytes.length} exceeds memory size`);
         }
         return this.memory.storeFrom(tryAsMemoryIndex(Number(address)), bytes);
     }
@@ -20874,13 +21176,10 @@ class HostCallMemory {
             return result_Result.ok(result_OK);
         }
         if (startAddress + numbers_tryAsU64(result.length) > MEMORY_SIZE) {
-            return result_Result.error(new OutOfBounds());
+            return result_Result.error(new OutOfBounds(), () => `Memory access out of bounds: address ${startAddress} + length ${result.length} exceeds memory size`);
         }
         return this.memory.loadInto(result, tryAsMemoryIndex(Number(startAddress)));
     }
-    getMemory() {
-        return this.memory;
-    }
 }
 
 ;// CONCATENATED MODULE: ./packages/core/pvm-host-calls/host-call-registers.ts
@@ -21159,7 +21458,7 @@ class Assign {
         // NOTE: Here we know the core index is valid
         const coreIndex = tryAsCoreIndex(Number(maybeCoreIndex));
         const decoder = decoder_Decoder.fromBlob(res);
-        const authQueue = decoder.sequenceFixLen(descriptors_codec.bytes(hash_HASH_SIZE), AUTHORIZATION_QUEUE_SIZE);
+        const authQueue = decoder.sequenceFixLen(descriptors_codec.bytes(hash_HASH_SIZE).asOpaque(), AUTHORIZATION_QUEUE_SIZE);
         const fixedSizeAuthQueue = FixedSizeArray.new(authQueue, AUTHORIZATION_QUEUE_SIZE);
         const result = this.partialState.updateAuthorizationQueue(coreIndex, fixedSizeAuthQueue, assigners);
         if (result.isOk) {
@@ -21271,6 +21570,7 @@ class Bless {
             return;
         }
         const e = updateResult.error;
+        // NOTE: `UpdatePrivilegesError.UnprivilegedService` won't happen in 0.7.1+
         if (e === UpdatePrivilegesError.UnprivilegedService) {
             logger_logger.trace `BLESS(${manager}, ${authorizers}, ${delegator}, ${registrar}, ${autoAccumulateEntries}) <- HUH`;
             regs.set(bless_IN_OUT_REG, HostCallResult.HUH);
@@ -21354,7 +21654,7 @@ class Checkpoint {
 
 
 const designate_IN_OUT_REG = 7;
-const VALIDATOR_DATA_BYTES = tryAsExactBytes(ValidatorData.Codec.sizeHint);
+const VALIDATOR_DATA_BYTES = tryAsExactBytes(validator_data_ValidatorData.Codec.sizeHint);
 /**
  * Designate a new set of validator keys.
  *
@@ -21383,7 +21683,7 @@ class Designate {
             return PvmExecution.Panic;
         }
         const decoder = decoder_Decoder.fromBlob(res);
-        const validatorsData = decoder.sequenceFixLen(ValidatorData.Codec, this.chainSpec.validatorsCount);
+        const validatorsData = decoder.sequenceFixLen(validator_data_ValidatorData.Codec, this.chainSpec.validatorsCount);
         const result = this.partialState.updateValidatorsData(tryAsPerValidator(validatorsData, this.chainSpec));
         if (result.isError) {
             logger_logger.trace `DESIGNATE([${validatorsData[0]}, ${validatorsData[1]}, ...]) <- HUH`;
@@ -22265,7 +22565,7 @@ class Lookup {
         }
         // v
         const preImage = this.account.lookup(serviceId, preImageHash);
-        logger_logger.trace `LOOKUP(${serviceId}, ${preImageHash}) <- ${preImage?.toStringTruncated()}...`;
+        logger_logger.trace `LOOKUP(${serviceId}, ${preImageHash}) <- ${preImage?.toStringTruncated() ?? "<missing>"}...`;
         const preImageLength = preImage === null ? numbers_tryAsU64(0) : numbers_tryAsU64(preImage.raw.length);
         const preimageBlobOffset = regs.get(10);
         const lengthToWrite = regs.get(11);
@@ -22815,25 +23115,25 @@ class Accumulate {
      *
      * https://graypaper.fluffylabs.dev/#/7e6ff6a/2fdb012fdb01?v=0.6.7
      */
-    async pvmAccumulateInvocation(slot, serviceId, transfers, operands, gas, entropy, inputStateUpdate) {
-        const service = this.state.getService(serviceId);
-        if (service === null) {
+    async pvmAccumulateInvocation(slot, serviceId, transfers, operands, gas, entropy, updatedState) {
+        const serviceInfo = updatedState.getServiceInfo(serviceId);
+        if (serviceInfo === null) {
             accumulate_logger.log `Service with id ${serviceId} not found.`;
-            return result_Result.error(PvmInvocationError.NoService);
+            return result_Result.error(PvmInvocationError.NoService, () => `Accumulate: service ${serviceId} not found`);
         }
-        const codeHash = service.getInfo().codeHash;
+        const codeHash = serviceInfo.codeHash;
         // TODO [ToDr] Should we check that the preimage is still available?
-        const code = service.getPreimage(codeHash.asOpaque());
+        const code = updatedState.getPreimage(serviceId, codeHash.asOpaque());
         if (code === null) {
             accumulate_logger.log `Code with hash ${codeHash} not found for service ${serviceId}.`;
-            return result_Result.error(PvmInvocationError.NoPreimage);
+            return result_Result.error(PvmInvocationError.NoPreimage, () => `Accumulate: code with hash ${codeHash} not found for service ${serviceId}`);
         }
         if (code.length > W_C) {
             accumulate_logger.log `Code with hash ${codeHash} is too long for service ${serviceId}.`;
-            return result_Result.error(PvmInvocationError.PreimageTooLong);
+            return result_Result.error(PvmInvocationError.PreimageTooLong, () => `Accumulate: code length ${code.length} exceeds max ${W_C} for service ${serviceId}`);
         }
         const nextServiceId = generateNextServiceId({ serviceId, entropy, timeslot: slot }, this.chainSpec, this.blake2b);
-        const partialState = new AccumulateExternalities(this.chainSpec, this.blake2b, new PartiallyUpdatedState(this.state, inputStateUpdate), serviceId, nextServiceId, slot);
+        const partialState = new AccumulateExternalities(this.chainSpec, this.blake2b, updatedState, serviceId, nextServiceId, slot);
         const fetchExternalities = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
             ? FetchExternalities.createForAccumulate({ entropy, transfers, operands }, this.chainSpec)
             : FetchExternalities.createForPre071Accumulate({ entropy, operands }, this.chainSpec);
@@ -22887,11 +23187,28 @@ class Accumulate {
      */
     async accumulateSingleService(serviceId, transfers, operands, gasCost, slot, entropy, inputStateUpdate) {
         accumulate_logger.log `Accumulating service ${serviceId}, transfers: ${transfers.length} operands: ${operands.length} at slot: ${slot}.`;
-        const result = await this.pvmAccumulateInvocation(slot, serviceId, transfers, operands, gasCost, entropy, inputStateUpdate);
+        const updatedState = new PartiallyUpdatedState(this.state, inputStateUpdate);
+        // update service balance from incoming transfers
+        if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
+            const serviceInfo = updatedState.getServiceInfo(serviceId);
+            if (serviceInfo !== null) {
+                // update the balance from incoming tranfsers
+                const newBalance = sumU64(serviceInfo.balance, ...transfers.map((item) => item.amount));
+                if (newBalance.overflow) {
+                    accumulate_logger.log `Accumulation failed because of overflowing balance ${serviceId}.`;
+                    return { stateUpdate: null, consumedGas: 0n };
+                }
+                const newInfo = ServiceAccountInfo.create({ ...serviceInfo, balance: newBalance.value });
+                updatedState.updateServiceInfo(serviceId, newInfo);
+            }
+        }
+        const result = await this.pvmAccumulateInvocation(slot, serviceId, transfers, operands, gasCost, entropy, updatedState);
         if (result.isError) {
-            // https://graypaper.fluffylabs.dev/#/7e6ff6a/2fb6012fb601?v=0.6.7
+            // https://graypaper.fluffylabs.dev/#/ab2cdbd/2fc9032fc903?v=0.7.2
             accumulate_logger.log `Accumulation failed for ${serviceId}.`;
-            return { stateUpdate: null, consumedGas: 0n };
+            // even though accumulation failed, we still need to make sure that
+            // incoming transfers updated the balance, hence we pass state update here
+            return { stateUpdate: updatedState.stateUpdate, consumedGas: 0n };
         }
         accumulate_logger.log `Accumulation successful for ${serviceId}. Consumed: ${result.ok.consumedGas}`;
         return result.ok;
@@ -22949,7 +23266,7 @@ class Accumulate {
         const accumulateData = new AccumulateData(reportsToAccumulateInParallel, transfers, autoAccumulateServices);
         const reportsToAccumulateSequentially = reports.subview(i);
         const { gasCost, state: stateAfterParallelAcc, ...rest } = await this.accumulateInParallel(accumulateData, slot, entropy, statistics, stateUpdate);
-        const newTransfers = stateAfterParallelAcc.transfers;
+        const newTransfers = stateAfterParallelAcc.takeTransfers();
         assertEmpty(rest);
         // NOTE [ToDr] recursive invocation
         const { accumulatedReports, gasCost: seqGasCost, state, ...seqRest } = await this.accumulateSequentially(tryAsServiceGas(gasLimit - gasCost), reportsToAccumulateSequentially, newTransfers, slot, entropy, statistics, stateAfterParallelAcc, []);
@@ -22977,12 +23294,19 @@ class Accumulate {
         const currentManager = (inputStateUpdate.privilegedServices ?? this.state.privilegedServices).manager;
         for (const serviceId of serviceIds) {
             const checkpoint = AccumulationStateUpdate.copyFrom(currentState);
-            const { consumedGas, stateUpdate } = await this.accumulateSingleService(serviceId, accumulateData.getTransfers(serviceId), accumulateData.getOperands(serviceId), accumulateData.getGasCost(serviceId), slot, entropy, currentState);
+            const operands = accumulateData.getOperands(serviceId);
+            const { consumedGas, stateUpdate } = await this.accumulateSingleService(serviceId, accumulateData.getTransfers(serviceId), operands, accumulateData.getGasCost(serviceId), slot, entropy, currentState);
             gasCost = tryAsServiceGas(gasCost + consumedGas);
+            // https://graypaper.fluffylabs.dev/#/ab2cdbd/193b05193b05?v=0.7.2
             const serviceStatistics = statistics.get(serviceId) ?? { count: numbers_tryAsU32(0), gasUsed: tryAsServiceGas(0) };
-            serviceStatistics.count = numbers_tryAsU32(serviceStatistics.count + accumulateData.getReportsLength(serviceId));
-            serviceStatistics.gasUsed = tryAsServiceGas(serviceStatistics.gasUsed + consumedGas);
-            statistics.set(serviceId, serviceStatistics);
+            const count = accumulateData.getReportsLength(serviceId);
+            // [0.7.1]: do not update statistics, if the service only had incoming transfers
+            if ((Compatibility.isLessThan(GpVersion.V0_7_2) && count > 0) ||
+                (Compatibility.isGreaterOrEqual(GpVersion.V0_7_2) && (count > 0 || consumedGas > 0n))) {
+                serviceStatistics.count = numbers_tryAsU32(serviceStatistics.count + count);
+                serviceStatistics.gasUsed = tryAsServiceGas(serviceStatistics.gasUsed + consumedGas);
+                statistics.set(serviceId, serviceStatistics);
+            }
             currentState = stateUpdate === null ? checkpoint : stateUpdate;
             if (Compatibility.is(GpVersion.V0_7_0) && serviceId === currentManager) {
                 const newV = currentState.privilegedServices?.delegator;
@@ -23017,9 +23341,10 @@ class Accumulate {
         const recentlyAccumulated = tryAsPerEpochBlock(newRecentlyAccumulated, this.chainSpec);
         const accumulationQueue = this.state.accumulationQueue.slice();
         accumulationQueue[phaseIndex] = pruneQueue(toAccumulateLater, accumulatedSet);
+        const timeslot = this.state.timeslot;
         for (let i = 1; i < epochLength; i++) {
             const queueIndex = (phaseIndex + epochLength - i) % epochLength;
-            if (i < slot - this.state.timeslot) {
+            if (i < slot - timeslot) {
                 accumulationQueue[queueIndex] = [];
             }
             else {
@@ -23034,6 +23359,7 @@ class Accumulate {
             const info = partialStateUpdate.getServiceInfo(serviceId);
             if (info === null) {
                 // NOTE If there is no service, we dont update it.
+                accumulate_logger.log `Skipping update of ${serviceId}, because we have no service info.`;
                 continue;
             }
             // δ‡
@@ -23059,19 +23385,16 @@ class Accumulate {
         const gasLimit = tryAsServiceGas(this.chainSpec.maxBlockGas > calculatedGasLimit ? this.chainSpec.maxBlockGas : calculatedGasLimit);
         return tryAsServiceGas(gasLimit);
     }
-    hasDuplicatedServicesCreated(updateServices) {
-        const createdServiceIds = new Set();
-        for (const update of updateServices) {
-            if (update.action.kind === UpdateServiceKind.Create) {
-                const serviceId = update.serviceId;
-                if (createdServiceIds.has(serviceId)) {
-                    accumulate_logger.log `Duplicated Service creation detected ${serviceId}. Block is invalid.`;
-                    return true;
-                }
-                createdServiceIds.add(serviceId);
-            }
-        }
-        return false;
+    /**
+     * Detects the very unlikely situation where multiple services are created with the same ID.
+     *
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/30f20330f403?v=0.7.2
+     *
+     * NOTE: This is public only for testing purposes and should not be used outside of accumulation.
+     */
+    hasDuplicatedServiceIdCreated(createdIds) {
+        const uniqueIds = new Set(createdIds);
+        return uniqueIds.size !== createdIds.length;
     }
     async transition({ reports, slot, entropy }) {
         const statistics = new Map();
@@ -23093,8 +23416,9 @@ class Accumulate {
         const accumulated = accumulatableReports.subview(0, accumulatedReports);
         const { services, yieldedRoots, transfers, validatorsData, privilegedServices, authorizationQueues, ...stateUpdateRest } = state;
         assertEmpty(stateUpdateRest);
-        if (this.hasDuplicatedServicesCreated(services.servicesUpdates)) {
-            return result_Result.error(ACCUMULATION_ERROR);
+        if (this.hasDuplicatedServiceIdCreated(services.created)) {
+            accumulate_logger.trace `Duplicated Service creation detected. Block is invalid.`;
+            return result_Result.error(ACCUMULATION_ERROR, () => "Accumulate: duplicate service created");
         }
         const accStateUpdate = this.getAccumulationStateUpdate(accumulated.toArray(), toAccumulateLater, slot, Array.from(statistics.keys()), services);
         const accumulationOutputUnsorted = Array.from(yieldedRoots.entries()).map(([serviceId, root]) => {
@@ -23175,13 +23499,13 @@ class DeferredTransfers {
                 .toSorted((a, b) => a.source - b.source);
             const info = partiallyUpdatedState.getServiceInfo(serviceId);
             if (info === null) {
-                return result_Result.error(DeferredTransfersErrorCode.ServiceInfoNotExist);
+                return result_Result.error(DeferredTransfersErrorCode.ServiceInfoNotExist, () => `Deferred transfers: service info not found for ${serviceId}`);
             }
             const codeHash = info.codeHash;
             const code = partiallyUpdatedState.getPreimage(serviceId, codeHash.asOpaque());
             const newBalance = sumU64(info.balance, ...transfers.map((item) => item.amount));
             if (newBalance.overflow) {
-                return result_Result.error(DeferredTransfersErrorCode.ServiceBalanceOverflow);
+                return result_Result.error(DeferredTransfersErrorCode.ServiceBalanceOverflow, () => `Deferred transfers: balance overflow for service ${serviceId}`);
             }
             const newInfo = ServiceAccountInfo.create({ ...info, balance: newBalance.value });
             partiallyUpdatedState.updateServiceInfo(serviceId, newInfo);
@@ -23230,7 +23554,6 @@ class DeferredTransfers {
 
 
 
-
 /**
  * Maintain a list of available authorizations per core.
  *
@@ -23259,11 +23582,12 @@ class Authorization {
      */
     transition(input) {
         const authPoolsUpdate = this.state.authPools.slice();
+        const authQueues = this.state.authQueues;
         // we transition authorizations for each core.
         for (let coreIndex = tryAsCoreIndex(0); coreIndex < this.chainSpec.coresCount; coreIndex++) {
             let pool = authPoolsUpdate[coreIndex].slice();
             // the queue is only read (we should most likely use `ArrayView` here).
-            const queue = this.state.authQueues[coreIndex];
+            const queue = authQueues[coreIndex];
             // if there were any used hashes - remove them
             const usedHashes = input.used.get(coreIndex);
             if (usedHashes !== undefined) {
@@ -23437,14 +23761,18 @@ class RecentHistory {
      * https://graypaper.fluffylabs.dev/#/1c979cb/0f55020f5502?v=0.7.1
      */
     partialTransition(input) {
-        const recentBlocks = this.state.recentBlocks.blocks.slice();
+        const stateBlocks = this.state.recentBlocks;
+        const recentBlocks = stateBlocks.blocks.slice();
         const lastState = recentBlocks.length > 0 ? recentBlocks[recentBlocks.length - 1] : null;
         // update the posterior root of previous state.
         if (lastState !== null) {
             lastState.postStateRoot = input.priorStateRoot;
         }
         return {
-            recentBlocks: this.state.recentBlocks.updateBlocks(recentBlocks), // β_H†
+            recentBlocks: RecentBlocks.create({
+                blocks: sized_array_asKnownSize(recentBlocks),
+                accumulationLog: stateBlocks.accumulationLog,
+            }), // β_H†
         };
     }
     /**
@@ -23456,8 +23784,8 @@ class RecentHistory {
     transition(input) {
         const recentBlocks = input.partial.recentBlocks.blocks.slice();
         // `β′_B`
-        const mmr = this.state.recentBlocks.asCurrent().accumulationLog !== null
-            ? MerkleMountainRange.fromPeaks(this.hasher, this.state.recentBlocks.asCurrent().accumulationLog)
+        const mmr = this.state.recentBlocks.accumulationLog !== null
+            ? MerkleMountainRange.fromPeaks(this.hasher, this.state.recentBlocks.accumulationLog)
             : MerkleMountainRange.empty(this.hasher);
         // append the accumulation root
         mmr.append(input.accumulateRoot);
@@ -23475,7 +23803,7 @@ class RecentHistory {
         }
         // write back to the state.
         return {
-            recentBlocks: RecentBlocksHistory.create(RecentBlocks.create({
+            recentBlocks: RecentBlocks.create(RecentBlocks.create({
                 blocks: sized_array_asKnownSize(recentBlocks),
                 accumulationLog: peaks,
             })),
@@ -23655,7 +23983,7 @@ function verifyReportsBasic(input) {
         const noOfPrerequisites = reportView.context.view().prerequisites.view().length;
         const noOfSegmentRootLookups = reportView.segmentRootLookup.view().length;
         if (noOfPrerequisites + noOfSegmentRootLookups > MAX_REPORT_DEPENDENCIES) {
-            return result_Result.error(ReportsError.TooManyDependencies, `Report at ${reportView.coreIndex.materialize()} has too many dependencies. Got ${noOfPrerequisites} + ${noOfSegmentRootLookups}, max: ${MAX_REPORT_DEPENDENCIES}`);
+            return result_Result.error(ReportsError.TooManyDependencies, () => `Report at ${reportView.coreIndex.materialize()} has too many dependencies. Got ${noOfPrerequisites} + ${noOfSegmentRootLookups}, max: ${MAX_REPORT_DEPENDENCIES}`);
         }
         /**
          * In order to ensure fair use of a block’s extrinsic space,
@@ -23674,7 +24002,7 @@ function verifyReportsBasic(input) {
             totalOutputsSize += item.view().result.view().okBlob?.raw.length ?? 0;
         }
         if (authOutputSize + totalOutputsSize > MAX_WORK_REPORT_SIZE_BYTES) {
-            return result_Result.error(ReportsError.WorkReportTooBig, `Work report at ${reportView.coreIndex.materialize()} too big. Got ${authOutputSize} + ${totalOutputsSize}, max: ${MAX_WORK_REPORT_SIZE_BYTES}`);
+            return result_Result.error(ReportsError.WorkReportTooBig, () => `Work report at ${reportView.coreIndex.materialize()} too big. Got ${authOutputSize} + ${totalOutputsSize}, max: ${MAX_WORK_REPORT_SIZE_BYTES}`);
         }
     }
     return result_Result.ok(result_OK);
@@ -23687,7 +24015,6 @@ function verifyReportsBasic(input) {
 
 
 
-
 const verify_contextual_logger = Logger.new(import.meta.filename, "stf:reports");
 /** https://graypaper.fluffylabs.dev/#/7e6ff6a/15eb0115eb01?v=0.6.7 */
 function verifyContextualValidity(input, state, headerChain, maxLookupAnchorAge) {
@@ -23709,12 +24036,12 @@ function verifyContextualValidity(input, state, headerChain, maxLookupAnchorAge)
         for (const result of guarantee.report.results) {
             const service = state.getService(result.serviceId);
             if (service === null) {
-                return result_Result.error(ReportsError.BadServiceId, `No service with id: ${result.serviceId}`);
+                return result_Result.error(ReportsError.BadServiceId, () => `No service with id: ${result.serviceId}`);
             }
             // check service code hash
             // https://graypaper.fluffylabs.dev/#/5f542d7/154b02154b02
             if (!result.codeHash.isEqualTo(service.getInfo().codeHash)) {
-                return result_Result.error(ReportsError.BadCodeHash, `Service (${result.serviceId}) code hash mismatch. Got: ${result.codeHash}, expected: ${service.getInfo().codeHash}`);
+                return result_Result.error(ReportsError.BadCodeHash, () => `Service (${result.serviceId}) code hash mismatch. Got: ${result.codeHash}, expected: ${service.getInfo().codeHash}`);
             }
         }
     }
@@ -23725,7 +24052,7 @@ function verifyContextualValidity(input, state, headerChain, maxLookupAnchorAge)
      * https://graypaper.fluffylabs.dev/#/5f542d7/151f01152101
      */
     if (currentWorkPackages.size !== input.guarantees.length) {
-        return result_Result.error(ReportsError.DuplicatePackage, "Duplicate work package detected.");
+        return result_Result.error(ReportsError.DuplicatePackage, () => "Duplicate work package detected.");
     }
     const minLookupSlot = Math.max(0, input.slot - maxLookupAnchorAge);
     const contextResult = verifyRefineContexts(minLookupSlot, contexts, input.recentBlocksPartialUpdate, headerChain);
@@ -23770,7 +24097,7 @@ function verifyContextualValidity(input, state, headerChain, maxLookupAnchorAge)
                         : undefined;
             }
             if (root === undefined || !root.segmentTreeRoot.isEqualTo(lookup.segmentTreeRoot)) {
-                return result_Result.error(ReportsError.SegmentRootLookupInvalid, `Mismatching segment tree root for package ${lookup.workPackageHash}. Got: ${lookup.segmentTreeRoot}, expected: ${root?.segmentTreeRoot}`);
+                return result_Result.error(ReportsError.SegmentRootLookupInvalid, () => `Mismatching segment tree root for package ${lookup.workPackageHash}. Got: ${lookup.segmentTreeRoot}, expected: ${root?.segmentTreeRoot}`);
             }
         }
     }
@@ -23793,16 +24120,16 @@ function verifyRefineContexts(minLookupSlot, contexts, recentBlocksPartialUpdate
          */
         const recentBlock = recentBlocks.get(context.anchor);
         if (recentBlock === undefined) {
-            return result_Result.error(ReportsError.AnchorNotRecent, `Anchor block ${context.anchor} not found in recent blocks.`);
+            return result_Result.error(ReportsError.AnchorNotRecent, () => `Anchor block ${context.anchor} not found in recent blocks.`);
         }
         // check state root
         if (!recentBlock.postStateRoot.isEqualTo(context.stateRoot)) {
-            return result_Result.error(ReportsError.BadStateRoot, `Anchor state root mismatch. Got: ${context.stateRoot}, expected: ${recentBlock.postStateRoot}.`);
+            return result_Result.error(ReportsError.BadStateRoot, () => `Anchor state root mismatch. Got: ${context.stateRoot}, expected: ${recentBlock.postStateRoot}.`);
         }
         // check beefy root
-        const beefyRoot = RecentBlocksHistory.accumulationResult(recentBlock);
+        const beefyRoot = recentBlock.accumulationResult;
         if (!beefyRoot.isEqualTo(context.beefyRoot)) {
-            return result_Result.error(ReportsError.BadBeefyMmrRoot, `Invalid BEEFY super peak hash. Got: ${context.beefyRoot}, expected: ${beefyRoot}. Anchor: ${recentBlock.headerHash}`);
+            return result_Result.error(ReportsError.BadBeefyMmrRoot, () => `Invalid BEEFY super peak hash. Got: ${context.beefyRoot}, expected: ${beefyRoot}. Anchor: ${recentBlock.headerHash}`);
         }
         /**
          * We require that each lookup-anchor block be within the
@@ -23811,7 +24138,7 @@ function verifyRefineContexts(minLookupSlot, contexts, recentBlocksPartialUpdate
          * https://graypaper.fluffylabs.dev/#/5f542d7/154601154701
          */
         if (context.lookupAnchorSlot < minLookupSlot) {
-            return result_Result.error(ReportsError.SegmentRootLookupInvalid, `Lookup anchor slot's too old. Got: ${context.lookupAnchorSlot}, minimal: ${minLookupSlot}`);
+            return result_Result.error(ReportsError.SegmentRootLookupInvalid, () => `Lookup anchor slot's too old. Got: ${context.lookupAnchorSlot}, minimal: ${minLookupSlot}`);
         }
         /**
          * We also require that we have a record of it; this is one of
@@ -23828,7 +24155,7 @@ function verifyRefineContexts(minLookupSlot, contexts, recentBlocksPartialUpdate
                 verify_contextual_logger.warn `Lookup anchor check for ${context.lookupAnchor} would fail, but override is active.`;
             }
             else {
-                return result_Result.error(ReportsError.SegmentRootLookupInvalid, `Lookup anchor is not found in chain. Hash: ${context.lookupAnchor} (slot: ${context.lookupAnchorSlot})`);
+                return result_Result.error(ReportsError.SegmentRootLookupInvalid, () => `Lookup anchor is not found in chain. Hash: ${context.lookupAnchor} (slot: ${context.lookupAnchorSlot})`);
             }
         }
     }
@@ -23851,7 +24178,7 @@ function verifyDependencies({ currentWorkPackages, recentlyReported, prerequisit
             if (recentlyReported.has(preReqHash)) {
                 continue;
             }
-            return result_Result.error(isSegmentRoot ? ReportsError.SegmentRootLookupInvalid : ReportsError.DependencyMissing, `Missing work package ${preReqHash} in current extrinsic or recent history.`);
+            return result_Result.error(isSegmentRoot ? ReportsError.SegmentRootLookupInvalid : ReportsError.DependencyMissing, () => `Missing work package ${preReqHash} in current extrinsic or recent history.`);
         }
         return result_Result.ok(result_OK);
     };
@@ -23899,7 +24226,7 @@ function verifyWorkPackagesUniqueness(workPackageHashes, state) {
     // let's check if any of our packages is in the pipeline
     const intersection = packagesInPipeline.intersection(workPackageHashes);
     for (const packageHash of intersection) {
-        return result_Result.error(ReportsError.DuplicatePackage, `The same work package hash found in the pipeline (workPackageHash: ${packageHash})`);
+        return result_Result.error(ReportsError.DuplicatePackage, () => `The same work package hash found in the pipeline (workPackageHash: ${packageHash})`);
     }
     return result_Result.ok(result_OK);
 }
@@ -23938,7 +24265,7 @@ workReportHashes, slot, getGuarantorAssignment) {
         const credentialsView = guaranteeView.credentials.view();
         if (credentialsView.length < REQUIRED_CREDENTIALS_RANGE[0] ||
             credentialsView.length > REQUIRED_CREDENTIALS_RANGE[1]) {
-            return result_Result.error(ReportsError.InsufficientGuarantees, `Invalid number of credentials. Expected ${REQUIRED_CREDENTIALS_RANGE}, got ${credentialsView.length}`);
+            return result_Result.error(ReportsError.InsufficientGuarantees, () => `Invalid number of credentials. Expected ${REQUIRED_CREDENTIALS_RANGE}, got ${credentialsView.length}`);
         }
         /** Retrieve current core assignment. */
         const timeSlot = guaranteeView.slot.materialize();
@@ -23953,20 +24280,20 @@ workReportHashes, slot, getGuarantorAssignment) {
             const credentialView = credential.view();
             const validatorIndex = credentialView.validatorIndex.materialize();
             if (lastValidatorIndex >= validatorIndex) {
-                return result_Result.error(ReportsError.NotSortedOrUniqueGuarantors, `Credentials must be sorted by validator index. Got ${validatorIndex}, expected at least ${lastValidatorIndex + 1}`);
+                return result_Result.error(ReportsError.NotSortedOrUniqueGuarantors, () => `Credentials must be sorted by validator index. Got ${validatorIndex}, expected at least ${lastValidatorIndex + 1}`);
             }
             lastValidatorIndex = validatorIndex;
             const signature = credentialView.signature.materialize();
             const guarantorData = guarantorAssignments[validatorIndex];
             if (guarantorData === undefined) {
-                return result_Result.error(ReportsError.BadValidatorIndex, `Invalid validator index: ${validatorIndex}`);
+                return result_Result.error(ReportsError.BadValidatorIndex, () => `Invalid validator index: ${validatorIndex}`);
             }
             /**
              * Verify core assignment.
              * https://graypaper.fluffylabs.dev/#/5f542d7/14e40214e602
              */
             if (guarantorData.core !== coreIndex) {
-                return result_Result.error(ReportsError.WrongAssignment, `Invalid core assignment for validator ${validatorIndex}. Expected: ${guarantorData.core}, got: ${coreIndex}`);
+                return result_Result.error(ReportsError.WrongAssignment, () => `Invalid core assignment for validator ${validatorIndex}. Expected: ${guarantorData.core}, got: ${coreIndex}`);
             }
             signaturesToVerify.push({
                 signature,
@@ -24004,10 +24331,10 @@ function verifyReportsOrder(input, chainSpec) {
         const reportView = guarantee.view().report.view();
         const coreIndex = reportView.coreIndex.materialize();
         if (lastCoreIndex >= coreIndex) {
-            return result_Result.error(ReportsError.OutOfOrderGuarantee, `Core indices of work reports are not unique or in order. Got: ${coreIndex}, expected at least: ${lastCoreIndex + 1}`);
+            return result_Result.error(ReportsError.OutOfOrderGuarantee, () => `Core indices of work reports are not unique or in order. Got: ${coreIndex}, expected at least: ${lastCoreIndex + 1}`);
         }
         if (coreIndex >= noOfCores) {
-            return result_Result.error(ReportsError.BadCoreIndex, `Invalid core index. Got: ${coreIndex}, max: ${noOfCores}`);
+            return result_Result.error(ReportsError.BadCoreIndex, () => `Invalid core index. Got: ${coreIndex}, max: ${noOfCores}`);
         }
         lastCoreIndex = coreIndex;
     }
@@ -24032,7 +24359,7 @@ function verifyPostSignatureChecks(input, availabilityAssignment, authPools, ser
          * https://graypaper.fluffylabs.dev/#/5f542d7/15ea0015ea00
          */
         if (availabilityAssignment[coreIndex] !== null) {
-            return result_Result.error(ReportsError.CoreEngaged, `Report pending availability at core: ${coreIndex}`);
+            return result_Result.error(ReportsError.CoreEngaged, () => `Report pending availability at core: ${coreIndex}`);
         }
         /**
          * A report is valid only if the authorizer hash is present
@@ -24042,9 +24369,10 @@ function verifyPostSignatureChecks(input, availabilityAssignment, authPools, ser
          * https://graypaper.fluffylabs.dev/#/5f542d7/15eb0015ed00
          */
         const authorizerHash = report.authorizerHash;
-        const authorizerPool = authPools[coreIndex];
-        if (authorizerPool.find((hash) => hash.isEqualTo(authorizerHash)) === undefined) {
-            return result_Result.error(ReportsError.CoreUnauthorized, `Authorizer hash not found in the pool of core ${coreIndex}: ${authorizerHash}`);
+        const authorizerPool = authPools.get(coreIndex);
+        const pool = authorizerPool?.materialize() ?? [];
+        if (pool.find((hash) => hash.isEqualTo(authorizerHash)) === undefined) {
+            return result_Result.error(ReportsError.CoreUnauthorized, () => `Authorizer hash not found in the pool of core ${coreIndex}: ${authorizerHash}`);
         }
         /**
          * We require that the gas allotted for accumulation of each
@@ -24056,17 +24384,17 @@ function verifyPostSignatureChecks(input, availabilityAssignment, authPools, ser
         for (const result of report.results) {
             const service = services(result.serviceId);
             if (service === null) {
-                return result_Result.error(ReportsError.BadServiceId, `No service with id: ${result.serviceId}`);
+                return result_Result.error(ReportsError.BadServiceId, () => `No service with id: ${result.serviceId}`);
             }
             const info = service.getInfo();
             // check minimal accumulation gas
             if (result.gas < info.accumulateMinGas) {
-                return result_Result.error(ReportsError.ServiceItemGasTooLow, `Service (${result.serviceId}) gas is less than minimal. Got: ${result.gas}, expected at least: ${info.accumulateMinGas}`);
+                return result_Result.error(ReportsError.ServiceItemGasTooLow, () => `Service (${result.serviceId}) gas is less than minimal. Got: ${result.gas}, expected at least: ${info.accumulateMinGas}`);
             }
         }
         const totalGas = sumU64(...report.results.map((x) => x.gas));
         if (totalGas.overflow || totalGas.value > G_A) {
-            return result_Result.error(ReportsError.WorkReportGasTooHigh, `Total gas too high. Got: ${totalGas.value} (ovfl: ${totalGas.overflow}), maximal: ${G_A}`);
+            return result_Result.error(ReportsError.WorkReportGasTooHigh, () => `Total gas too high. Got: ${totalGas.value} (ovfl: ${totalGas.overflow}), maximal: ${G_A}`);
         }
     }
     return result_Result.ok(result_OK);
@@ -24152,7 +24480,7 @@ class Reports {
         }
         const reporters = SortedSet.fromArray(bytesBlobComparator, signaturesToVerify.ok.map((x) => x.key)).slice();
         if (hasAnyOffenders(reporters, input.offenders)) {
-            return result_Result.error(ReportsError.BannedValidator);
+            return result_Result.error(ReportsError.BannedValidator, () => "One or more reporters are banned validators");
         }
         return result_Result.ok({
             stateUpdate: {
@@ -24173,7 +24501,8 @@ class Reports {
         return verifyCredentials(input.guarantees, workReportHashes, input.slot, (headerTimeSlot, guaranteeTimeSlot) => this.getGuarantorAssignment(headerTimeSlot, guaranteeTimeSlot, input.newEntropy));
     }
     verifyPostSignatureChecks(input, assurancesAvailAssignment) {
-        return verifyPostSignatureChecks(input, assurancesAvailAssignment, this.state.authPools, (id) => this.state.getService(id));
+        const authPoolsView = this.state.view().authPoolsView();
+        return verifyPostSignatureChecks(input, assurancesAvailAssignment, authPoolsView, (id) => this.state.getService(id));
     }
     verifyContextualValidity(input) {
         return verifyContextualValidity(input, this.state, this.headerChain, this.chainSpec.maxLookupAnchorAge);
@@ -24191,7 +24520,7 @@ class Reports {
             return signaturesToVerify[idx].key;
         })
             .filter((x) => x !== null);
-        return result_Result.error(ReportsError.BadSignature, `Invalid signatures for validators with keys: ${invalidKeys.join(", ")}`);
+        return result_Result.error(ReportsError.BadSignature, () => `Invalid signatures for validators with keys: ${invalidKeys.join(", ")}`);
     }
     /**
      * Get the guarantor assignment (both core and validator data)
@@ -24207,10 +24536,10 @@ class Reports {
         const minTimeSlot = Math.max(0, headerRotation - 1) * rotationPeriod;
         // https://graypaper.fluffylabs.dev/#/5f542d7/155e00156900
         if (guaranteeTimeSlot > headerTimeSlot) {
-            return result_Result.error(ReportsError.FutureReportSlot, `Report slot is in future. Block ${headerTimeSlot}, Report: ${guaranteeTimeSlot}`);
+            return result_Result.error(ReportsError.FutureReportSlot, () => `Report slot is in future. Block ${headerTimeSlot}, Report: ${guaranteeTimeSlot}`);
         }
         if (guaranteeTimeSlot < minTimeSlot) {
-            return result_Result.error(ReportsError.ReportEpochBeforeLast, `Report slot is too old. Block ${headerTimeSlot}, Report: ${guaranteeTimeSlot}`);
+            return result_Result.error(ReportsError.ReportEpochBeforeLast, () => `Report slot is too old. Block ${headerTimeSlot}, Report: ${guaranteeTimeSlot}`);
         }
         // TODO [ToDr] [opti] below code needs cache.
         // The `G` and `G*` sets should only be computed once per rotation.
@@ -24746,6 +25075,9 @@ class OnChain {
             servicesUpdate = servicesUpdateFromDeferredTransfers;
             assertEmpty(deferredTransfersRest);
         }
+        else {
+            debug_check `${pendingTransfers.length === 0} All transfers should be already accumulated.`;
+        }
         const accumulateRoot = await this.accumulateOutput.transition({ accumulationOutputLog });
         // recent history
         const recentHistoryUpdate = this.recentHistory.transition({
@@ -24775,6 +25107,16 @@ class OnChain {
         });
         const { statistics, ...statisticsRest } = statisticsUpdate;
         assertEmpty(statisticsRest);
+        // Concat accumulatePreimages updates with preimages
+        for (const [serviceId, accPreimageUpdates] of accumulatePreimages.entries()) {
+            const preimagesUpdates = preimages.get(serviceId);
+            if (preimagesUpdates === undefined) {
+                preimages.set(serviceId, accPreimageUpdates);
+            }
+            else {
+                preimages.set(serviceId, preimagesUpdates.concat(accPreimageUpdates));
+            }
+        }
         return result_Result.ok({
             ...(maybeAuthorizationQueues !== undefined ? { authQueues: maybeAuthorizationQueues } : {}),
             ...(maybeDesignatedValidatorData !== undefined ? { designatedValidatorData: maybeDesignatedValidatorData } : {}),
@@ -24796,7 +25138,7 @@ class OnChain {
             recentlyAccumulated,
             accumulationOutputLog,
             ...servicesUpdate,
-            preimages: preimages.concat(accumulatePreimages),
+            preimages,
         });
     }
     getUsedAuthorizerHashes(guarantees) {
@@ -24813,11 +25155,11 @@ class OnChain {
 }
 function checkOffendersMatch(offendersMark, headerOffendersMark) {
     if (offendersMark.size !== headerOffendersMark.length) {
-        return result_Result.error(OFFENDERS_ERROR, `Length mismatch: ${offendersMark.size} vs ${headerOffendersMark.length}`);
+        return result_Result.error(OFFENDERS_ERROR, () => `Length mismatch: ${offendersMark.size} vs ${headerOffendersMark.length}`);
     }
     for (const key of headerOffendersMark) {
         if (!offendersMark.has(key)) {
-            return result_Result.error(OFFENDERS_ERROR, `Missing key: ${key}`);
+            return result_Result.error(OFFENDERS_ERROR, () => `Missing key: ${key}`);
         }
     }
     return result_Result.ok(result_OK);
@@ -24899,7 +25241,7 @@ class Importer {
         if (!this.currentHash.isEqualTo(parentHash)) {
             const state = this.states.getState(parentHash);
             if (state === null) {
-                const e = result_Result.error(BlockVerifierError.StateRootNotFound);
+                const e = result_Result.error(BlockVerifierError.StateRootNotFound, () => `State not found for parent block ${parentHash}`);
                 if (!e.isError) {
                     throw new Error("unreachable, just adding to make compiler happy");
                 }
@@ -25095,7 +25437,7 @@ const importBlockResultCodec = descriptors_codec.custom({
     }
     if (kind === 1) {
         const error = d.bytesBlob();
-        return result_Result.error(error.asText());
+        return result_Result.error(error.asText(), () => error.asText());
     }
     throw new Error(`Invalid Result: ${kind}`);
 }, (s) => {
@@ -25146,7 +25488,7 @@ class MainReady extends State {
         if (res instanceof Uint8Array) {
             return decoder_Decoder.decodeObject(importBlockResultCodec, res);
         }
-        return result_Result.error("Invalid worker response.");
+        return result_Result.error("Invalid worker response.", () => "Invalid worker response: expected Uint8Array");
     }
     async getStateEntries(port, hash) {
         const res = await port.sendRequest("getStateEntries", hash, [hash.buffer]);
@@ -25258,13 +25600,13 @@ class ImporterReady extends State {
                     response = result_Result.ok(this.importer.getBestStateRootHash() ?? ZERO_HASH.asOpaque());
                 }
                 else {
-                    response = result_Result.error(resultToString(res));
+                    response = result_Result.error(resultToString(res), () => resultToString(res));
                 }
             }
             catch (e) {
                 state_machine_logger.error `Failed to import block: ${e}`;
                 state_machine_logger.error `${e instanceof Error ? e.stack : ""}`;
-                response = result_Result.error(`${e}`);
+                response = result_Result.error(`${e}`, () => `${e}`);
             }
             const encoded = encoder_Encoder.encodeObject(importBlockResultCodec, response);
             return {