@kamino-finance/klend-sdk 5.12.6 → 5.12.7-beta.0
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.map +1 -1
- package/dist/classes/manager.js +50 -13
- package/dist/classes/manager.js.map +1 -1
- package/dist/classes/market.d.ts +1 -0
- package/dist/classes/market.d.ts.map +1 -1
- package/dist/classes/market.js +3 -0
- package/dist/classes/market.js.map +1 -1
- package/dist/classes/vault.d.ts +0 -1
- package/dist/classes/vault.d.ts.map +1 -1
- package/dist/classes/vault.js +0 -16
- package/dist/classes/vault.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/deposit.d.ts +0 -2
- package/dist/idl_codegen_kamino_vault/instructions/deposit.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/deposit.js +0 -2
- package/dist/idl_codegen_kamino_vault/instructions/deposit.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/withdraw.d.ts +0 -4
- package/dist/idl_codegen_kamino_vault/instructions/withdraw.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/withdraw.js +0 -12
- package/dist/idl_codegen_kamino_vault/instructions/withdraw.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.d.ts +0 -2
- package/dist/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.js +0 -2
- package/dist/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.js.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/ReserveConfig.d.ts +11 -26
- package/dist/idl_codegen_kamino_vault/types/ReserveConfig.d.ts.map +1 -1
- package/dist/idl_codegen_kamino_vault/types/ReserveConfig.js +10 -15
- package/dist/idl_codegen_kamino_vault/types/ReserveConfig.js.map +1 -1
- package/dist/utils/accountListing.d.ts +2 -2
- package/dist/utils/accountListing.d.ts.map +1 -1
- package/dist/utils/accountListing.js +1 -1
- package/dist/utils/accountListing.js.map +1 -1
- package/dist/utils/oracle.d.ts +1 -0
- package/dist/utils/oracle.d.ts.map +1 -1
- package/dist/utils/oracle.js +8 -7
- package/dist/utils/oracle.js.map +1 -1
- package/package.json +1 -1
- package/src/classes/manager.ts +71 -21
- package/src/classes/market.ts +11 -0
- package/src/classes/vault.ts +1 -16
- package/src/client.ts +26 -1
- package/src/idl_codegen_kamino_vault/instructions/deposit.ts +0 -4
- package/src/idl_codegen_kamino_vault/instructions/withdraw.ts +0 -16
- package/src/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.ts +0 -4
- package/src/idl_codegen_kamino_vault/types/ReserveConfig.ts +16 -31
- package/src/idl_kamino_vault.json +10 -120
- package/src/utils/accountListing.ts +3 -3
- package/src/utils/oracle.ts +14 -9
|
@@ -8,15 +8,10 @@ export interface ReserveConfigFields {
|
|
|
8
8
|
assetTier: number;
|
|
9
9
|
/** Flat rate that goes to the host */
|
|
10
10
|
hostFixedInterestRateBps: number;
|
|
11
|
-
/**
|
|
12
|
-
* [DEPRECATED] Space that used to hold 2 fields:
|
|
13
|
-
* - Boost for side (debt or collateral)
|
|
14
|
-
* - Reward points multiplier per obligation type
|
|
15
|
-
* Can be re-used after making sure all underlying production account data is zeroed.
|
|
16
|
-
*/
|
|
11
|
+
/** [DEPRECATED] Boost for side (debt or collateral) */
|
|
17
12
|
reserved2: Array<number>;
|
|
18
|
-
/**
|
|
19
|
-
|
|
13
|
+
/** [DEPRECATED] Reward points multiplier per obligation type */
|
|
14
|
+
reserved3: Array<number>;
|
|
20
15
|
/** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
|
|
21
16
|
protocolTakeRatePct: number;
|
|
22
17
|
/** Cut of the liquidation bonus that the protocol receives, as a percentage */
|
|
@@ -100,15 +95,10 @@ export interface ReserveConfigJSON {
|
|
|
100
95
|
assetTier: number;
|
|
101
96
|
/** Flat rate that goes to the host */
|
|
102
97
|
hostFixedInterestRateBps: number;
|
|
103
|
-
/**
|
|
104
|
-
* [DEPRECATED] Space that used to hold 2 fields:
|
|
105
|
-
* - Boost for side (debt or collateral)
|
|
106
|
-
* - Reward points multiplier per obligation type
|
|
107
|
-
* Can be re-used after making sure all underlying production account data is zeroed.
|
|
108
|
-
*/
|
|
98
|
+
/** [DEPRECATED] Boost for side (debt or collateral) */
|
|
109
99
|
reserved2: Array<number>;
|
|
110
|
-
/**
|
|
111
|
-
|
|
100
|
+
/** [DEPRECATED] Reward points multiplier per obligation type */
|
|
101
|
+
reserved3: Array<number>;
|
|
112
102
|
/** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
|
|
113
103
|
protocolTakeRatePct: number;
|
|
114
104
|
/** Cut of the liquidation bonus that the protocol receives, as a percentage */
|
|
@@ -193,15 +183,10 @@ export declare class ReserveConfig {
|
|
|
193
183
|
readonly assetTier: number;
|
|
194
184
|
/** Flat rate that goes to the host */
|
|
195
185
|
readonly hostFixedInterestRateBps: number;
|
|
196
|
-
/**
|
|
197
|
-
* [DEPRECATED] Space that used to hold 2 fields:
|
|
198
|
-
* - Boost for side (debt or collateral)
|
|
199
|
-
* - Reward points multiplier per obligation type
|
|
200
|
-
* Can be re-used after making sure all underlying production account data is zeroed.
|
|
201
|
-
*/
|
|
186
|
+
/** [DEPRECATED] Boost for side (debt or collateral) */
|
|
202
187
|
readonly reserved2: Array<number>;
|
|
203
|
-
/**
|
|
204
|
-
readonly
|
|
188
|
+
/** [DEPRECATED] Reward points multiplier per obligation type */
|
|
189
|
+
readonly reserved3: Array<number>;
|
|
205
190
|
/** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
|
|
206
191
|
readonly protocolTakeRatePct: number;
|
|
207
192
|
/** Cut of the liquidation bonus that the protocol receives, as a percentage */
|
|
@@ -285,7 +270,7 @@ export declare class ReserveConfig {
|
|
|
285
270
|
assetTier: number;
|
|
286
271
|
hostFixedInterestRateBps: number;
|
|
287
272
|
reserved2: number[];
|
|
288
|
-
|
|
273
|
+
reserved3: number[];
|
|
289
274
|
protocolTakeRatePct: number;
|
|
290
275
|
protocolLiquidationFeePct: number;
|
|
291
276
|
loanToValuePct: number;
|
|
@@ -363,7 +348,7 @@ export declare class ReserveConfig {
|
|
|
363
348
|
assetTier: number;
|
|
364
349
|
hostFixedInterestRateBps: number;
|
|
365
350
|
reserved2: number[];
|
|
366
|
-
|
|
351
|
+
reserved3: number[];
|
|
367
352
|
protocolTakeRatePct: number;
|
|
368
353
|
protocolLiquidationFeePct: number;
|
|
369
354
|
loanToValuePct: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReserveConfig.d.ts","sourceRoot":"","sources":["../../../src/idl_codegen_kamino_vault/types/ReserveConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,MAAM,OAAO,CAAA;AACtB,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAGjC,MAAM,WAAW,mBAAmB;IAClC,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAA;IACd,gGAAgG;IAChG,SAAS,EAAE,MAAM,CAAA;IACjB,sCAAsC;IACtC,wBAAwB,EAAE,MAAM,CAAA;IAChC
|
|
1
|
+
{"version":3,"file":"ReserveConfig.d.ts","sourceRoot":"","sources":["../../../src/idl_codegen_kamino_vault/types/ReserveConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,15 +48,10 @@ class ReserveConfig {
|
|
|
48
48
|
assetTier;
|
|
49
49
|
/** Flat rate that goes to the host */
|
|
50
50
|
hostFixedInterestRateBps;
|
|
51
|
-
/**
|
|
52
|
-
* [DEPRECATED] Space that used to hold 2 fields:
|
|
53
|
-
* - Boost for side (debt or collateral)
|
|
54
|
-
* - Reward points multiplier per obligation type
|
|
55
|
-
* Can be re-used after making sure all underlying production account data is zeroed.
|
|
56
|
-
*/
|
|
51
|
+
/** [DEPRECATED] Boost for side (debt or collateral) */
|
|
57
52
|
reserved2;
|
|
58
|
-
/**
|
|
59
|
-
|
|
53
|
+
/** [DEPRECATED] Reward points multiplier per obligation type */
|
|
54
|
+
reserved3;
|
|
60
55
|
/** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
|
|
61
56
|
protocolTakeRatePct;
|
|
62
57
|
/** Cut of the liquidation bonus that the protocol receives, as a percentage */
|
|
@@ -137,7 +132,7 @@ class ReserveConfig {
|
|
|
137
132
|
this.assetTier = fields.assetTier;
|
|
138
133
|
this.hostFixedInterestRateBps = fields.hostFixedInterestRateBps;
|
|
139
134
|
this.reserved2 = fields.reserved2;
|
|
140
|
-
this.
|
|
135
|
+
this.reserved3 = fields.reserved3;
|
|
141
136
|
this.protocolTakeRatePct = fields.protocolTakeRatePct;
|
|
142
137
|
this.protocolLiquidationFeePct = fields.protocolLiquidationFeePct;
|
|
143
138
|
this.loanToValuePct = fields.loanToValuePct;
|
|
@@ -181,8 +176,8 @@ class ReserveConfig {
|
|
|
181
176
|
borsh.u8("status"),
|
|
182
177
|
borsh.u8("assetTier"),
|
|
183
178
|
borsh.u16("hostFixedInterestRateBps"),
|
|
184
|
-
borsh.array(borsh.u8(),
|
|
185
|
-
borsh.u8("
|
|
179
|
+
borsh.array(borsh.u8(), 2, "reserved2"),
|
|
180
|
+
borsh.array(borsh.u8(), 8, "reserved3"),
|
|
186
181
|
borsh.u8("protocolTakeRatePct"),
|
|
187
182
|
borsh.u8("protocolLiquidationFeePct"),
|
|
188
183
|
borsh.u8("loanToValuePct"),
|
|
@@ -217,7 +212,7 @@ class ReserveConfig {
|
|
|
217
212
|
assetTier: obj.assetTier,
|
|
218
213
|
hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
|
|
219
214
|
reserved2: obj.reserved2,
|
|
220
|
-
|
|
215
|
+
reserved3: obj.reserved3,
|
|
221
216
|
protocolTakeRatePct: obj.protocolTakeRatePct,
|
|
222
217
|
protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
|
|
223
218
|
loanToValuePct: obj.loanToValuePct,
|
|
@@ -251,7 +246,7 @@ class ReserveConfig {
|
|
|
251
246
|
assetTier: fields.assetTier,
|
|
252
247
|
hostFixedInterestRateBps: fields.hostFixedInterestRateBps,
|
|
253
248
|
reserved2: fields.reserved2,
|
|
254
|
-
|
|
249
|
+
reserved3: fields.reserved3,
|
|
255
250
|
protocolTakeRatePct: fields.protocolTakeRatePct,
|
|
256
251
|
protocolLiquidationFeePct: fields.protocolLiquidationFeePct,
|
|
257
252
|
loanToValuePct: fields.loanToValuePct,
|
|
@@ -285,7 +280,7 @@ class ReserveConfig {
|
|
|
285
280
|
assetTier: this.assetTier,
|
|
286
281
|
hostFixedInterestRateBps: this.hostFixedInterestRateBps,
|
|
287
282
|
reserved2: this.reserved2,
|
|
288
|
-
|
|
283
|
+
reserved3: this.reserved3,
|
|
289
284
|
protocolTakeRatePct: this.protocolTakeRatePct,
|
|
290
285
|
protocolLiquidationFeePct: this.protocolLiquidationFeePct,
|
|
291
286
|
loanToValuePct: this.loanToValuePct,
|
|
@@ -319,7 +314,7 @@ class ReserveConfig {
|
|
|
319
314
|
assetTier: obj.assetTier,
|
|
320
315
|
hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
|
|
321
316
|
reserved2: obj.reserved2,
|
|
322
|
-
|
|
317
|
+
reserved3: obj.reserved3,
|
|
323
318
|
protocolTakeRatePct: obj.protocolTakeRatePct,
|
|
324
319
|
protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
|
|
325
320
|
loanToValuePct: obj.loanToValuePct,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReserveConfig.js","sourceRoot":"","sources":["../../../src/idl_codegen_kamino_vault/types/ReserveConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAsB,CAAC,wDAAwD;AAC/E,gDAAiC,CAAC,wDAAwD;AAC1F,wDAAyC;
|
|
1
|
+
{"version":3,"file":"ReserveConfig.js","sourceRoot":"","sources":["../../../src/idl_codegen_kamino_vault/types/ReserveConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Connection, PublicKey } from '@solana/web3.js';
|
|
1
|
+
import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
|
|
2
2
|
import { LendingMarket, Obligation, Reserve } from '../idl_codegen/accounts';
|
|
3
3
|
export declare function getAllObligationAccounts(connection: Connection): AsyncGenerator<[PublicKey, Obligation], void, unknown>;
|
|
4
|
-
export declare function getAllReserveAccounts(connection: Connection): AsyncGenerator<[PublicKey, Reserve], void, unknown>;
|
|
4
|
+
export declare function getAllReserveAccounts(connection: Connection): AsyncGenerator<[PublicKey, Reserve, AccountInfo<Buffer>], void, unknown>;
|
|
5
5
|
export declare function getAllLendingMarketAccounts(connection: Connection): AsyncGenerator<[PublicKey, LendingMarket], void, unknown>;
|
|
6
6
|
//# sourceMappingURL=accountListing.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountListing.d.ts","sourceRoot":"","sources":["../../src/utils/accountListing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"accountListing.d.ts","sourceRoot":"","sources":["../../src/utils/accountListing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAI7E,wBAAuB,wBAAwB,CAC7C,UAAU,EAAE,UAAU,GACrB,cAAc,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CA0BxD;AAED,wBAAuB,qBAAqB,CAC1C,UAAU,EAAE,UAAU,GACrB,cAAc,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAkB1E;AAED,wBAAuB,2BAA2B,CAChD,UAAU,EAAE,UAAU,GACrB,cAAc,CAAC,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAkB3D"}
|
|
@@ -52,7 +52,7 @@ async function* getAllReserveAccounts(connection) {
|
|
|
52
52
|
],
|
|
53
53
|
});
|
|
54
54
|
for (const reserve of reserves) {
|
|
55
|
-
yield [reserve.pubkey, accounts_1.Reserve.decode(reserve.account.data)];
|
|
55
|
+
yield [reserve.pubkey, accounts_1.Reserve.decode(reserve.account.data), reserve.account];
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
async function* getAllLendingMarketAccounts(connection) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountListing.js","sourceRoot":"","sources":["../../src/utils/accountListing.ts"],"names":[],"mappings":";;;;;AAKA,4DA4BC;AAED,sDAoBC;AAED,kEAoBC;AA5ED,sDAA6E;AAC7E,wDAAsD;AACtD,gDAAwB;AAEjB,KAAK,SAAS,CAAC,CAAC,wBAAwB,CAC7C,UAAsB;IAEtB,uBAAuB;IACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,sBAAU,EAAE;YAClE,OAAO,EAAE;gBACP;oBACE,QAAQ,EAAE,qBAAU,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;iBACrC;gBACD;oBACE,MAAM,EAAE;wBACN,MAAM,EAAE,CAAC;wBACT,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,qBAAU,CAAC,aAAa,CAAC;qBAC7C;iBACF;gBACD;oBACE,MAAM,EAAE;wBACN,MAAM,EAAE,EAAE;wBACV,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,0EAA0E;qBACpG;iBACF;aACF;SACF,CAAC,CAAC;QACH,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,qBAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;AACH,CAAC;AAEM,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAC1C,UAAsB;IAEtB,uIAAuI;IACvI,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,sBAAU,EAAE;QAC/D,OAAO,EAAE;YACP;gBACE,QAAQ,EAAE,kBAAO,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;aAClC;YACD;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,kBAAO,CAAC,aAAa,CAAC;iBAC1C;aACF;SACF;KACF,CAAC,CAAC;IACH,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"accountListing.js","sourceRoot":"","sources":["../../src/utils/accountListing.ts"],"names":[],"mappings":";;;;;AAKA,4DA4BC;AAED,sDAoBC;AAED,kEAoBC;AA5ED,sDAA6E;AAC7E,wDAAsD;AACtD,gDAAwB;AAEjB,KAAK,SAAS,CAAC,CAAC,wBAAwB,CAC7C,UAAsB;IAEtB,uBAAuB;IACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,sBAAU,EAAE;YAClE,OAAO,EAAE;gBACP;oBACE,QAAQ,EAAE,qBAAU,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;iBACrC;gBACD;oBACE,MAAM,EAAE;wBACN,MAAM,EAAE,CAAC;wBACT,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,qBAAU,CAAC,aAAa,CAAC;qBAC7C;iBACF;gBACD;oBACE,MAAM,EAAE;wBACN,MAAM,EAAE,EAAE;wBACV,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,0EAA0E;qBACpG;iBACF;aACF;SACF,CAAC,CAAC;QACH,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,qBAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;AACH,CAAC;AAEM,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAC1C,UAAsB;IAEtB,uIAAuI;IACvI,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,sBAAU,EAAE;QAC/D,OAAO,EAAE;YACP;gBACE,QAAQ,EAAE,kBAAO,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;aAClC;YACD;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,kBAAO,CAAC,aAAa,CAAC;iBAC1C;aACF;SACF;KACF,CAAC,CAAC;IACH,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAEM,KAAK,SAAS,CAAC,CAAC,2BAA2B,CAChD,UAAsB;IAEtB,mJAAmJ;IACnJ,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,sBAAU,EAAE;QACrE,OAAO,EAAE;YACP;gBACE,QAAQ,EAAE,wBAAa,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;aACxC;YACD;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,wBAAa,CAAC,aAAa,CAAC;iBAChD;aACF;SACF;KACF,CAAC,CAAC;IACH,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;QAC3C,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACjF,CAAC;AACH,CAAC"}
|
package/dist/utils/oracle.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ export type ScopePriceRefreshConfig = {
|
|
|
22
22
|
scope: Scope;
|
|
23
23
|
scopeFeed: string;
|
|
24
24
|
};
|
|
25
|
+
export declare function getTokenOracleDataSync(allOracleAccounts: AllOracleAccounts, switchboardV2: SwitchboardProgram, reserves: Reserve[]): [Reserve, TokenOracleData | undefined][];
|
|
25
26
|
export declare function getTokenOracleData(connection: Connection, reserves: Reserve[]): Promise<Array<[Reserve, TokenOracleData | undefined]>>;
|
|
26
27
|
export type AllOracleAccounts = PubkeyHashMap<PublicKey, AccountInfo<Buffer>>;
|
|
27
28
|
export declare function getAllOracleAccounts(connection: Connection, reserves: Reserve[]): Promise<AllOracleAccounts>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../src/utils/oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAmB,aAAa,EAAgB,MAAM,UAAU,CAAC;AAExE,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAQjC,eAAO,MAAM,yBAAyB,EAAE,OAA0B,CAAC;AAGnE,eAAO,MAAM,iBAAiB,EAAE,OAA2D,CAAC;AAM5F,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,SAAS,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;
|
|
1
|
+
{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../src/utils/oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAmB,aAAa,EAAgB,MAAM,UAAU,CAAC;AAExE,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAQjC,eAAO,MAAM,yBAAyB,EAAE,OAA0B,CAAC;AAGnE,eAAO,MAAM,iBAAiB,EAAE,OAA2D,CAAC;AAM5F,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,SAAS,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,kBAAkB,EACjC,QAAQ,EAAE,OAAO,EAAE,4CA2DpB;AAGD,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,CAIxD;AAED,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;AAE9E,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAyBlH;AAMD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,IAAI,CAAC,EAAE,cAAc,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,EACjC,cAAc,EAAE,iBAAiB,GAChC,UAAU,GAAG,IAAI,CAwCnB;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,EACjB,gBAAgB,EAAE,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,EAChD,cAAc,EAAE,iBAAiB,EACjC,aAAa,EAAE,kBAAkB,GAChC,cAAc,GAAG,IAAI,CA6BvB;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,EACxC,iBAAiB,EAAE,iBAAiB,EACpC,KAAK,EAAE,MAAM,EAAE,GACd,cAAc,GAAG,IAAI,CAsBvB"}
|
package/dist/utils/oracle.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.CONFIDENCE_FACTOR = exports.MAX_CONFIDENCE_PERCENTAGE = void 0;
|
|
7
|
+
exports.getTokenOracleDataSync = getTokenOracleDataSync;
|
|
7
8
|
exports.getTokenOracleData = getTokenOracleData;
|
|
8
9
|
exports.getAllOracleAccounts = getAllOracleAccounts;
|
|
9
10
|
exports.cacheOrGetPythPrices = cacheOrGetPythPrices;
|
|
@@ -25,14 +26,11 @@ exports.CONFIDENCE_FACTOR = new decimal_js_1.default('100').div(exports.MAX_CONF
|
|
|
25
26
|
const getScopeAddress = () => {
|
|
26
27
|
return 'HFn8GnPADiny6XqUoWE8uRPPxb29ikn4yTuPa9MF2fWJ';
|
|
27
28
|
};
|
|
28
|
-
|
|
29
|
-
async function getTokenOracleData(connection, reserves) {
|
|
30
|
-
const allOracleAccounts = await getAllOracleAccounts(connection, reserves);
|
|
29
|
+
function getTokenOracleDataSync(allOracleAccounts, switchboardV2, reserves) {
|
|
31
30
|
const tokenOracleDataForReserves = [];
|
|
32
31
|
const pythCache = new pubkey_1.PubkeyHashMap();
|
|
33
32
|
const switchboardCache = new pubkey_1.PubkeyHashMap();
|
|
34
33
|
const scopeCache = new pubkey_1.PubkeyHashMap();
|
|
35
|
-
let switchboardV2;
|
|
36
34
|
for (const reserve of reserves) {
|
|
37
35
|
let currentBest = undefined;
|
|
38
36
|
const oracle = {
|
|
@@ -48,9 +46,6 @@ async function getTokenOracleData(connection, reserves) {
|
|
|
48
46
|
}
|
|
49
47
|
}
|
|
50
48
|
if ((0, pubkey_1.isNotNullPubkey)(oracle.switchboardFeedAddress)) {
|
|
51
|
-
if (!switchboardV2) {
|
|
52
|
-
switchboardV2 = await sbv2_lite_1.default.loadMainnet(connection);
|
|
53
|
-
}
|
|
54
49
|
const switchboardPrice = cacheOrGetSwitchboardPrice(oracle.switchboardFeedAddress, switchboardCache, allOracleAccounts, switchboardV2);
|
|
55
50
|
if (switchboardPrice) {
|
|
56
51
|
currentBest = getBestPrice(currentBest, switchboardPrice);
|
|
@@ -78,6 +73,12 @@ async function getTokenOracleData(connection, reserves) {
|
|
|
78
73
|
}
|
|
79
74
|
return tokenOracleDataForReserves;
|
|
80
75
|
}
|
|
76
|
+
// TODO: Add freshness of the latest price to match sc logic
|
|
77
|
+
async function getTokenOracleData(connection, reserves) {
|
|
78
|
+
const allOracleAccounts = await getAllOracleAccounts(connection, reserves);
|
|
79
|
+
const switchboardV2 = await sbv2_lite_1.default.loadMainnet(connection);
|
|
80
|
+
return getTokenOracleDataSync(allOracleAccounts, switchboardV2, reserves);
|
|
81
|
+
}
|
|
81
82
|
async function getAllOracleAccounts(connection, reserves) {
|
|
82
83
|
const allAccounts = [];
|
|
83
84
|
reserves.forEach((reserve) => {
|
package/dist/utils/oracle.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../src/utils/oracle.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../src/utils/oracle.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/classes/manager.ts
CHANGED
|
@@ -32,7 +32,12 @@ import {
|
|
|
32
32
|
CreateKaminoMarketParams,
|
|
33
33
|
createReserveIxs,
|
|
34
34
|
ENV,
|
|
35
|
+
getAllLendingMarketAccounts,
|
|
36
|
+
getAllOracleAccounts,
|
|
37
|
+
getAllReserveAccounts,
|
|
38
|
+
getMedianSlotDurationInMsFromLastEpochs,
|
|
35
39
|
getReserveOracleConfigs,
|
|
40
|
+
getTokenOracleDataSync,
|
|
36
41
|
initLendingMarket,
|
|
37
42
|
InitLendingMarketAccounts,
|
|
38
43
|
InitLendingMarketArgs,
|
|
@@ -44,6 +49,7 @@ import {
|
|
|
44
49
|
MarketWithAddress,
|
|
45
50
|
parseForChangesReserveConfigAndGetIxs,
|
|
46
51
|
parseOracleType,
|
|
52
|
+
parseTokenSymbol,
|
|
47
53
|
PubkeyHashMap,
|
|
48
54
|
Reserve,
|
|
49
55
|
ReserveWithAddress,
|
|
@@ -86,6 +92,7 @@ import {
|
|
|
86
92
|
WithdrawIxs,
|
|
87
93
|
} from './types';
|
|
88
94
|
import { FarmState } from '@kamino-finance/farms-sdk/dist';
|
|
95
|
+
import SwitchboardProgram from '@switchboard-xyz/sbv2-lite';
|
|
89
96
|
|
|
90
97
|
/**
|
|
91
98
|
* KaminoManager is a class that provides a high-level interface to interact with the Kamino Lend and Kamino Vault programs, in order to create and manage a market, as well as vaults
|
|
@@ -600,29 +607,72 @@ export class KaminoManager {
|
|
|
600
607
|
* @returns an array of all lending markets
|
|
601
608
|
*/
|
|
602
609
|
async getAllMarkets(): Promise<KaminoMarket[]> {
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
610
|
+
// Get all lending markets
|
|
611
|
+
const marketGenerator = getAllLendingMarketAccounts(this.getConnection());
|
|
612
|
+
const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
|
|
613
|
+
|
|
614
|
+
const lendingMarketPairs: [PublicKey, LendingMarket][] = [];
|
|
615
|
+
for await (const pair of marketGenerator) {
|
|
616
|
+
lendingMarketPairs.push(pair);
|
|
617
|
+
}
|
|
618
|
+
|
|
619
|
+
// Get all reserves
|
|
620
|
+
const allReserveAccounts = await getAllReserveAccounts(this.getConnection());
|
|
621
|
+
const reservePairs: [PublicKey, Reserve, AccountInfo<Buffer<ArrayBufferLike>>][] = [];
|
|
622
|
+
for await (const pair of allReserveAccounts) {
|
|
623
|
+
reservePairs.push(pair);
|
|
624
|
+
}
|
|
625
|
+
const allReserves = reservePairs.map(([, reserve]) => reserve);
|
|
626
|
+
|
|
627
|
+
// Get all oracle accounts
|
|
628
|
+
const allOracleAccounts = await getAllOracleAccounts(this.getConnection(), allReserves);
|
|
629
|
+
const switchboardV2 = await SwitchboardProgram.loadMainnet(this.getConnection());
|
|
630
|
+
|
|
631
|
+
// Group reserves by market
|
|
632
|
+
const marketToReserve = new PubkeyHashMap<
|
|
633
|
+
PublicKey,
|
|
634
|
+
[PublicKey, Reserve, AccountInfo<Buffer<ArrayBufferLike>>][]
|
|
635
|
+
>();
|
|
636
|
+
for (const [reserveAddress, reserveState, buffer] of reservePairs) {
|
|
637
|
+
const marketAddress = reserveState.lendingMarket;
|
|
638
|
+
if (!marketToReserve.has(marketAddress)) {
|
|
639
|
+
marketToReserve.set(marketAddress, [[reserveAddress, reserveState, buffer]]);
|
|
640
|
+
} else {
|
|
641
|
+
marketToReserve.get(marketAddress)?.push([reserveAddress, reserveState, buffer]);
|
|
613
642
|
}
|
|
614
|
-
|
|
643
|
+
}
|
|
615
644
|
|
|
616
|
-
const
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
645
|
+
const combinedMarkets = lendingMarketPairs.map(([pubkey, market]) => {
|
|
646
|
+
const reserves = marketToReserve.get(pubkey);
|
|
647
|
+
const reservesByAddress = new PubkeyHashMap<PublicKey, KaminoReserve>();
|
|
648
|
+
if (!reserves) {
|
|
649
|
+
console.log(`Market ${pubkey.toString()} ${parseTokenSymbol(market.name)} has no reserves`);
|
|
650
|
+
} else {
|
|
651
|
+
const allBuffers = reserves.map(([, , account]) => account);
|
|
652
|
+
const allReserves = reserves.map(([, reserve]) => reserve);
|
|
653
|
+
const reservesAndOracles = getTokenOracleDataSync(allOracleAccounts, switchboardV2, allReserves);
|
|
654
|
+
reservesAndOracles.forEach(([reserve, oracle], index) => {
|
|
655
|
+
if (!oracle) {
|
|
656
|
+
console.log('Manager > getAllMarkets: oracle not found for reserve', reserve.config.tokenInfo.name);
|
|
657
|
+
return;
|
|
658
|
+
}
|
|
659
|
+
|
|
660
|
+
const kaminoReserve = KaminoReserve.initialize(
|
|
661
|
+
allBuffers[index],
|
|
662
|
+
reserves[index][0],
|
|
663
|
+
reserves[index][1],
|
|
664
|
+
oracle,
|
|
665
|
+
this.getConnection(),
|
|
666
|
+
this.recentSlotDurationMs
|
|
667
|
+
);
|
|
668
|
+
reservesByAddress.set(kaminoReserve.address, kaminoReserve);
|
|
669
|
+
});
|
|
670
|
+
}
|
|
671
|
+
|
|
672
|
+
return KaminoMarket.loadWithReserves(this.getConnection(), market, reservesByAddress, pubkey, slotDuration);
|
|
673
|
+
});
|
|
674
|
+
|
|
675
|
+
return combinedMarkets;
|
|
626
676
|
}
|
|
627
677
|
|
|
628
678
|
/**
|
package/src/classes/market.ts
CHANGED
|
@@ -112,6 +112,17 @@ export class KaminoMarket {
|
|
|
112
112
|
return new KaminoMarket(connection, market, marketAddress.toString(), reserves, recentSlotDurationMs, programId);
|
|
113
113
|
}
|
|
114
114
|
|
|
115
|
+
static loadWithReserves(
|
|
116
|
+
connection: Connection,
|
|
117
|
+
market: LendingMarket,
|
|
118
|
+
reserves: Map<PublicKey, KaminoReserve>,
|
|
119
|
+
marketAddress: PublicKey,
|
|
120
|
+
recentSlotDurationMs: number,
|
|
121
|
+
programId: PublicKey = PROGRAM_ID
|
|
122
|
+
) {
|
|
123
|
+
return new KaminoMarket(connection, market, marketAddress.toString(), reserves, recentSlotDurationMs, programId);
|
|
124
|
+
}
|
|
125
|
+
|
|
115
126
|
async reload(): Promise<void> {
|
|
116
127
|
const market = await LendingMarket.fetch(this.connection, this.getAddress(), this.programId);
|
|
117
128
|
if (market === null) {
|
package/src/classes/vault.ts
CHANGED
|
@@ -109,7 +109,7 @@ const TOKEN_VAULT_SEED = 'token_vault';
|
|
|
109
109
|
const CTOKEN_VAULT_SEED = 'ctoken_vault';
|
|
110
110
|
const BASE_VAULT_AUTHORITY_SEED = 'authority';
|
|
111
111
|
const SHARES_SEED = 'shares';
|
|
112
|
-
|
|
112
|
+
|
|
113
113
|
export const INITIAL_DEPOSIT_LAMPORTS = 1000;
|
|
114
114
|
|
|
115
115
|
/**
|
|
@@ -794,7 +794,6 @@ export class KaminoVaultClient {
|
|
|
794
794
|
]);
|
|
795
795
|
createAtasIxns.push(createSharesAtaIxns);
|
|
796
796
|
|
|
797
|
-
const eventAuthority = getEventAuthorityPda(this._kaminoVaultProgramId);
|
|
798
797
|
const depoistAccounts: DepositAccounts = {
|
|
799
798
|
user: user,
|
|
800
799
|
vaultState: vault.address,
|
|
@@ -807,8 +806,6 @@ export class KaminoVaultClient {
|
|
|
807
806
|
tokenProgram: tokenProgramID,
|
|
808
807
|
klendProgram: this._kaminoLendProgramId,
|
|
809
808
|
sharesTokenProgram: TOKEN_PROGRAM_ID,
|
|
810
|
-
eventAuthority: eventAuthority,
|
|
811
|
-
program: this._kaminoVaultProgramId,
|
|
812
809
|
};
|
|
813
810
|
|
|
814
811
|
const depositArgs: DepositArgs = {
|
|
@@ -1279,7 +1276,6 @@ export class KaminoVaultClient {
|
|
|
1279
1276
|
): TransactionInstruction {
|
|
1280
1277
|
const lendingMarketAuth = lendingMarketAuthPda(marketAddress, this._kaminoLendProgramId)[0];
|
|
1281
1278
|
|
|
1282
|
-
const eventAuthority = getEventAuthorityPda(this._kaminoVaultProgramId);
|
|
1283
1279
|
const withdrawAccounts: WithdrawAccounts = {
|
|
1284
1280
|
withdrawFromAvailable: {
|
|
1285
1281
|
user,
|
|
@@ -1293,8 +1289,6 @@ export class KaminoVaultClient {
|
|
|
1293
1289
|
tokenProgram: vaultState.tokenProgram,
|
|
1294
1290
|
sharesTokenProgram: TOKEN_PROGRAM_ID,
|
|
1295
1291
|
klendProgram: this._kaminoLendProgramId,
|
|
1296
|
-
eventAuthority: eventAuthority,
|
|
1297
|
-
program: this._kaminoVaultProgramId,
|
|
1298
1292
|
},
|
|
1299
1293
|
withdrawFromReserveAccounts: {
|
|
1300
1294
|
vaultState: vault.address,
|
|
@@ -1307,8 +1301,6 @@ export class KaminoVaultClient {
|
|
|
1307
1301
|
reserveCollateralTokenProgram: TOKEN_PROGRAM_ID,
|
|
1308
1302
|
instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
|
|
1309
1303
|
},
|
|
1310
|
-
eventAuthority: eventAuthority,
|
|
1311
|
-
program: this._kaminoVaultProgramId,
|
|
1312
1304
|
};
|
|
1313
1305
|
|
|
1314
1306
|
const withdrawArgs: WithdrawArgs = {
|
|
@@ -1349,7 +1341,6 @@ export class KaminoVaultClient {
|
|
|
1349
1341
|
userTokenAta: PublicKey,
|
|
1350
1342
|
shareAmountLamports: Decimal
|
|
1351
1343
|
): Promise<TransactionInstruction> {
|
|
1352
|
-
const eventAuthority = getEventAuthorityPda(this._kaminoVaultProgramId);
|
|
1353
1344
|
const withdrawFromAvailableAccounts: WithdrawFromAvailableAccounts = {
|
|
1354
1345
|
user,
|
|
1355
1346
|
vaultState: vault.address,
|
|
@@ -1362,8 +1353,6 @@ export class KaminoVaultClient {
|
|
|
1362
1353
|
tokenProgram: vaultState.tokenProgram,
|
|
1363
1354
|
sharesTokenProgram: TOKEN_PROGRAM_ID,
|
|
1364
1355
|
klendProgram: this._kaminoLendProgramId,
|
|
1365
|
-
eventAuthority: eventAuthority,
|
|
1366
|
-
program: this._kaminoVaultProgramId,
|
|
1367
1356
|
};
|
|
1368
1357
|
|
|
1369
1358
|
const withdrawFromAvailableArgs: WithdrawFromAvailableArgs = {
|
|
@@ -2699,10 +2688,6 @@ export function getCTokenVaultPda(vaultAddress: PublicKey, reserveAddress: Publi
|
|
|
2699
2688
|
)[0];
|
|
2700
2689
|
}
|
|
2701
2690
|
|
|
2702
|
-
export function getEventAuthorityPda(kaminoVaultProgramId: PublicKey) {
|
|
2703
|
-
return PublicKey.findProgramAddressSync([Buffer.from(EVENT_AUTHORITY_SEED)], kaminoVaultProgramId)[0];
|
|
2704
|
-
}
|
|
2705
|
-
|
|
2706
2691
|
export type VaultHolder = {
|
|
2707
2692
|
holderPubkey: PublicKey;
|
|
2708
2693
|
amount: Decimal;
|