@sonarwatch/portfolio-plugins 0.11.98 → 0.11.99
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/plugins/01/depostisFetcher.js +2 -1
- package/src/plugins/01/depostisFetcher.js.map +1 -1
- package/src/plugins/aave/helpers.js +2 -1
- package/src/plugins/aave/helpers.js.map +1 -1
- package/src/plugins/aptin/depositsFetcher.js +2 -1
- package/src/plugins/aptin/depositsFetcher.js.map +1 -1
- package/src/plugins/aries/depositsFetcher.js +2 -1
- package/src/plugins/aries/depositsFetcher.js.map +1 -1
- package/src/plugins/aurory/helpers.d.ts +1 -1
- package/src/plugins/aurory/helpers.js +1 -12
- package/src/plugins/aurory/helpers.js.map +1 -1
- package/src/plugins/aurory/stakingFetcher.js +1 -1
- package/src/plugins/aurory/stakingFetcher.js.map +1 -1
- package/src/plugins/bucket/collateralFetcher.js +2 -1
- package/src/plugins/bucket/collateralFetcher.js.map +1 -1
- package/src/plugins/compound/getPositionsV2Fetcher.js +2 -1
- package/src/plugins/compound/getPositionsV2Fetcher.js.map +1 -1
- package/src/plugins/compound/getPositionsV3Fetcher.js +2 -1
- package/src/plugins/compound/getPositionsV3Fetcher.js.map +1 -1
- package/src/plugins/drift/deposits.js +2 -1
- package/src/plugins/drift/deposits.js.map +1 -1
- package/src/plugins/flash/perpetualFetcher.js +2 -1
- package/src/plugins/flash/perpetualFetcher.js.map +1 -1
- package/src/plugins/flowmatic/stakingFetcher.js +2 -0
- package/src/plugins/flowmatic/stakingFetcher.js.map +1 -1
- package/src/plugins/genesysgo/stakingFetcher.js +2 -0
- package/src/plugins/genesysgo/stakingFetcher.js.map +1 -1
- package/src/plugins/jupiter/perpetualFetcher.js +2 -1
- package/src/plugins/jupiter/perpetualFetcher.js.map +1 -1
- package/src/plugins/kamino/lendsFetcher.js +6 -3
- package/src/plugins/kamino/lendsFetcher.js.map +1 -1
- package/src/plugins/maker/vaultsFetcher.js +2 -1
- package/src/plugins/maker/vaultsFetcher.js.map +1 -1
- package/src/plugins/mango/boostFetcher.js +2 -1
- package/src/plugins/mango/boostFetcher.js.map +1 -1
- package/src/plugins/mango/collateralFetcher.js +2 -1
- package/src/plugins/mango/collateralFetcher.js.map +1 -1
- package/src/plugins/mango/redeemFetcher.js +2 -1
- package/src/plugins/mango/redeemFetcher.js.map +1 -1
- package/src/plugins/maple/ethereumFetcher.js +2 -1
- package/src/plugins/maple/ethereumFetcher.js.map +1 -1
- package/src/plugins/marginfi/fetcherExecutor.js +2 -1
- package/src/plugins/marginfi/fetcherExecutor.js.map +1 -1
- package/src/plugins/morpho/aaveV3CollateralFetcher.js +2 -1
- package/src/plugins/morpho/aaveV3CollateralFetcher.js.map +1 -1
- package/src/plugins/navi/collateralFetcher.js +2 -1
- package/src/plugins/navi/collateralFetcher.js.map +1 -1
- package/src/plugins/port/obligationsFetcher.js +2 -1
- package/src/plugins/port/obligationsFetcher.js.map +1 -1
- package/src/plugins/scallop/lendingsFetcher.js +2 -1
- package/src/plugins/scallop/lendingsFetcher.js.map +1 -1
- package/src/plugins/scallop/obligationsFetcher.js +2 -1
- package/src/plugins/scallop/obligationsFetcher.js.map +1 -1
- package/src/plugins/solend/obligationsFetcher.js +2 -1
- package/src/plugins/solend/obligationsFetcher.js.map +1 -1
- package/src/plugins/thala/vaultsFetcher.js +2 -1
- package/src/plugins/thala/vaultsFetcher.js.map +1 -1
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.99](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.98...plugins-0.11.99) (2024-03-07)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
5
9
|
## [0.11.98](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.97...plugins-0.11.98) (2024-03-06)
|
|
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.99",
|
|
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.102"
|
|
45
45
|
},
|
|
46
46
|
"main": "./src/index.js",
|
|
47
47
|
"types": "./src/index.d.ts"
|
|
@@ -53,7 +53,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
53
53
|
const elements = [];
|
|
54
54
|
if (suppliedAssets.length === 0)
|
|
55
55
|
return [];
|
|
56
|
-
const { borrowedValue, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
56
|
+
const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
57
57
|
elements.push();
|
|
58
58
|
return [
|
|
59
59
|
{
|
|
@@ -71,6 +71,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
71
71
|
suppliedYields,
|
|
72
72
|
collateralRatio: null,
|
|
73
73
|
rewardAssets,
|
|
74
|
+
rewardValue,
|
|
74
75
|
healthRatio,
|
|
75
76
|
value,
|
|
76
77
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depostisFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/01/depostisFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,6CAA4C;AAG5C,2CAAgD;AAChD,uCAAmC;AACnC,kFAA+E;AAC/E,qCAAwC;AACxC,iDAAsD;AACtD,iDAA+D;AAC/D,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,GAAG,GAAG,IAAA,gBAAM,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EAAC,MAAM,EAAE,qBAAY,EAAE,GAAG,CAAC,CAAC;IAEtE,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAExB,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAA,kCAAwB,EAAC,UAAU,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAAE,SAAS;QAE/C,MAAM,IAAI,GAAG,iBAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,6CAA6C;YAAE,SAAS;QAErE,MAAM,MAAM,GACV,IAAI;YACJ,CAAC,6CAA6C;gBAC5C,6CAA6C,CAAC;YAC9C,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;YAC3B,CAAC,CAAC,SAAS,CAAC;QAEhB,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,SAAS;QAE1C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;QAErE,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,IAAI,EACJ,MAAM,CAAC,QAAQ,EAAE,EACjB,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE3C,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"depostisFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/01/depostisFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -237,9 +237,10 @@ function getElementLendingData(networkId, userSummary) {
|
|
|
237
237
|
}
|
|
238
238
|
}
|
|
239
239
|
const rewardAssets = getRewardAssets(networkId, calculatedUserIncentives);
|
|
240
|
-
const { borrowedValue, suppliedValue, healthRatio, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs);
|
|
240
|
+
const { borrowedValue, suppliedValue, healthRatio, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs);
|
|
241
241
|
const elementData = {
|
|
242
242
|
rewardAssets,
|
|
243
|
+
rewardValue,
|
|
243
244
|
borrowedAssets,
|
|
244
245
|
borrowedValue,
|
|
245
246
|
borrowedYields,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,7 +83,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
83
83
|
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(coinType, amount, portfolio_core_1.NetworkId.aptos, tokenPrices[address] || undefined));
|
|
84
84
|
borrowedYields.push([]);
|
|
85
85
|
}
|
|
86
|
-
const { borrowedValue, healthRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs);
|
|
86
|
+
const { borrowedValue, healthRatio, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs);
|
|
87
87
|
const element = {
|
|
88
88
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
89
89
|
networkId: portfolio_core_1.NetworkId.aptos,
|
|
@@ -100,6 +100,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
100
100
|
collateralRatio: null,
|
|
101
101
|
healthRatio,
|
|
102
102
|
rewardAssets,
|
|
103
|
+
rewardValue,
|
|
103
104
|
value,
|
|
104
105
|
},
|
|
105
106
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aptin/depositsFetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aptin/depositsFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
84
84
|
}
|
|
85
85
|
if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
|
|
86
86
|
continue;
|
|
87
|
-
const { borrowedValue, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
87
|
+
const { borrowedValue, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
88
88
|
elements.push({
|
|
89
89
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
90
90
|
networkId: portfolio_core_1.NetworkId.aptos,
|
|
@@ -102,6 +102,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
102
102
|
collateralRatio: null,
|
|
103
103
|
healthRatio: 1 - new bignumber_js_1.default(profile.riskFactor).toNumber(),
|
|
104
104
|
rewardAssets,
|
|
105
|
+
rewardValue,
|
|
105
106
|
value,
|
|
106
107
|
},
|
|
107
108
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aries/depositsFetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aries/depositsFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { PublicKey } from '@solana/web3.js';
|
|
2
|
-
export declare function getStakingAccountAddress(owner: string):
|
|
2
|
+
export declare function getStakingAccountAddress(owner: string): PublicKey;
|
|
@@ -1,21 +1,10 @@
|
|
|
1
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
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.getStakingAccountAddress = void 0;
|
|
13
4
|
const web3_js_1 = require("@solana/web3.js");
|
|
14
5
|
const constants_1 = require("./constants");
|
|
15
6
|
function getStakingAccountAddress(owner) {
|
|
16
|
-
return
|
|
17
|
-
return web3_js_1.PublicKey.findProgramAddressSync([new web3_js_1.PublicKey(owner).toBuffer()], constants_1.programId)[0];
|
|
18
|
-
});
|
|
7
|
+
return web3_js_1.PublicKey.findProgramAddressSync([new web3_js_1.PublicKey(owner).toBuffer()], constants_1.programId)[0];
|
|
19
8
|
}
|
|
20
9
|
exports.getStakingAccountAddress = getStakingAccountAddress;
|
|
21
10
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aurory/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aurory/helpers.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAC5C,2CAAwC;AAExC,SAAgB,wBAAwB,CAAC,KAAa;IACpD,OAAO,mBAAS,CAAC,sBAAsB,CACrC,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,EACjC,qBAAS,CACV,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AALD,4DAKC"}
|
|
@@ -21,7 +21,7 @@ const structs_1 = require("./structs");
|
|
|
21
21
|
const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
|
|
22
22
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
23
|
const client = (0, clients_1.getClientSolana)();
|
|
24
|
-
const stakingAccountAddress =
|
|
24
|
+
const stakingAccountAddress = (0, helpers_1.getStakingAccountAddress)(owner);
|
|
25
25
|
const stakingAccount = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.UserStakingAccountStruct, stakingAccountAddress);
|
|
26
26
|
if (!stakingAccount)
|
|
27
27
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aurory/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AAGpC,2CAAoE;AACpE,iDAAsD;AACtD,uCAAqD;AACrD,kFAA+E;AAC/E,uCAAqD;AACrD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,qBAAqB,GAAG,
|
|
1
|
+
{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aurory/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AAGpC,2CAAoE;AACpE,iDAAsD;AACtD,uCAAqD;AACrD,kFAA+E;AAC/E,uCAAqD;AACrD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,qBAAqB,GAAG,IAAA,kCAAwB,EAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,MAAM,IAAA,2CAAoB,EAC/C,MAAM,EACN,kCAAwB,EACxB,qBAAqB,CACtB,CAAC;IAEF,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,qBAAS,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAE1E,MAAM,KAAK,GAAmB,IAAA,gCAAsB,EAClD,qBAAS,EACT,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,oBAAQ,CAAA,CAAC,CAAC,QAAQ,EAAE,EAC1D,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CAAC;IACF,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,QAAQ;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAE,4BAAgB;YAC5B,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE;YACzB,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,4BAAgB,UAAU;IACjC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
|
@@ -57,7 +57,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
57
57
|
.toNumber();
|
|
58
58
|
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(constants_1.buckId, borrowedQuantity, portfolio_core_1.NetworkId.sui, buckPrice));
|
|
59
59
|
suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(collateral.tokenId, suppliedQuantity, portfolio_core_1.NetworkId.sui, tokenPrice));
|
|
60
|
-
const { borrowedValue, healthRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
60
|
+
const { borrowedValue, healthRatio, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
61
61
|
const element = {
|
|
62
62
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
63
63
|
networkId: portfolio_core_1.NetworkId.sui,
|
|
@@ -74,6 +74,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
74
74
|
collateralRatio: null,
|
|
75
75
|
healthRatio,
|
|
76
76
|
rewardAssets,
|
|
77
|
+
rewardValue,
|
|
77
78
|
value,
|
|
78
79
|
},
|
|
79
80
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bucket/collateralFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,gEAAqC;AAGrC,2CAA8D;AAC9D,iDAAmD;AAEnD,qGAA6E;AAC7E,iFAA8E;AAE9E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,kBAAM,EAAE,0BAAS,CAAC,GAAG,CAAC,CAAC;IACnE,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,KAAK,MAAM,UAAU,IAAI,uBAAW,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG;YACZ,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,KAAK;aACb;SACF,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,IAAA,6CAAqB,EAC9C,MAAM,EACN,KAAK,CACN,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,IAAI;YAAE,SAAS;QAEjC,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAC1C,UAAU,CAAC,OAAO,EAClB,0BAAS,CAAC,GAAG,CACd,CAAC;QACF,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,cAAc,GAClB,MAAA,YAAY,CAAC,IAAI,CAAC,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAC9D,IAAI,CAAC,cAAc;YAAE,SAAS;QAC9B,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,iBAAiB,CAAC;aACrE,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;aACpC,QAAQ,EAAE,CAAC;QACd,IAAI,gBAAgB,KAAK,CAAC;YAAE,SAAS;QACrC,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,WAAW,CAAC;aAC/D,SAAS,CAAC,SAAA,EAAE,EAAI,SAAS,CAAC,QAAQ,CAAA,CAAC;aACnC,QAAQ,EAAE,CAAC;QAEd,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EAAC,kBAAM,EAAE,gBAAgB,EAAE,0BAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAC3E,CAAC;QAEF,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,gBAAgB,EAChB,0BAAS,CAAC,GAAG,EACb,UAAU,CACX,CACF,CAAC;QAEF,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bucket/collateralFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,7 +93,7 @@ function getPositionsV2Fetcher(networkId, platformId) {
|
|
|
93
93
|
}
|
|
94
94
|
if (borrowedAssets.length === 0 && suppliedAssets.length === 0)
|
|
95
95
|
return [];
|
|
96
|
-
const { borrowedValue, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
96
|
+
const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
97
97
|
return [
|
|
98
98
|
{
|
|
99
99
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
@@ -111,6 +111,7 @@ function getPositionsV2Fetcher(networkId, platformId) {
|
|
|
111
111
|
collateralRatio: null,
|
|
112
112
|
healthRatio,
|
|
113
113
|
rewardAssets,
|
|
114
|
+
rewardValue,
|
|
114
115
|
value,
|
|
115
116
|
},
|
|
116
117
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPositionsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV2Fetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getPositionsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV2Fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,7 +120,7 @@ function getPositionsV3Fetcher(networkId) {
|
|
|
120
120
|
suppliedAssets.length === 0 &&
|
|
121
121
|
rewardAssets.length === 0)
|
|
122
122
|
continue;
|
|
123
|
-
const { borrowedValue, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
123
|
+
const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
124
124
|
elements.push({
|
|
125
125
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
126
126
|
networkId,
|
|
@@ -138,6 +138,7 @@ function getPositionsV3Fetcher(networkId) {
|
|
|
138
138
|
collateralRatio: null,
|
|
139
139
|
healthRatio,
|
|
140
140
|
rewardAssets,
|
|
141
|
+
rewardValue,
|
|
141
142
|
value,
|
|
142
143
|
},
|
|
143
144
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPositionsV3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV3Fetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getPositionsV3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV3Fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -141,7 +141,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
141
141
|
}
|
|
142
142
|
if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
|
|
143
143
|
continue;
|
|
144
|
-
const { borrowedValue, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
144
|
+
const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
145
145
|
elements.push({
|
|
146
146
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
147
147
|
networkId: portfolio_core_1.NetworkId.solana,
|
|
@@ -157,6 +157,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
157
157
|
suppliedYields,
|
|
158
158
|
collateralRatio: null,
|
|
159
159
|
rewardAssets,
|
|
160
|
+
rewardValue,
|
|
160
161
|
healthRatio,
|
|
161
162
|
value,
|
|
162
163
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deposits.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/deposits.ts"],"names":[],"mappings":"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
|
|
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,uCAMmB;AAEnB,+CAG4B;AAC5B,iDAAsD;AACtD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,WAAW,CAAqB;QACnE,MAAM,EAAE,6BAAiB;QACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IAEH,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE7C,MAAM,iBAAiB,GAAoC,IAAI,GAAG,EAAE,CAAC;IACrE,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,MAAM,mCAAmC,GAAgB,EAAE,CAAC;IAC5D,KAAK,MAAM,cAAc,IAAI,gBAAgB,EAAE,CAAC;QAC9C,mCAAmC,CAAC,cAAc,CAAC,WAAW,CAAC;YAC7D,IAAA,mDAAyC,EACvC,wBAAY,EACZ,IAAI,mBAAS,CAAC,KAAK,CAAC,EACpB,cAAc,CAAC,WAAW,CAC3B,CAAC;QACJ,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAClE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,cAAc,CAC7C,WAAW,EACX,0BAAS,CAAC,MAAM,CACjB,CAAC;IACF,MAAM,cAAc,GAA4B,IAAI,GAAG,EAAE,CAAC;IAC1D,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7E,MAAM,iBAAiB,GAAG,MAAM,IAAA,sCAA6B,EAC3D,MAAM,EACN,iCAAwB,EACxB,mCAAmC,CACpC,CAAC;IAEF,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,iBAAiB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;;YACvC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;gBAAE,OAAO;YACxD,MAAM,IAAI,GAAG,MAAA,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,0CAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvD,IAAI,CAAC,IAAI;gBAAE,OAAO;YAClB,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,UAAU;gBAAE,OAAO;YACxB,MAAM,CAAC,IAAI,CACT,IAAA,gCAAsB,EACpB,IAAI,EACJ,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC,QAAQ,EAAE,EACjE,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,QAAQ,CAAC,IAAI,CAAC;gBACZ,SAAS,EAAE,0BAAS,CAAC,MAAM;gBAC3B,KAAK,EAAE,QAAQ;gBACf,IAAI,EAAE,gBAAgB;gBACtB,UAAU,EAAV,sBAAU;gBACV,IAAI,EAAE,qCAAoB,CAAC,QAAQ;gBACnC,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACjD,IAAI,EAAE;oBACJ,MAAM;iBACP;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,IAAI,aAAa,CAAC;IAClB,GAAG,CAAC;QACF,MAAM,cAAc,GAAG,IAAA,mCAAyB,EAC9C,wBAAY,EACZ,IAAI,mBAAS,CAAC,KAAK,CAAC,EACpB,EAAE,EACF,EAAE,GAAG,EAAE,CACR,CAAC;QACF,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACjD,MAAM,EACN,0BAAiB,EACjB,cAAc,CACf,CAAC;QACF,YAAY,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QACpC,EAAE,IAAI,EAAE,CAAC;IACX,CAAC,QAAQ,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;IAE9C,IAAI,CAAC,YAAY;QAAE,OAAO,QAAQ,CAAC;IAEnC,yCAAyC;IACzC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,IAAI,CAAC,WAAW;YAAE,SAAS;QAC3B,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAE1C,MAAM,cAAc,GAAG,CAAC,CAAC;QAEzB,yCAAyC;QACzC,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,aAAa,EAAE,CAAC;YACrD,IAAI,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE;gBAAE,SAAS;YAClD,MAAM,YAAY,GAChB,cAAc,KAAK,SAAS;gBAC5B,YAAY,CAAC,WAAW,KAAK,cAAc,CAAC;YAE9C,MAAM,aAAa,GACjB,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,CAAC,CAAC;YACvD,IACE,IAAA,iCAAuB,EAAC,YAAY,CAAC;gBACrC,CAAC,CAAC,YAAY,IAAI,CAAC,aAAa,CAAC,EACjC,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YACnE,IAAI,CAAC,UAAU;gBAAE,SAAS;YAE1B,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,IAAI;gBAAE,SAAS;YAEjD,IAAI,WAAW,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;YACnC,IACE,UAAU,CAAC,WAAW,KAAK,CAAC;gBAC5B,YAAY,CAAC,WAAW,KAAK,wBAAe,CAAC,OAAO,EACpD,CAAC;gBACD,WAAW,GAAG,IAAA,wBAAc,EAC1B,YAAY,CAAC,aAAa,EAC1B,UAAU,EACV,YAAY,CAAC,WAAW,CACzB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,WAAW,GAAG,IAAA,8BAAoB,EAChC,IAAA,wBAAc,EACZ,YAAY,CAAC,aAAa,EAC1B,UAAU,EACV,YAAY,CAAC,WAAW,CACzB,EACD,YAAY,CAAC,WAAW,CACzB,CAAC;YACJ,CAAC;YAED,IAAI,YAAY,CAAC,WAAW,KAAK,wBAAe,CAAC,OAAO,EAAE,CAAC;gBACzD,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAC1B,WAAW,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC,QAAQ,EAAE,EACrD,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;gBACF,cAAc,CAAC,IAAI,CAAC;oBAClB;wBACE,GAAG,EAAE,UAAU,CAAC,UAAU;wBAC1B,GAAG,EAAE,IAAA,yBAAQ,EAAC,UAAU,CAAC,UAAU,CAAC;qBACrC;iBACF,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,YAAY,CAAC,WAAW,KAAK,wBAAe,CAAC,MAAM,EAAE,CAAC;gBAC/D,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAC1B,WAAW;qBACR,GAAG,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;qBAC9B,GAAG,EAAE;qBACL,QAAQ,EAAE,EACb,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;gBACF,cAAc,CAAC,IAAI,CAAC;oBAClB;wBACE,GAAG,EAAE,UAAU,CAAC,SAAS;wBACzB,GAAG,EAAE,IAAA,yBAAQ,EAAC,UAAU,CAAC,SAAS,CAAC;qBACpC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAEzE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,GACrE,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QACxE,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe,EAAE,IAAI;gBAErB,YAAY;gBACZ,WAAW;gBACX,WAAW;gBACX,KAAK;aACN;YACD,IAAI,EAAE,IAAA,wBAAe,EAAC,WAAW,CAAC,IAAI,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
|
@@ -135,7 +135,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
135
135
|
// });
|
|
136
136
|
if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
|
|
137
137
|
continue;
|
|
138
|
-
const { borrowedValue, suppliedValue, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
138
|
+
const { borrowedValue, suppliedValue, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
139
139
|
const value = collateralUsd.dividedBy(usdFactor).plus(pnl).toNumber();
|
|
140
140
|
const side = isLong ? 'Long' : 'Short';
|
|
141
141
|
elements.push({
|
|
@@ -154,6 +154,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
154
154
|
suppliedYields,
|
|
155
155
|
collateralRatio: null,
|
|
156
156
|
rewardAssets,
|
|
157
|
+
rewardValue,
|
|
157
158
|
healthRatio,
|
|
158
159
|
value,
|
|
159
160
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/perpetualFetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/perpetualFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,8 @@ const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/token
|
|
|
22
22
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
23
|
const client = (0, clients_1.getClientSolana)();
|
|
24
24
|
const stakeAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.stakeDepositReceiptStruct, constants_1.programId, (0, filters_1.stakeFilters)(owner));
|
|
25
|
+
if (stakeAccounts.length === 0)
|
|
26
|
+
return [];
|
|
25
27
|
const tokenPrice = yield cache.getTokenPrice(constants_1.flowmaticMint, portfolio_core_1.NetworkId.solana);
|
|
26
28
|
const assets = [];
|
|
27
29
|
for (const stakeAccount of stakeAccounts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flowmatic/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AAGpC,2CAAmE;AACnE,iDAAsD;AACtD,+CAA8D;AAC9D,oDAAmE;AACnE,uCAAyC;AACzC,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,mCAAyB,EACzB,qBAAS,EACT,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flowmatic/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AAGpC,2CAAmE;AACnE,iDAAsD;AACtD,+CAA8D;AAC9D,oDAAmE;AACnE,uCAAyC;AACzC,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,mCAAyB,EACzB,qBAAS,EACT,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB,CAAC;IACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE1C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,yBAAa,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC9E,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,IAAI,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE;YAAE,SAAS;QAClD,MAAM,WAAW,GAAG,IAAI,IAAI,CAC1B,YAAY,CAAC,gBAAgB;aAC1B,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;aACjC,KAAK,CAAC,IAAI,CAAC;aACX,QAAQ,EAAE,CACd,CAAC,OAAO,EAAE,CAAC;QAEZ,MAAM,CAAC,IAAI,iCACN,IAAA,gCAAsB,EACvB,yBAAa,EACb,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC,QAAQ,EAAE,EACxD,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,KACD,UAAU,EAAE;gBACV,WAAW;aACZ,IACD,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,QAAQ;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1D;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
|
@@ -22,6 +22,8 @@ const tokenPriceToAssetTokens_1 = __importDefault(require("../../utils/misc/toke
|
|
|
22
22
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
23
|
const client = (0, clients_1.getClientSolana)();
|
|
24
24
|
const userStateAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, vaults_1.userStateStruct, constants_1.programId, (0, filters_1.userStateFilter)(owner));
|
|
25
|
+
if (userStateAccounts.length === 0)
|
|
26
|
+
return [];
|
|
25
27
|
const tokenPrice = yield cache.getTokenPrice(constants_1.shadowMint, portfolio_core_1.NetworkId.solana);
|
|
26
28
|
const assets = [];
|
|
27
29
|
for (const userState of userStateAccounts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/genesysgo/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AAGpC,2CAAgF;AAChF,iDAAsD;AACtD,+CAA8D;AAC9D,qDAA2D;AAC3D,+CAAoD;AACpD,uGAA+E;AAE/E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,iBAAiB,GAAG,MAAM,IAAA,iCAAwB,EACtD,MAAM,EACN,wBAAe,EACf,qBAAS,EACT,IAAA,yBAAe,EAAC,KAAK,CAAC,CACvB,CAAC;
|
|
1
|
+
{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/genesysgo/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AAGpC,2CAAgF;AAChF,iDAAsD;AACtD,+CAA8D;AAC9D,qDAA2D;AAC3D,+CAAoD;AACpD,uGAA+E;AAE/E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,iBAAiB,GAAG,MAAM,IAAA,iCAAwB,EACtD,MAAM,EACN,wBAAe,EACf,qBAAS,EACT,IAAA,yBAAe,EAAC,KAAK,CAAC,CACvB,CAAC;IACF,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE9C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,sBAAU,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE,CAAC;QAC1C,IAAI,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE;YAAE,SAAS;QACnD,MAAM,MAAM,GAAG,SAAS,CAAC,iBAAiB;aACvC,SAAS,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC;aACnB,SAAS,CAAC,SAAA,EAAE,EAAI,0BAAc,CAAA,CAAC;aAC/B,QAAQ,EAAE,CAAC;QAEd,MAAM,CAAC,IAAI,CACT,GAAG,IAAA,iCAAuB,EACxB,sBAAU,EACV,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,QAAQ;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1D;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
|
@@ -131,7 +131,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
131
131
|
});
|
|
132
132
|
if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
|
|
133
133
|
continue;
|
|
134
|
-
const { borrowedValue, suppliedValue, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
134
|
+
const { borrowedValue, suppliedValue, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
135
135
|
const value = collateralUsd.dividedBy(usdFactor).plus(pnl).toNumber();
|
|
136
136
|
const side = isLong ? 'Long' : 'Short';
|
|
137
137
|
elements.push({
|
|
@@ -150,6 +150,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
150
150
|
suppliedYields,
|
|
151
151
|
collateralRatio: null,
|
|
152
152
|
rewardAssets,
|
|
153
|
+
rewardValue,
|
|
153
154
|
healthRatio,
|
|
154
155
|
value,
|
|
155
156
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/perpetualFetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/perpetualFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -103,7 +103,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
103
103
|
]);
|
|
104
104
|
}
|
|
105
105
|
if (suppliedAssets.length !== 0 || borrowedAssets.length !== 0) {
|
|
106
|
-
const { borrowedValue, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
106
|
+
const { borrowedValue, suppliedValue, value, healthRatio, rewardValue, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
107
107
|
elements.push({
|
|
108
108
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
109
109
|
networkId,
|
|
@@ -121,6 +121,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
121
121
|
collateralRatio: null,
|
|
122
122
|
healthRatio,
|
|
123
123
|
rewardAssets,
|
|
124
|
+
rewardValue,
|
|
124
125
|
value,
|
|
125
126
|
},
|
|
126
127
|
});
|
|
@@ -185,7 +186,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
185
186
|
]);
|
|
186
187
|
}
|
|
187
188
|
if (suppliedAssets.length !== 0 || borrowedAssets.length !== 0) {
|
|
188
|
-
const { borrowedValue, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
189
|
+
const { borrowedValue, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
189
190
|
elements.push({
|
|
190
191
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
191
192
|
networkId,
|
|
@@ -203,6 +204,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
203
204
|
healthRatio: null,
|
|
204
205
|
collateralRatio: null,
|
|
205
206
|
rewardAssets,
|
|
207
|
+
rewardValue,
|
|
206
208
|
value,
|
|
207
209
|
},
|
|
208
210
|
});
|
|
@@ -261,7 +263,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
261
263
|
]);
|
|
262
264
|
}
|
|
263
265
|
if (suppliedAssets.length !== 0 || borrowedAssets.length !== 0) {
|
|
264
|
-
const { borrowedValue, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
266
|
+
const { borrowedValue, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
265
267
|
elements.push({
|
|
266
268
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
267
269
|
networkId,
|
|
@@ -279,6 +281,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
279
281
|
collateralRatio: null,
|
|
280
282
|
healthRatio: null,
|
|
281
283
|
rewardAssets,
|
|
284
|
+
rewardValue,
|
|
282
285
|
value,
|
|
283
286
|
},
|
|
284
287
|
});
|