@sonarwatch/portfolio-plugins 0.6.1 → 0.6.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.6.2](https://github.com/sonarwatch/portfolio/compare/plugins-0.6.1...plugins-0.6.2) (2023-08-18)
+
+
+
 ## [0.6.1](https://github.com/sonarwatch/portfolio/compare/plugins-0.6.0...plugins-0.6.1) (2023-08-18)
 
 

package/package.json

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

package/src/plugins/orca/constants.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const platformId = "orca";
-export declare const aquafarmsPrefix: string;
+export declare const poolsProgram: PublicKey;
 export declare const aquafarmsProgram: PublicKey;
 export declare const positionsIdentifier = "Orca Whirlpool Position";
 export declare const whirlpoolPrefix: string;

package/src/plugins/orca/constants.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apiWhirlpool = exports.whirlpoolConfig = exports.whirlpoolProgram = exports.whirlpoolPrefix = exports.positionsIdentifier = exports.aquafarmsProgram = exports.aquafarmsPrefix = exports.platformId = void 0;
+exports.apiWhirlpool = exports.whirlpoolConfig = exports.whirlpoolProgram = exports.whirlpoolPrefix = exports.positionsIdentifier = exports.aquafarmsProgram = exports.poolsProgram = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'orca';
-exports.aquafarmsPrefix = `${exports.platformId}-aquafarms`;
+exports.poolsProgram = new web3_js_1.PublicKey('9W959DqEETiGZocYWCQPaJ6sBmUzgfxXfqGeTEdp3aQP');
 exports.aquafarmsProgram = new web3_js_1.PublicKey('82yxjeMsvaURa4MbZZ7WZZHfobirZYkH1zF8fmeGtyaQ');
 exports.positionsIdentifier = 'Orca Whirlpool Position';
 exports.whirlpoolPrefix = `${exports.platformId}-whirlpool`;

package/src/plugins/orca/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,MAAM,CAAC;AAEpB,QAAA,eAAe,GAAG,GAAG,kBAAU,YAAY,CAAC;AAC5C,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,yBAAyB,CAAC;AAChD,QAAA,eAAe,GAAG,GAAG,kBAAU,YAAY,CAAC;AAC5C,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC;AACW,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,8CAA8C,CAC/C,CAAC;AACW,QAAA,YAAY,GAAG,+CAA+C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,8CAA8C,CAC/C,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,yBAAyB,CAAC;AAChD,QAAA,eAAe,GAAG,GAAG,kBAAU,YAAY,CAAC;AAC5C,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC;AACW,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,8CAA8C,CAC/C,CAAC;AACW,QAAA,YAAY,GAAG,+CAA+C,CAAC"}

package/src/plugins/orca/filters.d.ts

@@ -1,3 +1,4 @@
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const aquafarmFilters: GetProgramAccountsFilter[];
+export declare const poolsFilters: GetProgramAccountsFilter[];
 export declare const whirlpoolFilters: GetProgramAccountsFilter[];

package/src/plugins/orca/filters.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.whirlpoolFilters = exports.aquafarmFilters = void 0;
-const aquafarms_1 = require("./structs/aquafarms");
+exports.whirlpoolFilters = exports.poolsFilters = exports.aquafarmFilters = void 0;
+const oldLiquidities_1 = require("./structs/oldLiquidities");
 const whirlpool_1 = require("./structs/whirlpool");
 exports.aquafarmFilters = [
-    { dataSize: aquafarms_1.aquafarmStruct.byteSize },
+    { dataSize: oldLiquidities_1.aquafarmStruct.byteSize },
 ];
+exports.poolsFilters = [{ dataSize: 324 }];
 exports.whirlpoolFilters = [
     { dataSize: whirlpool_1.whirlpoolStruct.byteSize },
 ];

package/src/plugins/orca/filters.js.map

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/filters.ts"],"names":[],"mappings":";;;AACA,mDAAqD;AACrD,mDAAsD;AAEzC,QAAA,eAAe,GAA+B;IACzD,EAAE,QAAQ,EAAE,0BAAc,CAAC,QAAQ,EAAE;CACtC,CAAC;AAEW,QAAA,gBAAgB,GAA+B;IAC1D,EAAE,QAAQ,EAAE,2BAAe,CAAC,QAAQ,EAAE;CACvC,CAAC"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/filters.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAC1D,mDAAsD;AAEzC,QAAA,eAAe,GAA+B;IACzD,EAAE,QAAQ,EAAE,+BAAc,CAAC,QAAQ,EAAE;CACtC,CAAC;AAEW,QAAA,YAAY,GAA+B,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;AAE/D,QAAA,gBAAgB,GAA+B;IAC1D,EAAE,QAAQ,EAAE,2BAAe,CAAC,QAAQ,EAAE;CACvC,CAAC"}

package/src/plugins/orca/helpers.d.ts

@@ -1,9 +1,2 @@
-import { TokenPrice } from '@sonarwatch/portfolio-core';
 import { Metadata, Nft, Sft } from '@metaplex-foundation/js';
-import { Aquafarm } from './structs/aquafarms';
 export declare function isAnOrcaPosition(nft: Metadata | Nft | Sft): boolean;
-export declare function getYields(aquafarm: Aquafarm, rewardToken: TokenPrice, baseVaultValue: number): {
-    mint: string;
-    apr: number;
-    apy: number;
-}[];

package/src/plugins/orca/helpers.js

@@ -1,29 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getYields = exports.isAnOrcaPosition = void 0;
-const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+exports.isAnOrcaPosition = void 0;
 const constants_1 = require("./constants");
 function isAnOrcaPosition(nft) {
     return nft && nft.name === constants_1.positionsIdentifier;
 }
 exports.isAnOrcaPosition = isAnOrcaPosition;
-function getYields(aquafarm, rewardToken, baseVaultValue) {
-    const apr = aquafarm.emissionsPerSecondNumerator
-        .div(aquafarm.emissionsPerSecondDenominator)
-        .div(Math.pow(10, rewardToken.decimals))
-        .times(60 * 60 * 24 * 365)
-        .times(rewardToken.price)
-        .div(baseVaultValue)
-        .times(100)
-        .toNumber();
-    const yields = [
-        {
-            mint: rewardToken.address,
-            apr,
-            apy: (0, portfolio_core_1.aprToApy)(apr),
-        },
-    ];
-    return yields;
-}
-exports.getYields = getYields;
 //# sourceMappingURL=helpers.js.map

package/src/plugins/orca/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/helpers.ts"],"names":[],"mappings":";;;AAAA,+DAAkE;AAGlE,2CAAkD;AAElD,SAAgB,gBAAgB,CAAC,GAAyB;IACxD,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,+BAAmB,CAAC;AACjD,CAAC;AAFD,4CAEC;AAED,SAAgB,SAAS,CACvB,QAAkB,EAClB,WAAuB,EACvB,cAAsB;IAEtB,MAAM,GAAG,GAAG,QAAQ,CAAC,2BAA2B;SAC7C,GAAG,CAAC,QAAQ,CAAC,6BAA6B,CAAC;SAC3C,GAAG,CAAC,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,CAAC;SAC/B,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;SACzB,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC;SACxB,GAAG,CAAC,cAAc,CAAC;SACnB,KAAK,CAAC,GAAG,CAAC;SACV,QAAQ,EAAE,CAAC;IACd,MAAM,MAAM,GAAG;QACb;YACE,IAAI,EAAE,WAAW,CAAC,OAAO;YACzB,GAAG;YACH,GAAG,EAAE,IAAA,yBAAQ,EAAC,GAAG,CAAC;SACnB;KACF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,8BAqBC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/helpers.ts"],"names":[],"mappings":";;;AACA,2CAAkD;AAElD,SAAgB,gBAAgB,CAAC,GAAyB;IACxD,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,+BAAmB,CAAC;AACjD,CAAC;AAFD,4CAEC"}

package/src/plugins/orca/lpTokensJob.js

@@ -8,50 +8,143 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const filters_1 = require("./filters");
 const clients_1 = require("../../utils/clients");
-const aquafarms_1 = require("./structs/aquafarms");
+const oldLiquidities_1 = require("./structs/oldLiquidities");
 const solana_1 = require("../../utils/solana");
 const fetchTokenSupplyAndDecimals_1 = require("../../utils/solana/fetchTokenSupplyAndDecimals");
-// import { getYields } from './helpers';
-const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
+const runInBatch_1 = __importDefault(require("../../utils/misc/runInBatch"));
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const aquafarmsRes = yield client.getProgramAccounts(constants_1.aquafarmsProgram, {
-        filters: filters_1.aquafarmFilters,
+    const farmsAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, oldLiquidities_1.aquafarmStruct, constants_1.aquafarmsProgram, filters_1.aquafarmFilters);
+    const poolsAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, oldLiquidities_1.poolInfoStruct, constants_1.poolsProgram, filters_1.poolsFilters);
+    const mints = new Set();
+    poolsAccounts.forEach((p) => mints.add(p.mintA.toString()).add(p.mintB.toString()));
+    farmsAccounts.forEach((a) => mints.add(a.baseTokenMint.toString()));
+    const tokenPriceResults = yield (0, runInBatch_1.default)([...Array.from(mints)].map((mint) => () => cache.getTokenPrice(mint, portfolio_core_1.NetworkId.solana)));
+    const tokenPrices = new Map();
+    tokenPriceResults.forEach((r) => {
+        if (r.status === 'rejected')
+            return;
+        if (!r.value)
+            return;
+        tokenPrices.set(r.value.address, r.value);
     });
-    const aquafarms = aquafarmsRes.map((i) => (Object.assign(Object.assign({}, aquafarms_1.aquafarmStruct.deserialize(i.account.data)[0]), { pubkey: i.pubkey })));
-    const tokenAccountsToFetch = [
-        ...aquafarms.map((a) => a.baseTokenVault),
-        ...aquafarms.map((a) => a.rewardTokenVault),
+    const tokenAddresses = [
+        ...farmsAccounts.map((a) => a.baseTokenVault),
+        ...poolsAccounts.map((p) => [p.tokenAccountA, p.tokenAccountB]).flat(),
     ];
-    const tokenAccountsRes = yield (0, getMultipleAccountsInfoSafe_1.getMultipleAccountsInfoSafe)(client, tokenAccountsToFetch);
-    if (!tokenAccountsRes)
-        return;
-    const tokenAccountsMap = new Map();
-    tokenAccountsRes.forEach((tokenAccountRes, i) => {
-        if (!tokenAccountRes)
+    const tokensAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, solana_1.tokenAccountStruct, tokenAddresses);
+    const tokenAccountByAddress = new Map();
+    tokensAccounts.forEach((tAccount) => {
+        if (!tAccount)
+            return;
+        tokenAccountByAddress.set(tAccount.pubkey.toString(), tAccount);
+    });
+    const batchResult = yield (0, runInBatch_1.default)(poolsAccounts.map((farm) => () => (0, fetchTokenSupplyAndDecimals_1.fetchTokenSupplyAndDecimals)(farm.tokenPool, client, 0)));
+    const poolTokenInfoByAddress = new Map();
+    batchResult.forEach((r, index) => {
+        if (r.status === 'rejected')
+            return;
+        if (!r.value)
+            return;
+        poolTokenInfoByAddress.set(poolsAccounts[index].tokenPool.toString(), r.value);
+    });
+    const poolsPromises = [];
+    for (const poolAccount of poolsAccounts) {
+        if ([
+            poolAccount.tokenAccountA.toString(),
+            poolAccount.tokenAccountB.toString(),
+        ].includes('11111111111111111111111111111111'))
+            continue;
+        const lpMint = poolAccount.tokenPool;
+        const lpSupplyAndDecimals = poolTokenInfoByAddress.get(lpMint.toString());
+        if (!lpSupplyAndDecimals)
+            continue;
+        const lpSupply = lpSupplyAndDecimals.supply;
+        if (lpSupply === 0)
+            continue;
+        const poolCoinTokenAccount = tokenAccountByAddress.get(poolAccount.tokenAccountA.toString());
+        const poolPcTokenAccount = tokenAccountByAddress.get(poolAccount.tokenAccountB.toString());
+        if (!poolPcTokenAccount || !poolCoinTokenAccount)
+            continue;
+        const coinToken = tokenPrices.get(poolAccount.mintA.toString());
+        const pcToken = tokenPrices.get(poolAccount.mintB.toString());
+        if (!coinToken || !pcToken)
+            continue;
+        const coinDecimals = coinToken.decimals;
+        const pcDecimals = pcToken.decimals;
+        const coinAmountWei = new bignumber_js_1.default(poolCoinTokenAccount.amount.toString());
+        const pcAmountWei = new bignumber_js_1.default(poolPcTokenAccount.amount.toString());
+        const coinAmount = coinAmountWei
+            .dividedBy(new bignumber_js_1.default(Math.pow(10, coinDecimals)))
+            .toNumber();
+        const pcAmount = pcAmountWei
+            .dividedBy(new bignumber_js_1.default(Math.pow(10, pcDecimals)))
+            .toNumber();
+        const coinValueLocked = coinAmount * coinToken.price;
+        const pcValueLocked = pcAmount * pcToken.price;
+        const lpDecimals = lpSupplyAndDecimals.decimals;
+        const tvl = coinValueLocked + pcValueLocked;
+        const price = tvl / lpSupply;
+        poolsPromises.push(cache.setTokenPriceSource({
+            networkId: portfolio_core_1.NetworkId.solana,
+            platformId: constants_1.platformId,
+            id: constants_1.platformId,
+            weight: 1,
+            address: lpMint.toString(),
+            price,
+            decimals: lpDecimals,
+            underlyings: [
+                {
+                    networkId: portfolio_core_1.NetworkId.solana,
+                    address: coinToken.address,
+                    decimals: coinToken.decimals,
+                    price: coinToken.price,
+                    amountPerLp: coinAmount / lpSupply,
+                },
+                {
+                    networkId: portfolio_core_1.NetworkId.solana,
+                    address: pcToken.address,
+                    decimals: pcToken.decimals,
+                    price: pcToken.price,
+                    amountPerLp: pcAmount / lpSupply,
+                },
+            ],
+            timestamp: Date.now(),
+        }));
+    }
+    yield Promise.allSettled(poolsPromises);
+    const tokensSupDecResult = yield (0, runInBatch_1.default)(farmsAccounts.map((farm) => () => (0, fetchTokenSupplyAndDecimals_1.fetchTokenSupplyAndDecimals)(farm.farmTokenMint, client, 0)));
+    const tokensSuppliesAndDecimalsByMint = new Map();
+    tokensSupDecResult.forEach((r, index) => {
+        if (r.status === 'rejected')
+            return;
+        if (!r.value)
             return;
-        const tokenAccount = solana_1.tokenAccountStruct.deserialize(tokenAccountRes.data)[0];
-        tokenAccountsMap.set(tokenAccountsToFetch[i].toString(), tokenAccount);
+        tokensSuppliesAndDecimalsByMint.set(farmsAccounts[index].farmTokenMint.toString(), r.value);
     });
-    for (let i = 0; i < aquafarms.length; i += 1) {
-        const aquafarm = aquafarms[i];
+    const farmsPromises = [];
+    for (let i = 0; i < farmsAccounts.length; i += 1) {
+        const aquafarm = farmsAccounts[i];
         const baseMint = aquafarm.baseTokenMint.toString();
         const baseToken = yield cache.getTokenPrice(baseMint, portfolio_core_1.NetworkId.solana);
         if (!baseToken)
             continue;
-        const baseVault = tokenAccountsMap.get(aquafarm.baseTokenVault.toString());
+        const baseVault = tokenAccountByAddress.get(aquafarm.baseTokenVault.toString());
         if (!baseVault)
             continue;
         if (baseVault.amount.isZero())
             continue;
         const farmMint = aquafarm.farmTokenMint.toString();
-        const tokenSupplyRes = yield (0, fetchTokenSupplyAndDecimals_1.fetchTokenSupplyAndDecimals)(new web3_js_1.PublicKey(farmMint), client, 0);
+        const tokenSupplyRes = tokensSuppliesAndDecimalsByMint.get(farmMint);
         if (!tokenSupplyRes)
             continue;
         const { decimals: farmDecimals, supply: farmSupply } = tokenSupplyRes;
@@ -60,21 +153,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             .toNumber();
         const baseVaultValue = baseVaultAmount * baseToken.price;
         const price = baseVaultValue / farmSupply;
-        // Yields
-        // const rewardToken = null;
-        // const rewardVault = tokenAccountsMap.get(
-        //   aquafarm.rewardTokenVault.toString()
-        // );
-        // if (rewardVault) rewardToken = tokenAccountsMap.get(rewardVault.mint.toString());
-        // if (rewardVault)
-        //   rewardToken = await cache.getTokenPrice(
-        //     rewardVault.mint.toString(),
-        //     NetworkId.solana
-        //   );
-        // let yields;
-        // if (rewardToken) yields = getYields(aquafarm, rewardToken, baseVaultValue);
-        // console.log('constexecutor:JobExecutor= ~ yields:', yields);
-        yield cache.setTokenPriceSource({
+        farmsPromises.push(cache.setTokenPriceSource({
             id: constants_1.platformId,
             weight: 1,
             address: farmMint.toString(),
@@ -92,8 +171,9 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                 },
             ],
             timestamp: Date.now(),
-        });
+        }));
     }
+    yield Promise.allSettled(farmsPromises);
 });
 const job = {
     id: `${constants_1.platformId}-lp-tokens`,

package/src/plugins/orca/lpTokensJob.js.map

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

package/src/plugins/orca/structs/{aquafarms.d.ts → oldLiquidities.d.ts}

@@ -35,3 +35,24 @@ export type Aquafarm = {
     cumulativeEmissionsPerFarmToken: BigNumber;
 };
 export declare const aquafarmStruct: BeetStruct<Aquafarm, Partial<Aquafarm>>;
+export type PoolInfo = {
+    version: number;
+    isInitialized: number;
+    nonce: number;
+    tokenProgramId: PublicKey;
+    tokenAccountA: PublicKey;
+    tokenAccountB: PublicKey;
+    tokenPool: PublicKey;
+    mintA: PublicKey;
+    mintB: PublicKey;
+    feeAccount: PublicKey;
+    tradeFeeNumerator: BigNumber;
+    tradeFeeDenominator: BigNumber;
+    ownerTradeFeeNumerator: BigNumber;
+    ownerTradeFeeDenominator: BigNumber;
+    ownerWithdrawFeeNumerator: BigNumber;
+    ownerWithdrawFeeDenominator: BigNumber;
+    hostFeeNumerator: BigNumber;
+    hostFeeDenominator: BigNumber;
+};
+export declare const poolInfoStruct: BeetStruct<PoolInfo, Partial<PoolInfo>>;

package/src/plugins/orca/structs/{aquafarms.js → oldLiquidities.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aquafarmStruct = exports.userAquafarmStruct = exports.ammV4InfoStruct = void 0;
+exports.poolInfoStruct = exports.aquafarmStruct = exports.userAquafarmStruct = exports.ammV4InfoStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../../utils/solana");
@@ -34,4 +34,24 @@ exports.aquafarmStruct = new beet_1.BeetStruct([
     ['lastUpdatedTimestamp', solana_1.u64],
     ['cumulativeEmissionsPerFarmToken', solana_1.u256],
 ], (args) => args);
-//# sourceMappingURL=aquafarms.js.map
+exports.poolInfoStruct = new beet_1.BeetStruct([
+    ['version', beet_1.u8],
+    ['isInitialized', beet_1.u8],
+    ['nonce', beet_1.u8],
+    ['tokenProgramId', beet_solana_1.publicKey],
+    ['tokenAccountA', beet_solana_1.publicKey],
+    ['tokenAccountB', beet_solana_1.publicKey],
+    ['tokenPool', beet_solana_1.publicKey],
+    ['mintA', beet_solana_1.publicKey],
+    ['mintB', beet_solana_1.publicKey],
+    ['feeAccount', beet_solana_1.publicKey],
+    ['tradeFeeNumerator', solana_1.i64],
+    ['tradeFeeDenominator', solana_1.i64],
+    ['ownerTradeFeeNumerator', solana_1.i64],
+    ['ownerTradeFeeDenominator', solana_1.i64],
+    ['ownerWithdrawFeeNumerator', solana_1.i64],
+    ['ownerWithdrawFeeDenominator', solana_1.i64],
+    ['hostFeeNumerator', solana_1.i64],
+    ['hostFeeDenominator', solana_1.i64],
+], (args) => args);
+//# sourceMappingURL=oldLiquidities.js.map

package/src/plugins/orca/structs/oldLiquidities.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oldLiquidities.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orca/structs/oldLiquidities.ts"],"names":[],"mappings":";;;AAAA,oDAA2D;AAC3D,kEAA6D;AAG7D,kDAA6D;AAWhD,QAAA,eAAe,GAAG,IAAI,iBAAU,CAC3C;IACE,CAAC,eAAe,EAAE,SAAE,CAAC;IACrB,CAAC,aAAa,EAAE,SAAE,CAAC;IACnB,CAAC,YAAY,EAAE,uBAAS,CAAC;IACzB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,qBAAqB,EAAE,YAAG,CAAC;IAC5B,CAAC,+BAA+B,EAAE,aAAI,CAAC;CACxC,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAiB,CAC5B,CAAC;AAWW,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,eAAe,EAAE,SAAE,CAAC;IACrB,CAAC,aAAa,EAAE,SAAE,CAAC;IACnB,CAAC,YAAY,EAAE,uBAAS,CAAC;IACzB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,qBAAqB,EAAE,YAAG,CAAC;IAC5B,CAAC,+BAA+B,EAAE,aAAI,CAAC;CACxC,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC;AAiBW,QAAA,cAAc,GAAG,IAAI,iBAAU,CAC1C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,gBAAgB,EAAE,uBAAS,CAAC;IAC7B,CAAC,oBAAoB,EAAE,uBAAS,CAAC;IACjC,CAAC,wBAAwB,EAAE,uBAAS,CAAC;IACrC,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,gBAAgB,EAAE,uBAAS,CAAC;IAC7B,CAAC,kBAAkB,EAAE,uBAAS,CAAC;IAC/B,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,6BAA6B,EAAE,YAAG,CAAC;IACpC,CAAC,+BAA+B,EAAE,YAAG,CAAC;IACtC,CAAC,sBAAsB,EAAE,YAAG,CAAC;IAC7B,CAAC,iCAAiC,EAAE,aAAI,CAAC;CAC1C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAgB,CAC3B,CAAC;AAsBW,QAAA,cAAc,GAAG,IAAI,iBAAU,CAC1C;IACE,CAAC,SAAS,EAAE,SAAE,CAAC;IACf,CAAC,eAAe,EAAE,SAAE,CAAC;IACrB,CAAC,OAAO,EAAE,SAAE,CAAC;IACb,CAAC,gBAAgB,EAAE,uBAAS,CAAC;IAC7B,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,WAAW,EAAE,uBAAS,CAAC;IACxB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,YAAY,EAAE,uBAAS,CAAC;IACzB,CAAC,mBAAmB,EAAE,YAAG,CAAC;IAC1B,CAAC,qBAAqB,EAAE,YAAG,CAAC;IAC5B,CAAC,wBAAwB,EAAE,YAAG,CAAC;IAC/B,CAAC,0BAA0B,EAAE,YAAG,CAAC;IACjC,CAAC,2BAA2B,EAAE,YAAG,CAAC;IAClC,CAAC,6BAA6B,EAAE,YAAG,CAAC;IACpC,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,oBAAoB,EAAE,YAAG,CAAC;CAC5B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAgB,CAC3B,CAAC"}

package/src/plugins/raydium/lpTokensJob.js

@@ -22,28 +22,31 @@ const filters_1 = require("./filters");
 const types_1 = require("./types");
 const runInBatch_1 = __importDefault(require("../../utils/misc/runInBatch"));
 const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
-const ammInfos = [
+const ammsDetails = [
     {
         versionId: 4,
         struct: amms_1.ammInfoV4Struct,
         programId: constants_1.AMM_PROGRAM_ID_V4,
         filters: filters_1.ammV4Filter,
+        name: 'Pools V4',
     },
     {
         versionId: 5,
         struct: amms_1.ammInfoV5Struct,
         programId: constants_1.AMM_PROGRAM_ID_V5,
         filters: filters_1.ammV5Filter,
+        name: 'Pools V5',
     },
 ];
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     const ammsRaws = [];
-    for (let id = 0; id < ammInfos.length; id++) {
-        const ammInfo = ammInfos[id];
-        const { struct, programId, filters } = ammInfo;
+    for (let id = 0; id < ammsDetails.length; id++) {
+        const ammDetails = ammsDetails[id];
+        const { struct, programId, filters, versionId, name: ammName } = ammDetails;
         const ammsRes = yield client.getProgramAccounts(programId, { filters });
-        const cAmms = ammsRes.map((poolRes) => struct.deserialize(poolRes.account.data)[0]);
+        const cAmms = ammsRes.map((poolRes) => (Object.assign(Object.assign({}, struct.deserialize(poolRes.account.data)[0]), { versionId,
+            ammName })));
         ammsRaws.push(...cAmms);
     }
     const ammsAccounts = ammsRaws.filter((a) => {
@@ -155,6 +158,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             decimals: lpDecimals,
             price,
             underlyings,
+            elementName: amm.ammName,
             timestamp: Date.now(),
         });
     }

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

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

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

@@ -1,3 +1,4 @@
+import { AmmInfoV4, AmmInfoV5 } from './structs/amms';
 export declare enum LiquidityPoolStatus {
     Uninitialized = 0,
     Initialized = 1,
@@ -8,3 +9,13 @@ export declare enum LiquidityPoolStatus {
     Swap = 6,
     WaitingForStart = 7
 }
+export type EnhancedAmmInfoV4 = AmmInfoV4 & {
+    versionId: number;
+    ammName: string;
+};
+export type EnhancedAmmInfoV5 = AmmInfoV5 & {
+    versionId: number;
+    ammName: string;
+};
+export type AmmInfo = AmmInfoV4 | AmmInfoV5;
+export type EnhancedAmmInfo = EnhancedAmmInfoV4 | EnhancedAmmInfoV5;

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBASX;AATD,WAAY,mBAAmB;IAC7B,+EAAa,CAAA;IACb,2EAAW,CAAA;IACX,qEAAQ,CAAA;IACR,2FAAmB,CAAA;IACnB,+EAAa,CAAA;IACb,uEAAS,CAAA;IACT,6DAAI,CAAA;IACJ,mFAAe,CAAA;AACjB,CAAC,EATW,mBAAmB,mCAAnB,mBAAmB,QAS9B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,mBASX;AATD,WAAY,mBAAmB;IAC7B,+EAAa,CAAA;IACb,2EAAW,CAAA;IACX,qEAAQ,CAAA;IACR,2FAAmB,CAAA;IACnB,+EAAa,CAAA;IACb,uEAAS,CAAA;IACT,6DAAI,CAAA;IACJ,mFAAe,CAAA;AACjB,CAAC,EATW,mBAAmB,mCAAnB,mBAAmB,QAS9B"}

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

@@ -19,6 +19,18 @@ 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"));
+function getTag(platformId, elementName) {
+    return `${platformId}${elementName ? `<|>${elementName}` : ''}`;
+}
+function parseTag(tag) {
+    const split = tag.split('<|>', 2);
+    if (split.length < 1)
+        throw new Error(`Tag is not valid: ${tag}`);
+    return {
+        platformId: split[0],
+        elementName: split.at(1),
+    };
+}
 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);
@@ -32,7 +44,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         tokenPrices.set(tokenPrice.address, tokenPrice);
     });
     const walletTokensAssets = [];
-    const liquiditiesByPlatformId = {};
+    const liquiditiesByTag = {};
     for (let i = 0; i < tokenAccounts.length; i++) {
         const tokenAccount = tokenAccounts[i];
         if (tokenAccount.amount.isZero())
@@ -54,10 +66,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 value: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
                 yields: [],
             };
-            if (!liquiditiesByPlatformId[tokenPrice.platformId]) {
-                liquiditiesByPlatformId[tokenPrice.platformId] = [];
+            const tag = getTag(tokenPrice.networkId, tokenPrice.elementName);
+            if (!liquiditiesByTag[tag]) {
+                liquiditiesByTag[tag] = [];
             }
-            liquiditiesByPlatformId[tokenPrice.platformId].push(liquidity);
+            liquiditiesByTag[tag].push(liquidity);
         }
         else {
             walletTokensAssets.push((0, tokenPriceToAssetToken_1.default)(address, amount, portfolio_core_1.NetworkId.solana, tokenPrice));
@@ -77,11 +90,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         };
         elements.push(walletTokensElement);
     }
-    for (const [platformId, liquidities] of Object.entries(liquiditiesByPlatformId)) {
+    for (const [tag, liquidities] of Object.entries(liquiditiesByTag)) {
+        const { platformId, elementName } = parseTag(tag);
         elements.push({
             type: portfolio_core_1.PortfolioElementType.liquidity,
             networkId: portfolio_core_1.NetworkId.solana,
             platformId,
+            name: elementName,
             label: 'LiquidityPool',
             value: (0, portfolio_core_1.getUsdValueSum)(liquidities.map((a) => a.value)),
             data: {

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/utils/clients/getClientSei.d.ts

@@ -1,4 +1,3 @@
-import { AptosClient } from 'aptos';
 export default function getClientSei(): Promise<{
     cosmos: {
         auth: {
@@ -36,4 +35,3 @@ export default function getClientSei(): Promise<{
         };
     };
 }>;
-export declare function getClientAptos(): AptosClient;

package/src/utils/clients/getClientSei.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClientAptos = void 0;
 const proto_1 = require("@sei-js/proto");
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const aptos_1 = require("aptos");
 const constants_1 = require("./constants");
-const getBasicAuthHeaders_1 = require("../misc/getBasicAuthHeaders");
 function getClientSei() {
     const urlEndpoint = (0, constants_1.getUrlEndpoint)(portfolio_core_1.NetworkId.sei);
     return proto_1.seiprotocol.ClientFactory.createLCDClient({
@@ -13,15 +10,4 @@ function getClientSei() {
     });
 }
 exports.default = getClientSei;
-function getClientAptos() {
-    var _a, _b;
-    const rpcEndpoint = (0, constants_1.getRpcEndpoint)(portfolio_core_1.NetworkId.aptos);
-    const headers = rpcEndpoint.basicAuth
-        ? (0, getBasicAuthHeaders_1.getBasicAuthHeaders)((_a = rpcEndpoint.basicAuth) === null || _a === void 0 ? void 0 : _a.username, (_b = rpcEndpoint.basicAuth) === null || _b === void 0 ? void 0 : _b.password)
-        : undefined;
-    return new aptos_1.AptosClient(rpcEndpoint.url, {
-        HEADERS: headers,
-    });
-}
-exports.getClientAptos = getClientAptos;
 //# sourceMappingURL=getClientSei.js.map

package/src/utils/clients/getClientSei.js.map

@@ -1 +1 @@
-{"version":3,"file":"getClientSei.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clients/getClientSei.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAE5C,+DAAuD;AACvD,iCAAoC;AACpC,2CAA6D;AAC7D,qEAAkE;AAElE,SAAwB,YAAY;IAClC,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,0BAAS,CAAC,GAAG,CAAC,CAAC;IAClD,OAAO,mBAAW,CAAC,aAAa,CAAC,eAAe,CAAC;QAC/C,YAAY,EAAE,WAAW;KAC1B,CAAC,CAAC;AACL,CAAC;AALD,+BAKC;AAED,SAAgB,cAAc;;IAC5B,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,0BAAS,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS;QACnC,CAAC,CAAC,IAAA,yCAAmB,EACjB,MAAA,WAAW,CAAC,SAAS,0CAAE,QAAQ,EAC/B,MAAA,WAAW,CAAC,SAAS,0CAAE,QAAQ,CAChC;QACH,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,IAAI,mBAAW,CAAC,WAAW,CAAC,GAAG,EAAE;QACtC,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;AACL,CAAC;AAXD,wCAWC"}
+{"version":3,"file":"getClientSei.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clients/getClientSei.ts"],"names":[],"mappings":";;AAAA,yCAA4C;AAE5C,+DAAuD;AACvD,2CAA6C;AAE7C,SAAwB,YAAY;IAClC,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,0BAAS,CAAC,GAAG,CAAC,CAAC;IAClD,OAAO,mBAAW,CAAC,aAAa,CAAC,eAAe,CAAC;QAC/C,YAAY,EAAE,WAAW;KAC1B,CAAC,CAAC;AACL,CAAC;AALD,+BAKC"}

package/src/utils/misc/getDecimalsForToken.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDecimalsForToken = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const clients_1 = require("../clients");
 const aptos_1 = require("../aptos");
 /**
@@ -34,6 +35,11 @@ function getDecimalsForToken(address, networkId) {
                     return undefined;
                 return viewRes[0];
             }
+            case 'solana': {
+                const client = (0, clients_1.getClientSolana)();
+                const res = yield client.getTokenSupply(new web3_js_1.PublicKey(address));
+                return res.value.decimals ? res.value.decimals : undefined;
+            }
             default:
                 throw new Error('getDecimalsForToken : Network not supported');
         }

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

@@ -1 +1 @@
-{"version":3,"file":"getDecimalsForToken.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getDecimalsForToken.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wCAA4C;AAC5C,oCAAwC;AAExC;;;;;;;GAOG;AACH,SAAsB,mBAAmB,CACvC,OAAe,EACf,SAAwB;;QAExB,QAAQ,SAAS,EAAE;YACjB,KAAK,OAAO,CAAC,CAAC;gBACZ,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAChC,MAAM,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC;oBACjC,QAAQ,EAAE,oBAAY;oBACtB,cAAc,EAAE,CAAC,OAAO,CAAC;oBACzB,SAAS,EAAE,EAAE;iBACd,CAAC,CAAa,CAAC;gBAChB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAO,SAAS,CAAC;gBAC3C,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;aACnB;YACD;gBACE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAClE;IACH,CAAC;CAAA;AAlBD,kDAkBC"}
+{"version":3,"file":"getDecimalsForToken.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getDecimalsForToken.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAA4C;AAC5C,wCAA6D;AAC7D,oCAAwC;AAExC;;;;;;;GAOG;AACH,SAAsB,mBAAmB,CACvC,OAAe,EACf,SAAwB;;QAExB,QAAQ,SAAS,EAAE;YACjB,KAAK,OAAO,CAAC,CAAC;gBACZ,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAChC,MAAM,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC;oBACjC,QAAQ,EAAE,oBAAY;oBACtB,cAAc,EAAE,CAAC,OAAO,CAAC;oBACzB,SAAS,EAAE,EAAE;iBACd,CAAC,CAAa,CAAC;gBAChB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAO,SAAS,CAAC;gBAC3C,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;aACnB;YACD,KAAK,QAAQ,CAAC,CAAC;gBACb,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;gBACjC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAChE,OAAO,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;aAC5D;YACD;gBACE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAClE;IACH,CAAC;CAAA;AAvBD,kDAuBC"}

package/src/utils/solana/fetchTokenSupplyAndDecimals.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchTokenSupplyAndDecimals = void 0;
-const web3_js_1 = require("@solana/web3.js");
 const sleep_1 = __importDefault(require("../misc/sleep"));
 const solMints = [
     '11111111111111111111111111111111',
@@ -21,14 +20,7 @@ const solMints = [
 ];
 function fetchTokenSupplyAndDecimals(mint, client, sleepMultiplier = 1) {
     return __awaiter(this, void 0, void 0, function* () {
-        let mintPublicKey;
-        if (typeof mint === 'string') {
-            mintPublicKey = new web3_js_1.PublicKey(mint);
-        }
-        else {
-            mintPublicKey = mint;
-        }
-        if (solMints.includes(mintPublicKey.toString())) {
+        if (solMints.includes(mint.toString())) {
             const supply = yield client.getSupply();
             yield (0, sleep_1.default)(200 * sleepMultiplier);
             return {
@@ -36,7 +28,7 @@ function fetchTokenSupplyAndDecimals(mint, client, sleepMultiplier = 1) {
                 decimals: 9,
             };
         }
-        const tokenSupplyRes = yield client.getTokenSupply(mintPublicKey);
+        const tokenSupplyRes = yield client.getTokenSupply(mint);
         if (!tokenSupplyRes.value.uiAmount)
             return undefined;
         yield (0, sleep_1.default)(200 * sleepMultiplier);

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

@@ -1 +1 @@
-{"version":3,"file":"fetchTokenSupplyAndDecimals.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/fetchTokenSupplyAndDecimals.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAwD;AACxD,0DAAkC;AAElC,MAAM,QAAQ,GAAG;IACf,kCAAkC;IAClC,6CAA6C;CAC9C,CAAC;AAEF,SAAsB,2BAA2B,CAC/C,IAAe,EACf,MAAkB,EAClB,eAAe,GAAG,CAAC;;QAEnB,IAAI,aAAa,CAAC;QAClB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,aAAa,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,CAAC;SACrC;aAAM;YACL,aAAa,GAAG,IAAI,CAAC;SACtB;QAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,EAAE;YAC/C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,IAAA,eAAK,EAAC,GAAG,GAAG,eAAe,CAAC,CAAC;YACnC,OAAO;gBACL,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI;gBACjC,QAAQ,EAAE,CAAC;aACZ,CAAC;SACH;QACD,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAClE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QACrD,MAAM,IAAA,eAAK,EAAC,GAAG,GAAG,eAAe,CAAC,CAAC;QACnC,OAAO;YACL,MAAM,EAAE,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC5D,QAAQ,EAAE,cAAc,CAAC,KAAK,CAAC,QAAQ;SACxC,CAAC;IACJ,CAAC;CAAA;AA3BD,kEA2BC"}
+{"version":3,"file":"fetchTokenSupplyAndDecimals.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/fetchTokenSupplyAndDecimals.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,0DAAkC;AAElC,MAAM,QAAQ,GAAG;IACf,kCAAkC;IAClC,6CAA6C;CAC9C,CAAC;AAEF,SAAsB,2BAA2B,CAC/C,IAAe,EACf,MAAkB,EAClB,eAAe,GAAG,CAAC;;QAEnB,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE;YACtC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,IAAA,eAAK,EAAC,GAAG,GAAG,eAAe,CAAC,CAAC;YACnC,OAAO;gBACL,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI;gBACjC,QAAQ,EAAE,CAAC;aACZ,CAAC;SACH;QACD,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QACrD,MAAM,IAAA,eAAK,EAAC,GAAG,GAAG,eAAe,CAAC,CAAC;QACnC,OAAO;YACL,MAAM,EAAE,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC5D,QAAQ,EAAE,cAAc,CAAC,KAAK,CAAC,QAAQ;SACxC,CAAC;IACJ,CAAC;CAAA;AApBD,kEAoBC"}

package/src/plugins/orca/structs/aquafarms.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"aquafarms.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orca/structs/aquafarms.ts"],"names":[],"mappings":";;;AAAA,oDAA2D;AAC3D,kEAA6D;AAG7D,kDAAwD;AAW3C,QAAA,eAAe,GAAG,IAAI,iBAAU,CAC3C;IACE,CAAC,eAAe,EAAE,SAAE,CAAC;IACrB,CAAC,aAAa,EAAE,SAAE,CAAC;IACnB,CAAC,YAAY,EAAE,uBAAS,CAAC;IACzB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,qBAAqB,EAAE,YAAG,CAAC;IAC5B,CAAC,+BAA+B,EAAE,aAAI,CAAC;CACxC,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAiB,CAC5B,CAAC;AAWW,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,eAAe,EAAE,SAAE,CAAC;IACrB,CAAC,aAAa,EAAE,SAAE,CAAC;IACnB,CAAC,YAAY,EAAE,uBAAS,CAAC;IACzB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,qBAAqB,EAAE,YAAG,CAAC;IAC5B,CAAC,+BAA+B,EAAE,aAAI,CAAC;CACxC,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC;AAiBW,QAAA,cAAc,GAAG,IAAI,iBAAU,CAC1C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,gBAAgB,EAAE,uBAAS,CAAC;IAC7B,CAAC,oBAAoB,EAAE,uBAAS,CAAC;IACjC,CAAC,wBAAwB,EAAE,uBAAS,CAAC;IACrC,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,gBAAgB,EAAE,uBAAS,CAAC;IAC7B,CAAC,kBAAkB,EAAE,uBAAS,CAAC;IAC/B,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,6BAA6B,EAAE,YAAG,CAAC;IACpC,CAAC,+BAA+B,EAAE,YAAG,CAAC;IACtC,CAAC,sBAAsB,EAAE,YAAG,CAAC;IAC7B,CAAC,iCAAiC,EAAE,aAAI,CAAC;CAC1C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAgB,CAC3B,CAAC"}