@typeberry/convert 0.5.7 → 0.5.8-0dea783

package/index.js

@@ -4615,7 +4615,7 @@ function seeThrough(v) {
 }
 
 ;// CONCATENATED MODULE: ./packages/core/utils/package.json
-const package_namespaceObject = {"rE":"0.5.7"};
+const package_namespaceObject = {"rE":"0.5.8"};
 ;// CONCATENATED MODULE: ./packages/core/utils/result.ts
 
 /**
@@ -10187,16 +10187,24 @@ const guaranteesExtrinsicCodec = codecWithContext((context) => codecKnownSizeArr
 
 
 
-function tryAsTicketAttempt(x) {
+function tryAsTicketAttempt(x, chainSpec) {
+    if (x >= chainSpec.ticketsPerValidator) {
+        throw new Error(`Ticket attempt ${x} is out of bounds [0, ${chainSpec.ticketsPerValidator})`);
+    }
     return opaque_asOpaqueType(tryAsU8(x));
 }
+const ticketAttemptCodec = codecWithContext((context) => {
+    return codec_codec.varU32.convert((x) => {
+        tryAsTicketAttempt(x, context);
+        return numbers_tryAsU32(x);
+    }, (x) => tryAsTicketAttempt(x, context));
+});
 /* Bandersnatch-signed ticket contest entry. */
 class SignedTicket extends WithDebug {
     attempt;
     signature;
     static Codec = codec_codec.Class(SignedTicket, {
-        // TODO [ToDr] we should verify that attempt is either 0|1|2.
-        attempt: codec_codec.u8.asOpaque(),
+        attempt: ticketAttemptCodec,
         signature: codec_codec.bytes(BANDERSNATCH_PROOF_BYTES).asOpaque(),
     });
     static create({ attempt, signature }) {
@@ -10218,8 +10226,7 @@ class Ticket extends WithDebug {
     attempt;
     static Codec = codec_codec.Class(Ticket, {
         id: codec_codec.bytes(hash_HASH_SIZE),
-        // TODO [ToDr] we should verify that attempt is either 0|1|2.
-        attempt: codec_codec.u8.asOpaque(),
+        attempt: ticketAttemptCodec,
     });
     static create({ id, attempt }) {
         return new Ticket(id, attempt);
@@ -10857,11 +10864,8 @@ var fromJson;
     fromJson.bytesBlob = json.fromString(bytes_BytesBlob.parseBlob);
     fromJson.bytesBlobNoPrefix = json.fromString(bytes_BytesBlob.parseBlobNoPrefix);
     fromJson.ed25519Signature = json.fromString((v) => bytes_Bytes.parseBytes(v, 64).asOpaque());
-    fromJson.ticketAttempt = json.fromNumber((v) => {
-        if (v !== 0 && v !== 1 && v !== 2) {
-            throw new Error("Invalid TicketAttempt value.");
-        }
-        return tryAsTicketAttempt(v);
+    fromJson.ticketAttempt = (spec) => json.fromNumber((v) => {
+        return tryAsTicketAttempt(v, spec);
     });
     fromJson.uint8Array = json.fromAny((v) => {
         if (Array.isArray(v)) {
@@ -11101,11 +11105,13 @@ const preimagesExtrinsicFromJson = json.array(preimageFromJson);
 
 
 
-const ticketEnvelopeFromJson = json.object({
-    attempt: fromJson.ticketAttempt,
-    signature: json.fromString((v) => bytes_Bytes.parseBytes(v, BANDERSNATCH_PROOF_BYTES).asOpaque()),
-}, (x) => SignedTicket.create({ attempt: x.attempt, signature: x.signature }));
-const ticketsExtrinsicFromJson = json.array(ticketEnvelopeFromJson);
+const ticketsExtrinsicFromJson = (spec) => {
+    const ticketEnvelopeFromJson = json.object({
+        attempt: fromJson.ticketAttempt(spec),
+        signature: json.fromString((v) => bytes_Bytes.parseBytes(v, BANDERSNATCH_PROOF_BYTES).asOpaque()),
+    }, (x) => SignedTicket.create({ attempt: x.attempt, signature: x.signature }));
+    return json.array(ticketEnvelopeFromJson);
+};
 
 ;// CONCATENATED MODULE: ./packages/jam/block-json/extrinsic.ts
 
@@ -11116,7 +11122,7 @@ const ticketsExtrinsicFromJson = json.array(ticketEnvelopeFromJson);
 
 
 const getExtrinsicFromJson = (ctx) => json.object({
-    tickets: ticketsExtrinsicFromJson,
+    tickets: ticketsExtrinsicFromJson(ctx),
     preimages: preimagesExtrinsicFromJson,
     guarantees: guaranteesExtrinsicFromJson,
     assurances: getAssurancesExtrinsicFromJson(ctx),
@@ -11140,39 +11146,41 @@ const epochMark = json.object({
     tickets_entropy: fromJson.bytes32(),
     validators: json.array(validatorKeysFromJson),
 }, (x) => EpochMarker.create({ entropy: x.entropy, ticketsEntropy: x.tickets_entropy, validators: x.validators }));
-const ticket = json.object({
-    id: fromJson.bytes32(),
-    attempt: fromJson.ticketAttempt,
-}, (x) => Ticket.create({ id: x.id, attempt: x.attempt }));
-const headerFromJson = json.object({
-    parent: fromJson.bytes32(),
-    parent_state_root: fromJson.bytes32(),
-    extrinsic_hash: fromJson.bytes32(),
-    slot: "number",
-    epoch_mark: json.optional(epochMark),
-    tickets_mark: json.optional(json.array(ticket)),
-    offenders_mark: json.array(fromJson.bytes32()),
-    author_index: "number",
-    entropy_source: bandersnatchVrfSignature,
-    seal: bandersnatchVrfSignature,
-}, ({ parent, parent_state_root, extrinsic_hash, slot, epoch_mark, tickets_mark, offenders_mark, author_index, entropy_source, seal, }) => {
-    const epochMarker = epoch_mark ?? null;
-    const ticketsMarker = tickets_mark === undefined || tickets_mark === null
-        ? null
-        : TicketsMarker.create({ tickets: opaque_asOpaqueType(tickets_mark) });
-    return header_Header.create({
-        parentHeaderHash: parent,
-        priorStateRoot: parent_state_root,
-        extrinsicHash: extrinsic_hash,
-        timeSlotIndex: slot,
-        epochMarker,
-        ticketsMarker,
-        offendersMarker: offenders_mark,
-        bandersnatchBlockAuthorIndex: author_index,
-        entropySource: entropy_source,
-        seal,
+const headerFromJson = (spec) => {
+    const ticket = json.object({
+        id: fromJson.bytes32(),
+        attempt: fromJson.ticketAttempt(spec),
+    }, (x) => Ticket.create({ id: x.id, attempt: x.attempt }));
+    return json.object({
+        parent: fromJson.bytes32(),
+        parent_state_root: fromJson.bytes32(),
+        extrinsic_hash: fromJson.bytes32(),
+        slot: "number",
+        epoch_mark: json.optional(epochMark),
+        tickets_mark: json.optional(json.array(ticket)),
+        offenders_mark: json.array(fromJson.bytes32()),
+        author_index: "number",
+        entropy_source: bandersnatchVrfSignature,
+        seal: bandersnatchVrfSignature,
+    }, ({ parent, parent_state_root, extrinsic_hash, slot, epoch_mark, tickets_mark, offenders_mark, author_index, entropy_source, seal, }) => {
+        const epochMarker = epoch_mark ?? null;
+        const ticketsMarker = tickets_mark === undefined || tickets_mark === null
+            ? null
+            : TicketsMarker.create({ tickets: opaque_asOpaqueType(tickets_mark) });
+        return header_Header.create({
+            parentHeaderHash: parent,
+            priorStateRoot: parent_state_root,
+            extrinsicHash: extrinsic_hash,
+            timeSlotIndex: slot,
+            epochMarker,
+            ticketsMarker,
+            offendersMarker: offenders_mark,
+            bandersnatchBlockAuthorIndex: author_index,
+            entropySource: entropy_source,
+            seal,
+        });
     });
-});
+};
 
 ;// CONCATENATED MODULE: ./packages/jam/block-json/block.ts
 
@@ -11180,7 +11188,7 @@ const headerFromJson = json.object({
 
 
 const blockFromJson = (spec) => json.object({
-    header: headerFromJson,
+    header: headerFromJson(spec),
     extrinsic: getExtrinsicFromJson(spec),
 }, ({ header, extrinsic }) => Block.create({ header, extrinsic }));
 const blockViewFromJson = (spec) => {
@@ -14032,15 +14040,17 @@ const recentBlocksHistoryFromJson = json.object({
 
 
 
-const ticketFromJson = json.object({
+const ticketFromJson = (spec) => json.object({
     id: fromJson.bytes32(),
-    attempt: fromJson.ticketAttempt,
+    attempt: fromJson.ticketAttempt(spec),
 }, Ticket.create);
 class TicketsOrKeys {
-    static fromJson = {
-        keys: json.optional(json.array(fromJson.bytes32())),
-        tickets: json.optional(json.array(ticketFromJson)),
-    };
+    static fromJson(spec) {
+        return {
+            keys: json.optional(json.array(fromJson.bytes32())),
+            tickets: json.optional(json.array(ticketFromJson(spec))),
+        };
+    }
     keys;
     tickets;
     static toSafroleSealingKeys(data, chainSpec) {
@@ -14214,8 +14224,8 @@ const fullStateDumpFromJson = (spec) => json.object({
     beta: json.nullable(recentBlocksHistoryFromJson),
     gamma: {
         gamma_k: json.array(validatorDataFromJson),
-        gamma_a: json.array(ticketFromJson),
-        gamma_s: TicketsOrKeys.fromJson,
+        gamma_a: json.array(ticketFromJson(spec)),
+        gamma_s: TicketsOrKeys.fromJson(spec),
         gamma_z: json.fromString((v) => bytes_Bytes.parseBytes(v, BANDERSNATCH_RING_ROOT_BYTES).asOpaque()),
     },
     psi: disputesRecordsFromJson,
@@ -16068,10 +16078,12 @@ class TestState {
     keyvals;
 }
 class StateTransitionGenesis {
-    static fromJson = {
-        header: headerFromJson,
-        state: TestState.fromJson,
-    };
+    static fromJson(spec = chain_spec_tinyChainSpec) {
+        return {
+            header: headerFromJson(spec),
+            state: TestState.fromJson,
+        };
+    }
     static Codec = codec_codec.object({
         header: header_Header.Codec,
         state: TestState.Codec,
@@ -20131,7 +20143,7 @@ const SUPPORTED_TYPES = [
         name: "header",
         encode: header_Header.Codec,
         decode: header_Header.Codec,
-        json: (_spec) => headerFromJson,
+        json: (spec) => headerFromJson(spec),
         process: {
             options: ["as-hash"],
             run(spec, data, option, blake2b) {
@@ -20204,7 +20216,7 @@ const SUPPORTED_TYPES = [
         name: "stf-genesis",
         encode: StateTransitionGenesis.Codec,
         decode: StateTransitionGenesis.Codec,
-        json: () => StateTransitionGenesis.fromJson,
+        json: (spec) => StateTransitionGenesis.fromJson(spec),
         process: {
             options: ["as-state", "as-jip4", "as-fuzz-message"],
             run(spec, data, option, blake2b) {