@kamino-finance/klend-sdk 6.0.5 → 7.0.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/@codegen/kvault/accounts/Reserve.js +1 -1
- package/dist/@codegen/kvault/accounts/VaultState.d.ts +6 -6
- package/dist/@codegen/kvault/accounts/VaultState.d.ts.map +1 -1
- package/dist/@codegen/kvault/accounts/VaultState.js +12 -12
- package/dist/@codegen/kvault/accounts/VaultState.js.map +1 -1
- package/dist/@codegen/kvault/errors/custom.d.ts +9 -1
- package/dist/@codegen/kvault/errors/custom.d.ts.map +1 -1
- package/dist/@codegen/kvault/errors/custom.js +15 -1
- package/dist/@codegen/kvault/errors/custom.js.map +1 -1
- package/dist/@codegen/kvault/types/VaultConfigField.d.ts +26 -0
- package/dist/@codegen/kvault/types/VaultConfigField.d.ts.map +1 -1
- package/dist/@codegen/kvault/types/VaultConfigField.js +49 -1
- package/dist/@codegen/kvault/types/VaultConfigField.js.map +1 -1
- package/dist/@codegen/kvault/types/index.d.ts +2 -2
- package/dist/@codegen/kvault/types/index.d.ts.map +1 -1
- package/dist/@codegen/kvault/types/index.js.map +1 -1
- package/dist/classes/action.d.ts +1 -1
- package/dist/classes/action.d.ts.map +1 -1
- package/dist/classes/action.js +26 -11
- package/dist/classes/action.js.map +1 -1
- package/dist/classes/manager.d.ts +25 -6
- package/dist/classes/manager.d.ts.map +1 -1
- package/dist/classes/manager.js +59 -27
- package/dist/classes/manager.js.map +1 -1
- package/dist/classes/market.d.ts +7 -2
- package/dist/classes/market.d.ts.map +1 -1
- package/dist/classes/market.js +12 -6
- package/dist/classes/market.js.map +1 -1
- package/dist/classes/vault.d.ts +22 -3
- package/dist/classes/vault.d.ts.map +1 -1
- package/dist/classes/vault.js +73 -40
- package/dist/classes/vault.js.map +1 -1
- package/dist/classes/vault_types.d.ts +9 -1
- package/dist/classes/vault_types.d.ts.map +1 -1
- package/dist/client/commands/borrow.d.ts.map +1 -1
- package/dist/client/commands/borrow.js +2 -1
- package/dist/client/commands/borrow.js.map +1 -1
- package/dist/client/commands/deposit.d.ts.map +1 -1
- package/dist/client/commands/deposit.js +2 -1
- package/dist/client/commands/deposit.js.map +1 -1
- package/dist/client/commands/repay.d.ts.map +1 -1
- package/dist/client/commands/repay.js +2 -1
- package/dist/client/commands/repay.js.map +1 -1
- package/dist/client/commands/withdraw.d.ts.map +1 -1
- package/dist/client/commands/withdraw.js +2 -1
- package/dist/client/commands/withdraw.js.map +1 -1
- package/dist/leverage/operations.d.ts.map +1 -1
- package/dist/leverage/operations.js +8 -5
- package/dist/leverage/operations.js.map +1 -1
- package/dist/manager/client_kamino_manager.js +10 -3
- package/dist/manager/client_kamino_manager.js.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/dist/utils/managerTypes.d.ts +2 -3
- package/dist/utils/managerTypes.d.ts.map +1 -1
- package/dist/utils/managerTypes.js +37 -34
- package/dist/utils/managerTypes.js.map +1 -1
- package/dist/utils/map.d.ts +2 -0
- package/dist/utils/map.d.ts.map +1 -0
- package/dist/utils/map.js +13 -0
- package/dist/utils/map.js.map +1 -0
- package/dist/utils/oracle.d.ts +2 -1
- package/dist/utils/oracle.d.ts.map +1 -1
- package/dist/utils/oracle.js +4 -4
- package/dist/utils/oracle.js.map +1 -1
- package/dist/utils/vault.js +2 -2
- package/dist/utils/vault.js.map +1 -1
- package/dist/utils/vaultAllocation.d.ts +21 -0
- package/dist/utils/vaultAllocation.d.ts.map +1 -0
- package/dist/utils/vaultAllocation.js +71 -0
- package/dist/utils/vaultAllocation.js.map +1 -0
- package/package.json +2 -2
- package/src/@codegen/kvault/accounts/Reserve.ts +1 -1
- package/src/@codegen/kvault/accounts/VaultState.ts +16 -16
- package/src/@codegen/kvault/errors/custom.ts +14 -0
- package/src/@codegen/kvault/types/VaultConfigField.ts +60 -0
- package/src/@codegen/kvault/types/index.ts +4 -0
- package/src/classes/action.ts +26 -11
- package/src/classes/manager.ts +92 -30
- package/src/classes/market.ts +15 -9
- package/src/classes/vault.ts +125 -42
- package/src/classes/vault_types.ts +11 -1
- package/src/client/commands/borrow.ts +2 -1
- package/src/client/commands/deposit.ts +2 -1
- package/src/client/commands/repay.ts +2 -1
- package/src/client/commands/withdraw.ts +2 -1
- package/src/idl/kvault.json +34 -12
- package/src/leverage/operations.ts +9 -10
- package/src/manager/client_kamino_manager.ts +15 -3
- package/src/utils/index.ts +1 -0
- package/src/utils/managerTypes.ts +29 -28
- package/src/utils/map.ts +8 -0
- package/src/utils/oracle.ts +4 -3
- package/src/utils/vault.ts +2 -2
- package/src/utils/vaultAllocation.ts +93 -0
|
@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.encodeTokenName = exports.
|
|
6
|
+
exports.encodeTokenName = exports.getDefaultConfigParams = exports.DebtConfig = exports.CollateralConfig = exports.AssetReserveConfigCli = exports.AssetReserveConfig = void 0;
|
|
7
7
|
exports.getReserveOracleConfigs = getReserveOracleConfigs;
|
|
8
8
|
exports.parseOracleType = parseOracleType;
|
|
9
9
|
const types_1 = require("../@codegen/klend/types");
|
|
10
10
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
11
|
-
const fraction_1 = require("../classes/fraction");
|
|
12
|
-
const bn_js_1 = __importDefault(require("bn.js"));
|
|
13
11
|
const classes_1 = require("../classes");
|
|
12
|
+
const bn_js_1 = __importDefault(require("bn.js"));
|
|
13
|
+
const classes_2 = require("../classes");
|
|
14
14
|
const pubkey_1 = require("./pubkey");
|
|
15
15
|
const scope_sdk_1 = require("@kamino-finance/scope-sdk");
|
|
16
16
|
const types_2 = require("@kamino-finance/scope-sdk/dist/@codegen/scope/types");
|
|
@@ -26,7 +26,7 @@ class AssetReserveConfig {
|
|
|
26
26
|
this.mintDecimals = fields.mintDecimals;
|
|
27
27
|
this.mintTokenProgram = fields.mintTokenProgram;
|
|
28
28
|
// TODO: verify defaults and ensure opinionated
|
|
29
|
-
this.assetReserveConfigParams = exports.
|
|
29
|
+
this.assetReserveConfigParams = (0, exports.getDefaultConfigParams)();
|
|
30
30
|
this.assetReserveConfigParams.priceFeed = fields.priceFeed;
|
|
31
31
|
this.assetReserveConfigParams.loanToValuePct = fields.loanToValuePct;
|
|
32
32
|
this.assetReserveConfigParams.liquidationThresholdPct = fields.liquidationThresholdPct;
|
|
@@ -57,7 +57,7 @@ class AssetReserveConfigCli {
|
|
|
57
57
|
this.reserveConfig = reserveConfig;
|
|
58
58
|
this.tokenName = '';
|
|
59
59
|
this.mintDecimals = 0;
|
|
60
|
-
this.assetReserveConfigParams = exports.
|
|
60
|
+
this.assetReserveConfigParams = (0, exports.getDefaultConfigParams)();
|
|
61
61
|
this.mint = mint;
|
|
62
62
|
this.mintTokenProgram = mintTokenProgram;
|
|
63
63
|
}
|
|
@@ -90,7 +90,7 @@ class CollateralConfig {
|
|
|
90
90
|
this.mintDecimals = fields.mintDecimals;
|
|
91
91
|
this.mintTokenProgram = fields.mintTokenProgram;
|
|
92
92
|
// TODO: verify defaults and ensure opinionated
|
|
93
|
-
this.assetReserveConfigParams = exports.
|
|
93
|
+
this.assetReserveConfigParams = (0, exports.getDefaultConfigParams)();
|
|
94
94
|
this.assetReserveConfigParams.priceFeed = fields.priceFeed;
|
|
95
95
|
this.assetReserveConfigParams.loanToValuePct = fields.loanToValuePct;
|
|
96
96
|
this.assetReserveConfigParams.liquidationThresholdPct = fields.liquidationThresholdPct;
|
|
@@ -124,7 +124,7 @@ class DebtConfig {
|
|
|
124
124
|
this.borrowLimitOutsideElevationGroup = fields.borrowLimitOutsideElevationGroup;
|
|
125
125
|
this.debtWithdrawalCapConfigCapacity = fields.debtWithdrawalCapConfigCapacity;
|
|
126
126
|
// TODO: verify defaults and ensure opinionated
|
|
127
|
-
this.assetReserveConfigParams = exports.
|
|
127
|
+
this.assetReserveConfigParams = (0, exports.getDefaultConfigParams)();
|
|
128
128
|
this.assetReserveConfigParams.priceFeed = fields.priceFeed;
|
|
129
129
|
this.assetReserveConfigParams.borrowRateCurve = fields.borrowRateCurve;
|
|
130
130
|
}
|
|
@@ -142,29 +142,32 @@ class DebtConfig {
|
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
exports.DebtConfig = DebtConfig;
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
145
|
+
const getDefaultConfigParams = () => {
|
|
146
|
+
return {
|
|
147
|
+
loanToValuePct: 70,
|
|
148
|
+
maxLiquidationBonusBps: 500,
|
|
149
|
+
minLiquidationBonusBps: 200,
|
|
150
|
+
badDebtLiquidationBonusBps: 10,
|
|
151
|
+
liquidationThresholdPct: 75,
|
|
152
|
+
borrowFeeSf: classes_1.ZERO_FRACTION,
|
|
153
|
+
flashLoanFeeSf: classes_1.ZERO_FRACTION,
|
|
154
|
+
protocolTakeRate: 0,
|
|
155
|
+
elevationGroups: new Array(20).fill(0),
|
|
156
|
+
priceFeed: null,
|
|
157
|
+
borrowLimit: new decimal_js_1.default(1000.0),
|
|
158
|
+
depositLimit: new decimal_js_1.default(1000.0),
|
|
159
|
+
borrowRateCurve: new types_1.BorrowRateCurve({
|
|
160
|
+
points: [
|
|
161
|
+
new types_1.CurvePoint({ utilizationRateBps: 0, borrowRateBps: 1000 }),
|
|
162
|
+
new types_1.CurvePoint({ utilizationRateBps: 10000, borrowRateBps: 1000 }),
|
|
163
|
+
...Array(9).fill(new types_1.CurvePoint({ utilizationRateBps: 10000, borrowRateBps: 1000 })),
|
|
164
|
+
],
|
|
165
|
+
}),
|
|
166
|
+
maxAgePriceSeconds: 180,
|
|
167
|
+
maxAgeTwapSeconds: 240,
|
|
168
|
+
};
|
|
167
169
|
};
|
|
170
|
+
exports.getDefaultConfigParams = getDefaultConfigParams;
|
|
168
171
|
const encodeTokenName = (tokenName) => {
|
|
169
172
|
const buffer = Buffer.alloc(32);
|
|
170
173
|
const tokenNameEncoded = new Uint8Array(32);
|
|
@@ -193,8 +196,8 @@ function buildReserveConfig(fields) {
|
|
|
193
196
|
flashLoanFeeSf: fields.configParams.flashLoanFeeSf.getValue(),
|
|
194
197
|
padding: Array(6).fill(0),
|
|
195
198
|
},
|
|
196
|
-
depositLimit: new bn_js_1.default((0,
|
|
197
|
-
borrowLimit: new bn_js_1.default((0,
|
|
199
|
+
depositLimit: new bn_js_1.default((0, classes_2.numberToLamportsDecimal)(fields.configParams.depositLimit, fields.mintDecimals).floor().toString()),
|
|
200
|
+
borrowLimit: new bn_js_1.default((0, classes_2.numberToLamportsDecimal)(fields.configParams.borrowLimit, fields.mintDecimals).floor().toString()),
|
|
198
201
|
tokenInfo: {
|
|
199
202
|
name: (0, exports.encodeTokenName)(fields.tokenName),
|
|
200
203
|
heuristic: new types_1.PriceHeuristic({
|
|
@@ -210,7 +213,7 @@ function buildReserveConfig(fields) {
|
|
|
210
213
|
},
|
|
211
214
|
borrowRateCurve: fields.configParams.borrowRateCurve,
|
|
212
215
|
depositWithdrawalCap: new types_1.WithdrawalCaps({
|
|
213
|
-
configCapacity: new bn_js_1.default((0,
|
|
216
|
+
configCapacity: new bn_js_1.default((0, classes_2.numberToLamportsDecimal)(fields.configParams.depositLimit ?? new decimal_js_1.default(0), fields.mintDecimals)
|
|
214
217
|
.floor()
|
|
215
218
|
.toString()),
|
|
216
219
|
currentTotal: new bn_js_1.default(0),
|
|
@@ -218,7 +221,7 @@ function buildReserveConfig(fields) {
|
|
|
218
221
|
configIntervalLengthSeconds: new bn_js_1.default(0),
|
|
219
222
|
}),
|
|
220
223
|
debtWithdrawalCap: new types_1.WithdrawalCaps({
|
|
221
|
-
configCapacity: new bn_js_1.default((0,
|
|
224
|
+
configCapacity: new bn_js_1.default((0, classes_2.numberToLamportsDecimal)(fields.debtWithdrawalCapConfigCapacity ?? new decimal_js_1.default(0), fields.mintDecimals)
|
|
222
225
|
.floor()
|
|
223
226
|
.toString()),
|
|
224
227
|
currentTotal: new bn_js_1.default(0),
|
|
@@ -233,7 +236,7 @@ function buildReserveConfig(fields) {
|
|
|
233
236
|
utilizationLimitBlockBorrowingAbovePct: 0,
|
|
234
237
|
hostFixedInterestRateBps: 0,
|
|
235
238
|
autodeleverageEnabled: 0,
|
|
236
|
-
borrowLimitOutsideElevationGroup: new bn_js_1.default((0,
|
|
239
|
+
borrowLimitOutsideElevationGroup: new bn_js_1.default((0, classes_2.numberToLamportsDecimal)(fields.borrowLimitOutsideElevationGroup ?? new decimal_js_1.default(0), fields.mintDecimals)
|
|
237
240
|
.floor()
|
|
238
241
|
.toString()),
|
|
239
242
|
borrowLimitAgainstThisCollateralInElevationGroup: Array(32).fill(new bn_js_1.default(0)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managerTypes.js","sourceRoot":"","sources":["../../src/utils/managerTypes.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"managerTypes.js","sourceRoot":"","sources":["../../src/utils/managerTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../src/utils/map.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAO1E"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setOrAppend = setOrAppend;
|
|
4
|
+
function setOrAppend(map, key, value) {
|
|
5
|
+
const existing = map.get(key);
|
|
6
|
+
if (existing) {
|
|
7
|
+
existing.push(value);
|
|
8
|
+
}
|
|
9
|
+
else {
|
|
10
|
+
map.set(key, [value]);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=map.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"map.js","sourceRoot":"","sources":["../../src/utils/map.ts"],"names":[],"mappings":";;AAAA,kCAOC;AAPD,SAAgB,WAAW,CAAO,GAAgB,EAAE,GAAM,EAAE,KAAQ;IAClE,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACxB,CAAC;AACH,CAAC"}
|
package/dist/utils/oracle.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import Decimal from 'decimal.js';
|
|
|
3
3
|
import { Scope } from '@kamino-finance/scope-sdk';
|
|
4
4
|
import { OraclePrices } from '@kamino-finance/scope-sdk/dist/@codegen/scope/accounts/OraclePrices';
|
|
5
5
|
import { Reserve } from '../lib';
|
|
6
|
+
import { Configuration } from '@kamino-finance/scope-sdk/dist/@codegen/scope/accounts/Configuration';
|
|
6
7
|
export declare const MAX_CONFIDENCE_PERCENTAGE: Decimal;
|
|
7
8
|
export declare const CONFIDENCE_FACTOR: Decimal;
|
|
8
9
|
export type TokenOracleData = {
|
|
@@ -19,7 +20,7 @@ export type CandidatePrice = {
|
|
|
19
20
|
};
|
|
20
21
|
export type ScopePriceRefreshConfig = {
|
|
21
22
|
scope: Scope;
|
|
22
|
-
|
|
23
|
+
scopeConfigurations: [Address, Configuration][];
|
|
23
24
|
};
|
|
24
25
|
export declare function getTokenOracleDataSync(allOracleAccounts: AllOracleAccounts, reserves: Reserve[]): [Reserve, TokenOracleData | undefined][];
|
|
25
26
|
export declare function getTokenOracleData(rpc: Rpc<GetMultipleAccountsApi>, reserves: Reserve[]): Promise<Array<[Reserve, TokenOracleData | undefined]>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../src/utils/oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAW,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAChH,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,qEAAqE,CAAC;AAGnG,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../src/utils/oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAW,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAChH,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,qEAAqE,CAAC;AAGnG,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAQjC,OAAO,EAAE,aAAa,EAAE,MAAM,sEAAsE,CAAC;AAGrG,eAAO,MAAM,yBAAyB,EAAE,OAA0B,CAAC;AAGnE,eAAO,MAAM,iBAAiB,EAAE,OAA2D,CAAC;AAM5F,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,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,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,CAAC;CACjD,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,OAAO,EAAE,4CAyD/F;AAGD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,GAAG,CAAC,sBAAsB,CAAC,EAChC,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,CAGxD;AAED,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC;AAEjF,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,GAAG,CAAC,sBAAsB,CAAC,EAChC,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC,iBAAiB,CAAC,CA4B5B;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,OAAO,EACf,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,EAC/B,cAAc,EAAE,iBAAiB,GAChC,UAAU,GAAG,IAAI,CAwCnB;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,OAAO,EACf,gBAAgB,EAAE,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,EAC9C,cAAc,EAAE,iBAAiB,GAChC,cAAc,GAAG,IAAI,CA4BvB;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,EACtC,iBAAiB,EAAE,iBAAiB,EACpC,KAAK,EAAE,MAAM,EAAE,GACd,cAAc,GAAG,IAAI,CAsBvB"}
|
package/dist/utils/oracle.js
CHANGED
|
@@ -17,8 +17,8 @@ const OraclePrices_1 = require("@kamino-finance/scope-sdk/dist/@codegen/scope/ac
|
|
|
17
17
|
const pubkey_1 = require("./pubkey");
|
|
18
18
|
const classes_1 = require("../classes");
|
|
19
19
|
const kliquidity_sdk_1 = require("@kamino-finance/kliquidity-sdk");
|
|
20
|
-
const
|
|
21
|
-
const
|
|
20
|
+
const accounts_1 = require("../@codegen/pyth_rec/accounts");
|
|
21
|
+
const accounts_2 = require("../@codegen/switchboard_v2/accounts");
|
|
22
22
|
const buffer_1 = require("buffer");
|
|
23
23
|
const switchboard_1 = require("./switchboard");
|
|
24
24
|
const programId_1 = require("../@codegen/switchboard_v2/programId");
|
|
@@ -126,7 +126,7 @@ function cacheOrGetPythPrices(oracle, cache, oracleAccounts) {
|
|
|
126
126
|
const result = oracleAccounts.get(oracle);
|
|
127
127
|
if (result) {
|
|
128
128
|
try {
|
|
129
|
-
const { priceMessage } =
|
|
129
|
+
const { priceMessage } = accounts_1.priceUpdateV2.decode(buffer_1.Buffer.from(result.data[0], 'base64'));
|
|
130
130
|
const { price, exponent, conf: confidence, publishTime: timestamp, emaPrice } = priceMessage;
|
|
131
131
|
if (price) {
|
|
132
132
|
const px = new decimal_js_1.default(price.toString()).div(10 ** Math.abs(exponent));
|
|
@@ -175,7 +175,7 @@ function cacheOrGetSwitchboardPrice(oracle, switchboardCache, oracleAccounts) {
|
|
|
175
175
|
const info = oracleAccounts.get(oracle);
|
|
176
176
|
if (info) {
|
|
177
177
|
if (info.programAddress === programId_1.PROGRAM_ID) {
|
|
178
|
-
const agg =
|
|
178
|
+
const agg = accounts_2.AggregatorAccountData.decode(buffer_1.Buffer.from(info.data[0], 'base64'));
|
|
179
179
|
const result = (0, switchboard_1.getLatestAggregatorValue)(agg);
|
|
180
180
|
if (result !== undefined && result !== null) {
|
|
181
181
|
const switchboardPx = new decimal_js_1.default(result.toString());
|
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":";;;;;;AA6CA,wDAyDC;AAGD,gDAMC;AAID,oDA+BC;AAiBD,oDA4CC;AAQD,gEAgCC;AASD,oDA2BC;AA3RD,qCAAgH;AAChH,4DAAiC;AACjC,yDAAkD;AAClD,sGAAmG;AACnG,qCAA2C;AAC3C,wCAA8C;AAE9C,mEAA4D;AAE5D,4DAA8D;AAC9D,kEAA4E;AAC5E,mCAAgC;AAChC,+CAAyD;AACzD,oEAA+F;AAG/F,4EAA4E;AAC/D,QAAA,yBAAyB,GAAY,IAAI,oBAAO,CAAC,GAAG,CAAC,CAAC;AAEnE,yGAAyG;AAC5F,QAAA,iBAAiB,GAAY,IAAI,oBAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,iCAAyB,CAAC,CAAC;AAE5F,MAAM,eAAe,GAAG,GAAG,EAAE;IAC3B,OAAO,IAAA,aAAO,EAAC,8CAA8C,CAAC,CAAC;AACjE,CAAC,CAAC;AAqBF,SAAgB,sBAAsB,CAAC,iBAAoC,EAAE,QAAmB;IAC9F,MAAM,0BAA0B,GAAkD,EAAE,CAAC;IACrF,MAAM,SAAS,GAAG,IAAI,GAAG,EAAuB,CAAC;IACjD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,GAAG,EAAyB,CAAC;IACpD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,WAAW,GAA+B,SAAS,CAAC;QACxD,MAAM,MAAM,GAAG;YACb,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK;YAC7D,sBAAsB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,eAAe;YACzF,sBAAsB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,cAAc;YACxF,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS;SAC1E,CAAC;QACF,IAAI,IAAA,wBAAe,EAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YACxC,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;YAC1F,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;gBAClC,WAAW,GAAG,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QACD,IAAI,IAAA,wBAAe,EAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACnD,MAAM,gBAAgB,GAAG,0BAA0B,CACjD,MAAM,CAAC,sBAAsB,EAC7B,gBAAgB,EAChB,iBAAiB,CAClB,CAAC;YACF,IAAI,gBAAgB,EAAE,CAAC;gBACrB,WAAW,GAAG,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAED,IAAI,IAAA,wBAAe,EAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC/C,MAAM,UAAU,GAAG,oBAAoB,CACrC,MAAM,CAAC,kBAAkB,EACzB,UAAU,EACV,iBAAiB,EACjB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,UAAU,CACvD,CAAC;YACF,IAAI,UAAU,EAAE,CAAC;gBACf,WAAW,GAAG,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,+BAA+B,IAAA,0BAAgB,EAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAChG,0BAA0B,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;YACtD,SAAS;QACX,CAAC;QACD,MAAM,eAAe,GAAoB;YACvC,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,UAAU;YACzC,QAAQ,EAAE,oBAAO,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YACpE,KAAK,EAAE,IAAI,oBAAO,CAAC,WAAW,CAAC,KAAK,CAAC;YACrC,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,KAAK,EAAE,WAAW,CAAC,KAAK;SACzB,CAAC;QACF,0BAA0B,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,0BAA0B,CAAC;AACpC,CAAC;AAED,4DAA4D;AACrD,KAAK,UAAU,kBAAkB,CACtC,GAAgC,EAChC,QAAmB;IAEnB,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACpE,OAAO,sBAAsB,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AAC7D,CAAC;AAIM,KAAK,UAAU,oBAAoB,CACxC,GAAgC,EAChC,QAAmB;IAEnB,MAAM,WAAW,GAAc,EAAE,CAAC;IAClC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,IAAI,IAAA,wBAAe,EAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;YACtE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,IAAA,wBAAe,EAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,eAAe,CAAC,EAAE,CAAC;YACvF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAC;QACtF,CAAC;QACD,IAAI,IAAA,wBAAe,EAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,cAAc,CAAC,EAAE,CAAC;YACtF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;QACrF,CAAC;QACD,IAAI,IAAA,wBAAe,EAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3E,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,kBAAkB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,MAAM,IAAA,2BAAU,EAC9B,kBAAkB,EAClB,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CACrE,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,GAAG,EAA+C,CAAC;IAC1E,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QACzB,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/G,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,SAAS,CAAC,IAAe;IAChC,OAAO,CAAC,GAAG,IAAI,GAAG,CAAU,IAAI,CAAC,CAAC,CAAC;AACrC,CAAC;AAOD;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,MAAe,EACf,KAA+B,EAC/B,cAAiC;IAEjC,MAAM,MAAM,GAAe,EAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,EAAE,YAAY,EAAE,GAAG,wBAAa,CAAC,MAAM,CAAC,eAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;gBACrF,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;gBAC7F,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,EAAE,GAAG,IAAI,oBAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;oBACvE,MAAM,IAAI,GAAG,IAAI,oBAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAChD,MAAM,CAAC,IAAI,GAAG;wBACZ,KAAK,EAAE,EAAE;wBACT,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;wBACvC,KAAK,EAAE,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC;qBAChC,CAAC;gBACJ,CAAC;gBACD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;oBAChD,MAAM,KAAK,GAAG,IAAI,oBAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC7E,MAAM,CAAC,IAAI,GAAG;wBACZ,KAAK,EAAE,KAAK;wBACZ,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;wBACvC,KAAK,EAAE,IAAI;qBACZ,CAAC;gBACJ,CAAC;gBACD,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;oBAC/B,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,oCAAoC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;gBACnF,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,0BAA0B,CACxC,MAAe,EACf,gBAA8C,EAC9C,cAAiC;IAEjC,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,IAAI,CAAC,cAAc,KAAK,sBAAyB,EAAE,CAAC;gBACtD,MAAM,GAAG,GAAG,gCAAqB,CAAC,MAAM,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAC9E,MAAM,MAAM,GAAG,IAAA,sCAAwB,EAAC,GAAG,CAAC,CAAC;gBAC7C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;oBAC5C,MAAM,aAAa,GAAG,IAAI,oBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACrD,MAAM,oBAAoB,GAAO,GAAG,CAAC,oBAAoB,CAAC,kBAAkB,CAAC;oBAC7E,MAAM,EAAE,GAAG,MAAM,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACnD,MAAM,KAAK,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;oBAC3C,OAAO;wBACL,KAAK,EAAE,aAAa;wBACpB,SAAS,EAAE,EAAE;wBACb,KAAK;qBACN,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,0CAA0C,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC/E,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAClC,MAAe,EACf,UAAsC,EACtC,iBAAoC,EACpC,KAAe;IAEf,IAAI,CAAC,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,iBAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,0BAA0B,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,IAAI,GAAG,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC;QAClC,IAAI,KAAK,KAAK,eAAe,EAAE,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,2BAAY,CAAC,MAAM,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;YACxE,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC/B,OAAO,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,OAAmC,EAAE,IAAoB;IAC7E,IAAI,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CAAC,OAAmC,EAAE,IAAoB;IAC9E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;AAC5C,CAAC;AAED,SAAS,cAAc,CAAC,KAAc,EAAE,UAAmB;IACzD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,yBAAiB,CAAC,CAAC;IAClD,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,uBAAuB,CAAC,GAA0B;IACzD,MAAM,UAAU,GAAG,IAAI,oBAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpF,MAAM,OAAO,GAAG,IAAI,oBAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9E,MAAM,aAAa,GAAG,IAAI,oBAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,IAAI,oBAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvF,IAAI,aAAsB,CAAC;IAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,yBAAiB,CAAC,CAAC;QACrD,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACN,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,yBAAiB,CAAC,CAAC;QACrD,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAe,EAAE,MAAoB;IACvE,MAAM,OAAO,GAAG,iBAAK,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,iCAAiC;IAC1E,OAAO;QACL,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC/C,KAAK;KACN,CAAC;AACJ,CAAC"}
|
package/dist/utils/vault.js
CHANGED
|
@@ -21,7 +21,8 @@ function decodeVaultState(data) {
|
|
|
21
21
|
tokenAvailable: dec.tokenAvailable,
|
|
22
22
|
sharesIssued: dec.sharesIssued,
|
|
23
23
|
availableCrankFunds: dec.availableCrankFunds,
|
|
24
|
-
|
|
24
|
+
unallocatedWeight: dec.unallocatedWeight,
|
|
25
|
+
unallocatedTokensCap: dec.unallocatedTokensCap,
|
|
25
26
|
performanceFeeBps: dec.performanceFeeBps,
|
|
26
27
|
managementFeeBps: dec.managementFeeBps,
|
|
27
28
|
lastFeeChargeTimestamp: dec.lastFeeChargeTimestamp,
|
|
@@ -42,7 +43,6 @@ function decodeVaultState(data) {
|
|
|
42
43
|
vaultLookupTable: dec.vaultLookupTable,
|
|
43
44
|
vaultFarm: dec.vaultFarm,
|
|
44
45
|
creationTimestamp: dec.creationTimestamp,
|
|
45
|
-
padding2: dec.padding2,
|
|
46
46
|
allocationAdmin: dec.allocationAdmin,
|
|
47
47
|
padding3: dec.padding3,
|
|
48
48
|
});
|
package/dist/utils/vault.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vault.js","sourceRoot":"","sources":["../../src/utils/vault.ts"],"names":[],"mappings":";;AAGA,4CA+CC;AAlDD,uEAAoE;AACpE,8EAA2E;AAE3E,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,IAAI,CAAC,uBAAU,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,GAAG,GAAG,uBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpD,OAAO,IAAI,uBAAU,CAAC;QACpB,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;QAC5C,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;QAC1C,sBAAsB,EAAE,GAAG,CAAC,sBAAsB;QAClD,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;QAC1C,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;QAC5C,
|
|
1
|
+
{"version":3,"file":"vault.js","sourceRoot":"","sources":["../../src/utils/vault.ts"],"names":[],"mappings":";;AAGA,4CA+CC;AAlDD,uEAAoE;AACpE,8EAA2E;AAE3E,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,IAAI,CAAC,uBAAU,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,GAAG,GAAG,uBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpD,OAAO,IAAI,uBAAU,CAAC;QACpB,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;QAC5C,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;QAC1C,sBAAsB,EAAE,GAAG,CAAC,sBAAsB;QAClD,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;QAC1C,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;QAC5C,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,oBAAoB,EAAE,GAAG,CAAC,oBAAoB;QAC9C,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;QACtC,sBAAsB,EAAE,GAAG,CAAC,sBAAsB;QAClD,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,CAAC,GAAG,CACtD,CAAC,IAAS,CAAC,4DAA4D,EAAE,EAAE,CAAC,iCAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAC9G;QACD,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;QACtC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;QAC5C,sBAAsB,EAAE,GAAG,CAAC,sBAAsB;QAClD,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,0BAA0B,EAAE,GAAG,CAAC,0BAA0B;QAC1D,oBAAoB,EAAE,GAAG,CAAC,oBAAoB;QAC9C,oBAAoB,EAAE,GAAG,CAAC,oBAAoB;QAC9C,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;QACtC,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,QAAQ,EAAE,GAAG,CAAC,QAAQ;KACvB,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import Decimal from 'decimal.js';
|
|
2
|
+
import { Address } from '@solana/kit';
|
|
3
|
+
export interface ReserveAllocationOverview {
|
|
4
|
+
targetWeight: Decimal;
|
|
5
|
+
tokenAllocationCap: Decimal;
|
|
6
|
+
ctokenAllocation: Decimal;
|
|
7
|
+
}
|
|
8
|
+
export interface VaultAllocationResult {
|
|
9
|
+
targetUnallocatedAmount: Decimal;
|
|
10
|
+
targetReservesAllocation: Map<Address, Decimal>;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Computes the allocation of vault funds across reserves based on weights and caps
|
|
14
|
+
* @param vaultAUM - Total AUM of the vault
|
|
15
|
+
* @param vaultUnallocatedWeight - Weight for unallocated funds
|
|
16
|
+
* @param vaultUnallocatedCap - Maximum amount that can remain unallocated
|
|
17
|
+
* @param initialVaultAllocations - Map of reserve addresses to their allocation configurations
|
|
18
|
+
* @returns Object containing target unallocated amount and target allocations per reserve
|
|
19
|
+
*/
|
|
20
|
+
export declare function computeReservesAllocation(vaultAUM: Decimal, vaultUnallocatedWeight: Decimal, vaultUnallocatedCap: Decimal, initialVaultAllocations: Map<Address, ReserveAllocationOverview>): VaultAllocationResult;
|
|
21
|
+
//# sourceMappingURL=vaultAllocation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vaultAllocation.d.ts","sourceRoot":"","sources":["../../src/utils/vaultAllocation.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC,uBAAuB,EAAE,OAAO,CAAC;IACjC,wBAAwB,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACjD;AAKD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,OAAO,EACjB,sBAAsB,EAAE,OAAO,EAC/B,mBAAmB,EAAE,OAAO,EAC5B,uBAAuB,EAAE,GAAG,CAAC,OAAO,EAAE,yBAAyB,CAAC,GAC/D,qBAAqB,CA8DvB"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.computeReservesAllocation = computeReservesAllocation;
|
|
7
|
+
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
8
|
+
const ZERO = new decimal_js_1.default(0);
|
|
9
|
+
const ONE = new decimal_js_1.default(1);
|
|
10
|
+
/**
|
|
11
|
+
* Computes the allocation of vault funds across reserves based on weights and caps
|
|
12
|
+
* @param vaultAUM - Total AUM of the vault
|
|
13
|
+
* @param vaultUnallocatedWeight - Weight for unallocated funds
|
|
14
|
+
* @param vaultUnallocatedCap - Maximum amount that can remain unallocated
|
|
15
|
+
* @param initialVaultAllocations - Map of reserve addresses to their allocation configurations
|
|
16
|
+
* @returns Object containing target unallocated amount and target allocations per reserve
|
|
17
|
+
*/
|
|
18
|
+
function computeReservesAllocation(vaultAUM, vaultUnallocatedWeight, vaultUnallocatedCap, initialVaultAllocations) {
|
|
19
|
+
let totalAllocation = new decimal_js_1.default(0);
|
|
20
|
+
const allReserves = Array.from(initialVaultAllocations.keys());
|
|
21
|
+
const expectedHoldingsDistribution = new Map();
|
|
22
|
+
// Initialize reserve allocations and calculate total weight
|
|
23
|
+
allReserves.forEach((reserve) => {
|
|
24
|
+
expectedHoldingsDistribution.set(reserve, ZERO);
|
|
25
|
+
totalAllocation = totalAllocation.add(initialVaultAllocations.get(reserve).targetWeight);
|
|
26
|
+
});
|
|
27
|
+
let totalLeftToInvest = vaultAUM;
|
|
28
|
+
const totalAllocationsIncludingUnallocated = totalAllocation.add(vaultUnallocatedWeight);
|
|
29
|
+
// Calculate initial unallocated amount
|
|
30
|
+
let unallocatedAllocation = totalLeftToInvest.mul(vaultUnallocatedWeight).div(totalAllocationsIncludingUnallocated);
|
|
31
|
+
if (unallocatedAllocation.gt(vaultUnallocatedCap)) {
|
|
32
|
+
unallocatedAllocation = vaultUnallocatedCap;
|
|
33
|
+
}
|
|
34
|
+
totalLeftToInvest = totalLeftToInvest.sub(unallocatedAllocation);
|
|
35
|
+
let currentAllocationSum = totalAllocation;
|
|
36
|
+
// Iteratively allocate funds to reserves based on weights and caps
|
|
37
|
+
while (totalLeftToInvest.gt(ONE) && currentAllocationSum.gt(ZERO)) {
|
|
38
|
+
const totalLeftover = totalLeftToInvest;
|
|
39
|
+
for (const reserve of allReserves) {
|
|
40
|
+
const reserveWithWeight = initialVaultAllocations.get(reserve);
|
|
41
|
+
if (!reserveWithWeight)
|
|
42
|
+
continue;
|
|
43
|
+
const targetAllocation = reserveWithWeight.targetWeight.mul(totalLeftover).div(currentAllocationSum);
|
|
44
|
+
const reserveCap = reserveWithWeight.tokenAllocationCap;
|
|
45
|
+
let amountToInvest = decimal_js_1.default.min(targetAllocation, totalLeftToInvest);
|
|
46
|
+
// Handle reserve caps
|
|
47
|
+
if (reserveCap.gt(ZERO)) {
|
|
48
|
+
const currentReserveAllocation = expectedHoldingsDistribution.get(reserve);
|
|
49
|
+
const remainingCapacity = reserveCap.sub(currentReserveAllocation);
|
|
50
|
+
amountToInvest = decimal_js_1.default.min(amountToInvest, remainingCapacity);
|
|
51
|
+
}
|
|
52
|
+
else if (reserveCap.eq(ZERO)) {
|
|
53
|
+
// Zero cap means no investment allowed
|
|
54
|
+
amountToInvest = ZERO;
|
|
55
|
+
}
|
|
56
|
+
totalLeftToInvest = totalLeftToInvest.sub(amountToInvest);
|
|
57
|
+
// Check if reserve is now capped and should be removed from future allocations
|
|
58
|
+
const newReserveAllocation = expectedHoldingsDistribution.get(reserve).add(amountToInvest);
|
|
59
|
+
if (reserveCap.eq(ZERO) || (reserveCap.gt(ZERO) && newReserveAllocation.gte(reserveCap))) {
|
|
60
|
+
currentAllocationSum = currentAllocationSum.sub(reserveWithWeight.targetWeight);
|
|
61
|
+
}
|
|
62
|
+
// Update reserve allocation
|
|
63
|
+
expectedHoldingsDistribution.set(reserve, newReserveAllocation);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return {
|
|
67
|
+
targetUnallocatedAmount: unallocatedAllocation.add(totalLeftToInvest),
|
|
68
|
+
targetReservesAllocation: expectedHoldingsDistribution,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=vaultAllocation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vaultAllocation.js","sourceRoot":"","sources":["../../src/utils/vaultAllocation.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": "
|
|
3
|
+
"version": "7.0.0",
|
|
4
4
|
"description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"@coral-xyz/borsh": "^0.28.0",
|
|
65
65
|
"@kamino-finance/farms-sdk": "^3.1.0",
|
|
66
66
|
"@kamino-finance/kliquidity-sdk": "^8.4.0",
|
|
67
|
-
"@kamino-finance/scope-sdk": "^
|
|
67
|
+
"@kamino-finance/scope-sdk": "^10.0.3",
|
|
68
68
|
"@solana-program/address-lookup-table": "^0.7.0",
|
|
69
69
|
"@solana-program/system": "^0.7.0",
|
|
70
70
|
"@solana-program/token": "^0.5.1",
|
|
@@ -110,7 +110,7 @@ export class Reserve {
|
|
|
110
110
|
types.ReserveCollateral.layout("collateral"),
|
|
111
111
|
borsh.array(borsh.u64(), 150, "reserveCollateralPadding"),
|
|
112
112
|
types.ReserveConfig.layout("config"),
|
|
113
|
-
borsh.array(borsh.u64(),
|
|
113
|
+
borsh.array(borsh.u64(), 115, "configPadding"),
|
|
114
114
|
borsh.u64("borrowedAmountOutsideElevationGroup"),
|
|
115
115
|
borsh.array(
|
|
116
116
|
borsh.u64(),
|