@sonarwatch/portfolio-plugins 0.4.13 → 0.4.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/package.json +2 -2
- package/src/plugins/marginfi/fetcherExecutor.js +6 -3
- package/src/plugins/marginfi/fetcherExecutor.js.map +1 -1
- package/src/plugins/thala/stabilityPoolFetcher.js +6 -3
- package/src/plugins/thala/stabilityPoolFetcher.js.map +1 -1
- package/src/plugins/thala/vaultsFetcher.js +6 -3
- package/src/plugins/thala/vaultsFetcher.js.map +1 -1
- package/src/plugins/tokens/fetchers/aptos.js +4 -4
- package/src/plugins/tokens/fetchers/aptos.js.map +1 -1
- package/src/utils/misc/tokenPriceToAssetToken.d.ts +1 -1
- package/src/utils/misc/tokenPriceToAssetToken.js +1 -2
- package/src/utils/misc/tokenPriceToAssetToken.js.map +1 -1
- package/src/utils/misc/tokenPriceToAssetTokens.d.ts +1 -1
- package/src/utils/misc/tokenPriceToAssetTokens.js +7 -5
- package/src/utils/misc/tokenPriceToAssetTokens.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.4.14](https://github.com/sonarwatch/portfolio/compare/plugins-0.4.13...plugins-0.4.14) (2023-07-09)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
5
9
|
## [0.4.13](https://github.com/sonarwatch/portfolio/compare/plugins-0.4.12...plugins-0.4.13) (2023-07-09)
|
|
6
10
|
|
|
7
11
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.14",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"generators": "./generators.json",
|
|
6
6
|
"dependencies": {
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"viem": "^1.2.9"
|
|
23
23
|
},
|
|
24
24
|
"peerDependencies": {
|
|
25
|
-
"@sonarwatch/portfolio-core": "0.4.
|
|
25
|
+
"@sonarwatch/portfolio-core": "0.4.14"
|
|
26
26
|
},
|
|
27
27
|
"main": "./src/index.js",
|
|
28
28
|
"types": "./src/index.d.ts"
|
|
@@ -8,6 +8,9 @@ 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
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
13
16
|
const constants_1 = require("./constants");
|
|
@@ -16,7 +19,7 @@ const helpers_1 = require("./helpers");
|
|
|
16
19
|
const filters_1 = require("./filters");
|
|
17
20
|
const solana_1 = require("../../utils/solana");
|
|
18
21
|
const clients_1 = require("../../utils/clients");
|
|
19
|
-
const tokenPriceToAssetToken_1 = require("../../utils/misc/tokenPriceToAssetToken");
|
|
22
|
+
const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
|
|
20
23
|
const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
24
|
var _a;
|
|
22
25
|
const connection = (0, clients_1.getClientSolana)();
|
|
@@ -44,13 +47,13 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
|
|
|
44
47
|
const suppliedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(accountBalanceInfo.assetShares)
|
|
45
48
|
.times(bankInfo.dividedAssetShareValue)
|
|
46
49
|
.toNumber();
|
|
47
|
-
suppliedAssets.push((0, tokenPriceToAssetToken_1.
|
|
50
|
+
suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), suppliedQuantity, portfolio_core_1.NetworkId.solana, tokenPrice));
|
|
48
51
|
}
|
|
49
52
|
if (!accountBalanceInfo.liabilityShares.value.isZero()) {
|
|
50
53
|
const borrowedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(accountBalanceInfo.liabilityShares)
|
|
51
54
|
.times(bankInfo.dividedLiabilityShareValue)
|
|
52
55
|
.toNumber();
|
|
53
|
-
borrowedAssets.push((0, tokenPriceToAssetToken_1.
|
|
56
|
+
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), borrowedQuantity, portfolio_core_1.NetworkId.solana, tokenPrice));
|
|
54
57
|
}
|
|
55
58
|
const bankLendingYields = [
|
|
56
59
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/fetcherExecutor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/fetcherExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,12 +8,15 @@ 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
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
13
16
|
const constants_1 = require("./constants");
|
|
14
17
|
const aptos_1 = require("../../utils/aptos");
|
|
15
18
|
const clients_1 = require("../../utils/clients");
|
|
16
|
-
const tokenPriceToAssetToken_1 = require("../../utils/misc/tokenPriceToAssetToken");
|
|
19
|
+
const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
|
|
17
20
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
21
|
const connection = (0, clients_1.getClientAptos)();
|
|
19
22
|
const stabilityPoolDepositView = yield (0, aptos_1.getView)(connection, (0, constants_1.stabilityDepositPayload)(owner));
|
|
@@ -27,7 +30,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
27
30
|
if (depositAmount === 0)
|
|
28
31
|
return [];
|
|
29
32
|
const depositTokenPrice = yield cache.getTokenPrice(constants_1.modCoin.toString(), portfolio_core_1.NetworkId.aptos);
|
|
30
|
-
const assets = (0, tokenPriceToAssetToken_1.
|
|
33
|
+
const assets = (0, tokenPriceToAssetToken_1.default)(constants_1.modCoin.toString(), depositAmount, portfolio_core_1.NetworkId.aptos, depositTokenPrice);
|
|
31
34
|
const assetsValue = !depositTokenPrice
|
|
32
35
|
? null
|
|
33
36
|
: depositTokenPrice.price * depositAmount;
|
|
@@ -38,7 +41,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
38
41
|
return [];
|
|
39
42
|
const rewardsAmount = +rewardsAmountString / Math.pow(10, portfolio_core_1.aptosNetwork.native.decimals);
|
|
40
43
|
const rewardsTokenPrice = yield cache.getTokenPrice(constants_1.thlCoin.toString(), portfolio_core_1.NetworkId.aptos);
|
|
41
|
-
const rewardAssets = (0, tokenPriceToAssetToken_1.
|
|
44
|
+
const rewardAssets = (0, tokenPriceToAssetToken_1.default)(constants_1.thlCoin.toString(), rewardsAmount, portfolio_core_1.NetworkId.aptos, rewardsTokenPrice);
|
|
42
45
|
const rewardAssetsValue = !rewardsTokenPrice
|
|
43
46
|
? null
|
|
44
47
|
: rewardsTokenPrice.price * rewardsAmount;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stabilityPoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/stabilityPoolFetcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stabilityPoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/stabilityPoolFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,12 +8,15 @@ 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
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
13
16
|
const constants_1 = require("./constants");
|
|
14
17
|
const clients_1 = require("../../utils/clients");
|
|
15
18
|
const aptos_1 = require("../../utils/aptos");
|
|
16
|
-
const tokenPriceToAssetToken_1 = require("../../utils/misc/tokenPriceToAssetToken");
|
|
19
|
+
const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
|
|
17
20
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
21
|
const connection = (0, clients_1.getClientAptos)();
|
|
19
22
|
const resources = yield (0, aptos_1.getAccountResources)(connection, owner);
|
|
@@ -40,9 +43,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
40
43
|
if (!suppliedTokenPrice || !suppliedTokenPrice.decimals)
|
|
41
44
|
continue;
|
|
42
45
|
const suppliedAmount = vaultData.collateral.value / Math.pow(10, suppliedTokenPrice.decimals);
|
|
43
|
-
suppliedAssets.push((0, tokenPriceToAssetToken_1.
|
|
46
|
+
suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(suppliedAsset, suppliedAmount, portfolio_core_1.NetworkId.aptos, suppliedTokenPrice));
|
|
44
47
|
const borrowedAmount = vaultData.debt / Math.pow(10, borrowedTokenPrice.decimals);
|
|
45
|
-
borrowedAssets.push((0, tokenPriceToAssetToken_1.
|
|
48
|
+
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(borrowedAsset, borrowedAmount, portfolio_core_1.NetworkId.aptos, borrowedTokenPrice));
|
|
46
49
|
const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
47
50
|
elements.push({
|
|
48
51
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/vaultsFetcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/vaultsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAWoC;AACpC,2CAA+D;AAC/D,iDAAqD;AACrD,6CAAuE;AAEvE,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,wBAAc,GAAE,CAAC;IAEpC,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAmB,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC/D,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAE1B,MAAM,aAAa,GAAG,mBAAO,CAAC;IAC9B,MAAM,kBAAkB,GAAG,MAAM,KAAK,CAAC,aAAa,CAClD,aAAa,EACb,0BAAS,CAAC,KAAK,CAChB,CAAC;IACF,IAAI,CAAC,kBAAkB;QAAE,OAAO,EAAE,CAAC;IAEnC,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACrD,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,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAW,CAAC;YAAE,SAAS;QAErD,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAsB,CAAC;QAClD,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC;QAEhC,MAAM,aAAa,GAAG,IAAA,qBAAa,EAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,kBAAkB,GAAG,MAAM,KAAK,CAAC,aAAa,CAClD,aAAa,EACb,0BAAS,CAAC,KAAK,CAChB,CAAC;QACF,IAAI,CAAC,kBAAkB,IAAI,CAAC,kBAAkB,CAAC,QAAQ;YAAE,SAAS;QAElE,MAAM,cAAc,GAClB,SAAS,CAAC,UAAU,CAAC,KAAK,GAAG,SAAA,EAAE,EAAI,kBAAkB,CAAC,QAAQ,CAAA,CAAC;QAEjE,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,aAAa,EACb,cAAc,EACd,0BAAS,CAAC,KAAK,EACf,kBAAkB,CACnB,CACF,CAAC;QACF,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,GAAG,SAAA,EAAE,EAAI,kBAAkB,CAAC,QAAQ,CAAA,CAAC;QAE1E,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,aAAa,EACb,cAAc,EACd,0BAAS,CAAC,KAAK,EACf,kBAAkB,CACnB,CACF,CAAC;QACF,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,KAAK,EAAE,GAC5D,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QAExE,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,KAAK;YAC1B,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;gBACf,YAAY;gBACZ,KAAK;aACN;SACF,CAAC,CAAC;QACH,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,OAAO,CAAS,aAAa,EAAE;YACnE,MAAM,EAAE,sBAAU;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,IAAI,iBAAiB,KAAK,CAAC;YAAE,SAAS;QAE5D,MAAM,oBAAoB,GAAY;YACpC;gBACE,GAAG,EAAE,IAAA,yBAAQ,EAAC,iBAAiB,CAAC;gBAChC,GAAG,EAAE,iBAAiB;aACvB;SACF,CAAC;QACF,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;KAC3C;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,KAAK;IAC1B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
|
@@ -14,8 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
16
16
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
17
|
-
const tokenPriceToAssetTokens_1 = require("
|
|
18
|
-
const tokenPriceToAssetToken_1 = require("
|
|
17
|
+
const tokenPriceToAssetTokens_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetTokens"));
|
|
18
|
+
const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
|
|
19
19
|
const platforms_1 = require("../../../platforms");
|
|
20
20
|
const clients_1 = require("../../../utils/clients");
|
|
21
21
|
const aptos_1 = require("../../../utils/aptos");
|
|
@@ -51,7 +51,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
51
51
|
if (amount === 0)
|
|
52
52
|
continue;
|
|
53
53
|
if (tokenPrice.platformId !== platforms_1.walletTokensPlatform.id) {
|
|
54
|
-
const assets = (0, tokenPriceToAssetTokens_1.
|
|
54
|
+
const assets = (0, tokenPriceToAssetTokens_1.default)(coinType, amount, portfolio_core_1.NetworkId.aptos, tokenPrice);
|
|
55
55
|
const liquidity = {
|
|
56
56
|
assets,
|
|
57
57
|
assetsValue: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
|
|
@@ -66,7 +66,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
66
66
|
liquiditiesByPlatformId[tokenPrice.platformId].push(liquidity);
|
|
67
67
|
}
|
|
68
68
|
else {
|
|
69
|
-
walletTokensAssets.push((0, tokenPriceToAssetToken_1.
|
|
69
|
+
walletTokensAssets.push((0, tokenPriceToAssetToken_1.default)(coinType, amount, portfolio_core_1.NetworkId.aptos, tokenPrice));
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
const elements = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptos.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/aptos.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAWoC;AAEpC,gEAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"aptos.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/aptos.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { NetworkIdType, PortfolioAssetToken, TokenPrice, TokenPriceUnderlying } from '@sonarwatch/portfolio-core';
|
|
2
|
-
export
|
|
2
|
+
export default function tokenPriceToAssetToken(address: string, amount: number, networkId: NetworkIdType, tokenPrice?: TokenPrice | TokenPriceUnderlying | null): PortfolioAssetToken;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.tokenPriceToAssetToken = void 0;
|
|
4
3
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
5
4
|
function tokenPriceToAssetToken(address, amount, networkId, tokenPrice) {
|
|
6
5
|
return {
|
|
@@ -14,5 +13,5 @@ function tokenPriceToAssetToken(address, amount, networkId, tokenPrice) {
|
|
|
14
13
|
},
|
|
15
14
|
};
|
|
16
15
|
}
|
|
17
|
-
exports.
|
|
16
|
+
exports.default = tokenPriceToAssetToken;
|
|
18
17
|
//# sourceMappingURL=tokenPriceToAssetToken.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenPriceToAssetToken.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/tokenPriceToAssetToken.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tokenPriceToAssetToken.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/tokenPriceToAssetToken.ts"],"names":[],"mappings":";;AAAA,+DAOoC;AAEpC,SAAwB,sBAAsB,CAC5C,OAAe,EACf,MAAc,EACd,SAAwB,EACxB,UAAqD;IAErD,OAAO;QACL,IAAI,EAAE,mCAAkB,CAAC,KAAK;QAC9B,SAAS;QACT,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI;QACpD,IAAI,EAAE;YACJ,OAAO,EAAE,IAAA,mCAAkB,EAAC,OAAO,EAAE,SAAS,CAAC;YAC/C,MAAM;YACN,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;SAC5C;KACF,CAAC;AACJ,CAAC;AAhBD,yCAgBC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { NetworkIdType, PortfolioAssetToken, TokenPrice } from '@sonarwatch/portfolio-core';
|
|
2
|
-
export
|
|
2
|
+
export default function tokenPriceToAssetTokens(address: string, amount: number, networkId: NetworkIdType, tokenPrice?: TokenPrice | null): PortfolioAssetToken[];
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
const tokenPriceToAssetToken_1 = require("./tokenPriceToAssetToken");
|
|
6
|
+
const tokenPriceToAssetToken_1 = __importDefault(require("./tokenPriceToAssetToken"));
|
|
5
7
|
function tokenPriceToAssetTokens(address, amount, networkId, tokenPrice) {
|
|
6
8
|
if (!tokenPrice || !tokenPrice.underlyings)
|
|
7
|
-
return [(0, tokenPriceToAssetToken_1.
|
|
8
|
-
return tokenPrice.underlyings.map((tokenPriceUnderlying) => (0, tokenPriceToAssetToken_1.
|
|
9
|
+
return [(0, tokenPriceToAssetToken_1.default)(address, amount, networkId, tokenPrice)];
|
|
10
|
+
return tokenPrice.underlyings.map((tokenPriceUnderlying) => (0, tokenPriceToAssetToken_1.default)(tokenPriceUnderlying.address, amount * tokenPriceUnderlying.amountPerLp, tokenPriceUnderlying.networkId, tokenPriceUnderlying));
|
|
9
11
|
}
|
|
10
|
-
exports.
|
|
12
|
+
exports.default = tokenPriceToAssetTokens;
|
|
11
13
|
//# sourceMappingURL=tokenPriceToAssetTokens.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenPriceToAssetTokens.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/tokenPriceToAssetTokens.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tokenPriceToAssetTokens.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/tokenPriceToAssetTokens.ts"],"names":[],"mappings":";;;;;AAKA,sFAA8D;AAE9D,SAAwB,uBAAuB,CAC7C,OAAe,EACf,MAAc,EACd,SAAwB,EACxB,UAA8B;IAE9B,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,WAAW;QACxC,OAAO,CAAC,IAAA,gCAAsB,EAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAC1E,OAAO,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,oBAAoB,EAAE,EAAE,CACzD,IAAA,gCAAsB,EACpB,oBAAoB,CAAC,OAAO,EAC5B,MAAM,GAAG,oBAAoB,CAAC,WAAW,EACzC,oBAAoB,CAAC,SAAS,EAC9B,oBAAoB,CACrB,CACF,CAAC;AACJ,CAAC;AAhBD,0CAgBC"}
|