Remove validation during parsing

bin/convert/types.ts

@@ -56,7 +56,7 @@ export const SUPPORTED_TYPES: readonly SupportedType[] = [
     name: "header",
     encode: Header.Codec,
     decode: Header.Codec,
-    json: (spec: ChainSpec) => headerFromJson(spec),
+    json: (_spec: ChainSpec) => headerFromJson,
     process: {
       options: ["as-hash"],
       run(spec, data, option, blake2b) {
@@ -132,7 +132,7 @@ export const SUPPORTED_TYPES: readonly SupportedType[] = [
     name: "stf-genesis",
     encode: StateTransitionGenesis.Codec,
     decode: StateTransitionGenesis.Codec,
-    json: (spec: ChainSpec) => StateTransitionGenesis.fromJson(spec),
+    json: (_spec: ChainSpec) => StateTransitionGenesis.fromJson,
     process: {
       options: ["as-state", "as-jip4", "as-fuzz-message"],
       run(spec: ChainSpec, data: unknown, option: string, blake2b) {

bin/test-runner/jam-conformance-071.ts

@@ -12,13 +12,6 @@ main(runners, "test-vectors/jam-conformance/fuzz-reports/0.7.1/traces", {
     // no timeslot in pre-state - valid behavior
     "1763371531/00000042.json",
     "1763489287/00000872.json",
-    // WorkItemsCount === 0 - valid behavior
-    "1763371098/00000006.json",
-    "1763372314/00000094.json",
-    // Invalid ticket attempt - valid behavior
-    "1763371155/00000055.json",
-    "1763488328/00000051.json",
-    "1763487981/00000051.json",
   ],
 })
   .then((r) => logger.log`${r}`)

bin/test-runner/jam-conformance-072.ts

@@ -10,30 +10,6 @@ main(runners, "test-vectors/jam-conformance/fuzz-reports/0.7.2/traces", {
 
     // Block should be rejected?
     "1766565819_2010/00000225.json",
-
-    // Rejecting for WorkItemsCount: valid behavior
-    "1766244251_2939/00001634.json",
-    "1766243861_2056/00000022.json",
-    "1766243861_5589/00000207.json",
-    "1766479507_3250/00000001.json",
-    "1766565819_9888/00001868.json",
-    "1767871405_3616/00000386.json",
-    "1767872928_6833/00003568.json",
-    "1767872928_7682/00000035.json",
-    "1767895984_2203/00012889.json",
-    "1767895984_2519/00008157.json",
-    "1767895984_3511/00000469.json",
-    "1767895984_4076/00010619.json",
-    "1767896003_1048/00005219.json",
-    "1767896003_2541/00013907.json",
-    // Rejecting for invalid ticket attempt: valid behavior
-    "1766244251_1816/00000377.json",
-    "1766244122_5414/00000482.json",
-    "1766243315_2277/00000123.json",
-    "1766565819_7584/00000277.json",
-    "1767872928_1994/00000399.json",
-    "1767889897_4774/00002350.json",
-    "1767889897_7743/00000301.json",
   ],
 })
   .then((r) => logger.log`${r}`)

bin/test-runner/w3f/runners.ts

@@ -67,8 +67,8 @@ export const runners = [
   runner("pvm", runPvmTest).fromJson(PvmTest.fromJson),
   runner("gas-cost-tests", runPvmGasCostTest).fromJson(PvmGasCostTest.fromJson),
   runner("reports", runReportsTest, tinyFull).fromJson(ReportsTest.fromJson),
-  runner("safrole", runSafroleTest, tiny).fromJson(SafroleTest.fromJson(tinyChainSpec)),
-  runner("safrole", runSafroleTest, full).fromJson(SafroleTest.fromJson(fullChainSpec)),
+  runner("safrole", runSafroleTest, tiny).fromJson(SafroleTest.fromJson),
+  runner("safrole", runSafroleTest, full).fromJson(SafroleTest.fromJson),
   runner("shuffle", runShufflingTests).fromJson(shufflingTestsFromJson),
   runner("statistics/tiny", runStatisticsTestTiny, tiny).fromJson(StatisticsTestTiny.fromJson),
   runner("statistics/full", runStatisticsTestFull, full).fromJson(StatisticsTestFull.fromJson),
@@ -92,14 +92,12 @@ function codecRunners(flavor: "tiny" | "full") {
     runner(`codec/${flavor}/guarantees_extrinsic`, runGuaranteesExtrinsicTest, [spec]).fromJson(
       guaranteesExtrinsicFromJson,
     ),
-    runner(`codec/${flavor}/header`, runHeaderTest, [spec]).fromJson(headerFromJson(spec)),
+    runner(`codec/${flavor}/header`, runHeaderTest, [spec]).fromJson(headerFromJson),
     runner(`codec/${flavor}/preimages_extrinsic`, runPreimagesExtrinsicTest, [spec]).fromJson(
       preimagesExtrinsicFromJson,
     ),
     runner(`codec/${flavor}/refine_context`, runRefineContextTest, [spec]).fromJson(refineContextFromJson),
-    runner(`codec/${flavor}/tickets_extrinsic`, runTicketsExtrinsicTest, [spec]).fromJson(
-      ticketsExtrinsicFromJson(spec),
-    ),
+    runner(`codec/${flavor}/tickets_extrinsic`, runTicketsExtrinsicTest, [spec]).fromJson(ticketsExtrinsicFromJson),
     runner(`codec/${flavor}/work_item`, runWorkItemTest, [spec]).fromJson(workItemFromJson),
     runner(`codec/${flavor}/work_package`, runWorkPackageTest, [spec]).fromJson(workPackageFromJson),
     runner(`codec/${flavor}/work_report`, runWorkReportTest, [spec]).fromJson(workReportFromJson),

bin/test-runner/w3f/safrole.ts

@@ -61,20 +61,18 @@ export enum TestErrorCode {
 }
 
 class JsonState {
-  static fromJson(spec: ChainSpec): FromJson<JsonState> {
-    return {
-      tau: "number",
-      eta: json.array(fromJson.bytes32()),
-      lambda: json.array(validatorDataFromJson),
-      kappa: json.array(validatorDataFromJson),
-      gamma_k: json.array(validatorDataFromJson),
-      iota: json.array(validatorDataFromJson),
-      gamma_a: json.array(ticketFromJson(spec)),
-      gamma_s: TicketsOrKeys.fromJson(spec),
-      gamma_z: json.fromString((v) => Bytes.parseBytes(v, BANDERSNATCH_RING_ROOT_BYTES).asOpaque()),
-      post_offenders: json.array(fromJson.bytes32()),
-    };
-  }
+  static fromJson: FromJson<JsonState> = {
+    tau: "number",
+    eta: json.array(fromJson.bytes32()),
+    lambda: json.array(validatorDataFromJson),
+    kappa: json.array(validatorDataFromJson),
+    gamma_k: json.array(validatorDataFromJson),
+    iota: json.array(validatorDataFromJson),
+    gamma_a: json.array(ticketFromJson),
+    gamma_s: TicketsOrKeys.fromJson(),
+    gamma_z: json.fromString((v) => Bytes.parseBytes(v, BANDERSNATCH_RING_ROOT_BYTES).asOpaque()),
+    post_offenders: json.array(fromJson.bytes32()),
+  };
   // timeslot
   tau!: TimeSlot;
   // entropy
@@ -124,23 +122,19 @@ export class EpochMark {
 }
 
 export class OkOutput {
-  static fromJson(spec: ChainSpec): FromJson<OkOutput> {
-    return {
-      epoch_mark: json.optional(EpochMark.fromJson),
-      tickets_mark: json.optional<Ticket[]>(json.array(ticketFromJson(spec))),
-    };
-  }
+  static fromJson: FromJson<OkOutput> = {
+    epoch_mark: json.optional(EpochMark.fromJson),
+    tickets_mark: json.optional<Ticket[]>(json.array(ticketFromJson)),
+  };
   epoch_mark?: EpochMark | null;
   tickets_mark?: Ticket[] | null;
 }
 
 export class Output {
-  static fromJson(spec: ChainSpec): FromJson<Output> {
-    return {
-      ok: json.optional(OkOutput.fromJson(spec)),
-      err: json.optional("string"),
-    };
-  }
+  static fromJson: FromJson<Output> = {
+    ok: json.optional(OkOutput.fromJson),
+    err: json.optional("string"),
+  };
 
   ok?: OkOutput;
   err?: TestErrorCode;
@@ -202,14 +196,12 @@ class TestInput {
 }
 
 export class SafroleTest {
-  static fromJson(spec: ChainSpec): FromJson<SafroleTest> {
-    return {
-      input: TestInput.fromJson,
-      pre_state: JsonState.fromJson(spec),
-      output: Output.fromJson(spec),
-      post_state: JsonState.fromJson(spec),
-    };
-  }
+  static fromJson: FromJson<SafroleTest> = {
+    input: TestInput.fromJson,
+    pre_state: JsonState.fromJson,
+    output: Output.fromJson,
+    post_state: JsonState.fromJson,
+  };
 
   input!: TestInput;
   pre_state!: JsonState;

packages/jam/block-json/block.ts

@@ -7,7 +7,7 @@ import { headerFromJson } from "./header.js";
 export const blockFromJson = (spec: ChainSpec) =>
   json.object<Block>(
     {
-      header: headerFromJson(spec),
+      header: headerFromJson,
       extrinsic: getExtrinsicFromJson(spec),
     },
     ({ header, extrinsic }) => Block.create({ header, extrinsic }),

packages/jam/block-json/common.ts

@@ -1,6 +1,5 @@
 import { type TicketAttempt, tryAsTicketAttempt } from "@typeberry/block/tickets.js";
 import { Bytes, BytesBlob } from "@typeberry/bytes";
-import type { ChainSpec } from "@typeberry/config";
 import type { Ed25519Signature } from "@typeberry/crypto";
 import { type FromJson, json } from "@typeberry/json-parser";
 
@@ -22,10 +21,9 @@ export namespace fromJson {
 
   export const ed25519Signature = json.fromString<Ed25519Signature>((v) => Bytes.parseBytes(v, 64).asOpaque());
 
-  export const ticketAttempt = (spec: ChainSpec) =>
-    json.fromNumber((v) => {
-      return tryAsTicketAttempt(v, spec);
-    }) as FromJson<TicketAttempt>;
+  export const ticketAttempt = json.fromNumber((v) => {
+    return tryAsTicketAttempt(v);
+  }) as FromJson<TicketAttempt>;
 
   export const uint8Array = json.fromAny((v) => {
     if (Array.isArray(v)) {

packages/jam/block-json/extrinsic.ts

@@ -11,7 +11,7 @@ import { ticketsExtrinsicFromJson } from "./tickets-extrinsic.js";
 export const getExtrinsicFromJson = (ctx: ChainSpec) =>
   json.object<Extrinsic>(
     {
-      tickets: ticketsExtrinsicFromJson(ctx),
+      tickets: ticketsExtrinsicFromJson,
       preimages: preimagesExtrinsicFromJson,
       guarantees: guaranteesExtrinsicFromJson,
       assurances: getAssurancesExtrinsicFromJson(ctx),

packages/jam/block-json/header.ts

@@ -13,7 +13,6 @@ import {
 } from "@typeberry/block";
 import { Ticket } from "@typeberry/block/tickets.js";
 import { Bytes } from "@typeberry/bytes";
-import type { ChainSpec } from "@typeberry/config";
 import type { BandersnatchKey, Ed25519Key } from "@typeberry/crypto";
 import type { BandersnatchVrfSignature } from "@typeberry/crypto/bandersnatch.js";
 import { json } from "@typeberry/json-parser";
@@ -58,57 +57,55 @@ type JsonHeader = {
   seal: BandersnatchVrfSignature;
 };
 
-export const headerFromJson = (spec: ChainSpec) => {
-  const ticket = json.object<Ticket>(
-    {
-      id: fromJson.bytes32(),
-      attempt: fromJson.ticketAttempt(spec),
-    },
-    (x) => Ticket.create({ id: x.id, attempt: x.attempt }),
-  );
+const ticket = json.object<Ticket>(
+  {
+    id: fromJson.bytes32(),
+    attempt: fromJson.ticketAttempt,
+  },
+  (x) => Ticket.create({ id: x.id, attempt: x.attempt }),
+);
 
-  return json.object<JsonHeader, Header>(
-    {
-      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<Ed25519Key>()),
-      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,
+export const headerFromJson = json.object<JsonHeader, Header>(
+  {
+    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<Ed25519Key>()),
+    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: asOpaqueType(tickets_mark) });
+    return 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 epochMarker = epoch_mark ?? null;
-      const ticketsMarker =
-        tickets_mark === undefined || tickets_mark === null
-          ? null
-          : TicketsMarker.create({ tickets: asOpaqueType(tickets_mark) });
-      return 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,
-      });
-    },
-  );
-};
+    });
+  },
+);

packages/jam/block-json/tickets-extrinsic.ts

@@ -1,18 +1,15 @@
 import { SignedTicket } from "@typeberry/block/tickets.js";
 import { Bytes } from "@typeberry/bytes";
-import type { ChainSpec } from "@typeberry/config";
 import { BANDERSNATCH_PROOF_BYTES } from "@typeberry/crypto/bandersnatch.js";
 import { json } from "@typeberry/json-parser";
 import { fromJson } from "./common.js";
 
-export const ticketsExtrinsicFromJson = (spec: ChainSpec) => {
-  const ticketEnvelopeFromJson = json.object<SignedTicket>(
-    {
-      attempt: fromJson.ticketAttempt(spec),
-      signature: json.fromString((v) => Bytes.parseBytes(v, BANDERSNATCH_PROOF_BYTES).asOpaque()),
-    },
-    (x) => SignedTicket.create({ attempt: x.attempt, signature: x.signature }),
-  );
+const ticketEnvelopeFromJson = json.object<SignedTicket>(
+  {
+    attempt: fromJson.ticketAttempt,
+    signature: json.fromString((v) => Bytes.parseBytes(v, BANDERSNATCH_PROOF_BYTES).asOpaque()),
+  },
+  (x) => SignedTicket.create({ attempt: x.attempt, signature: x.signature }),
+);
 
-  return json.array(ticketEnvelopeFromJson);
-};
+export const ticketsExtrinsicFromJson = json.array(ticketEnvelopeFromJson);

packages/jam/block-json/work-result.ts

@@ -58,15 +58,15 @@ type JsonWorkExecResult = {
 
 const workRefineLoadFromJson = json.object<JsonWorkRefineLoad, WorkRefineLoad>(
   {
-    gas_used: json.fromNumber((x) => tryAsServiceGas(x)),
+    gas_used: json.fromBigInt((x) => tryAsServiceGas(x)),
     imports: "number",
     extrinsic_count: "number",
     extrinsic_size: "number",
     exports: "number",
   },
   ({ gas_used, imports, extrinsic_count, extrinsic_size, exports }) =>
     WorkRefineLoad.create({
-      gasUsed: tryAsServiceGas(gas_used),
+      gasUsed: gas_used,
       importedSegments: tryAsU32(imports),
       extrinsicCount: tryAsU32(extrinsic_count),
       extrinsicSize: tryAsU32(extrinsic_size),