Skip to content

Commit 1c36e30

Browse files
steveluschersteveluscher
committed
Eliminate rentEpoch 
1 parent dffaeb8 commit 1c36e30

File tree

8 files changed

+7
-63
lines changed

8 files changed

+7
-63
lines changed

‎.changeset/mean-peas-wish.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@solana/rpc-subscriptions-api': major
3+
'@solana/rpc-graphql': major
4+
'@solana/rpc-types': major
5+
---
6+
7+
Removed `rentEpoch` from the `AccountInfoBase` type. This property is no longer relevant post SIMD-215. Developers whose applications rely on this property being numeric should either eliminate it or hardcode it to `18_446_744_073_709_551_615n`.

‎packages/rpc-graphql/README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ interface Account {
141141
lamports: BigInt
142142
ownerProgram: Account
143143
space: BigInt
144-
rentEpoch: BigInt
145144
}
146145
```
147146

@@ -154,7 +153,6 @@ const source = `
154153
account(address: $address) {
155154
executable
156155
lamports
157-
rentEpoch
158156
}
159157
}
160158
`;
@@ -171,7 +169,6 @@ data: {
171169
account: {
172170
executable: false,
173171
lamports: 10290815n,
174-
rentEpoch: 0n,
175172
},
176173
}
177174
```
@@ -317,7 +314,6 @@ const source = `
317314
programAccounts(programAddress: $address) {
318315
executable
319316
lamports
320-
rentEpoch
321317
}
322318
}
323319
`;
@@ -335,12 +331,10 @@ data: {
335331
{
336332
executable: false,
337333
lamports: 10290815n,
338-
rentEpoch: 0n,
339334
},
340335
{
341336
executable: false,
342337
lamports: 10290815n,
343-
rentEpoch: 0n,
344338
},
345339
/* .. */
346340
]

‎packages/rpc-graphql/src/__tests__/account-test.ts‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ describe('account', () => {
8888
account(address: $address, commitment: $commitment) {
8989
executable
9090
lamports
91-
rentEpoch
9291
space
9392
}
9493
}
@@ -99,7 +98,6 @@ describe('account', () => {
9998
account: {
10099
executable: false,
101100
lamports: 10290815n,
102-
rentEpoch: 0n,
103101
space: 165n,
104102
},
105103
},
@@ -121,7 +119,6 @@ describe('account', () => {
121119
address
122120
executable
123121
lamports
124-
rentEpoch
125122
space
126123
}
127124
}
@@ -135,7 +132,6 @@ describe('account', () => {
135132
address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
136133
executable: true,
137134
lamports: expect.any(BigInt),
138-
rentEpoch: expect.any(BigInt),
139135
space: 133352n,
140136
},
141137
},
@@ -160,7 +156,6 @@ describe('account', () => {
160156
address
161157
executable
162158
lamports
163-
rentEpoch
164159
space
165160
}
166161
}
@@ -177,7 +172,6 @@ describe('account', () => {
177172
address: 'BPFLoader2111111111111111111111111111111111',
178173
executable: true,
179174
lamports: expect.any(BigInt),
180-
rentEpoch: expect.any(BigInt),
181175
space: 25n,
182176
},
183177
},
@@ -510,7 +504,6 @@ describe('account', () => {
510504
ownerProgram {
511505
address
512506
}
513-
rentEpoch
514507
space
515508
... on NonceAccount {
516509
authority {
@@ -540,7 +533,6 @@ describe('account', () => {
540533
ownerProgram: {
541534
address: '11111111111111111111111111111111',
542535
},
543-
rentEpoch: expect.any(BigInt),
544536
space: 80n,
545537
},
546538
},
@@ -560,7 +552,6 @@ describe('account', () => {
560552
ownerProgram {
561553
address
562554
}
563-
rentEpoch
564555
space
565556
... on LookupTableAccount {
566557
addresses
@@ -590,7 +581,6 @@ describe('account', () => {
590581
ownerProgram: {
591582
address: 'AddressLookupTab1e1111111111111111111111111',
592583
},
593-
rentEpoch: expect.any(BigInt),
594584
space: 1304n,
595585
},
596586
},
@@ -610,7 +600,6 @@ describe('account', () => {
610600
ownerProgram {
611601
address
612602
}
613-
rentEpoch
614603
space
615604
... on MintAccount {
616605
decimals
@@ -639,7 +628,6 @@ describe('account', () => {
639628
ownerProgram: {
640629
address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
641630
},
642-
rentEpoch: expect.any(BigInt),
643631
space: 82n,
644632
supply: expect.any(BigInt),
645633
},
@@ -660,7 +648,6 @@ describe('account', () => {
660648
ownerProgram {
661649
address
662650
}
663-
rentEpoch
664651
space
665652
... on TokenAccount {
666653
isNative
@@ -697,7 +684,6 @@ describe('account', () => {
697684
ownerProgram: {
698685
address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
699686
},
700-
rentEpoch: expect.any(BigInt),
701687
space: 165n,
702688
state: expect.any(String),
703689
tokenAmount: {
@@ -723,7 +709,6 @@ describe('account', () => {
723709
ownerProgram {
724710
address
725711
}
726-
rentEpoch
727712
space
728713
... on StakeAccount {
729714
meta {
@@ -786,7 +771,6 @@ describe('account', () => {
786771
ownerProgram: {
787772
address: 'Stake11111111111111111111111111111111111111',
788773
},
789-
rentEpoch: expect.any(BigInt),
790774
space: 200n,
791775
stake: {
792776
creditsObserved: expect.any(BigInt),
@@ -817,7 +801,6 @@ describe('account', () => {
817801
ownerProgram {
818802
address
819803
}
820-
rentEpoch
821804
space
822805
... on VoteAccount {
823806
authorizedVoters {
@@ -888,7 +871,6 @@ describe('account', () => {
888871
address: 'Vote111111111111111111111111111111111111111',
889872
},
890873
priorVoters: expect.any(Array),
891-
rentEpoch: expect.any(BigInt),
892874
rootSlot: expect.any(BigInt),
893875
space: 3762n,
894876
votes: expect.arrayContaining([
@@ -915,7 +897,6 @@ describe('account', () => {
915897
ownerProgram {
916898
address
917899
}
918-
rentEpoch
919900
space
920901
... on SysvarClockAccount {
921902
epoch
@@ -939,7 +920,6 @@ describe('account', () => {
939920
ownerProgram: {
940921
address: 'Sysvar1111111111111111111111111111111111111',
941922
},
942-
rentEpoch: expect.any(BigInt),
943923
slot: expect.any(BigInt),
944924
space: expect.any(BigInt),
945925
unixTimestamp: expect.any(BigInt),
@@ -962,7 +942,6 @@ describe('account', () => {
962942
ownerProgram {
963943
address
964944
}
965-
rentEpoch
966945
space
967946
... on SysvarEpochScheduleAccount {
968947
firstNormalEpoch
@@ -986,7 +965,6 @@ describe('account', () => {
986965
ownerProgram: {
987966
address: 'Sysvar1111111111111111111111111111111111111',
988967
},
989-
rentEpoch: expect.any(BigInt),
990968
slotsPerEpoch: expect.any(BigInt),
991969
space: expect.any(BigInt),
992970
warmup: expect.any(Boolean),
@@ -1007,7 +985,6 @@ describe('account', () => {
1007985
ownerProgram {
1008986
address
1009987
}
1010-
rentEpoch
1011988
space
1012989
... on SysvarLastRestartSlotAccount {
1013990
lastRestartSlot
@@ -1025,7 +1002,6 @@ describe('account', () => {
10251002
ownerProgram: {
10261003
address: 'Sysvar1111111111111111111111111111111111111',
10271004
},
1028-
rentEpoch: expect.any(BigInt),
10291005
space: expect.any(BigInt),
10301006
},
10311007
},
@@ -1044,7 +1020,6 @@ describe('account', () => {
10441020
ownerProgram {
10451021
address
10461022
}
1047-
rentEpoch
10481023
space
10491024
... on SysvarRecentBlockhashesAccount {
10501025
entries {
@@ -1074,7 +1049,6 @@ describe('account', () => {
10741049
ownerProgram: {
10751050
address: 'Sysvar1111111111111111111111111111111111111',
10761051
},
1077-
rentEpoch: expect.any(BigInt),
10781052
space: expect.any(BigInt),
10791053
},
10801054
},
@@ -1093,7 +1067,6 @@ describe('account', () => {
10931067
ownerProgram {
10941068
address
10951069
}
1096-
rentEpoch
10971070
space
10981071
... on SysvarRentAccount {
10991072
burnPercent
@@ -1115,7 +1088,6 @@ describe('account', () => {
11151088
ownerProgram: {
11161089
address: 'Sysvar1111111111111111111111111111111111111',
11171090
},
1118-
rentEpoch: expect.any(BigInt),
11191091
space: expect.any(BigInt),
11201092
},
11211093
},
@@ -1134,7 +1106,6 @@ describe('account', () => {
11341106
ownerProgram {
11351107
address
11361108
}
1137-
rentEpoch
11381109
space
11391110
... on SysvarSlotHashesAccount {
11401111
entries {
@@ -1160,7 +1131,6 @@ describe('account', () => {
11601131
ownerProgram: {
11611132
address: 'Sysvar1111111111111111111111111111111111111',
11621133
},
1163-
rentEpoch: expect.any(BigInt),
11641134
space: expect.any(BigInt),
11651135
},
11661136
},
@@ -1179,7 +1149,6 @@ describe('account', () => {
11791149
ownerProgram {
11801150
address
11811151
}
1182-
rentEpoch
11831152
space
11841153
... on SysvarSlotHistoryAccount {
11851154
bits
@@ -1199,7 +1168,6 @@ describe('account', () => {
11991168
ownerProgram: {
12001169
address: 'Sysvar1111111111111111111111111111111111111',
12011170
},
1202-
rentEpoch: expect.any(BigInt),
12031171
space: expect.any(BigInt),
12041172
},
12051173
},
@@ -1218,7 +1186,6 @@ describe('account', () => {
12181186
ownerProgram {
12191187
address
12201188
}
1221-
rentEpoch
12221189
space
12231190
... on SysvarStakeHistoryAccount {
12241191
entries {
@@ -1240,7 +1207,6 @@ describe('account', () => {
12401207
ownerProgram: {
12411208
address: 'Sysvar1111111111111111111111111111111111111',
12421209
},
1243-
rentEpoch: expect.any(BigInt),
12441210
space: expect.any(BigInt),
12451211
},
12461212
},

‎packages/rpc-graphql/src/__tests__/program-accounts-test.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ describe('programAccounts', () => {
6868
programAccounts(programAddress: $programAddress, commitment: $commitment) {
6969
executable
7070
lamports
71-
rentEpoch
7271
}
7372
}
7473
`;
@@ -79,7 +78,6 @@ describe('programAccounts', () => {
7978
{
8079
executable: expect.any(Boolean),
8180
lamports: expect.any(BigInt),
82-
rentEpoch: expect.any(BigInt),
8381
},
8482
]),
8583
},

0 commit comments

Comments
 (0)