@sonarwatch/portfolio-plugins 0.15.40 → 0.15.42
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 +20 -0
- package/package.json +1 -1
- package/src/plugins/bonfida/airdropFetcher.d.ts +3 -3
- package/src/plugins/bonfida/airdropFetcher.js +63 -29
- package/src/plugins/bonfida/airdropFetcher.js.map +1 -1
- package/src/plugins/bonfida/constants.d.ts +1 -0
- package/src/plugins/bonfida/constants.js +11 -2
- package/src/plugins/bonfida/constants.js.map +1 -1
- package/src/plugins/bonfida/index.js +3 -3
- package/src/plugins/bonfida/index.js.map +1 -1
- package/src/plugins/debridge/airdropFetcher.js +6 -0
- package/src/plugins/debridge/airdropFetcher.js.map +1 -1
- package/src/plugins/defituna/airdropFetcher.d.ts +2 -0
- package/src/plugins/defituna/airdropFetcher.js +63 -0
- package/src/plugins/defituna/airdropFetcher.js.map +1 -0
- package/src/plugins/defituna/constants.d.ts +4 -0
- package/src/plugins/defituna/constants.js +13 -1
- package/src/plugins/defituna/constants.js.map +1 -1
- package/src/plugins/defituna/index.d.ts +2 -0
- package/src/plugins/defituna/index.js +3 -1
- package/src/plugins/defituna/index.js.map +1 -1
- package/src/plugins/defituna/types.d.ts +7 -0
- package/src/plugins/defituna/types.js +3 -0
- package/src/plugins/defituna/types.js.map +1 -0
- package/src/plugins/drift-market-maker-vault/depositsFetcher.js +18 -5
- package/src/plugins/drift-market-maker-vault/depositsFetcher.js.map +1 -1
- package/src/plugins/drift-market-maker-vault/types.d.ts +1 -0
- package/src/plugins/drift-market-maker-vault/vaultsJob.js +9 -1
- package/src/plugins/drift-market-maker-vault/vaultsJob.js.map +1 -1
- package/src/plugins/exponent/ptPricesJob.js +18 -3
- package/src/plugins/exponent/ptPricesJob.js.map +1 -1
- package/src/plugins/flash/custodiesJob.js +1 -1
- package/src/plugins/flash/custodiesJob.js.map +1 -1
- package/src/plugins/flash/index.js +5 -4
- package/src/plugins/flash/index.js.map +1 -1
- package/src/plugins/flash/perpetualFetcher.js +35 -71
- package/src/plugins/flash/perpetualFetcher.js.map +1 -1
- package/src/plugins/flash/{poolJob.js → poolsJob.js} +1 -1
- package/src/plugins/flash/poolsJob.js.map +1 -0
- package/src/plugins/flash/poolsYieldJob.d.ts +3 -0
- package/src/plugins/flash/poolsYieldJob.js +54 -0
- package/src/plugins/flash/poolsYieldJob.js.map +1 -0
- package/src/plugins/huma/index.js +2 -1
- package/src/plugins/huma/index.js.map +1 -1
- package/src/plugins/huma/pstYieldJob.d.ts +3 -0
- package/src/plugins/huma/pstYieldJob.js +40 -0
- package/src/plugins/huma/pstYieldJob.js.map +1 -0
- package/src/plugins/jito/airdropFetcher.d.ts +2 -3
- package/src/plugins/jito/airdropFetcher.js +42 -47
- package/src/plugins/jito/airdropFetcher.js.map +1 -1
- package/src/plugins/jito/airdropFetcher_old.d.ts +3 -0
- package/src/plugins/jito/airdropFetcher_old.js +66 -0
- package/src/plugins/jito/airdropFetcher_old.js.map +1 -0
- package/src/plugins/jito/constants.d.ts +2 -0
- package/src/plugins/jito/constants.js +10 -1
- package/src/plugins/jito/constants.js.map +1 -1
- package/src/plugins/jito/index.d.ts +1 -0
- package/src/plugins/jito/index.js +7 -3
- package/src/plugins/jito/index.js.map +1 -1
- package/src/plugins/jito/structs.d.ts +1 -1
- package/src/plugins/jito/structs.js +1 -1
- package/src/plugins/jito/structs.js.map +1 -1
- package/src/plugins/jupiter/launchpad/lfgAirdropFetcher.js +7 -2
- package/src/plugins/jupiter/launchpad/lfgAirdropFetcher.js.map +1 -1
- package/src/plugins/kamino/constants.js +30 -0
- package/src/plugins/kamino/constants.js.map +1 -1
- package/src/plugins/magiceden/airdropFetcher.js +46 -19
- package/src/plugins/magiceden/airdropFetcher.js.map +1 -1
- package/src/plugins/magiceden/structs.d.ts +11 -0
- package/src/plugins/magiceden/structs.js +11 -1
- package/src/plugins/magiceden/structs.js.map +1 -1
- package/src/plugins/meteora/vaultsJob.js +1 -0
- package/src/plugins/meteora/vaultsJob.js.map +1 -1
- package/src/plugins/ratex/ptPricesJob.js +11 -1
- package/src/plugins/ratex/ptPricesJob.js.map +1 -1
- package/src/plugins/solayer/index.js +2 -1
- package/src/plugins/solayer/index.js.map +1 -1
- package/src/plugins/solayer/poolsJob.js +4 -2
- package/src/plugins/solayer/poolsJob.js.map +1 -1
- package/src/plugins/solayer/poolsYieldJob.d.ts +3 -0
- package/src/plugins/solayer/poolsYieldJob.js +41 -0
- package/src/plugins/solayer/poolsYieldJob.js.map +1 -0
- package/src/plugins/streamflow/airdropFetcher.js +1 -7
- package/src/plugins/streamflow/airdropFetcher.js.map +1 -1
- package/src/plugins/streamflow/helpers.d.ts +1 -0
- package/src/plugins/streamflow/helpers.js +63 -1
- package/src/plugins/streamflow/helpers.js.map +1 -1
- package/src/plugins/tensor/season4AirdropFetcher.js +15 -7
- package/src/plugins/tensor/season4AirdropFetcher.js.map +1 -1
- package/src/plugins/tokens/fetchers/solana.js +3 -10
- package/src/plugins/tokens/fetchers/solana.js.map +1 -1
- package/src/plugins/wormhole/airdropFetcher.js +10 -2
- package/src/plugins/wormhole/airdropFetcher.js.map +1 -1
- package/src/plugins/wormhole/structs.d.ts +36 -1
- package/src/plugins/wormhole/structs.js +40 -1
- package/src/plugins/wormhole/structs.js.map +1 -1
- package/src/utils/elementbuilder/AssetBuilder.d.ts +2 -1
- package/src/utils/elementbuilder/AssetBuilder.js.map +1 -1
- package/src/utils/elementbuilder/AssetTokenBuilder.d.ts +3 -2
- package/src/utils/elementbuilder/AssetTokenBuilder.js +6 -3
- package/src/utils/elementbuilder/AssetTokenBuilder.js.map +1 -1
- package/src/utils/elementbuilder/ElementBorrowlendBuilder.d.ts +2 -1
- package/src/utils/elementbuilder/ElementBorrowlendBuilder.js +4 -4
- package/src/utils/elementbuilder/ElementBorrowlendBuilder.js.map +1 -1
- package/src/utils/elementbuilder/ElementBuilder.d.ts +2 -1
- package/src/utils/elementbuilder/ElementBuilder.js.map +1 -1
- package/src/utils/elementbuilder/ElementConcentratedLiquidityBuilder.d.ts +2 -1
- package/src/utils/elementbuilder/ElementConcentratedLiquidityBuilder.js +2 -2
- package/src/utils/elementbuilder/ElementConcentratedLiquidityBuilder.js.map +1 -1
- package/src/utils/elementbuilder/ElementLeverageBuilder.d.ts +2 -1
- package/src/utils/elementbuilder/ElementLeverageBuilder.js +2 -2
- package/src/utils/elementbuilder/ElementLeverageBuilder.js.map +1 -1
- package/src/utils/elementbuilder/ElementLiquidityBuilder.d.ts +2 -1
- package/src/utils/elementbuilder/ElementLiquidityBuilder.js +2 -2
- package/src/utils/elementbuilder/ElementLiquidityBuilder.js.map +1 -1
- package/src/utils/elementbuilder/ElementMultipleBuilder.d.ts +2 -1
- package/src/utils/elementbuilder/ElementMultipleBuilder.js +2 -2
- package/src/utils/elementbuilder/ElementMultipleBuilder.js.map +1 -1
- package/src/utils/elementbuilder/ElementRegistry.js +2 -1
- package/src/utils/elementbuilder/ElementRegistry.js.map +1 -1
- package/src/utils/elementbuilder/ElementTradeBuilder.d.ts +2 -1
- package/src/utils/elementbuilder/ElementTradeBuilder.js +3 -3
- package/src/utils/elementbuilder/ElementTradeBuilder.js.map +1 -1
- package/src/utils/elementbuilder/LiquidityBuilder.d.ts +2 -1
- package/src/utils/elementbuilder/LiquidityBuilder.js +3 -3
- package/src/utils/elementbuilder/LiquidityBuilder.js.map +1 -1
- package/src/plugins/flash/poolJob.js.map +0 -1
- /package/src/plugins/flash/{poolJob.d.ts → poolsJob.d.ts} +0 -0
|
@@ -36,7 +36,7 @@ class ElementConcentratedLiquidityBuilder extends ElementLiquidityBuilder_1.Elem
|
|
|
36
36
|
mints.push(this.concentratedLiquidityParams.addressB.toString());
|
|
37
37
|
return mints;
|
|
38
38
|
}
|
|
39
|
-
get(networkId, platformId, tokenPrices) {
|
|
39
|
+
get(networkId, platformId, tokenPrices, tokenYields) {
|
|
40
40
|
if (!this.liquidities[0] || !this.concentratedLiquidityParams)
|
|
41
41
|
return null;
|
|
42
42
|
const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(new bignumber_js_1.default(this.concentratedLiquidityParams.liquidity), Number(this.concentratedLiquidityParams.tickCurrentIndex.toString()), Number(this.concentratedLiquidityParams.tickLowerIndex.toString()), Number(this.concentratedLiquidityParams.tickUpperIndex.toString()), this.concentratedLiquidityParams.roundUp || false);
|
|
@@ -69,7 +69,7 @@ class ElementConcentratedLiquidityBuilder extends ElementLiquidityBuilder_1.Elem
|
|
|
69
69
|
}
|
|
70
70
|
if (tokenAmountA.isZero() || tokenAmountB.isZero())
|
|
71
71
|
this.addTag('Out Of Range');
|
|
72
|
-
return super.get(networkId, platformId, tokenPrices);
|
|
72
|
+
return super.get(networkId, platformId, tokenPrices, tokenYields);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
exports.ElementConcentratedLiquidityBuilder = ElementConcentratedLiquidityBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ElementConcentratedLiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementConcentratedLiquidityBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,+DAKoC;AACpC,uEAAoE;AACpE,yDAAsD;AACtD,+EAAgF;AAChF,yFAAsF;AACtF,uCAAoC;
|
|
1
|
+
{"version":3,"file":"ElementConcentratedLiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementConcentratedLiquidityBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,+DAKoC;AACpC,uEAAoE;AACpE,yDAAsD;AACtD,+EAAgF;AAChF,yFAAsF;AACtF,uCAAoC;AAIpC,MAAa,mCAAoC,SAAQ,iDAAuB;IAG9E,iHAAiH;IACxG,YAAY,CAAC,MAAwB;QAC5C,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAED,YAAY,CAAC,MAAmC;QAC9C,IAAI,CAAC,2BAA2B,GAAG,MAAM,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC;YAC5C,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACtC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAEQ,cAAc;;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5E,IAAI,MAAA,IAAI,CAAC,2BAA2B,0CAAE,QAAQ;YAC5C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnE,IAAI,MAAA,IAAI,CAAC,2BAA2B,0CAAE,QAAQ;YAC5C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnE,OAAO,KAAK,CAAC;IACf,CAAC;IAEQ,GAAG,CACV,SAAwB,EACxB,UAAkB,EAClB,WAA0B,EAC1B,WAA0B;QAE1B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B;YAAE,OAAO,IAAI,CAAC;QAE3E,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,uDAA4B,EACjE,IAAI,sBAAS,CAAC,IAAI,CAAC,2BAA2B,CAAC,SAAS,CAAC,EACzD,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,EACpE,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,EAClE,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,EAClE,IAAI,CAAC,2BAA2B,CAAC,OAAO,IAAI,KAAK,CAClD,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAE7C,gBAAgB,CAAC,QAAQ,CAAC;YACxB,OAAO,EAAE,IAAI,CAAC,2BAA2B,CAAC,QAAQ;YAClD,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;QAEH,gBAAgB,CAAC,QAAQ,CAAC;YACxB,OAAO,EAAE,IAAI,CAAC,2BAA2B,CAAC,QAAQ;YAClD,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;QAEH,IACE,IAAI,CAAC,2BAA2B,CAAC,OAAO;YACxC,IAAI,CAAC,2BAA2B,CAAC,gBAAgB;YACjD,IAAI,CAAC,2BAA2B,CAAC,aAAa;YAC9C,IAAI,CAAC,2BAA2B,CAAC,aAAa,EAC9C,CAAC;YACD,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CACjC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,QAAQ,EAAE,CACrD,CAAC;gBACF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CACjC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,QAAQ,EAAE,CACrD,CAAC;gBAEF,IAAI,WAAW,IAAI,WAAW,EAAE,CAAC;oBAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,6DAA6B,EAC9C,MAAM,CACJ,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAC7D,EACD,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,EAClE,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,EAClE,IAAA,WAAI,EAAC,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,EACvD,IAAA,WAAI,EAAC,IAAI,CAAC,2BAA2B,CAAC,aAAa,CAAC,EACpD,WAAW,CAAC,QAAQ,EACpB,WAAW,CAAC,QAAQ,EACpB,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAC3D,GAAG,YAAY,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,CAAC,EAAE,EACvD,GAAG,YAAY,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,CAAC,EAAE,EACvD,GAAG,IAAI,CAAC,2BAA2B,CAAC,aAAa,EAAE,EACnD,GAAG,WAAW,CAAC,KAAK,EAAE,EACtB,GAAG,WAAW,CAAC,KAAK,EAAE,CACvB,CAAC;oBAEF,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;wBAClC,gBAAgB,CAAC,QAAQ,CAAC,IAAA,6BAAY,EAAC,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;oBAChE,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,QAAQ,CAAC,IAAA,6BAAY,EAAC,CAAC,CAAC,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,EAAE,IAAI,YAAY,CAAC,MAAM,EAAE;YAChD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAE9B,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IACpE,CAAC;CACF;AAxGD,kFAwGC"}
|
|
@@ -3,6 +3,7 @@ import { ElementBuilder } from './ElementBuilder';
|
|
|
3
3
|
import { CrossLevPositionParams, IsoLevPositionParams, Params, PortfolioAssetTokenParams } from './Params';
|
|
4
4
|
import { CrossLevPositionBuilder, IsoLevPositionBuilder } from './LevPositionBuilder';
|
|
5
5
|
import { AssetTokenBuilder } from './AssetTokenBuilder';
|
|
6
|
+
import { TokenYieldMap } from '../../TokenYieldMap';
|
|
6
7
|
export declare class ElementLeverageBuilder extends ElementBuilder {
|
|
7
8
|
isoPositions: IsoLevPositionBuilder[];
|
|
8
9
|
crossPositions: CrossLevPositionBuilder[];
|
|
@@ -12,5 +13,5 @@ export declare class ElementLeverageBuilder extends ElementBuilder {
|
|
|
12
13
|
addIsoPosition(params: IsoLevPositionParams): IsoLevPositionBuilder;
|
|
13
14
|
addCrossPosition(params: CrossLevPositionParams): CrossLevPositionBuilder;
|
|
14
15
|
addCrossCollateral(params: PortfolioAssetTokenParams): void;
|
|
15
|
-
get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementLeverage | null;
|
|
16
|
+
get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioElementLeverage | null;
|
|
16
17
|
}
|
|
@@ -40,7 +40,7 @@ class ElementLeverageBuilder extends ElementBuilder_1.ElementBuilder {
|
|
|
40
40
|
addCrossCollateral(params) {
|
|
41
41
|
this.crossCollateralAssets.push(new AssetTokenBuilder_1.AssetTokenBuilder(params));
|
|
42
42
|
}
|
|
43
|
-
get(networkId, platformId, tokenPrices) {
|
|
43
|
+
get(networkId, platformId, tokenPrices, tokenYields) {
|
|
44
44
|
var _a;
|
|
45
45
|
if (this.isoPositions.length === 0 &&
|
|
46
46
|
this.crossPositions.length === 0 &&
|
|
@@ -50,7 +50,7 @@ class ElementLeverageBuilder extends ElementBuilder_1.ElementBuilder {
|
|
|
50
50
|
const isoValue = (0, portfolio_core_1.getUsdValueSum)([...isoPositions.map((a) => a.value)]);
|
|
51
51
|
const crossPositions = this.crossPositions.map((p) => p.get(networkId));
|
|
52
52
|
const crossCollateralAssets = this.crossCollateralAssets
|
|
53
|
-
.map((p) => p.get(networkId, tokenPrices))
|
|
53
|
+
.map((p) => p.get(networkId, tokenPrices, tokenYields))
|
|
54
54
|
.filter((a) => a !== null);
|
|
55
55
|
const crossValue = (0, portfolio_core_1.getUsdValueSum)([
|
|
56
56
|
...crossCollateralAssets.map((a) => a.value),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ElementLeverageBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLeverageBuilder.ts"],"names":[],"mappings":";;;AAAA,+DASoC;AACpC,qDAAkD;AAOlD,6DAG8B;AAC9B,2DAAwD;
|
|
1
|
+
{"version":3,"file":"ElementLeverageBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLeverageBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,11 @@ import { NetworkIdType, PortfolioElementLiquidity, TokenPriceMap } from '@sonarw
|
|
|
2
2
|
import { ElementBuilder } from './ElementBuilder';
|
|
3
3
|
import { LiquidityParams, Params } from './Params';
|
|
4
4
|
import { LiquidityBuilder } from './LiquidityBuilder';
|
|
5
|
+
import { TokenYieldMap } from '../../TokenYieldMap';
|
|
5
6
|
export declare class ElementLiquidityBuilder extends ElementBuilder {
|
|
6
7
|
liquidities: LiquidityBuilder[];
|
|
7
8
|
constructor(params: Params);
|
|
8
9
|
addLiquidity(params?: LiquidityParams): LiquidityBuilder;
|
|
9
10
|
tokenAddresses(): string[];
|
|
10
|
-
get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementLiquidity | null;
|
|
11
|
+
get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioElementLiquidity | null;
|
|
11
12
|
}
|
|
@@ -17,9 +17,9 @@ class ElementLiquidityBuilder extends ElementBuilder_1.ElementBuilder {
|
|
|
17
17
|
tokenAddresses() {
|
|
18
18
|
return this.liquidities.map((liquidity) => liquidity.mints()).flat();
|
|
19
19
|
}
|
|
20
|
-
get(networkId, platformId, tokenPrices) {
|
|
20
|
+
get(networkId, platformId, tokenPrices, tokenYields) {
|
|
21
21
|
const liquidities = this.liquidities
|
|
22
|
-
.map((l) => l.get(networkId, tokenPrices))
|
|
22
|
+
.map((l) => l.get(networkId, tokenPrices, tokenYields))
|
|
23
23
|
.filter((a) => a !== null);
|
|
24
24
|
if (liquidities.length === 0)
|
|
25
25
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ElementLiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLiquidityBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAOoC;AACpC,qDAAkD;AAElD,yDAAsD;
|
|
1
|
+
{"version":3,"file":"ElementLiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLiquidityBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAOoC;AACpC,qDAAkD;AAElD,yDAAsD;AAGtD,MAAa,uBAAwB,SAAQ,+BAAc;IAGzD,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,MAAwB;QACnC,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACxC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACvE,CAAC;IAEQ,GAAG,CACV,SAAwB,EACxB,UAAkB,EAClB,WAA0B,EAC1B,WAA0B;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW;aACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;aACtD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAyB,CAAC;QAErD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE1C,OAAO;YACL,IAAI,EAAE,qCAAoB,CAAC,SAAS;YACpC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU;YACzC,IAAI,EAAE;gBACJ,WAAW;aACZ;YACD,KAAK,EAAE,IAAA,+BAAc,EAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC9D,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;IACJ,CAAC;CACF;AA3CD,0DA2CC"}
|
|
@@ -2,11 +2,12 @@ import { NetworkIdType, PortfolioElementMultiple, TokenPriceMap } from '@sonarwa
|
|
|
2
2
|
import { ElementBuilder } from './ElementBuilder';
|
|
3
3
|
import { Params, PortfolioAssetGenericParams, PortfolioAssetTokenParams } from './Params';
|
|
4
4
|
import { AssetBuilder } from './AssetBuilder';
|
|
5
|
+
import { TokenYieldMap } from '../../TokenYieldMap';
|
|
5
6
|
export declare class ElementMultipleBuilder extends ElementBuilder {
|
|
6
7
|
assets: AssetBuilder[];
|
|
7
8
|
constructor(params: Params);
|
|
8
9
|
addAsset(params: PortfolioAssetTokenParams): void;
|
|
9
10
|
addGenericAsset(params: PortfolioAssetGenericParams): void;
|
|
10
11
|
tokenAddresses(): string[];
|
|
11
|
-
get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementMultiple | null;
|
|
12
|
+
get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioElementMultiple | null;
|
|
12
13
|
}
|
|
@@ -19,10 +19,10 @@ class ElementMultipleBuilder extends ElementBuilder_1.ElementBuilder {
|
|
|
19
19
|
tokenAddresses() {
|
|
20
20
|
return [...this.assets.map((a) => a.tokenAddresses())].flat();
|
|
21
21
|
}
|
|
22
|
-
get(networkId, platformId, tokenPrices) {
|
|
22
|
+
get(networkId, platformId, tokenPrices, tokenYields) {
|
|
23
23
|
var _a;
|
|
24
24
|
const assets = this.assets
|
|
25
|
-
.map((a) => a.get(networkId, tokenPrices))
|
|
25
|
+
.map((a) => a.get(networkId, tokenPrices, tokenYields))
|
|
26
26
|
.filter((a) => a !== null);
|
|
27
27
|
if (assets.length === 0)
|
|
28
28
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ElementMultipleBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementMultipleBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAOoC;AACpC,qDAAkD;AAClD,2DAAwD;AAOxD,+DAA4D;
|
|
1
|
+
{"version":3,"file":"ElementMultipleBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementMultipleBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAOoC;AACpC,qDAAkD;AAClD,2DAAwD;AAOxD,+DAA4D;AAG5D,MAAa,sBAAuB,SAAQ,+BAAc;IAGxD,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,MAAiC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qCAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,eAAe,CAAC,MAAmC;QACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,yCAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAChE,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,UAAkB,EAClB,WAA0B,EAC1B,WAA0B;;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;aACtD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAqB,CAAC;QAEjD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAErC,OAAO;YACL,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU;YACzC,IAAI,EAAE;gBACJ,MAAM;gBACN,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE;gBACzB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;YACD,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzD,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;IACJ,CAAC;CACF;AAhDD,wDAgDC"}
|
|
@@ -57,8 +57,9 @@ class ElementRegistry {
|
|
|
57
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
58
|
const mints = this.elements.map((e) => e.tokenAddresses()).flat();
|
|
59
59
|
const tokenPrices = yield cache.getTokenPricesAsMap(mints, this.networkId);
|
|
60
|
+
const tokenYields = yield cache.getTokenYieldsAsMap(mints, this.networkId);
|
|
60
61
|
return this.elements
|
|
61
|
-
.map((e) => e.get(this.networkId, this.platformId, tokenPrices))
|
|
62
|
+
.map((e) => e.get(this.networkId, this.platformId, tokenPrices, tokenYields))
|
|
62
63
|
.filter((e) => {
|
|
63
64
|
if (e &&
|
|
64
65
|
e.type === portfolio_core_1.PortfolioElementType.borrowlend &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ElementRegistry.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementRegistry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAKoC;AAIpC,qEAAkE;AAClE,uEAAoE;AACpE,yEAAsE;AACtE,qEAAkE;AAClE,+FAA4F;AAC5F,+DAA4D;AAE5D,MAAa,eAAe;IAK1B,YAAY,SAAwB,EAAE,UAAkB;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,kBAAkB,CAAC,MAA4B;QAC7C,MAAM,cAAc,GAAG,IAAI,+CAAsB,iCAC5C,MAAM,KACT,IAAI,EAAE,qCAAoB,CAAC,QAAQ,IACnC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,mBAAmB,CAAC,MAA4B;QAC9C,MAAM,cAAc,GAAG,IAAI,iDAAuB,iCAC7C,MAAM,KACT,IAAI,EAAE,qCAAoB,CAAC,SAAS,IACpC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,+BAA+B,CAC7B,aAEC;QAED,MAAM,cAAc,GAAG,IAAI,yEAAmC,iCACzD,aAAa,KAChB,IAAI,EAAE,qCAAoB,CAAC,SAAS,EACpC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,KAAI,EAAE,CAAC,EAAE,cAAc,CAAC,EACtD,KAAK,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,KAAI,eAAe,IAC9C,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,oBAAoB,CAAC,MAA4B;QAC/C,MAAM,cAAc,GAAG,IAAI,mDAAwB,iCAC9C,MAAM,KACT,IAAI,EAAE,qCAAoB,CAAC,UAAU,IACrC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,kBAAkB,CAAC,MAA4B;QAC7C,MAAM,cAAc,GAAG,IAAI,+CAAsB,iCAC5C,MAAM,KACT,IAAI,EAAE,qCAAoB,CAAC,QAAQ,IACnC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,eAAe,CAAC,MAA4B;QAC1C,MAAM,cAAc,GAAG,IAAI,yCAAmB,iCACzC,MAAM,KACT,IAAI,EAAE,qCAAoB,CAAC,KAAK,IAChC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnC,OAAO,cAAc,CAAC;IACxB,CAAC;IAEK,WAAW,CAAC,KAAY;;YAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAClE,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAE3E,OAAO,IAAI,CAAC,QAAQ;iBACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"ElementRegistry.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementRegistry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { NetworkIdType, PortfolioElementTrade, TokenPriceMap } from '@sonarwatch/portfolio-core';
|
|
2
2
|
import { ElementBuilder } from './ElementBuilder';
|
|
3
3
|
import { Params, TradeParams } from './Params';
|
|
4
|
+
import { TokenYieldMap } from '../../TokenYieldMap';
|
|
4
5
|
export declare class ElementTradeBuilder extends ElementBuilder {
|
|
5
6
|
params?: TradeParams;
|
|
6
7
|
constructor(params: Params);
|
|
7
8
|
setTrade(params: TradeParams): void;
|
|
8
9
|
tokenAddresses(): string[];
|
|
9
|
-
get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementTrade | null;
|
|
10
|
+
get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioElementTrade | null;
|
|
10
11
|
}
|
|
@@ -26,7 +26,7 @@ class ElementTradeBuilder extends ElementBuilder_1.ElementBuilder {
|
|
|
26
26
|
mints.push(this.params.outputAsset.address.toString());
|
|
27
27
|
return mints;
|
|
28
28
|
}
|
|
29
|
-
get(networkId, platformId, tokenPrices) {
|
|
29
|
+
get(networkId, platformId, tokenPrices, tokenYields) {
|
|
30
30
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
31
31
|
if (!this.params)
|
|
32
32
|
return null;
|
|
@@ -40,11 +40,11 @@ class ElementTradeBuilder extends ElementBuilder_1.ElementBuilder {
|
|
|
40
40
|
const inputAsset = new AssetTokenBuilder_1.AssetTokenBuilder({
|
|
41
41
|
address: this.params.inputAsset.address.toString(),
|
|
42
42
|
amount: inputAmount.toNumber(),
|
|
43
|
-
}).get(networkId, tokenPrices);
|
|
43
|
+
}).get(networkId, tokenPrices, tokenYields);
|
|
44
44
|
const outputAsset = new AssetTokenBuilder_1.AssetTokenBuilder({
|
|
45
45
|
address: this.params.outputAsset.address.toString(),
|
|
46
46
|
amount: outputAmount.toNumber(),
|
|
47
|
-
}).get(networkId, tokenPrices);
|
|
47
|
+
}).get(networkId, tokenPrices, tokenYields);
|
|
48
48
|
const inputPrice = tokenPrices.get(this.params.inputAsset.address.toString());
|
|
49
49
|
const outputPrice = tokenPrices.get(this.params.outputAsset.address.toString());
|
|
50
50
|
if (!inputPrice)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ElementTradeBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementTradeBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,+DAMoC;AACpC,gEAAqC;AACrC,qDAAkD;AAElD,2DAAwD;
|
|
1
|
+
{"version":3,"file":"ElementTradeBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementTradeBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { NetworkIdType, PortfolioLiquidity, TokenPriceMap, Yield } from '@sonarwatch/portfolio-core';
|
|
2
2
|
import { AssetTokenBuilder } from './AssetTokenBuilder';
|
|
3
3
|
import { LiquidityParams, PortfolioAssetTokenParams } from './Params';
|
|
4
|
+
import { TokenYieldMap } from '../../TokenYieldMap';
|
|
4
5
|
export declare class LiquidityBuilder {
|
|
5
6
|
private readonly params?;
|
|
6
7
|
assets: AssetTokenBuilder[];
|
|
@@ -11,5 +12,5 @@ export declare class LiquidityBuilder {
|
|
|
11
12
|
addRewardAsset(params: PortfolioAssetTokenParams): void;
|
|
12
13
|
addYield(ayield: Yield): void;
|
|
13
14
|
mints(): string[];
|
|
14
|
-
get(networkId: NetworkIdType, tokenPrices: TokenPriceMap): PortfolioLiquidity | null;
|
|
15
|
+
get(networkId: NetworkIdType, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioLiquidity | null;
|
|
15
16
|
}
|
|
@@ -25,14 +25,14 @@ class LiquidityBuilder {
|
|
|
25
25
|
...this.rewardAssets.map((a) => a.address),
|
|
26
26
|
];
|
|
27
27
|
}
|
|
28
|
-
get(networkId, tokenPrices) {
|
|
28
|
+
get(networkId, tokenPrices, tokenYields) {
|
|
29
29
|
var _a;
|
|
30
30
|
const assets = this.assets
|
|
31
|
-
.map((a) => a.getUnderlyings(networkId, tokenPrices))
|
|
31
|
+
.map((a) => a.getUnderlyings(networkId, tokenPrices, tokenYields))
|
|
32
32
|
.flat()
|
|
33
33
|
.filter((a) => a !== null);
|
|
34
34
|
const rewardAssets = this.rewardAssets
|
|
35
|
-
.map((a) => a.get(networkId, tokenPrices))
|
|
35
|
+
.map((a) => a.get(networkId, tokenPrices, tokenYields))
|
|
36
36
|
.filter((a) => a !== null);
|
|
37
37
|
if (assets.length === 0 && rewardAssets.length === 0)
|
|
38
38
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/LiquidityBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAOoC;AACpC,2DAAwD;
|
|
1
|
+
{"version":3,"file":"LiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/LiquidityBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"poolJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/poolJob.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|