Skip to content

Commit 9e5e13f

Browse files
rustopianrustopian
committed
rm old idl, update format value, add sysvar defaults
1 parent 2b1b4aa commit 9e5e13f

24 files changed

+209
-559
lines changed

‎clients/js/src/generated/instructions/authorize.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ export function getAuthorizeDiscriminatorBytes() {
4848
export type AuthorizeInstruction<
4949
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
5050
TAccountStake extends string | AccountMeta<string> = string,
51-
TAccountClockSysvar extends string | AccountMeta<string> = string,
51+
TAccountClockSysvar extends
52+
| string
53+
| AccountMeta<string> = 'SysvarC1ock11111111111111111111111111111111',
5254
TAccountAuthority extends string | AccountMeta<string> = string,
5355
TAccountLockupAuthority extends
5456
| string
@@ -130,7 +132,7 @@ export type AuthorizeInput<
130132
/** Stake account to be updated */
131133
stake: Address<TAccountStake>;
132134
/** Clock sysvar */
133-
clockSysvar: Address<TAccountClockSysvar>;
135+
clockSysvar?: Address<TAccountClockSysvar>;
134136
/** The stake or withdraw authority */
135137
authority: TransactionSigner<TAccountAuthority>;
136138
/** Lockup authority, if updating `StakeAuthorize::Withdrawer` before lockup expiration */
@@ -181,6 +183,12 @@ export function getAuthorizeInstruction<
181183
// Original args.
182184
const args = { ...input };
183185

186+
// Resolve default values.
187+
if (!accounts.clockSysvar.value) {
188+
accounts.clockSysvar.value =
189+
'SysvarC1ock11111111111111111111111111111111' as Address<'SysvarC1ock11111111111111111111111111111111'>;
190+
}
191+
184192
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
185193
return Object.freeze({
186194
accounts: [

‎clients/js/src/generated/instructions/authorizeChecked.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ export function getAuthorizeCheckedDiscriminatorBytes() {
4646
export type AuthorizeCheckedInstruction<
4747
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
4848
TAccountStake extends string | AccountMeta<string> = string,
49-
TAccountClockSysvar extends string | AccountMeta<string> = string,
49+
TAccountClockSysvar extends
50+
| string
51+
| AccountMeta<string> = 'SysvarC1ock11111111111111111111111111111111',
5052
TAccountAuthority extends string | AccountMeta<string> = string,
5153
TAccountNewAuthority extends string | AccountMeta<string> = string,
5254
TAccountLockupAuthority extends
@@ -130,7 +132,7 @@ export type AuthorizeCheckedInput<
130132
/** Stake account to be updated */
131133
stake: Address<TAccountStake>;
132134
/** Clock sysvar */
133-
clockSysvar: Address<TAccountClockSysvar>;
135+
clockSysvar?: Address<TAccountClockSysvar>;
134136
/** The stake or withdraw authority */
135137
authority: TransactionSigner<TAccountAuthority>;
136138
/** The new stake or withdraw authority */
@@ -186,6 +188,12 @@ export function getAuthorizeCheckedInstruction<
186188
// Original args.
187189
const args = { ...input };
188190

191+
// Resolve default values.
192+
if (!accounts.clockSysvar.value) {
193+
accounts.clockSysvar.value =
194+
'SysvarC1ock11111111111111111111111111111111' as Address<'SysvarC1ock11111111111111111111111111111111'>;
195+
}
196+
189197
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
190198
return Object.freeze({
191199
accounts: [

‎clients/js/src/generated/instructions/authorizeCheckedWithSeed.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ export type AuthorizeCheckedWithSeedInstruction<
5353
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
5454
TAccountStake extends string | AccountMeta<string> = string,
5555
TAccountBase extends string | AccountMeta<string> = string,
56-
TAccountClockSysvar extends string | AccountMeta<string> = string,
56+
TAccountClockSysvar extends
57+
| string
58+
| AccountMeta<string> = 'SysvarC1ock11111111111111111111111111111111',
5759
TAccountNewAuthority extends string | AccountMeta<string> = string,
5860
TAccountLockupAuthority extends
5961
| string
@@ -151,7 +153,7 @@ export type AuthorizeCheckedWithSeedInput<
151153
/** Base key of stake or withdraw authority */
152154
base: TransactionSigner<TAccountBase>;
153155
/** Clock sysvar */
154-
clockSysvar: Address<TAccountClockSysvar>;
156+
clockSysvar?: Address<TAccountClockSysvar>;
155157
/** The new stake or withdraw authority */
156158
newAuthority: TransactionSigner<TAccountNewAuthority>;
157159
/** Lockup authority, if updating `StakeAuthorize::Withdrawer` before lockup expiration */
@@ -207,6 +209,12 @@ export function getAuthorizeCheckedWithSeedInstruction<
207209
// Original args.
208210
const args = { ...input };
209211

212+
// Resolve default values.
213+
if (!accounts.clockSysvar.value) {
214+
accounts.clockSysvar.value =
215+
'SysvarC1ock11111111111111111111111111111111' as Address<'SysvarC1ock11111111111111111111111111111111'>;
216+
}
217+
210218
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
211219
return Object.freeze({
212220
accounts: [

‎clients/js/src/generated/instructions/authorizeWithSeed.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ export type AuthorizeWithSeedInstruction<
5353
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
5454
TAccountStake extends string | AccountMeta<string> = string,
5555
TAccountBase extends string | AccountMeta<string> = string,
56-
TAccountClockSysvar extends string | AccountMeta<string> = string,
56+
TAccountClockSysvar extends
57+
| string
58+
| AccountMeta<string> = 'SysvarC1ock11111111111111111111111111111111',
5759
TAccountLockupAuthority extends
5860
| string
5961
| AccountMeta<string>
@@ -146,7 +148,7 @@ export type AuthorizeWithSeedInput<
146148
/** Base key of stake or withdraw authority */
147149
base: TransactionSigner<TAccountBase>;
148150
/** Clock sysvar */
149-
clockSysvar: Address<TAccountClockSysvar>;
151+
clockSysvar?: Address<TAccountClockSysvar>;
150152
/** Lockup authority, if updating `StakeAuthorize::Withdrawer` before lockup expiration */
151153
lockupAuthority?: TransactionSigner<TAccountLockupAuthority>;
152154
newAuthorizedPubkey: AuthorizeWithSeedInstructionDataArgs['newAuthorizedPubkey'];
@@ -197,6 +199,12 @@ export function getAuthorizeWithSeedInstruction<
197199
// Original args.
198200
const args = { ...input };
199201

202+
// Resolve default values.
203+
if (!accounts.clockSysvar.value) {
204+
accounts.clockSysvar.value =
205+
'SysvarC1ock11111111111111111111111111111111' as Address<'SysvarC1ock11111111111111111111111111111111'>;
206+
}
207+
200208
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
201209
return Object.freeze({
202210
accounts: [

‎clients/js/src/generated/instructions/deactivate.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ export function getDeactivateDiscriminatorBytes() {
4040
export type DeactivateInstruction<
4141
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
4242
TAccountStake extends string | AccountMeta<string> = string,
43-
TAccountClockSysvar extends string | AccountMeta<string> = string,
43+
TAccountClockSysvar extends
44+
| string
45+
| AccountMeta<string> = 'SysvarC1ock11111111111111111111111111111111',
4446
TAccountStakeAuthority extends string | AccountMeta<string> = string,
4547
TRemainingAccounts extends readonly AccountMeta<string>[] = [],
4648
> = Instruction<TProgram> &
@@ -94,7 +96,7 @@ export type DeactivateInput<
9496
/** Delegated stake account to be deactivated */
9597
stake: Address<TAccountStake>;
9698
/** Clock sysvar */
97-
clockSysvar: Address<TAccountClockSysvar>;
99+
clockSysvar?: Address<TAccountClockSysvar>;
98100
/** Stake authority */
99101
stakeAuthority: TransactionSigner<TAccountStakeAuthority>;
100102
};
@@ -131,6 +133,12 @@ export function getDeactivateInstruction<
131133
ResolvedAccount
132134
>;
133135

136+
// Resolve default values.
137+
if (!accounts.clockSysvar.value) {
138+
accounts.clockSysvar.value =
139+
'SysvarC1ock11111111111111111111111111111111' as Address<'SysvarC1ock11111111111111111111111111111111'>;
140+
}
141+
134142
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
135143
return Object.freeze({
136144
accounts: [

‎clients/js/src/generated/instructions/delegateStake.ts‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ export type DelegateStakeInstruction<
4141
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
4242
TAccountStake extends string | AccountMeta<string> = string,
4343
TAccountVote extends string | AccountMeta<string> = string,
44-
TAccountClockSysvar extends string | AccountMeta<string> = string,
45-
TAccountStakeHistory extends string | AccountMeta<string> = string,
44+
TAccountClockSysvar extends
45+
| string
46+
| AccountMeta<string> = 'SysvarC1ock11111111111111111111111111111111',
47+
TAccountStakeHistory extends
48+
| string
49+
| AccountMeta<string> = 'SysvarStakeHistory1111111111111111111111111',
4650
TAccountUnused extends string | AccountMeta<string> = string,
4751
TAccountStakeAuthority extends string | AccountMeta<string> = string,
4852
TRemainingAccounts extends readonly AccountMeta<string>[] = [],
@@ -111,9 +115,9 @@ export type DelegateStakeInput<
111115
/** Vote account to which this stake will be delegated */
112116
vote: Address<TAccountVote>;
113117
/** Clock sysvar */
114-
clockSysvar: Address<TAccountClockSysvar>;
118+
clockSysvar?: Address<TAccountClockSysvar>;
115119
/** Stake history sysvar that carries stake warmup/cooldown history */
116-
stakeHistory: Address<TAccountStakeHistory>;
120+
stakeHistory?: Address<TAccountStakeHistory>;
117121
/** Unused account, formerly the stake config */
118122
unused: Address<TAccountUnused>;
119123
/** Stake authority */
@@ -164,6 +168,16 @@ export function getDelegateStakeInstruction<
164168
ResolvedAccount
165169
>;
166170

171+
// Resolve default values.
172+
if (!accounts.clockSysvar.value) {
173+
accounts.clockSysvar.value =
174+
'SysvarC1ock11111111111111111111111111111111' as Address<'SysvarC1ock11111111111111111111111111111111'>;
175+
}
176+
if (!accounts.stakeHistory.value) {
177+
accounts.stakeHistory.value =
178+
'SysvarStakeHistory1111111111111111111111111' as Address<'SysvarStakeHistory1111111111111111111111111'>;
179+
}
180+
167181
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
168182
return Object.freeze({
169183
accounts: [

‎clients/js/src/generated/instructions/initialize.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ export function getInitializeDiscriminatorBytes() {
4747
export type InitializeInstruction<
4848
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
4949
TAccountStake extends string | AccountMeta<string> = string,
50-
TAccountRentSysvar extends string | AccountMeta<string> = string,
50+
TAccountRentSysvar extends
51+
| string
52+
| AccountMeta<string> = 'SysvarRent111111111111111111111111111111111',
5153
TRemainingAccounts extends readonly AccountMeta<string>[] = [],
5254
> = Instruction<TProgram> &
5355
InstructionWithData<ReadonlyUint8Array> &
@@ -110,7 +112,7 @@ export type InitializeInput<
110112
/** Uninitialized stake account */
111113
stake: Address<TAccountStake>;
112114
/** Rent sysvar */
113-
rentSysvar: Address<TAccountRentSysvar>;
115+
rentSysvar?: Address<TAccountRentSysvar>;
114116
arg0: InitializeInstructionDataArgs['arg0'];
115117
arg1: InitializeInstructionDataArgs['arg1'];
116118
};
@@ -139,6 +141,12 @@ export function getInitializeInstruction<
139141
// Original args.
140142
const args = { ...input };
141143

144+
// Resolve default values.
145+
if (!accounts.rentSysvar.value) {
146+
accounts.rentSysvar.value =
147+
'SysvarRent111111111111111111111111111111111' as Address<'SysvarRent111111111111111111111111111111111'>;
148+
}
149+
142150
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
143151
return Object.freeze({
144152
accounts: [

‎clients/js/src/generated/instructions/initializeChecked.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ export function getInitializeCheckedDiscriminatorBytes() {
4040
export type InitializeCheckedInstruction<
4141
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
4242
TAccountStake extends string | AccountMeta<string> = string,
43-
TAccountRentSysvar extends string | AccountMeta<string> = string,
43+
TAccountRentSysvar extends
44+
| string
45+
| AccountMeta<string> = 'SysvarRent111111111111111111111111111111111',
4446
TAccountStakeAuthority extends string | AccountMeta<string> = string,
4547
TAccountWithdrawAuthority extends string | AccountMeta<string> = string,
4648
TRemainingAccounts extends readonly AccountMeta<string>[] = [],
@@ -99,7 +101,7 @@ export type InitializeCheckedInput<
99101
/** Uninitialized stake account */
100102
stake: Address<TAccountStake>;
101103
/** Rent sysvar */
102-
rentSysvar: Address<TAccountRentSysvar>;
104+
rentSysvar?: Address<TAccountRentSysvar>;
103105
/** The stake authority */
104106
stakeAuthority: Address<TAccountStakeAuthority>;
105107
/** The withdraw authority */
@@ -145,6 +147,12 @@ export function getInitializeCheckedInstruction<
145147
ResolvedAccount
146148
>;
147149

150+
// Resolve default values.
151+
if (!accounts.rentSysvar.value) {
152+
accounts.rentSysvar.value =
153+
'SysvarRent111111111111111111111111111111111' as Address<'SysvarRent111111111111111111111111111111111'>;
154+
}
155+
148156
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
149157
return Object.freeze({
150158
accounts: [

‎clients/js/src/generated/instructions/merge.ts‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ export type MergeInstruction<
4141
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
4242
TAccountDestinationStake extends string | AccountMeta<string> = string,
4343
TAccountSourceStake extends string | AccountMeta<string> = string,
44-
TAccountClockSysvar extends string | AccountMeta<string> = string,
45-
TAccountStakeHistorySysvar extends string | AccountMeta<string> = string,
44+
TAccountClockSysvar extends
45+
| string
46+
| AccountMeta<string> = 'SysvarC1ock11111111111111111111111111111111',
47+
TAccountStakeHistorySysvar extends
48+
| string
49+
| AccountMeta<string> = 'SysvarStakeHistory1111111111111111111111111',
4650
TAccountStakeAuthority extends string | AccountMeta<string> = string,
4751
TRemainingAccounts extends readonly AccountMeta<string>[] = [],
4852
> = Instruction<TProgram> &
@@ -106,9 +110,9 @@ export type MergeInput<
106110
/** Source stake account for to merge. This account will be drained */
107111
sourceStake: Address<TAccountSourceStake>;
108112
/** Clock sysvar */
109-
clockSysvar: Address<TAccountClockSysvar>;
113+
clockSysvar?: Address<TAccountClockSysvar>;
110114
/** Stake history sysvar that carries stake warmup/cooldown history */
111-
stakeHistorySysvar: Address<TAccountStakeHistorySysvar>;
115+
stakeHistorySysvar?: Address<TAccountStakeHistorySysvar>;
112116
/** Stake authority */
113117
stakeAuthority: TransactionSigner<TAccountStakeAuthority>;
114118
};
@@ -159,6 +163,16 @@ export function getMergeInstruction<
159163
ResolvedAccount
160164
>;
161165

166+
// Resolve default values.
167+
if (!accounts.clockSysvar.value) {
168+
accounts.clockSysvar.value =
169+
'SysvarC1ock11111111111111111111111111111111' as Address<'SysvarC1ock11111111111111111111111111111111'>;
170+
}
171+
if (!accounts.stakeHistorySysvar.value) {
172+
accounts.stakeHistorySysvar.value =
173+
'SysvarStakeHistory1111111111111111111111111' as Address<'SysvarStakeHistory1111111111111111111111111'>;
174+
}
175+
162176
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
163177
return Object.freeze({
164178
accounts: [

‎clients/js/src/generated/instructions/withdraw.ts‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ export type WithdrawInstruction<
4343
TProgram extends string = typeof STAKE_PROGRAM_ADDRESS,
4444
TAccountStake extends string | AccountMeta<string> = string,
4545
TAccountRecipient extends string | AccountMeta<string> = string,
46-
TAccountClockSysvar extends string | AccountMeta<string> = string,
47-
TAccountStakeHistorySysvar extends string | AccountMeta<string> = string,
46+
TAccountClockSysvar extends
47+
| string
48+
| AccountMeta<string> = 'SysvarC1ock11111111111111111111111111111111',
49+
TAccountStakeHistorySysvar extends
50+
| string
51+
| AccountMeta<string> = 'SysvarStakeHistory1111111111111111111111111',
4852
TAccountWithdrawAuthority extends string | AccountMeta<string> = string,
4953
TAccountLockupAuthority extends
5054
| string
@@ -130,9 +134,9 @@ export type WithdrawInput<
130134
/** Recipient account */
131135
recipient: Address<TAccountRecipient>;
132136
/** Clock sysvar */
133-
clockSysvar: Address<TAccountClockSysvar>;
137+
clockSysvar?: Address<TAccountClockSysvar>;
134138
/** Stake history sysvar that carries stake warmup/cooldown history */
135-
stakeHistorySysvar: Address<TAccountStakeHistorySysvar>;
139+
stakeHistorySysvar?: Address<TAccountStakeHistorySysvar>;
136140
/** Withdraw authority */
137141
withdrawAuthority: TransactionSigner<TAccountWithdrawAuthority>;
138142
/** Lockup authority, if before lockup expiration */
@@ -196,6 +200,16 @@ export function getWithdrawInstruction<
196200
// Original args.
197201
const args = { ...input };
198202

203+
// Resolve default values.
204+
if (!accounts.clockSysvar.value) {
205+
accounts.clockSysvar.value =
206+
'SysvarC1ock11111111111111111111111111111111' as Address<'SysvarC1ock11111111111111111111111111111111'>;
207+
}
208+
if (!accounts.stakeHistorySysvar.value) {
209+
accounts.stakeHistorySysvar.value =
210+
'SysvarStakeHistory1111111111111111111111111' as Address<'SysvarStakeHistory1111111111111111111111111'>;
211+
}
212+
199213
const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
200214
return Object.freeze({
201215
accounts: [

0 commit comments

Comments
 (0)