@kamino-finance/klend-sdk 5.2.13 → 5.3.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/action.d.ts.map +1 -1
- package/dist/classes/action.js +1 -2
- package/dist/classes/action.js.map +1 -1
- package/dist/classes/manager.js +22 -5
- package/dist/classes/manager.js.map +1 -1
- package/dist/classes/obligation.d.ts +2 -0
- package/dist/classes/obligation.d.ts.map +1 -1
- package/dist/classes/obligation.js +12 -6
- package/dist/classes/obligation.js.map +1 -1
- package/dist/classes/reserve.js +14 -14
- package/dist/classes/reserve.js.map +1 -1
- package/dist/classes/shared.d.ts +2 -2
- package/dist/classes/shared.d.ts.map +1 -1
- package/dist/classes/types.d.ts +1 -1
- package/dist/classes/types.d.ts.map +1 -1
- package/dist/classes/vault.d.ts +1 -1
- package/dist/classes/vault.d.ts.map +1 -1
- package/dist/classes/vault.js +16 -3
- package/dist/classes/vault.js.map +1 -1
- package/dist/client_kamino_manager.d.ts.map +1 -1
- package/dist/client_kamino_manager.js +44 -6
- package/dist/client_kamino_manager.js.map +1 -1
- package/dist/idl.json +310 -48
- package/dist/idl_codegen/accounts/LendingMarket.d.ts +48 -3
- package/dist/idl_codegen/accounts/LendingMarket.d.ts.map +1 -1
- package/dist/idl_codegen/accounts/LendingMarket.js +35 -8
- package/dist/idl_codegen/accounts/LendingMarket.js.map +1 -1
- package/dist/idl_codegen/accounts/Obligation.d.ts +30 -0
- package/dist/idl_codegen/accounts/Obligation.d.ts.map +1 -1
- package/dist/idl_codegen/accounts/Obligation.js +23 -2
- package/dist/idl_codegen/accounts/Obligation.js.map +1 -1
- package/dist/idl_codegen/accounts/Reserve.js +1 -1
- package/dist/idl_codegen/errors/custom.d.ts +33 -1
- package/dist/idl_codegen/errors/custom.d.ts.map +1 -1
- package/dist/idl_codegen/errors/custom.js +57 -1
- package/dist/idl_codegen/errors/custom.js.map +1 -1
- package/dist/idl_codegen/instructions/index.d.ts +7 -3
- package/dist/idl_codegen/instructions/index.d.ts.map +1 -1
- package/dist/idl_codegen/instructions/index.js +7 -3
- package/dist/idl_codegen/instructions/index.js.map +1 -1
- package/dist/idl_codegen/instructions/initReferrerTokenState.d.ts +2 -5
- package/dist/idl_codegen/instructions/initReferrerTokenState.d.ts.map +1 -1
- package/dist/idl_codegen/instructions/initReferrerTokenState.js +3 -32
- package/dist/idl_codegen/instructions/initReferrerTokenState.js.map +1 -1
- package/dist/idl_codegen/instructions/markObligationForDeleveraging.d.ts +12 -0
- package/dist/idl_codegen/instructions/markObligationForDeleveraging.d.ts.map +1 -0
- package/dist/idl_codegen/instructions/markObligationForDeleveraging.js +47 -0
- package/dist/idl_codegen/instructions/markObligationForDeleveraging.js.map +1 -0
- package/dist/idl_codegen/instructions/repayAndWithdrawAndRedeem.d.ts +38 -0
- package/dist/idl_codegen/instructions/repayAndWithdrawAndRedeem.d.ts.map +1 -0
- package/dist/idl_codegen/instructions/repayAndWithdrawAndRedeem.js +159 -0
- package/dist/idl_codegen/instructions/repayAndWithdrawAndRedeem.js.map +1 -0
- package/dist/idl_codegen/instructions/withdrawObligationCollateralAndRedeemReserveCollateral.js +1 -1
- package/dist/idl_codegen/instructions/withdrawObligationCollateralAndRedeemReserveCollateral.js.map +1 -1
- package/dist/idl_codegen/types/ReserveConfig.d.ts +78 -20
- package/dist/idl_codegen/types/ReserveConfig.d.ts.map +1 -1
- package/dist/idl_codegen/types/ReserveConfig.js +45 -14
- package/dist/idl_codegen/types/ReserveConfig.js.map +1 -1
- package/dist/idl_codegen/types/ReserveLiquidity.d.ts +16 -16
- package/dist/idl_codegen/types/ReserveLiquidity.d.ts.map +1 -1
- package/dist/idl_codegen/types/ReserveLiquidity.js +16 -16
- package/dist/idl_codegen/types/ReserveLiquidity.js.map +1 -1
- package/dist/idl_codegen/types/UpdateConfigMode.d.ts +40 -14
- package/dist/idl_codegen/types/UpdateConfigMode.d.ts.map +1 -1
- package/dist/idl_codegen/types/UpdateConfigMode.js +71 -23
- package/dist/idl_codegen/types/UpdateConfigMode.js.map +1 -1
- package/dist/idl_codegen/types/UpdateLendingMarketMode.d.ts +37 -11
- package/dist/idl_codegen/types/UpdateLendingMarketMode.d.ts.map +1 -1
- package/dist/idl_codegen/types/UpdateLendingMarketMode.js +64 -16
- package/dist/idl_codegen/types/UpdateLendingMarketMode.js.map +1 -1
- package/dist/idl_codegen/types/index.d.ts +4 -4
- package/dist/idl_codegen/types/index.d.ts.map +1 -1
- package/dist/idl_codegen/types/index.js.map +1 -1
- package/dist/idl_codegen/zero_padding/ObligationZP.d.ts +4 -0
- package/dist/idl_codegen/zero_padding/ObligationZP.d.ts.map +1 -1
- package/dist/idl_codegen/zero_padding/ObligationZP.js +10 -0
- package/dist/idl_codegen/zero_padding/ObligationZP.js.map +1 -1
- package/dist/lending_operations/repay_with_collateral_calcs.d.ts +4 -2
- package/dist/lending_operations/repay_with_collateral_calcs.d.ts.map +1 -1
- package/dist/lending_operations/repay_with_collateral_calcs.js +45 -52
- package/dist/lending_operations/repay_with_collateral_calcs.js.map +1 -1
- package/dist/lending_operations/repay_with_collateral_operations.d.ts +7 -0
- package/dist/lending_operations/repay_with_collateral_operations.d.ts.map +1 -1
- package/dist/lending_operations/repay_with_collateral_operations.js +13 -3
- package/dist/lending_operations/repay_with_collateral_operations.js.map +1 -1
- package/dist/pyth/accounts/PriceUpdateV2.d.ts +30 -0
- package/dist/pyth/accounts/PriceUpdateV2.d.ts.map +1 -0
- package/dist/pyth/accounts/PriceUpdateV2.js +104 -0
- package/dist/pyth/accounts/PriceUpdateV2.js.map +1 -0
- package/dist/pyth/accounts/index.d.ts +3 -0
- package/dist/pyth/accounts/index.d.ts.map +1 -0
- package/dist/pyth/accounts/index.js +6 -0
- package/dist/pyth/accounts/index.js.map +1 -0
- package/dist/pyth/types/PriceFeedMessage.d.ts +58 -0
- package/dist/pyth/types/PriceFeedMessage.d.ts.map +1 -0
- package/dist/pyth/types/PriceFeedMessage.js +118 -0
- package/dist/pyth/types/PriceFeedMessage.js.map +1 -0
- package/dist/pyth/types/VerificationLevel.d.ts +45 -0
- package/dist/pyth/types/VerificationLevel.d.ts.map +1 -0
- package/dist/pyth/types/VerificationLevel.js +105 -0
- package/dist/pyth/types/VerificationLevel.js.map +1 -0
- package/dist/pyth/types/index.d.ts +7 -0
- package/dist/pyth/types/index.d.ts.map +1 -0
- package/dist/pyth/types/index.js +31 -0
- package/dist/pyth/types/index.js.map +1 -0
- package/dist/referrals/instructions.d.ts.map +1 -1
- package/dist/referrals/instructions.js +1 -2
- package/dist/referrals/instructions.js.map +1 -1
- package/dist/utils/managerTypes.d.ts.map +1 -1
- package/dist/utils/managerTypes.js +5 -4
- package/dist/utils/managerTypes.js.map +1 -1
- package/dist/utils/oracle.d.ts.map +1 -1
- package/dist/utils/oracle.js +9 -14
- package/dist/utils/oracle.js.map +1 -1
- package/package.json +3 -4
- package/src/classes/action.ts +1 -3
- package/src/classes/manager.ts +29 -6
- package/src/classes/obligation.ts +15 -6
- package/src/classes/reserve.ts +16 -16
- package/src/classes/shared.ts +2 -2
- package/src/classes/types.ts +16 -17
- package/src/classes/vault.ts +18 -4
- package/src/client_kamino_manager.ts +61 -6
- package/src/idl_codegen/accounts/LendingMarket.ts +76 -13
- package/src/idl_codegen/accounts/Obligation.ts +47 -2
- package/src/idl_codegen/accounts/Reserve.ts +1 -1
- package/src/idl_codegen/errors/custom.ts +56 -0
- package/src/idl_codegen/instructions/index.ts +13 -6
- package/src/idl_codegen/instructions/initReferrerTokenState.ts +3 -15
- package/src/idl_codegen/instructions/markObligationForDeleveraging.ts +40 -0
- package/src/idl_codegen/instructions/repayAndWithdrawAndRedeem.ts +177 -0
- package/src/idl_codegen/instructions/withdrawObligationCollateralAndRedeemReserveCollateral.ts +1 -1
- package/src/idl_codegen/programId.ts +1 -1
- package/src/idl_codegen/types/ReserveConfig.ts +100 -28
- package/src/idl_codegen/types/ReserveLiquidity.ts +25 -24
- package/src/idl_codegen/types/UpdateConfigMode.ts +86 -26
- package/src/idl_codegen/types/UpdateLendingMarketMode.ts +77 -17
- package/src/idl_codegen/types/index.ts +14 -6
- package/src/idl_codegen/zero_padding/ObligationZP.ts +10 -0
- package/src/lending_operations/repay_with_collateral_calcs.ts +55 -61
- package/src/lending_operations/repay_with_collateral_operations.ts +24 -4
- package/src/leverage/operations.ts +1 -1
- package/src/pyth/accounts/PriceUpdateV2.ts +110 -0
- package/src/pyth/accounts/index.ts +2 -0
- package/src/pyth/types/PriceFeedMessage.ts +120 -0
- package/src/pyth/types/VerificationLevel.ts +98 -0
- package/src/pyth/types/index.ts +9 -0
- package/src/referrals/instructions.ts +1 -3
- package/src/utils/managerTypes.ts +5 -5
- package/src/utils/oracle.ts +9 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managerTypes.js","sourceRoot":"","sources":["../../src/utils/managerTypes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"managerTypes.js","sourceRoot":"","sources":["../../src/utils/managerTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../src/utils/oracle.ts"],"names":[],"mappings":"
|
|
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,EAAS,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,YAAY,GAAG;IACzB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,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,CA+DxD;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,CAuCnB;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
|
@@ -9,7 +9,6 @@ exports.getAllOracleAccounts = getAllOracleAccounts;
|
|
|
9
9
|
exports.cacheOrGetPythPrices = cacheOrGetPythPrices;
|
|
10
10
|
exports.cacheOrGetSwitchboardPrice = cacheOrGetSwitchboardPrice;
|
|
11
11
|
exports.cacheOrGetScopePrice = cacheOrGetScopePrice;
|
|
12
|
-
const client_1 = require("@pythnetwork/client");
|
|
13
12
|
const web3_js_1 = require("@solana/web3.js");
|
|
14
13
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
15
14
|
const scope_sdk_1 = require("@kamino-finance/scope-sdk");
|
|
@@ -17,6 +16,7 @@ const pubkey_1 = require("./pubkey");
|
|
|
17
16
|
const classes_1 = require("../classes");
|
|
18
17
|
const sbv2_lite_1 = __importDefault(require("@switchboard-xyz/sbv2-lite"));
|
|
19
18
|
const kliquidity_sdk_1 = require("@kamino-finance/kliquidity-sdk");
|
|
19
|
+
const accounts_1 = require("../pyth/accounts");
|
|
20
20
|
const SWITCHBOARD_V2_PROGRAM_ID = new web3_js_1.PublicKey('SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f');
|
|
21
21
|
// validate price confidence - confidence/price ratio should be less than 2%
|
|
22
22
|
exports.MAX_CONFIDENCE_PERCENTAGE = new decimal_js_1.default('2');
|
|
@@ -123,26 +123,21 @@ function cacheOrGetPythPrices(oracle, cache, oracleAccounts) {
|
|
|
123
123
|
const result = oracleAccounts.get(oracle);
|
|
124
124
|
if (result) {
|
|
125
125
|
try {
|
|
126
|
-
const {
|
|
126
|
+
const { priceMessage } = accounts_1.PriceUpdateV2.decode(result.data);
|
|
127
|
+
const { price, exponent, conf: confidence, publishTime: timestamp, emaPrice } = priceMessage;
|
|
127
128
|
if (price) {
|
|
128
|
-
const px = new decimal_js_1.default(price);
|
|
129
|
+
const px = new decimal_js_1.default(price.toString()).div(10 ** Math.abs(exponent));
|
|
129
130
|
prices.spot = {
|
|
130
131
|
price: px,
|
|
131
|
-
timestamp,
|
|
132
|
-
valid: validatePythPx(px, confidence),
|
|
133
|
-
};
|
|
134
|
-
}
|
|
135
|
-
else {
|
|
136
|
-
prices.spot = {
|
|
137
|
-
price: new decimal_js_1.default(previousPrice),
|
|
138
|
-
timestamp: previousTimestamp,
|
|
139
|
-
valid: false,
|
|
132
|
+
timestamp: BigInt(timestamp.toString()),
|
|
133
|
+
valid: validatePythPx(px, confidence.toNumber()),
|
|
140
134
|
};
|
|
141
135
|
}
|
|
142
136
|
if (emaPrice !== undefined && emaPrice !== null) {
|
|
137
|
+
const emaPx = new decimal_js_1.default(emaPrice.toString()).div(10 ** Math.abs(exponent));
|
|
143
138
|
prices.twap = {
|
|
144
|
-
price:
|
|
145
|
-
timestamp,
|
|
139
|
+
price: emaPx,
|
|
140
|
+
timestamp: BigInt(timestamp.toString()),
|
|
146
141
|
valid: true,
|
|
147
142
|
};
|
|
148
143
|
}
|
package/dist/utils/oracle.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../src/utils/oracle.ts"],"names":[],"mappings":";;;;;;AA2CA,gDAkEC;AAID,oDAyBC;AAiBD,
|
|
1
|
+
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../src/utils/oracle.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kamino-finance/klend-sdk",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.3.0",
|
|
4
4
|
"description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"lint": "yarn prettier --check .; yarn eslint .",
|
|
39
39
|
"lint:fix": "yarn prettier --write .; yarn eslint . --fix",
|
|
40
40
|
"codegen": "yarn anchor-client-gen src/idl.json ./src/idl_codegen/ --program-id KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD",
|
|
41
|
-
"codegen-kvault": "yarn anchor-client-gen src/idl_kamino_vault.json ./src/idl_codegen_kamino_vault/ --program-id kvauTFR8qm1dhniz6pYuBZkuene3Hfrs1VQhVRgCNrr",
|
|
42
41
|
"codegen-jupiter-perps": "yarn anchor-client-gen src/jupiter_perps_idl.json ./src/idl_codegen_jupiter_perps/ --program-id PERPHjGBqRHArX4DySjwM6UJHiR3sWAatqfdBS2qQJu",
|
|
42
|
+
"codegen-kvault": "yarn anchor-client-gen src/idl_kamino_vault.json ./src/idl_codegen_kamino_vault/ --program-id kvauTFR8qm1dhniz6pYuBZkuene3Hfrs1VQhVRgCNrr",
|
|
43
43
|
"start-validator": "solana-test-validator $(./deps/test-validator-params.sh)",
|
|
44
44
|
"start-validator-and-test": "yarn start-server-and-test 'yarn start-validator' http://127.0.0.1:8899/health test",
|
|
45
45
|
"dump-programs": "./deps/dump-from-mainnet.sh",
|
|
@@ -50,9 +50,8 @@
|
|
|
50
50
|
"@coral-xyz/anchor": "^0.28.0",
|
|
51
51
|
"@coral-xyz/borsh": "^0.28.0",
|
|
52
52
|
"@kamino-finance/farms-sdk": "^2.0.3",
|
|
53
|
-
"@kamino-finance/kliquidity-sdk": "^6.
|
|
53
|
+
"@kamino-finance/kliquidity-sdk": "^6.3.1",
|
|
54
54
|
"@kamino-finance/scope-sdk": "^8.0.2",
|
|
55
|
-
"@pythnetwork/client": "^2.5.1",
|
|
56
55
|
"@solana/buffer-layout": "^4.0.0",
|
|
57
56
|
"@solana/spl-token": "^0.4.8",
|
|
58
57
|
"@solana/web3.js": "^1.87.6",
|
package/src/classes/action.ts
CHANGED
|
@@ -2346,13 +2346,11 @@ export class KaminoAction {
|
|
|
2346
2346
|
const account = await this.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
|
|
2347
2347
|
if (!account) {
|
|
2348
2348
|
const initReferrerTokenStateIx = initReferrerTokenState(
|
|
2349
|
-
{
|
|
2350
|
-
referrer: this.referrer,
|
|
2351
|
-
},
|
|
2352
2349
|
{
|
|
2353
2350
|
lendingMarket: this.kaminoMarket.getAddress(),
|
|
2354
2351
|
payer: this.owner,
|
|
2355
2352
|
reserve: reserve.address,
|
|
2353
|
+
referrer: this.referrer,
|
|
2356
2354
|
referrerTokenState,
|
|
2357
2355
|
rent: SYSVAR_RENT_PUBKEY,
|
|
2358
2356
|
systemProgram: SystemProgram.programId,
|
package/src/classes/manager.ts
CHANGED
|
@@ -1013,13 +1013,35 @@ function parseForChangesMarketConfigAndGetIxs(
|
|
|
1013
1013
|
),
|
|
1014
1014
|
});
|
|
1015
1015
|
}
|
|
1016
|
-
} else if (key === '
|
|
1017
|
-
if (!market.
|
|
1016
|
+
} else if (key === 'minValueSkipLiquidationBfChecks') {
|
|
1017
|
+
if (!market.minValueSkipLiquidationBfChecks.eq(newMarket.minValueSkipLiquidationBfChecks)) {
|
|
1018
1018
|
updateLendingMarketIxnsArgs.push({
|
|
1019
|
-
mode: UpdateLendingMarketMode.
|
|
1019
|
+
mode: UpdateLendingMarketMode.UpdateMinValueBfSkipPriorityLiqCheck.discriminator,
|
|
1020
1020
|
value: updateMarketConfigEncodedValue(
|
|
1021
|
-
UpdateLendingMarketMode.
|
|
1022
|
-
newMarket.
|
|
1021
|
+
UpdateLendingMarketMode.UpdateMinValueBfSkipPriorityLiqCheck.discriminator,
|
|
1022
|
+
newMarket.minValueSkipLiquidationBfChecks.toNumber()
|
|
1023
|
+
),
|
|
1024
|
+
});
|
|
1025
|
+
}
|
|
1026
|
+
} else if (key === 'minValueSkipLiquidationLtvChecks') {
|
|
1027
|
+
if (!market.minValueSkipLiquidationLtvChecks.eq(newMarket.minValueSkipLiquidationLtvChecks)) {
|
|
1028
|
+
updateLendingMarketIxnsArgs.push({
|
|
1029
|
+
mode: UpdateLendingMarketMode.UpdateMinValueLtvSkipPriorityLiqCheck.discriminator,
|
|
1030
|
+
value: updateMarketConfigEncodedValue(
|
|
1031
|
+
UpdateLendingMarketMode.UpdateMinValueLtvSkipPriorityLiqCheck.discriminator,
|
|
1032
|
+
newMarket.minValueSkipLiquidationLtvChecks.toNumber()
|
|
1033
|
+
),
|
|
1034
|
+
});
|
|
1035
|
+
}
|
|
1036
|
+
} else if (key === 'individualAutodeleverageMarginCallPeriodSecs') {
|
|
1037
|
+
if (
|
|
1038
|
+
!market.individualAutodeleverageMarginCallPeriodSecs.eq(newMarket.individualAutodeleverageMarginCallPeriodSecs)
|
|
1039
|
+
) {
|
|
1040
|
+
updateLendingMarketIxnsArgs.push({
|
|
1041
|
+
mode: UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecs.discriminator,
|
|
1042
|
+
value: updateMarketConfigEncodedValue(
|
|
1043
|
+
UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecs.discriminator,
|
|
1044
|
+
newMarket.individualAutodeleverageMarginCallPeriodSecs.toNumber()
|
|
1023
1045
|
),
|
|
1024
1046
|
});
|
|
1025
1047
|
}
|
|
@@ -1099,7 +1121,8 @@ function updateMarketConfigEncodedValue(
|
|
|
1099
1121
|
case UpdateLendingMarketMode.UpdateGlobalAllowedBorrow.discriminator:
|
|
1100
1122
|
case UpdateLendingMarketMode.UpdateGlobalUnhealthyBorrow.discriminator:
|
|
1101
1123
|
case UpdateLendingMarketMode.UpdateMinFullLiquidationThreshold.discriminator:
|
|
1102
|
-
case UpdateLendingMarketMode.
|
|
1124
|
+
case UpdateLendingMarketMode.UpdateMinValueBfSkipPriorityLiqCheck.discriminator:
|
|
1125
|
+
case UpdateLendingMarketMode.UpdateMinValueLtvSkipPriorityLiqCheck.discriminator:
|
|
1103
1126
|
value = value as number;
|
|
1104
1127
|
buffer.writeBigUint64LE(BigInt(value), 0);
|
|
1105
1128
|
break;
|
|
@@ -32,6 +32,7 @@ export type Position = {
|
|
|
32
32
|
export type ObligationStats = {
|
|
33
33
|
userTotalDeposit: Decimal;
|
|
34
34
|
userTotalCollateralDeposit: Decimal;
|
|
35
|
+
userTotalLiquidatableDeposit: Decimal;
|
|
35
36
|
userTotalBorrow: Decimal;
|
|
36
37
|
userTotalBorrowBorrowFactorAdjusted: Decimal;
|
|
37
38
|
borrowLimit: Decimal;
|
|
@@ -55,6 +56,7 @@ interface DepositStats {
|
|
|
55
56
|
deposits: Map<PublicKey, Position>;
|
|
56
57
|
userTotalDeposit: Decimal;
|
|
57
58
|
userTotalCollateralDeposit: Decimal;
|
|
59
|
+
userTotalLiquidatableDeposit: Decimal;
|
|
58
60
|
borrowLimit: Decimal;
|
|
59
61
|
liquidationLtv: Decimal;
|
|
60
62
|
borrowLiquidationLimit: Decimal;
|
|
@@ -639,7 +641,7 @@ export class KaminoObligation {
|
|
|
639
641
|
|
|
640
642
|
newStats.netAccountValue = newStats.userTotalDeposit.minus(newStats.userTotalBorrow);
|
|
641
643
|
newStats.loanToValue = valueOrZero(
|
|
642
|
-
newStats.userTotalBorrowBorrowFactorAdjusted.dividedBy(newStats.
|
|
644
|
+
newStats.userTotalBorrowBorrowFactorAdjusted.dividedBy(newStats.userTotalCollateralDeposit)
|
|
643
645
|
);
|
|
644
646
|
newStats.leverage = valueOrZero(newStats.userTotalDeposit.dividedBy(newStats.netAccountValue));
|
|
645
647
|
|
|
@@ -714,6 +716,7 @@ export class KaminoObligation {
|
|
|
714
716
|
userTotalBorrowBorrowFactorAdjusted: borrowStatsOraclePrice.userTotalBorrowBorrowFactorAdjusted,
|
|
715
717
|
userTotalDeposit: depositStatsOraclePrice.userTotalDeposit,
|
|
716
718
|
userTotalCollateralDeposit: depositStatsOraclePrice.userTotalCollateralDeposit,
|
|
719
|
+
userTotalLiquidatableDeposit: depositStatsOraclePrice.userTotalLiquidatableDeposit,
|
|
717
720
|
liquidationLtv: depositStatsOraclePrice.liquidationLtv,
|
|
718
721
|
borrowUtilization: borrowStatsOraclePrice.userTotalBorrowBorrowFactorAdjusted.dividedBy(
|
|
719
722
|
depositStatsOraclePrice.borrowLimit
|
|
@@ -721,7 +724,7 @@ export class KaminoObligation {
|
|
|
721
724
|
netAccountValue: netAccountValueScopeRefreshed,
|
|
722
725
|
leverage: depositStatsOraclePrice.userTotalDeposit.dividedBy(netAccountValueScopeRefreshed),
|
|
723
726
|
loanToValue: borrowStatsOraclePrice.userTotalBorrowBorrowFactorAdjusted.dividedBy(
|
|
724
|
-
depositStatsOraclePrice.
|
|
727
|
+
depositStatsOraclePrice.userTotalCollateralDeposit
|
|
725
728
|
),
|
|
726
729
|
potentialElevationGroupUpdate,
|
|
727
730
|
},
|
|
@@ -737,6 +740,7 @@ export class KaminoObligation {
|
|
|
737
740
|
): DepositStats {
|
|
738
741
|
let userTotalDeposit = new Decimal(0);
|
|
739
742
|
let userTotalCollateralDeposit = new Decimal(0);
|
|
743
|
+
let userTotalLiquidatableDeposit = new Decimal(0);
|
|
740
744
|
let borrowLimit = new Decimal(0);
|
|
741
745
|
let borrowLiquidationLimit = new Decimal(0);
|
|
742
746
|
|
|
@@ -770,6 +774,10 @@ export class KaminoObligation {
|
|
|
770
774
|
userTotalCollateralDeposit = userTotalCollateralDeposit.add(depositValueUsd);
|
|
771
775
|
}
|
|
772
776
|
|
|
777
|
+
if (!liquidationLtv.eq('0')) {
|
|
778
|
+
userTotalLiquidatableDeposit = userTotalLiquidatableDeposit.add(depositValueUsd);
|
|
779
|
+
}
|
|
780
|
+
|
|
773
781
|
borrowLimit = borrowLimit.add(depositValueUsd.mul(maxLtv));
|
|
774
782
|
borrowLiquidationLimit = borrowLiquidationLimit.add(depositValueUsd.mul(liquidationLtv));
|
|
775
783
|
|
|
@@ -786,8 +794,9 @@ export class KaminoObligation {
|
|
|
786
794
|
deposits,
|
|
787
795
|
userTotalDeposit,
|
|
788
796
|
userTotalCollateralDeposit,
|
|
797
|
+
userTotalLiquidatableDeposit,
|
|
789
798
|
borrowLimit,
|
|
790
|
-
liquidationLtv: valueOrZero(borrowLiquidationLimit.div(
|
|
799
|
+
liquidationLtv: valueOrZero(borrowLiquidationLimit.div(userTotalLiquidatableDeposit)),
|
|
791
800
|
borrowLiquidationLimit,
|
|
792
801
|
};
|
|
793
802
|
}
|
|
@@ -865,7 +874,7 @@ export class KaminoObligation {
|
|
|
865
874
|
const getOraclePx = (reserve: KaminoReserve) => reserve.getOracleMarketPrice();
|
|
866
875
|
const { collateralExchangeRates } = KaminoObligation.getRatesForObligation(market, this.state, slot);
|
|
867
876
|
|
|
868
|
-
const { borrowLimit,
|
|
877
|
+
const { borrowLimit, userTotalCollateralDeposit } = KaminoObligation.calculateObligationDeposits(
|
|
869
878
|
market,
|
|
870
879
|
this.state.deposits,
|
|
871
880
|
collateralExchangeRates,
|
|
@@ -873,11 +882,11 @@ export class KaminoObligation {
|
|
|
873
882
|
getOraclePx
|
|
874
883
|
);
|
|
875
884
|
|
|
876
|
-
if (borrowLimit.eq(0) ||
|
|
885
|
+
if (borrowLimit.eq(0) || userTotalCollateralDeposit.eq(0)) {
|
|
877
886
|
return new Decimal(0);
|
|
878
887
|
}
|
|
879
888
|
|
|
880
|
-
return borrowLimit.div(
|
|
889
|
+
return borrowLimit.div(userTotalCollateralDeposit);
|
|
881
890
|
}
|
|
882
891
|
|
|
883
892
|
/*
|
package/src/classes/reserve.ts
CHANGED
|
@@ -878,8 +878,8 @@ export class KaminoReserve {
|
|
|
878
878
|
decimals: this.state.liquidity.mintDecimals.toNumber(),
|
|
879
879
|
accumulatedProtocolFees: this.getAccumulatedProtocolFees().div(this.getMintFactor()),
|
|
880
880
|
mintTotalSupply,
|
|
881
|
-
|
|
882
|
-
|
|
881
|
+
depositLimitCrossedTimestamp: parsedData.liquidity.depositLimitCrossedTimestamp.toNumber(),
|
|
882
|
+
borrowLimitCrossedTimestamp: parsedData.liquidity.borrowLimitCrossedTimestamp.toNumber(),
|
|
883
883
|
borrowFactor: parsedData.config.borrowFactorPct.toNumber(),
|
|
884
884
|
};
|
|
885
885
|
}
|
|
@@ -1478,21 +1478,21 @@ export function parseForChangesReserveConfigAndGetIxs(
|
|
|
1478
1478
|
),
|
|
1479
1479
|
});
|
|
1480
1480
|
}
|
|
1481
|
-
} else if (key === '
|
|
1481
|
+
} else if (key === 'deleveragingThresholdSecsPerBps') {
|
|
1482
1482
|
if (reserve === undefined) {
|
|
1483
1483
|
updateReserveIxnsArgs.push({
|
|
1484
|
-
mode: UpdateConfigMode.
|
|
1484
|
+
mode: UpdateConfigMode.UpdateDeleveragingThresholdSecsPerBps.discriminator,
|
|
1485
1485
|
value: updateReserveConfigEncodedValue(
|
|
1486
|
-
UpdateConfigMode.
|
|
1487
|
-
reserveConfig.
|
|
1486
|
+
UpdateConfigMode.UpdateDeleveragingThresholdSecsPerBps.discriminator,
|
|
1487
|
+
reserveConfig.deleveragingThresholdSecsPerBps.toNumber()
|
|
1488
1488
|
),
|
|
1489
1489
|
});
|
|
1490
|
-
} else if (!reserve.config.
|
|
1490
|
+
} else if (!reserve.config.deleveragingThresholdSecsPerBps.eq(reserveConfig.deleveragingThresholdSecsPerBps)) {
|
|
1491
1491
|
updateReserveIxnsArgs.push({
|
|
1492
|
-
mode: UpdateConfigMode.
|
|
1492
|
+
mode: UpdateConfigMode.UpdateDeleveragingThresholdSecsPerBps.discriminator,
|
|
1493
1493
|
value: updateReserveConfigEncodedValue(
|
|
1494
|
-
UpdateConfigMode.
|
|
1495
|
-
reserveConfig.
|
|
1494
|
+
UpdateConfigMode.UpdateDeleveragingThresholdSecsPerBps.discriminator,
|
|
1495
|
+
reserveConfig.deleveragingThresholdSecsPerBps.toNumber()
|
|
1496
1496
|
),
|
|
1497
1497
|
});
|
|
1498
1498
|
}
|
|
@@ -1654,17 +1654,17 @@ export function parseForChangesReserveConfigAndGetIxs(
|
|
|
1654
1654
|
} else if (key === 'deleveragingMarginCallPeriodSecs') {
|
|
1655
1655
|
if (reserve === undefined) {
|
|
1656
1656
|
updateReserveIxnsArgs.push({
|
|
1657
|
-
mode: UpdateConfigMode.
|
|
1657
|
+
mode: UpdateConfigMode.UpdateDeleveragingMarginCallPeriod.discriminator,
|
|
1658
1658
|
value: updateReserveConfigEncodedValue(
|
|
1659
|
-
UpdateConfigMode.
|
|
1659
|
+
UpdateConfigMode.UpdateDeleveragingMarginCallPeriod.discriminator,
|
|
1660
1660
|
reserveConfig.deleveragingMarginCallPeriodSecs.toNumber()
|
|
1661
1661
|
),
|
|
1662
1662
|
});
|
|
1663
1663
|
} else if (!reserve.config.deleveragingMarginCallPeriodSecs.eq(reserveConfig.deleveragingMarginCallPeriodSecs)) {
|
|
1664
1664
|
updateReserveIxnsArgs.push({
|
|
1665
|
-
mode: UpdateConfigMode.
|
|
1665
|
+
mode: UpdateConfigMode.UpdateDeleveragingMarginCallPeriod.discriminator,
|
|
1666
1666
|
value: updateReserveConfigEncodedValue(
|
|
1667
|
-
UpdateConfigMode.
|
|
1667
|
+
UpdateConfigMode.UpdateDeleveragingMarginCallPeriod.discriminator,
|
|
1668
1668
|
reserveConfig.deleveragingMarginCallPeriodSecs.toNumber()
|
|
1669
1669
|
),
|
|
1670
1670
|
});
|
|
@@ -1979,9 +1979,9 @@ export function updateReserveConfigEncodedValue(
|
|
|
1979
1979
|
case UpdateConfigMode.UpdateTokenInfoTwapMaxAge.discriminator:
|
|
1980
1980
|
case UpdateConfigMode.UpdateDebtWithdrawalCapCurrentTotal.discriminator:
|
|
1981
1981
|
case UpdateConfigMode.UpdateDepositWithdrawalCapCurrentTotal.discriminator:
|
|
1982
|
-
case UpdateConfigMode.
|
|
1982
|
+
case UpdateConfigMode.UpdateDeleveragingMarginCallPeriod.discriminator:
|
|
1983
1983
|
case UpdateConfigMode.UpdateBorrowFactor.discriminator:
|
|
1984
|
-
case UpdateConfigMode.
|
|
1984
|
+
case UpdateConfigMode.UpdateDeleveragingThresholdSecsPerBps.discriminator:
|
|
1985
1985
|
case UpdateConfigMode.UpdateBorrowLimitOutsideElevationGroup.discriminator:
|
|
1986
1986
|
value = value as number;
|
|
1987
1987
|
buffer = Buffer.alloc(8);
|
package/src/classes/shared.ts
CHANGED
|
@@ -35,8 +35,8 @@ export type ReserveDataType = {
|
|
|
35
35
|
liquidationThreshold: number;
|
|
36
36
|
reserveDepositLimit: Decimal;
|
|
37
37
|
reserveBorrowLimit: Decimal;
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
depositLimitCrossedTimestamp: number;
|
|
39
|
+
borrowLimitCrossedTimestamp: number;
|
|
40
40
|
symbol: string;
|
|
41
41
|
decimals: number;
|
|
42
42
|
protocolTakeRate: number;
|
package/src/classes/types.ts
CHANGED
|
@@ -1,28 +1,27 @@
|
|
|
1
|
-
import { TransactionInstruction } from
|
|
2
|
-
|
|
1
|
+
import { TransactionInstruction } from '@solana/web3.js';
|
|
3
2
|
|
|
4
3
|
/** the populateLUTIxs should be executed in a separate transaction as we cannot create and populate a lookup table in the same tx */
|
|
5
4
|
export type InitVaultIxs = {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
}
|
|
5
|
+
initVaultIxs: TransactionInstruction[];
|
|
6
|
+
populateLUTIxs: TransactionInstruction[];
|
|
7
|
+
};
|
|
9
8
|
|
|
10
9
|
export type AcceptVaultOwnershipIxs = {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}
|
|
10
|
+
acceptVaultOwnershipIx: TransactionInstruction;
|
|
11
|
+
updateLUTIxs: TransactionInstruction[];
|
|
12
|
+
};
|
|
14
13
|
|
|
15
14
|
export type UpdateReserveAllocationIxs = {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
15
|
+
updateReserveAllocationIx: TransactionInstruction;
|
|
16
|
+
updateLUTIxs: TransactionInstruction[];
|
|
17
|
+
};
|
|
19
18
|
|
|
20
19
|
export type UpdateVaultConfigIxs = {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
20
|
+
updateVaultConfigIx: TransactionInstruction;
|
|
21
|
+
updateLUTIxs: TransactionInstruction[];
|
|
22
|
+
};
|
|
24
23
|
|
|
25
24
|
export type SyncVaultLUTIxs = {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
25
|
+
setupLUTIfNeededIxs: TransactionInstruction[];
|
|
26
|
+
syncLUTIxs: TransactionInstruction[];
|
|
27
|
+
};
|
package/src/classes/vault.ts
CHANGED
|
@@ -829,10 +829,10 @@ export class KaminoVaultClient {
|
|
|
829
829
|
async investSingleReserveIxs(
|
|
830
830
|
payer: PublicKey,
|
|
831
831
|
vault: KaminoVault,
|
|
832
|
-
reserve: ReserveWithAddress
|
|
832
|
+
reserve: ReserveWithAddress,
|
|
833
|
+
vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>
|
|
833
834
|
): Promise<TransactionInstruction[]> {
|
|
834
835
|
const vaultState = await vault.getState(this._connection);
|
|
835
|
-
|
|
836
836
|
const cTokenVault = getCTokenVaultPda(vault.address, reserve.address, this._kaminoVaultProgramId);
|
|
837
837
|
const lendingMarketAuth = lendingMarketAuthPda(reserve.state.lendingMarket, this._kaminoLendProgramId)[0];
|
|
838
838
|
|
|
@@ -864,10 +864,24 @@ export class KaminoVaultClient {
|
|
|
864
864
|
const investIx = invest(investAccounts, this._kaminoVaultProgramId);
|
|
865
865
|
|
|
866
866
|
const vaultReserves = this.getVaultReserves(vaultState);
|
|
867
|
-
const
|
|
868
|
-
|
|
867
|
+
const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
|
|
868
|
+
|
|
869
|
+
let vaultReservesAccountMetas: AccountMeta[] = [];
|
|
870
|
+
let vaultReservesLendingMarkets: AccountMeta[] = [];
|
|
871
|
+
vaultReserves.forEach((reserve) => {
|
|
872
|
+
const reserveState = vaultReservesState.get(reserve);
|
|
873
|
+
if (reserveState === undefined) {
|
|
874
|
+
throw new Error(`Reserve ${reserve.toBase58()} not found`);
|
|
875
|
+
}
|
|
876
|
+
vaultReservesAccountMetas = vaultReservesAccountMetas.concat([
|
|
877
|
+
{ pubkey: reserve, isSigner: false, isWritable: true },
|
|
878
|
+
]);
|
|
879
|
+
vaultReservesLendingMarkets = vaultReservesLendingMarkets.concat([
|
|
880
|
+
{ pubkey: reserveState.state.lendingMarket, isSigner: false, isWritable: false },
|
|
881
|
+
]);
|
|
869
882
|
});
|
|
870
883
|
investIx.keys = investIx.keys.concat(vaultReservesAccountMetas);
|
|
884
|
+
investIx.keys = investIx.keys.concat(vaultReservesLendingMarkets);
|
|
871
885
|
|
|
872
886
|
return [createAtaIx, investIx];
|
|
873
887
|
}
|