@typeberry/convert 0.5.0-89f6b41 → 0.5.0-b577adc

package/README.md

@@ -17,7 +17,6 @@ the submitted code. By creating the PR you accept this requirement.**
 
 Gray Paper compliance can be controlled via `GP_VERSION` environment variable.
 
-- [x] 0.6.7
 - [x] 0.7.0
 - [x] 0.7.1
 - [x] 0.7.2

package/index.js

@@ -4254,7 +4254,6 @@ const env = typeof process === "undefined" ? {} : process.env;
 
 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";
     GpVersion["V0_7_2"] = "0.7.2";
@@ -4262,9 +4261,9 @@ var GpVersion;
 var TestSuite;
 (function (TestSuite) {
     TestSuite["W3F_DAVXY"] = "w3f-davxy";
-    TestSuite["JAMDUNA"] = "jamduna";
 })(TestSuite || (TestSuite = {}));
-const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
+// NOTE: Also acts as a supported versions
+const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
 const DEFAULT_VERSION = GpVersion.V0_7_2;
 let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
@@ -9574,7 +9573,7 @@ function workItemExtrinsicsCodec(workItems) {
 /**
  * Work Item which is a part of some work package.
  *
- * https://graypaper.fluffylabs.dev/#/579bd12/198b00199600
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/1a86001a9100?v=0.7.2
  */
 class work_item_WorkItem extends WithDebug {
     service;
@@ -9585,35 +9584,20 @@ class work_item_WorkItem extends WithDebug {
     importSegments;
     extrinsic;
     exportCount;
-    static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_7_0)
-        ? Class(work_item_WorkItem, {
-            service: u32.asOpaque(),
-            codeHash: bytes(hash_HASH_SIZE).asOpaque(),
-            refineGasLimit: u64.asOpaque(),
-            accumulateGasLimit: u64.asOpaque(),
-            exportCount: u16,
-            payload: blob,
-            importSegments: codecKnownSizeArray(ImportSpec.Codec, {
-                minLength: 0,
-                maxLength: MAX_NUMBER_OF_SEGMENTS,
-                typicalLength: MAX_NUMBER_OF_SEGMENTS,
-            }),
-            extrinsic: sequenceVarLen(WorkItemExtrinsicSpec.Codec),
-        })
-        : Class(work_item_WorkItem, {
-            service: u32.asOpaque(),
-            codeHash: bytes(hash_HASH_SIZE).asOpaque(),
-            payload: blob,
-            refineGasLimit: u64.asOpaque(),
-            accumulateGasLimit: u64.asOpaque(),
-            importSegments: codecKnownSizeArray(ImportSpec.Codec, {
-                minLength: 0,
-                maxLength: MAX_NUMBER_OF_SEGMENTS,
-                typicalLength: MAX_NUMBER_OF_SEGMENTS,
-            }),
-            extrinsic: sequenceVarLen(WorkItemExtrinsicSpec.Codec),
-            exportCount: u16,
-        });
+    static Codec = Class(work_item_WorkItem, {
+        service: u32.asOpaque(),
+        codeHash: bytes(hash_HASH_SIZE).asOpaque(),
+        refineGasLimit: u64.asOpaque(),
+        accumulateGasLimit: u64.asOpaque(),
+        exportCount: u16,
+        payload: blob,
+        importSegments: codecKnownSizeArray(ImportSpec.Codec, {
+            minLength: 0,
+            maxLength: MAX_NUMBER_OF_SEGMENTS,
+            typicalLength: MAX_NUMBER_OF_SEGMENTS,
+        }),
+        extrinsic: sequenceVarLen(WorkItemExtrinsicSpec.Codec),
+    });
     static create({ service, codeHash, payload, refineGasLimit, accumulateGasLimit, importSegments, extrinsic, exportCount, }) {
         return new work_item_WorkItem(service, codeHash, payload, refineGasLimit, accumulateGasLimit, importSegments, extrinsic, exportCount);
     }
@@ -9685,23 +9669,14 @@ class work_package_WorkPackage extends WithDebug {
     parametrization;
     context;
     items;
-    static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_7_0)
-        ? Class(work_package_WorkPackage, {
-            authCodeHost: u32.asOpaque(),
-            authCodeHash: bytes(hash_HASH_SIZE).asOpaque(),
-            context: RefineContext.Codec,
-            authorization: blob,
-            parametrization: blob,
-            items: sequenceVarLen(work_item_WorkItem.Codec).convert((x) => x, (items) => FixedSizeArray.new(items, tryAsWorkItemsCount(items.length))),
-        })
-        : Class(work_package_WorkPackage, {
-            authorization: blob,
-            authCodeHost: u32.asOpaque(),
-            authCodeHash: bytes(hash_HASH_SIZE).asOpaque(),
-            parametrization: blob,
-            context: RefineContext.Codec,
-            items: sequenceVarLen(work_item_WorkItem.Codec).convert((x) => x, (items) => FixedSizeArray.new(items, tryAsWorkItemsCount(items.length))),
-        });
+    static Codec = Class(work_package_WorkPackage, {
+        authCodeHost: u32.asOpaque(),
+        authCodeHash: bytes(hash_HASH_SIZE).asOpaque(),
+        context: RefineContext.Codec,
+        authorization: blob,
+        parametrization: blob,
+        items: sequenceVarLen(work_item_WorkItem.Codec).convert((x) => x, (items) => FixedSizeArray.new(items, tryAsWorkItemsCount(items.length))),
+    });
     static create({ authorization, authCodeHost, authCodeHash, parametrization, context, items, }) {
         return new work_package_WorkPackage(authorization, authCodeHost, authCodeHash, parametrization, context, items);
     }
@@ -9951,9 +9926,9 @@ class WorkPackageSpec extends WithDebug {
 /**
  * A report of execution of some work package.
  *
- * https://graypaper.fluffylabs.dev/#/cc517d7/131c01132401?v=0.6.5
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/13bb0113c301?v=0.7.2
  */
-class WorkReportNoCodec extends WithDebug {
+class WorkReport extends WithDebug {
     workPackageSpec;
     context;
     coreIndex;
@@ -9962,17 +9937,32 @@ class WorkReportNoCodec extends WithDebug {
     segmentRootLookup;
     results;
     authorizationGasUsed;
+    static Codec = Class(WorkReport, {
+        workPackageSpec: WorkPackageSpec.Codec,
+        context: RefineContext.Codec,
+        coreIndex: varU32.convert((o) => numbers_tryAsU32(o), (i) => {
+            if (!isU16(i)) {
+                throw new Error(`Core index exceeds U16: ${i}`);
+            }
+            return tryAsCoreIndex(i);
+        }),
+        authorizerHash: bytes(hash_HASH_SIZE).asOpaque(),
+        authorizationGasUsed: varU64.asOpaque(),
+        authorizationOutput: blob,
+        segmentRootLookup: readonlyArray(sequenceVarLen(WorkPackageInfo.Codec)),
+        results: sequenceVarLen(WorkResult.Codec).convert((x) => x, (items) => FixedSizeArray.new(items, tryAsWorkItemsCount(items.length))),
+    });
     static create({ workPackageSpec, context, coreIndex, authorizerHash, authorizationOutput, segmentRootLookup, results, authorizationGasUsed, }) {
-        return new WorkReportNoCodec(workPackageSpec, context, coreIndex, authorizerHash, authorizationOutput, segmentRootLookup, results, authorizationGasUsed);
+        return new WorkReport(workPackageSpec, context, coreIndex, authorizerHash, authorizationOutput, segmentRootLookup, results, authorizationGasUsed);
     }
     constructor(
     /** `s`: Work package specification. */
     workPackageSpec, 
-    /** `x`: Refinement context. */
+    /** `c`: Refinement context. */
     context, 
-    /** `c`: Core index on which the work is done. */
+    /** *`c`*: Core index on which the work is done. */
     coreIndex, 
-    /** `a`: Hash of the authorizer. */
+    /** *`a`*: Hash of the authorizer. */
     authorizerHash, 
     /** `o`: Authorization output. */
     authorizationOutput, 
@@ -9983,7 +9973,7 @@ class WorkReportNoCodec extends WithDebug {
     segmentRootLookup, 
     /** `r`: The results of evaluation of each of the items in the work package. */
     results, 
-    /** `g`: Gas used during authorization. */
+    /** *`g`*: Gas used during authorization. */
     authorizationGasUsed) {
         super();
         this.workPackageSpec = workPackageSpec;
@@ -9996,41 +9986,6 @@ class WorkReportNoCodec extends WithDebug {
         this.authorizationGasUsed = authorizationGasUsed;
     }
 }
-const WorkReportCodec = Class(WorkReportNoCodec, {
-    workPackageSpec: WorkPackageSpec.Codec,
-    context: RefineContext.Codec,
-    coreIndex: varU32.convert((o) => numbers_tryAsU32(o), (i) => {
-        if (!isU16(i)) {
-            throw new Error(`Core index exceeds U16: ${i}`);
-        }
-        return tryAsCoreIndex(i);
-    }),
-    authorizerHash: bytes(hash_HASH_SIZE).asOpaque(),
-    authorizationGasUsed: varU64.asOpaque(),
-    authorizationOutput: blob,
-    segmentRootLookup: readonlyArray(sequenceVarLen(WorkPackageInfo.Codec)),
-    results: sequenceVarLen(WorkResult.Codec).convert((x) => x, (items) => FixedSizeArray.new(items, tryAsWorkItemsCount(items.length))),
-});
-const WorkReportCodecPre070 = Class(WorkReportNoCodec, {
-    workPackageSpec: WorkPackageSpec.Codec,
-    context: RefineContext.Codec,
-    coreIndex: varU32.convert((o) => numbers_tryAsU32(o), (i) => {
-        if (!isU16(i)) {
-            throw new Error(`Core index exceeds U16: ${i}`);
-        }
-        return tryAsCoreIndex(i);
-    }),
-    authorizerHash: bytes(hash_HASH_SIZE).asOpaque(),
-    authorizationOutput: blob,
-    segmentRootLookup: readonlyArray(sequenceVarLen(WorkPackageInfo.Codec)),
-    results: sequenceVarLen(WorkResult.Codec).convert((x) => x, (items) => FixedSizeArray.new(items, tryAsWorkItemsCount(items.length))),
-    authorizationGasUsed: varU64.asOpaque(),
-});
-class WorkReport extends WorkReportNoCodec {
-    static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_7_0)
-        ? WorkReportCodec
-        : WorkReportCodecPre070;
-}
 
 ;// CONCATENATED MODULE: ./packages/jam/block/guarantees.ts
 
@@ -10272,41 +10227,24 @@ const encodeUnsealedHeader = (view) => {
     const encodedUnsealedLen = encodedFullHeader.length - BANDERSNATCH_VRF_SIGNATURE_BYTES;
     return BytesBlob.blobFrom(encodedFullHeader.subarray(0, encodedUnsealedLen));
 };
-/**
- * Codec descriptor with pre 0.7.0 encoding order
- */
-const legacyDescriptor = {
-    parentHeaderHash: bytes(hash_HASH_SIZE).asOpaque(),
-    priorStateRoot: bytes(hash_HASH_SIZE).asOpaque(),
-    extrinsicHash: bytes(hash_HASH_SIZE).asOpaque(),
-    timeSlotIndex: u32.asOpaque(),
-    epochMarker: optional(EpochMarker.Codec),
-    ticketsMarker: optional(TicketsMarker.Codec),
-    offendersMarker: sequenceVarLen(bytes(ED25519_KEY_BYTES).asOpaque()),
-    bandersnatchBlockAuthorIndex: u16.asOpaque(),
-    entropySource: bytes(bandersnatch_BANDERSNATCH_VRF_SIGNATURE_BYTES).asOpaque(),
-    seal: bytes(bandersnatch_BANDERSNATCH_VRF_SIGNATURE_BYTES).asOpaque(),
-};
 /**
  * The header of the JAM block.
  *
- * https://graypaper.fluffylabs.dev/#/579bd12/0c66000c7200
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/0c66000c7200?v=0.7.2
  */
 class header_Header extends WithDebug {
-    static Codec = Class(header_Header, Compatibility.isLessThan(GpVersion.V0_7_0)
-        ? legacyDescriptor
-        : {
-            parentHeaderHash: bytes(hash_HASH_SIZE).asOpaque(),
-            priorStateRoot: bytes(hash_HASH_SIZE).asOpaque(),
-            extrinsicHash: bytes(hash_HASH_SIZE).asOpaque(),
-            timeSlotIndex: u32.asOpaque(),
-            epochMarker: optional(EpochMarker.Codec),
-            ticketsMarker: optional(TicketsMarker.Codec),
-            bandersnatchBlockAuthorIndex: u16.asOpaque(),
-            entropySource: bytes(bandersnatch_BANDERSNATCH_VRF_SIGNATURE_BYTES).asOpaque(),
-            offendersMarker: sequenceVarLen(bytes(ED25519_KEY_BYTES).asOpaque()),
-            seal: bytes(bandersnatch_BANDERSNATCH_VRF_SIGNATURE_BYTES).asOpaque(),
-        });
+    static Codec = Class(header_Header, {
+        parentHeaderHash: bytes(hash_HASH_SIZE).asOpaque(),
+        priorStateRoot: bytes(hash_HASH_SIZE).asOpaque(),
+        extrinsicHash: bytes(hash_HASH_SIZE).asOpaque(),
+        timeSlotIndex: u32.asOpaque(),
+        epochMarker: optional(EpochMarker.Codec),
+        ticketsMarker: optional(TicketsMarker.Codec),
+        bandersnatchBlockAuthorIndex: u16.asOpaque(),
+        entropySource: bytes(bandersnatch_BANDERSNATCH_VRF_SIGNATURE_BYTES).asOpaque(),
+        offendersMarker: sequenceVarLen(bytes(ED25519_KEY_BYTES).asOpaque()),
+        seal: bytes(bandersnatch_BANDERSNATCH_VRF_SIGNATURE_BYTES).asOpaque(),
+    });
     static create(h) {
         return Object.assign(header_Header.empty(), h);
     }
@@ -12729,9 +12667,6 @@ class LookupHistoryItem {
 
 
 
-const codecServiceId = Compatibility.isSuite(TestSuite.W3F_DAVXY) || Compatibility.isSuite(TestSuite.JAMDUNA, GpVersion.V0_6_7)
-    ? u32.asOpaque()
-    : varU32.convert((s) => numbers_tryAsU32(s), (i) => tryAsServiceId(i));
 /**
  * Activity Record of a single validator.
  *
@@ -12787,7 +12722,7 @@ const codecVarGas = varU64.convert((g) => numbers_tryAsU64(g), (i) => tryAsServi
  * Single core statistics.
  * Updated per block, based on incoming work reports (`w`).
  *
- * https://graypaper.fluffylabs.dev/#/68eaa1f/18f10318f103?v=0.6.4
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/197902197902?v=0.7.2
  * https://github.com/gavofyork/graypaper/blob/9bffb08f3ea7b67832019176754df4fb36b9557d/text/statistics.tex#L65
  */
 class CoreStatistics {
@@ -12799,27 +12734,16 @@ class CoreStatistics {
     extrinsicCount;
     bundleSize;
     gasUsed;
-    static Codec = Compatibility.isGreaterOrEqual(GpVersion.V0_7_0)
-        ? Class(CoreStatistics, {
-            dataAvailabilityLoad: varU32,
-            popularity: codecVarU16,
-            imports: codecVarU16,
-            extrinsicCount: codecVarU16,
-            extrinsicSize: varU32,
-            exports: codecVarU16,
-            bundleSize: varU32,
-            gasUsed: codecVarGas,
-        })
-        : Class(CoreStatistics, {
-            dataAvailabilityLoad: varU32,
-            popularity: codecVarU16,
-            imports: codecVarU16,
-            exports: codecVarU16,
-            extrinsicSize: varU32,
-            extrinsicCount: codecVarU16,
-            bundleSize: varU32,
-            gasUsed: codecVarGas,
-        });
+    static Codec = Class(CoreStatistics, {
+        dataAvailabilityLoad: varU32,
+        popularity: codecVarU16,
+        imports: codecVarU16,
+        extrinsicCount: codecVarU16,
+        extrinsicSize: varU32,
+        exports: codecVarU16,
+        bundleSize: 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);
     }
@@ -12860,7 +12784,7 @@ class CoreStatistics {
  * Service statistics.
  * Updated per block, based on available work reports (`W`).
  *
- * https://graypaper.fluffylabs.dev/#/1c979cb/199802199802?v=0.7.1
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/19e20219e202?v=0.7.2
  */
 class ServiceStatistics {
     providedCount;
@@ -12882,29 +12806,15 @@ class ServiceStatistics {
             refinementCount: varU32,
             refinementGasUsed: codecVarGas,
             imports: codecVarU16,
-            exports: codecVarU16,
-            extrinsicSize: varU32,
             extrinsicCount: codecVarU16,
+            extrinsicSize: varU32,
+            exports: codecVarU16,
             accumulateCount: varU32,
             accumulateGasUsed: codecVarGas,
             onTransfersCount: varU32,
             onTransfersGasUsed: codecVarGas,
         }),
         versions: {
-            [GpVersion.V0_7_0]: Class(ServiceStatistics, {
-                providedCount: codecVarU16,
-                providedSize: varU32,
-                refinementCount: varU32,
-                refinementGasUsed: codecVarGas,
-                imports: codecVarU16,
-                extrinsicCount: codecVarU16,
-                extrinsicSize: varU32,
-                exports: codecVarU16,
-                accumulateCount: varU32,
-                accumulateGasUsed: codecVarGas,
-                onTransfersCount: varU32,
-                onTransfersGasUsed: codecVarGas,
-            }),
             [GpVersion.V0_7_1]: Class(ServiceStatistics, {
                 providedCount: codecVarU16,
                 providedSize: varU32,
@@ -12979,7 +12889,7 @@ class StatisticsData {
         current: codecPerValidator(ValidatorStatistics.Codec),
         previous: codecPerValidator(ValidatorStatistics.Codec),
         cores: codecPerCore(CoreStatistics.Codec),
-        services: dictionary(codecServiceId, ServiceStatistics.Codec, {
+        services: dictionary(u32.asOpaque(), ServiceStatistics.Codec, {
             sortKeys: (a, b) => a - b,
         }),
     });
@@ -14320,8 +14230,6 @@ function binaryMerkleization(input, hasher) {
 
 
 
-
-const U32_BYTES = 4;
 /** Numeric mapping for state entries. */
 var StateKeyIdx;
 (function (StateKeyIdx) {
@@ -14384,35 +14292,16 @@ var stateKeys;
     stateKeys.serviceInfo = serviceInfo;
     /** https://graypaper.fluffylabs.dev/#/1c979cb/3bba033bba03?v=0.7.1 */
     function serviceStorage(blake2b, serviceId, key) {
-        if (Compatibility.isLessThan(GpVersion.V0_6_7)) {
-            const out = bytes_Bytes.zero(hash_HASH_SIZE);
-            out.raw.set(numbers_u32AsLeBytes(numbers_tryAsU32(2 ** 32 - 1)), 0);
-            out.raw.set(key.raw.subarray(0, hash_HASH_SIZE - U32_BYTES), U32_BYTES);
-            return legacyServiceNested(serviceId, out);
-        }
         return serviceNested(blake2b, serviceId, numbers_tryAsU32(2 ** 32 - 1), key);
     }
     stateKeys.serviceStorage = serviceStorage;
     /** https://graypaper.fluffylabs.dev/#/1c979cb/3bd7033bd703?v=0.7.1 */
     function servicePreimage(blake2b, serviceId, hash) {
-        if (Compatibility.isLessThan(GpVersion.V0_6_7)) {
-            const out = bytes_Bytes.zero(hash_HASH_SIZE);
-            out.raw.set(numbers_u32AsLeBytes(numbers_tryAsU32(2 ** 32 - 2)), 0);
-            out.raw.set(hash.raw.subarray(1, hash_HASH_SIZE - U32_BYTES + 1), U32_BYTES);
-            return legacyServiceNested(serviceId, out);
-        }
         return serviceNested(blake2b, serviceId, numbers_tryAsU32(2 ** 32 - 2), hash);
     }
     stateKeys.servicePreimage = servicePreimage;
     /** https://graypaper.fluffylabs.dev/#/1c979cb/3b0a043b0a04?v=0.7.1 */
     function serviceLookupHistory(blake2b, serviceId, hash, preimageLength) {
-        if (Compatibility.isLessThan(GpVersion.V0_6_7)) {
-            const doubleHash = blake2b.hashBytes(hash);
-            const out = bytes_Bytes.zero(hash_HASH_SIZE);
-            out.raw.set(numbers_u32AsLeBytes(preimageLength), 0);
-            out.raw.set(doubleHash.raw.subarray(2, hash_HASH_SIZE - U32_BYTES + 2), U32_BYTES);
-            return legacyServiceNested(serviceId, out);
-        }
         return serviceNested(blake2b, serviceId, preimageLength, hash);
     }
     stateKeys.serviceLookupHistory = serviceLookupHistory;
@@ -14436,16 +14325,16 @@ var stateKeys;
 })(stateKeys || (stateKeys = {}));
 /** https://graypaper.fluffylabs.dev/#/85129da/380101380101?v=0.6.3 */
 function legacyServiceNested(serviceId, hash) {
-    const key = bytes_Bytes.zero(hash_HASH_SIZE);
+    const key = Bytes.zero(HASH_SIZE);
     let i = 0;
-    for (const byte of numbers_u32AsLeBytes(serviceId)) {
+    for (const byte of u32AsLeBytes(serviceId)) {
         key.raw[i] = byte;
         key.raw[i + 1] = hash.raw[i / 2];
         i += 2;
     }
     // no need to floor, since we know it's divisible (adding +2 every iteration).
     const middle = i / 2;
-    key.raw.set(hash.raw.subarray(middle, hash_HASH_SIZE - middle), i);
+    key.raw.set(hash.raw.subarray(middle, HASH_SIZE - middle), i);
     return key.asOpaque();
 }
 
@@ -14689,8 +14578,6 @@ class SerializedStateView {
 
 
 
-
-
 /**
  * State object which reads it's entries from some backend.
  *
@@ -14848,14 +14735,6 @@ class SerializedService {
     }
     /** Retrieve a storage item. */
     getStorage(rawKey) {
-        if (Compatibility.isLessThan(GpVersion.V0_6_7)) {
-            const SERVICE_ID_BYTES = 4;
-            const serviceIdAndKey = safe_alloc_uint8array_safeAllocUint8Array(SERVICE_ID_BYTES + rawKey.length);
-            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_serialize.serviceStorage(this.blake2b, this.serviceId, key)) ?? null;
-        }
         return this.retrieveOptional(serialize_serialize.serviceStorage(this.blake2b, this.serviceId, rawKey)) ?? null;
     }
     /**