Skip to content

Commit 6018d20

Browse files
committed
fix idl build issue
1 parent 853a4af commit 6018d20

File tree

3 files changed

+121
-24
lines changed

3 files changed

+121
-24
lines changed

programs/steward/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ testnet = []
1919
cpi = ["no-entrypoint"]
2020
default = ["custom-heap"]
2121
custom-heap = []
22-
idl-build = ["anchor-lang/idl-build", "no-entrypoint"]
22+
idl-build = ["anchor-lang/idl-build", "validator-history/idl-build", "no-entrypoint"]
2323

2424
[dependencies]
2525
anchor-lang = "0.30.0"

programs/steward/idl/steward.json

+88-22
Original file line numberDiff line numberDiff line change
@@ -1625,16 +1625,16 @@
16251625
]
16261626
},
16271627
{
1628-
"name": "InstantUnstakeComponentsV2",
1628+
"name": "InstantUnstakeComponentsV3",
16291629
"discriminator": [
1630-
138,
1631-
62,
1632-
181,
1633-
14,
1634-
9,
1635-
48,
1636-
109,
1637-
47
1630+
5,
1631+
64,
1632+
24,
1633+
200,
1634+
42,
1635+
152,
1636+
222,
1637+
172
16381638
]
16391639
},
16401640
{
@@ -1664,16 +1664,16 @@
16641664
]
16651665
},
16661666
{
1667-
"name": "ScoreComponentsV2",
1667+
"name": "ScoreComponentsV3",
16681668
"discriminator": [
1669-
140,
1670-
182,
1671-
108,
1672-
49,
1673-
246,
1674-
38,
1675-
247,
1676-
181
1669+
255,
1670+
128,
1671+
115,
1672+
82,
1673+
192,
1674+
199,
1675+
160,
1676+
185
16771677
]
16781678
},
16791679
{
@@ -2250,6 +2250,26 @@
22502250
}
22512251
}
22522252
},
2253+
{
2254+
"name": "_padding0",
2255+
"docs": [
2256+
"Required for 8 byte alignment"
2257+
],
2258+
"type": {
2259+
"array": [
2260+
"u8",
2261+
1
2262+
]
2263+
}
2264+
},
2265+
{
2266+
"name": "tip_router_upload_auth_epoch_cutoff",
2267+
"docs": [
2268+
"The epoch after which validators must be using TipRouter upload authority for tip",
2269+
"distribution"
2270+
],
2271+
"type": "u16"
2272+
},
22532273
{
22542274
"name": "_padding",
22552275
"docs": [
@@ -2258,7 +2278,7 @@
22582278
"type": {
22592279
"array": [
22602280
"u8",
2261-
1023
2281+
1020
22622282
]
22632283
}
22642284
}
@@ -2385,7 +2405,7 @@
23852405
}
23862406
},
23872407
{
2388-
"name": "InstantUnstakeComponentsV2",
2408+
"name": "InstantUnstakeComponentsV3",
23892409
"type": {
23902410
"kind": "struct",
23912411
"fields": [
@@ -2424,6 +2444,13 @@
24242444
],
24252445
"type": "bool"
24262446
},
2447+
{
2448+
"name": "is_bad_merkle_root_upload_authority",
2449+
"docs": [
2450+
"Checks if validator has an unacceptable merkle root upload authority"
2451+
],
2452+
"type": "bool"
2453+
},
24272454
{
24282455
"name": "vote_account",
24292456
"type": "pubkey"
@@ -2523,6 +2550,26 @@
25232550
]
25242551
}
25252552
},
2553+
{
2554+
"name": "MerkleRootUploadAuthority",
2555+
"type": {
2556+
"kind": "enum",
2557+
"variants": [
2558+
{
2559+
"name": "Empty"
2560+
},
2561+
{
2562+
"name": "Other"
2563+
},
2564+
{
2565+
"name": "OldJitoLabs"
2566+
},
2567+
{
2568+
"name": "TipRouter"
2569+
}
2570+
]
2571+
}
2572+
},
25262573
{
25272574
"name": "Parameters",
25282575
"serialization": "bytemuck",
@@ -2809,7 +2856,7 @@
28092856
}
28102857
},
28112858
{
2812-
"name": "ScoreComponentsV2",
2859+
"name": "ScoreComponentsV3",
28132860
"type": {
28142861
"kind": "struct",
28152862
"fields": [
@@ -2876,6 +2923,14 @@
28762923
],
28772924
"type": "f64"
28782925
},
2926+
{
2927+
"name": "merkle_root_upload_authority_score",
2928+
"docs": [
2929+
"If validator is using TipRouter authority, OR OldJito authority prior to TipRouter only",
2930+
"activation epoch, then score is 1.0, else 0.0"
2931+
],
2932+
"type": "f64"
2933+
},
28792934
{
28802935
"name": "vote_credits_ratio",
28812936
"docs": [
@@ -3559,12 +3614,23 @@
35593614
"name": "mev_earned",
35603615
"type": "u32"
35613616
},
3617+
{
3618+
"name": "merkle_root_upload_authority",
3619+
"docs": [
3620+
"The enum mapping of the Validator's Tip Distribution Account's merkle root upload authority"
3621+
],
3622+
"type": {
3623+
"defined": {
3624+
"name": "MerkleRootUploadAuthority"
3625+
}
3626+
}
3627+
},
35623628
{
35633629
"name": "padding1",
35643630
"type": {
35653631
"array": [
35663632
"u8",
3567-
84
3633+
83
35683634
]
35693635
}
35703636
}

programs/validator-history/idl/validator_history.json

+32-1
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,26 @@
804804
]
805805
}
806806
},
807+
{
808+
"name": "MerkleRootUploadAuthority",
809+
"type": {
810+
"kind": "enum",
811+
"variants": [
812+
{
813+
"name": "Empty"
814+
},
815+
{
816+
"name": "Other"
817+
},
818+
{
819+
"name": "OldJitoLabs"
820+
},
821+
{
822+
"name": "TipRouter"
823+
}
824+
]
825+
}
826+
},
807827
{
808828
"name": "ValidatorHistory",
809829
"serialization": "bytemuck",
@@ -936,12 +956,23 @@
936956
"name": "mev_earned",
937957
"type": "u32"
938958
},
959+
{
960+
"name": "merkle_root_upload_authority",
961+
"docs": [
962+
"The enum mapping of the Validator's Tip Distribution Account's merkle root upload authority"
963+
],
964+
"type": {
965+
"defined": {
966+
"name": "MerkleRootUploadAuthority"
967+
}
968+
}
969+
},
939970
{
940971
"name": "padding1",
941972
"type": {
942973
"array": [
943974
"u8",
944-
84
975+
83
945976
]
946977
}
947978
}

0 commit comments

Comments
 (0)