@sonarwatch/portfolio-plugins 0.11.61 → 0.11.63

package/CHANGELOG.md

@@ -2,10 +2,18 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
-## [0.11.61](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.60...plugins-0.11.61) (2024-02-05)
+## [0.11.63](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.62...plugins-0.11.63) (2024-02-09)
 
 
 
+## [0.11.62](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.61...plugins-0.11.62) (2024-02-07)
+
+
+
+## [0.11.61](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.60...plugins-0.11.61) (2024-02-05)
+
+
+
 ## [0.11.60](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.59...plugins-0.11.60) (2024-02-02)
 
 

package/package.json

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

package/src/plugins/jupiter/airdropFetcher.js

@@ -28,7 +28,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         .get(constants_1.merkleApi + owner)
         .catch(() => null);
     const jupTokenPrice = yield cache.getTokenPrice(constants_1.jupMint, portfolio_core_1.NetworkId.solana);
-    if (claimProofRes) {
+    if (claimProofRes && claimProofRes.data) {
         const claimStatus = (0, helpers_1.deriveClaimStatus)(new web3_js_1.PublicKey(owner), new web3_js_1.PublicKey(claimProofRes.data.merkle_tree), constants_1.merkleDistributorPid)[0];
         const account = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.claimStatusStruct, claimStatus);
         if (!account) {

package/src/plugins/jupiter/airdropFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAC7E,kDAA6C;AAC7C,6CAA4C;AAC5C,gEAAqC;AAGrC,2CAMqB;AACrB,iDAAsD;AACtD,uCAA8C;AAE9C,kFAA+E;AAC/E,uCAA8C;AAC9C,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,aAAa,GAA6C,MAAM,eAAK;SACxE,GAAG,CAAC,qBAAS,GAAG,KAAK,CAAC;SACtB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAErB,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,mBAAO,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC3E,IAAI,aAAa,EAAE;QACjB,MAAM,WAAW,GAAG,IAAA,2BAAiB,EACnC,IAAI,mBAAS,CAAC,KAAK,CAAC,EACpB,IAAI,mBAAS,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,EAC7C,gCAAoB,CACrB,CAAC,CAAC,CAAC,CAAC;QACL,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EACxC,MAAM,EACN,2BAAiB,EACjB,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;iBACpD,SAAS,CAAC,SAAA,EAAE,EAAI,uBAAW,CAAA,CAAC;iBAC5B,QAAQ,EAAE,CAAC;YACd,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,mBAAO,EACP,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,aAAa,CACd,CAAC;YACF,OAAO;gBACL;oBACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;oBACnC,KAAK,EAAE,SAAS;oBAChB,SAAS,EAAE,0BAAS,CAAC,MAAM;oBAC3B,UAAU,EAAV,sBAAU;oBACV,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE;wBACJ,MAAM,EAAE,iCAAM,KAAK,KAAE,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,IAAG;qBAC1D;oBACD,KAAK,EAAE,KAAK,CAAC,KAAK;iBACnB;aACF,CAAC;SACH;QACD,OAAO,EAAE,CAAC;KACX;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAC7E,kDAA6C;AAC7C,6CAA4C;AAC5C,gEAAqC;AAGrC,2CAMqB;AACrB,iDAAsD;AACtD,uCAA8C;AAE9C,kFAA+E;AAC/E,uCAA8C;AAC9C,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,aAAa,GAA6C,MAAM,eAAK;SACxE,GAAG,CAAC,qBAAS,GAAG,KAAK,CAAC;SACtB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAErB,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,mBAAO,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC3E,IAAI,aAAa,IAAI,aAAa,CAAC,IAAI,EAAE;QACvC,MAAM,WAAW,GAAG,IAAA,2BAAiB,EACnC,IAAI,mBAAS,CAAC,KAAK,CAAC,EACpB,IAAI,mBAAS,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,EAC7C,gCAAoB,CACrB,CAAC,CAAC,CAAC,CAAC;QACL,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EACxC,MAAM,EACN,2BAAiB,EACjB,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;iBACpD,SAAS,CAAC,SAAA,EAAE,EAAI,uBAAW,CAAA,CAAC;iBAC5B,QAAQ,EAAE,CAAC;YACd,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,mBAAO,EACP,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,aAAa,CACd,CAAC;YACF,OAAO;gBACL;oBACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;oBACnC,KAAK,EAAE,SAAS;oBAChB,SAAS,EAAE,0BAAS,CAAC,MAAM;oBAC3B,UAAU,EAAV,sBAAU;oBACV,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE;wBACJ,MAAM,EAAE,iCAAM,KAAK,KAAE,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,IAAG;qBAC1D;oBACD,KAAK,EAAE,KAAK,CAAC,KAAK;iBACnB;aACF,CAAC;SACH;QACD,OAAO,EAAE,CAAC;KACX;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/kamino/helpers/vaults.d.ts

@@ -1,11 +1,22 @@
 import BigNumber from 'bignumber.js';
+import { BeetStruct } from '@metaplex-foundation/beet';
 import { Position, Whirlpool } from '../../orca/structs/whirlpool';
 import { PersonalPositionState, PoolState } from '../../raydium/structs/clmms';
 import { WhirlpoolStrategy } from '../structs/vaults';
 import { ParsedAccount } from '../../../utils/solana';
-export declare function dexToNumber(dex: string): number;
-export declare function getTokenAmountsFromInfos(strategy: ParsedAccount<WhirlpoolStrategy>, pool: PoolState | Whirlpool, position: PersonalPositionState | Position): {
+import { BinArray, DLMMPosition, LbPair } from '../../meteora/struct';
+export declare enum DEXS {
+    ORCA = 0,
+    RAYDIUM = 1,
+    METEORA = 2
+}
+export declare function getTokenAmountsFromInfos(strategy: ParsedAccount<WhirlpoolStrategy>, pool: PoolState | Whirlpool | LbPair, position: PersonalPositionState | Position | DLMMPosition, binArrays?: BinArray[]): {
     tokenAmountA: BigNumber;
     tokenAmountB: BigNumber;
 };
 export declare function isActive(strategy: WhirlpoolStrategy): boolean;
+type PoolStruct = BeetStruct<PoolState, Partial<PoolState>> | BeetStruct<Whirlpool, Partial<Whirlpool>> | BeetStruct<LbPair, Partial<LbPair>>;
+export declare function getPoolStructFromDex(dexNumber: BigNumber): PoolStruct | undefined;
+type PositionStruct = BeetStruct<PersonalPositionState, Partial<PersonalPositionState>> | BeetStruct<Position, Partial<Position>> | BeetStruct<DLMMPosition, Partial<DLMMPosition>>;
+export declare function getPositionStructFromDex(dexNumber: BigNumber): PositionStruct | undefined;
+export {};

package/src/plugins/kamino/helpers/vaults.js

@@ -3,31 +3,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isActive = exports.getTokenAmountsFromInfos = exports.dexToNumber = void 0;
+exports.getPositionStructFromDex = exports.getPoolStructFromDex = exports.isActive = exports.getTokenAmountsFromInfos = exports.DEXS = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const whirlpool_1 = require("../../orca/structs/whirlpool");
+const clmms_1 = require("../../raydium/structs/clmms");
 const tokenAmountFromLiquidity_1 = require("../../../utils/clmm/tokenAmountFromLiquidity");
-const dexes = ['ORCA', 'RAYDIUM', 'METEORA'];
-function dexToNumber(dex) {
-    for (let i = 0; i < dexes.length; i += 1) {
-        if (dexes[i] === dex) {
-            return i;
-        }
-    }
-    throw new Error(`Unknown Kamino DEX: ${dex}`);
-}
-exports.dexToNumber = dexToNumber;
-function getTokenAmountsFromInfos(strategy, pool, position) {
-    if (strategy.strategyDex.toNumber() === dexToNumber('ORCA')) {
+const struct_1 = require("../../meteora/struct");
+const dlmmHelper_1 = require("../../meteora/dlmmHelper");
+var DEXS;
+(function (DEXS) {
+    DEXS[DEXS["ORCA"] = 0] = "ORCA";
+    DEXS[DEXS["RAYDIUM"] = 1] = "RAYDIUM";
+    DEXS[DEXS["METEORA"] = 2] = "METEORA";
+})(DEXS || (exports.DEXS = DEXS = {}));
+function getTokenAmountsFromInfos(strategy, pool, position, binArrays) {
+    if (strategy.strategyDex.toNumber() === DEXS.ORCA) {
         const orcaPool = pool;
         const orcaPosition = position;
         return (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(orcaPosition.liquidity, orcaPool.tickCurrentIndex, orcaPosition.tickLowerIndex, orcaPosition.tickUpperIndex, false);
     }
-    if (strategy.strategyDex.toNumber() === dexToNumber('RAYDIUM')) {
+    if (strategy.strategyDex.toNumber() === DEXS.RAYDIUM) {
         const raydiumPool = pool;
         const raydiumPosition = position;
         return (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(raydiumPosition.liquidity, raydiumPool.tickCurrent, raydiumPosition.tickLowerIndex, raydiumPosition.tickUpperIndex, false);
     }
-    console.log('Unsupported number of DEX : ', strategy.strategyDex.toNumber());
+    if (strategy.strategyDex.toNumber() === DEXS.METEORA) {
+        const meteoraPool = pool;
+        const meteoraPosition = position;
+        if (binArrays && binArrays.length === 2) {
+            return (0, dlmmHelper_1.getTokensAmountsFromLiquidity)(meteoraPosition, meteoraPool, binArrays === null || binArrays === void 0 ? void 0 : binArrays[0], binArrays === null || binArrays === void 0 ? void 0 : binArrays[1], strategy.tokenAMintDecimals.toNumber(), strategy.tokenBMintDecimals.toNumber());
+        }
+    }
     return { tokenAmountA: new bignumber_js_1.default(0), tokenAmountB: new bignumber_js_1.default(0) };
 }
 exports.getTokenAmountsFromInfos = getTokenAmountsFromInfos;
@@ -49,4 +55,24 @@ function isActive(strategy) {
     return true;
 }
 exports.isActive = isActive;
+function getPoolStructFromDex(dexNumber) {
+    if (dexNumber.toNumber() === DEXS.ORCA)
+        return whirlpool_1.whirlpoolStruct;
+    if (dexNumber.toNumber() === DEXS.RAYDIUM)
+        return clmms_1.poolStateStruct;
+    if (dexNumber.toNumber() === DEXS.METEORA)
+        return struct_1.lbPairStruct;
+    return undefined;
+}
+exports.getPoolStructFromDex = getPoolStructFromDex;
+function getPositionStructFromDex(dexNumber) {
+    if (dexNumber.toNumber() === DEXS.ORCA)
+        return whirlpool_1.positionStruct;
+    if (dexNumber.toNumber() === DEXS.RAYDIUM)
+        return clmms_1.personalPositionStateStruct;
+    if (dexNumber.toNumber() === DEXS.METEORA)
+        return struct_1.dlmmPositionV2Struct;
+    return undefined;
+}
+exports.getPositionStructFromDex = getPositionStructFromDex;
 //# sourceMappingURL=vaults.js.map

package/src/plugins/kamino/helpers/vaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"vaults.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/kamino/helpers/vaults.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAKrC,2FAA4F;AAE5F,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAE7C,SAAgB,WAAW,CAAC,GAAW;IACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;QACxC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACpB,OAAO,CAAC,CAAC;SACV;KACF;IACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;AAChD,CAAC;AAPD,kCAOC;AAED,SAAgB,wBAAwB,CACtC,QAA0C,EAC1C,IAA2B,EAC3B,QAA0C;IAE1C,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,WAAW,CAAC,MAAM,CAAC,EAAE;QAC3D,MAAM,QAAQ,GAAG,IAAiB,CAAC;QACnC,MAAM,YAAY,GAAG,QAAoB,CAAC;QAE1C,OAAO,IAAA,uDAA4B,EACjC,YAAY,CAAC,SAAS,EACtB,QAAQ,CAAC,gBAAgB,EACzB,YAAY,CAAC,cAAc,EAC3B,YAAY,CAAC,cAAc,EAC3B,KAAK,CACN,CAAC;KACH;IACD,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,WAAW,CAAC,SAAS,CAAC,EAAE;QAC9D,MAAM,WAAW,GAAG,IAAiB,CAAC;QACtC,MAAM,eAAe,GAAG,QAAiC,CAAC;QAE1D,OAAO,IAAA,uDAA4B,EACjC,eAAe,CAAC,SAAS,EACzB,WAAW,CAAC,WAAW,EACvB,eAAe,CAAC,cAAc,EAC9B,eAAe,CAAC,cAAc,EAC9B,KAAK,CACN,CAAC;KACH;IACD,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7E,OAAO,EAAE,YAAY,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5E,CAAC;AA/BD,4DA+BC;AAED,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC;IAC1B,CAAC,CAAC,EAAE,SAAS,CAAC;IACd,CAAC,CAAC,EAAE,QAAQ,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,YAAY,CAAC;IACjB,CAAC,CAAC,EAAE,SAAS,CAAC;CACf,CAAC,CAAC;AAEH,SAAgB,QAAQ,CAAC,QAA2B;IAClD,IAAI,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE;QAAE,OAAO,KAAK,CAAC;IACjD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1B,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC/D,OAAO,IAAI,CAAC;AACd,CAAC;AAND,4BAMC"}
+{"version":3,"file":"vaults.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/kamino/helpers/vaults.ts"],"names":[],"mappings":"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"}

package/src/plugins/kamino/poolsJob.js

@@ -15,11 +15,11 @@ const constants_1 = require("./constants");
 const solana_1 = require("../../utils/solana");
 const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
 const vaults_1 = require("./helpers/vaults");
-const whirlpool_1 = require("../orca/structs/whirlpool");
-const clmms_1 = require("../raydium/structs/clmms");
 const vaults_2 = require("./structs/vaults");
 const filters_1 = require("../../utils/solana/filters");
+const struct_1 = require("../meteora/struct");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const client = (0, clients_1.getClientSolana)();
     const strategies = yield (0, solana_1.getParsedProgramAccounts)(client, vaults_2.whirlpoolStrategyStruct, constants_1.programId, (0, filters_1.dataStructSizeFilter)(vaults_2.whirlpoolStrategyStruct));
     const tokensMint = strategies
@@ -38,6 +38,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
         const strategy = strategies[i];
         if (!(0, vaults_1.isActive)(strategy))
             continue;
+        const { strategyDex } = strategy;
         // Here is a Kamino error.
         // They've tested a pool with 11111111111111111111111111111111 for whirlpool
         if (pools[i].toString() === '11111111111111111111111111111111')
@@ -49,22 +50,30 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
         const address = strategy.sharesMint;
         const decimals = strategy.sharesMintDecimals.toNumber();
         const supply = strategy.sharesIssued.dividedBy(Math.pow(10, decimals));
-        const isOrca = strategy.strategyDex.toNumber() === (0, vaults_1.dexToNumber)('ORCA');
         const rawPool = positionAndWhirlpoolAccountsInfo[positionSizeIndex + i];
         if (!rawPool)
             continue;
         const rawPoolData = rawPool.data;
-        const pool = isOrca
-            ? whirlpool_1.whirlpoolStruct.deserialize(rawPoolData)[0]
-            : clmms_1.poolStateStruct.deserialize(rawPoolData)[0];
+        const pool = (_a = (0, vaults_1.getPoolStructFromDex)(strategyDex)) === null || _a === void 0 ? void 0 : _a.deserialize(rawPoolData)[0];
+        if (!pool)
+            continue;
         const rawPosition = positionAndWhirlpoolAccountsInfo[i];
         if (!rawPosition)
             continue;
         const positionData = rawPosition.data;
-        const position = isOrca
-            ? whirlpool_1.positionStruct.deserialize(positionData)[0]
-            : clmms_1.personalPositionStateStruct.deserialize(positionData)[0];
-        const { tokenAmountA, tokenAmountB } = (0, vaults_1.getTokenAmountsFromInfos)(strategy, pool, position);
+        const position = (_b = (0, vaults_1.getPositionStructFromDex)(strategyDex)) === null || _b === void 0 ? void 0 : _b.deserialize(positionData)[0];
+        if (!position)
+            continue;
+        const isMeteroa = strategyDex.toNumber() === vaults_1.DEXS.METEORA;
+        const binArrays = isMeteroa
+            ? (yield (0, solana_1.getParsedMultipleAccountsInfo)(client, struct_1.binArrayStruct, [
+                strategy.tickArrayLower,
+                strategy.tickArrayUpper,
+            ]))
+                .map((account) => account || [])
+                .flat()
+            : undefined;
+        const { tokenAmountA, tokenAmountB } = (0, vaults_1.getTokenAmountsFromInfos)(strategy, pool, position, binArrays);
         if (tokenAmountA.isZero() && tokenAmountB.isZero())
             continue;
         const tokenAAmount = tokenAmountA

package/src/plugins/kamino/poolsJob.js.map

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

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

@@ -4,11 +4,12 @@ import BigNumber from 'bignumber.js';
 export declare const platformId = "marinade";
 export declare const marinadePlatform: Platform;
 export declare const cachePrefix = "marinade";
+export declare const season2RewardsPrefix: string;
 export declare const marinadeTicketProgramId: PublicKey;
 export declare const claimProgram: PublicKey;
 export declare const mndeMint = "MNDEFzGvMt87ueuHvVU9VcTqsAP5b3fTGPsHuuPA5ey";
 export declare const solFactor: BigNumber;
 export declare const baseRewardsUrl = "https://native-staking-referral.marinade.finance/v1/rewards/";
-export declare const season2Route = "staker/season-2?pubkey=";
+export declare const season2Route = "all/season-2?pubkey=";
 export declare const stakerRoute = "staker?pubkey=";
 export declare const referrerRoute = "referrer?pubkey=";

package/src/plugins/marinade/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.referrerRoute = exports.stakerRoute = exports.season2Route = exports.baseRewardsUrl = exports.solFactor = exports.mndeMint = exports.claimProgram = exports.marinadeTicketProgramId = exports.cachePrefix = exports.marinadePlatform = exports.platformId = void 0;
+exports.referrerRoute = exports.stakerRoute = exports.season2Route = exports.baseRewardsUrl = exports.solFactor = exports.mndeMint = exports.claimProgram = exports.marinadeTicketProgramId = exports.season2RewardsPrefix = exports.cachePrefix = exports.marinadePlatform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -16,12 +16,13 @@ exports.marinadePlatform = {
     website: 'https://marinade.finance/',
 };
 exports.cachePrefix = 'marinade';
+exports.season2RewardsPrefix = `${exports.platformId}-s2Rewards`;
 exports.marinadeTicketProgramId = new web3_js_1.PublicKey('MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD');
 exports.claimProgram = new web3_js_1.PublicKey('indiXdKbsC4QSLQQnn6ngZvkqfywn6KgEeQbkGSpk1V');
 exports.mndeMint = 'MNDEFzGvMt87ueuHvVU9VcTqsAP5b3fTGPsHuuPA5ey';
 exports.solFactor = new bignumber_js_1.default(Math.pow(10, portfolio_core_1.solanaNetwork.native.decimals));
 exports.baseRewardsUrl = 'https://native-staking-referral.marinade.finance/v1/rewards/';
-exports.season2Route = 'staker/season-2?pubkey=';
+exports.season2Route = 'all/season-2?pubkey=';
 exports.stakerRoute = 'staker?pubkey=';
 exports.referrerRoute = 'referrer?pubkey=';
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marinade/constants.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,+DAAqE;AACrE,gEAAqC;AAExB,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,gDAAgD;IACvD,WAAW,EAAE,yBAAyB;IACtC,OAAO,EAAE,2BAA2B;CACrC,CAAC;AAEW,QAAA,WAAW,GAAG,UAAU,CAAC;AACzB,QAAA,uBAAuB,GAAG,IAAI,mBAAS,CAClD,6CAA6C,CAC9C,CAAC;AACW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AACW,QAAA,QAAQ,GAAG,6CAA6C,CAAC;AACzD,QAAA,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,8BAAa,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAC;AAC/D,QAAA,cAAc,GACzB,8DAA8D,CAAC;AACpD,QAAA,YAAY,GAAG,yBAAyB,CAAC;AACzC,QAAA,WAAW,GAAG,gBAAgB,CAAC;AAC/B,QAAA,aAAa,GAAG,kBAAkB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marinade/constants.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,+DAAqE;AACrE,gEAAqC;AAExB,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,gDAAgD;IACvD,WAAW,EAAE,yBAAyB;IACtC,OAAO,EAAE,2BAA2B;CACrC,CAAC;AAEW,QAAA,WAAW,GAAG,UAAU,CAAC;AACzB,QAAA,oBAAoB,GAAG,GAAG,kBAAU,YAAY,CAAC;AACjD,QAAA,uBAAuB,GAAG,IAAI,mBAAS,CAClD,6CAA6C,CAC9C,CAAC;AACW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AACW,QAAA,QAAQ,GAAG,6CAA6C,CAAC;AACzD,QAAA,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,8BAAa,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAC;AAC/D,QAAA,cAAc,GACzB,8DAA8D,CAAC;AACpD,QAAA,YAAY,GAAG,sBAAsB,CAAC;AACtC,QAAA,WAAW,GAAG,gBAAgB,CAAC;AAC/B,QAAA,aAAa,GAAG,kBAAkB,CAAC"}

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

@@ -0,0 +1,2 @@
+import { PublicKey } from '@solana/web3.js';
+export declare function getClaimPda(owner: string): PublicKey;

package/src/plugins/marinade/helpers.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getClaimPda = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("./constants");
+function getClaimPda(owner) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from('claim_record', 'utf-8'),
+        new web3_js_1.PublicKey('inTrQECqatDmvAt7ahYeWg82efX5PsxhiFXzQk9eKYG').toBuffer(),
+        new web3_js_1.PublicKey(owner).toBuffer(),
+    ], constants_1.claimProgram)[0];
+}
+exports.getClaimPda = getClaimPda;
+//# sourceMappingURL=helpers.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marinade/helpers.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAC5C,2CAA2C;AAE3C,SAAgB,WAAW,CAAC,KAAa;IACvC,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC;QACpC,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC,QAAQ,EAAE;QACvE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;KAChC,EACD,wBAAY,CACb,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AATD,kCASC"}

package/src/plugins/marinade/rewardsFetcher.js

@@ -18,9 +18,9 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const clients_1 = require("../../utils/clients");
-const solana_1 = require("../../utils/solana");
 const structs_1 = require("./structs");
-const filters_1 = require("./filters");
+const helpers_1 = require("./helpers");
+const getParsedAccountInfo_1 = require("../../utils/solana/getParsedAccountInfo");
 const decimals = 9;
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const mndeTokenPrice = yield cache.getTokenPrice(constants_1.mndeMint, portfolio_core_1.NetworkId.solana);
@@ -28,51 +28,93 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         return [];
     const season1Unlock = new Date(1704067200000); // January 1 2024
     const season2Unlock = new Date(1711843200000); // March 31 2024
-    const assets = [];
     const client = (0, clients_1.getClientSolana)();
-    const claimRecords = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.claimRecordStruct, constants_1.claimProgram, (0, filters_1.claimRecordFilters)(owner));
-    if (claimRecords.length === 1 && !claimRecords[0].nonClaimedAmount.isZero()) {
-        assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.mndeMint, claimRecords[0].nonClaimedAmount.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, mndeTokenPrice)), { attributes: {
+    const pda = (0, helpers_1.getClaimPda)(owner);
+    const claimRecord = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.claimRecordStruct, pda);
+    const getReferrerRewards = yield axios_1.default
+        .get(constants_1.baseRewardsUrl + constants_1.referrerRoute + owner)
+        .catch(() => null);
+    const season1Assets = [];
+    const elements = [];
+    if (claimRecord && !claimRecord.nonClaimedAmount.isZero()) {
+        season1Assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.mndeMint, claimRecord.nonClaimedAmount.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, mndeTokenPrice)), { attributes: {
                 lockedUntil: season1Unlock.getTime(),
-                tags: ['season 1'],
+                tags: ['Staking'],
             } }));
     }
-    const getSeason2Rewards = yield axios_1.default
-        .get(constants_1.baseRewardsUrl + constants_1.season2Route + owner)
-        .catch(() => null);
-    if (getSeason2Rewards) {
-        const rewardAmount = new bignumber_js_1.default(getSeason2Rewards.data.mSOLRewards);
+    if (getReferrerRewards) {
+        const rewardAmount = new bignumber_js_1.default(getReferrerRewards.data.rewards);
         if (!rewardAmount.isZero()) {
-            assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.mndeMint, rewardAmount.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, mndeTokenPrice)), { attributes: {
+            season1Assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.mndeMint, rewardAmount.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, mndeTokenPrice)), { attributes: {
                     lockedUntil: season2Unlock.getTime(),
-                    tags: ['season 2'],
+                    tags: ['Referrer'],
                 } }));
         }
     }
-    const getReferrerRewards = yield axios_1.default
-        .get(constants_1.baseRewardsUrl + constants_1.referrerRoute + owner)
-        .catch(() => null);
-    if (getReferrerRewards) {
-        const rewardAmount = new bignumber_js_1.default(getReferrerRewards.data.rewards);
-        if (!rewardAmount.isZero()) {
-            assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.mndeMint, rewardAmount.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, mndeTokenPrice)), { attributes: {
+    if (season1Assets.length > 0) {
+        elements.push({
+            type: portfolio_core_1.PortfolioElementType.multiple,
+            label: 'Rewards',
+            networkId: portfolio_core_1.NetworkId.solana,
+            platformId: constants_1.platformId,
+            name: 'Season 1',
+            data: { assets: season1Assets },
+            value: (0, portfolio_core_1.getUsdValueSum)(season1Assets.map((asset) => asset.value)),
+        });
+    }
+    const season2Assets = [];
+    let season2Rewards = yield cache.getItem(owner, {
+        prefix: constants_1.season2RewardsPrefix,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+    if (!season2Rewards) {
+        const getSeason2Rewards = yield axios_1.default
+            .get(constants_1.baseRewardsUrl + constants_1.season2Route + owner)
+            .catch(() => null);
+        if (getSeason2Rewards) {
+            season2Rewards = getSeason2Rewards.data;
+            yield cache.setItem(owner, season2Rewards, {
+                prefix: constants_1.season2RewardsPrefix,
+                networkId: portfolio_core_1.NetworkId.solana,
+                ttl: 1000 * 60 * 60 * 5,
+            });
+        }
+    }
+    if (season2Rewards) {
+        const stakingRewardAmount = new bignumber_js_1.default(season2Rewards.staker.mSOLRewards);
+        if (!stakingRewardAmount.isZero()) {
+            season2Assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.mndeMint, stakingRewardAmount.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, mndeTokenPrice)), { attributes: {
+                    lockedUntil: season2Unlock.getTime(),
+                    tags: ['Staking'],
+                } }));
+        }
+        const governorRewardAmount = new bignumber_js_1.default(season2Rewards.governor.vemndeDelStratVotesRewards);
+        if (!governorRewardAmount.isZero()) {
+            season2Assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.mndeMint, governorRewardAmount.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, mndeTokenPrice)), { attributes: {
                     lockedUntil: season2Unlock.getTime(),
-                    tags: ['referrer'],
+                    tags: ['Governor'],
+                } }));
+        }
+        const validatorRewardAmount = new bignumber_js_1.default(season2Rewards.validator.algoScoreRewards);
+        if (!validatorRewardAmount.isZero()) {
+            season2Assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.mndeMint, validatorRewardAmount.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, mndeTokenPrice)), { attributes: {
+                    lockedUntil: season2Unlock.getTime(),
+                    tags: ['Validator'],
                 } }));
         }
     }
-    if (assets.length === 0)
-        return [];
-    return [
-        {
+    if (season2Assets.length > 0) {
+        elements.push({
             type: portfolio_core_1.PortfolioElementType.multiple,
             label: 'Rewards',
             networkId: portfolio_core_1.NetworkId.solana,
             platformId: constants_1.platformId,
-            data: { assets },
-            value: (0, portfolio_core_1.getUsdValueSum)(assets.map((asset) => asset.value)),
-        },
-    ];
+            name: 'Season 2',
+            data: { assets: season2Assets },
+            value: (0, portfolio_core_1.getUsdValueSum)(season2Assets.map((asset) => asset.value)),
+        });
+    }
+    return elements;
 });
 const fetcher = {
     id: `${constants_1.platformId}-rewards`,

package/src/plugins/marinade/rewardsFetcher.js.map

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

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

@@ -14,4 +14,26 @@ export type StakerResponse = {
     ratePerSecondPerSol: string;
     updatedAt: string;
 };
-export type Season2Response = StakerResponse;
+export type Season2Response = {
+    pubkey: string;
+    ratePerSecondPerSol: string;
+    updatedAt: string;
+    staker: {
+        mSOLBalance: string;
+        mSOLRewards: string;
+        nativeStakeBalance: string;
+        nativeStakeRewards: string;
+    };
+    validator: {
+        algoScoreBalance: string;
+        algoScoreRewards: string;
+    };
+    governor: {
+        vemndeDelStratVotesBalance: string;
+        vemndeDelStratVotesRewards: string;
+    };
+    redelegator: {
+        stakeAccountRedelegationBalance: string;
+        stakeAccountRedelegationRewards: string;
+    };
+};

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

@@ -7,3 +7,4 @@ export declare const farmsKey = "farms";
 export declare const vaultsProgramId: PublicKey;
 export declare const poolsProgramId: PublicKey;
 export declare const farmProgramId: PublicKey;
+export declare const dlmmProgramId: PublicKey;

package/src/plugins/meteora/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.farmProgramId = exports.poolsProgramId = exports.vaultsProgramId = exports.farmsKey = exports.prefixVaults = exports.meteoraPlatform = exports.platformId = void 0;
+exports.dlmmProgramId = exports.farmProgramId = exports.poolsProgramId = exports.vaultsProgramId = exports.farmsKey = exports.prefixVaults = exports.meteoraPlatform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'meteora';
 exports.meteoraPlatform = {
@@ -15,4 +15,5 @@ exports.farmsKey = 'farms';
 exports.vaultsProgramId = new web3_js_1.PublicKey('24Uqj9JCLxUeoC3hGfh5W3s9FM9uCHDS2SG3LYwBpyTi');
 exports.poolsProgramId = new web3_js_1.PublicKey('Eo7WjKq67rjJQSZxS6z3YkapzY3eMj6Xy8X5EQVn5UaB');
 exports.farmProgramId = new web3_js_1.PublicKey('FarmuwXPWXvefWUeqFAa5w6rifLkq5X6E8bimYvrhCB1');
+exports.dlmmProgramId = new web3_js_1.PublicKey('LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo');
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,eAAe,GAAa;IACvC,EAAE,EAAE,SAAS;IACb,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,qBAAqB;CAC/B,CAAC;AAEW,QAAA,YAAY,GAAG,GAAG,kBAAU,SAAS,CAAC;AACtC,QAAA,QAAQ,GAAG,OAAO,CAAC;AAEnB,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,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"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,eAAe,GAAa;IACvC,EAAE,EAAE,SAAS;IACb,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,qBAAqB;CAC/B,CAAC;AAEW,QAAA,YAAY,GAAG,GAAG,kBAAU,SAAS,CAAC;AACtC,QAAA,QAAQ,GAAG,OAAO,CAAC;AAEnB,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,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,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC"}

package/src/plugins/meteora/dlmmHelper.d.ts

@@ -0,0 +1,28 @@
+import { PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
+import BigNumber from 'bignumber.js';
+import { BinLiquidity, LMRewards, PositionData, PositionVersion } from './types';
+import { Bin, BinArray, DLMMPosition, LbPair } from './struct';
+export declare const MAX_BIN_ARRAY_SIZE: BN;
+export declare const SCALE_OFFSET = 64;
+export declare const BASIS_POINT_MAX = 10000;
+export declare function binIdToBinArrayIndex(binId: BigNumber): BN;
+export declare function deriveBinArrayBitmapExtension(lbPair: PublicKey, programId: PublicKey): [PublicKey, number];
+export declare function deriveBinArray(lbPair: PublicKey, index: BN, programId: PublicKey): [PublicKey, number];
+export declare function processPosition(program: PublicKey, version: PositionVersion, lbPair: LbPair, position: DLMMPosition, baseTokenDecimal: number, quoteTokenDecimal: number, lowerBinArray: BinArray, upperBinArray: BinArray): PositionData | null;
+export declare function getBinsBetweenLowerAndUpperBound(lbPair: LbPair, lowerBinId: number, upperBinId: number, baseTokenDecimal: number, quoteTokenDecimal: number, lowerBinArrays: BinArray, upperBinArrays: BinArray): BinLiquidity[];
+export declare function getClaimableLMReward(program: PublicKey, positionVersion: PositionVersion, lbPair: LbPair, onChainTimestamp: number, position: DLMMPosition, lowerBinArray?: BinArray, upperBinArray?: BinArray): Promise<LMRewards>;
+export declare function getBinFromBinArray(binId: number, binArray: BinArray): Bin;
+export declare function getBinArrayLowerUpperBinId(binArrayIndex: BigNumber): BigNumber[];
+export declare enum Rounding {
+    Up = 0,
+    Down = 1
+}
+export declare function mulShr(x: BigNumber, y: BigNumber, offset: number, rounding: Rounding): BigNumber;
+export declare function shlDiv(x: BigNumber, y: BigNumber, offset: number, rounding: Rounding): BigNumber;
+export declare function mulDiv(x: BigNumber, y: BigNumber, denominator: BigNumber, rounding: Rounding): BigNumber;
+export declare function getPriceOfBinByBinId(binStep: number, binId: number): string;
+export declare function getTokensAmountsFromLiquidity(position: DLMMPosition, pool: LbPair, lowerBinArray: BinArray, upperBinArray: BinArray, baseTokenDecimal: number, quoteTokenDecimal: number): {
+    tokenAmountA: BigNumber;
+    tokenAmountB: BigNumber;
+};