@sonarwatch/portfolio-plugins 0.15.35 → 0.15.37

package/src/plugins/uniswap-v2/helpers.js

@@ -40,28 +40,28 @@ function getPairKey(version) {
 exports.getPairKey = getPairKey;
 function getPairsV2FromTheGraph(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pairs(
-        orderBy: reserveUSD
-        first: ${length}
-        orderDirection: desc
-        where: { trackedReserveETH_not: "0" }
-      ) {
-        id
-        reserve0
-        reserve1
-        totalSupply
-        token0 {
-          id
-          decimals
-        }
-        token1 {
-          id
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pairs(
+        orderBy: reserveUSD
+        first: ${length}
+        orderDirection: desc
+        where: { trackedReserveETH_not: "0" }
+      ) {
+        id
+        reserve0
+        reserve1
+        totalSupply
+        token0 {
+          id
+          decimals
+        }
+        token1 {
+          id
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pairs = res.pairs;

package/src/plugins/zeta/airdropFetcher.js

@@ -41,20 +41,20 @@ const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAcc
 const helpers_1 = require("./helpers");
 const AirdropFetcher_1 = require("../../AirdropFetcher");
 const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
-const query = (0, graphql_request_1.gql) `
-  query GetAirdropFinalFrontend($authority: String!) {
-    getAirdropFinalFrontend(authority: $authority) {
-      authority
-      community_allocation
-      eligibility
-      main_allocation
-      og_allocation
-      s1_allocation
-      s2_allocation
-      total_allocation
-      __typename
-    }
-  }
+const query = (0, graphql_request_1.gql) `
+  query GetAirdropFinalFrontend($authority: String!) {
+    getAirdropFinalFrontend(authority: $authority) {
+      authority
+      community_allocation
+      eligibility
+      main_allocation
+      og_allocation
+      s1_allocation
+      s2_allocation
+      total_allocation
+      __typename
+    }
+  }
 `;
 const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield (0, graphql_request_1.default)(constants_1.graphqlApi, query, {

package/src/utils/elementbuilder/AssetCollectibleBuilder.js

@@ -20,20 +20,19 @@ class AssetCollectibleBuilder extends AssetBuilder_1.AssetBuilder {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     tokenPrices) {
         var _a;
+        const amount = new bignumber_js_1.default(this.params.amount || 1).toFixed(1);
         return {
             type: portfolio_core_1.PortfolioAssetType.collectible,
             networkId,
-            value: new bignumber_js_1.default(this.params.collection.floorPrice)
-                .multipliedBy(new bignumber_js_1.default(this.params.amount || 1))
-                .toNumber(),
+            value: (0, portfolio_core_1.fixUsdValue)(new bignumber_js_1.default(this.params.collection.floorPrice)
+                .multipliedBy(amount)
+                .toNumber()),
             name: this.params.name || this.params.collection.name,
             data: {
                 address: this.params.address.toString(),
-                amount: new bignumber_js_1.default(this.params.amount || 1).toNumber(),
+                amount: Number(amount),
                 price: new bignumber_js_1.default(this.params.collection.floorPrice).toNumber(),
                 name: this.params.name || this.params.collection.name,
-                /* dataUri: asset.content.json_uri,
-                attributes: asset.content.metadata.attributes, */
                 collection: {
                     name: this.params.collection.name,
                     floorPrice: new bignumber_js_1.default(this.params.collection.floorPrice).toNumber(),

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

@@ -1 +1 @@
-{"version":3,"file":"AssetCollectibleBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetCollectibleBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,+DAKoC;AACpC,gEAAqC;AACrC,iDAA8C;AAG9C,MAAa,uBAAwB,SAAQ,2BAAY;IAGvD,YAAY,MAAuC;QACjD,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,kDAAkD;IAClD,cAAc;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,GAAG,CACD,SAAwB;IACxB,6DAA6D;IAC7D,WAA0B;;QAE1B,OAAO;YACL,IAAI,EAAE,mCAAkB,CAAC,WAAW;YACpC,SAAS;YACT,KAAK,EAAE,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;iBACpD,YAAY,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;iBACpD,QAAQ,EAAE;YACb,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI;YACrD,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;gBACvC,MAAM,EAAE,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;gBACzD,KAAK,EAAE,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE;gBAClE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI;gBACrD;iEACiD;gBACjD,UAAU,EAAE;oBACV,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI;oBACjC,UAAU,EAAE,IAAI,sBAAS,CACvB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAClC,CAAC,QAAQ,EAAE;iBACb;aACF;YACD,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ;YACzC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE;YACxC,IAAI,EACF,IAAI,CAAC,MAAM,CAAC,IAAI;gBAChB,iCAAiC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACxD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,GAAG,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,0CAAE,QAAQ,EAAE;SACjC,CAAC;IACJ,CAAC;CACF;AAhDD,0DAgDC"}
+{"version":3,"file":"AssetCollectibleBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetCollectibleBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,+DAMoC;AACpC,gEAAqC;AACrC,iDAA8C;AAG9C,MAAa,uBAAwB,SAAQ,2BAAY;IAGvD,YAAY,MAAuC;QACjD,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,kDAAkD;IAClD,cAAc;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,GAAG,CACD,SAAwB;IACxB,6DAA6D;IAC7D,WAA0B;;QAE1B,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACjE,OAAO;YACL,IAAI,EAAE,mCAAkB,CAAC,WAAW;YACpC,SAAS;YACT,KAAK,EAAE,IAAA,4BAAW,EAChB,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;iBAC7C,YAAY,CAAC,MAAM,CAAC;iBACpB,QAAQ,EAAE,CACd;YACD,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI;YACrD,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;gBACvC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;gBACtB,KAAK,EAAE,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE;gBAClE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI;gBACrD,UAAU,EAAE;oBACV,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI;oBACjC,UAAU,EAAE,IAAI,sBAAS,CACvB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAClC,CAAC,QAAQ,EAAE;iBACb;aACF;YACD,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ;YACzC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE;YACxC,IAAI,EACF,IAAI,CAAC,MAAM,CAAC,IAAI;gBAChB,iCAAiC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACxD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,GAAG,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,0CAAE,QAAQ,EAAE;SACjC,CAAC;IACJ,CAAC;CACF;AAjDD,0DAiDC"}

package/src/utils/elementbuilder/AssetGenericBuilder.js

@@ -30,7 +30,7 @@ class AssetGenericBuilder extends AssetBuilder_1.AssetBuilder {
         return {
             type: portfolio_core_1.PortfolioAssetType.generic,
             networkId,
-            value: value.isZero() ? null : value.toNumber(),
+            value: value.isZero() ? null : (0, portfolio_core_1.fixUsdValue)(value.toNumber()),
             name: this.params.name,
             data: {
                 address: this.params.address

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

@@ -1 +1 @@
-{"version":3,"file":"AssetGenericBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetGenericBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,+DAKoC;AACpC,gEAAqC;AACrC,iDAA8C;AAG9C,MAAa,mBAAoB,SAAQ,2BAAY;IAGnD,YAAY,MAAmC;QAC7C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,kDAAkD;IAClD,cAAc;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,GAAG,CACD,SAAwB;IACxB,6DAA6D;IAC7D,WAA0B;;QAE1B,IAAI,KAAK,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,KAAK,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnD,KAAK,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CACpD,IAAI,CAAC,MAAM,CAAC,MAAM,CACnB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,IAAI,EAAE,mCAAkB,CAAC,OAAO;YAChC,SAAS;YACT,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;oBAC1B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAChC,CAAC,CAAC,SAAS;gBACb,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;oBACxB,CAAC,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;oBAC9C,CAAC,CAAC,SAAS;aACd;YACD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE;YACxC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,GAAG,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,0CAAE,QAAQ,EAAE;SACjC,CAAC;IACJ,CAAC;CACF;AA9CD,kDA8CC"}
+{"version":3,"file":"AssetGenericBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetGenericBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,+DAMoC;AACpC,gEAAqC;AACrC,iDAA8C;AAG9C,MAAa,mBAAoB,SAAQ,2BAAY;IAGnD,YAAY,MAAmC;QAC7C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,kDAAkD;IAClD,cAAc;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,GAAG,CACD,SAAwB;IACxB,6DAA6D;IAC7D,WAA0B;;QAE1B,IAAI,KAAK,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,KAAK,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnD,KAAK,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CACpD,IAAI,CAAC,MAAM,CAAC,MAAM,CACnB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,IAAI,EAAE,mCAAkB,CAAC,OAAO;YAChC,SAAS;YACT,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,4BAAW,EAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC5D,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;oBAC1B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAChC,CAAC,CAAC,SAAS;gBACb,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;oBACxB,CAAC,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;oBAC9C,CAAC,CAAC,SAAS;aACd;YACD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE;YACxC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,GAAG,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,0CAAE,QAAQ,EAAE;SACjC,CAAC;IACJ,CAAC;CACF;AA9CD,kDA8CC"}

package/src/utils/elementbuilder/AssetTokenBuilder.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 { NetworkIdType, PortfolioAsset, PortfolioAssetAttributes, SourceRef, TokenPriceMap } from '@sonarwatch/portfolio-core';
+import { NetworkIdType, PortfolioAsset, PortfolioAssetAttributes, SourceRef, TokenPriceMap, TokenYield } from '@sonarwatch/portfolio-core';
 import BigNumber from 'bignumber.js';
 import { PublicKey } from '@solana/web3.js';
 import { AssetBuilder } from './AssetBuilder';
@@ -13,6 +13,7 @@ export declare class AssetTokenBuilder extends AssetBuilder {
     sourceRefs?: SourceRef[];
     ref?: string | PublicKey;
     link?: string;
+    tokenYield?: TokenYield;
     constructor(params: PortfolioAssetTokenParams);
     tokenAddresses(): string[];
     getUnderlyings(networkId: NetworkIdType, tokenPrices: TokenPriceMap): PortfolioAsset[];

package/src/utils/elementbuilder/AssetTokenBuilder.js

@@ -18,6 +18,7 @@ class AssetTokenBuilder extends AssetBuilder_1.AssetBuilder {
         this.ref = params.ref;
         this.sourceRefs = params.sourceRefs;
         this.link = params.link;
+        this.tokenYield = params.tokenYield;
     }
     tokenAddresses() {
         return [this.address];
@@ -43,7 +44,7 @@ class AssetTokenBuilder extends AssetBuilder_1.AssetBuilder {
             return null;
         if (!this.alreadyShifted && tokenPrice)
             amount = amount.dividedBy(Math.pow(10, tokenPrice.decimals));
-        return Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(this.address, amount.toNumber(), networkId, tokenPrice, undefined, this.attributes, this.link)), { sourceRefs: this.sourceRefs, ref: (_a = this.ref) === null || _a === void 0 ? void 0 : _a.toString() });
+        return Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(this.address, amount.toNumber(), networkId, tokenPrice, undefined, this.attributes, this.link, this.tokenYield)), { sourceRefs: this.sourceRefs, ref: (_a = this.ref) === null || _a === void 0 ? void 0 : _a.toString() });
     }
 }
 exports.AssetTokenBuilder = AssetTokenBuilder;

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

@@ -1 +1 @@
-{"version":3,"file":"AssetTokenBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetTokenBuilder.ts"],"names":[],"mappings":";;;;;;AAOA,gEAAqC;AAErC,4FAAoE;AACpE,8FAAsE;AACtE,iDAA8C;AAG9C,MAAa,iBAAkB,SAAQ,2BAAY;IASjD,YAAY,MAAiC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC;QACrD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IAED,cAAc,CACZ,SAAwB,EACxB,WAA0B;QAE1B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAE3B,IAAI,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAExC,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,UAAU,CAAC,WAAW;YAAE,OAAO,EAAE,CAAC;QAEzD,IAAI,CAAC,IAAI,CAAC,cAAc;YACtB,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEvD,OAAO,IAAA,iCAAuB,EAC5B,UAAU,CAAC,OAAO,EAClB,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,EACT,UAAU,EACV,SAAS,EACT,IAAI,CAAC,UAAU,CAChB,CAAC;IACJ,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,WAA0B;;QAE1B,IAAI,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,IAAI,CAAC;QAEjC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC;QAErD,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,UAAU;YACpC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEvD,uCACK,IAAA,gCAAsB,EACvB,IAAI,CAAC,OAAO,EACZ,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,EACT,UAAU,EACV,SAAS,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,IAAI,CACV,KACD,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE,IACzB;IACJ,CAAC;CACF;AA3ED,8CA2EC"}
+{"version":3,"file":"AssetTokenBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetTokenBuilder.ts"],"names":[],"mappings":";;;;;;AAQA,gEAAqC;AAErC,4FAAoE;AACpE,8FAAsE;AACtE,iDAA8C;AAG9C,MAAa,iBAAkB,SAAQ,2BAAY;IAUjD,YAAY,MAAiC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC;QACrD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACtC,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IAED,cAAc,CACZ,SAAwB,EACxB,WAA0B;QAE1B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAE3B,IAAI,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAExC,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,UAAU,CAAC,WAAW;YAAE,OAAO,EAAE,CAAC;QAEzD,IAAI,CAAC,IAAI,CAAC,cAAc;YACtB,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEvD,OAAO,IAAA,iCAAuB,EAC5B,UAAU,CAAC,OAAO,EAClB,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,EACT,UAAU,EACV,SAAS,EACT,IAAI,CAAC,UAAU,CAChB,CAAC;IACJ,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,WAA0B;;QAE1B,IAAI,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,IAAI,CAAC;QAEjC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC;QAErD,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,UAAU;YACpC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEvD,uCACK,IAAA,gCAAsB,EACvB,IAAI,CAAC,OAAO,EACZ,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,EACT,UAAU,EACV,SAAS,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,CAChB,KACD,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE,IACzB;IACJ,CAAC;CACF;AA9ED,8CA8EC"}

package/src/utils/elementbuilder/ElementLeverageBuilder.js

@@ -69,13 +69,13 @@ class ElementLeverageBuilder extends ElementBuilder_1.ElementBuilder {
             data: {
                 isolated: {
                     positions: isoPositions,
-                    value: isoValue,
+                    value: (0, portfolio_core_1.fixUsdValue)(isoValue),
                 },
                 cross: {
                     positions: crossPositions,
                     collateralAssets: crossCollateralAssets,
                     collateralValue: (0, portfolio_core_1.getUsdValueSum)(crossCollateralAssets.map((a) => a.value)),
-                    value: crossValue,
+                    value: (0, portfolio_core_1.fixUsdValue)(crossValue),
                     leverage: crossLeverage,
                 },
                 value,

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,+DAQoC;AACpC,qDAAkD;AAOlD,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,IACE,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;YAC9B,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC;YAChC,IAAI,CAAC,qBAAqB,CAAC,MAAM,KAAK,CAAC;YAEvC,OAAO,IAAI,CAAC;QAEd,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;AAvGD,wDAuGC"}
+{"version":3,"file":"ElementLeverageBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLeverageBuilder.ts"],"names":[],"mappings":";;;AAAA,+DASoC;AACpC,qDAAkD;AAOlD,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,IACE,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;YAC9B,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC;YAChC,IAAI,CAAC,qBAAqB,CAAC,MAAM,KAAK,CAAC;YAEvC,OAAO,IAAI,CAAC;QAEd,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,IAAA,4BAAW,EAAC,QAAQ,CAAC;iBAC7B;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,IAAA,4BAAW,EAAC,UAAU,CAAC;oBAC9B,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;AAvGD,wDAuGC"}

package/src/utils/elementbuilder/LevPositionBuilder.js

@@ -10,8 +10,8 @@ class IsoLevPositionBuilder {
     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]) });
+                : undefined, value: (0, portfolio_core_1.fixUsdValue)(this.params.value ||
+                (0, portfolio_core_1.getUsdValueSum)([this.params.collateralValue, this.params.pnlValue])) });
     }
     get tokenAddress() {
         return this.params.address;

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,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"}
+{"version":3,"file":"LevPositionBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/LevPositionBuilder.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AACzC,+DAOoC;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,EAAE,IAAA,4BAAW,EAChB,IAAI,CAAC,MAAM,CAAC,KAAK;gBACf,IAAA,+BAAc,EAAC,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CACtE,IACD;IACJ,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;CACF;AAvBD,sDAuBC;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 { CrossLevPosition, IsoLevPosition, PortfolioAssetAttributes, PortfolioElementLabel, PortfolioElementTypeType, SourceRef, UsdValue } from '@sonarwatch/portfolio-core';
+import { CrossLevPosition, IsoLevPosition, PortfolioAssetAttributes, PortfolioElementLabel, PortfolioElementTypeType, SourceRef, TokenYield, UsdValue } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';
 export type Params = {
@@ -70,6 +70,7 @@ export type PortfolioAssetTokenParams = {
     sourceRefs?: SourceRef[];
     ref?: string | PublicKey;
     link?: string;
+    tokenYield?: TokenYield;
 };
 export type TradeParams = {
     inputAsset: Omit<PortfolioAssetTokenParams, 'amount'> & {

package/src/utils/misc/tokenPriceToAssetToken.js

@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 function tokenPriceToAssetToken(address, amount, networkId, tokenPrice, price, attributes, link, tokenYield) {
     const fPrice = (tokenPrice === null || tokenPrice === void 0 ? void 0 : tokenPrice.price) || price || null;
+    const fAmount = tokenPrice
+        ? Number(amount.toFixed(tokenPrice.decimals))
+        : amount;
     return {
         type: portfolio_core_1.PortfolioAssetType.token,
         networkId,
-        value: fPrice ? fPrice * amount : null,
+        value: (0, portfolio_core_1.fixUsdValue)(fPrice ? fPrice * amount : null),
         data: {
             address: (0, portfolio_core_1.formatTokenAddress)(address, networkId),
-            amount,
+            amount: fAmount,
             price: fPrice,
             yield: tokenYield === null || tokenYield === void 0 ? void 0 : tokenYield.yield,
         },

package/src/utils/misc/tokenPriceToAssetToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokenPriceToAssetToken.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/tokenPriceToAssetToken.ts"],"names":[],"mappings":";;AAAA,+DAUoC;AAEpC,SAAwB,sBAAsB,CAC5C,OAAe,EACf,MAAc,EACd,SAAwB,EACxB,UAAqD,EACrD,KAAc,EACd,UAAqC,EACrC,IAAa,EACb,UAA8B;IAE9B,MAAM,MAAM,GAAa,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,KAAI,KAAK,IAAI,IAAI,CAAC;IAC5D,OAAO;QACL,IAAI,EAAE,mCAAkB,CAAC,KAAK;QAC9B,SAAS;QACT,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI;QACtC,IAAI,EAAE;YACJ,OAAO,EAAE,IAAA,mCAAkB,EAAC,OAAO,EAAE,SAAS,CAAC;YAC/C,MAAM;YACN,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK;SACzB;QACD,UAAU,EAAE,UAAU,IAAI,EAAE;QAC5B,IAAI;KACL,CAAC;AACJ,CAAC;AAxBD,yCAwBC"}
+{"version":3,"file":"tokenPriceToAssetToken.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/tokenPriceToAssetToken.ts"],"names":[],"mappings":";;AAAA,+DAWoC;AAEpC,SAAwB,sBAAsB,CAC5C,OAAe,EACf,MAAc,EACd,SAAwB,EACxB,UAAqD,EACrD,KAAc,EACd,UAAqC,EACrC,IAAa,EACb,UAA8B;IAE9B,MAAM,MAAM,GAAa,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,KAAI,KAAK,IAAI,IAAI,CAAC;IAC5D,MAAM,OAAO,GAAG,UAAU;QACxB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,MAAM,CAAC;IACX,OAAO;QACL,IAAI,EAAE,mCAAkB,CAAC,KAAK;QAC9B,SAAS;QACT,KAAK,EAAE,IAAA,4BAAW,EAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QACnD,IAAI,EAAE;YACJ,OAAO,EAAE,IAAA,mCAAkB,EAAC,OAAO,EAAE,SAAS,CAAC;YAC/C,MAAM,EAAE,OAAO;YACf,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK;SACzB;QACD,UAAU,EAAE,UAAU,IAAI,EAAE;QAC5B,IAAI;KACL,CAAC;AACJ,CAAC;AA3BD,yCA2BC"}

package/src/utils/misc/tokenPriceToLiquidity.js

@@ -9,10 +9,10 @@ function tokenPriceToLiquidity(address, amount, networkId, tokenPrice, tokenYiel
     const assets = (0, tokenPriceToAssetTokens_1.default)(address, amount, networkId, tokenPrice);
     return {
         assets,
-        assetsValue: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
+        assetsValue: (0, portfolio_core_1.fixUsdValue)((0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value))),
         rewardAssets: [],
         rewardAssetsValue: 0,
-        value: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
+        value: (0, portfolio_core_1.fixUsdValue)((0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value))),
         yields: tokenYield ? [tokenYield.yield] : [],
         name: tokenPrice.liquidityName,
         link: tokenPrice.link,

package/src/utils/misc/tokenPriceToLiquidity.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokenPriceToLiquidity.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/tokenPriceToLiquidity.ts"],"names":[],"mappings":";;;;;AAAA,+DAMoC;AACpC,wFAAgE;AAEhE,SAAwB,qBAAqB,CAC3C,OAAe,EACf,MAAc,EACd,SAAwB,EACxB,UAAsB,EACtB,UAAuB;IAEvB,MAAM,MAAM,GAAG,IAAA,iCAAuB,EACpC,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CACX,CAAC;IACF,OAAO;QACL,MAAM;QACN,WAAW,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACvD,YAAY,EAAE,EAAE;QAChB,iBAAiB,EAAE,CAAC;QACpB,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;QAC5C,IAAI,EAAE,UAAU,CAAC,aAAa;QAC9B,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,UAAU,EAAE;YACV;gBACE,OAAO;gBACP,IAAI,EAAE,MAAM;aACb;SACF;KACF,CAAC;AACJ,CAAC;AA7BD,wCA6BC"}
+{"version":3,"file":"tokenPriceToLiquidity.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/tokenPriceToLiquidity.ts"],"names":[],"mappings":";;;;;AAAA,+DAOoC;AACpC,wFAAgE;AAEhE,SAAwB,qBAAqB,CAC3C,OAAe,EACf,MAAc,EACd,SAAwB,EACxB,UAAsB,EACtB,UAAuB;IAEvB,MAAM,MAAM,GAAG,IAAA,iCAAuB,EACpC,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CACX,CAAC;IACF,OAAO;QACL,MAAM;QACN,WAAW,EAAE,IAAA,4BAAW,EAAC,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACpE,YAAY,EAAE,EAAE;QAChB,iBAAiB,EAAE,CAAC;QACpB,KAAK,EAAE,IAAA,4BAAW,EAAC,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9D,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;QAC5C,IAAI,EAAE,UAAU,CAAC,aAAa;QAC9B,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,UAAU,EAAE;YACV;gBACE,OAAO;gBACP,IAAI,EAAE,MAAM;aACb;SACF;KACF,CAAC;AACJ,CAAC;AA7BD,wCA6BC"}

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;

package/src/utils/solana/getTokenAccountsByOwner.d.ts

@@ -1,4 +1,5 @@
-import { TokenAccount } from './structs';
+import { TokenAccount, TokenAccountWithMetadata } from './structs';
 import { ParsedAccount } from './types';
-export declare const getTokenAccountsByOwner: (owner: string) => Promise<ParsedAccount<TokenAccount>[]>;
+import { SolanaClient } from '../clients/types';
+export declare const getTokenAccountsByOwner: (client: SolanaClient, owner: string) => Promise<ParsedAccount<TokenAccountWithMetadata>[]>;
 export declare const getTokenAccountsByOwnerMemo: (owner: string) => Promise<ParsedAccount<TokenAccount>[]>;

package/src/utils/solana/getTokenAccountsByOwner.js

@@ -13,10 +13,12 @@ exports.getTokenAccountsByOwnerMemo = exports.getTokenAccountsByOwner = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const structs_1 = require("./structs");
-const clients_1 = require("../clients");
 const MemoryCache_1 = require("../misc/MemoryCache");
-const getTokenAccountsByOwner = (owner) => __awaiter(void 0, void 0, void 0, function* () {
-    const client = (0, clients_1.getClientSolana)();
+const clients_1 = require("../clients");
+const helpers_1 = require("../../plugins/metaplex/helpers");
+const getParsedMultipleAccountsInfo_1 = require("./getParsedMultipleAccountsInfo");
+const structs_2 = require("../../plugins/metaplex/structs");
+const getTokenAccountsByOwner = (client, owner) => __awaiter(void 0, void 0, void 0, function* () {
     const tokenAccounts = yield Promise.all([
         client.getTokenAccountsByOwner(new web3_js_1.PublicKey(owner), {
             programId: constants_1.solanaTokenPidPk,
@@ -25,12 +27,27 @@ const getTokenAccountsByOwner = (owner) => __awaiter(void 0, void 0, void 0, fun
             programId: constants_1.solanaToken2022PidPk,
         }),
     ]);
-    return [...tokenAccounts[0].value, ...tokenAccounts[1].value]
+    const tokenAccountsInfo = [
+        ...tokenAccounts[0].value,
+        ...tokenAccounts[1].value,
+    ]
         .map((x) => (Object.assign(Object.assign({}, structs_1.tokenAccountStruct.deserialize(x.account.data)[0]), { pubkey: x.pubkey, lamports: x.account.lamports, tokenProgram: x.account.owner })))
         .filter((a) => !a.amount.isZero());
+    const metadataAccounts = yield (0, getParsedMultipleAccountsInfo_1.getParsedMultipleAccountsInfo)(client, structs_2.metadataAccountStruct, tokenAccountsInfo
+        .filter((t) => t.amount.isEqualTo(1))
+        .map((t) => (0, helpers_1.getMetadataPubkey)(t.mint)));
+    return tokenAccountsInfo.map((t, i) => {
+        const metadataAccount = metadataAccounts[i];
+        if (!metadataAccount)
+            return t;
+        return Object.assign(Object.assign({}, t), { metadata: {
+                name: metadataAccount.data.name.split('\x00')[0].trim(),
+                symbol: metadataAccount.data.symbol.split('\x00')[0].trim(),
+            } });
+    });
 });
 exports.getTokenAccountsByOwner = getTokenAccountsByOwner;
-const memoCollection = new MemoryCache_1.MemoryCache(exports.getTokenAccountsByOwner);
+const memoCollection = new MemoryCache_1.MemoryCache((owner) => (0, exports.getTokenAccountsByOwner)((0, clients_1.getClientSolana)(), owner));
 const getTokenAccountsByOwnerMemo = (owner) => __awaiter(void 0, void 0, void 0, function* () { return memoCollection.getItem(owner); });
 exports.getTokenAccountsByOwnerMemo = getTokenAccountsByOwnerMemo;
 //# sourceMappingURL=getTokenAccountsByOwner.js.map

package/src/utils/solana/getTokenAccountsByOwner.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTokenAccountsByOwner.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/getTokenAccountsByOwner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,2CAAqE;AACrE,uCAA6D;AAC7D,wCAA6C;AAE7C,qDAAkD;AAE3C,MAAM,uBAAuB,GAAG,CAAO,KAAa,EAAE,EAAE;IAC7D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtC,MAAM,CAAC,uBAAuB,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,EAAE;YACnD,SAAS,EAAE,4BAAgB;SAC5B,CAAC;QACF,MAAM,CAAC,uBAAuB,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,EAAE;YACnD,SAAS,EAAE,gCAAoB;SAChC,CAAC;KACH,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SAC1D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCACP,4BAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KACpD,MAAM,EAAE,CAAC,CAAC,MAAM,EAChB,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAC5B,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,IAC7B,CAAC;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAkC,CAAC;AACxE,CAAC,CAAA,CAAC;AAlBW,QAAA,uBAAuB,2BAkBlC;AAEF,MAAM,cAAc,GAAG,IAAI,yBAAW,CACpC,+BAAuB,CACxB,CAAC;AAEK,MAAM,2BAA2B,GAAG,CAAO,KAAa,EAAE,EAAE,kDACjE,OAAA,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA,GAAA,CAAC;AADnB,QAAA,2BAA2B,+BACR"}
+{"version":3,"file":"getTokenAccountsByOwner.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/getTokenAccountsByOwner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,2CAAqE;AACrE,uCAImB;AAEnB,qDAAkD;AAElD,wCAA6C;AAC7C,4DAAmE;AACnE,mFAAgF;AAChF,4DAAuE;AAEhE,MAAM,uBAAuB,GAAG,CACrC,MAAoB,EACpB,KAAa,EACuC,EAAE;IACtD,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtC,MAAM,CAAC,uBAAuB,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,EAAE;YACnD,SAAS,EAAE,4BAAgB;SAC5B,CAAC;QACF,MAAM,CAAC,uBAAuB,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,EAAE;YACnD,SAAS,EAAE,gCAAoB;SAChC,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG;QACxB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK;QACzB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK;KAC1B;SACE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCACP,4BAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KACpD,MAAM,EAAE,CAAC,CAAC,MAAM,EAChB,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAC5B,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,IAC7B,CAAC;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAkC,CAAC;IAEtE,MAAM,gBAAgB,GAAG,MAAM,IAAA,6DAA6B,EAC1D,MAAM,EACN,+BAAqB,EACrB,iBAAiB;SACd,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACpC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,2BAAiB,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CACzC,CAAC;IAEF,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,eAAe,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,eAAe;YAAE,OAAO,CAAC,CAAC;QAC/B,uCACK,CAAC,KACJ,QAAQ,EAAE;gBACR,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;gBACvD,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;aAC5D,IACD;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AA5CW,QAAA,uBAAuB,2BA4ClC;AAEF,MAAM,cAAc,GAAG,IAAI,yBAAW,CACpC,CAAC,KAAa,EAAE,EAAE,CAAC,IAAA,+BAAuB,EAAC,IAAA,yBAAe,GAAE,EAAE,KAAK,CAAC,CACrE,CAAC;AAEK,MAAM,2BAA2B,GAAG,CAAO,KAAa,EAAE,EAAE,kDACjE,OAAA,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA,GAAA,CAAC;AADnB,QAAA,2BAA2B,+BACR"}

package/src/utils/solana/structs.d.ts

@@ -31,4 +31,10 @@ export type TokenAccount = {
     readonly closeAuthorityOption: number;
     readonly closeAuthority: PublicKey;
 };
+export type TokenAccountWithMetadata = TokenAccount & {
+    readonly metadata?: {
+        name: string;
+        symbol: string;
+    };
+};
 export declare const tokenAccountStruct: BeetStruct<TokenAccount, Partial<TokenAccount>>;

package/src/utils/solana/structs.js.map

@@ -1 +1 @@
-{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/structs.ts"],"names":[],"mappings":";;;AAAA,oDAAsE;AACtE,kEAA6D;AAG7D,6CAAsC;AAYzB,QAAA,iBAAiB,GAAG,IAAI,iBAAU,CAC7C;IACE,CAAC,qBAAqB,EAAE,UAAG,CAAC;IAC5B,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,QAAQ,EAAE,aAAG,CAAC;IACf,CAAC,UAAU,EAAE,SAAE,CAAC;IAChB,CAAC,aAAa,EAAE,WAAI,CAAC;IACrB,CAAC,uBAAuB,EAAE,UAAG,CAAC;IAC9B,CAAC,iBAAiB,EAAE,uBAAS,CAAC;CAC/B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAmB,EAC7B,aAAa,CACd,CAAC;AAEF,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,iEAAiB,CAAA;IACjB,6DAAe,CAAA;IACf,mDAAU,CAAA;AACZ,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAgBY,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,QAAQ,EAAE,aAAG,CAAC;IACf,CAAC,gBAAgB,EAAE,UAAG,CAAC;IACvB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,OAAO,EAAE,SAAE,CAAC;IACb,CAAC,gBAAgB,EAAE,UAAG,CAAC;IACvB,CAAC,UAAU,EAAE,aAAG,CAAC;IACjB,CAAC,iBAAiB,EAAE,aAAG,CAAC;IACxB,CAAC,sBAAsB,EAAE,UAAG,CAAC;IAC7B,CAAC,gBAAgB,EAAE,uBAAS,CAAC;CAC9B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,EAC9B,cAAc,CACf,CAAC"}
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/structs.ts"],"names":[],"mappings":";;;AAAA,oDAAsE;AACtE,kEAA6D;AAG7D,6CAAsC;AAYzB,QAAA,iBAAiB,GAAG,IAAI,iBAAU,CAC7C;IACE,CAAC,qBAAqB,EAAE,UAAG,CAAC;IAC5B,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,QAAQ,EAAE,aAAG,CAAC;IACf,CAAC,UAAU,EAAE,SAAE,CAAC;IAChB,CAAC,aAAa,EAAE,WAAI,CAAC;IACrB,CAAC,uBAAuB,EAAE,UAAG,CAAC;IAC9B,CAAC,iBAAiB,EAAE,uBAAS,CAAC;CAC/B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAmB,EAC7B,aAAa,CACd,CAAC;AAEF,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,iEAAiB,CAAA;IACjB,6DAAe,CAAA;IACf,mDAAU,CAAA;AACZ,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAuBY,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,QAAQ,EAAE,aAAG,CAAC;IACf,CAAC,gBAAgB,EAAE,UAAG,CAAC;IACvB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,OAAO,EAAE,SAAE,CAAC;IACb,CAAC,gBAAgB,EAAE,UAAG,CAAC;IACvB,CAAC,UAAU,EAAE,aAAG,CAAC;IACjB,CAAC,iBAAiB,EAAE,aAAG,CAAC;IACxB,CAAC,sBAAsB,EAAE,UAAG,CAAC;IAC7B,CAAC,gBAAgB,EAAE,uBAAS,CAAC;CAC9B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,EAC9B,cAAc,CACf,CAAC"}

package/src/plugins/raydium/getClmmPositions.d.ts

@@ -1,3 +0,0 @@
-import { ParsedAccount, TokenAccount } from '../../utils/solana';
-import { Cache } from '../../Cache';
-export declare const getClmmPositions: (potentialTokens: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<import("@sonarwatch/portfolio-core").PortfolioElement[]>;

package/src/plugins/raydium/getClmmPositions.js

@@ -1,107 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClmmPositions = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const clients_1 = require("../../utils/clients");
-const solana_1 = require("../../utils/solana");
-const clmms_1 = require("./structs/clmms");
-const constants_1 = require("./constants");
-const helpers_1 = require("./helpers");
-const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
-const getClmmPositions = (potentialTokens, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!potentialTokens.length)
-        return [];
-    const positionsProgramAddress = potentialTokens.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), address.mint.toBuffer()], constants_1.raydiumProgram)[0]);
-    if (positionsProgramAddress.length === 0)
-        return [];
-    const client = (0, clients_1.getClientSolana)();
-    const personalPositionsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.personalPositionStateStruct, positionsProgramAddress);
-    if (!personalPositionsInfo || personalPositionsInfo.length === 0)
-        return [];
-    const poolsIds = personalPositionsInfo.flatMap((position) => position ? position.poolId : []);
-    const [poolStatesInfo, poolsStats] = yield Promise.all([
-        (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.poolStateStruct, poolsIds),
-        cache.getItems(poolsIds.map((p) => p.toString()), { prefix: constants_1.poolStatsPrefix, networkId: portfolio_core_1.NetworkId.solana }),
-    ]);
-    const tickArrays = yield Promise.all(personalPositionsInfo.map((personalPositionInfo, index) => {
-        if (!personalPositionInfo)
-            return [];
-        const poolStateInfo = poolStatesInfo[index];
-        if (!poolStateInfo)
-            return [];
-        return (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.tickArrayStatetruct, [
-            (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickLowerIndex, poolStateInfo.tickSpacing),
-            (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickUpperIndex, poolStateInfo.tickSpacing),
-        ]);
-    }));
-    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
-    for (let index = 0; index < personalPositionsInfo.length; index++) {
-        const personalPositionInfo = personalPositionsInfo[index];
-        if (!personalPositionInfo)
-            continue;
-        const poolStateInfo = poolStatesInfo.find((p) => p && personalPositionInfo.poolId.toString() === p.pubkey.toString());
-        if (!poolStateInfo)
-            continue;
-        const element = elementRegistry.addElementConcentratedLiquidity({
-            link: 'https://raydium.io/portfolio/?position_tab=concentrated',
-        });
-        const poolStats = poolsStats.find((p) => (p === null || p === void 0 ? void 0 : p.address) === personalPositionInfo.poolId.toString());
-        const liquidity = element.setLiquidity({
-            addressA: poolStateInfo.tokenMint0,
-            addressB: poolStateInfo.tokenMint1,
-            liquidity: personalPositionInfo.liquidity,
-            tickCurrentIndex: poolStateInfo.tickCurrent,
-            tickLowerIndex: personalPositionInfo.tickLowerIndex,
-            tickUpperIndex: personalPositionInfo.tickUpperIndex,
-            ref: personalPositionInfo.pubkey,
-            swapVolume24h: poolStats === null || poolStats === void 0 ? void 0 : poolStats.stats['24h'].volume,
-            feeRate: poolStats === null || poolStats === void 0 ? void 0 : poolStats.feeRate,
-            currentSqrtPrice: poolStateInfo.sqrtPriceX64,
-            poolLiquidity: poolStateInfo.liquidity,
-            sourceRefs: [
-                {
-                    name: 'Pool',
-                    address: personalPositionInfo.poolId.toString(),
-                },
-                {
-                    name: 'NFT Mint',
-                    address: personalPositionInfo.nftMint.toString(),
-                },
-            ],
-        });
-        const feesAndRewardsBalances = (0, helpers_1.getFeesAndRewardsBalance)(personalPositionInfo, poolStateInfo, tickArrays[index]);
-        if (feesAndRewardsBalances) {
-            liquidity.addRewardAsset({
-                address: poolStateInfo.tokenMint0,
-                amount: feesAndRewardsBalances.tokenFeeAmountA,
-            });
-            liquidity.addRewardAsset({
-                address: poolStateInfo.tokenMint1,
-                amount: feesAndRewardsBalances.tokenFeeAmountB,
-            });
-            feesAndRewardsBalances.rewards.forEach((rewardBalance, i) => {
-                if (rewardBalance.isZero() ||
-                    poolStateInfo.rewardInfos[i].tokenMint.toString() ===
-                        '11111111111111111111111111111111')
-                    return;
-                liquidity.addRewardAsset({
-                    address: poolStateInfo.rewardInfos[i].tokenMint,
-                    amount: rewardBalance,
-                });
-            });
-        }
-    }
-    return elementRegistry.getElements(cache);
-});
-exports.getClmmPositions = getClmmPositions;
-//# sourceMappingURL=getClmmPositions.js.map

package/src/plugins/raydium/getClmmPositions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getClmmPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/getClmmPositions.ts"],"names":[],"mappings":"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"}

package/src/plugins/tokens/fetchers/solana-nfts-underlyings.d.ts

@@ -1,3 +0,0 @@
-import { Fetcher } from '../../../Fetcher';
-declare const fetcher: Fetcher;
-export default fetcher;