@sonarwatch/portfolio-plugins 0.11.29 → 0.11.31

package/CHANGELOG.md

@@ -2,14 +2,22 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
-## [0.11.29](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.28...plugins-0.11.29) (2023-12-22)
+## [0.11.31](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.30...plugins-0.11.31) (2024-01-04)
 
 
 
-## [0.11.28](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.27...plugins-0.11.28) (2023-12-21)
+## [0.11.30](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.29...plugins-0.11.30) (2023-12-28)
 
 
 
+## [0.11.29](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.28...plugins-0.11.29) (2023-12-22)
+
+
+
+## [0.11.28](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.27...plugins-0.11.28) (2023-12-21)
+
+
+
 ## [0.11.27](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.26...plugins-0.11.27) (2023-12-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.11.29",
+  "version": "0.11.31",
   "type": "commonjs",
   "generators": "./generators.json",
   "dependencies": {
@@ -41,7 +41,7 @@
     "web3-v1": "npm:web3@^1.5.0"
   },
   "peerDependencies": {
-    "@sonarwatch/portfolio-core": "0.11.29"
+    "@sonarwatch/portfolio-core": "0.11.31"
   },
   "main": "./src/index.js",
   "types": "./src/index.d.ts"

package/src/plugins/tokens/fetchers/solana.js

@@ -13,73 +13,84 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const web3_js_1 = require("@solana/web3.js");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("../constants");
-const clients_1 = require("../../../utils/clients");
-const solana_1 = require("../../../utils/solana");
-const tokenPriceToAssetTokens_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetTokens"));
-const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
+const constants_2 = require("../../../utils/clients/constants");
 const helpers_1 = require("../helpers");
+const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
+const tokenPriceToLiquidity_1 = __importDefault(require("../../../utils/misc/tokenPriceToLiquidity"));
+const heliusAssetToAssetCollectible_1 = require("../../../utils/solana/das/heliusAssetToAssetCollectible");
+const getAssetsByOwnerDas_1 = require("../../../utils/solana/das/getAssetsByOwnerDas");
+const isHeliusFungibleAsset_1 = require("../../../utils/solana/das/isHeliusFungibleAsset");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const client = (0, clients_1.getClientSolana)();
-    const ownerPubKey = new web3_js_1.PublicKey(owner);
-    const tokenRegularAccounts = yield (0, solana_1.getTokenAccountsByOwner)(client, ownerPubKey);
-    const token2022Accounts = yield (0, solana_1.getTokenAccountsByOwner)(client, ownerPubKey, solana_1.solanaToken2022Pid);
-    const tokenAccounts = [...token2022Accounts, ...tokenRegularAccounts];
-    const mints = [...new Set(tokenAccounts.map((ta) => ta.mint.toString()))];
-    const tokenPricesArray = yield cache.getTokenPrices(mints, portfolio_core_1.NetworkId.solana);
+    const rpcEndpoint = (0, constants_2.getRpcEndpoint)(portfolio_core_1.NetworkId.solana);
+    const items = yield (0, getAssetsByOwnerDas_1.getAssetsByOwnerDas)(rpcEndpoint, owner);
+    const fungibleAddresses = items.reduce((addresses, curr) => {
+        if ((0, isHeliusFungibleAsset_1.isHeliusFungibleAsset)(curr))
+            addresses.push(curr.id);
+        return addresses;
+    }, []);
+    const tokenPricesArray = yield cache.getTokenPrices(fungibleAddresses, portfolio_core_1.NetworkId.solana);
     const tokenPrices = new Map();
     tokenPricesArray.forEach((tokenPrice) => {
-        if (!tokenPrice)
-            return;
-        tokenPrices.set(tokenPrice.address, tokenPrice);
+        if (tokenPrice)
+            tokenPrices.set(tokenPrice.address, tokenPrice);
     });
-    const walletTokensAssets = [];
+    const nftAssets = [];
+    const tokenAssets = [];
     const liquiditiesByTag = {};
-    for (let i = 0; i < tokenAccounts.length; i++) {
-        const tokenAccount = tokenAccounts[i];
-        if (tokenAccount.amount.isZero())
-            continue;
-        const address = tokenAccount.mint.toString();
-        const tokenPrice = tokenPrices.get(address);
-        if (!tokenPrice)
-            continue;
-        const amount = tokenAccount.amount
-            .div(Math.pow(10, tokenPrice.decimals))
-            .toNumber();
-        if (tokenPrice.platformId !== constants_1.walletTokensPlatform.id) {
-            const assets = (0, tokenPriceToAssetTokens_1.default)(address, amount, portfolio_core_1.NetworkId.solana, tokenPrice);
-            const liquidity = {
-                assets,
-                assetsValue: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
-                rewardAssets: [],
-                rewardAssetsValue: 0,
-                value: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
-                yields: [],
-            };
+    for (let i = 0; i < items.length; i++) {
+        const asset = items[i];
+        const isFungible = (0, isHeliusFungibleAsset_1.isHeliusFungibleAsset)(asset);
+        const tokenPrice = isFungible ? tokenPrices.get(asset.id) : undefined;
+        const address = asset.id;
+        const amount = asset.token_info
+            ? (0, bignumber_js_1.default)(asset.token_info.balance)
+                .div(Math.pow(10, asset.token_info.decimals))
+                .toNumber()
+            : 1;
+        // If it's an LP Token
+        if (tokenPrice && tokenPrice.platformId !== constants_1.walletTokensPlatform.id) {
+            const liquidity = (0, tokenPriceToLiquidity_1.default)(asset.id, amount, portfolio_core_1.NetworkId.solana, tokenPrice);
             const tag = (0, helpers_1.getLpTag)(tokenPrice.platformId, tokenPrice.elementName);
             if (!liquiditiesByTag[tag]) {
                 liquiditiesByTag[tag] = [];
             }
             liquiditiesByTag[tag].push(liquidity);
         }
+        // If it's a regular token
+        else if (tokenPrice && tokenPrice.platformId === constants_1.walletTokensPlatform.id) {
+            tokenAssets.push((0, tokenPriceToAssetToken_1.default)(address, amount, portfolio_core_1.NetworkId.solana, tokenPrice));
+        }
+        // If it's a NFT
         else {
-            walletTokensAssets.push((0, tokenPriceToAssetToken_1.default)(address, amount, portfolio_core_1.NetworkId.solana, tokenPrice));
+            nftAssets.push((0, heliusAssetToAssetCollectible_1.heliusAssetToAssetCollectible)(asset));
         }
     }
     const elements = [];
-    if (walletTokensAssets.length > 0) {
-        const walletTokensElement = {
+    if (nftAssets.length !== 0) {
+        elements.push({
+            type: portfolio_core_1.PortfolioElementType.multiple,
+            networkId: portfolio_core_1.NetworkId.solana,
+            platformId: constants_1.walletNftsPlatform.id,
+            label: 'Wallet',
+            value: null,
+            data: {
+                assets: nftAssets,
+            },
+        });
+    }
+    if (tokenAssets.length !== 0) {
+        elements.push({
             type: portfolio_core_1.PortfolioElementType.multiple,
             networkId: portfolio_core_1.NetworkId.solana,
             platformId: constants_1.walletTokensPlatform.id,
             label: 'Wallet',
-            value: (0, portfolio_core_1.getUsdValueSum)(walletTokensAssets.map((a) => a.value)),
+            value: (0, portfolio_core_1.getUsdValueSum)(tokenAssets.map((a) => a.value)),
             data: {
-                assets: walletTokensAssets,
+                assets: tokenAssets,
             },
-        };
-        elements.push(walletTokensElement);
+        });
     }
     for (const [tag, liquidities] of Object.entries(liquiditiesByTag)) {
         const { platformId, elementName } = (0, helpers_1.parseLpTag)(tag);

package/src/plugins/tokens/fetchers/solana.js.map

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

package/src/plugins/tokens/index.js

@@ -5,20 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchers = exports.jobs = exports.platforms = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const constants_1 = require("./constants");
 const jobGenerator_1 = __importDefault(require("./jobGenerator"));
 const aptos_1 = __importDefault(require("./fetchers/aptos"));
-const solana_1 = __importDefault(require("./fetchers/solana"));
 const sui_1 = __importDefault(require("./fetchers/sui"));
 const sui_nfts_1 = __importDefault(require("./fetchers/sui-nfts"));
 const sei_1 = __importDefault(require("./fetchers/sei"));
 const bitcoin_1 = __importDefault(require("./fetchers/bitcoin"));
+const solana_1 = __importDefault(require("./fetchers/solana"));
 const solana_native_1 = __importDefault(require("./fetchers/solana-native"));
-const solana_cnfts_1 = __importDefault(require("./fetchers/solana-cnfts"));
-const solana_nfts_1 = __importDefault(require("./fetchers/solana-nfts"));
 const solana_nfts_underlyings_1 = __importDefault(require("./fetchers/solana-nfts-underlyings"));
-const getTokenListsJob_1 = __importDefault(require("./getTokenListsJob"));
 const evms_1 = require("./fetchers/evms");
-const constants_1 = require("./constants");
+const getTokenListsJob_1 = __importDefault(require("./getTokenListsJob"));
 exports.platforms = [constants_1.walletTokensPlatform, constants_1.walletNftsPlatform];
 exports.jobs = [
     (0, jobGenerator_1.default)(portfolio_core_1.NetworkId.bitcoin),
@@ -36,8 +34,6 @@ exports.fetchers = [
     aptos_1.default,
     solana_1.default,
     solana_native_1.default,
-    solana_nfts_1.default,
-    solana_cnfts_1.default,
     solana_nfts_underlyings_1.default,
     sui_1.default,
     sui_nfts_1.default,

package/src/plugins/tokens/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tokens/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAIoC;AACpC,kEAA0C;AAC1C,6DAA4C;AAC5C,+DAA8C;AAC9C,yDAAwC;AACxC,mEAAiD;AACjD,yDAAwC;AACxC,iEAAgD;AAChD,6EAA2D;AAC3D,2EAAyD;AACzD,yEAAuD;AACvD,iGAA8E;AAE9E,0EAAkD;AAElD,0CAA0D;AAC1D,2CAAuE;AAG1D,QAAA,SAAS,GAAe,CAAC,gCAAoB,EAAE,8BAAkB,CAAC,CAAC;AACnE,QAAA,IAAI,GAAU;IACzB,IAAA,sBAAY,EAAC,0BAAS,CAAC,OAAO,CAAC;IAC/B,IAAA,sBAAY,EAAC,0BAAS,CAAC,KAAK,CAAC;IAC7B,IAAA,sBAAY,EAAC,0BAAS,CAAC,MAAM,CAAC;IAC9B,IAAA,sBAAY,EAAC,0BAAS,CAAC,QAAQ,CAAC;IAChC,IAAA,sBAAY,EAAC,0BAAS,CAAC,SAAS,CAAC;IACjC,IAAA,sBAAY,EAAC,0BAAS,CAAC,OAAO,CAAC;IAC/B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,GAAG,gCAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,0BAAgB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;CAClE,CAAC;AAEW,QAAA,QAAQ,GAAc;IACjC,eAAY;IACZ,gBAAa;IACb,uBAAmB;IACnB,qBAAiB;IACjB,sBAAkB;IAClB,iCAA4B;IAC5B,aAAU;IACV,kBAAc;IACd,aAAU;IACV,iBAAc;IACd,GAAG,eAAW;CACf,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tokens/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAIoC;AAKpC,2CAAuE;AACvE,kEAA0C;AAC1C,6DAA4C;AAC5C,yDAAwC;AACxC,mEAAiD;AACjD,yDAAwC;AACxC,iEAAgD;AAChD,+DAA8C;AAC9C,6EAA2D;AAC3D,iGAA8E;AAC9E,0CAA0D;AAC1D,0EAAkD;AAErC,QAAA,SAAS,GAAe,CAAC,gCAAoB,EAAE,8BAAkB,CAAC,CAAC;AACnE,QAAA,IAAI,GAAU;IACzB,IAAA,sBAAY,EAAC,0BAAS,CAAC,OAAO,CAAC;IAC/B,IAAA,sBAAY,EAAC,0BAAS,CAAC,KAAK,CAAC;IAC7B,IAAA,sBAAY,EAAC,0BAAS,CAAC,MAAM,CAAC;IAC9B,IAAA,sBAAY,EAAC,0BAAS,CAAC,QAAQ,CAAC;IAChC,IAAA,sBAAY,EAAC,0BAAS,CAAC,SAAS,CAAC;IACjC,IAAA,sBAAY,EAAC,0BAAS,CAAC,OAAO,CAAC;IAC/B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,GAAG,gCAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,0BAAgB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;CAClE,CAAC;AAEW,QAAA,QAAQ,GAAc;IACjC,eAAY;IACZ,gBAAa;IACb,uBAAmB;IACnB,iCAA4B;IAC5B,aAAU;IACV,kBAAc;IACd,aAAU;IACV,iBAAc;IACd,GAAG,eAAW;CACf,CAAC"}

package/src/utils/misc/tokenPriceToLiquidity.d.ts

@@ -0,0 +1,2 @@
+import { NetworkIdType, PortfolioLiquidity, TokenPrice } from '@sonarwatch/portfolio-core';
+export default function tokenPriceToLiquidity(address: string, amount: number, networkId: NetworkIdType, tokenPrice: TokenPrice): PortfolioLiquidity;

package/src/utils/misc/tokenPriceToLiquidity.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const tokenPriceToAssetTokens_1 = __importDefault(require("./tokenPriceToAssetTokens"));
+function tokenPriceToLiquidity(address, amount, networkId, tokenPrice) {
+    const assets = (0, tokenPriceToAssetTokens_1.default)(address, amount, networkId, tokenPrice);
+    const liquidity = {
+        assets,
+        assetsValue: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
+        rewardAssets: [],
+        rewardAssetsValue: 0,
+        value: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
+        yields: [],
+    };
+    return liquidity;
+}
+exports.default = tokenPriceToLiquidity;
+//# sourceMappingURL=tokenPriceToLiquidity.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tokenPriceToLiquidity.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/tokenPriceToLiquidity.ts"],"names":[],"mappings":";;;;;AAAA,+DAKoC;AACpC,wFAAgE;AAEhE,SAAwB,qBAAqB,CAC3C,OAAe,EACf,MAAc,EACd,SAAwB,EACxB,UAAsB;IAEtB,MAAM,MAAM,GAAG,IAAA,iCAAuB,EACpC,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CACX,CAAC;IACF,MAAM,SAAS,GAAuB;QACpC,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,EAAE;KACX,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC;AArBD,wCAqBC"}

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,kBAAkB,GAAG,IAAI,mBAAS,CAC7C,6CAA6C,CAC9C,CAAC;AAEW,QAAA,wBAAwB,GAAG,IAAI,mBAAS,CACnD,8CAA8C,CAC/C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,kBAAkB,GAAG,IAAI,mBAAS,CAC7C,6CAA6C,CAC9C,CAAC;AACW,QAAA,wBAAwB,GAAG,IAAI,mBAAS,CACnD,8CAA8C,CAC/C,CAAC"}

package/src/utils/solana/das/getAssetsByOwnerDas.d.ts

@@ -0,0 +1,3 @@
+import { RpcEndpoint } from '@sonarwatch/portfolio-core';
+import { HeliusAsset } from './types';
+export declare function getAssetsByOwnerDas(rpcEndpoint: RpcEndpoint, owner: string): Promise<HeliusAsset[]>;

package/src/utils/solana/{getAssetsByOwnerDas.js → das/getAssetsByOwnerDas.js}

@@ -14,35 +14,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAssetsByOwnerDas = void 0;
 const axios_1 = __importDefault(require("axios"));
-const getBasicAuthHeaders_1 = require("../misc/getBasicAuthHeaders");
+const getBasicAuthHeaders_1 = require("../../misc/getBasicAuthHeaders");
+const limit = 1000;
+const maxPage = 10;
 function getAssetsByOwnerDas(rpcEndpoint, owner) {
     return __awaiter(this, void 0, void 0, function* () {
         const httpHeaders = rpcEndpoint.basicAuth
             ? (0, getBasicAuthHeaders_1.getBasicAuthHeaders)(rpcEndpoint.basicAuth.username, rpcEndpoint.basicAuth.password)
             : undefined;
-        return axios_1.default
-            .post(rpcEndpoint.url, {
-            jsonrpc: '2.0',
-            id: Math.random().toString(),
-            method: 'getAssetsByOwner',
-            params: {
-                ownerAddress: owner,
-                page: 1,
-                limit: 1000,
-                sortBy: {
-                    sortBy: 'created',
-                    sortDirection: 'asc',
+        const items = [];
+        let page = 0;
+        while (page < maxPage) {
+            page += 1;
+            const res = yield axios_1.default.post(rpcEndpoint.url, {
+                jsonrpc: '2.0',
+                id: Math.random().toString(),
+                method: 'getAssetsByOwner',
+                params: {
+                    ownerAddress: owner,
+                    page,
+                    limit,
+                    sortBy: {
+                        sortBy: 'id',
+                        sortDirection: 'asc',
+                    },
+                    displayOptions: {
+                        showNativeBalance: false,
+                        showFungible: true,
+                        showInscription: true,
+                        showUnverifiedCollections: true,
+                        showCollectionMetadata: true,
+                        showGrandTotal: true,
+                    },
                 },
-                displayOptions: {
-                    showFungible: false,
-                    showNativeBalance: false,
-                    showInscription: true,
-                },
-            },
-        }, {
-            headers: Object.assign({ 'Content-Type': 'application/json' }, httpHeaders),
-        })
-            .then((res) => res.data.result);
+            }, {
+                headers: Object.assign({ 'Content-Type': 'application/json' }, httpHeaders),
+            });
+            items.push(...res.data.result.items);
+            if (res.data.result.total !== limit)
+                break;
+        }
+        return items;
     });
 }
 exports.getAssetsByOwnerDas = getAssetsByOwnerDas;

package/src/utils/solana/das/getAssetsByOwnerDas.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAssetsByOwnerDas.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/das/getAssetsByOwnerDas.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,kDAA6C;AAE7C,wEAAqE;AAErE,MAAM,KAAK,GAAG,IAAI,CAAC;AACnB,MAAM,OAAO,GAAG,EAAE,CAAC;AAEnB,SAAsB,mBAAmB,CACvC,WAAwB,EACxB,KAAa;;QAEb,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS;YACvC,CAAC,CAAC,IAAA,yCAAmB,EACjB,WAAW,CAAC,SAAS,CAAC,QAAQ,EAC9B,WAAW,CAAC,SAAS,CAAC,QAAQ,CAC/B;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,KAAK,GAAkB,EAAE,CAAC;QAChC,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,OAAO,IAAI,GAAG,OAAO,EAAE,CAAC;YACtB,IAAI,IAAI,CAAC,CAAC;YACV,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,IAAI,CAK1B,WAAW,CAAC,GAAG,EACf;gBACE,OAAO,EAAE,KAAK;gBACd,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;gBAC5B,MAAM,EAAE,kBAAkB;gBAC1B,MAAM,EAAE;oBACN,YAAY,EAAE,KAAK;oBACnB,IAAI;oBACJ,KAAK;oBACL,MAAM,EAAE;wBACN,MAAM,EAAE,IAAI;wBACZ,aAAa,EAAE,KAAK;qBACrB;oBACD,cAAc,EAAE;wBACd,iBAAiB,EAAE,KAAK;wBACxB,YAAY,EAAE,IAAI;wBAClB,eAAe,EAAE,IAAI;wBACrB,yBAAyB,EAAE,IAAI;wBAC/B,sBAAsB,EAAE,IAAI;wBAC5B,cAAc,EAAE,IAAI;qBACrB;iBACF;aACF,EACD;gBACE,OAAO,kBACL,cAAc,EAAE,kBAAkB,IAC/B,WAAW,CACf;aACF,CACF,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,KAAK;gBAAE,MAAM;QAC7C,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAtDD,kDAsDC"}

package/src/utils/solana/das/heliusAssetToAssetCollectible.d.ts

@@ -0,0 +1,3 @@
+import { PortfolioAssetCollectible } from '@sonarwatch/portfolio-core';
+import { HeliusAsset } from './types';
+export declare function heliusAssetToAssetCollectible(asset: HeliusAsset): PortfolioAssetCollectible;

package/src/utils/solana/das/heliusAssetToAssetCollectible.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.heliusAssetToAssetCollectible = void 0;
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+function heliusAssetToAssetCollectible(asset) {
+    var _a;
+    let amount = 1;
+    if (asset.token_info && asset.token_info.decimals === 0) {
+        amount = asset.token_info.balance;
+    }
+    let tags = [];
+    if (asset.compression.compressed)
+        tags.push('compressed');
+    if (asset.spl20)
+        tags.push('spl20');
+    if (asset.inscription)
+        tags.push('inscription');
+    if (tags.length === 0)
+        tags = undefined;
+    return {
+        type: portfolio_core_1.PortfolioAssetType.collectible,
+        attributes: {
+            tags,
+        },
+        data: {
+            address: asset.id,
+            amount,
+            price: null,
+            name: asset.content.metadata.name,
+            dataUri: asset.content.json_uri,
+            imageUri: (_a = asset.content.links) === null || _a === void 0 ? void 0 : _a.image,
+        },
+        networkId: portfolio_core_1.NetworkId.solana,
+        value: null,
+    };
+}
+exports.heliusAssetToAssetCollectible = heliusAssetToAssetCollectible;
+//# sourceMappingURL=heliusAssetToAssetCollectible.js.map

package/src/utils/solana/das/heliusAssetToAssetCollectible.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"heliusAssetToAssetCollectible.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/das/heliusAssetToAssetCollectible.ts"],"names":[],"mappings":";;;AAAA,+DAIoC;AAGpC,SAAgB,6BAA6B,CAC3C,KAAkB;;IAElB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QACxD,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,IAAI,IAAI,GAAyB,EAAE,CAAC;IACpC,IAAI,KAAK,CAAC,WAAW,CAAC,UAAU;QAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1D,IAAI,KAAK,CAAC,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,IAAI,KAAK,CAAC,WAAW;QAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAChD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,IAAI,GAAG,SAAS,CAAC;IAExC,OAAO;QACL,IAAI,EAAE,mCAAkB,CAAC,WAAW;QACpC,UAAU,EAAE;YACV,IAAI;SACL;QACD,IAAI,EAAE;YACJ,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,MAAM;YACN,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI;YACjC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ;YAC/B,QAAQ,EAAE,MAAA,KAAK,CAAC,OAAO,CAAC,KAAK,0CAAE,KAAK;SACrC;QACD,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,KAAK,EAAE,IAAI;KACZ,CAAC;AACJ,CAAC;AA9BD,sEA8BC"}

package/src/utils/solana/das/isHeliusFungibleAsset.d.ts

@@ -0,0 +1,2 @@
+import { HeliusAsset } from './types';
+export declare function isHeliusFungibleAsset(heliusAsset: HeliusAsset): boolean;

package/src/utils/solana/das/isHeliusFungibleAsset.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isHeliusFungibleAsset = void 0;
+function isHeliusFungibleAsset(heliusAsset) {
+    return ((heliusAsset.interface === 'FungibleToken' ||
+        heliusAsset.interface === 'FungibleAsset') &&
+        heliusAsset.token_info !== undefined);
+}
+exports.isHeliusFungibleAsset = isHeliusFungibleAsset;
+//# sourceMappingURL=isHeliusFungibleAsset.js.map

package/src/utils/solana/das/isHeliusFungibleAsset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isHeliusFungibleAsset.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/das/isHeliusFungibleAsset.ts"],"names":[],"mappings":";;;AAEA,SAAgB,qBAAqB,CAAC,WAAwB;IAC5D,OAAO,CACL,CAAC,WAAW,CAAC,SAAS,KAAK,eAAe;QACxC,WAAW,CAAC,SAAS,KAAK,eAAe,CAAC;QAC5C,WAAW,CAAC,UAAU,KAAK,SAAS,CACrC,CAAC;AACJ,CAAC;AAND,sDAMC"}

package/src/utils/solana/{getAssetsByOwnerDas.d.ts → das/types.d.ts}

@@ -1,5 +1,3 @@
-import { RpcEndpoint } from '@sonarwatch/portfolio-core';
-export declare function getAssetsByOwnerDas(rpcEndpoint: RpcEndpoint, owner: string): Promise<HeliusAssetList>;
 export type GetAssetsByOwnerOutput = {
     jsonrpc: string;
     result: HeliusAssetList;
@@ -24,9 +22,28 @@ export type HeliusAsset = {
     supply: Supply | null;
     mutable: boolean;
     burnt: boolean;
+    token_info?: TokenInfo;
     inscription: Inscription | null;
     spl20: Spl20 | null;
 };
+export type HeliusFungibleAsset = HeliusAsset & {
+    interface: 'FungibleToken' | 'FungibleAsset';
+    token_info: TokenInfo;
+};
+export type TokenInfo = {
+    balance: number;
+    supply: number;
+    decimals: number;
+    token_program: string;
+    associated_token_address: string;
+    symbol?: string;
+    price_info?: PriceInfo;
+};
+export type PriceInfo = {
+    price_per_token: number;
+    total_price: number;
+    currency: string;
+};
 export type Inscription = {
     order: number;
     size: number;
@@ -70,7 +87,8 @@ export type File = {
     mime?: string;
 };
 export type Links = {
-    external_url: string;
+    external_url?: string;
+    image?: string;
 };
 export type Metadata = {
     attributes?: Attribute[];

package/src/utils/solana/das/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/src/utils/solana/das/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/das/types.ts"],"names":[],"mappings":""}

package/src/plugins/tokens/fetchers/solana-cnfts.d.ts

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

package/src/plugins/tokens/fetchers/solana-cnfts.js

@@ -1,62 +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 });
-const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const getAssetsByOwnerDas_1 = require("../../../utils/solana/getAssetsByOwnerDas");
-const constants_1 = require("../constants");
-const constants_2 = require("../../../utils/clients/constants");
-const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
-    const rpcEndpoint = (0, constants_2.getRpcEndpoint)(portfolio_core_1.NetworkId.solana);
-    const list = yield (0, getAssetsByOwnerDas_1.getAssetsByOwnerDas)(rpcEndpoint, owner);
-    const assets = [];
-    const items = list.items.filter((i) => {
-        const isCompressed = i.compression.compressed;
-        const isSplNft = i.spl20 === null && i.inscription !== null;
-        return isCompressed || isSplNft;
-    });
-    items.forEach((i) => {
-        var _a;
-        assets.push({
-            networkId: portfolio_core_1.NetworkId.solana,
-            type: portfolio_core_1.PortfolioAssetType.collectible,
-            value: null,
-            attributes: {},
-            data: {
-                address: i.id,
-                amount: 1,
-                price: null,
-                name: i.content.metadata.name,
-                imageUri: (_a = i.content.files.find((f) => { var _a; return (_a = f.mime) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase().startsWith('image'); })) === null || _a === void 0 ? void 0 : _a.uri,
-                dataUri: i.content.json_uri,
-            },
-        });
-    });
-    if (assets.length === 0)
-        return [];
-    const element = {
-        type: portfolio_core_1.PortfolioElementType.multiple,
-        networkId: portfolio_core_1.NetworkId.solana,
-        platformId: constants_1.walletNftsPlatform.id,
-        label: 'Wallet',
-        value: null,
-        data: {
-            assets,
-        },
-    };
-    return [element];
-});
-const fetcher = {
-    id: `${constants_1.walletTokensPlatform.id}-solana-cnfts`,
-    networkId: portfolio_core_1.NetworkId.solana,
-    executor,
-};
-exports.default = fetcher;
-//# sourceMappingURL=solana-cnfts.js.map

package/src/plugins/tokens/fetchers/solana-cnfts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"solana-cnfts.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-cnfts.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAMoC;AAEpC,mFAAgF;AAChF,4CAAwE;AACxE,gEAAkE;AAElE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,EAAE;IACxD,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,0BAAS,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,MAAM,IAAA,yCAAmB,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAgC,EAAE,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC;QAC9C,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,WAAW,KAAK,IAAI,CAAC;QAC5D,OAAO,YAAY,IAAI,QAAQ,CAAC;IAClC,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;;QAClB,MAAM,CAAC,IAAI,CAAC;YACV,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,IAAI,EAAE,mCAAkB,CAAC,WAAW;YACpC,KAAK,EAAE,IAAI;YACX,UAAU,EAAE,EAAE;YACd,IAAI,EAAE;gBACJ,OAAO,EAAE,CAAC,CAAC,EAAE;gBACb,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAC7B,QAAQ,EAAE,MAAA,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,WACnC,OAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA,EAAA,CAChD,0CAAE,GAAG;gBACN,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ;aAC5B;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,OAAO,GAA6B;QACxC,IAAI,EAAE,qCAAoB,CAAC,QAAQ;QACnC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,UAAU,EAAE,8BAAkB,CAAC,EAAE;QACjC,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,IAAI;QACX,IAAI,EAAE;YACJ,MAAM;SACP;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,gCAAoB,CAAC,EAAE,eAAe;IAC7C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

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

package/src/plugins/tokens/fetchers/solana-nfts.js

@@ -1,126 +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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const web3_js_1 = require("@solana/web3.js");
-const js_1 = require("@metaplex-foundation/js");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
-const constants_1 = require("../constants");
-const clients_1 = require("../../../utils/clients");
-const runInBatch_1 = __importDefault(require("../../../utils/misc/runInBatch"));
-const singleListingFetcher_1 = __importDefault(require("../../tensor/singleListingFetcher"));
-const prefix = 'nft-images';
-const noImageValue = 'noimage';
-const cacheTtl = 60 * 60 * 24 * 2; // 2 days
-const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const client = (0, clients_1.getClientSolana)();
-    const metaplex = new js_1.Metaplex(client);
-    const outputs = yield metaplex.nfts().findAllByOwner({
-        owner: new web3_js_1.PublicKey(owner),
-    });
-    const nftsOnTensor = yield (0, singleListingFetcher_1.default)(owner);
-    const allNfts = [...outputs, ...nftsOnTensor].filter((nft) => nft !== null);
-    const cachedImages = yield cache.getItems(allNfts.map((o) => o.model === 'metadata'
-        ? o.mintAddress.toString()
-        : o.mint.address.toString()), {
-        prefix,
-        networkId: portfolio_core_1.NetworkId.solana,
-    });
-    const images = new Map();
-    const missings = [];
-    allNfts.forEach((o, i) => {
-        const cachedImage = cachedImages[i];
-        if (cachedImage) {
-            const address = o.model === 'metadata'
-                ? o.mintAddress.toString()
-                : o.mint.address.toString();
-            images.set(address, cachedImage);
-        }
-        else if (o.model === 'metadata') {
-            missings.push(o);
-        }
-    });
-    const res = yield (0, runInBatch_1.default)(missings.map((o) => () => metaplex.nfts().load({ metadata: o })), 7);
-    const promises = res.map((r, i) => {
-        var _a;
-        const image = r.status !== 'rejected' ? (_a = r.value.json) === null || _a === void 0 ? void 0 : _a.image : undefined;
-        if (r.status === 'rejected' || !image) {
-            const address = missings[i].mintAddress.toString();
-            return cache.setItem(address, noImageValue, {
-                prefix,
-                networkId: portfolio_core_1.NetworkId.solana,
-            });
-        }
-        const address = r.value.mint.address.toString();
-        images.set(address, image);
-        return cache.setItem(address, image, {
-            prefix,
-            networkId: portfolio_core_1.NetworkId.solana,
-            ttl: cacheTtl,
-        });
-    });
-    yield Promise.allSettled(promises);
-    const assets = allNfts.map((output) => {
-        const address = output.model === 'metadata'
-            ? output.mintAddress.toString()
-            : output.mint.address.toString();
-        const token = (0, js_1.isNftWithToken)(output) || (0, js_1.isSftWithToken)(output) ? output.token : null;
-        const amount = (token === null || token === void 0 ? void 0 : token.amount)
-            ? new bignumber_js_1.default(token.amount.basisPoints.toString())
-                .div(Math.pow(10, token.amount.currency.decimals))
-                .toNumber()
-            : 1;
-        let image = images.get(address);
-        if (image === noImageValue)
-            image = undefined;
-        const collection = output.collection
-            ? { id: output.collection.address.toString(), floorPrice: null }
-            : undefined;
-        return {
-            networkId: portfolio_core_1.NetworkId.solana,
-            type: portfolio_core_1.PortfolioAssetType.collectible,
-            value: null,
-            attributes: {},
-            data: {
-                address,
-                amount,
-                dataUri: output.uri,
-                price: null,
-                imageUri: image,
-                name: output.name,
-                collection,
-            },
-        };
-    });
-    if (assets.length === 0)
-        return [];
-    const element = {
-        type: portfolio_core_1.PortfolioElementType.multiple,
-        networkId: portfolio_core_1.NetworkId.solana,
-        platformId: constants_1.walletNftsPlatform.id,
-        label: 'Wallet',
-        value: null,
-        data: {
-            assets,
-        },
-    };
-    return [element];
-});
-const fetcher = {
-    id: `${constants_1.walletTokensPlatform.id}-solana-nfts`,
-    networkId: portfolio_core_1.NetworkId.solana,
-    executor,
-};
-exports.default = fetcher;
-//# sourceMappingURL=solana-nfts.js.map

package/src/plugins/tokens/fetchers/solana-nfts.js.map

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"getAssetsByOwnerDas.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/getAssetsByOwnerDas.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,kDAA6C;AAC7C,qEAAkE;AAElE,SAAsB,mBAAmB,CACvC,WAAwB,EACxB,KAAa;;QAEb,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS;YACvC,CAAC,CAAC,IAAA,yCAAmB,EACjB,WAAW,CAAC,SAAS,CAAC,QAAQ,EAC9B,WAAW,CAAC,SAAS,CAAC,QAAQ,CAC/B;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO,eAAK;aACT,IAAI,CACH,WAAW,CAAC,GAAG,EACf;YACE,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE;gBACN,YAAY,EAAE,KAAK;gBACnB,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE;oBACN,MAAM,EAAE,SAAS;oBACjB,aAAa,EAAE,KAAK;iBACrB;gBACD,cAAc,EAAE;oBACd,YAAY,EAAE,KAAK;oBACnB,iBAAiB,EAAE,KAAK;oBACxB,eAAe,EAAE,IAAI;iBACtB;aACF;SACF,EACD;YACE,OAAO,kBACL,cAAc,EAAE,kBAAkB,IAC/B,WAAW,CACf;SACF,CACF;aACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;CAAA;AAzCD,kDAyCC"}