@typeberry/lib 0.0.1-5e4911c → 0.0.1-61e63ec

package/index.js

@@ -68,8 +68,6 @@ var index$s = /*#__PURE__*/Object.freeze({
 
 var GpVersion;
 (function (GpVersion) {
-    GpVersion["V0_6_5"] = "0.6.5";
-    GpVersion["V0_6_6"] = "0.6.6";
     GpVersion["V0_6_7"] = "0.6.7";
     GpVersion["V0_7_0"] = "0.7.0-preview";
     GpVersion["V0_7_1"] = "0.7.1-preview";
@@ -80,13 +78,7 @@ var TestSuite;
     TestSuite["JAMDUNA"] = "jamduna";
 })(TestSuite || (TestSuite = {}));
 const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
-const ALL_VERSIONS_IN_ORDER = [
-    GpVersion.V0_6_5,
-    GpVersion.V0_6_6,
-    GpVersion.V0_6_7,
-    GpVersion.V0_7_0,
-    GpVersion.V0_7_1,
-];
+const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1];
 const env = typeof process === "undefined" ? {} : process.env;
 const DEFAULT_VERSION = GpVersion.V0_6_7;
 let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
@@ -1847,6 +1839,73 @@ class Skipper {
     }
 }
 
+/**
+ * Type descriptor definition.
+ *
+ * The type descriptor can encode & decode given type `T`, but
+ * also have a `name` and a byte-size hint.
+ *
+ * Descriptors can be composed to form more complex typings.
+ */
+class Descriptor {
+    name;
+    sizeHint;
+    encode;
+    decode;
+    skip;
+    /** A "lightweight" version of the object. */
+    View;
+    /** New descriptor with specialized `View`. */
+    static withView(name, sizeHint, encode, decode, skip, view) {
+        return new Descriptor(name, sizeHint, encode, decode, skip, view);
+    }
+    /** Create a new descriptor without a specialized `View`. */
+    static new(name, sizeHint, encode, decode, skip) {
+        return new Descriptor(name, sizeHint, encode, decode, skip, null);
+    }
+    constructor(
+    /** Descriptive name of the coded data. */
+    name, 
+    /** A byte size hint for encoded data. */
+    sizeHint, 
+    /** Encoding function. */
+    encode, 
+    /** Decoding function. */
+    decode, 
+    /** Skipping function. */
+    skip, 
+    /** view object. It can be `null` iff T===V. */
+    view) {
+        this.name = name;
+        this.sizeHint = sizeHint;
+        this.encode = encode;
+        this.decode = decode;
+        this.skip = skip;
+        // We cast here to make sure that the field is always set.
+        this.View = view ?? this;
+    }
+    /**
+     * Extract an encoded version of this type from the decoder.
+     *
+     * This function skips the object instead of decoding it,
+     * allowing to retrieve the encoded portion of the object from `Decoder`.
+     */
+    skipEncoded(decoder) {
+        const initBytes = decoder.bytesRead();
+        this.skip(new Skipper(decoder));
+        const endBytes = decoder.bytesRead();
+        return BytesBlob.blobFrom(decoder.source.subarray(initBytes, endBytes));
+    }
+    /** Return a new descriptor that converts data into some other type. */
+    convert(input, output) {
+        return new Descriptor(this.name, this.sizeHint, (e, elem) => this.encode(e, input(elem)), (d) => output(this.decode(d)), this.skip, this.View);
+    }
+    /** Safely cast the descriptor value to a opaque type. */
+    asOpaque() {
+        return this.convert((i) => seeThrough(i), (o) => asOpaqueType(o));
+    }
+}
+
 /** Validate that given sequence length is within expected range. */
 function validateLength(range, length, context) {
     if (length < range.minLength) {
@@ -2078,72 +2137,6 @@ const TYPICAL_SEQUENCE_LENGTH = 64;
  * TODO [ToDr] [opti] This value should be updated when we run some real-data bechmarks.
  */
 const TYPICAL_DICTIONARY_LENGTH = 32;
-/**
- * Type descriptor definition.
- *
- * The type descriptor can encode & decode given type `T`, but
- * also have a `name` and a byte-size hint.
- *
- * Descriptors can be composed to form more complex typings.
- */
-class Descriptor {
-    name;
-    sizeHint;
-    encode;
-    decode;
-    skip;
-    /** A "lightweight" version of the object. */
-    View;
-    /** New descriptor with specialized `View`. */
-    static withView(name, sizeHint, encode, decode, skip, view) {
-        return new Descriptor(name, sizeHint, encode, decode, skip, view);
-    }
-    /** Create a new descriptor without a specialized `View`. */
-    static new(name, sizeHint, encode, decode, skip) {
-        return new Descriptor(name, sizeHint, encode, decode, skip, null);
-    }
-    constructor(
-    /** Descriptive name of the coded data. */
-    name, 
-    /** A byte size hint for encoded data. */
-    sizeHint, 
-    /** Encoding function. */
-    encode, 
-    /** Decoding function. */
-    decode, 
-    /** Skipping function. */
-    skip, 
-    /** view object. It can be `null` iff T===V. */
-    view) {
-        this.name = name;
-        this.sizeHint = sizeHint;
-        this.encode = encode;
-        this.decode = decode;
-        this.skip = skip;
-        // We cast here to make sure that the field is always set.
-        this.View = view ?? this;
-    }
-    /**
-     * Extract an encoded version of this type from the decoder.
-     *
-     * This function skips the object instead of decoding it,
-     * allowing to retrieve the encoded portion of the object from `Decoder`.
-     */
-    skipEncoded(decoder) {
-        const initBytes = decoder.bytesRead();
-        this.skip(new Skipper(decoder));
-        const endBytes = decoder.bytesRead();
-        return BytesBlob.blobFrom(decoder.source.subarray(initBytes, endBytes));
-    }
-    /** Return a new descriptor that converts data into some other type. */
-    convert(input, output) {
-        return new Descriptor(this.name, this.sizeHint, (e, elem) => this.encode(e, input(elem)), (d) => output(this.decode(d)), this.skip, this.View);
-    }
-    /** Safely cast the descriptor value to a opaque type. */
-    asOpaque() {
-        return this.convert((i) => seeThrough(i), (o) => asOpaqueType(o));
-    }
-}
 /**
  * Convert a descriptor for regular array into readonly one.
  *
@@ -2452,6 +2445,7 @@ var index$o = /*#__PURE__*/Object.freeze({
   ObjectView: ObjectView,
   SequenceView: SequenceView,
   TYPICAL_DICTIONARY_LENGTH: TYPICAL_DICTIONARY_LENGTH,
+  ViewField: ViewField,
   addSizeHints: addSizeHints,
   get codec () { return codec$1; },
   decodeVariableLengthExtraBytes: decodeVariableLengthExtraBytes,
@@ -5752,6 +5746,31 @@ const codecPerEpochBlock = (val) => codecWithContext((context) => {
     return codecKnownSizeArray(val, { fixedLength: context.epochLength });
 });
 
+/**
+ * Mapping between work package hash and root hash of it's exports.
+ *
+ * Used to construct a dictionary.
+ */
+class WorkPackageInfo extends WithDebug {
+    workPackageHash;
+    segmentTreeRoot;
+    static Codec = codec$1.Class(WorkPackageInfo, {
+        workPackageHash: codec$1.bytes(HASH_SIZE).asOpaque(),
+        segmentTreeRoot: codec$1.bytes(HASH_SIZE).asOpaque(),
+    });
+    constructor(
+    /** Hash of the described work package. */
+    workPackageHash, 
+    /** Exports root hash. */
+    segmentTreeRoot) {
+        super();
+        this.workPackageHash = workPackageHash;
+        this.segmentTreeRoot = segmentTreeRoot;
+    }
+    static create({ workPackageHash, segmentTreeRoot }) {
+        return new WorkPackageInfo(workPackageHash, segmentTreeRoot);
+    }
+}
 /**
  * `X`: Refinement Context - state of the chain at the point
  * that the report's corresponding work-package was evaluated.
@@ -5801,7 +5820,8 @@ class RefineContext extends WithDebug {
 
 var refineContext = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  RefineContext: RefineContext
+  RefineContext: RefineContext,
+  WorkPackageInfo: WorkPackageInfo
 });
 
 /** `W_E`: The basic size of erasure-coded pieces in octets. See equation H.6. */
@@ -6070,17 +6090,13 @@ var WorkExecResultKind;
     /** `☇`: unexpected program termination. */
     WorkExecResultKind[WorkExecResultKind["panic"] = 2] = "panic";
     /** `⊚`: the number of exports made was invalidly reported. */
-    // biome-ignore lint/style/useLiteralEnumMembers: Compatibility
-    WorkExecResultKind[WorkExecResultKind["incorrectNumberOfExports"] = Compatibility.isGreaterOrEqual(GpVersion.V0_6_7) ? 3 : -1] = "incorrectNumberOfExports";
+    WorkExecResultKind[WorkExecResultKind["incorrectNumberOfExports"] = 3] = "incorrectNumberOfExports";
     /** `⊖`: the size of the digest (refinement output) would cross the acceptable limit. */
-    // biome-ignore lint/style/useLiteralEnumMembers: Compatibility
-    WorkExecResultKind[WorkExecResultKind["digestTooBig"] = Compatibility.isGreaterOrEqual(GpVersion.V0_6_7) ? 4 : -1] = "digestTooBig";
+    WorkExecResultKind[WorkExecResultKind["digestTooBig"] = 4] = "digestTooBig";
     /** `BAD`: service code was not available for lookup in state. */
-    // biome-ignore lint/style/useLiteralEnumMembers: Compatibility
-    WorkExecResultKind[WorkExecResultKind["badCode"] = Compatibility.isGreaterOrEqual(GpVersion.V0_6_7) ? 5 : 3] = "badCode";
+    WorkExecResultKind[WorkExecResultKind["badCode"] = 5] = "badCode";
     /** `BIG`: the code was too big (beyond the maximum allowed size `W_C`) */
-    // biome-ignore lint/style/useLiteralEnumMembers: Compatibility
-    WorkExecResultKind[WorkExecResultKind["codeOversize"] = Compatibility.isGreaterOrEqual(GpVersion.V0_6_7) ? 6 : 4] = "codeOversize";
+    WorkExecResultKind[WorkExecResultKind["codeOversize"] = 6] = "codeOversize";
 })(WorkExecResultKind || (WorkExecResultKind = {}));
 /** The execution result of some work-package. */
 class WorkExecResult extends WithDebug {
@@ -6272,31 +6288,6 @@ class WorkPackageSpec extends WithDebug {
         this.exportsCount = exportsCount;
     }
 }
-/**
- * Mapping between work package hash and root hash of it's exports.
- *
- * Used to construct a dictionary.
- */
-class WorkPackageInfo extends WithDebug {
-    workPackageHash;
-    segmentTreeRoot;
-    static Codec = codec$1.Class(WorkPackageInfo, {
-        workPackageHash: codec$1.bytes(HASH_SIZE).asOpaque(),
-        segmentTreeRoot: codec$1.bytes(HASH_SIZE).asOpaque(),
-    });
-    constructor(
-    /** Hash of the described work package. */
-    workPackageHash, 
-    /** Exports root hash. */
-    segmentTreeRoot) {
-        super();
-        this.workPackageHash = workPackageHash;
-        this.segmentTreeRoot = segmentTreeRoot;
-    }
-    static create({ workPackageHash, segmentTreeRoot }) {
-        return new WorkPackageInfo(workPackageHash, segmentTreeRoot);
-    }
-}
 /**
  * A report of execution of some work package.
  *
@@ -6363,14 +6354,12 @@ const WorkReportCodec = codec$1.Class(WorkReportNoCodec, {
 const WorkReportCodecPre070 = codec$1.Class(WorkReportNoCodec, {
     workPackageSpec: WorkPackageSpec.Codec,
     context: RefineContext.Codec,
-    coreIndex: Compatibility.isGreaterOrEqual(GpVersion.V0_6_5) && !Compatibility.isSuite(TestSuite.JAMDUNA, GpVersion.V0_6_5)
-        ? codec$1.varU32.convert((o) => tryAsU32(o), (i) => {
-            if (!isU16(i)) {
-                throw new Error(`Core index exceeds U16: ${i}`);
-            }
-            return tryAsCoreIndex(i);
-        })
-        : codec$1.u16.asOpaque(),
+    coreIndex: codec$1.varU32.convert((o) => tryAsU32(o), (i) => {
+        if (!isU16(i)) {
+            throw new Error(`Core index exceeds U16: ${i}`);
+        }
+        return tryAsCoreIndex(i);
+    }),
     authorizerHash: codec$1.bytes(HASH_SIZE).asOpaque(),
     authorizationOutput: codec$1.blob,
     segmentRootLookup: readonlyArray(codec$1.sequenceVarLen(WorkPackageInfo.Codec)),
@@ -6385,7 +6374,6 @@ class WorkReport extends WorkReportNoCodec {
 
 var workReport = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  WorkPackageInfo: WorkPackageInfo,
   WorkPackageSpec: WorkPackageSpec,
   WorkReport: WorkReport,
   WorkReportNoCodec: WorkReportNoCodec
@@ -7801,244 +7789,68 @@ class AutoAccumulate {
     static create({ service, gasLimit }) {
         return new AutoAccumulate(service, gasLimit);
     }
-    constructor(
-    /** Service id that auto-accumulates. */
-    service, 
-    /** Gas limit for auto-accumulation. */
-    gasLimit) {
-        this.service = service;
-        this.gasLimit = gasLimit;
-    }
-}
-/**
- * https://graypaper.fluffylabs.dev/#/7e6ff6a/11da0111da01?v=0.6.7
- */
-class PrivilegedServices {
-    manager;
-    authManager;
-    validatorsManager;
-    autoAccumulateServices;
-    static Codec = codec$1.Class(PrivilegedServices, {
-        manager: codec$1.u32.asOpaque(),
-        authManager: Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)
-            ? codecPerCore(codec$1.u32.asOpaque())
-            : codecWithContext((ctx) => codec$1.u32.asOpaque().convert(
-            // NOTE: [MaSo] In a compatibility mode we are always updating all entries
-            // (all the entries are the same)
-            // so it doesn't matter which one we take here.
-            (perCore) => perCore[0], (serviceId) => {
-                const array = new Array(ctx.coresCount).fill(serviceId);
-                return tryAsPerCore(array, ctx);
-            })),
-        validatorsManager: codec$1.u32.asOpaque(),
-        autoAccumulateServices: readonlyArray(codec$1.sequenceVarLen(AutoAccumulate.Codec)),
-    });
-    static create({ manager, authManager, validatorsManager, autoAccumulateServices }) {
-        return new PrivilegedServices(manager, authManager, validatorsManager, autoAccumulateServices);
-    }
-    constructor(
-    /**
-     * `chi_m`: The first, χm, is the index of the manager service which is
-     * the service able to effect an alteration of χ from block to block,
-     * as well as bestow services with storage deposit credits.
-     * https://graypaper.fluffylabs.dev/#/7e6ff6a/11a40111a801?v=0.6.7
-     */
-    manager, 
-    /** `chi_a`: Manages authorization queue one for each core. */
-    authManager, 
-    /** `chi_v`: Managers validator keys. */
-    validatorsManager, 
-    /** `chi_g`: Dictionary of services that auto-accumulate every block with their gas limit. */
-    autoAccumulateServices) {
-        this.manager = manager;
-        this.authManager = authManager;
-        this.validatorsManager = validatorsManager;
-        this.autoAccumulateServices = autoAccumulateServices;
-    }
-}
-
-const SUPER_PEAK_STRING = BytesBlob.blobFromString("peak");
-/**
- * Merkle Mountain Range.
- *
- * https://graypaper.fluffylabs.dev/#/5f542d7/3aa0023aa002?v=0.6.2
- */
-class MerkleMountainRange {
-    hasher;
-    mountains;
-    /** Construct an empty MMR. */
-    static empty(hasher) {
-        return new MerkleMountainRange(hasher);
-    }
-    /** Construct a new MMR from existing peaks. */
-    static fromPeaks(hasher, mmr) {
-        return new MerkleMountainRange(hasher, mmr.peaks
-            .reduce((acc, peak, index) => {
-            if (peak !== null) {
-                acc.push(Mountain.fromPeak(peak, 2 ** index));
-            }
-            return acc;
-        }, [])
-            .reverse());
-    }
-    constructor(hasher, 
-    /** Store non-empty merkle tries (mountains) ordered by descending size. */
-    mountains = []) {
-        this.hasher = hasher;
-        this.mountains = mountains;
-    }
-    /**
-     * Append a new hash to the MMR structure.
-     *
-     * https://graypaper.fluffylabs.dev/#/5f542d7/3b11003b1100?v=0.6.2
-     */
-    append(hash) {
-        let newMountain = Mountain.fromPeak(hash, 1);
-        for (;;) {
-            const last = this.mountains.pop();
-            if (last === undefined) {
-                this.mountains.push(newMountain);
-                return;
-            }
-            if (last.size !== newMountain.size) {
-                this.mountains.push(last);
-                this.mountains.push(newMountain);
-                return;
-            }
-            newMountain = last.mergeWith(this.hasher, newMountain);
-        }
-    }
-    /**
-     * Root of the entire structure.
-     *
-     * https://graypaper.fluffylabs.dev/#/5f542d7/3b20013b2001?v=0.6.2
-     */
-    getSuperPeakHash() {
-        if (this.mountains.length === 0) {
-            return Bytes.zero(HASH_SIZE).asOpaque();
-        }
-        const revMountains = this.mountains.slice().reverse();
-        const length = revMountains.length;
-        let lastHash = revMountains[0].peak;
-        for (let i = 1; i < length; i++) {
-            const mountain = revMountains[i];
-            lastHash = this.hasher.hashConcatPrepend(SUPER_PEAK_STRING, lastHash, mountain.peak);
-        }
-        return lastHash;
-    }
-    /** Get current peaks. */
-    getPeaks() {
-        const peaks = [];
-        const mountains = this.mountains;
-        // always 2**index
-        let currentSize = 1;
-        let currentIdx = mountains.length - 1;
-        while (currentIdx >= 0) {
-            const currentItem = mountains[currentIdx];
-            if (currentItem.size >= currentSize && currentItem.size < 2 * currentSize) {
-                peaks.push(currentItem.peak);
-                currentIdx -= 1;
-            }
-            else {
-                peaks.push(null);
-            }
-            // move to the next index.
-            currentSize = currentSize << 1;
-        }
-        return { peaks };
-    }
-}
-/** An internal helper structure to represent a merkle trie for MMR. */
-class Mountain {
-    peak;
-    size;
-    constructor(peak, size) {
-        this.peak = peak;
-        this.size = size;
-    }
-    static fromPeak(peak, size) {
-        return new Mountain(peak, size);
-    }
-    static fromChildren(hasher, children) {
-        const [left, right] = children;
-        const peak = hasher.hashConcat(left.peak, right.peak);
-        const size = left.size + right.size;
-        return new Mountain(peak, size);
-    }
-    /** Merge with another montain of the same size. */
-    mergeWith(hasher, other) {
-        return Mountain.fromChildren(hasher, [this, other]);
-    }
-    toString() {
-        return `${this.size} @ ${this.peak}`;
-    }
-}
-
-var index$f = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  MerkleMountainRange: MerkleMountainRange
-});
-
-/**
- * `H = 8`: The size of recent history, in blocks.
- *
- * https://graypaper.fluffylabs.dev/#/579bd12/416300416500
- */
-const MAX_RECENT_HISTORY = 8;
-class LegacyBlockState extends WithDebug {
-    headerHash;
-    mmr;
-    postStateRoot;
-    reported;
-    static Codec = codec$1.Class(LegacyBlockState, {
-        headerHash: codec$1.bytes(HASH_SIZE).asOpaque(),
-        mmr: codec$1.object({
-            peaks: readonlyArray(codec$1.sequenceVarLen(codec$1.optional(codec$1.bytes(HASH_SIZE)))),
-        }),
-        postStateRoot: codec$1.bytes(HASH_SIZE).asOpaque(),
-        reported: codecHashDictionary(WorkPackageInfo.Codec, (x) => x.workPackageHash),
-    });
-    static create({ headerHash, mmr, postStateRoot, reported }) {
-        return new LegacyBlockState(headerHash, mmr, postStateRoot, reported);
-    }
-    constructor(
-    /** Header hash. */
-    headerHash, 
-    /** Merkle mountain range peaks. */
-    mmr, 
-    /** 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.mmr = mmr;
-        this.postStateRoot = postStateRoot;
-        this.reported = reported;
-    }
+    constructor(
+    /** Service id that auto-accumulates. */
+    service, 
+    /** Gas limit for auto-accumulation. */
+    gasLimit) {
+        this.service = service;
+        this.gasLimit = gasLimit;
+    }
 }
-class LegacyRecentBlocks extends WithDebug {
-    blocks;
-    static Codec = codec$1.Class(LegacyRecentBlocks, {
-        blocks: codecKnownSizeArray(LegacyBlockState.Codec, {
-            minLength: 0,
-            maxLength: MAX_RECENT_HISTORY,
-            typicalLength: MAX_RECENT_HISTORY,
-        }),
+/**
+ * https://graypaper.fluffylabs.dev/#/7e6ff6a/11da0111da01?v=0.6.7
+ */
+class PrivilegedServices {
+    manager;
+    authManager;
+    validatorsManager;
+    autoAccumulateServices;
+    static Codec = codec$1.Class(PrivilegedServices, {
+        manager: codec$1.u32.asOpaque(),
+        authManager: Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)
+            ? codecPerCore(codec$1.u32.asOpaque())
+            : codecWithContext((ctx) => codec$1.u32.asOpaque().convert(
+            // NOTE: [MaSo] In a compatibility mode we are always updating all entries
+            // (all the entries are the same)
+            // so it doesn't matter which one we take here.
+            (perCore) => perCore[0], (serviceId) => {
+                const array = new Array(ctx.coresCount).fill(serviceId);
+                return tryAsPerCore(array, ctx);
+            })),
+        validatorsManager: codec$1.u32.asOpaque(),
+        autoAccumulateServices: readonlyArray(codec$1.sequenceVarLen(AutoAccumulate.Codec)),
     });
-    static create(a) {
-        return new LegacyRecentBlocks(a.blocks);
+    static create({ manager, authManager, validatorsManager, autoAccumulateServices }) {
+        return new PrivilegedServices(manager, authManager, validatorsManager, autoAccumulateServices);
     }
     constructor(
     /**
-     * Most recent blocks.
-     * https://graypaper.fluffylabs.dev/#/85129da/0fb6010fb601?v=0.6.3
+     * `chi_m`: The first, χm, is the index of the manager service which is
+     * the service able to effect an alteration of χ from block to block,
+     * as well as bestow services with storage deposit credits.
+     * https://graypaper.fluffylabs.dev/#/7e6ff6a/11a40111a801?v=0.6.7
      */
-    blocks) {
-        super();
-        this.blocks = blocks;
+    manager, 
+    /** `chi_a`: Manages authorization queue one for each core. */
+    authManager, 
+    /** `chi_v`: Managers validator keys. */
+    validatorsManager, 
+    /** `chi_g`: Dictionary of services that auto-accumulate every block with their gas limit. */
+    autoAccumulateServices) {
+        this.manager = manager;
+        this.authManager = authManager;
+        this.validatorsManager = validatorsManager;
+        this.autoAccumulateServices = autoAccumulateServices;
     }
 }
+
+/**
+ * `H = 8`: The size of recent history, in blocks.
+ *
+ * https://graypaper.fluffylabs.dev/#/579bd12/416300416500
+ */
+const MAX_RECENT_HISTORY = 8;
 /** Recent history of a single block. */
 class BlockState extends WithDebug {
     headerHash;
@@ -8103,66 +7915,42 @@ class RecentBlocks extends WithDebug {
     }
 }
 /**
- * Unified recent history of blocks that handles both legacy and current formats.
+ * Recent history of blocks.
  *
- * https://graypaper.fluffylabs.dev/#/85129da/38cb0138cb01?v=0.6.3
  * https://graypaper.fluffylabs.dev/#/7e6ff6a/0fc9010fc901?v=0.6.7
  */
 class RecentBlocksHistory extends WithDebug {
     current;
-    legacy;
-    static Codec = Descriptor.new("RecentBlocksHistory", Compatibility.isGreaterOrEqual(GpVersion.V0_6_7) ? RecentBlocks.Codec.sizeHint : LegacyRecentBlocks.Codec.sizeHint, (encoder, value) => Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)
-        ? RecentBlocks.Codec.encode(encoder, value.asCurrent())
-        : LegacyRecentBlocks.Codec.encode(encoder, value.asLegacy()), (decoder) => {
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)) {
-            const recentBlocks = RecentBlocks.Codec.decode(decoder);
-            return RecentBlocksHistory.create(recentBlocks);
-        }
-        const legacyBlocks = LegacyRecentBlocks.Codec.decode(decoder);
-        return RecentBlocksHistory.legacyCreate(legacyBlocks);
-    }, (_sizer) => {
-        return Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)
-            ? RecentBlocks.Codec.sizeHint
-            : LegacyRecentBlocks.Codec.sizeHint;
+    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);
     });
     static create(recentBlocks) {
-        return new RecentBlocksHistory(recentBlocks, null);
-    }
-    static legacyCreate(legacyRecentBlocks) {
-        return new RecentBlocksHistory(null, legacyRecentBlocks);
+        return new RecentBlocksHistory(recentBlocks);
     }
     static empty() {
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)) {
-            return RecentBlocksHistory.create(RecentBlocks.create({
-                blocks: asKnownSize([]),
-                accumulationLog: { peaks: [] },
-            }));
-        }
-        return RecentBlocksHistory.legacyCreate(LegacyRecentBlocks.create({ blocks: asKnownSize([]) }));
+        return RecentBlocksHistory.create(RecentBlocks.create({
+            blocks: asKnownSize([]),
+            accumulationLog: { peaks: [] },
+        }));
     }
     /**
      * Returns the block's BEEFY super peak.
-     *
-     * NOTE: The `hasher` parameter exists solely for backward compatibility with legacy block format.
      */
-    static accumulationResult(block, { hasher, }) {
-        return Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)
-            ? block.accumulationResult
-            : MerkleMountainRange.fromPeaks(hasher, block.mmr).getSuperPeakHash();
+    static accumulationResult(block) {
+        return block.accumulationResult;
     }
-    constructor(current, legacy) {
+    constructor(current) {
         super();
         this.current = current;
-        this.legacy = legacy;
     }
     /** History of recent blocks with maximum size of `MAX_RECENT_HISTORY` */
     get blocks() {
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_6_7) && this.current !== null) {
+        if (this.current !== null) {
             return this.current.blocks;
         }
-        if (this.legacy !== null) {
-            return this.legacy.blocks;
-        }
         throw new Error("RecentBlocksHistory is in invalid state");
     }
     asCurrent() {
@@ -8171,24 +7959,13 @@ class RecentBlocksHistory extends WithDebug {
         }
         return this.current;
     }
-    asLegacy() {
-        if (this.legacy === null) {
-            throw new Error("Cannot access legacy RecentBlocks format");
-        }
-        return this.legacy;
-    }
     updateBlocks(blocks) {
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_6_7) && this.current !== null) {
+        if (this.current !== null) {
             return RecentBlocksHistory.create(RecentBlocks.create({
                 ...this.current,
                 blocks: asOpaqueType(blocks),
             }));
         }
-        if (this.legacy !== null) {
-            return RecentBlocksHistory.legacyCreate(LegacyRecentBlocks.create({
-                blocks: asOpaqueType(blocks),
-            }));
-        }
         throw new Error("RecentBlocksHistory is in invalid state. Cannot be updated!");
     }
 }
@@ -8365,31 +8142,18 @@ class ServiceAccountInfo extends WithDebug {
     created;
     lastAccumulation;
     parentService;
-    static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)
-        ? codec$1.Class(ServiceAccountInfo, {
-            codeHash: codec$1.bytes(HASH_SIZE).asOpaque(),
-            balance: codec$1.u64,
-            accumulateMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
-            onTransferMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
-            storageUtilisationBytes: codec$1.u64,
-            gratisStorage: codec$1.u64,
-            storageUtilisationCount: codec$1.u32,
-            created: codec$1.u32.convert((x) => x, tryAsTimeSlot),
-            lastAccumulation: codec$1.u32.convert((x) => x, tryAsTimeSlot),
-            parentService: codec$1.u32.convert((x) => x, tryAsServiceId),
-        })
-        : codec$1.Class(ServiceAccountInfo, {
-            codeHash: codec$1.bytes(HASH_SIZE).asOpaque(),
-            balance: codec$1.u64,
-            accumulateMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
-            onTransferMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
-            storageUtilisationBytes: codec$1.u64,
-            storageUtilisationCount: codec$1.u32,
-            gratisStorage: ignoreValueWithDefault(tryAsU64(0)),
-            created: ignoreValueWithDefault(tryAsTimeSlot(0)),
-            lastAccumulation: ignoreValueWithDefault(tryAsTimeSlot(0)),
-            parentService: ignoreValueWithDefault(tryAsServiceId(0)),
-        });
+    static Codec = codec$1.Class(ServiceAccountInfo, {
+        codeHash: codec$1.bytes(HASH_SIZE).asOpaque(),
+        balance: codec$1.u64,
+        accumulateMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
+        onTransferMinGas: codec$1.u64.convert((x) => x, tryAsServiceGas),
+        storageUtilisationBytes: codec$1.u64,
+        gratisStorage: codec$1.u64,
+        storageUtilisationCount: codec$1.u32,
+        created: codec$1.u32.convert((x) => x, tryAsTimeSlot),
+        lastAccumulation: codec$1.u32.convert((x) => x, tryAsTimeSlot),
+        parentService: codec$1.u32.convert((x) => x, tryAsServiceId),
+    });
     static create(a) {
         return new ServiceAccountInfo(a.codeHash, a.balance, a.accumulateMinGas, a.onTransferMinGas, a.storageUtilisationBytes, a.gratisStorage, a.storageUtilisationCount, a.created, a.lastAccumulation, a.parentService);
     }
@@ -8662,9 +8426,7 @@ class UpdateStorage {
  */
 const ENTROPY_ENTRIES = 4;
 
-const codecServiceId = Compatibility.isSuite(TestSuite.W3F_DAVXY) ||
-    Compatibility.isSuite(TestSuite.JAMDUNA, GpVersion.V0_6_5) ||
-    Compatibility.isSuite(TestSuite.JAMDUNA, GpVersion.V0_6_7)
+const codecServiceId = Compatibility.isSuite(TestSuite.W3F_DAVXY) || Compatibility.isSuite(TestSuite.JAMDUNA, GpVersion.V0_6_7)
     ? codec$1.u32.asOpaque()
     : codec$1.varU32.convert((s) => tryAsU32(s), (i) => tryAsServiceId(i));
 /**
@@ -9332,7 +9094,7 @@ const serviceDataCodec = codec$1.dictionary(codec$1.u32.asOpaque(), serviceEntri
     sortKeys: (a, b) => a - b,
 });
 
-var index$e = /*#__PURE__*/Object.freeze({
+var index$f = /*#__PURE__*/Object.freeze({
   __proto__: null,
   AccumulationOutput: AccumulationOutput,
   AutoAccumulate: AutoAccumulate,
@@ -9346,8 +9108,6 @@ var index$e = /*#__PURE__*/Object.freeze({
   ENTROPY_ENTRIES: ENTROPY_ENTRIES,
   InMemoryService: InMemoryService,
   InMemoryState: InMemoryState,
-  LegacyBlockState: LegacyBlockState,
-  LegacyRecentBlocks: LegacyRecentBlocks,
   LookupHistoryItem: LookupHistoryItem,
   MAX_RECENT_HISTORY: MAX_RECENT_HISTORY,
   PreimageItem: PreimageItem,
@@ -9549,7 +9309,7 @@ function legacyServiceNested(serviceId, hash) {
 /** Serialization for particular state entries. */
 var serialize;
 (function (serialize) {
-    /** C(1): https://graypaper.fluffylabs.dev/#/85129da/38a20138a201?v=0.6.3 */
+    /** C(1): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b15013b1501?v=0.6.7 */
     serialize.authPools = {
         key: stateKeys.index(StateKeyIdx.Alpha),
         Codec: codecPerCore(codecKnownSizeArray(codec$1.bytes(HASH_SIZE).asOpaque(), {
@@ -9559,7 +9319,7 @@ var serialize;
         })),
         extract: (s) => s.authPools,
     };
-    /** C(2): https://graypaper.fluffylabs.dev/#/85129da/38be0138be01?v=0.6.3 */
+    /** C(2): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b31013b3101?v=0.6.7 */
     serialize.authQueues = {
         key: stateKeys.index(StateKeyIdx.Phi),
         Codec: codecPerCore(codecFixedSizeArray(codec$1.bytes(HASH_SIZE).asOpaque(), AUTHORIZATION_QUEUE_SIZE)),
@@ -9567,7 +9327,6 @@ var serialize;
     };
     /**
      * C(3): Recent blocks with compatibility
-     *  https://graypaper.fluffylabs.dev/#/85129da/38cb0138cb01?v=0.6.3
      *  https://graypaper.fluffylabs.dev/#/7e6ff6a/3b3e013b3e01?v=0.6.7
      */
     serialize.recentBlocks = {
@@ -9575,7 +9334,7 @@ var serialize;
         Codec: RecentBlocksHistory.Codec,
         extract: (s) => s.recentBlocks,
     };
-    /** C(4): https://graypaper.fluffylabs.dev/#/85129da/38e60138e601?v=0.6.3 */
+    /** C(4): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b63013b6301?v=0.6.7 */
     serialize.safrole = {
         key: stateKeys.index(StateKeyIdx.Gamma),
         Codec: SafroleData.Codec,
@@ -9586,55 +9345,55 @@ var serialize;
             ticketsAccumulator: s.ticketsAccumulator,
         }),
     };
-    /** C(5): https://graypaper.fluffylabs.dev/#/85129da/383d02383d02?v=0.6.3 */
+    /** C(5): https://graypaper.fluffylabs.dev/#/7e6ff6a/3bba013bba01?v=0.6.7 */
     serialize.disputesRecords = {
         key: stateKeys.index(StateKeyIdx.Psi),
         Codec: DisputesRecords.Codec,
         extract: (s) => s.disputesRecords,
     };
-    /** C(6): https://graypaper.fluffylabs.dev/#/85129da/387602387602?v=0.6.3 */
+    /** C(6): https://graypaper.fluffylabs.dev/#/7e6ff6a/3bf3013bf301?v=0.6.7 */
     serialize.entropy = {
         key: stateKeys.index(StateKeyIdx.Eta),
         Codec: codecFixedSizeArray(codec$1.bytes(HASH_SIZE).asOpaque(), ENTROPY_ENTRIES),
         extract: (s) => s.entropy,
     };
-    /** C(7): https://graypaper.fluffylabs.dev/#/85129da/388302388302?v=0.6.3 */
+    /** C(7): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b00023b0002?v=0.6.7 */
     serialize.designatedValidators = {
         key: stateKeys.index(StateKeyIdx.Iota),
         Codec: codecPerValidator(ValidatorData.Codec),
         extract: (s) => s.designatedValidatorData,
     };
-    /** C(8): https://graypaper.fluffylabs.dev/#/85129da/389002389002?v=0.6.3 */
+    /** C(8): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b0d023b0d02?v=0.6.7 */
     serialize.currentValidators = {
         key: stateKeys.index(StateKeyIdx.Kappa),
         Codec: codecPerValidator(ValidatorData.Codec),
         extract: (s) => s.currentValidatorData,
     };
-    /** C(9): https://graypaper.fluffylabs.dev/#/85129da/389d02389d02?v=0.6.3 */
+    /** C(9): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b1a023b1a02?v=0.6.7 */
     serialize.previousValidators = {
         key: stateKeys.index(StateKeyIdx.Lambda),
         Codec: codecPerValidator(ValidatorData.Codec),
         extract: (s) => s.previousValidatorData,
     };
-    /** C(10): https://graypaper.fluffylabs.dev/#/85129da/38aa0238aa02?v=0.6.3 */
+    /** C(10): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b27023b2702?v=0.6.7 */
     serialize.availabilityAssignment = {
         key: stateKeys.index(StateKeyIdx.Rho),
         Codec: codecPerCore(codec$1.optional(AvailabilityAssignment.Codec)),
         extract: (s) => s.availabilityAssignment,
     };
-    /** C(11): https://graypaper.fluffylabs.dev/#/85129da/38c10238c102?v=0.6.3 */
+    /** C(11): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b3e023b3e02?v=0.6.7 */
     serialize.timeslot = {
         key: stateKeys.index(StateKeyIdx.Tau),
         Codec: codec$1.u32.asOpaque(),
         extract: (s) => s.timeslot,
     };
-    /** C(12): https://graypaper.fluffylabs.dev/#/85129da/38cf0238cf02?v=0.6.3 */
+    /** C(12): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b4c023b4c02?v=0.6.7 */
     serialize.privilegedServices = {
         key: stateKeys.index(StateKeyIdx.Chi),
         Codec: PrivilegedServices.Codec,
         extract: (s) => s.privilegedServices,
     };
-    /** C(13): https://graypaper.fluffylabs.dev/#/85129da/38e10238e102?v=0.6.3 */
+    /** C(13): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b5e023b5e02?v=0.6.7 */
     serialize.statistics = {
         key: stateKeys.index(StateKeyIdx.Pi),
         Codec: StatisticsData.Codec,
@@ -9646,7 +9405,7 @@ var serialize;
         Codec: codecPerEpochBlock(readonlyArray(codec$1.sequenceVarLen(NotYetAccumulatedReport.Codec))),
         extract: (s) => s.accumulationQueue,
     };
-    /** C(15): https://graypaper.fluffylabs.dev/#/85129da/381903381903?v=0.6.3 */
+    /** C(15): https://graypaper.fluffylabs.dev/#/7e6ff6a/3b96023b9602?v=0.6.7 */
     serialize.recentlyAccumulated = {
         key: stateKeys.index(StateKeyIdx.Xi),
         Codec: codecPerEpochBlock(codec$1.sequenceVarLen(codec$1.bytes(HASH_SIZE).asOpaque()).convert((x) => Array.from(x), (x) => HashSet.from(x))),
@@ -10555,7 +10314,7 @@ function trieStringify(root, nodes) {
     return `\nLeaf('${leaf.getKey().toString()}',${value})`;
 }
 
-var index$d = /*#__PURE__*/Object.freeze({
+var index$e = /*#__PURE__*/Object.freeze({
   __proto__: null,
   BranchNode: BranchNode,
   InMemoryTrie: InMemoryTrie,
@@ -10775,7 +10534,7 @@ function loadState(spec, entries) {
  *        hashmap of `key -> value` entries.
  */
 
-var index$c = /*#__PURE__*/Object.freeze({
+var index$d = /*#__PURE__*/Object.freeze({
   __proto__: null,
   SerializedService: SerializedService,
   SerializedState: SerializedState,
@@ -11061,7 +10820,7 @@ var LookupKind;
     LookupKind[LookupKind["DbKey"] = 1] = "DbKey";
 })(LookupKind || (LookupKind = {}));
 
-var index$b = /*#__PURE__*/Object.freeze({
+var index$c = /*#__PURE__*/Object.freeze({
   __proto__: null,
   InMemoryBlocks: InMemoryBlocks,
   InMemoryStates: InMemoryStates,
@@ -11720,7 +11479,7 @@ function chunksToShards(spec, chunks) {
     return tryAsPerValidator(result, spec);
 }
 
-var index$a = /*#__PURE__*/Object.freeze({
+var index$b = /*#__PURE__*/Object.freeze({
   __proto__: null,
   N_CHUNKS_REDUNDANCY: N_CHUNKS_REDUNDANCY,
   N_CHUNKS_REQUIRED: N_CHUNKS_REQUIRED,
@@ -12292,7 +12051,7 @@ function preimageLenAsU32(length) {
     return length >= 2n ** 32n ? null : tryAsU32(Number(length));
 }
 
-var index$9 = /*#__PURE__*/Object.freeze({
+var index$a = /*#__PURE__*/Object.freeze({
   __proto__: null,
   AccumulationStateUpdate: AccumulationStateUpdate,
   CURRENT_SERVICE_ID: CURRENT_SERVICE_ID,
@@ -12603,13 +12362,135 @@ class Logger {
     }
 }
 
-var index$8 = /*#__PURE__*/Object.freeze({
+var index$9 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   get Level () { return Level; },
   Logger: Logger,
   parseLoggerOptions: parseLoggerOptions
 });
 
+const SUPER_PEAK_STRING = BytesBlob.blobFromString("peak");
+/**
+ * Merkle Mountain Range.
+ *
+ * https://graypaper.fluffylabs.dev/#/5f542d7/3aa0023aa002?v=0.6.2
+ */
+class MerkleMountainRange {
+    hasher;
+    mountains;
+    /** Construct an empty MMR. */
+    static empty(hasher) {
+        return new MerkleMountainRange(hasher);
+    }
+    /** Construct a new MMR from existing peaks. */
+    static fromPeaks(hasher, mmr) {
+        return new MerkleMountainRange(hasher, mmr.peaks
+            .reduce((acc, peak, index) => {
+            if (peak !== null) {
+                acc.push(Mountain.fromPeak(peak, 2 ** index));
+            }
+            return acc;
+        }, [])
+            .reverse());
+    }
+    constructor(hasher, 
+    /** Store non-empty merkle tries (mountains) ordered by descending size. */
+    mountains = []) {
+        this.hasher = hasher;
+        this.mountains = mountains;
+    }
+    /**
+     * Append a new hash to the MMR structure.
+     *
+     * https://graypaper.fluffylabs.dev/#/5f542d7/3b11003b1100?v=0.6.2
+     */
+    append(hash) {
+        let newMountain = Mountain.fromPeak(hash, 1);
+        for (;;) {
+            const last = this.mountains.pop();
+            if (last === undefined) {
+                this.mountains.push(newMountain);
+                return;
+            }
+            if (last.size !== newMountain.size) {
+                this.mountains.push(last);
+                this.mountains.push(newMountain);
+                return;
+            }
+            newMountain = last.mergeWith(this.hasher, newMountain);
+        }
+    }
+    /**
+     * Root of the entire structure.
+     *
+     * https://graypaper.fluffylabs.dev/#/5f542d7/3b20013b2001?v=0.6.2
+     */
+    getSuperPeakHash() {
+        if (this.mountains.length === 0) {
+            return Bytes.zero(HASH_SIZE).asOpaque();
+        }
+        const revMountains = this.mountains.slice().reverse();
+        const length = revMountains.length;
+        let lastHash = revMountains[0].peak;
+        for (let i = 1; i < length; i++) {
+            const mountain = revMountains[i];
+            lastHash = this.hasher.hashConcatPrepend(SUPER_PEAK_STRING, lastHash, mountain.peak);
+        }
+        return lastHash;
+    }
+    /** Get current peaks. */
+    getPeaks() {
+        const peaks = [];
+        const mountains = this.mountains;
+        // always 2**index
+        let currentSize = 1;
+        let currentIdx = mountains.length - 1;
+        while (currentIdx >= 0) {
+            const currentItem = mountains[currentIdx];
+            if (currentItem.size >= currentSize && currentItem.size < 2 * currentSize) {
+                peaks.push(currentItem.peak);
+                currentIdx -= 1;
+            }
+            else {
+                peaks.push(null);
+            }
+            // move to the next index.
+            currentSize = currentSize << 1;
+        }
+        return { peaks };
+    }
+}
+/** An internal helper structure to represent a merkle trie for MMR. */
+class Mountain {
+    peak;
+    size;
+    constructor(peak, size) {
+        this.peak = peak;
+        this.size = size;
+    }
+    static fromPeak(peak, size) {
+        return new Mountain(peak, size);
+    }
+    static fromChildren(hasher, children) {
+        const [left, right] = children;
+        const peak = hasher.hashConcat(left.peak, right.peak);
+        const size = left.size + right.size;
+        return new Mountain(peak, size);
+    }
+    /** Merge with another montain of the same size. */
+    mergeWith(hasher, other) {
+        return Mountain.fromChildren(hasher, [this, other]);
+    }
+    toString() {
+        return `${this.size} @ ${this.peak}`;
+    }
+}
+
+var index$8 = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  MerkleMountainRange: MerkleMountainRange
+});
+
 /**
  * Upper bound of instruction distance - it is equal to max value of GP's skip function + 1
  */
@@ -13445,9 +13326,7 @@ const instructionsWithoutArgs = [
     [Instruction.TRAP, 1],
     [Instruction.FALLTHROUGH, 1],
 ];
-const instructionsWithOneImmediate = [
-    [Instruction.ECALLI, Compatibility.isSuite(TestSuite.JAMDUNA, GpVersion.V0_6_5) ? 0 : 1],
-];
+const instructionsWithOneImmediate = [[Instruction.ECALLI, 1]];
 const instructionsWithOneRegisterAndOneExtendedWidthImmediate = [[Instruction.LOAD_IMM_64, 1]];
 const instructionsWithTwoImmediates = [
     [Instruction.STORE_IMM_U8, 1],
@@ -15923,7 +15802,6 @@ class ProgramDecoder {
 
 class Interpreter {
     useSbrkGas;
-    ignoreInstructionGas;
     registers = new Registers();
     code = new Uint8Array();
     mask = Mask.empty();
@@ -15950,9 +15828,8 @@ class Interpreter {
     argsDecodingResults = createResults();
     basicBlocks;
     jumpTable = JumpTable.empty();
-    constructor({ useSbrkGas = false, ignoreInstructionGas = false } = {}) {
+    constructor({ useSbrkGas = false } = {}) {
         this.useSbrkGas = useSbrkGas;
-        this.ignoreInstructionGas = ignoreInstructionGas;
         this.argsDecoder = new ArgsDecoder();
         this.basicBlocks = new BasicBlocks();
         const mathOps = new MathOps(this.registers);
@@ -16032,7 +15909,7 @@ class Interpreter {
         const currentInstruction = this.code[this.pc] ?? Instruction.TRAP;
         const isValidInstruction = Instruction[currentInstruction] !== undefined;
         const gasCost = instructionGasMap[currentInstruction] ?? instructionGasMap[Instruction.TRAP];
-        const underflow = this.ignoreInstructionGas ? false : this.gas.sub(gasCost);
+        const underflow = this.gas.sub(gasCost);
         if (underflow) {
             this.status = Status.OOG;
             return this.status;
@@ -16096,11 +15973,6 @@ class Interpreter {
             }
         }
         if (this.instructionResult.status !== null) {
-            // All abnormal terminations should be interpreted as TRAP and we should subtract the gas. In case of FAULT we have to do it manually at the very end.
-            if (this.instructionResult.status === Result.FAULT || this.instructionResult.status === Result.FAULT_ACCESS) {
-                // TODO [ToDr] underflow?
-                this.gas.sub(instructionGasMap[Instruction.TRAP]);
-            }
             switch (this.instructionResult.status) {
                 case Result.FAULT:
                     this.status = Status.FAULT;
@@ -16544,7 +16416,7 @@ class HostCalls {
             }
             this.hostCalls.traceHostCall("Invoking", index, hostCall, regs, gasBefore);
             const result = await hostCall.execute(gas, regs, memory);
-            this.hostCalls.traceHostCall(result === undefined ? "Result" : `Status(${result})`, index, hostCall, regs, gas.get());
+            this.hostCalls.traceHostCall(result === undefined ? "Result" : `Status(${PvmExecution[result]})`, index, hostCall, regs, gas.get());
             if (result === PvmExecution.Halt) {
                 status = Status.HALT;
                 return this.getReturnValue(status, pvmInstance);
@@ -16569,13 +16441,9 @@ class InterpreterInstanceManager {
     instances = [];
     waitingQueue = [];
     constructor(noOfPvmInstances) {
-        const shouldCountGas = Compatibility.isGreaterOrEqual(GpVersion.V0_6_7) ||
-            Compatibility.isSuite(TestSuite.JAMDUNA, GpVersion.V0_6_5) ||
-            Compatibility.isSuite(TestSuite.W3F_DAVXY, GpVersion.V0_6_6);
         for (let i = 0; i < noOfPvmInstances; i++) {
             this.instances.push(new Interpreter({
                 useSbrkGas: false,
-                ignoreInstructionGas: !shouldCountGas,
             }));
         }
     }
@@ -16598,13 +16466,13 @@ class InterpreterInstanceManager {
 }
 
 const logger = Logger.new(undefined, "host-calls-pvm");
-// TODO [ToDr] Rename to just `HostCalls`
 /** Container for all available host calls. */
 class HostCallsManager {
     hostCalls = new Map();
-    missing = new Missing();
-    constructor(...hostCallHandlers) {
-        for (const handler of hostCallHandlers) {
+    missing;
+    constructor({ missing, handlers = [], }) {
+        this.missing = missing;
+        for (const handler of handlers) {
             check(this.hostCalls.get(handler.index) === undefined, `Overwriting host call handler at index ${handler.index}`);
             this.hostCalls.set(handler.index, handler);
         }
@@ -16627,16 +16495,6 @@ class HostCallsManager {
         logger.trace(`[${currentServiceId}] ${context} ${name}${requested}.  Gas: ${gas}. Regs: ${registerValues}.`);
     }
 }
-class Missing {
-    index = tryAsHostCallIndex(2 ** 32 - 1);
-    gasCost = tryAsSmallGas(10);
-    currentServiceId = CURRENT_SERVICE_ID;
-    tracedRegisters = traceRegisters(7);
-    execute(_gas, regs, _memory) {
-        regs.set(7, HostCallResult.WHAT);
-        return Promise.resolve(undefined);
-    }
-}
 
 var index$4 = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -16938,7 +16796,7 @@ const recentBlockStateFromJson = json.object({
         reported: HashDictionary.fromEntries(reported.map((x) => [x.workPackageHash, x])),
     });
 });
-const recentBlocksFromJson = json.object({
+const recentBlocksHistoryFromJson = json.object({
     history: json.array(recentBlockStateFromJson),
     mmr: {
         peaks: json.array(json.nullable(fromJson.bytes32())),
@@ -16949,29 +16807,6 @@ const recentBlocksFromJson = json.object({
         accumulationLog: mmr,
     }));
 });
-const legacyRecentBlockStateFromJson = json.object({
-    header_hash: fromJson.bytes32(),
-    mmr: {
-        peaks: json.array(json.nullable(fromJson.bytes32())),
-    },
-    state_root: fromJson.bytes32(),
-    reported: json.array(reportedWorkPackageFromJson),
-}, ({ header_hash, mmr, state_root, reported }) => {
-    return {
-        headerHash: header_hash,
-        mmr,
-        postStateRoot: state_root,
-        reported: HashDictionary.fromEntries(reported.map((x) => [x.workPackageHash, x])),
-    };
-});
-const legacyRecentBlocksFromJson = json.object(json.array(legacyRecentBlockStateFromJson), (blocks) => {
-    return RecentBlocksHistory.legacyCreate(LegacyRecentBlocks.create({
-        blocks,
-    }));
-});
-const recentBlocksHistoryFromJson = Compatibility.isGreaterOrEqual(GpVersion.V0_6_7)
-    ? recentBlocksFromJson
-    : legacyRecentBlocksFromJson;
 
 const ticketFromJson = json.object({
     id: fromJson.bytes32(),
@@ -17288,6 +17123,17 @@ var index$1 = /*#__PURE__*/Object.freeze({
   validatorDataFromJson: validatorDataFromJson
 });
 
+class Missing {
+    index = tryAsHostCallIndex(2 ** 32 - 1);
+    gasCost = tryAsSmallGas(10);
+    currentServiceId = CURRENT_SERVICE_ID;
+    tracedRegisters = traceRegisters(7);
+    execute(_gas, regs, _memory) {
+        regs.set(7, HostCallResult.WHAT);
+        return Promise.resolve(undefined);
+    }
+}
+
 var ServiceExecutorError;
 (function (ServiceExecutorError) {
     ServiceExecutorError[ServiceExecutorError["NoLookup"] = 0] = "NoLookup";
@@ -17395,7 +17241,7 @@ class WorkPackageExecutor {
 class PvmExecutor {
     serviceCode;
     pvm;
-    hostCalls = new HostCallsManager();
+    hostCalls = new HostCallsManager({ missing: new Missing() });
     pvmInstanceManager = new InterpreterInstanceManager(4);
     constructor(serviceCode) {
         this.serviceCode = serviceCode;
@@ -17544,13 +17390,13 @@ exports.collections = index$l;
 exports.config = index$k;
 exports.config_node = index$g;
 exports.crypto = index$m;
-exports.database = index$b;
-exports.erasure_coding = index$a;
+exports.database = index$c;
+exports.erasure_coding = index$b;
 exports.hash = index$n;
-exports.jam_host_calls = index$9;
+exports.jam_host_calls = index$a;
 exports.json_parser = index$i;
-exports.logger = index$8;
-exports.mmr = index$f;
+exports.logger = index$9;
+exports.mmr = index$8;
 exports.numbers = index$p;
 exports.ordering = index$s;
 exports.pvm = index$3;
@@ -17559,9 +17405,9 @@ exports.pvm_interpreter = index$7;
 exports.pvm_program = index$5;
 exports.pvm_spi_decoder = index$6;
 exports.shuffling = index$2;
-exports.state = index$e;
+exports.state = index$f;
 exports.state_json = index$1;
-exports.state_merkleization = index$c;
+exports.state_merkleization = index$d;
 exports.transition = index;
-exports.trie = index$d;
+exports.trie = index$e;
 exports.utils = index$r;