@sonarwatch/portfolio-plugins 0.14.113 → 0.14.114

package/src/utils/elementbuilder/ElementLeverageBuilder.d.ts

@@ -1,12 +1,17 @@
 import { NetworkIdType, PortfolioElementLeverage } from '@sonarwatch/portfolio-core';
 import { ElementBuilder } from './ElementBuilder';
-import { LevPositionParams, Params } from './Params';
+import { CrossLevPositionParams, IsoLevPositionParams, Params, PortfolioAssetTokenParams } from './Params';
 import { TokenPriceMap } from '../../TokenPriceMap';
-import { LevPositionBuilder } from './LevPositionBuilder';
+import { CrossLevPositionBuilder, IsoLevPositionBuilder } from './LevPositionBuilder';
+import { AssetTokenBuilder } from './AssetTokenBuilder';
 export declare class ElementLeverageBuilder extends ElementBuilder {
-    positions: LevPositionBuilder[];
+    isoPositions: IsoLevPositionBuilder[];
+    crossPositions: CrossLevPositionBuilder[];
+    crossCollateralAssets: AssetTokenBuilder[];
     constructor(params: Params);
-    addPosition(params: LevPositionParams): LevPositionBuilder;
-    mints(): string[];
+    tokenAddresses(): string[];
+    addIsoPosition(params: IsoLevPositionParams): IsoLevPositionBuilder;
+    addCrossPosition(params: CrossLevPositionParams): CrossLevPositionBuilder;
+    addCrossCollateral(params: PortfolioAssetTokenParams): void;
     get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementLeverage | null;
 }

package/src/utils/elementbuilder/ElementLeverageBuilder.js

@@ -4,30 +4,76 @@ exports.ElementLeverageBuilder = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const ElementBuilder_1 = require("./ElementBuilder");
 const LevPositionBuilder_1 = require("./LevPositionBuilder");
+const AssetTokenBuilder_1 = require("./AssetTokenBuilder");
 class ElementLeverageBuilder extends ElementBuilder_1.ElementBuilder {
     constructor(params) {
         super(params);
-        this.positions = [];
+        this.isoPositions = [];
+        this.crossPositions = [];
+        this.crossCollateralAssets = [];
     }
-    addPosition(params) {
-        const levPositionBuilder = new LevPositionBuilder_1.LevPositionBuilder(params);
-        this.positions.push(levPositionBuilder);
-        return levPositionBuilder;
+    tokenAddresses() {
+        const addresses = [];
+        this.isoPositions.forEach((p) => {
+            if (p.tokenAddress)
+                addresses.push(p.tokenAddress);
+        });
+        this.crossPositions.forEach((p) => {
+            if (p.tokenAddress)
+                addresses.push(p.tokenAddress);
+        });
+        this.crossCollateralAssets.forEach((p) => {
+            addresses.push(p.address);
+        });
+        return addresses;
     }
-    mints() {
-        return this.positions.map((position) => position.mints()).flat();
+    addIsoPosition(params) {
+        const isoPositionBuilder = new LevPositionBuilder_1.IsoLevPositionBuilder(params);
+        this.isoPositions.push(isoPositionBuilder);
+        return isoPositionBuilder;
+    }
+    addCrossPosition(params) {
+        const crossPositionBuilder = new LevPositionBuilder_1.CrossLevPositionBuilder(params);
+        this.crossPositions.push(crossPositionBuilder);
+        return crossPositionBuilder;
+    }
+    addCrossCollateral(params) {
+        this.crossCollateralAssets.push(new AssetTokenBuilder_1.AssetTokenBuilder(params));
     }
     get(networkId, platformId, tokenPrices) {
         var _a;
-        const positions = this.positions
+        const isoPositions = this.isoPositions.map((p) => p.get(networkId));
+        const isoValue = (0, portfolio_core_1.getUsdValueSum)([...isoPositions.map((a) => a.value)]);
+        const crossPositions = this.crossPositions.map((p) => p.get(networkId));
+        const crossCollateralAssets = this.crossCollateralAssets
             .map((p) => p.get(networkId, tokenPrices))
-            .filter((p) => p !== null);
-        const value = (0, portfolio_core_1.getUsdValueSum)(positions.map((a) => a.value));
+            .filter((a) => a !== null);
+        const crossValue = (0, portfolio_core_1.getUsdValueSum)([
+            ...crossCollateralAssets.map((a) => a.value),
+            ...crossPositions.map((p) => p.pnlValue),
+        ]);
+        const crossSizeValueTotal = (0, portfolio_core_1.getUsdValueSumStrict)(crossPositions.map((p) => p.sizeValue));
+        const crossLeverage = crossSizeValueTotal && crossValue
+            ? crossSizeValueTotal / crossValue
+            : undefined;
+        const value = (0, portfolio_core_1.getUsdValueSum)([crossValue, isoValue]);
         return {
-            type: this.type,
+            type: portfolio_core_1.PortfolioElementType.leverage,
+            name: this.name,
+            tags: this.tags,
             label: this.label,
             data: {
-                positions,
+                isolated: {
+                    positions: isoPositions,
+                    value: isoValue,
+                },
+                cross: {
+                    positions: crossPositions,
+                    collateralAssets: crossCollateralAssets,
+                    collateralValue: (0, portfolio_core_1.getUsdValueSum)(crossCollateralAssets.map((a) => a.value)),
+                    value: crossValue,
+                    leverage: crossLeverage,
+                },
                 value,
                 ref: (_a = this.ref) === null || _a === void 0 ? void 0 : _a.toString(),
                 sourceRefs: this.sourceRefs,

package/src/utils/elementbuilder/ElementLeverageBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementLeverageBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLeverageBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAKoC;AACpC,qDAAkD;AAGlD,6DAA0D;AAE1D,MAAa,sBAAuB,SAAQ,+BAAc;IAGxD,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,WAAW,CAAC,MAAyB;QACnC,MAAM,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACxC,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,UAAkB,EAClB,WAA0B;;QAE1B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS;aAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAkB,CAAC;QAC9C,MAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5D,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE;gBACJ,SAAS;gBACT,KAAK;gBACL,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE;gBACzB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;YACD,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU;YACzC,KAAK;SACsB,CAAC;IAChC,CAAC;CACF;AA1CD,wDA0CC"}
+{"version":3,"file":"ElementLeverageBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLeverageBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAOoC;AACpC,qDAAkD;AAQlD,6DAG8B;AAC9B,2DAAwD;AAExD,MAAa,sBAAuB,SAAQ,+BAAc;IAKxD,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;IAClC,CAAC;IAEQ,cAAc;QACrB,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,YAAY;gBAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAChC,IAAI,CAAC,CAAC,YAAY;gBAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACvC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,cAAc,CAAC,MAA4B;QACzC,MAAM,kBAAkB,GAAG,IAAI,0CAAqB,CAAC,MAAM,CAAC,CAAC;QAC7D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC3C,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,gBAAgB,CAAC,MAA8B;QAC7C,MAAM,oBAAoB,GAAG,IAAI,4CAAuB,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC/C,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,kBAAkB,CAAC,MAAiC;QAClD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,qCAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,UAAkB,EAClB,WAA0B;;QAE1B,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAG,IAAA,+BAAc,EAAC,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QACxE,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB;aACrD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAqB,CAAC;QACjD,MAAM,UAAU,GAAG,IAAA,+BAAc,EAAC;YAChC,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YAC5C,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;SACzC,CAAC,CAAC;QACH,MAAM,mBAAmB,GAAG,IAAA,qCAAoB,EAC9C,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CACvC,CAAC;QACF,MAAM,aAAa,GACjB,mBAAmB,IAAI,UAAU;YAC/B,CAAC,CAAC,mBAAmB,GAAG,UAAU;YAClC,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAErD,OAAO;YACL,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE;gBACJ,QAAQ,EAAE;oBACR,SAAS,EAAE,YAAY;oBACvB,KAAK,EAAE,QAAQ;iBAChB;gBACD,KAAK,EAAE;oBACL,SAAS,EAAE,cAAc;oBACzB,gBAAgB,EAAE,qBAAqB;oBACvC,eAAe,EAAE,IAAA,+BAAc,EAC7B,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAC1C;oBACD,KAAK,EAAE,UAAU;oBACjB,QAAQ,EAAE,aAAa;iBACxB;gBACD,KAAK;gBACL,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE;gBACzB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;YACD,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU;YACzC,KAAK;SACN,CAAC;IACJ,CAAC;CACF;AAhGD,wDAgGC"}

package/src/utils/elementbuilder/ElementLiquidityBuilder.d.ts

@@ -1,4 +1,4 @@
-import { NetworkIdType, PortfolioElement } from '@sonarwatch/portfolio-core';
+import { NetworkIdType, PortfolioElementLiquidity } from '@sonarwatch/portfolio-core';
 import { ElementBuilder } from './ElementBuilder';
 import { LiquidityParams, Params } from './Params';
 import { TokenPriceMap } from '../../TokenPriceMap';
@@ -7,6 +7,6 @@ export declare class ElementLiquidityBuilder extends ElementBuilder {
     liquidities: LiquidityBuilder[];
     constructor(params: Params);
     addLiquidity(params?: LiquidityParams): LiquidityBuilder;
-    mints(): string[];
-    get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElement | null;
+    tokenAddresses(): string[];
+    get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementLiquidity | null;
 }

package/src/utils/elementbuilder/ElementLiquidityBuilder.js

@@ -14,7 +14,7 @@ class ElementLiquidityBuilder extends ElementBuilder_1.ElementBuilder {
         this.liquidities.push(liquidityBuilder);
         return liquidityBuilder;
     }
-    mints() {
+    tokenAddresses() {
         return this.liquidities.map((liquidity) => liquidity.mints()).flat();
     }
     get(networkId, platformId, tokenPrices) {
@@ -24,7 +24,7 @@ class ElementLiquidityBuilder extends ElementBuilder_1.ElementBuilder {
         if (liquidities.length === 0)
             return null;
         return {
-            type: this.type,
+            type: portfolio_core_1.PortfolioElementType.liquidity,
             label: this.label,
             networkId,
             platformId: this.platformId || platformId,

package/src/utils/elementbuilder/ElementLiquidityBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementLiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLiquidityBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAMoC;AACpC,qDAAkD;AAGlD,yDAAsD;AAEtD,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,KAAK;QACH,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;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW;aACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aACzC,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,IAAI,CAAC,IAAI;YACf,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;SACa,CAAC;IACjC,CAAC;CACF;AA1CD,0DA0CC"}
+{"version":3,"file":"ElementLiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLiquidityBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAMoC;AACpC,qDAAkD;AAGlD,yDAAsD;AAEtD,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;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW;aACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aACzC,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;AA1CD,0DA0CC"}

package/src/utils/elementbuilder/ElementMultipleBuilder.d.ts

@@ -1,4 +1,4 @@
-import { NetworkIdType, PortfolioElement } from '@sonarwatch/portfolio-core';
+import { NetworkIdType, PortfolioElementMultiple } from '@sonarwatch/portfolio-core';
 import { ElementBuilder } from './ElementBuilder';
 import { Params, PortfolioAssetGenericParams, PortfolioAssetTokenParams } from './Params';
 import { TokenPriceMap } from '../../TokenPriceMap';
@@ -8,6 +8,6 @@ export declare class ElementMultipleBuilder extends ElementBuilder {
     constructor(params: Params);
     addAsset(params: PortfolioAssetTokenParams): void;
     addGenericAsset(params: PortfolioAssetGenericParams): void;
-    mints(): string[];
-    get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElement | null;
+    tokenAddresses(): string[];
+    get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementMultiple | null;
 }

package/src/utils/elementbuilder/ElementMultipleBuilder.js

@@ -16,8 +16,8 @@ class ElementMultipleBuilder extends ElementBuilder_1.ElementBuilder {
     addGenericAsset(params) {
         this.assets.push(new AssetGenericBuilder_1.AssetGenericBuilder(params));
     }
-    mints() {
-        return [...this.assets.map((a) => a.mints())].flat();
+    tokenAddresses() {
+        return [...this.assets.map((a) => a.tokenAddresses())].flat();
     }
     get(networkId, platformId, tokenPrices) {
         var _a;
@@ -27,7 +27,7 @@ class ElementMultipleBuilder extends ElementBuilder_1.ElementBuilder {
         if (assets.length === 0)
             return null;
         return {
-            type: this.type,
+            type: portfolio_core_1.PortfolioElementType.multiple,
             label: this.label,
             networkId,
             platformId: this.platformId || platformId,

package/src/utils/elementbuilder/ElementMultipleBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementMultipleBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementMultipleBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAKoC;AACpC,qDAAkD;AAClD,2DAAwD;AAQxD,+DAA4D;AAE5D,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,KAAK;QACH,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACvD,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,UAAkB,EAClB,WAA0B;;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aACzC,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,IAAI,CAAC,IAAI;YACf,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;SACI,CAAC;IACxB,CAAC;CACF;AA/CD,wDA+CC"}
+{"version":3,"file":"ElementMultipleBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementMultipleBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAMoC;AACpC,qDAAkD;AAClD,2DAAwD;AAQxD,+DAA4D;AAE5D,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;;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aACzC,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;AA/CD,wDA+CC"}

package/src/utils/elementbuilder/ElementRegistry.d.ts

@@ -7,6 +7,7 @@ import { ElementLiquidityBuilder } from './ElementLiquidityBuilder';
 import { ElementBorrowlendBuilder } from './ElementBorrowlendBuilder';
 import { ElementLeverageBuilder } from './ElementLeverageBuilder';
 import { ElementConcentratedLiquidityBuilder } from './ElementConcentratedLiquidityBuilder';
+import { ElementTradeBuilder } from './ElementTradeBuilder';
 export declare class ElementRegistry {
     readonly networkId: NetworkIdType;
     readonly platformId: string;
@@ -19,5 +20,8 @@ export declare class ElementRegistry {
     }): ElementConcentratedLiquidityBuilder;
     addElementBorrowlend(params: Omit<Params, 'type'>): ElementBorrowlendBuilder;
     addElementLeverage(params: Omit<Params, 'type'>): ElementLeverageBuilder;
+    addElementTrade(elementParams?: Omit<Params, 'type' | 'label'> & {
+        label?: PortfolioElementLabel;
+    }): ElementTradeBuilder;
     getElements(cache: Cache): Promise<PortfolioElement[]>;
 }

package/src/utils/elementbuilder/ElementRegistry.js

@@ -16,6 +16,7 @@ const ElementLiquidityBuilder_1 = require("./ElementLiquidityBuilder");
 const ElementBorrowlendBuilder_1 = require("./ElementBorrowlendBuilder");
 const ElementLeverageBuilder_1 = require("./ElementLeverageBuilder");
 const ElementConcentratedLiquidityBuilder_1 = require("./ElementConcentratedLiquidityBuilder");
+const ElementTradeBuilder_1 = require("./ElementTradeBuilder");
 class ElementRegistry {
     constructor(networkId, platformId) {
         this.networkId = networkId;
@@ -47,9 +48,17 @@ class ElementRegistry {
         this.elements.push(elementBuilder);
         return elementBuilder;
     }
+    addElementTrade(elementParams) {
+        const elementBuilder = new ElementTradeBuilder_1.ElementTradeBuilder({
+            type: portfolio_core_1.PortfolioElementType.trade,
+            label: (elementParams === null || elementParams === void 0 ? void 0 : elementParams.label) || 'LimitOrder',
+        });
+        this.elements.push(elementBuilder);
+        return elementBuilder;
+    }
     getElements(cache) {
         return __awaiter(this, void 0, void 0, function* () {
-            const mints = this.elements.map((e) => e.mints()).flat();
+            const mints = this.elements.map((e) => e.tokenAddresses()).flat();
             const tokenPrices = yield cache.getTokenPricesAsMap(mints, this.networkId);
             return this.elements
                 .map((e) => e.get(this.networkId, this.platformId, tokenPrices))

package/src/utils/elementbuilder/ElementRegistry.js.map

@@ -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;AAE5F,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;IAEK,WAAW,CAAC,KAAY;;YAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACzD,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,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;iBAC/D,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CACtB,CAAC;QAC5B,CAAC;KAAA;CACF;AAxED,0CAwEC"}
+{"version":3,"file":"ElementRegistry.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementRegistry.ts"],"names":[],"mappings":"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"}

package/src/utils/elementbuilder/ElementTradeBuilder.d.ts

@@ -0,0 +1,11 @@
+import { NetworkIdType, PortfolioElementTrade } from '@sonarwatch/portfolio-core';
+import { ElementBuilder } from './ElementBuilder';
+import { Params, TradeParams } from './Params';
+import { TokenPriceMap } from '../../TokenPriceMap';
+export declare class ElementTradeBuilder extends ElementBuilder {
+    params?: TradeParams;
+    constructor(params: Params);
+    setTrade(params: TradeParams): void;
+    tokenAddresses(): string[];
+    get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementTrade | null;
+}

package/src/utils/elementbuilder/ElementTradeBuilder.js

@@ -0,0 +1,87 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ElementTradeBuilder = void 0;
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const ElementBuilder_1 = require("./ElementBuilder");
+const AssetTokenBuilder_1 = require("./AssetTokenBuilder");
+class ElementTradeBuilder extends ElementBuilder_1.ElementBuilder {
+    // eslint-disable-next-line @typescript-eslint/no-useless-constructor
+    constructor(params) {
+        super(params);
+    }
+    setTrade(params) {
+        this.params = params;
+    }
+    tokenAddresses() {
+        var _a, _b;
+        const mints = [];
+        if ((_a = this.params) === null || _a === void 0 ? void 0 : _a.inputAsset)
+            mints.push(...new AssetTokenBuilder_1.AssetTokenBuilder(this.params.inputAsset).tokenAddresses());
+        if ((_b = this.params) === null || _b === void 0 ? void 0 : _b.outputAsset)
+            mints.push(this.params.outputAsset.address.toString());
+        return mints;
+    }
+    get(networkId, platformId, tokenPrices) {
+        var _a, _b, _c;
+        if (!this.params)
+            return null;
+        const inputAsset = new AssetTokenBuilder_1.AssetTokenBuilder(this.params.inputAsset).get(networkId, tokenPrices);
+        if (!(inputAsset === null || inputAsset === void 0 ? void 0 : inputAsset.data.amount))
+            return null;
+        const outputAsset = new bignumber_js_1.default(this.params.outputAsset.amount || 0).gt(0)
+            ? new AssetTokenBuilder_1.AssetTokenBuilder({
+                address: this.params.outputAsset.address.toString(),
+                amount: new bignumber_js_1.default(this.params.outputAsset.amount || 0).toNumber(),
+            }).get(networkId, tokenPrices)
+            : null;
+        const inputPrice = tokenPrices.get(this.params.inputAsset.address.toString());
+        const outputPrice = tokenPrices.get(this.params.outputAsset.address.toString());
+        if (!inputPrice)
+            return null;
+        const initialInputAmount = new bignumber_js_1.default(this.params.initialInputAmount).dividedBy(Math.pow(10, inputPrice.decimals));
+        return {
+            networkId,
+            label: this.label,
+            platformId,
+            type: portfolio_core_1.PortfolioElementType.trade,
+            name: this.name,
+            tags: this.tags,
+            data: {
+                assets: {
+                    input: inputAsset,
+                    output: outputAsset,
+                },
+                inputAddress: this.params.inputAsset.address.toString(),
+                outputAddress: this.params.outputAsset.address.toString(),
+                initialInputAmount: initialInputAmount.toNumber(),
+                withdrawnOutputAmount: this.params.withdrawnOutputAmount && outputPrice
+                    ? new bignumber_js_1.default(this.params.withdrawnOutputAmount)
+                        .dividedBy(Math.pow(10, outputPrice.decimals))
+                        .toNumber()
+                    : 0,
+                expectedOutputAmount: this.params.expectedOutputAmount && outputPrice
+                    ? new bignumber_js_1.default(this.params.expectedOutputAmount)
+                        .dividedBy(Math.pow(10, outputPrice.decimals))
+                        .toNumber()
+                    : undefined,
+                filledPercentage: new bignumber_js_1.default(1)
+                    .minus(new bignumber_js_1.default(inputAsset.data.amount).dividedBy(initialInputAmount))
+                    .toNumber(),
+                inputPrice: inputPrice.price,
+                outputPrice: (outputPrice === null || outputPrice === void 0 ? void 0 : outputPrice.price) || null,
+                createdAt: (_a = this.params) === null || _a === void 0 ? void 0 : _a.createdAt,
+                expireAt: (_b = this.params) === null || _b === void 0 ? void 0 : _b.expireAt,
+                ref: (_c = this.ref) === null || _c === void 0 ? void 0 : _c.toString(),
+                sourceRefs: this.sourceRefs,
+                link: this.link,
+            },
+            value: (0, portfolio_core_1.getUsdValueSum)([inputAsset.value, (outputAsset === null || outputAsset === void 0 ? void 0 : outputAsset.value) || 0]),
+        };
+    }
+}
+exports.ElementTradeBuilder = ElementTradeBuilder;
+//# sourceMappingURL=ElementTradeBuilder.js.map

package/src/utils/elementbuilder/ElementTradeBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ElementTradeBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementTradeBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,+DAKoC;AACpC,gEAAqC;AACrC,qDAAkD;AAGlD,2DAAwD;AAExD,MAAa,mBAAoB,SAAQ,+BAAc;IAGrD,qEAAqE;IACrE,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,MAAmB;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,cAAc;;QACZ,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,UAAU;YACzB,KAAK,CAAC,IAAI,CACR,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,cAAc,EAAE,CAClE,CAAC;QACJ,IAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW;YAC1B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,UAAkB,EAClB,WAA0B;;QAE1B,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAC9B,MAAM,UAAU,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAClE,SAAS,EACT,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC,MAAM,CAAA;YAAE,OAAO,IAAI,CAAC;QAE1C,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1E,CAAC,CAAC,IAAI,qCAAiB,CAAC;gBACpB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE;gBACnD,MAAM,EAAE,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;aACtE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC;YAChC,CAAC,CAAC,IAAI,CAAC;QAET,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAChC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAC1C,CAAC;QACF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CACjC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,CAC3C,CAAC;QAEF,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC;QAE7B,MAAM,kBAAkB,GAAG,IAAI,sBAAS,CACtC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAC/B,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEvC,OAAO;YACL,SAAS;YACT,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,UAAU;YACV,IAAI,EAAE,qCAAoB,CAAC,KAAK;YAChC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE;gBACJ,MAAM,EAAE;oBACN,KAAK,EAAE,UAAU;oBACjB,MAAM,EAAE,WAAW;iBACpB;gBACD,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE;gBACvD,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE;gBACzD,kBAAkB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;gBACjD,qBAAqB,EACnB,IAAI,CAAC,MAAM,CAAC,qBAAqB,IAAI,WAAW;oBAC9C,CAAC,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC;yBAC7C,SAAS,CAAC,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,CAAC;yBACrC,QAAQ,EAAE;oBACf,CAAC,CAAC,CAAC;gBACP,oBAAoB,EAClB,IAAI,CAAC,MAAM,CAAC,oBAAoB,IAAI,WAAW;oBAC7C,CAAC,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;yBAC5C,SAAS,CAAC,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,CAAC;yBACrC,QAAQ,EAAE;oBACf,CAAC,CAAC,SAAS;gBACf,gBAAgB,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;qBAC/B,KAAK,CACJ,IAAI,sBAAS,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CACpE;qBACA,QAAQ,EAAE;gBACb,UAAU,EAAE,UAAU,CAAC,KAAK;gBAC5B,WAAW,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,KAAI,IAAI;gBACvC,SAAS,EAAE,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS;gBACjC,QAAQ,EAAE,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ;gBAC/B,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,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,KAAI,CAAC,CAAC,CAAC;SACnE,CAAC;IACJ,CAAC;CACF;AAnGD,kDAmGC"}

package/src/utils/elementbuilder/LevPositionBuilder.d.ts

@@ -1,9 +1,14 @@
-import { LevPosition, NetworkIdType } from '@sonarwatch/portfolio-core';
-import { TokenPriceMap } from '../../TokenPriceMap';
-import { LevPositionParams } from './Params';
-export declare class LevPositionBuilder {
+import { CrossLevPosition, IsoLevPosition, NetworkIdType } from '@sonarwatch/portfolio-core';
+import { CrossLevPositionParams, IsoLevPositionParams } from './Params';
+export declare class IsoLevPositionBuilder {
     private params;
-    constructor(params: LevPositionParams);
-    mints(): string[];
-    get(networkId: NetworkIdType, tokenPrices: TokenPriceMap): LevPosition | null;
+    constructor(params: IsoLevPositionParams);
+    get(networkId: NetworkIdType): IsoLevPosition;
+    get tokenAddress(): string | undefined;
+}
+export declare class CrossLevPositionBuilder {
+    private params;
+    constructor(params: CrossLevPositionParams);
+    get(networkId: NetworkIdType): CrossLevPosition;
+    get tokenAddress(): string | undefined;
 }

package/src/utils/elementbuilder/LevPositionBuilder.js

@@ -1,50 +1,35 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LevPositionBuilder = void 0;
+exports.CrossLevPositionBuilder = exports.IsoLevPositionBuilder = void 0;
+/* eslint-disable max-classes-per-file */
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
-class LevPositionBuilder {
+class IsoLevPositionBuilder {
     constructor(params) {
         this.params = params;
     }
-    mints() {
-        if (this.params.collateralAmount)
-            return [this.params.address];
-        return [];
+    get(networkId) {
+        return Object.assign(Object.assign({}, this.params), { address: this.params.address
+                ? (0, portfolio_core_1.formatTokenAddress)(this.params.address, networkId)
+                : undefined, value: this.params.value ||
+                (0, portfolio_core_1.getUsdValueSum)([this.params.collateralValue, this.params.pnlValue]) });
     }
-    get(networkId, tokenPrices) {
-        var _a;
-        let collateralValue;
-        if (this.params.collateralAmount) {
-            const collateralTokenPrice = tokenPrices.get(this.params.address);
-            if (!collateralTokenPrice)
-                return null;
-            collateralValue = this.params.collateralAmount
-                .dividedBy(Math.pow(10, collateralTokenPrice.decimals))
-                .multipliedBy(collateralTokenPrice.price);
-        }
-        else if (!this.params.collateralValue) {
-            return null;
-        }
-        else {
-            collateralValue = new bignumber_js_1.default(this.params.collateralValue);
-        }
-        return {
-            address: (0, portfolio_core_1.formatTokenAddress)(this.params.address, networkId),
-            side: this.params.side,
-            liquidationPrice: this.params.liquidationPrice || null,
-            collateralValue: collateralValue.toNumber(),
-            sizeValue: this.params.sizeValue.toNumber(),
-            pnlValue: (_a = this.params.pnlValue) === null || _a === void 0 ? void 0 : _a.toNumber(),
-            value: collateralValue.plus(this.params.pnlValue || 0).toNumber(),
-            name: this.params.name,
-            imageUri: this.params.imageUri,
-            leverage: this.params.leverage,
-        };
+    get tokenAddress() {
+        return this.params.address;
     }
 }
-exports.LevPositionBuilder = LevPositionBuilder;
+exports.IsoLevPositionBuilder = IsoLevPositionBuilder;
+class CrossLevPositionBuilder {
+    constructor(params) {
+        this.params = params;
+    }
+    get(networkId) {
+        return Object.assign(Object.assign({}, this.params), { address: this.params.address
+                ? (0, portfolio_core_1.formatTokenAddress)(this.params.address, networkId)
+                : undefined });
+    }
+    get tokenAddress() {
+        return this.params.address;
+    }
+}
+exports.CrossLevPositionBuilder = CrossLevPositionBuilder;
 //# sourceMappingURL=LevPositionBuilder.js.map

package/src/utils/elementbuilder/LevPositionBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"LevPositionBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/LevPositionBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,+DAIoC;AACpC,gEAAqC;AAIrC,MAAa,kBAAkB;IAG7B,YAAY,MAAyB;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB;YAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,WAA0B;;QAE1B,IAAI,eAAe,CAAC;QACpB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;YACjC,MAAM,oBAAoB,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAClE,IAAI,CAAC,oBAAoB;gBAAE,OAAO,IAAI,CAAC;YACvC,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB;iBAC3C,SAAS,CAAC,SAAA,EAAE,EAAI,oBAAoB,CAAC,QAAQ,CAAA,CAAC;iBAC9C,YAAY,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC9C,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAA,mCAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC;YAC3D,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,IAAI;YACtD,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;YAC3C,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC3C,QAAQ,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,QAAQ,0CAAE,QAAQ,EAAE;YAC1C,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;YACjE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;SAChB,CAAC;IACnB,CAAC;CACF;AA1CD,gDA0CC"}
+{"version":3,"file":"LevPositionBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/LevPositionBuilder.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AACzC,+DAMoC;AAGpC,MAAa,qBAAqB;IAGhC,YAAY,MAA4B;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,SAAwB;QAC1B,uCACK,IAAI,CAAC,MAAM,KACd,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBAC1B,CAAC,CAAC,IAAA,mCAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC;gBACpD,CAAC,CAAC,SAAS,EACb,KAAK,EACH,IAAI,CAAC,MAAM,CAAC,KAAK;gBACjB,IAAA,+BAAc,EAAC,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IACrE;IACJ,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;CACF;AAtBD,sDAsBC;AAED,MAAa,uBAAuB;IAGlC,YAAY,MAA8B;QACxC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,SAAwB;QAC1B,uCACK,IAAI,CAAC,MAAM,KACd,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBAC1B,CAAC,CAAC,IAAA,mCAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC;gBACpD,CAAC,CAAC,SAAS,IACb;IACJ,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;CACF;AAnBD,0DAmBC"}

package/src/utils/elementbuilder/Params.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
-import { LeverageSide, PortfolioAssetAttributes, PortfolioElementLabel, PortfolioElementTypeType, SourceRef, UsdValue } from '@sonarwatch/portfolio-core';
+import { CrossLevPosition, IsoLevPosition, PortfolioAssetAttributes, PortfolioElementLabel, PortfolioElementTypeType, SourceRef, UsdValue } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';
 export type Params = {
@@ -36,18 +36,6 @@ export type ConcentratedLiquidityParams = {
     ref?: string | PublicKey;
     link?: string;
 };
-export type LevPositionParams = {
-    address: string;
-    collateralAmount?: BigNumber;
-    collateralValue?: UsdValue;
-    side: LeverageSide;
-    sizeValue: BigNumber;
-    liquidationPrice?: BigNumber;
-    pnlValue?: BigNumber;
-    name?: string;
-    imageUri?: string;
-    leverage?: number;
-};
 export type PortfolioAssetGenericParams = {
     address?: string | PublicKey;
     amount?: number | BigNumber | string;
@@ -62,3 +50,19 @@ export type PortfolioAssetTokenParams = {
     attributes?: PortfolioAssetAttributes;
     alreadyShifted?: boolean;
 };
+export type TradeParams = {
+    inputAsset: PortfolioAssetTokenParams;
+    outputAsset: {
+        address: string | PublicKey;
+        amount?: number | BigNumber | string;
+    };
+    initialInputAmount: number | BigNumber | string;
+    expectedOutputAmount?: number | BigNumber | string;
+    withdrawnOutputAmount: number | BigNumber | string;
+    createdAt?: number;
+    expireAt?: number;
+};
+export type IsoLevPositionParams = Omit<IsoLevPosition, 'value'> & {
+    value?: UsdValue;
+};
+export type CrossLevPositionParams = CrossLevPosition;

package/src/utils/sei/constants.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.poolQueryMsg = exports.minterQueryMsg = exports.tokenInfoQueryMsg = exports.infoQueryMsg = void 0;
-exports.infoQueryMsg = JSON.parse(`{
-  "info": {}
+exports.infoQueryMsg = JSON.parse(`{
+  "info": {}
 }`);
-exports.tokenInfoQueryMsg = JSON.parse(`{
-  "token_info": {}
+exports.tokenInfoQueryMsg = JSON.parse(`{
+  "token_info": {}
 }`);
-exports.minterQueryMsg = JSON.parse(`{
-  "minter": {}
+exports.minterQueryMsg = JSON.parse(`{
+  "minter": {}
 }`);
-exports.poolQueryMsg = JSON.parse(`{
-  "pool": {}
+exports.poolQueryMsg = JSON.parse(`{
+  "pool": {}
 }`);
 //# sourceMappingURL=constants.js.map

package/src/utils/sei/getQueryBalanceByOwner.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 function getQueryBalanceByOwner(owner) {
-    return JSON.parse(`{
-    "balance": {
-      "address": "${owner}"
-    }
+    return JSON.parse(`{
+    "balance": {
+      "address": "${owner}"
+    }
   }`);
 }
 exports.default = getQueryBalanceByOwner;