@kamino-finance/klend-sdk 5.2.10 → 5.2.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/classes/manager.d.ts +2 -2
- package/dist/classes/manager.js +3 -3
- package/dist/classes/manager.js.map +1 -1
- package/dist/classes/utils.js +2 -2
- package/dist/classes/utils.js.map +1 -1
- package/dist/classes/vault.d.ts +3 -3
- package/dist/classes/vault.d.ts.map +1 -1
- package/dist/classes/vault.js +34 -32
- package/dist/classes/vault.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/accounts/Reserve.js +1 -1
- package/dist/idl_codegen_kamino_vault/accounts/VaultState.d.ts +18 -9
- package/dist/idl_codegen_kamino_vault/accounts/VaultState.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/accounts/VaultState.js +62 -42
- package/dist/idl_codegen_kamino_vault/accounts/VaultState.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/errors/custom.d.ts +112 -80
- package/dist/idl_codegen_kamino_vault/errors/custom.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/errors/custom.js +214 -158
- package/dist/idl_codegen_kamino_vault/errors/custom.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/deposit.d.ts +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/deposit.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/deposit.js +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/deposit.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/index.d.ts +6 -0
- package/dist/idl_codegen_kamino_vault/instructions/index.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/index.js +7 -1
- package/dist/idl_codegen_kamino_vault/instructions/index.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/initVault.d.ts +2 -2
- package/dist/idl_codegen_kamino_vault/instructions/initVault.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/initVault.js +2 -2
- package/dist/idl_codegen_kamino_vault/instructions/initVault.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.d.ts +19 -0
- package/dist/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.d.ts.map +1 -0
- package/dist/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.js +58 -0
- package/dist/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.js.map +1 -0
- package/dist/idl_codegen_kamino_vault/instructions/invest.d.ts +3 -4
- package/dist/idl_codegen_kamino_vault/instructions/invest.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/invest.js +2 -3
- package/dist/idl_codegen_kamino_vault/instructions/invest.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/updateSharesMetadata.d.ts +16 -0
- package/dist/idl_codegen_kamino_vault/instructions/updateSharesMetadata.d.ts.map +1 -0
- package/dist/idl_codegen_kamino_vault/instructions/updateSharesMetadata.js +55 -0
- package/dist/idl_codegen_kamino_vault/instructions/updateSharesMetadata.js.map +1 -0
- package/dist/idl_codegen_kamino_vault/instructions/updateVaultConfig.js +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/updateVaultConfig.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/withdraw.d.ts +24 -20
- package/dist/idl_codegen_kamino_vault/instructions/withdraw.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/withdraw.js +81 -20
- package/dist/idl_codegen_kamino_vault/instructions/withdraw.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.d.ts +21 -0
- package/dist/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.d.ts.map +1 -0
- package/dist/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.js +55 -0
- package/dist/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.js.map +1 -0
- package/dist/idl_codegen_kamino_vault/instructions/withdrawPendingFees.d.ts +2 -3
- package/dist/idl_codegen_kamino_vault/instructions/withdrawPendingFees.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/withdrawPendingFees.js +3 -4
- package/dist/idl_codegen_kamino_vault/instructions/withdrawPendingFees.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/ReserveConfig.d.ts +78 -20
- package/dist/idl_codegen_kamino_vault/types/ReserveConfig.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/ReserveConfig.js +45 -14
- package/dist/idl_codegen_kamino_vault/types/ReserveConfig.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/ReserveLiquidity.d.ts +16 -16
- package/dist/idl_codegen_kamino_vault/types/ReserveLiquidity.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/ReserveLiquidity.js +16 -16
- package/dist/idl_codegen_kamino_vault/types/ReserveLiquidity.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/VaultAllocation.d.ts +5 -5
- package/dist/idl_codegen_kamino_vault/types/VaultAllocation.js +7 -7
- package/dist/idl_codegen_kamino_vault/types/VaultConfigField.d.ts +46 -7
- package/dist/idl_codegen_kamino_vault/types/VaultConfigField.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/VaultConfigField.js +84 -12
- package/dist/idl_codegen_kamino_vault/types/VaultConfigField.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/index.d.ts +2 -2
- package/dist/idl_codegen_kamino_vault/types/index.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/index.js.map +1 -1
- package/dist/lending_operations/repay_with_collateral_calcs.d.ts.map +1 -1
- package/dist/lending_operations/repay_with_collateral_calcs.js +10 -1
- package/dist/lending_operations/repay_with_collateral_calcs.js.map +1 -1
- package/dist/lending_operations/repay_with_collateral_operations.d.ts.map +1 -1
- package/dist/lending_operations/repay_with_collateral_operations.js +7 -6
- package/dist/lending_operations/repay_with_collateral_operations.js.map +1 -1
- package/dist/leverage/operations.d.ts.map +1 -1
- package/dist/leverage/operations.js +12 -8
- package/dist/leverage/operations.js.map +1 -1
- package/dist/leverage/types.d.ts +1 -0
- package/dist/leverage/types.d.ts.map +1 -1
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/package.json +1 -1
- package/src/classes/manager.ts +3 -3
- package/src/classes/utils.ts +2 -2
- package/src/classes/vault.ts +34 -32
- package/src/idl_codegen_kamino_vault/accounts/Reserve.ts +1 -1
- package/src/idl_codegen_kamino_vault/accounts/VaultState.ts +215 -178
- package/src/idl_codegen_kamino_vault/errors/custom.ts +213 -157
- package/src/idl_codegen_kamino_vault/instructions/deposit.ts +2 -2
- package/src/idl_codegen_kamino_vault/instructions/index.ts +15 -0
- package/src/idl_codegen_kamino_vault/instructions/initVault.ts +4 -4
- package/src/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.ts +58 -0
- package/src/idl_codegen_kamino_vault/instructions/invest.ts +5 -7
- package/src/idl_codegen_kamino_vault/instructions/updateSharesMetadata.ts +52 -0
- package/src/idl_codegen_kamino_vault/instructions/updateVaultConfig.ts +1 -1
- package/src/idl_codegen_kamino_vault/instructions/withdraw.ts +106 -40
- package/src/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.ts +56 -0
- package/src/idl_codegen_kamino_vault/instructions/withdrawPendingFees.ts +5 -7
- package/src/idl_codegen_kamino_vault/types/ReserveConfig.ts +100 -28
- package/src/idl_codegen_kamino_vault/types/ReserveLiquidity.ts +25 -24
- package/src/idl_codegen_kamino_vault/types/VaultAllocation.ts +9 -9
- package/src/idl_codegen_kamino_vault/types/VaultConfigField.ts +103 -13
- package/src/idl_codegen_kamino_vault/types/index.ts +8 -2
- package/src/lending_operations/repay_with_collateral_calcs.ts +18 -1
- package/src/lending_operations/repay_with_collateral_operations.ts +9 -7
- package/src/leverage/operations.ts +69 -29
- package/src/leverage/types.ts +1 -0
- package/src/utils/index.ts +1 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { PublicKey, Connection } from
|
|
2
|
-
import BN from
|
|
3
|
-
import * as types from
|
|
1
|
+
import { PublicKey, Connection } from "@solana/web3.js";
|
|
2
|
+
import BN from "bn.js";
|
|
3
|
+
import * as types from "../types";
|
|
4
4
|
export interface VaultStateFields {
|
|
5
5
|
adminAuthority: PublicKey;
|
|
6
6
|
baseVaultAuthority: PublicKey;
|
|
@@ -27,9 +27,12 @@ export interface VaultStateFields {
|
|
|
27
27
|
minInvestDelaySlots: BN;
|
|
28
28
|
crankFundFeePerReserve: BN;
|
|
29
29
|
pendingAdmin: PublicKey;
|
|
30
|
+
cumulativeEarnedInterestSf: BN;
|
|
31
|
+
cumulativeMgmtFeesSf: BN;
|
|
32
|
+
cumulativePerfFeesSf: BN;
|
|
33
|
+
name: Array<number>;
|
|
30
34
|
vaultLookupTable: PublicKey;
|
|
31
|
-
|
|
32
|
-
padding1: BN;
|
|
35
|
+
vaultFarm: PublicKey;
|
|
33
36
|
padding2: Array<BN>;
|
|
34
37
|
}
|
|
35
38
|
export interface VaultStateJSON {
|
|
@@ -58,9 +61,12 @@ export interface VaultStateJSON {
|
|
|
58
61
|
minInvestDelaySlots: string;
|
|
59
62
|
crankFundFeePerReserve: string;
|
|
60
63
|
pendingAdmin: string;
|
|
64
|
+
cumulativeEarnedInterestSf: string;
|
|
65
|
+
cumulativeMgmtFeesSf: string;
|
|
66
|
+
cumulativePerfFeesSf: string;
|
|
67
|
+
name: Array<number>;
|
|
61
68
|
vaultLookupTable: string;
|
|
62
|
-
|
|
63
|
-
padding1: string;
|
|
69
|
+
vaultFarm: string;
|
|
64
70
|
padding2: Array<string>;
|
|
65
71
|
}
|
|
66
72
|
export declare class VaultState {
|
|
@@ -89,9 +95,12 @@ export declare class VaultState {
|
|
|
89
95
|
readonly minInvestDelaySlots: BN;
|
|
90
96
|
readonly crankFundFeePerReserve: BN;
|
|
91
97
|
readonly pendingAdmin: PublicKey;
|
|
98
|
+
readonly cumulativeEarnedInterestSf: BN;
|
|
99
|
+
readonly cumulativeMgmtFeesSf: BN;
|
|
100
|
+
readonly cumulativePerfFeesSf: BN;
|
|
101
|
+
readonly name: Array<number>;
|
|
92
102
|
readonly vaultLookupTable: PublicKey;
|
|
93
|
-
readonly
|
|
94
|
-
readonly padding1: BN;
|
|
103
|
+
readonly vaultFarm: PublicKey;
|
|
95
104
|
readonly padding2: Array<BN>;
|
|
96
105
|
static readonly discriminator: Buffer;
|
|
97
106
|
static readonly layout: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VaultState.d.ts","sourceRoot":"","sources":["../../../src/idl_codegen_kamino_vault/accounts/VaultState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"VaultState.d.ts","sourceRoot":"","sources":["../../../src/idl_codegen_kamino_vault/accounts/VaultState.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,41 +58,49 @@ class VaultState {
|
|
|
58
58
|
minInvestDelaySlots;
|
|
59
59
|
crankFundFeePerReserve;
|
|
60
60
|
pendingAdmin;
|
|
61
|
+
cumulativeEarnedInterestSf;
|
|
62
|
+
cumulativeMgmtFeesSf;
|
|
63
|
+
cumulativePerfFeesSf;
|
|
64
|
+
name;
|
|
61
65
|
vaultLookupTable;
|
|
62
|
-
|
|
63
|
-
padding1;
|
|
66
|
+
vaultFarm;
|
|
64
67
|
padding2;
|
|
65
|
-
static discriminator = Buffer.from([
|
|
68
|
+
static discriminator = Buffer.from([
|
|
69
|
+
228, 196, 82, 165, 98, 210, 235, 152,
|
|
70
|
+
]);
|
|
66
71
|
static layout = borsh.struct([
|
|
67
|
-
borsh.publicKey(
|
|
68
|
-
borsh.publicKey(
|
|
69
|
-
borsh.u64(
|
|
70
|
-
borsh.publicKey(
|
|
71
|
-
borsh.u64(
|
|
72
|
-
borsh.publicKey(
|
|
73
|
-
borsh.publicKey(
|
|
74
|
-
borsh.publicKey(
|
|
75
|
-
borsh.u64(
|
|
76
|
-
borsh.u64(
|
|
77
|
-
borsh.u64(
|
|
78
|
-
borsh.u64(
|
|
79
|
-
borsh.u64(
|
|
80
|
-
borsh.u64(
|
|
81
|
-
borsh.u64(
|
|
82
|
-
borsh.u64(
|
|
83
|
-
borsh.u128(
|
|
84
|
-
borsh.u128(
|
|
85
|
-
borsh.array(types.VaultAllocation.layout(), 10,
|
|
86
|
-
borsh.u64(
|
|
87
|
-
borsh.u64(
|
|
88
|
-
borsh.u64(
|
|
89
|
-
borsh.u64(
|
|
90
|
-
borsh.u64(
|
|
91
|
-
borsh.publicKey(
|
|
92
|
-
borsh.
|
|
93
|
-
borsh.
|
|
94
|
-
borsh.
|
|
95
|
-
borsh.array(borsh.
|
|
72
|
+
borsh.publicKey("adminAuthority"),
|
|
73
|
+
borsh.publicKey("baseVaultAuthority"),
|
|
74
|
+
borsh.u64("baseVaultAuthorityBump"),
|
|
75
|
+
borsh.publicKey("tokenMint"),
|
|
76
|
+
borsh.u64("tokenMintDecimals"),
|
|
77
|
+
borsh.publicKey("tokenVault"),
|
|
78
|
+
borsh.publicKey("tokenProgram"),
|
|
79
|
+
borsh.publicKey("sharesMint"),
|
|
80
|
+
borsh.u64("sharesMintDecimals"),
|
|
81
|
+
borsh.u64("tokenAvailable"),
|
|
82
|
+
borsh.u64("sharesIssued"),
|
|
83
|
+
borsh.u64("availableCrankFunds"),
|
|
84
|
+
borsh.u64("padding0"),
|
|
85
|
+
borsh.u64("performanceFeeBps"),
|
|
86
|
+
borsh.u64("managementFeeBps"),
|
|
87
|
+
borsh.u64("lastFeeChargeTimestamp"),
|
|
88
|
+
borsh.u128("prevAumSf"),
|
|
89
|
+
borsh.u128("pendingFeesSf"),
|
|
90
|
+
borsh.array(types.VaultAllocation.layout(), 10, "vaultAllocationStrategy"),
|
|
91
|
+
borsh.u64("minDepositAmount"),
|
|
92
|
+
borsh.u64("minWithdrawAmount"),
|
|
93
|
+
borsh.u64("minInvestAmount"),
|
|
94
|
+
borsh.u64("minInvestDelaySlots"),
|
|
95
|
+
borsh.u64("crankFundFeePerReserve"),
|
|
96
|
+
borsh.publicKey("pendingAdmin"),
|
|
97
|
+
borsh.u128("cumulativeEarnedInterestSf"),
|
|
98
|
+
borsh.u128("cumulativeMgmtFeesSf"),
|
|
99
|
+
borsh.u128("cumulativePerfFeesSf"),
|
|
100
|
+
borsh.array(borsh.u8(), 40, "name"),
|
|
101
|
+
borsh.publicKey("vaultLookupTable"),
|
|
102
|
+
borsh.publicKey("vaultFarm"),
|
|
103
|
+
borsh.array(borsh.u128(), 245, "padding2"),
|
|
96
104
|
]);
|
|
97
105
|
constructor(fields) {
|
|
98
106
|
this.adminAuthority = fields.adminAuthority;
|
|
@@ -120,9 +128,12 @@ class VaultState {
|
|
|
120
128
|
this.minInvestDelaySlots = fields.minInvestDelaySlots;
|
|
121
129
|
this.crankFundFeePerReserve = fields.crankFundFeePerReserve;
|
|
122
130
|
this.pendingAdmin = fields.pendingAdmin;
|
|
131
|
+
this.cumulativeEarnedInterestSf = fields.cumulativeEarnedInterestSf;
|
|
132
|
+
this.cumulativeMgmtFeesSf = fields.cumulativeMgmtFeesSf;
|
|
133
|
+
this.cumulativePerfFeesSf = fields.cumulativePerfFeesSf;
|
|
134
|
+
this.name = fields.name;
|
|
123
135
|
this.vaultLookupTable = fields.vaultLookupTable;
|
|
124
|
-
this.
|
|
125
|
-
this.padding1 = fields.padding1;
|
|
136
|
+
this.vaultFarm = fields.vaultFarm;
|
|
126
137
|
this.padding2 = fields.padding2;
|
|
127
138
|
}
|
|
128
139
|
static async fetch(c, address, programId = programId_1.PROGRAM_ID) {
|
|
@@ -148,8 +159,8 @@ class VaultState {
|
|
|
148
159
|
});
|
|
149
160
|
}
|
|
150
161
|
static decode(data) {
|
|
151
|
-
if (!
|
|
152
|
-
throw new Error(
|
|
162
|
+
if (!data.slice(0, 8).equals(VaultState.discriminator)) {
|
|
163
|
+
throw new Error("invalid account discriminator");
|
|
153
164
|
}
|
|
154
165
|
const dec = VaultState.layout.decode(data.slice(8));
|
|
155
166
|
return new VaultState({
|
|
@@ -178,9 +189,12 @@ class VaultState {
|
|
|
178
189
|
minInvestDelaySlots: dec.minInvestDelaySlots,
|
|
179
190
|
crankFundFeePerReserve: dec.crankFundFeePerReserve,
|
|
180
191
|
pendingAdmin: dec.pendingAdmin,
|
|
192
|
+
cumulativeEarnedInterestSf: dec.cumulativeEarnedInterestSf,
|
|
193
|
+
cumulativeMgmtFeesSf: dec.cumulativeMgmtFeesSf,
|
|
194
|
+
cumulativePerfFeesSf: dec.cumulativePerfFeesSf,
|
|
195
|
+
name: dec.name,
|
|
181
196
|
vaultLookupTable: dec.vaultLookupTable,
|
|
182
|
-
|
|
183
|
-
padding1: dec.padding1,
|
|
197
|
+
vaultFarm: dec.vaultFarm,
|
|
184
198
|
padding2: dec.padding2,
|
|
185
199
|
});
|
|
186
200
|
}
|
|
@@ -211,9 +225,12 @@ class VaultState {
|
|
|
211
225
|
minInvestDelaySlots: this.minInvestDelaySlots.toString(),
|
|
212
226
|
crankFundFeePerReserve: this.crankFundFeePerReserve.toString(),
|
|
213
227
|
pendingAdmin: this.pendingAdmin.toString(),
|
|
228
|
+
cumulativeEarnedInterestSf: this.cumulativeEarnedInterestSf.toString(),
|
|
229
|
+
cumulativeMgmtFeesSf: this.cumulativeMgmtFeesSf.toString(),
|
|
230
|
+
cumulativePerfFeesSf: this.cumulativePerfFeesSf.toString(),
|
|
231
|
+
name: this.name,
|
|
214
232
|
vaultLookupTable: this.vaultLookupTable.toString(),
|
|
215
|
-
|
|
216
|
-
padding1: this.padding1.toString(),
|
|
233
|
+
vaultFarm: this.vaultFarm.toString(),
|
|
217
234
|
padding2: this.padding2.map((item) => item.toString()),
|
|
218
235
|
};
|
|
219
236
|
}
|
|
@@ -244,9 +261,12 @@ class VaultState {
|
|
|
244
261
|
minInvestDelaySlots: new bn_js_1.default(obj.minInvestDelaySlots),
|
|
245
262
|
crankFundFeePerReserve: new bn_js_1.default(obj.crankFundFeePerReserve),
|
|
246
263
|
pendingAdmin: new web3_js_1.PublicKey(obj.pendingAdmin),
|
|
264
|
+
cumulativeEarnedInterestSf: new bn_js_1.default(obj.cumulativeEarnedInterestSf),
|
|
265
|
+
cumulativeMgmtFeesSf: new bn_js_1.default(obj.cumulativeMgmtFeesSf),
|
|
266
|
+
cumulativePerfFeesSf: new bn_js_1.default(obj.cumulativePerfFeesSf),
|
|
267
|
+
name: obj.name,
|
|
247
268
|
vaultLookupTable: new web3_js_1.PublicKey(obj.vaultLookupTable),
|
|
248
|
-
|
|
249
|
-
padding1: new bn_js_1.default(obj.padding1),
|
|
269
|
+
vaultFarm: new web3_js_1.PublicKey(obj.vaultFarm),
|
|
250
270
|
padding2: obj.padding2.map((item) => new bn_js_1.default(item)),
|
|
251
271
|
});
|
|
252
272
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VaultState.js","sourceRoot":"","sources":["../../../src/idl_codegen_kamino_vault/accounts/VaultState.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"VaultState.js","sourceRoot":"","sources":["../../../src/idl_codegen_kamino_vault/accounts/VaultState.ts"],"names":[],"mappings":"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"}
|