Skip to content

TicketAttempt validation and encoding fix #913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomusdrw merged 3 commits into from
Feb 19, 2026
Merged

TicketAttempt validation and encoding fix #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6b66d4
TicketAttempt validation and encoding fix.
tomusdrw Feb 18, 2026
0310541
Merge branch 'main' into td-fix-enc
tomusdrw Feb 18, 2026
f6a904a
Fix build
tomusdrw Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/convert/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const SUPPORTED_TYPES: readonly SupportedType[] = [
name: "header",
encode: Header.Codec,
decode: Header.Codec,
json: (_spec: ChainSpec) => headerFromJson,
json: (spec: ChainSpec) => headerFromJson(spec),
process: {
options: ["as-hash"],
run(spec, data, option, blake2b) {
Expand Down Expand Up @@ -132,7 +132,7 @@ export const SUPPORTED_TYPES: readonly SupportedType[] = [
name: "stf-genesis",
encode: StateTransitionGenesis.Codec,
decode: StateTransitionGenesis.Codec,
json: () => StateTransitionGenesis.fromJson,
json: (spec: ChainSpec) => StateTransitionGenesis.fromJson(spec),
process: {
options: ["as-state", "as-jip4", "as-fuzz-message"],
run(spec: ChainSpec, data: unknown, option: string, blake2b) {
Expand Down
9 changes: 6 additions & 3 deletions bin/test-runner/w3f/runners.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +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, tinyFull).fromJson(SafroleTest.fromJson),
runner("safrole", runSafroleTest, tiny).fromJson(SafroleTest.fromJson(tinyChainSpec)),
runner("safrole", runSafroleTest, full).fromJson(SafroleTest.fromJson(fullChainSpec)),
runner("shuffle", runShufflingTests).fromJson(shufflingTestsFromJson),
runner("statistics/tiny", runStatisticsTestTiny, tiny).fromJson(StatisticsTestTiny.fromJson),
runner("statistics/full", runStatisticsTestFull, full).fromJson(StatisticsTestFull.fromJson),
Expand All @@ -91,12 +92,14 @@ function codecRunners(flavor: "tiny" | "full") {
runner(`codec/${flavor}/guarantees_extrinsic`, runGuaranteesExtrinsicTest, [spec]).fromJson(
guaranteesExtrinsicFromJson,
),
runner(`codec/${flavor}/header`, runHeaderTest, [spec]).fromJson(headerFromJson),
runner(`codec/${flavor}/header`, runHeaderTest, [spec]).fromJson(headerFromJson(spec)),
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),
runner(`codec/${flavor}/tickets_extrinsic`, runTicketsExtrinsicTest, [spec]).fromJson(
ticketsExtrinsicFromJson(spec),
),
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),
Expand Down
60 changes: 34 additions & 26 deletions bin/test-runner/w3f/safrole.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,20 @@ export enum TestErrorCode {
}

class JsonState {
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()),
};
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()),
};
}
// timeslot
tau!: TimeSlot;
// entropy
Expand Down Expand Up @@ -122,19 +124,23 @@ export class EpochMark {
}

export class OkOutput {
static fromJson: FromJson<OkOutput> = {
epoch_mark: json.optional(EpochMark.fromJson),
tickets_mark: json.optional<Ticket[]>(json.array(ticketFromJson)),
};
static fromJson(spec: ChainSpec): FromJson<OkOutput> {
return {
epoch_mark: json.optional(EpochMark.fromJson),
tickets_mark: json.optional<Ticket[]>(json.array(ticketFromJson(spec))),
};
}
epoch_mark?: EpochMark | null;
tickets_mark?: Ticket[] | null;
}

export class Output {
static fromJson: FromJson<Output> = {
ok: json.optional(OkOutput.fromJson),
err: json.optional("string"),
};
static fromJson(spec: ChainSpec): FromJson<Output> {
return {
ok: json.optional(OkOutput.fromJson(spec)),
err: json.optional("string"),
};
}

ok?: OkOutput;
err?: TestErrorCode;
Expand Down Expand Up @@ -196,12 +202,14 @@ class TestInput {
}

export class SafroleTest {
static fromJson: FromJson<SafroleTest> = {
input: TestInput.fromJson,
pre_state: JsonState.fromJson,
output: Output.fromJson,
post_state: JsonState.fromJson,
};
static fromJson(spec: ChainSpec): FromJson<SafroleTest> {
return {
input: TestInput.fromJson,
pre_state: JsonState.fromJson(spec),
output: Output.fromJson(spec),
post_state: JsonState.fromJson(spec),
};
}

input!: TestInput;
pre_state!: JsonState;
Expand Down
Loading
Loading