@sonarwatch/portfolio-plugins 0.11.90 → 0.11.91
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +4 -0
- package/package.json +2 -2
- package/src/Cache.d.ts +1 -0
- package/src/Cache.js +12 -0
- package/src/Cache.js.map +1 -1
- package/src/plugins/circuit/constants.d.ts +1 -3
- package/src/plugins/circuit/constants.js +2 -17
- package/src/plugins/circuit/constants.js.map +1 -1
- package/src/plugins/circuit/depositsFetcher.js +10 -4
- package/src/plugins/circuit/depositsFetcher.js.map +1 -1
- package/src/plugins/circuit/filters.d.ts +1 -0
- package/src/plugins/circuit/filters.js +4 -1
- package/src/plugins/circuit/filters.js.map +1 -1
- package/src/plugins/circuit/index.js +2 -1
- package/src/plugins/circuit/index.js.map +1 -1
- package/src/plugins/circuit/types.d.ts +1 -47
- package/src/plugins/circuit/vaultsJob.d.ts +3 -0
- package/src/plugins/circuit/vaultsJob.js +42 -0
- package/src/plugins/circuit/vaultsJob.js.map +1 -0
- package/src/plugins/drift/deposits.js +1 -1
- package/src/plugins/drift/deposits.js.map +1 -1
- package/src/plugins/drift/helpers.d.ts +0 -1
- package/src/plugins/drift/helpers.js +1 -6
- package/src/plugins/drift/helpers.js.map +1 -1
- package/src/plugins/flash/poolJob.js +1 -2
- package/src/plugins/flash/poolJob.js.map +1 -1
- package/src/plugins/mango/collateralFetcher.js +1 -2
- package/src/plugins/mango/collateralFetcher.js.map +1 -1
- package/src/plugins/mango/helpers.d.ts +0 -1
- package/src/plugins/mango/helpers.js +1 -7
- package/src/plugins/mango/helpers.js.map +1 -1
- package/src/plugins/navi/collateralFetcher.js +20 -24
- package/src/plugins/navi/collateralFetcher.js.map +1 -1
- package/src/plugins/navi/constants.d.ts +0 -1
- package/src/plugins/navi/constants.js +10 -2
- package/src/plugins/navi/constants.js.map +1 -1
- package/src/plugins/navi/reservesJob.js +12 -50
- package/src/plugins/navi/reservesJob.js.map +1 -1
- package/src/plugins/navi/types.d.ts +42 -44
- package/src/utils/solana/index.d.ts +1 -0
- package/src/utils/solana/index.js +1 -0
- package/src/utils/solana/index.js.map +1 -1
- package/src/utils/solana/u8ArrayToString.d.ts +1 -0
- package/src/utils/solana/u8ArrayToString.js +11 -0
- package/src/utils/solana/u8ArrayToString.js.map +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [0.11.91](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.90...plugins-0.11.91) (2024-03-01)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
5
9
|
## [0.11.90](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.89...plugins-0.11.90) (2024-02-28)
|
|
6
10
|
|
|
7
11
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.91",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"generators": "./generators.json",
|
|
6
6
|
"dependencies": {
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"web3-v1": "npm:web3@^1.5.0"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
|
-
"@sonarwatch/portfolio-core": "0.11.
|
|
44
|
+
"@sonarwatch/portfolio-core": "0.11.91"
|
|
45
45
|
},
|
|
46
46
|
"main": "./src/index.js",
|
|
47
47
|
"types": "./src/index.d.ts"
|
package/src/Cache.d.ts
CHANGED
|
@@ -80,6 +80,7 @@ export declare class Cache {
|
|
|
80
80
|
private setTokenPriceLocal;
|
|
81
81
|
getTokenPrice(address: string, networkId: NetworkIdType): Promise<TokenPrice | undefined>;
|
|
82
82
|
getTokenPrices(addresses: string[], networkId: NetworkIdType): Promise<(TokenPrice | undefined)[]>;
|
|
83
|
+
getTokenPricesAsMap(addresses: string[], networkId: NetworkIdType): Promise<Map<string, TokenPrice>>;
|
|
83
84
|
private getTokenPriceSources;
|
|
84
85
|
private getTokenPricesSources;
|
|
85
86
|
getItems<K extends StorageValue>(keys: string[], opts: TransactionOptions): Promise<(K | undefined)[]>;
|
package/src/Cache.js
CHANGED
|
@@ -135,6 +135,18 @@ class Cache {
|
|
|
135
135
|
return fAddresses.map((address) => tokenPriceByAddress.get(address));
|
|
136
136
|
});
|
|
137
137
|
}
|
|
138
|
+
getTokenPricesAsMap(addresses, networkId) {
|
|
139
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
140
|
+
const tokenPrices = yield this.getTokenPrices(addresses, networkId);
|
|
141
|
+
const tokenPricesMap = new Map();
|
|
142
|
+
tokenPrices.forEach((tp) => {
|
|
143
|
+
if (!tp)
|
|
144
|
+
return;
|
|
145
|
+
tokenPricesMap.set(tp.address, tp);
|
|
146
|
+
});
|
|
147
|
+
return tokenPricesMap;
|
|
148
|
+
});
|
|
149
|
+
}
|
|
138
150
|
getTokenPriceSources(address, networkId) {
|
|
139
151
|
return __awaiter(this, void 0, void 0, function* () {
|
|
140
152
|
const fAddress = (0, portfolio_core_1.formatTokenAddress)(address, networkId);
|
package/src/Cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../../../../packages/plugins/src/Cache.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../../../../packages/plugins/src/Cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { PublicKey } from '@solana/web3.js';
|
|
2
2
|
import { Platform } from '@sonarwatch/portfolio-core';
|
|
3
|
-
import { VaultInfo } from './types';
|
|
4
3
|
export declare const platformId = "circuit";
|
|
5
4
|
export declare const platform: Platform;
|
|
6
5
|
export declare const circuitPid: PublicKey;
|
|
7
6
|
export declare const jitoSOLMint = "J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn";
|
|
8
|
-
export declare const
|
|
9
|
-
export declare const nameOfVauilts: Map<string, VaultInfo>;
|
|
7
|
+
export declare const prefixVaults = "circuitVaults";
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.prefixVaults = exports.jitoSOLMint = exports.circuitPid = exports.platform = exports.platformId = void 0;
|
|
4
4
|
const web3_js_1 = require("@solana/web3.js");
|
|
5
|
-
const solana_1 = require("../../utils/solana");
|
|
6
5
|
exports.platformId = 'circuit';
|
|
7
6
|
exports.platform = {
|
|
8
7
|
id: exports.platformId,
|
|
@@ -14,19 +13,5 @@ exports.platform = {
|
|
|
14
13
|
};
|
|
15
14
|
exports.circuitPid = new web3_js_1.PublicKey('vAuLTsyrvSfZRuRB3XgvkPwNGgYSs9YRYymVebLKoxR');
|
|
16
15
|
exports.jitoSOLMint = 'J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn';
|
|
17
|
-
exports.
|
|
18
|
-
exports.nameOfVauilts = new Map([
|
|
19
|
-
[
|
|
20
|
-
'F3no8aqNZRSkxvMEARC4feHJfvvrST2ZrHzr2NBVyJUr',
|
|
21
|
-
{ name: 'Turbocharger', mint: solana_1.usdcSolanaMint, decimals: 6 },
|
|
22
|
-
],
|
|
23
|
-
[
|
|
24
|
-
'GXyE3Snk3pPYX4Nz9QRVBrnBfbJRTAQYxuy5DRdnebAn',
|
|
25
|
-
{ name: 'Supercharger', mint: solana_1.usdcSolanaMint, decimals: 6 },
|
|
26
|
-
],
|
|
27
|
-
[
|
|
28
|
-
'ACmnVY5gf1z9UGhzBgnr2bf3h2ZwXW2EDW1w8RC9cQk4',
|
|
29
|
-
{ name: 'JitoSol Basis', mint: exports.jitoSOLMint, decimals: 9 },
|
|
30
|
-
],
|
|
31
|
-
]);
|
|
16
|
+
exports.prefixVaults = 'circuitVaults';
|
|
32
17
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/circuit/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/circuit/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,+CAA+C;IACtD,qEAAqE;IACrE,OAAO,EAAE,4BAA4B;IACrC,OAAO,EAAE,qCAAqC;CAC/C,CAAC;AAEW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AACW,QAAA,WAAW,GAAG,8CAA8C,CAAC;AAC7D,QAAA,YAAY,GAAG,eAAe,CAAC"}
|
|
@@ -25,7 +25,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
25
25
|
const depositAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.vaultDepositorStruct, constants_1.circuitPid, (0, filters_1.vaultDepositorFilter)(owner));
|
|
26
26
|
if (depositAccounts.length === 0)
|
|
27
27
|
return [];
|
|
28
|
-
const
|
|
28
|
+
const vaultsInfo = yield cache.getItems(depositAccounts.map((deposit) => deposit.vault.toString()), { prefix: constants_1.prefixVaults, networkId: portfolio_core_1.NetworkId.solana });
|
|
29
|
+
const vaultById = new Map();
|
|
30
|
+
for (const vaultInfo of vaultsInfo) {
|
|
31
|
+
if (vaultInfo)
|
|
32
|
+
vaultById.set(vaultInfo.pubkey, vaultInfo);
|
|
33
|
+
}
|
|
34
|
+
const tokenPrices = yield cache.getTokenPrices(vaultsInfo.map((vault) => (vault ? vault.mint : [])).flat(), portfolio_core_1.NetworkId.solana);
|
|
29
35
|
const tokenPriceById = new Map();
|
|
30
36
|
tokenPrices.forEach((tp) => tp ? tokenPriceById.set(tp.address, tp) : undefined);
|
|
31
37
|
const elements = [];
|
|
@@ -34,7 +40,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
34
40
|
if (depositAccount.lastWithdrawRequest.value.isZero() &&
|
|
35
41
|
depositAccount.netDeposits.isZero())
|
|
36
42
|
continue;
|
|
37
|
-
const vaultInfo =
|
|
43
|
+
const vaultInfo = vaultById.get(depositAccount.vault.toString());
|
|
38
44
|
if (!vaultInfo)
|
|
39
45
|
continue;
|
|
40
46
|
const { decimals, name, mint } = vaultInfo;
|
|
@@ -42,7 +48,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
42
48
|
let amountLeft = depositAccount.netDeposits.plus(depositAccount.cumulativeProfitShareAmount);
|
|
43
49
|
if (!depositAccount.lastWithdrawRequest.value.isZero()) {
|
|
44
50
|
amountLeft = amountLeft.minus(depositAccount.lastWithdrawRequest.value);
|
|
45
|
-
assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(
|
|
51
|
+
assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(mint, depositAccount.lastWithdrawRequest.value
|
|
46
52
|
.dividedBy(Math.pow(10, decimals))
|
|
47
53
|
.toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice)), { attributes: {
|
|
48
54
|
lockedUntil: depositAccount.lastWithdrawRequest.ts
|
|
@@ -51,7 +57,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
51
57
|
.toNumber(),
|
|
52
58
|
} }));
|
|
53
59
|
}
|
|
54
|
-
assets.push((0, tokenPriceToAssetToken_1.default)(
|
|
60
|
+
assets.push((0, tokenPriceToAssetToken_1.default)(mint, amountLeft.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
|
|
55
61
|
if (assets.length === 0)
|
|
56
62
|
continue;
|
|
57
63
|
elements.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/circuit/depositsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AAGpC,
|
|
1
|
+
{"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/circuit/depositsFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { GetProgramAccountsFilter } from '@solana/web3.js';
|
|
2
2
|
export declare const vaultsFilter: GetProgramAccountsFilter[];
|
|
3
3
|
export declare const vaultDepositorFilter: (owner: string) => GetProgramAccountsFilter[];
|
|
4
|
+
export declare const vaultFilter: GetProgramAccountsFilter[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.vaultDepositorFilter = exports.vaultsFilter = void 0;
|
|
3
|
+
exports.vaultFilter = exports.vaultDepositorFilter = exports.vaultsFilter = void 0;
|
|
4
4
|
const structs_1 = require("./structs");
|
|
5
5
|
exports.vaultsFilter = [
|
|
6
6
|
{ dataSize: structs_1.vaultStruct.byteSize },
|
|
@@ -15,4 +15,7 @@ const vaultDepositorFilter = (owner) => [
|
|
|
15
15
|
},
|
|
16
16
|
];
|
|
17
17
|
exports.vaultDepositorFilter = vaultDepositorFilter;
|
|
18
|
+
exports.vaultFilter = [
|
|
19
|
+
{ dataSize: structs_1.vaultStruct.byteSize },
|
|
20
|
+
];
|
|
18
21
|
//# sourceMappingURL=filters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/circuit/filters.ts"],"names":[],"mappings":";;;AACA,uCAA8D;AAEjD,QAAA,YAAY,GAA+B;IACtD,EAAE,QAAQ,EAAE,qBAAW,CAAC,QAAQ,EAAE;CACnC,CAAC;AAEK,MAAM,oBAAoB,GAAG,CAClC,KAAa,EACe,EAAE,CAAC;IAC/B,EAAE,QAAQ,EAAE,8BAAoB,CAAC,QAAQ,EAAE;IAC3C;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;CACF,CAAC;AAVW,QAAA,oBAAoB,wBAU/B"}
|
|
1
|
+
{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/circuit/filters.ts"],"names":[],"mappings":";;;AACA,uCAA8D;AAEjD,QAAA,YAAY,GAA+B;IACtD,EAAE,QAAQ,EAAE,qBAAW,CAAC,QAAQ,EAAE;CACnC,CAAC;AAEK,MAAM,oBAAoB,GAAG,CAClC,KAAa,EACe,EAAE,CAAC;IAC/B,EAAE,QAAQ,EAAE,8BAAoB,CAAC,QAAQ,EAAE;IAC3C;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;CACF,CAAC;AAVW,QAAA,oBAAoB,wBAU/B;AAEW,QAAA,WAAW,GAA+B;IACrD,EAAE,QAAQ,EAAE,qBAAW,CAAC,QAAQ,EAAE;CACnC,CAAC"}
|
|
@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.fetchers = exports.jobs = exports.platforms = void 0;
|
|
7
7
|
const constants_1 = require("./constants");
|
|
8
8
|
const depositsFetcher_1 = __importDefault(require("./depositsFetcher"));
|
|
9
|
+
const vaultsJob_1 = __importDefault(require("./vaultsJob"));
|
|
9
10
|
exports.platforms = [constants_1.platform];
|
|
10
|
-
exports.jobs = [];
|
|
11
|
+
exports.jobs = [vaultsJob_1.default];
|
|
11
12
|
exports.fetchers = [depositsFetcher_1.default];
|
|
12
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/circuit/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,wEAAgD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/circuit/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,wEAAgD;AAChD,4DAAoC;AAEvB,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,mBAAS,CAAC,CAAC;AAC1B,QAAA,QAAQ,GAAc,CAAC,yBAAe,CAAC,CAAC"}
|
|
@@ -1,52 +1,6 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
type WithdrawRequest = {
|
|
3
|
-
shares: string;
|
|
4
|
-
value: string;
|
|
5
|
-
ts: string;
|
|
6
|
-
};
|
|
7
|
-
type Vault = {
|
|
8
|
-
buffer: Buffer;
|
|
9
|
-
name: number[];
|
|
10
|
-
pubkey: string;
|
|
11
|
-
manager: string;
|
|
12
|
-
tokenAccount: string;
|
|
13
|
-
userStats: string;
|
|
14
|
-
user: string;
|
|
15
|
-
delegate: string;
|
|
16
|
-
liquidationDelegate: string;
|
|
17
|
-
userShares: string;
|
|
18
|
-
totalShares: string;
|
|
19
|
-
lastFeeUpdateTs: string;
|
|
20
|
-
liquidationStartTs: string;
|
|
21
|
-
redeemPeriod: string;
|
|
22
|
-
totalWithdrawRequested: string;
|
|
23
|
-
maxTokens: string;
|
|
24
|
-
managementFee: string;
|
|
25
|
-
initTs: string;
|
|
26
|
-
netDeposits: string;
|
|
27
|
-
managerNetDeposits: string;
|
|
28
|
-
totalDeposits: string;
|
|
29
|
-
totalWithdraws: string;
|
|
30
|
-
managerTotalDeposits: string;
|
|
31
|
-
managerTotalWithdraws: string;
|
|
32
|
-
managerTotalFee: string;
|
|
33
|
-
managerTotalProfitShare: string;
|
|
34
|
-
minDepositAmount: string;
|
|
35
|
-
lastManagerWithdrawRequest: WithdrawRequest;
|
|
36
|
-
sharesBase: number;
|
|
37
|
-
profitShare: number;
|
|
38
|
-
hurdleRate: number;
|
|
39
|
-
spotMarketIndex: number;
|
|
40
|
-
bump: number;
|
|
41
|
-
permissioned: boolean;
|
|
42
|
-
padding: string[];
|
|
43
|
-
};
|
|
44
|
-
export type VaultEnhanced = Vault & {
|
|
45
|
-
publicKey: string;
|
|
46
|
-
};
|
|
47
1
|
export type VaultInfo = {
|
|
2
|
+
pubkey: string;
|
|
48
3
|
mint: string;
|
|
49
4
|
decimals: number;
|
|
50
5
|
name: string;
|
|
51
6
|
};
|
|
52
|
-
export {};
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
13
|
+
const clients_1 = require("../../utils/clients");
|
|
14
|
+
const solana_1 = require("../../utils/solana");
|
|
15
|
+
const constants_1 = require("../drift/constants");
|
|
16
|
+
const constants_2 = require("./constants");
|
|
17
|
+
const filters_1 = require("./filters");
|
|
18
|
+
const structs_1 = require("./structs");
|
|
19
|
+
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
+
const client = (0, clients_1.getClientSolana)();
|
|
21
|
+
const vaults = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.vaultStruct, constants_2.circuitPid, filters_1.vaultFilter);
|
|
22
|
+
for (const vault of vaults) {
|
|
23
|
+
const name = (0, solana_1.u8ArrayToString)(vault.name);
|
|
24
|
+
const spotMarket = yield cache.getItem(vault.spotMarketIndex.toString(), {
|
|
25
|
+
prefix: constants_1.prefixSpotMarkets,
|
|
26
|
+
networkId: portfolio_core_1.NetworkId.solana,
|
|
27
|
+
});
|
|
28
|
+
if (!spotMarket)
|
|
29
|
+
continue;
|
|
30
|
+
const mint = spotMarket.mint.toString();
|
|
31
|
+
const { decimals } = spotMarket;
|
|
32
|
+
const pubkey = vault.pubkey.toString();
|
|
33
|
+
yield cache.setItem(pubkey, { pubkey, name, mint, decimals }, { prefix: constants_2.prefixVaults, networkId: portfolio_core_1.NetworkId.solana });
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
const job = {
|
|
37
|
+
id: `${constants_2.platformId}-vaults`,
|
|
38
|
+
executor,
|
|
39
|
+
label: 'normal',
|
|
40
|
+
};
|
|
41
|
+
exports.default = job;
|
|
42
|
+
//# sourceMappingURL=vaultsJob.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/circuit/vaultsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,iDAAsD;AACtD,+CAA+E;AAC/E,kDAAuD;AACvD,2CAAmE;AACnE,uCAAwC;AACxC,uCAAwC;AAIxC,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAwB,EAC3C,MAAM,EACN,qBAAW,EACX,sBAAU,EACV,qBAAW,CACZ,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,IAAA,wBAAe,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,OAAO,CACpC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,EAChC;YACE,MAAM,EAAE,6BAAiB;YACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CACF,CAAC;QACF,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;QAChC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACvC,MAAM,KAAK,CAAC,OAAO,CACjB,MAAM,EACN,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAChC,EAAE,MAAM,EAAE,wBAAY,EAAE,SAAS,EAAE,0BAAS,CAAC,MAAM,EAAE,CACtD,CAAC;IACJ,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
|
|
@@ -160,7 +160,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
160
160
|
healthRatio,
|
|
161
161
|
value,
|
|
162
162
|
},
|
|
163
|
-
name: (0,
|
|
163
|
+
name: (0, solana_1.u8ArrayToString)(userAccount.name),
|
|
164
164
|
});
|
|
165
165
|
}
|
|
166
166
|
return elements;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deposits.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/deposits.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAUoC;AACpC,gEAAqC;AACrC,6CAA4C;AAG5C,2CAA0E;AAC1E,qCAIkB;AAClB,
|
|
1
|
+
{"version":3,"file":"deposits.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/deposits.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,6 @@ export declare function calculateBorrowRate(bank: SpotMarket): BigNumber;
|
|
|
20
20
|
export declare function calculateDepositRate(bank: SpotMarket): BigNumber;
|
|
21
21
|
export declare function calculateInterestRate(bank: SpotMarket, delta?: BigNumber): BigNumber;
|
|
22
22
|
export declare function isSpotPositionAvailable(position: SpotPosition): boolean;
|
|
23
|
-
export declare function decodeName(bytes: number[]): string;
|
|
24
23
|
export declare function getUserAccountPublicKey(programId: PublicKey, owner: PublicKey, subAccountId: number): PublicKey;
|
|
25
24
|
export declare function getUserMainAccountPublicKey(programId: PublicKey, owner: PublicKey): PublicKey;
|
|
26
25
|
export declare function getUserAccountsPublicKeys(programId: PublicKey, owner: PublicKey, startId: number, endId: number): PublicKey[];
|
|
@@ -3,7 +3,7 @@ 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.getUserInsuranceFundStakeAccountPublicKey = exports.getUserAccountsPublicKeys = exports.getUserMainAccountPublicKey = exports.getUserAccountPublicKey = exports.
|
|
6
|
+
exports.getUserInsuranceFundStakeAccountPublicKey = exports.getUserAccountsPublicKeys = exports.getUserMainAccountPublicKey = exports.getUserAccountPublicKey = exports.isSpotPositionAvailable = exports.calculateInterestRate = exports.calculateDepositRate = exports.calculateBorrowRate = exports.calculateUtilization = exports.getSignedTokenAmount = exports.getTokenAmount = exports.divCeil = exports.CONCENTRATION_PRECISION = exports.PERCENTAGE_PRECISION = exports.PERCENTAGE_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.QUOTE_SPOT_MARKET_INDEX = exports.TEN = exports.ONE = exports.ZERO = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const web3_js_1 = require("@solana/web3.js");
|
|
9
9
|
const bn_js_1 = require("bn.js");
|
|
@@ -111,11 +111,6 @@ function isSpotPositionAvailable(position) {
|
|
|
111
111
|
return position.scaledBalance.eq(exports.ZERO) && position.openOrders === 0;
|
|
112
112
|
}
|
|
113
113
|
exports.isSpotPositionAvailable = isSpotPositionAvailable;
|
|
114
|
-
function decodeName(bytes) {
|
|
115
|
-
const buffer = Buffer.from(bytes);
|
|
116
|
-
return buffer.toString('utf8').trim();
|
|
117
|
-
}
|
|
118
|
-
exports.decodeName = decodeName;
|
|
119
114
|
function getUserAccountPublicKey(programId, owner, subAccountId) {
|
|
120
115
|
return web3_js_1.PublicKey.findProgramAddressSync([
|
|
121
116
|
Buffer.from('user', 'utf8'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/helpers.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,6CAA4C;AAC5C,iCAA2B;AAC3B,qCAAqE;AAExD,QAAA,IAAI,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;AACxB,QAAA,GAAG,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;AACvB,QAAA,GAAG,GAAG,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC;AACxB,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAC5B,QAAA,qCAAqC,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;AACzD,QAAA,iCAAiC,GAAG,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,GAAG,CACpE,6CAAqC,CACtC,CAAC;AACW,QAAA,8BAA8B,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;AAClD,QAAA,0BAA0B,GAAG,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,GAAG,CAC7D,sCAA8B,CAC/B,CAAC;AACW,QAAA,wBAAwB,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;AAC5C,QAAA,oBAAoB,GAAG,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,GAAG,CACvD,gCAAwB,CACzB,CAAC;AACW,QAAA,uBAAuB,GAAG,4BAAoB,CAAC;AAErD,MAAM,OAAO,GAAG,CAAC,CAAY,EAAE,CAAY,EAAa,EAAE;IAC/D,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAE1B,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAE3B,IAAI,SAAS,CAAC,EAAE,CAAC,YAAI,CAAC,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAC,IAAI,CAAC,WAAG,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AATW,QAAA,OAAO,WASlB;AAEF,SAAgB,cAAc,CAC5B,YAAuB,EACvB,UAAsB,EACtB,WAA4B;IAE5B,MAAM,iBAAiB,GAAG,WAAG,CAAC,GAAG,CAAC,IAAI,sBAAS,CAAC,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE3E,IAAI,WAAW,KAAK,wBAAe,CAAC,OAAO,EAAE,CAAC;QAC5C,OAAO,YAAY;aAChB,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC;aAClD,GAAG,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,IAAA,eAAO,EACZ,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAC9D,iBAAiB,CAClB,CAAC;AACJ,CAAC;AAhBD,wCAgBC;AAED,SAAgB,oBAAoB,CAClC,WAAsB,EACtB,WAA4B;IAE5B,IAAI,WAAW,KAAK,wBAAe,CAAC,OAAO,EAAE,CAAC;QAC5C,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;AACrC,CAAC;AARD,oDAQC;AAED,SAAgB,oBAAoB,CAClC,IAAgB,EAChB,KAAK,GAAG,YAAI;IAEZ,IAAI,kBAAkB,GAAG,cAAc,CACrC,IAAI,CAAC,cAAc,EACnB,IAAI,EACJ,wBAAe,CAAC,OAAO,CACxB,CAAC;IACF,IAAI,iBAAiB,GAAG,cAAc,CACpC,IAAI,CAAC,aAAa,EAClB,IAAI,EACJ,wBAAe,CAAC,MAAM,CACvB,CAAC;IAEF,IAAI,KAAK,CAAC,EAAE,CAAC,YAAI,CAAC,EAAE,CAAC;QACnB,kBAAkB,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;SAAM,IAAI,KAAK,CAAC,EAAE,CAAC,YAAI,CAAC,EAAE,CAAC;QAC1B,iBAAiB,GAAG,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,WAAsB,CAAC;IAC3B,IAAI,iBAAiB,CAAC,EAAE,CAAC,YAAI,CAAC,IAAI,kBAAkB,CAAC,EAAE,CAAC,YAAI,CAAC,EAAE,CAAC;QAC9D,WAAW,GAAG,YAAI,CAAC;IACrB,CAAC;SAAM,IAAI,kBAAkB,CAAC,EAAE,CAAC,YAAI,CAAC,EAAE,CAAC;QACvC,WAAW,GAAG,yCAAiC,CAAC;IAClD,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,iBAAiB;aAC5B,YAAY,CAAC,yCAAiC,CAAC;aAC/C,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAjCD,oDAiCC;AAED,SAAgB,mBAAmB,CAAC,IAAgB;IAClD,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,yCAAiC,CAAC,CAAC;AAC5E,CAAC;AAFD,kDAEC;AAED,SAAgB,oBAAoB,CAAC,IAAgB;IACnD,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,UAAU;SAC3B,YAAY,CACX,4BAAoB,CAAC,KAAK,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAC1E;SACA,YAAY,CAAC,WAAW,CAAC;SACzB,GAAG,CAAC,yCAAiC,CAAC;SACtC,GAAG,CAAC,4BAAoB,CAAC,CAAC;IAC7B,OAAO,WAAW,CAAC;AACrB,CAAC;AAXD,oDAWC;AAED,SAAgB,qBAAqB,CACnC,IAAgB,EAChB,KAAK,GAAG,YAAI;IAEZ,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,IAAI,YAAuB,CAAC;IAC5B,IAAI,WAAW,CAAC,EAAE,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC;QAC3D,MAAM,kBAAkB,GAAG,WAAW,CAAC,KAAK,CAC1C,IAAI,sBAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CACvC,CAAC;QACF,MAAM,eAAe,GAAG,IAAI,sBAAS,CACnC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAC5C;aACE,YAAY,CAAC,yCAAiC,CAAC;aAC/C,GAAG,CACF,yCAAiC,CAAC,KAAK,CACrC,IAAI,sBAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CACvC,CACF,CAAC;QAEJ,YAAY,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CACvD,kBAAkB;aACf,YAAY,CAAC,eAAe,CAAC;aAC7B,GAAG,CAAC,yCAAiC,CAAC,CAC1C,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,eAAe,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC;aAC1D,YAAY,CAAC,yCAAiC,CAAC;aAC/C,GAAG,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAE/C,YAAY,GAAG,WAAW;aACvB,YAAY,CAAC,eAAe,CAAC;aAC7B,GAAG,CAAC,yCAAiC,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AApCD,sDAoCC;AAED,SAAgB,uBAAuB,CAAC,QAAsB;IAC5D,OAAO,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,YAAI,CAAC,IAAI,QAAQ,CAAC,UAAU,KAAK,CAAC,CAAC;AACtE,CAAC;AAFD,0DAEC;AAED,SAAgB,uBAAuB,CACrC,SAAoB,EACpB,KAAgB,EAChB,YAAoB;IAEpB,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;QAC3B,KAAK,CAAC,QAAQ,EAAE;QAChB,IAAI,UAAE,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;KAClD,EACD,SAAS,CACV,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AAbD,0DAaC;AAED,SAAgB,2BAA2B,CACzC,SAAoB,EACpB,KAAgB;IAEhB,OAAO,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AACtD,CAAC;AALD,kEAKC;AAED,SAAgB,yBAAyB,CACvC,SAAoB,EACpB,KAAgB,EAChB,OAAe,EACf,KAAa;IAEb,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,KAAK,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CACP,mBAAS,CAAC,sBAAsB,CAC9B;YACE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;YAC3B,KAAK,CAAC,QAAQ,EAAE;YAChB,IAAI,UAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;SACvC,EACD,SAAS,CACV,CAAC,CAAC,CAAC,CACL,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AApBD,8DAoBC;AAED,SAAgB,yCAAyC,CACvD,SAAoB,EACpB,KAAgB,EAChB,WAAmB;IAEnB,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;QAC3C,KAAK,CAAC,QAAQ,EAAE;QAChB,IAAI,UAAE,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;KACjD,EACD,SAAS,CACV,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AAbD,8FAaC"}
|
|
@@ -19,7 +19,6 @@ const getLpTokenSource_1 = __importDefault(require("../../utils/misc/getLpTokenS
|
|
|
19
19
|
const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
|
|
20
20
|
const constants_1 = require("./constants");
|
|
21
21
|
const structs_1 = require("./structs");
|
|
22
|
-
const helpers_1 = require("../mango/helpers");
|
|
23
22
|
const fetchTokenSupplyAndDecimals_1 = require("../../utils/solana/fetchTokenSupplyAndDecimals");
|
|
24
23
|
const solana_1 = require("../../utils/solana");
|
|
25
24
|
const constants_2 = require("../jupiter/constants");
|
|
@@ -97,7 +96,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
97
96
|
});
|
|
98
97
|
}
|
|
99
98
|
// eslint-disable-next-line prefer-const
|
|
100
|
-
let source = (0, getLpTokenSource_1.default)(portfolio_core_1.NetworkId.solana, constants_1.poolsPkeys[i].toString(), constants_1.platformId, (0,
|
|
99
|
+
let source = (0, getLpTokenSource_1.default)(portfolio_core_1.NetworkId.solana, constants_1.poolsPkeys[i].toString(), constants_1.platformId, (0, solana_1.u8ArrayToString)(pool.name), { address: mint, decimals, supply }, assets);
|
|
101
100
|
source.price = pool.aumUsd
|
|
102
101
|
.dividedBy(Math.pow(10, decimals))
|
|
103
102
|
.dividedBy(supply)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poolJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/poolJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAmE;AACnE,6CAA4C;AAG5C,iDAAsD;AACtD,yFAAiE;AACjE,gGAA6F;AAC7F,2CAAqD;AACrD,uCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"poolJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/poolJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,6 @@ const struct_1 = require("./struct");
|
|
|
20
20
|
const filters_1 = require("./filters");
|
|
21
21
|
const solana_1 = require("../../utils/solana");
|
|
22
22
|
const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
|
|
23
|
-
const helpers_1 = require("./helpers");
|
|
24
23
|
const runInBatch_1 = __importDefault(require("../../utils/misc/runInBatch"));
|
|
25
24
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
25
|
const client = (0, clients_1.getClientSolana)();
|
|
@@ -137,7 +136,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
137
136
|
rewardAssets,
|
|
138
137
|
value,
|
|
139
138
|
},
|
|
140
|
-
name: (0,
|
|
139
|
+
name: (0, solana_1.u8ArrayToString)(userAccount.name),
|
|
141
140
|
});
|
|
142
141
|
}
|
|
143
142
|
return elements;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mango/collateralFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DASoC;AACpC,gEAAqC;AAGrC,2CAAkE;AAClE,iDAAsD;AACtD,qCAA8C;AAC9C,uCAA2C;AAC3C,+
|
|
1
|
+
{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mango/collateralFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import BigNumber from 'bignumber.js';
|
|
2
2
|
import { Bank } from './struct';
|
|
3
|
-
export declare function decodeName(bytes: number[]): string;
|
|
4
3
|
export declare function getBorrowRateWithoutUpkeepRate(bank: Bank): BigNumber;
|
|
5
4
|
export declare function zeroI80F48(): BigNumber;
|
|
6
5
|
/**
|
|
@@ -3,16 +3,10 @@ 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.getDepositRate = exports.getBorrowRate = exports.zeroI80F48 = exports.getBorrowRateWithoutUpkeepRate =
|
|
6
|
+
exports.getDepositRate = exports.getBorrowRate = exports.zeroI80F48 = exports.getBorrowRateWithoutUpkeepRate = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const FRACTIONS = 48;
|
|
9
9
|
const MULTIPLIER_NUMBER = Math.pow(2, FRACTIONS);
|
|
10
|
-
function decodeName(bytes) {
|
|
11
|
-
return new TextDecoder('utf-8')
|
|
12
|
-
.decode(new Uint8Array(bytes))
|
|
13
|
-
.split('\x00')[0];
|
|
14
|
-
}
|
|
15
|
-
exports.decodeName = decodeName;
|
|
16
10
|
function getBorrowRateWithoutUpkeepRate(bank) {
|
|
17
11
|
const totalBorrows = bank.indexedBorrows.multipliedBy(bank.borrowIndex);
|
|
18
12
|
const totalDeposits = bank.indexedDeposits.multipliedBy(bank.depositIndex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mango/helpers.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAGrC,MAAM,SAAS,GAAG,EAAE,CAAC;AACrB,MAAM,iBAAiB,GAAG,SAAA,CAAC,EAAI,SAAS,CAAA,CAAC;AAEzC,SAAgB,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mango/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
|
18
18
|
const constants_1 = require("./constants");
|
|
19
19
|
const clients_1 = require("../../utils/clients");
|
|
20
20
|
const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
|
|
21
|
+
const amountFactor = new bignumber_js_1.default(Math.pow(10, 36));
|
|
21
22
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
23
|
const client = (0, clients_1.getClientSui)();
|
|
23
24
|
const borrowedAssets = [];
|
|
@@ -31,34 +32,29 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
31
32
|
});
|
|
32
33
|
if (!reservesData)
|
|
33
34
|
return [];
|
|
34
|
-
const
|
|
35
|
-
for (const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
for (const pool of constants_1.poolsInfos) {
|
|
39
|
-
const reserve = reserveById.get(pool.reserveData);
|
|
40
|
-
if (!reserve)
|
|
41
|
-
continue;
|
|
42
|
-
const reserveData = reserve.value.fields;
|
|
43
|
-
const borrowBalance = yield client.getDynamicFieldObject({
|
|
44
|
-
parentId: pool.borrowBalanceParentId,
|
|
35
|
+
const tokenPrices = yield cache.getTokenPricesAsMap(reservesData.map((r) => r.value.fields.coin_type), portfolio_core_1.NetworkId.sui);
|
|
36
|
+
for (const rData of reservesData) {
|
|
37
|
+
const borrowBalancePromise = client.getDynamicFieldObject({
|
|
38
|
+
parentId: rData.value.fields.borrow_balance.fields.user_state.fields.id.id,
|
|
45
39
|
name: { type: 'address', value: owner },
|
|
46
40
|
});
|
|
47
|
-
const
|
|
48
|
-
parentId:
|
|
41
|
+
const supplyBalancePromise = client.getDynamicFieldObject({
|
|
42
|
+
parentId: rData.value.fields.supply_balance.fields.user_state.fields.id.id,
|
|
49
43
|
name: { type: 'address', value: owner },
|
|
50
44
|
});
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
45
|
+
const [borrowBalance, supplyBalance] = yield Promise.all([
|
|
46
|
+
borrowBalancePromise,
|
|
47
|
+
supplyBalancePromise,
|
|
48
|
+
]);
|
|
49
|
+
const tokenPrice = tokenPrices.get((0, portfolio_core_1.formatTokenAddress)(rData.value.fields.coin_type, portfolio_core_1.NetworkId.sui));
|
|
54
50
|
if (!borrowBalance.error && borrowBalance.data) {
|
|
55
51
|
const borrowInfo = (0, sui_js_1.getObjectFields)(borrowBalance.data);
|
|
56
52
|
if (borrowInfo.value) {
|
|
57
|
-
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(
|
|
58
|
-
.
|
|
59
|
-
.
|
|
53
|
+
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(rData.value.fields.coin_type, new bignumber_js_1.default(borrowInfo.value)
|
|
54
|
+
.times(rData.value.fields.current_borrow_index)
|
|
55
|
+
.dividedBy(amountFactor)
|
|
60
56
|
.toNumber(), portfolio_core_1.NetworkId.sui, tokenPrice));
|
|
61
|
-
const apy = new bignumber_js_1.default(
|
|
57
|
+
const apy = new bignumber_js_1.default(rData.value.fields.current_borrow_rate)
|
|
62
58
|
.dividedBy(Math.pow(10, constants_1.rateFactor))
|
|
63
59
|
.toNumber();
|
|
64
60
|
borrowedYields.push([
|
|
@@ -72,11 +68,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
72
68
|
if (!supplyBalance.error && supplyBalance.data) {
|
|
73
69
|
const supplyInfo = (0, sui_js_1.getObjectFields)(supplyBalance.data);
|
|
74
70
|
if (supplyInfo.value) {
|
|
75
|
-
suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(
|
|
76
|
-
.
|
|
77
|
-
.
|
|
71
|
+
suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(rData.value.fields.coin_type, new bignumber_js_1.default(supplyInfo.value)
|
|
72
|
+
.times(rData.value.fields.current_supply_index)
|
|
73
|
+
.dividedBy(amountFactor)
|
|
78
74
|
.toNumber(), portfolio_core_1.NetworkId.sui, tokenPrice));
|
|
79
|
-
const apy = new bignumber_js_1.default(
|
|
75
|
+
const apy = new bignumber_js_1.default(rData.value.fields.current_supply_rate)
|
|
80
76
|
.dividedBy(Math.pow(10, constants_1.rateFactor))
|
|
81
77
|
.toNumber();
|
|
82
78
|
suppliedYields.push([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/collateralFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/collateralFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ export declare const naviPlatform: Platform;
|
|
|
4
4
|
export declare const reservesPrefix = "navi";
|
|
5
5
|
export declare const reservesKey = "reserves";
|
|
6
6
|
export declare const reserveParentId = "0xe6d4c6610b86ce7735ea754596d71d72d10c7980b5052fc3c8cdf8d09fea9b4b";
|
|
7
|
-
export declare const indexFactor = 18;
|
|
8
7
|
export declare const rateFactor = 27;
|
|
9
8
|
export declare const poolsInfos: {
|
|
10
9
|
id: number;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.poolsInfos = exports.rateFactor = exports.
|
|
3
|
+
exports.poolsInfos = exports.rateFactor = exports.reserveParentId = exports.reservesKey = exports.reservesPrefix = exports.naviPlatform = exports.platformId = void 0;
|
|
4
4
|
exports.platformId = 'navi';
|
|
5
5
|
exports.naviPlatform = {
|
|
6
6
|
id: exports.platformId,
|
|
@@ -12,7 +12,6 @@ exports.naviPlatform = {
|
|
|
12
12
|
exports.reservesPrefix = exports.platformId;
|
|
13
13
|
exports.reservesKey = 'reserves';
|
|
14
14
|
exports.reserveParentId = '0xe6d4c6610b86ce7735ea754596d71d72d10c7980b5052fc3c8cdf8d09fea9b4b';
|
|
15
|
-
exports.indexFactor = 18;
|
|
16
15
|
exports.rateFactor = 27;
|
|
17
16
|
exports.poolsInfos = [
|
|
18
17
|
{
|
|
@@ -51,5 +50,14 @@ exports.poolsInfos = [
|
|
|
51
50
|
borrowBalanceParentId: '0x7568d06a1b6ffc416a36c82791e3daf0e621cf19d4a2724fc6f74842661b6323',
|
|
52
51
|
supplyBalanceParentId: '0xa668905b1ad445a3159b4d29b1181c4a62d864861b463dd9106cc0d97ffe8f7f',
|
|
53
52
|
},
|
|
53
|
+
{
|
|
54
|
+
id: 4,
|
|
55
|
+
name: 'cetus',
|
|
56
|
+
type: '0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b::cetus::CETUS',
|
|
57
|
+
pool: '0x71b9f6e822c48ce827bceadce82201d6a7559f7b0350ed1daa1dc2ba3ac41b56',
|
|
58
|
+
reserveData: '0x66a807c06212537fe46aa6719a00e4fa1e85a932d0b53ce7c4b1041983645133',
|
|
59
|
+
borrowBalanceParentId: '0x4c3da45ffff6432b4592a39cdb3ce12f4a28034cbcb804bb071facc81fdd923d',
|
|
60
|
+
supplyBalanceParentId: '0x6adc72faf2a9a15a583c9fb04f457c6a5f0b456bc9b4832413a131dfd4faddae',
|
|
61
|
+
},
|
|
54
62
|
];
|
|
55
63
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,YAAY,GAAa;IACpC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,qCAAqC,kBAAU,MAAM;IAC5D,WAAW,EAAE,eAAe;IAC5B,OAAO,EAAE,8BAA8B;CACxC,CAAC;AAEW,QAAA,cAAc,GAAG,kBAAU,CAAC;AAC5B,QAAA,WAAW,GAAG,UAAU,CAAC;AAEzB,QAAA,eAAe,GAC1B,oEAAoE,CAAC;AAE1D,QAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,YAAY,GAAa;IACpC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,qCAAqC,kBAAU,MAAM;IAC5D,WAAW,EAAE,eAAe;IAC5B,OAAO,EAAE,8BAA8B;CACxC,CAAC;AAEW,QAAA,cAAc,GAAG,kBAAU,CAAC;AAC5B,QAAA,WAAW,GAAG,UAAU,CAAC;AAEzB,QAAA,eAAe,GAC1B,oEAAoE,CAAC;AAE1D,QAAA,UAAU,GAAG,EAAE,CAAC;AAEhB,QAAA,UAAU,GAAG;IACxB;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,8EAA8E;QACpF,WAAW,EACT,oEAAoE;QACtE,IAAI,EAAE,oEAAoE;QAC1E,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gFAAgF;QACtF,WAAW,EACT,oEAAoE;QACtE,IAAI,EAAE,oEAAoE;QAC1E,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gFAAgF;QACtF,WAAW,EACT,oEAAoE;QACtE,IAAI,EAAE,EAAE;QACR,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gFAAgF;QACtF,IAAI,EAAE,oEAAoE;QAC1E,WAAW,EACT,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,kFAAkF;QACxF,IAAI,EAAE,oEAAoE;QAC1E,WAAW,EACT,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;CACF,CAAC"}
|
|
@@ -8,71 +8,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
const sui_js_1 = require("@mysten/sui.js");
|
|
16
13
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
17
|
-
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
18
14
|
const clients_1 = require("../../utils/clients");
|
|
19
15
|
const constants_1 = require("./constants");
|
|
20
16
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
17
|
const client = (0, clients_1.getClientSui)();
|
|
22
18
|
const reservesDatas = [];
|
|
23
|
-
|
|
24
|
-
|
|
19
|
+
let error;
|
|
20
|
+
let index = 0;
|
|
21
|
+
do {
|
|
22
|
+
const reserve = yield client.getDynamicFieldObject({
|
|
25
23
|
parentId: constants_1.reserveParentId,
|
|
26
|
-
name: { type: 'u8', value:
|
|
24
|
+
name: { type: 'u8', value: index },
|
|
27
25
|
});
|
|
28
|
-
if (
|
|
29
|
-
const
|
|
30
|
-
if (
|
|
31
|
-
reservesDatas.push(
|
|
26
|
+
if (reserve.data) {
|
|
27
|
+
const reserveData = (0, sui_js_1.getObjectFields)(reserve.data);
|
|
28
|
+
if (reserveData.value)
|
|
29
|
+
reservesDatas.push(reserveData);
|
|
32
30
|
}
|
|
33
|
-
|
|
31
|
+
index += 1;
|
|
32
|
+
error = reserve.error;
|
|
33
|
+
} while (!error || index > 25);
|
|
34
34
|
yield cache.setItem(constants_1.reservesKey, reservesDatas, {
|
|
35
35
|
prefix: constants_1.reservesPrefix,
|
|
36
36
|
networkId: portfolio_core_1.NetworkId.sui,
|
|
37
37
|
});
|
|
38
|
-
for (const reserveData of reservesDatas) {
|
|
39
|
-
const reserve = reserveData.value.fields;
|
|
40
|
-
const tokenAddress = reserve.coin_type;
|
|
41
|
-
const poolName = 'Main Pool';
|
|
42
|
-
const depositedAmount = new bignumber_js_1.default(reserve.supply_balance.fields.total_supply)
|
|
43
|
-
.dividedBy(reserve.current_supply_index)
|
|
44
|
-
.multipliedBy(Math.pow(10, constants_1.indexFactor))
|
|
45
|
-
.toNumber();
|
|
46
|
-
const borrowedAmount = new bignumber_js_1.default(reserve.borrow_balance.fields.total_supply)
|
|
47
|
-
.dividedBy(reserve.current_borrow_index)
|
|
48
|
-
.multipliedBy(Math.pow(10, constants_1.indexFactor))
|
|
49
|
-
.toNumber();
|
|
50
|
-
const borrowingApy = new bignumber_js_1.default(reserve.current_borrow_rate)
|
|
51
|
-
.dividedBy(Math.pow(10, constants_1.rateFactor))
|
|
52
|
-
.toNumber();
|
|
53
|
-
const lendingApy = new bignumber_js_1.default(reserve.current_supply_rate)
|
|
54
|
-
.dividedBy(Math.pow(10, constants_1.rateFactor))
|
|
55
|
-
.toNumber();
|
|
56
|
-
const rate = {
|
|
57
|
-
tokenAddress,
|
|
58
|
-
borrowYield: {
|
|
59
|
-
apy: borrowingApy,
|
|
60
|
-
apr: (0, portfolio_core_1.apyToApr)(borrowingApy),
|
|
61
|
-
},
|
|
62
|
-
borrowedAmount,
|
|
63
|
-
depositYield: {
|
|
64
|
-
apy: lendingApy,
|
|
65
|
-
apr: (0, portfolio_core_1.apyToApr)(lendingApy),
|
|
66
|
-
},
|
|
67
|
-
depositedAmount,
|
|
68
|
-
platformId: constants_1.platformId,
|
|
69
|
-
poolName,
|
|
70
|
-
};
|
|
71
|
-
yield cache.setItem(`${reserveData.id.id}-${tokenAddress}`, rate, {
|
|
72
|
-
prefix: portfolio_core_1.borrowLendRatesPrefix,
|
|
73
|
-
networkId: portfolio_core_1.NetworkId.solana,
|
|
74
|
-
});
|
|
75
|
-
}
|
|
76
38
|
});
|
|
77
39
|
const job = {
|
|
78
40
|
id: `${constants_1.platformId}-reserves`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/reservesJob.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/reservesJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2CAAiD;AACjD,+DAAuD;AAGvD,iDAAmD;AACnD,2CAKqB;AAGrB,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,aAAa,GAAkB,EAAE,CAAC;IAExC,IAAI,KAAK,CAAC;IACV,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,GAAG,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC;YACjD,QAAQ,EAAE,2BAAe;YACzB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;SACnC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,WAAW,GAAG,IAAA,wBAAe,EAAC,OAAO,CAAC,IAAI,CAAgB,CAAC;YACjE,IAAI,WAAW,CAAC,KAAK;gBAAE,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzD,CAAC;QACD,KAAK,IAAI,CAAC,CAAC;QACX,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IACxB,CAAC,QAAQ,CAAC,KAAK,IAAI,KAAK,GAAG,EAAE,EAAE;IAE/B,MAAM,KAAK,CAAC,OAAO,CAAC,uBAAW,EAAE,aAAa,EAAE;QAC9C,MAAM,EAAE,0BAAc;QACtB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
|
|
@@ -1,43 +1,3 @@
|
|
|
1
|
-
export type Balance = {
|
|
2
|
-
id: {
|
|
3
|
-
id: string;
|
|
4
|
-
};
|
|
5
|
-
name: string;
|
|
6
|
-
value: string;
|
|
7
|
-
};
|
|
8
|
-
export type ReserveBalance = {
|
|
9
|
-
type: string;
|
|
10
|
-
fields: {
|
|
11
|
-
total_supply: string;
|
|
12
|
-
user_state: {
|
|
13
|
-
type: string;
|
|
14
|
-
fields: {
|
|
15
|
-
id: {
|
|
16
|
-
id: string;
|
|
17
|
-
};
|
|
18
|
-
size: string;
|
|
19
|
-
};
|
|
20
|
-
};
|
|
21
|
-
};
|
|
22
|
-
};
|
|
23
|
-
export type BorrowRateFactors = {
|
|
24
|
-
type: string;
|
|
25
|
-
fields: {
|
|
26
|
-
base_rate: string;
|
|
27
|
-
jump_rate_multiplier: string;
|
|
28
|
-
multiplier: string;
|
|
29
|
-
optimal_utilization: string;
|
|
30
|
-
reserve_factor: string;
|
|
31
|
-
};
|
|
32
|
-
};
|
|
33
|
-
export type LiquidationFactors = {
|
|
34
|
-
type: string;
|
|
35
|
-
fields: {
|
|
36
|
-
bonus: string;
|
|
37
|
-
ratio: string;
|
|
38
|
-
threshold: string;
|
|
39
|
-
};
|
|
40
|
-
};
|
|
41
1
|
export type ReserveData = {
|
|
42
2
|
id: {
|
|
43
3
|
id: string;
|
|
@@ -46,9 +6,18 @@ export type ReserveData = {
|
|
|
46
6
|
value: {
|
|
47
7
|
type: string;
|
|
48
8
|
fields: {
|
|
49
|
-
borrow_balance:
|
|
9
|
+
borrow_balance: Balance;
|
|
50
10
|
borrow_cap_ceiling: string;
|
|
51
|
-
borrow_rate_factors:
|
|
11
|
+
borrow_rate_factors: {
|
|
12
|
+
type: string;
|
|
13
|
+
fields: {
|
|
14
|
+
base_rate: string;
|
|
15
|
+
jump_rate_multiplier: string;
|
|
16
|
+
multiplier: string;
|
|
17
|
+
optimal_utilization: string;
|
|
18
|
+
reserve_factor: string;
|
|
19
|
+
};
|
|
20
|
+
};
|
|
52
21
|
coin_type: string;
|
|
53
22
|
current_borrow_index: string;
|
|
54
23
|
current_borrow_rate: string;
|
|
@@ -57,16 +26,45 @@ export type ReserveData = {
|
|
|
57
26
|
id: number;
|
|
58
27
|
is_isolated: boolean;
|
|
59
28
|
last_update_timestamp: string;
|
|
60
|
-
liquidation_factors:
|
|
29
|
+
liquidation_factors: {
|
|
30
|
+
type: string;
|
|
31
|
+
fields: {
|
|
32
|
+
bonus: string;
|
|
33
|
+
ratio: string;
|
|
34
|
+
threshold: string;
|
|
35
|
+
};
|
|
36
|
+
};
|
|
61
37
|
ltv: string;
|
|
62
38
|
oracle_id: number;
|
|
63
39
|
reserve_field_a: string;
|
|
64
40
|
reserve_field_b: string;
|
|
65
41
|
reserve_field_c: string;
|
|
66
|
-
supply_balance:
|
|
42
|
+
supply_balance: Balance;
|
|
67
43
|
supply_cap_ceiling: string;
|
|
68
44
|
treasury_balance: string;
|
|
69
45
|
treasury_factor: string;
|
|
70
46
|
};
|
|
71
47
|
};
|
|
72
48
|
};
|
|
49
|
+
export type Balance = {
|
|
50
|
+
type: string;
|
|
51
|
+
fields: {
|
|
52
|
+
total_supply: string;
|
|
53
|
+
user_state: {
|
|
54
|
+
type: string;
|
|
55
|
+
fields: {
|
|
56
|
+
id: {
|
|
57
|
+
id: string;
|
|
58
|
+
};
|
|
59
|
+
size: string;
|
|
60
|
+
};
|
|
61
|
+
};
|
|
62
|
+
};
|
|
63
|
+
};
|
|
64
|
+
export type BalanceData = {
|
|
65
|
+
id: {
|
|
66
|
+
id: string;
|
|
67
|
+
};
|
|
68
|
+
name: string;
|
|
69
|
+
value: string;
|
|
70
|
+
};
|
|
@@ -5,5 +5,6 @@ export * from './getParsedProgramAccounts';
|
|
|
5
5
|
export * from './getParsedMultipleAccountsInfo';
|
|
6
6
|
export * from './getProgramAccountsSafe';
|
|
7
7
|
export * from './getTokenAccountsByOwner';
|
|
8
|
+
export * from './u8ArrayToString';
|
|
8
9
|
export * from './structs';
|
|
9
10
|
export * from './types';
|
|
@@ -21,6 +21,7 @@ __exportStar(require("./getParsedProgramAccounts"), exports);
|
|
|
21
21
|
__exportStar(require("./getParsedMultipleAccountsInfo"), exports);
|
|
22
22
|
__exportStar(require("./getProgramAccountsSafe"), exports);
|
|
23
23
|
__exportStar(require("./getTokenAccountsByOwner"), exports);
|
|
24
|
+
__exportStar(require("./u8ArrayToString"), exports);
|
|
24
25
|
__exportStar(require("./structs"), exports);
|
|
25
26
|
__exportStar(require("./types"), exports);
|
|
26
27
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,kDAAgC;AAChC,8CAA4B;AAC5B,6DAA2C;AAC3C,kEAAgD;AAChD,2DAAyC;AACzC,4DAA0C;AAC1C,4CAA0B;AAC1B,0CAAwB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,kDAAgC;AAChC,8CAA4B;AAC5B,6DAA2C;AAC3C,kEAAgD;AAChD,2DAAyC;AACzC,4DAA0C;AAC1C,oDAAkC;AAClC,4CAA0B;AAC1B,0CAAwB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function u8ArrayToString(bytes: number[]): string;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.u8ArrayToString = void 0;
|
|
4
|
+
function u8ArrayToString(bytes) {
|
|
5
|
+
return new TextDecoder('utf-8')
|
|
6
|
+
.decode(new Uint8Array(bytes))
|
|
7
|
+
.split('\x00')[0]
|
|
8
|
+
.trim();
|
|
9
|
+
}
|
|
10
|
+
exports.u8ArrayToString = u8ArrayToString;
|
|
11
|
+
//# sourceMappingURL=u8ArrayToString.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"u8ArrayToString.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/u8ArrayToString.ts"],"names":[],"mappings":";;;AAAA,SAAgB,eAAe,CAAC,KAAe;IAC7C,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC;SAC5B,MAAM,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;SAC7B,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SAChB,IAAI,EAAE,CAAC;AACZ,CAAC;AALD,0CAKC"}
|