@sonarwatch/portfolio-plugins 0.14.151 → 0.14.153

package/src/plugins/picasso/unstakingPositionsFetcher.js

@@ -27,16 +27,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const allVaults = yield allVaultsMemo.getItem(cache);
     if (!allVaults)
         throw new Error('Vaults not cached');
-    const myVaults = allVaults.filter((v) => { var _a; return ((_a = v.withdrawalRequest) === null || _a === void 0 ? void 0 : _a.owner) === owner; });
+    const myVaults = allVaults.filter((v) => { var _a; return ((_a = v.withdrawalRequest) === null || _a === void 0 ? void 0 : _a.owner.toString()) === owner; });
     if (myVaults.length === 0)
         return [];
     const tokenMints = [
-        ...new Set(myVaults.map((vault) => vault.stakeMint).flat()),
+        ...new Set(myVaults.map((vault) => vault.stakeMint.toString()).flat()),
     ];
     const tokenPrices = yield cache.getTokenPricesAsMap(tokenMints, portfolio_core_1.NetworkId.solana);
     const assets = [];
     myVaults.forEach((vault) => {
-        const tokenPrice = tokenPrices.get(vault.stakeMint);
+        const tokenPrice = tokenPrices.get(vault.stakeMint.toString());
         if (!tokenPrice || !vault.withdrawalRequest)
             return;
         const unlockingAt = new Date(new bignumber_js_1.default(vault.withdrawalRequest.timestampInSec)
@@ -44,7 +44,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             .times(1000)
             .toNumber());
         const isClaimable = unlockingAt.getTime() < Date.now();
-        assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(vault.stakeMint, new bignumber_js_1.default(vault.stakeAmount)
+        assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(vault.stakeMint.toString(), new bignumber_js_1.default(vault.stakeAmount)
             .dividedBy(Math.pow(10, tokenPrice.decimals))
             .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice, undefined, {
             isClaimable,

package/src/plugins/picasso/unstakingPositionsFetcher.js.map

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

package/src/plugins/raydium/ammV2ApiJob.js

@@ -63,6 +63,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
         let tokenPriceA;
         let tokenPriceB;
         const tokenPriceSources = [];
+        const poolStats = [];
         for (let id = 0; id < subPools.data.length; id++) {
             poolInfo = subPools.data[id];
             lpSupply = new bignumber_js_1.default(poolInfo.lpAmount);
@@ -145,7 +146,30 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                     });
                 }
             }
+            poolStats.push({
+                key: poolInfo.id,
+                value: {
+                    address: poolInfo.id,
+                    stats: {
+                        '24h': {
+                            volume: poolInfo.day.volume.toString(),
+                            fees: poolInfo.day.volumeFee.toString(),
+                        },
+                    },
+                    tvlUsdc: poolInfo.tvl.toString(),
+                    apr: poolInfo.day.apr.toString(),
+                    feeRate: poolInfo.config
+                        ? Number(poolInfo.feeRate) *
+                            100 *
+                            (1 - poolInfo.config.protocolFeeRate / 1000000)
+                        : undefined,
+                },
+            });
         }
+        yield cache.setItems(poolStats, {
+            prefix: constants_2.poolStatsPrefix,
+            networkId: portfolio_core_1.NetworkId.solana,
+        });
         yield cache.setTokenPriceSources(tokenPriceSources);
         page += 1;
     } while (subPools.hasNextPage && computeAndStoreLpPrice_1.minimumLiquidity.isLessThan(lastLiquidity));

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

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

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

@@ -5,6 +5,7 @@ import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "raydium";
 export declare const rayMint = "4k3Dyjzvzp8eMZWUXbBCjEvwSkkk59S5iCNLY3QrkX6R";
 export declare const platform: Platform;
+export declare const poolStatsPrefix = "raydium-pool-stats";
 export declare const apiV3 = "https://api-v3.raydium.io/";
 export declare const AMM_PROGRAM_ID_V3: PublicKey;
 export declare const AMM_PROGRAM_ID_V4: PublicKey;

package/src/plugins/raydium/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rayDecimals = exports.positionsIdentifier = exports.cpmmProgramId = exports.raydiumProgram = exports.AMM_PROGRAM_ID_V5 = exports.AMM_PROGRAM_ID_V4 = exports.AMM_PROGRAM_ID_V3 = exports.apiV3 = exports.platform = exports.rayMint = exports.platformId = void 0;
+exports.rayDecimals = exports.positionsIdentifier = exports.cpmmProgramId = exports.raydiumProgram = exports.AMM_PROGRAM_ID_V5 = exports.AMM_PROGRAM_ID_V4 = exports.AMM_PROGRAM_ID_V3 = exports.apiV3 = exports.poolStatsPrefix = exports.platform = exports.rayMint = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'raydium';
 exports.rayMint = '4k3Dyjzvzp8eMZWUXbBCjEvwSkkk59S5iCNLY3QrkX6R';
@@ -17,6 +17,7 @@ exports.platform = {
     tokens: [exports.rayMint],
     description: 'Raydium is an automated market maker (AMM) built on the Solana blockchain which enables lightning-fast trades, permissionless pool creation, and new features for earning yield',
 };
+exports.poolStatsPrefix = 'raydium-pool-stats';
 exports.apiV3 = 'https://api-v3.raydium.io/';
 exports.AMM_PROGRAM_ID_V3 = new web3_js_1.PublicKey('EhhTKczWMGQt46ynNeRX1WfeagwwJd7ufHvCDjRxjo5Q');
 exports.AMM_PROGRAM_ID_V4 = new web3_js_1.PublicKey('675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8');

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,OAAO,GAAG,8CAA8C,CAAC;AACzD,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EACH,6EAA6E;IAC/E,WAAW,EAAE,SAAS;IACtB,OAAO,EAAE,qBAAqB;IAC9B,aAAa,EAAE,kCAAkC;IACjD,OAAO,EAAE,oCAAoC;IAC7C,QAAQ,EAAE,8BAA8B;IACxC,MAAM,EAAE,+BAA+B;IACvC,MAAM,EAAE,CAAC,eAAO,CAAC;IACjB,WAAW,EACT,iLAAiL;CACpL,CAAC;AAEW,QAAA,KAAK,GAAG,4BAA4B,CAAC;AAErC,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AACW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,gCAAgC,CAAC;AAEvD,QAAA,WAAW,GAAG,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,OAAO,GAAG,8CAA8C,CAAC;AACzD,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EACH,6EAA6E;IAC/E,WAAW,EAAE,SAAS;IACtB,OAAO,EAAE,qBAAqB;IAC9B,aAAa,EAAE,kCAAkC;IACjD,OAAO,EAAE,oCAAoC;IAC7C,QAAQ,EAAE,8BAA8B;IACxC,MAAM,EAAE,+BAA+B;IACvC,MAAM,EAAE,CAAC,eAAO,CAAC;IACjB,WAAW,EACT,iLAAiL;CACpL,CAAC;AAEW,QAAA,eAAe,GAAG,oBAAoB,CAAC;AACvC,QAAA,KAAK,GAAG,4BAA4B,CAAC;AAErC,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AACW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,gCAAgC,CAAC;AAEvD,QAAA,WAAW,GAAG,CAAC,CAAC"}

package/src/plugins/raydium/getRaydiumCLMMPositions.js

@@ -34,7 +34,10 @@ function getRaydiumCLMMPositions(cache, nfts) {
         if (!personalPositionsInfo || personalPositionsInfo.length === 0)
             return [];
         const poolsIds = personalPositionsInfo.flatMap((position) => position ? position.poolId : []);
-        const poolStatesInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.poolStateStruct, poolsIds);
+        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 [];
@@ -54,13 +57,10 @@ function getRaydiumCLMMPositions(cache, nfts) {
             const personalPositionInfo = personalPositionsInfo[index];
             if (!personalPositionInfo)
                 continue;
-            if (!poolStateInfo.tokenMint0 ||
-                !poolStateInfo.tokenMint1 ||
-                !poolStateInfo.tickCurrent)
-                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,
@@ -69,6 +69,10 @@ function getRaydiumCLMMPositions(cache, nfts) {
                 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',

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

@@ -1 +1 @@
-{"version":3,"file":"getRaydiumCLMMPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/getRaydiumCLMMPositions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getRaydiumCLMMPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/getRaydiumCLMMPositions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAIoC;AACpC,6CAA4C;AAC5C,2CAA0E;AAC1E,+CAAmE;AACnE,iDAAsD;AACtD,2CAIyB;AAEzB,uCAA0E;AAC1E,gFAA6E;AAG7E,SAAsB,uBAAuB,CAC3C,KAAY,EACZ,IAAiC;;QAEjC,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QAEjC,MAAM,uBAAuB,GAAgB,EAAE,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEhD,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEnE,MAAM,CAAC,cAAc,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACvD,YAAY,EACZ,0BAAc,CACf,CAAC;YACF,uBAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QACH,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEpD,MAAM,qBAAqB,GAAG,MAAM,IAAA,sCAA6B,EAC/D,MAAM,EACN,mCAA2B,EAC3B,uBAAuB,CACxB,CAAC;QACF,IAAI,CAAC,qBAAqB,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAE5E,MAAM,QAAQ,GAAgB,qBAAqB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CACvE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAChC,CAAC;QAEF,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrD,IAAA,sCAA6B,EAAC,MAAM,EAAE,uBAAe,EAAE,QAAQ,CAAC;YAChE,KAAK,CAAC,QAAQ,CACZ,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,EACjC,EAAE,MAAM,EAAE,2BAAe,EAAE,SAAS,EAAE,0BAAS,CAAC,MAAM,EAAE,CACzD;SACF,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,qBAAqB,CAAC,GAAG,CAAC,CAAC,oBAAoB,EAAE,KAAK,EAAE,EAAE;YACxD,IAAI,CAAC,oBAAoB;gBAAE,OAAO,EAAE,CAAC;YACrC,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,aAAa;gBAAE,OAAO,EAAE,CAAC;YAE9B,OAAO,IAAA,sCAA6B,EAAC,MAAM,EAAE,2BAAmB,EAAE;gBAChE,IAAA,6BAAmB,EACjB,0BAAc,CAAC,QAAQ,EAAE,EACzB,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,EAC/B,oBAAoB,CAAC,cAAc,EACnC,aAAa,CAAC,WAAW,CAC1B;gBACD,IAAA,6BAAmB,EACjB,0BAAc,CAAC,QAAQ,EAAE,EACzB,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,EAC/B,oBAAoB,CAAC,cAAc,EACnC,aAAa,CAAC,WAAW,CAC1B;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;QAE1E,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YAClE,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAE5C,IAAI,CAAC,aAAa;gBAAE,SAAS;YAE7B,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC1D,IAAI,CAAC,oBAAoB;gBAAE,SAAS;YAEpC,MAAM,OAAO,GAAG,eAAe,CAAC,+BAA+B,CAAC;gBAC9D,IAAI,EAAE,yDAAyD;aAChE,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,MAAK,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAC7D,CAAC;YAEF,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;gBACrC,QAAQ,EAAE,aAAa,CAAC,UAAU;gBAClC,QAAQ,EAAE,aAAa,CAAC,UAAU;gBAClC,SAAS,EAAE,oBAAoB,CAAC,SAAS;gBACzC,gBAAgB,EAAE,aAAa,CAAC,WAAW;gBAC3C,cAAc,EAAE,oBAAoB,CAAC,cAAc;gBACnD,cAAc,EAAE,oBAAoB,CAAC,cAAc;gBACnD,GAAG,EAAE,oBAAoB,CAAC,MAAM;gBAChC,aAAa,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,KAAK,EAAE,MAAM;gBAC7C,OAAO,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO;gBAC3B,gBAAgB,EAAE,aAAa,CAAC,YAAY;gBAC5C,aAAa,EAAE,aAAa,CAAC,SAAS;gBACtC,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE;qBAChD;oBACD;wBACE,IAAI,EAAE,UAAU;wBAChB,OAAO,EAAE,oBAAoB,CAAC,OAAO,CAAC,QAAQ,EAAE;qBACjD;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,sBAAsB,GAAG,IAAA,kCAAwB,EACrD,oBAAoB,EACpB,aAAa,EACb,UAAU,CAAC,KAAK,CAAC,CAClB,CAAC;YAEF,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,UAAU;oBACjC,MAAM,EAAE,sBAAsB,CAAC,eAAe;iBAC/C,CAAC,CAAC;gBAEH,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,UAAU;oBACjC,MAAM,EAAE,sBAAsB,CAAC,eAAe;iBAC/C,CAAC,CAAC;gBAEH,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE;oBAC1D,IACE,aAAa,CAAC,MAAM,EAAE;wBACtB,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE;4BAC/C,kCAAkC;wBAEpC,OAAO;oBAET,SAAS,CAAC,cAAc,CAAC;wBACvB,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;wBAC/C,MAAM,EAAE,aAAa;qBACtB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;CAAA;AA1ID,0DA0IC"}

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

@@ -201,9 +201,9 @@ export type PoolInfo = {
     feeRate: number;
     openTime: string;
     tvl: number;
-    day: Day;
-    week: Day;
-    month: Day;
+    day: Stats;
+    week: Stats;
+    month: Stats;
     pooltype: string[];
     rewardDefaultInfos: number[];
     farmUpcomingCount: number;
@@ -214,8 +214,18 @@ export type PoolInfo = {
     lpPrice: number;
     lpAmount: number;
     burnPercent: number;
+    config?: {
+        id: string;
+        index: number;
+        protocolFeeRate: number;
+        tradeFeeRate: number;
+        tickSpacing: number;
+        fundFeeRate: number;
+        defaultRange: number;
+        defaultRangePoint: number[];
+    };
 };
-export type Day = {
+export type Stats = {
     volume: number;
     volumeQuote: number;
     volumeFee: number;

package/src/plugins/sanctum/s1AirdropFetcher.js

@@ -28,7 +28,7 @@ const capitalClaimDuration = 14 * 24 * 60 * 60 * 1000;
 const capitalClaimEnd = claimStart.plus(capitalClaimDuration);
 const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     const claimProofBase = yield axios_1.default
-        .get(`${constants_1.lfgApiBaseUrl}/CLoUDKc4Ane7HeQcPpE3YHnznRxhMimJ4MyaUqyHFzAu/${owner}`, {
+        .get(`${constants_1.lfgApiBaseUrl}/CLoUDKc4Ane7HeQcPpE3YHnznRxhMimJ4MyaUqyHFzAu/${owner}?${constants_1.jupApiToken !== null && constants_1.jupApiToken !== void 0 ? constants_1.jupApiToken : ''}`, {
         timeout: 5000,
     })
         .catch((e) => {
@@ -88,7 +88,7 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     ];
     // Check Earnestness
     const claimProofEarn = yield axios_1.default
-        .get(`${constants_1.lfgApiBaseUrl}/earnestness-CLoUDKc4Ane7HeQcPpE3YHnznRxhMimJ4MyaUqyHFzAu/${owner}`, {
+        .get(`${constants_1.lfgApiBaseUrl}/earnestness-CLoUDKc4Ane7HeQcPpE3YHnznRxhMimJ4MyaUqyHFzAu/${owner}?${constants_1.jupApiToken !== null && constants_1.jupApiToken !== void 0 ? constants_1.jupApiToken : ''}`, {
         timeout: 5000,
     })
         .catch((e) => {

package/src/plugins/sanctum/s1AirdropFetcher.js.map

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

package/src/plugins/sharky/collectionsJob.js

@@ -16,9 +16,10 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
-const types_1 = require("./types");
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const structs_1 = require("./structs");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
     const [floorPrices, orderBooks] = yield Promise.all([
@@ -29,15 +30,13 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             .catch((err) => {
             throw Error(`SHARKY_API ERR: ${err}`);
         }),
-        (0, solana_1.getAutoParsedProgramAccounts)(connection, constants_1.sharkyIdlItem, [
-            {
-                dataSize: constants_1.orderBookDataSize,
-            },
-        ]),
+        ParsedGpa_1.ParsedGpa.build(connection, structs_1.orderBookStruct, constants_1.sharkyProgram)
+            .addDataSizeFilter(constants_1.orderBookDataSize)
+            .run(),
     ]);
     if (!floorPrices.data || !orderBooks)
         return;
-    const nftLists = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, types_1.nftListStruct, orderBooks.map((ob) => new web3_js_1.PublicKey(ob.orderBookType.nftList.listAccount)), {
+    const nftLists = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.nftListStruct, orderBooks.map((ob) => new web3_js_1.PublicKey(ob.orderBookType.collectionKey)), {
         dataSlice: { offset: 0, length: 231 },
     });
     const collectionNamesAsMap = new Map();
@@ -49,9 +48,9 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const collections = [];
     orderBooks.forEach((orderBook) => {
         var _a, _b, _c;
-        if (!orderBook || !orderBook.orderBookType.nftList.listAccount)
+        if (!orderBook || !orderBook.orderBookType.collectionKey)
             return;
-        const collectionName = collectionNamesAsMap.get(orderBook.orderBookType.nftList.listAccount);
+        const collectionName = collectionNamesAsMap.get(orderBook.orderBookType.collectionKey.toString());
         if (!collectionName)
             return;
         collections.push({

package/src/plugins/sharky/collectionsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectionsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sharky/collectionsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA0B;AAC1B,6CAA4C;AAG5C,2CAMqB;AACrB,mCAA+D;AAC/D,+CAI4B;AAC5B,iDAAsD;AAEtD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAClD,eAAK;aACF,GAAG,CAAC,oCAAoC,EAAE;YACzC,OAAO,EAAE,IAAI;SACd,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,MAAM,KAAK,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC;QACJ,IAAA,qCAA4B,EAAY,UAAU,EAAE,yBAAa,EAAE;YACjE;gBACE,QAAQ,EAAE,6BAAiB;aAC5B;SACF,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,UAAU;QAAE,OAAO;IAE7C,MAAM,QAAQ,GAAG,MAAM,IAAA,sCAA6B,EAClD,UAAU,EACV,qBAAa,EACb,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,EAC3E;QACE,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE;KACtC,CACF,CAAC;IAEF,MAAM,oBAAoB,GAAwB,IAAI,GAAG,EAAE,CAAC;IAC5D,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc;YAAE,OAAO;QAChD,oBAAoB,CAAC,GAAG,CACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,IAAA,wBAAe,EAAC,OAAO,CAAC,cAAc,CAAC,CACxC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAiB,EAAE,CAAC;IAErC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;;QAC/B,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW;YAAE,OAAO;QACvE,MAAM,cAAc,GAAG,oBAAoB,CAAC,GAAG,CAC7C,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAC5C,CAAC;QACF,IAAI,CAAC,cAAc;YAAE,OAAO;QAC5B,WAAW,CAAC,IAAI,CAAC;YACf,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE;YACtC,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,MAAA,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,0CAAE,aAAa;YAClE,SAAS,EAAE,MAAA,MAAA,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,0CAAE,MAAM,0CAAE,IAAI;SACtE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,OAAO,CAAC,+BAAmB,EAAE,WAAW,EAAE;QACpD,MAAM,EAAE,uBAAW;QACnB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"collectionsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sharky/collectionsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA0B;AAC1B,6CAA4C;AAG5C,2CAMqB;AACrB,+CAG4B;AAC5B,iDAAsD;AACtD,kEAA+D;AAC/D,uCAA2D;AAG3D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAClD,eAAK;aACF,GAAG,CAAC,oCAAoC,EAAE;YACzC,OAAO,EAAE,IAAI;SACd,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,MAAM,KAAK,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC;QACJ,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,yBAAe,EAAE,yBAAa,CAAC;aACxD,iBAAiB,CAAC,6BAAiB,CAAC;aACpC,GAAG,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,UAAU;QAAE,OAAO;IAE7C,MAAM,QAAQ,GAAG,MAAM,IAAA,sCAA6B,EAClD,UAAU,EACV,uBAAa,EACb,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,EAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,EACrE;QACE,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE;KACtC,CACF,CAAC;IAEF,MAAM,oBAAoB,GAAwB,IAAI,GAAG,EAAE,CAAC;IAC5D,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc;YAAE,OAAO;QAChD,oBAAoB,CAAC,GAAG,CACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,IAAA,wBAAe,EAAC,OAAO,CAAC,cAAc,CAAC,CACxC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAiB,EAAE,CAAC;IAErC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;;QAC/B,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,aAAa;YAAE,OAAO;QACjE,MAAM,cAAc,GAAG,oBAAoB,CAAC,GAAG,CAC7C,SAAS,CAAC,aAAa,CAAC,aAAa,CAAC,QAAQ,EAAE,CACjD,CAAC;QACF,IAAI,CAAC,cAAc;YAAE,OAAO;QAC5B,WAAW,CAAC,IAAI,CAAC;YACf,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE;YACtC,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,MAAA,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,0CAAE,aAAa;YAClE,SAAS,EAAE,MAAA,MAAA,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,0CAAE,MAAM,0CAAE,IAAI;SACtE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,OAAO,CAAC,+BAAmB,EAAE,WAAW,EAAE;QACpD,MAAM,EAAE,uBAAW;QACnB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

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

@@ -2,7 +2,6 @@
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
-import { IdlItem } from '@solanafm/explorer-kit-idls';
 export declare const platformId = "sharky";
 export declare const platform: Platform;
 export declare const collectionsCacheKey = "sharky-collections";
@@ -10,4 +9,3 @@ export declare const cachePrefix = "sharky";
 export declare const sharkyProgram: PublicKey;
 export declare const loanDataSize = 338;
 export declare const orderBookDataSize = 10240;
-export declare const sharkyIdlItem: IdlItem;

package/src/plugins/sharky/constants.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sharkyIdlItem = exports.orderBookDataSize = exports.loanDataSize = exports.sharkyProgram = exports.cachePrefix = exports.collectionsCacheKey = exports.platform = exports.platformId = void 0;
+exports.orderBookDataSize = exports.loanDataSize = exports.sharkyProgram = exports.cachePrefix = exports.collectionsCacheKey = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const idl_1 = require("./idl");
 exports.platformId = 'sharky';
 exports.platform = {
     id: exports.platformId,
@@ -21,9 +20,4 @@ exports.cachePrefix = `${exports.platformId}`;
 exports.sharkyProgram = new web3_js_1.PublicKey('SHARKobtfF1bHhxD2eqftjHBdVSCbKo9JtgK71FhELP');
 exports.loanDataSize = 338;
 exports.orderBookDataSize = 10240;
-exports.sharkyIdlItem = {
-    programId: exports.sharkyProgram.toString(),
-    idl: idl_1.SharkyIDL,
-    idlType: 'anchor',
-};
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sharky/constants.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAE5C,+BAAkC;AAErB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,QAAQ;IACd,KAAK,EACH,4EAA4E;IAC9E,OAAO,EAAE,oBAAoB;IAC7B,OAAO,EAAE,8BAA8B;IACvC,WAAW,EAAE,QAAQ,EAAE,sCAAsC;IAC7D,OAAO,EAAE,6BAA6B;IACtC,MAAM,EAAE,6BAA6B;IACrC,MAAM,EAAE,CAAC,6CAA6C,CAAC;IACvD,WAAW,EACT,yJAAyJ;CAC5J,CAAC;AACW,QAAA,mBAAmB,GAAG,GAAG,kBAAU,cAAc,CAAC;AAClD,QAAA,WAAW,GAAG,GAAG,kBAAU,EAAE,CAAC;AAE9B,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,YAAY,GAAG,GAAG,CAAC;AACnB,QAAA,iBAAiB,GAAG,KAAK,CAAC;AAE1B,QAAA,aAAa,GAAG;IAC3B,SAAS,EAAE,qBAAa,CAAC,QAAQ,EAAE;IACnC,GAAG,EAAE,eAAS;IACd,OAAO,EAAE,QAAQ;CACP,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sharky/constants.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,QAAQ;IACd,KAAK,EACH,4EAA4E;IAC9E,OAAO,EAAE,oBAAoB;IAC7B,OAAO,EAAE,8BAA8B;IACvC,WAAW,EAAE,QAAQ,EAAE,sCAAsC;IAC7D,OAAO,EAAE,6BAA6B;IACtC,MAAM,EAAE,6BAA6B;IACrC,MAAM,EAAE,CAAC,6CAA6C,CAAC;IACvD,WAAW,EACT,yJAAyJ;CAC5J,CAAC;AACW,QAAA,mBAAmB,GAAG,GAAG,kBAAU,cAAc,CAAC;AAClD,QAAA,WAAW,GAAG,GAAG,kBAAU,EAAE,CAAC;AAE9B,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,YAAY,GAAG,GAAG,CAAC;AACnB,QAAA,iBAAiB,GAAG,KAAK,CAAC"}

package/src/plugins/sharky/loansFetcher.js

@@ -16,22 +16,30 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 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 filters_1 = require("./filters");
 const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
 const arrayToMap_1 = require("../../utils/misc/arrayToMap");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const structs_1 = require("./structs");
 const collectionsMemo = new MemoizedCache_1.MemoizedCache(constants_1.collectionsCacheKey, {
     prefix: constants_1.cachePrefix,
     networkId: portfolio_core_1.NetworkId.solana,
 }, (arr) => (0, arrayToMap_1.arrayToMap)(arr || [], 'orderBook'));
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const [filterA, filterB, filterC] = (0, filters_1.getLoanFilters)(owner);
     const accounts = (yield Promise.all([
-        (0, solana_1.getAutoParsedProgramAccounts)(connection, constants_1.sharkyIdlItem, filterA),
-        (0, solana_1.getAutoParsedProgramAccounts)(connection, constants_1.sharkyIdlItem, filterB),
-        (0, solana_1.getAutoParsedProgramAccounts)(connection, constants_1.sharkyIdlItem, filterC),
+        ParsedGpa_1.ParsedGpa.build(connection, structs_1.loanStruct, constants_1.sharkyProgram)
+            .addRawFilter(115, owner)
+            .addDataSizeFilter(constants_1.loanDataSize)
+            .run(),
+        ParsedGpa_1.ParsedGpa.build(connection, structs_1.loanStruct, constants_1.sharkyProgram)
+            .addRawFilter(147, owner)
+            .addDataSizeFilter(constants_1.loanDataSize)
+            .run(),
+        ParsedGpa_1.ParsedGpa.build(connection, structs_1.loanStruct, constants_1.sharkyProgram)
+            .addRawFilter(83, owner)
+            .addDataSizeFilter(constants_1.loanDataSize)
+            .run(),
     ])).flat();
     if (accounts.length === 0)
         return [];
@@ -45,17 +53,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         throw new Error('Sol price not cached');
     const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
     accounts.forEach((acc) => {
-        var _a;
-        const collection = collections.get(acc.orderBook);
+        const collection = collections.get(acc.orderBook.toString());
         if (!collection)
             return;
         const element = elementRegistry.addElementBorrowlend({
             label: 'Lending',
         });
         let mintAsset = null;
-        if ((_a = acc.loanState.taken) === null || _a === void 0 ? void 0 : _a.taken.nftCollateralMint) {
+        if (acc.loanState.__kind === 'Taken') {
             mintAsset = {
-                address: acc.loanState.taken.taken.nftCollateralMint,
+                address: acc.loanState.nftCollateralMint,
                 collection: {
                     name: collection.name,
                     floorPrice: new bignumber_js_1.default(collection.floor).multipliedBy(solTokenPrice.price),
@@ -68,13 +75,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             amount: acc.principalLamports,
         };
         let name;
-        if (acc.loanState.offer) {
+        if (acc.loanState.__kind === 'Offer') {
             // LENDER
             element.addSuppliedAsset(solAsset);
             name = `Lend Offer on ${collection.name}`;
         }
-        else if (acc.loanState.taken) {
-            if (acc.loanState.taken.taken.lenderNoteMint === owner.toString()) {
+        else if (acc.loanState.__kind === 'Taken') {
+            if (acc.loanState.lenderNoteMint.toString() === owner.toString()) {
                 // LENDER
                 element.addSuppliedAsset(solAsset);
                 if (mintAsset)
@@ -92,12 +99,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
         if (name)
             element.setName(name);
-        element.setFixedTerms(acc.loanState.offer !== undefined ||
-            (acc.loanState.taken
-                ? acc.loanState.taken.taken.lenderNoteMint === owner.toString()
-                : false), acc.loanState.taken
-            ? (Number(acc.loanState.taken.taken.terms.time.start) +
-                Number(acc.loanState.taken.taken.terms.time.duration)) *
+        element.setFixedTerms((acc.loanState.__kind === 'Taken'
+            ? acc.loanState.lenderNoteMint.toString() === owner.toString()
+            : false) || acc.loanState.__kind !== 'Offer', acc.loanState.__kind === 'Taken'
+            ? (Number(acc.loanState.terms.start) +
+                Number(acc.loanState.terms.duration)) *
                 1000
             : undefined);
     });

package/src/plugins/sharky/loansFetcher.js.map

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

package/src/plugins/sharky/structs.d.ts

@@ -0,0 +1,96 @@
+/// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
+import { PublicKey } from '@solana/web3.js';
+import BigNumber from 'bignumber.js';
+import { FixableBeetStruct, DataEnumKeyAsKind } from '@metaplex-foundation/beet';
+type APYRecord = {
+    Fixed: {
+        apy: number;
+    };
+};
+type APY = DataEnumKeyAsKind<APYRecord>;
+type LoanTermsRecord = {
+    Time: {
+        start: BigNumber;
+        duration: BigNumber;
+        total_owed_lamports: BigNumber;
+    };
+};
+type LoanTerms = DataEnumKeyAsKind<LoanTermsRecord>;
+type OrderBookTypeRecord = {
+    Collection: {
+        collectionKey: PublicKey;
+    };
+    NFTList: {
+        collectionKey: PublicKey;
+    };
+};
+type OrderBookType = DataEnumKeyAsKind<OrderBookTypeRecord>;
+type LoanTermsSpecRecord = {
+    Time: {
+        duration: BigNumber;
+    };
+};
+type LoanTermsSpec = DataEnumKeyAsKind<LoanTermsSpecRecord>;
+type BookLoanTermsRecord = {
+    Fixed: {
+        terms: LoanTermsSpec;
+    };
+    LenderChooses: NonNullable<unknown>;
+};
+type BookLoanTerms = DataEnumKeyAsKind<BookLoanTermsRecord>;
+export type OrderBook = {
+    accountDiscriminator: number[];
+    version: number;
+    orderBookType: OrderBookType;
+    apy: APY;
+    loanTerms: BookLoanTerms;
+    feePermillicentage: number;
+    feeAuthority: PublicKey;
+};
+export declare const orderBookStruct: FixableBeetStruct<OrderBook, Partial<OrderBook>>;
+export type NftList = {
+    accountDiscriminator: number[];
+    version: number;
+    collectionName: number[];
+};
+export declare const nftListStruct: FixableBeetStruct<NftList, Partial<NftList>>;
+type LoanStateRecord = {
+    Offer: {
+        lenderWallet: PublicKey;
+        termsSpec: LoanTermsSpec;
+        offerTime: BigNumber;
+    };
+    Taken: {
+        nftCollateralMint: PublicKey;
+        lenderNoteMint: PublicKey;
+        borrowerNoteMint: PublicKey;
+        apy: APY;
+        terms: LoanTerms;
+        isCollateralFrozen: number;
+    };
+};
+type LoanState = DataEnumKeyAsKind<LoanStateRecord>;
+export type Loan = {
+    accountDiscriminator: number[];
+    version: number;
+    principalLamports: BigNumber;
+    orderBook: PublicKey;
+    valueTokenMint: PublicKey;
+    escrowBumpSeed: number;
+    loanState: LoanState;
+};
+export declare const loanStruct: FixableBeetStruct<Loan, Partial<Loan>>;
+export type EscrowPda = {
+    accountDiscriminator: number[];
+    bump: number;
+};
+export declare const escrowPdaStruct: FixableBeetStruct<EscrowPda, Partial<EscrowPda>>;
+export type ProgramVersion = {
+    accountDiscriminator: number[];
+    version: number;
+    bump: number;
+    updated: BigNumber;
+};
+export declare const programVersionStruct: FixableBeetStruct<ProgramVersion, Partial<ProgramVersion>>;
+export {};