Skip to content

Commit 81558e6

Browse files
macalinaomacalinao
authored
Merge pull request #63 from macalinao/igm/more-account-efaults
Adds more account defaults
2 parents 74b1d36 + 8c8169f commit 81558e6

File tree

63 files changed

+5146
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+5146
-232
lines changed

‎.changeset/beige-cougars-drop.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
"@macalinao/clients-voter-stake-registry": patch
3+
"@macalinao/clients-orca-whirlpools": patch
4+
"@macalinao/clients-kamino-lending": patch
5+
"@macalinao/clients-spl-governance": patch
6+
"@macalinao/clients-spl-stake-pool": patch
7+
"@macalinao/clients-token-metadata": patch
8+
"@macalinao/coda-visitors": patch
9+
"@macalinao/coda": patch
10+
---
11+
12+
Adds more account defaults

‎bun.lock‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"": {
55
"name": "@macalinao/coda-monorepo",
66
"devDependencies": {
7-
"@biomejs/biome": "^2.2.6",
7+
"@biomejs/biome": "^2.2.7",
88
"@changesets/cli": "^2.29.7",
99
"@macalinao/biome-config": "^0.1.2",
1010
"husky": "^9.1.7",
@@ -175,6 +175,7 @@
175175
"name": "@macalinao/coda-visitors",
176176
"version": "0.1.6",
177177
"dependencies": {
178+
"@solana-program/memo": "^0.9.0",
178179
"@solana-program/system": "^0.9.0",
179180
"@solana-program/token": "^0.7.0",
180181
"@solana-program/token-2022": "^0.6.0",
@@ -705,6 +706,8 @@
705706

706707
"@shikijs/vscode-textmate": ["@shikijs/[email protected]", "", {}, "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg=="],
707708

709+
"@solana-program/memo": ["@solana-program/[email protected]", "", { "peerDependencies": { "@solana/kit": "^4.0" } }, "sha512-I544p9gFeaguGbM+U09tjc9Prbs71vh7votxRahEoiOlxVID9NtZTah4KQnL0jK7JboxFxXo4+VOBaIE3HYPOw=="],
710+
708711
"@solana-program/system": ["@solana-program/[email protected]", "", { "peerDependencies": { "@solana/kit": "^4.0" } }, "sha512-yu+i0SZ+c+0E9Cy+btoMiCbxRnP/FLQuv/Ba8l2klZApAiOX1Ja/2IGkctFV36fglsI7PwD9czkSkHm8og+QeA=="],
709712

710713
"@solana-program/token": ["@solana-program/[email protected]", "", { "peerDependencies": { "@solana/kit": "^4.0" } }, "sha512-Rx9vTsU15lLbjLmzrnLhPG4ZBlzkvyr7sRAH5ciA3dtSocpprkMEHQslDteE9+5rKkuYoIUl7Qki4l2IMY0P2w=="],

‎clients/kamino-lending/coda.config.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export default defineConfig({
161161
]),
162162
},
163163
{
164-
account: /sysvarInfo|instructionSysvarAccount/,
164+
account: /sysvarInfo|[\w+][iI]nstructionSysvarAccount/,
165165
defaultValue: SYSVAR_INSTRUCTIONS_VALUE_NODE,
166166
},
167167
{

‎clients/kamino-lending/src/generated/instructions/depositAndWithdraw.ts‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ export type DepositAndWithdrawInstruction<
7979
| AccountMeta = string,
8080
TAccountDepositAccountsCollateralTokenProgram extends
8181
| string
82-
| AccountMeta = string,
82+
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
8383
TAccountDepositAccountsLiquidityTokenProgram extends
8484
| string
85-
| AccountMeta = string,
85+
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
8686
TAccountDepositAccountsInstructionSysvarAccount extends
8787
| string
88-
| AccountMeta = string,
88+
| AccountMeta = "Sysvar1nstructions1111111111111111111111111",
8989
TAccountWithdrawAccountsOwner extends string | AccountMeta = string,
9090
TAccountWithdrawAccountsObligation extends string | AccountMeta = string,
9191
TAccountWithdrawAccountsLendingMarket extends string | AccountMeta = string,
@@ -113,13 +113,13 @@ export type DepositAndWithdrawInstruction<
113113
| AccountMeta = string,
114114
TAccountWithdrawAccountsCollateralTokenProgram extends
115115
| string
116-
| AccountMeta = string,
116+
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
117117
TAccountWithdrawAccountsLiquidityTokenProgram extends
118118
| string
119-
| AccountMeta = string,
119+
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
120120
TAccountWithdrawAccountsInstructionSysvarAccount extends
121121
| string
122-
| AccountMeta = string,
122+
| AccountMeta = "Sysvar1nstructions1111111111111111111111111",
123123
TAccountDepositFarmsAccountsObligationFarmUserState extends
124124
| string
125125
| AccountMeta = string,
@@ -337,9 +337,9 @@ export interface DepositAndWithdrawInput<
337337
depositAccountsReserveDestinationDepositCollateral: Address<TAccountDepositAccountsReserveDestinationDepositCollateral>;
338338
depositAccountsUserSourceLiquidity: Address<TAccountDepositAccountsUserSourceLiquidity>;
339339
depositAccountsPlaceholderUserDestinationCollateral?: Address<TAccountDepositAccountsPlaceholderUserDestinationCollateral>;
340-
depositAccountsCollateralTokenProgram: Address<TAccountDepositAccountsCollateralTokenProgram>;
341-
depositAccountsLiquidityTokenProgram: Address<TAccountDepositAccountsLiquidityTokenProgram>;
342-
depositAccountsInstructionSysvarAccount: Address<TAccountDepositAccountsInstructionSysvarAccount>;
340+
depositAccountsCollateralTokenProgram?: Address<TAccountDepositAccountsCollateralTokenProgram>;
341+
depositAccountsLiquidityTokenProgram?: Address<TAccountDepositAccountsLiquidityTokenProgram>;
342+
depositAccountsInstructionSysvarAccount?: Address<TAccountDepositAccountsInstructionSysvarAccount>;
343343
withdrawAccountsOwner: TransactionSigner<TAccountWithdrawAccountsOwner>;
344344
withdrawAccountsObligation: Address<TAccountWithdrawAccountsObligation>;
345345
withdrawAccountsLendingMarket: Address<TAccountWithdrawAccountsLendingMarket>;
@@ -351,9 +351,9 @@ export interface DepositAndWithdrawInput<
351351
withdrawAccountsReserveLiquiditySupply: Address<TAccountWithdrawAccountsReserveLiquiditySupply>;
352352
withdrawAccountsUserDestinationLiquidity: Address<TAccountWithdrawAccountsUserDestinationLiquidity>;
353353
withdrawAccountsPlaceholderUserDestinationCollateral?: Address<TAccountWithdrawAccountsPlaceholderUserDestinationCollateral>;
354-
withdrawAccountsCollateralTokenProgram: Address<TAccountWithdrawAccountsCollateralTokenProgram>;
355-
withdrawAccountsLiquidityTokenProgram: Address<TAccountWithdrawAccountsLiquidityTokenProgram>;
356-
withdrawAccountsInstructionSysvarAccount: Address<TAccountWithdrawAccountsInstructionSysvarAccount>;
354+
withdrawAccountsCollateralTokenProgram?: Address<TAccountWithdrawAccountsCollateralTokenProgram>;
355+
withdrawAccountsLiquidityTokenProgram?: Address<TAccountWithdrawAccountsLiquidityTokenProgram>;
356+
withdrawAccountsInstructionSysvarAccount?: Address<TAccountWithdrawAccountsInstructionSysvarAccount>;
357357
depositFarmsAccountsObligationFarmUserState?: Address<TAccountDepositFarmsAccountsObligationFarmUserState>;
358358
depositFarmsAccountsReserveFarmState?: Address<TAccountDepositFarmsAccountsReserveFarmState>;
359359
withdrawFarmsAccountsObligationFarmUserState?: Address<TAccountWithdrawFarmsAccountsObligationFarmUserState>;
@@ -616,6 +616,30 @@ export function getDepositAndWithdrawInstruction<
616616
const args = { ...input };
617617

618618
// Resolve default values.
619+
if (!accounts.depositAccountsCollateralTokenProgram.value) {
620+
accounts.depositAccountsCollateralTokenProgram.value =
621+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
622+
}
623+
if (!accounts.depositAccountsLiquidityTokenProgram.value) {
624+
accounts.depositAccountsLiquidityTokenProgram.value =
625+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
626+
}
627+
if (!accounts.depositAccountsInstructionSysvarAccount.value) {
628+
accounts.depositAccountsInstructionSysvarAccount.value =
629+
"Sysvar1nstructions1111111111111111111111111" as Address<"Sysvar1nstructions1111111111111111111111111">;
630+
}
631+
if (!accounts.withdrawAccountsCollateralTokenProgram.value) {
632+
accounts.withdrawAccountsCollateralTokenProgram.value =
633+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
634+
}
635+
if (!accounts.withdrawAccountsLiquidityTokenProgram.value) {
636+
accounts.withdrawAccountsLiquidityTokenProgram.value =
637+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
638+
}
639+
if (!accounts.withdrawAccountsInstructionSysvarAccount.value) {
640+
accounts.withdrawAccountsInstructionSysvarAccount.value =
641+
"Sysvar1nstructions1111111111111111111111111" as Address<"Sysvar1nstructions1111111111111111111111111">;
642+
}
619643
if (!accounts.farmsProgram.value) {
620644
accounts.farmsProgram.value = FARMS_PROGRAM_ADDRESS;
621645
accounts.farmsProgram.isWritable = false;

‎clients/kamino-lending/src/generated/instructions/liquidateObligationAndRedeemReserveCollateral.ts‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ export type LiquidateObligationAndRedeemReserveCollateralInstruction<
7171
TAccountCollateralTokenProgram extends
7272
| string
7373
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
74-
TAccountRepayLiquidityTokenProgram extends string | AccountMeta = string,
75-
TAccountWithdrawLiquidityTokenProgram extends string | AccountMeta = string,
74+
TAccountRepayLiquidityTokenProgram extends
75+
| string
76+
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
77+
TAccountWithdrawLiquidityTokenProgram extends
78+
| string
79+
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
7680
TAccountInstructionSysvarAccount extends
7781
| string
7882
| AccountMeta = "Sysvar1nstructions1111111111111111111111111",
@@ -233,8 +237,8 @@ export interface LiquidateObligationAndRedeemReserveCollateralAsyncInput<
233237
userDestinationCollateral: Address<TAccountUserDestinationCollateral>;
234238
userDestinationLiquidity: Address<TAccountUserDestinationLiquidity>;
235239
collateralTokenProgram?: Address<TAccountCollateralTokenProgram>;
236-
repayLiquidityTokenProgram: Address<TAccountRepayLiquidityTokenProgram>;
237-
withdrawLiquidityTokenProgram: Address<TAccountWithdrawLiquidityTokenProgram>;
240+
repayLiquidityTokenProgram?: Address<TAccountRepayLiquidityTokenProgram>;
241+
withdrawLiquidityTokenProgram?: Address<TAccountWithdrawLiquidityTokenProgram>;
238242
instructionSysvarAccount?: Address<TAccountInstructionSysvarAccount>;
239243
liquidityAmount: LiquidateObligationAndRedeemReserveCollateralInstructionDataArgs["liquidityAmount"];
240244
minAcceptableReceivedLiquidityAmount: LiquidateObligationAndRedeemReserveCollateralInstructionDataArgs["minAcceptableReceivedLiquidityAmount"];
@@ -402,6 +406,14 @@ export async function getLiquidateObligationAndRedeemReserveCollateralInstructio
402406
accounts.collateralTokenProgram.value =
403407
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
404408
}
409+
if (!accounts.repayLiquidityTokenProgram.value) {
410+
accounts.repayLiquidityTokenProgram.value =
411+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
412+
}
413+
if (!accounts.withdrawLiquidityTokenProgram.value) {
414+
accounts.withdrawLiquidityTokenProgram.value =
415+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
416+
}
405417
if (!accounts.instructionSysvarAccount.value) {
406418
accounts.instructionSysvarAccount.value =
407419
"Sysvar1nstructions1111111111111111111111111" as Address<"Sysvar1nstructions1111111111111111111111111">;
@@ -499,8 +511,8 @@ export interface LiquidateObligationAndRedeemReserveCollateralInput<
499511
userDestinationCollateral: Address<TAccountUserDestinationCollateral>;
500512
userDestinationLiquidity: Address<TAccountUserDestinationLiquidity>;
501513
collateralTokenProgram?: Address<TAccountCollateralTokenProgram>;
502-
repayLiquidityTokenProgram: Address<TAccountRepayLiquidityTokenProgram>;
503-
withdrawLiquidityTokenProgram: Address<TAccountWithdrawLiquidityTokenProgram>;
514+
repayLiquidityTokenProgram?: Address<TAccountRepayLiquidityTokenProgram>;
515+
withdrawLiquidityTokenProgram?: Address<TAccountWithdrawLiquidityTokenProgram>;
504516
instructionSysvarAccount?: Address<TAccountInstructionSysvarAccount>;
505517
liquidityAmount: LiquidateObligationAndRedeemReserveCollateralInstructionDataArgs["liquidityAmount"];
506518
minAcceptableReceivedLiquidityAmount: LiquidateObligationAndRedeemReserveCollateralInstructionDataArgs["minAcceptableReceivedLiquidityAmount"];
@@ -661,6 +673,14 @@ export function getLiquidateObligationAndRedeemReserveCollateralInstruction<
661673
accounts.collateralTokenProgram.value =
662674
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
663675
}
676+
if (!accounts.repayLiquidityTokenProgram.value) {
677+
accounts.repayLiquidityTokenProgram.value =
678+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
679+
}
680+
if (!accounts.withdrawLiquidityTokenProgram.value) {
681+
accounts.withdrawLiquidityTokenProgram.value =
682+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
683+
}
664684
if (!accounts.instructionSysvarAccount.value) {
665685
accounts.instructionSysvarAccount.value =
666686
"Sysvar1nstructions1111111111111111111111111" as Address<"Sysvar1nstructions1111111111111111111111111">;

‎clients/kamino-lending/src/generated/instructions/liquidateObligationAndRedeemReserveCollateralV2.ts‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,16 @@ export type LiquidateObligationAndRedeemReserveCollateralV2Instruction<
9696
| AccountMeta = string,
9797
TAccountLiquidationAccountsCollateralTokenProgram extends
9898
| string
99-
| AccountMeta = string,
99+
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
100100
TAccountLiquidationAccountsRepayLiquidityTokenProgram extends
101101
| string
102-
| AccountMeta = string,
102+
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
103103
TAccountLiquidationAccountsWithdrawLiquidityTokenProgram extends
104104
| string
105-
| AccountMeta = string,
105+
| AccountMeta = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
106106
TAccountLiquidationAccountsInstructionSysvarAccount extends
107107
| string
108-
| AccountMeta = string,
108+
| AccountMeta = "Sysvar1nstructions1111111111111111111111111",
109109
TAccountCollateralFarmsAccountsV2ObligationFarmUserState extends
110110
| string
111111
| AccountMeta = string,
@@ -305,10 +305,10 @@ export interface LiquidateObligationAndRedeemReserveCollateralV2Input<
305305
liquidationAccountsUserSourceLiquidity: Address<TAccountLiquidationAccountsUserSourceLiquidity>;
306306
liquidationAccountsUserDestinationCollateral: Address<TAccountLiquidationAccountsUserDestinationCollateral>;
307307
liquidationAccountsUserDestinationLiquidity: Address<TAccountLiquidationAccountsUserDestinationLiquidity>;
308-
liquidationAccountsCollateralTokenProgram: Address<TAccountLiquidationAccountsCollateralTokenProgram>;
309-
liquidationAccountsRepayLiquidityTokenProgram: Address<TAccountLiquidationAccountsRepayLiquidityTokenProgram>;
310-
liquidationAccountsWithdrawLiquidityTokenProgram: Address<TAccountLiquidationAccountsWithdrawLiquidityTokenProgram>;
311-
liquidationAccountsInstructionSysvarAccount: Address<TAccountLiquidationAccountsInstructionSysvarAccount>;
308+
liquidationAccountsCollateralTokenProgram?: Address<TAccountLiquidationAccountsCollateralTokenProgram>;
309+
liquidationAccountsRepayLiquidityTokenProgram?: Address<TAccountLiquidationAccountsRepayLiquidityTokenProgram>;
310+
liquidationAccountsWithdrawLiquidityTokenProgram?: Address<TAccountLiquidationAccountsWithdrawLiquidityTokenProgram>;
311+
liquidationAccountsInstructionSysvarAccount?: Address<TAccountLiquidationAccountsInstructionSysvarAccount>;
312312
collateralFarmsAccountsV2ObligationFarmUserState?: Address<TAccountCollateralFarmsAccountsV2ObligationFarmUserState>;
313313
collateralFarmsAccountsV2ReserveFarmState?: Address<TAccountCollateralFarmsAccountsV2ReserveFarmState>;
314314
debtFarmsAccountsObligationFarmUserState?: Address<TAccountDebtFarmsAccountsObligationFarmUserState>;
@@ -517,6 +517,22 @@ export function getLiquidateObligationAndRedeemReserveCollateralV2Instruction<
517517
const args = { ...input };
518518

519519
// Resolve default values.
520+
if (!accounts.liquidationAccountsCollateralTokenProgram.value) {
521+
accounts.liquidationAccountsCollateralTokenProgram.value =
522+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
523+
}
524+
if (!accounts.liquidationAccountsRepayLiquidityTokenProgram.value) {
525+
accounts.liquidationAccountsRepayLiquidityTokenProgram.value =
526+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
527+
}
528+
if (!accounts.liquidationAccountsWithdrawLiquidityTokenProgram.value) {
529+
accounts.liquidationAccountsWithdrawLiquidityTokenProgram.value =
530+
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
531+
}
532+
if (!accounts.liquidationAccountsInstructionSysvarAccount.value) {
533+
accounts.liquidationAccountsInstructionSysvarAccount.value =
534+
"Sysvar1nstructions1111111111111111111111111" as Address<"Sysvar1nstructions1111111111111111111111111">;
535+
}
520536
if (!accounts.farmsProgram.value) {
521537
accounts.farmsProgram.value = FARMS_PROGRAM_ADDRESS;
522538
accounts.farmsProgram.isWritable = false;

0 commit comments

Comments
 (0)