@kamino-finance/kliquidity-sdk 8.5.2-beta.0 → 8.5.2

package/dist/services/JupService.js

@@ -4,37 +4,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JupService = exports.DEFAULT_JUP_SWAP_API = exports.DEFAULT_JUP_API_ENDPOINT = void 0;
-const web3_js_1 = require("@solana/web3.js");
+exports.transformResponseIx = transformResponseIx;
+exports.getAccountRole = getAccountRole;
+const kit_1 = require("@solana/kit");
 const axios_1 = __importDefault(require("axios"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const api_1 = require("@jup-ag/api");
-const pubkey_1 = require("../utils/pubkey");
-const USDC_MINT = new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
+const USDC_MINT = (0, kit_1.address)('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
 exports.DEFAULT_JUP_API_ENDPOINT = 'https://lite-api.jup.ag';
 exports.DEFAULT_JUP_SWAP_API = 'https://lite-api.jup.ag/swap/v1';
-const jupiterSwapApi = (0, api_1.createJupiterApiClient)({
-    basePath: exports.DEFAULT_JUP_SWAP_API,
-});
+const jupiterSwapApi = (0, api_1.createJupiterApiClient)({ basePath: exports.DEFAULT_JUP_SWAP_API });
 class JupService {
-    _connection;
-    _cluster;
-    constructor(connection, cluster) {
-        this._connection = connection;
-        this._cluster = cluster;
-    }
     // the amounts has to be in lamports
-    static getBestRouteV6 = async (userPublicKey, amount, inputMint, outputMint, slippageBps, asLegacyTransaction, maxAccounts, onlyDirectRoutes) => {
+    static getBestRouteV6 = async (userAddress, amount, inputMint, outputMint, slippageBps, asLegacyTransaction, maxAccounts, onlyDirectRoutes) => {
         try {
             // https://lite-api.jup.ag/swap/v1/quote?inputMint=7dHbWXmci3dT8UFYWYZweBLXgycu7Y3iL6trKn1Y7ARj&outputMint=mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So&amount=71101983&slippageBps=10&onlyDirectRoutes=false&asLegacyTransaction=false&maxAccounts=33
             const res = await this.getBestRouteQuoteV6(amount, inputMint, outputMint, slippageBps, asLegacyTransaction, maxAccounts, onlyDirectRoutes);
-            const transaction = await jupiterSwapApi.swapPost({
-                swapRequest: {
-                    quoteResponse: res,
-                    userPublicKey: userPublicKey.toString(),
-                    wrapAndUnwrapSol: false,
-                },
+            const ixsResponse = await jupiterSwapApi.swapInstructionsPost({
+                swapRequest: { quoteResponse: res, userPublicKey: userAddress, wrapAndUnwrapSol: false },
             });
-            return transaction;
+            const swapIxs = {
+                tokenLedgerInstruction: ixsResponse.tokenLedgerInstruction
+                    ? transformResponseIx(ixsResponse.tokenLedgerInstruction)
+                    : undefined,
+                computeBudgetInstructions: ixsResponse.computeBudgetInstructions.map((ix) => transformResponseIx(ix)),
+                setupInstructions: ixsResponse.setupInstructions.map((ix) => transformResponseIx(ix)),
+                swapInstruction: transformResponseIx(ixsResponse.swapInstruction),
+                cleanupInstruction: ixsResponse.cleanupInstruction
+                    ? transformResponseIx(ixsResponse.cleanupInstruction)
+                    : undefined,
+                addressLookupTableAddresses: ixsResponse.addressLookupTableAddresses.map((a) => (0, kit_1.address)(a)),
+            };
+            return swapIxs;
         }
         catch (error) {
             console.log('getBestRouteV6 error', error);
@@ -44,8 +45,8 @@ class JupService {
     static getBestRouteQuoteV6 = async (amount, inputMint, outputMint, slippageBps, asLegacyTransaction, maxAccounts, onlyDirectRoutes, jupEndpoint) => {
         try {
             const params = {
-                inputMint: inputMint.toString(),
-                outputMint: outputMint.toString(),
+                inputMint,
+                outputMint,
                 amount: amount.floor().toNumber(),
                 slippageBps,
                 onlyDirectRoutes: onlyDirectRoutes,
@@ -61,12 +62,12 @@ class JupService {
             throw error;
         }
     };
-    static getSwapIxsFromQuote = async (userPublicKey, quote, wrapUnwrapSOL = true, asLegacyTransaction) => {
+    static getSwapIxsFromQuote = async (userAddress, quote, wrapUnwrapSOL = true, asLegacyTransaction) => {
         try {
             return await jupiterSwapApi.swapInstructionsPost({
                 swapRequest: {
                     quoteResponse: quote,
-                    userPublicKey: userPublicKey.toString(),
+                    userPublicKey: userAddress,
                     wrapAndUnwrapSol: wrapUnwrapSOL,
                     asLegacyTransaction: asLegacyTransaction,
                 },
@@ -78,11 +79,7 @@ class JupService {
         }
     };
     static getPrice = async (inputMint, outputMint, jupEndpoint) => {
-        const params = {
-            ids: inputMint.toString(),
-            vsToken: outputMint.toString(),
-            vsAmount: 1,
-        };
+        const params = { ids: inputMint.toString(), vsToken: outputMint.toString(), vsAmount: 1 };
         // BONK token
         if (outputMint.toString() === 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263') {
             params.vsAmount = 100;
@@ -93,25 +90,21 @@ class JupService {
     };
     static getPrices = async (inputMints, outputMint, jupEndpoint) => {
         const mintsCommaSeparated = inputMints.map((mint) => mint.toString()).join(',');
-        const params = {
-            ids: mintsCommaSeparated,
-            vsToken: outputMint.toString(),
-            vsAmount: 1,
-        };
+        const params = { ids: mintsCommaSeparated, vsToken: outputMint.toString(), vsAmount: 1 };
         // BONK token
         if (outputMint.toString() === 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263') {
             params.vsAmount = 100;
         }
         const baseURL = jupEndpoint || exports.DEFAULT_JUP_API_ENDPOINT;
-        const prices = new pubkey_1.PubkeyHashMap();
+        const prices = new Map();
         try {
             const res = await axios_1.default.get(`${baseURL}/price/v3`, { params });
             for (const mint of inputMints) {
                 try {
-                    prices.set(new web3_js_1.PublicKey(mint), new decimal_js_1.default(res.data[mint.toString()].usdPrice));
+                    prices.set((0, kit_1.address)(mint), new decimal_js_1.default(res.data[mint.toString()].usdPrice));
                 }
                 catch (e) {
-                    prices.set(new web3_js_1.PublicKey(mint), new decimal_js_1.default(0));
+                    prices.set((0, kit_1.address)(mint), new decimal_js_1.default(0));
                 }
             }
         }
@@ -126,39 +119,28 @@ class JupService {
     static getDollarPrice = async (inputMint, jupEndpoint) => {
         return this.getPrice(inputMint, USDC_MINT, jupEndpoint);
     };
-    static buildTransactionsFromSerialized = (serializedTransactions) => {
-        return serializedTransactions.filter(Boolean).map((tx) => {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            return web3_js_1.Transaction.from(Buffer.from(tx, 'base64'));
-        });
-    };
-    static deserealizeVersionedTransactions = async (connection, serializedTransactions) => {
-        const filtered = serializedTransactions.filter(Boolean);
-        const result = [];
-        let lookupTablesAddresses = [];
-        for (let i = 0; i < filtered.length; i++) {
-            const tx = filtered[i];
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            // safe to use as it is filtered above at 120 line
-            const buffer = Buffer.from(tx, 'base64');
-            const versionedTx = web3_js_1.VersionedTransaction.deserialize(buffer);
-            const { addressTableLookups } = versionedTx.message;
-            lookupTablesAddresses = [...lookupTablesAddresses, ...addressTableLookups.map((item) => item.accountKey)];
-            const lookupTableAccountsRequests = addressTableLookups.map((item) => {
-                return JupService.getLookupTableAccount(connection, item.accountKey);
-            });
-            const lookupTableAccounts = await Promise.all(lookupTableAccountsRequests);
-            const decompiledMessage = web3_js_1.TransactionMessage.decompile(versionedTx.message, {
-                // @ts-ignore
-                addressLookupTableAccounts: lookupTableAccounts,
-            });
-            result.push(decompiledMessage);
-        }
-        return { txMessage: result, lookupTablesAddresses };
-    };
-    static getLookupTableAccount = async (connection, address) => {
-        return connection.getAddressLookupTable(new web3_js_1.PublicKey(address)).then((res) => res.value);
-    };
 }
 exports.JupService = JupService;
+function transformResponseIx(ix) {
+    return {
+        data: ix.data ? Buffer.from(ix.data, 'base64') : undefined,
+        programAddress: (0, kit_1.address)(ix.programId),
+        accounts: ix.accounts.map((k) => ({
+            address: (0, kit_1.address)(k.pubkey),
+            role: getAccountRole({ isSigner: k.isSigner, isMut: k.isWritable }),
+        })),
+    };
+}
+function getAccountRole({ isSigner, isMut }) {
+    if (isSigner && isMut) {
+        return kit_1.AccountRole.WRITABLE_SIGNER;
+    }
+    if (isSigner && !isMut) {
+        return kit_1.AccountRole.READONLY_SIGNER;
+    }
+    if (!isSigner && isMut) {
+        return kit_1.AccountRole.WRITABLE;
+    }
+    return kit_1.AccountRole.READONLY;
+}
 //# sourceMappingURL=JupService.js.map

package/dist/services/JupService.js.map

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

package/dist/services/MeteoraPoolsResponse.d.ts

@@ -0,0 +1,60 @@
+export interface MeteoraPoolsResponse {
+    pairs: MeteoraPoolAPI[];
+    total: number;
+    meta?: {
+        cursor?: {
+            previous: string | null;
+            next: string | null;
+        };
+        total?: number;
+        page?: number;
+        size?: number;
+    };
+}
+export interface MeteoraPoolAPI {
+    address: string;
+    name: string;
+    mint_x: string;
+    mint_y: string;
+    bin_step: number;
+    base_fee_percentage: string;
+    max_fee_percentage: string;
+    protocol_fee_percentage: string;
+    liquidity: string;
+    reward_fee_percentage: string;
+    fees_24h: string;
+    today_fees: string;
+    trade_volume_24h: string;
+    cumulative_trade_volume: string;
+    cumulative_fee_volume: string;
+    current_price: string;
+    apr: string;
+    apy: string;
+    farm_apr: string;
+    farm_apy: string;
+    hide: boolean;
+    pair_point_data?: {
+        pool_address: string;
+        total_point: string;
+        point_per_second: string;
+        updated_at: string;
+    };
+    token_x?: MeteoraTokenAPI;
+    token_y?: MeteoraTokenAPI;
+    active_bin?: {
+        bin_id: number;
+        price: string;
+        liquidity_x: string;
+        liquidity_y: string;
+    };
+}
+export interface MeteoraTokenAPI {
+    address: string;
+    name: string;
+    symbol: string;
+    decimals: number;
+    logo_uri?: string;
+    coingecko_id?: string;
+    tags?: string[];
+}
+//# sourceMappingURL=MeteoraPoolsResponse.d.ts.map

package/dist/services/MeteoraPoolsResponse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MeteoraPoolsResponse.d.ts","sourceRoot":"","sources":["../../src/services/MeteoraPoolsResponse.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE;YACP,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;YACxB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;SACrB,CAAC;QACF,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,uBAAuB,EAAE,MAAM,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB,EAAE,MAAM,CAAC;IAChC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,CAAC,EAAE;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,gBAAgB,EAAE,MAAM,CAAC;QACzB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,UAAU,CAAC,EAAE;QACX,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB"}

package/dist/services/MeteoraPoolsResponse.js

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

package/dist/services/MeteoraPoolsResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MeteoraPoolsResponse.js","sourceRoot":"","sources":["../../src/services/MeteoraPoolsResponse.ts"],"names":[],"mappings":""}

package/dist/services/MeteoraService.d.ts

@@ -1,26 +1,29 @@
-import { Connection, PublicKey } from '@solana/web3.js';
+import { Address, Rpc, SolanaRpcApi } from '@solana/kit';
 import Decimal from 'decimal.js';
-import { WhirlpoolStrategy } from '../kamino-client/accounts';
+import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
 import { GenericPoolInfo, LiquidityDistribution } from '../utils';
-import { LbPair, PositionV2 } from '../meteora_client/accounts';
+import { LbPair, PositionV2 } from '../@codegen/meteora/accounts';
 import { WhirlpoolAprApy } from './WhirlpoolAprApy';
+import { MeteoraPoolAPI } from './MeteoraPoolsResponse';
 export interface MeteoraPool {
-    key: PublicKey;
+    key: Address;
     pool: LbPair;
 }
 export declare class MeteoraService {
-    private readonly _connection;
+    private readonly _rpc;
     private readonly _meteoraProgramId;
-    constructor(connection: Connection, meteoraProgramId?: PublicKey);
-    getMeteoraProgramId(): PublicKey;
-    getPool(poolAddress: PublicKey): Promise<LbPair | null>;
-    getPosition(position: PublicKey): Promise<PositionV2 | null>;
+    private readonly _meteoraApiUrl;
+    constructor(rpc: Rpc<SolanaRpcApi>, meteoraProgramId?: Address);
+    getMeteoraProgramId(): Address;
+    getPool(poolAddress: Address): Promise<LbPair | null>;
+    getPosition(position: Address): Promise<PositionV2 | null>;
     getMeteoraPools(): Promise<MeteoraPool[]>;
+    getMeteoraPoolsFromAPI(tokens?: Address[], maxPages?: number, maxPageSize?: number): Promise<MeteoraPoolAPI[]>;
     getStrategyMeteoraPoolAprApy(strategy: WhirlpoolStrategy): Promise<WhirlpoolAprApy>;
-    getMeteoraLiquidityDistribution(poolKey: PublicKey, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
-    getMeteoraPositionAprApy(poolPubkey: PublicKey, priceLower: Decimal, priceUpper: Decimal): Promise<WhirlpoolAprApy>;
-    getGenericPoolInfo(poolPubkey: PublicKey): Promise<GenericPoolInfo>;
-    getPositionsCountByPool(pool: PublicKey): Promise<number>;
+    getMeteoraLiquidityDistribution(poolKey: Address, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
+    getMeteoraPositionAprApy(poolPubkey: Address, priceLower: Decimal, priceUpper: Decimal): Promise<WhirlpoolAprApy>;
+    getGenericPoolInfo(poolPubkey: Address): Promise<GenericPoolInfo>;
+    getPositionsCountByPool(pool: Address): Promise<number>;
 }
 export declare function computeMeteoraFee(pool: LbPair): Decimal;
 //# sourceMappingURL=MeteoraService.d.ts.map

package/dist/services/MeteoraService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MeteoraService.d.ts","sourceRoot":"","sources":["../../src/services/MeteoraService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAEL,eAAe,EAIf,qBAAqB,EAEtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAY;gBAElC,UAAU,EAAE,UAAU,EAAE,gBAAgB,GAAE,SAA8B;IAKpF,mBAAmB,IAAI,SAAS;IAI1B,OAAO,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIvD,WAAW,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAI5D,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAiBzC,4BAA4B,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA6DnF,+BAA+B,CACnC,OAAO,EAAE,SAAS,EAClB,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAiC3B,wBAAwB,CAC5B,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,eAAe,CAAC;IAmDrB,kBAAkB,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC;IAqCnE,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAQhE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD"}
+{"version":3,"file":"MeteoraService.d.ts","sourceRoot":"","sources":["../../src/services/MeteoraService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAsB,GAAG,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACtF,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAEL,eAAe,EAIf,qBAAqB,EAEtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAKpD,OAAO,EAAE,cAAc,EAAwB,MAAM,wBAAwB,CAAC;AAE9E,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;gBAE5B,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAE,OAA4B;IAMlF,mBAAmB,IAAI,OAAO;IAIxB,OAAO,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIrD,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAI1D,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAwBzC,sBAAsB,CAAC,MAAM,GAAE,OAAO,EAAO,EAAE,QAAQ,SAAM,EAAE,WAAW,SAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IA2D5G,4BAA4B,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA6DnF,+BAA+B,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAiC3B,wBAAwB,CAC5B,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,eAAe,CAAC;IAmDrB,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAqCjE,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAa9D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD"}

package/dist/services/MeteoraService.js

@@ -5,37 +5,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MeteoraService = void 0;
 exports.computeMeteoraFee = computeMeteoraFee;
-const web3_js_1 = require("@solana/web3.js");
+const kit_1 = require("@solana/kit");
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const axios_1 = __importDefault(require("axios"));
 const utils_1 = require("../utils");
-const accounts_1 = require("../meteora_client/accounts");
-const programId_1 = require("../meteora_client/programId");
+const accounts_1 = require("../@codegen/meteora/accounts");
+const programId_1 = require("../@codegen/meteora/programId");
 const meteora_1 = require("../utils/meteora");
+const pubkeys_1 = require("../constants/pubkeys");
+const fzstd_1 = require("fzstd");
 class MeteoraService {
-    _connection;
+    _rpc;
     _meteoraProgramId;
-    constructor(connection, meteoraProgramId = programId_1.METEORA_PROGRAM_ID) {
-        this._connection = connection;
+    _meteoraApiUrl;
+    constructor(rpc, meteoraProgramId = programId_1.PROGRAM_ID) {
+        this._rpc = rpc;
         this._meteoraProgramId = meteoraProgramId;
+        this._meteoraApiUrl = 'https://dlmm-api.meteora.ag';
     }
     getMeteoraProgramId() {
         return this._meteoraProgramId;
     }
     async getPool(poolAddress) {
-        return await accounts_1.LbPair.fetch(this._connection, poolAddress);
+        return await accounts_1.LbPair.fetch(this._rpc, poolAddress);
     }
     async getPosition(position) {
-        return await accounts_1.PositionV2.fetch(this._connection, position);
+        return await accounts_1.PositionV2.fetch(this._rpc, position);
     }
     async getMeteoraPools() {
-        const rawPools = await this._connection.getProgramAccounts(programId_1.METEORA_PROGRAM_ID, {
+        const rawPools = await this._rpc
+            .getProgramAccounts(programId_1.PROGRAM_ID, {
             commitment: 'confirmed',
-            filters: [{ dataSize: 904 }],
-        });
+            filters: [{ dataSize: 904n }],
+            encoding: 'base64+zstd',
+        })
+            .send();
         const pools = [];
         for (let i = 0; i < rawPools.length; i++) {
             try {
-                const lbPair = accounts_1.LbPair.decode(rawPools[i].account.data);
+                const compressedData = Buffer.from(rawPools[i].account.data[0], 'base64');
+                const decompressedData = (0, fzstd_1.decompress)(compressedData);
+                const lbPair = accounts_1.LbPair.decode(Buffer.from(decompressedData));
                 pools.push({ pool: lbPair, key: rawPools[i].pubkey });
             }
             catch (e) {
@@ -44,6 +54,58 @@ class MeteoraService {
         }
         return pools;
     }
+    // Fetch all Meteora pools from their API with pagination support
+    async getMeteoraPoolsFromAPI(tokens = [], maxPages = 300, maxPageSize = 100) {
+        const allPoolsAPI = [];
+        let offset = 0;
+        let hasMore = true;
+        let pageCount = 0;
+        // First, fetch all pool data from the API
+        while (hasMore && pageCount < maxPages) {
+            pageCount++;
+            const url = new URL(`${this._meteoraApiUrl}/pair/all_with_pagination`);
+            url.searchParams.set('limit', maxPageSize.toString());
+            url.searchParams.set('offset', offset.toString());
+            // Add token filtering if provided
+            if (tokens.length === 1) {
+                url.searchParams.set('token', tokens[0]);
+            }
+            else if (tokens.length === 2) {
+                url.searchParams.set('token_x', tokens[0]);
+                url.searchParams.set('token_y', tokens[1]);
+            }
+            const response = await axios_1.default.get(url.toString());
+            const data = response.data;
+            // Add pools from this page to our collection
+            // The Meteora API returns { pairs: [...pools...], total: number }
+            if (data.pairs && Array.isArray(data.pairs) && data.pairs.length > 0) {
+                allPoolsAPI.push(...data.pairs);
+                offset += data.pairs.length;
+            }
+            // Check if there are more pages
+            const responseLength = data.pairs ? data.pairs.length : 0;
+            if (responseLength < maxPageSize) {
+                hasMore = false;
+            }
+            // Check total if available
+            if (data.total && allPoolsAPI.length >= data.total) {
+                hasMore = false;
+            }
+            // Check pagination metadata if available
+            if (data.meta) {
+                if (data.meta.cursor && !data.meta.cursor.next) {
+                    hasMore = false;
+                }
+                if (data.meta.total && allPoolsAPI.length >= data.meta.total) {
+                    hasMore = false;
+                }
+            }
+        }
+        if (pageCount >= maxPages) {
+            throw new Error(`Reached maximum page limit (${maxPages}). There might be more pools available.`);
+        }
+        return allPoolsAPI;
+    }
     async getStrategyMeteoraPoolAprApy(strategy) {
         const position = await this.getPosition(strategy.position);
         const pool = await this.getPool(strategy.pool);
@@ -102,8 +164,8 @@ class MeteoraService {
             };
         }
         const currentTickIndex = pool.activeId;
-        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenXMint);
-        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenYMint);
+        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenXMint);
+        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenYMint);
         const currentPrice = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(currentTickIndex, pool.binStep, tokenXDecimals, tokenYDecimals);
         // TODO: add actual distribution
         return {
@@ -128,8 +190,8 @@ class MeteoraService {
                 totalApr: utils_1.ZERO,
             };
         }
-        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenXMint);
-        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenYMint);
+        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenXMint);
+        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenYMint);
         const priceRange = (0, utils_1.getStrategyPriceRangeMeteora)(priceLower, priceUpper, pool.activeId, pool.binStep, tokenXDecimals, tokenYDecimals);
         if (priceRange.strategyOutOfRange) {
             return {
@@ -160,9 +222,9 @@ class MeteoraService {
         if (!pool) {
             return {
                 dex: 'METEORA',
-                address: new web3_js_1.PublicKey(0),
-                tokenMintA: new web3_js_1.PublicKey(0),
-                tokenMintB: new web3_js_1.PublicKey(0),
+                address: pubkeys_1.DEFAULT_PUBLIC_KEY,
+                tokenMintA: pubkeys_1.DEFAULT_PUBLIC_KEY,
+                tokenMintB: pubkeys_1.DEFAULT_PUBLIC_KEY,
                 price: new decimal_js_1.default(0),
                 feeRate: new decimal_js_1.default(0),
                 volumeOnLast7d: new decimal_js_1.default(0),
@@ -171,12 +233,12 @@ class MeteoraService {
                 positions: new decimal_js_1.default(0),
             };
         }
-        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenXMint);
-        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._connection, pool.tokenYMint);
+        const tokenXDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenXMint);
+        const tokenYDecimals = await (0, utils_1.getMintDecimals)(this._rpc, pool.tokenYMint);
         const price = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(pool.activeId, pool.binStep, tokenXDecimals, tokenYDecimals);
         const poolInfo = {
             dex: 'METEORA',
-            address: new web3_js_1.PublicKey(poolPubkey),
+            address: (0, kit_1.address)(poolPubkey),
             tokenMintA: pool.tokenXMint,
             tokenMintB: pool.tokenYMint,
             price,
@@ -191,10 +253,15 @@ class MeteoraService {
         return poolInfo;
     }
     async getPositionsCountByPool(pool) {
-        const rawPositions = await this._connection.getProgramAccounts(programId_1.METEORA_PROGRAM_ID, {
+        const rawPositions = await this._rpc
+            .getProgramAccounts(programId_1.PROGRAM_ID, {
             commitment: 'confirmed',
-            filters: [{ dataSize: 8120 }, { memcmp: { bytes: pool.toBase58(), offset: 8 } }],
-        });
+            filters: [
+                { dataSize: 8120n },
+                { memcmp: { bytes: pool.toString(), offset: 8n, encoding: 'base58' } },
+            ],
+        })
+            .send();
         return rawPositions.length;
     }
 }

package/dist/services/MeteoraService.js.map

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

package/dist/services/OrcaService.d.ts

@@ -1,21 +1,19 @@
-import { Connection, PublicKey } from '@solana/web3.js';
+import { Address, Rpc, SolanaRpcApi } from '@solana/kit';
 import Decimal from 'decimal.js';
-import { PoolData } from '@orca-so/whirlpool-sdk';
-import { OrcaWhirlpoolsResponse, Whirlpool } from './OrcaWhirlpoolsResponse';
-import { SolanaCluster } from '@hubbleprotocol/hubble-config';
-import { WhirlpoolStrategy } from '../kamino-client/accounts';
+import { Whirlpool as WhirlpoolAPIResponse } from './OrcaWhirlpoolsResponse';
+import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
 import { WhirlpoolAprApy } from './WhirlpoolAprApy';
 import { GenericPoolInfo, LiquidityDistribution } from '../utils';
-import { CollateralInfo } from '../kamino-client/types';
+import { CollateralInfo } from '../@codegen/kliquidity/types';
 import { KaminoPrices } from '../models';
 export declare class OrcaService {
-    private readonly _connection;
-    private readonly _whirilpoolProgramId;
-    private readonly _orcaNetwork;
+    private readonly _rpc;
+    private readonly _whirlpoolProgramId;
     private readonly _orcaApiUrl;
-    constructor(connection: Connection, cluster: SolanaCluster, whirlpoolProgramId?: PublicKey);
-    getWhirlpoolProgramId(): PublicKey;
-    getOrcaWhirlpools(): Promise<OrcaWhirlpoolsResponse>;
+    constructor(rpc: Rpc<SolanaRpcApi>, whirlpoolProgramId?: Address);
+    getWhirlpoolProgramId(): Address;
+    getOrcaWhirlpools(tokens?: Address[]): Promise<WhirlpoolAPIResponse[]>;
+    getOrcaWhirlpool(poolAddress: Address): Promise<WhirlpoolAPIResponse>;
     /**
      * Get token prices for a strategy - for use with orca sdk
      * @param strategy
@@ -26,11 +24,10 @@ export declare class OrcaService {
      */
     private getTokenPrices;
     private getPoolTokensPrices;
-    getPool(poolAddress: PublicKey): Promise<PoolData | null>;
-    getStrategyWhirlpoolPoolAprApy(strategy: WhirlpoolStrategy, collateralInfos: CollateralInfo[], prices: KaminoPrices, whirlpools?: Whirlpool[]): Promise<WhirlpoolAprApy>;
-    getWhirlpoolLiquidityDistribution(pool: PublicKey, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
-    getWhirlpoolPositionAprApy(poolPubkey: PublicKey, priceLower: Decimal, priceUpper: Decimal, prices: KaminoPrices, whirlpools?: Whirlpool[]): Promise<WhirlpoolAprApy>;
-    getGenericPoolInfo(poolPubkey: PublicKey, whirlpools?: Whirlpool[]): Promise<GenericPoolInfo>;
-    getPositionsCountByPool(pool: PublicKey): Promise<number>;
+    getStrategyWhirlpoolPoolAprApy(strategy: WhirlpoolStrategy, collateralInfos: CollateralInfo[], prices: KaminoPrices): Promise<WhirlpoolAprApy>;
+    getWhirlpoolLiquidityDistribution(pool: Address, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
+    getWhirlpoolPositionAprApy(poolPubkey: Address, priceLower: Decimal, priceUpper: Decimal, prices: KaminoPrices, rewardsDecimals: Map<Address, number>): Promise<WhirlpoolAprApy>;
+    getGenericPoolInfo(poolPubkey: Address): Promise<GenericPoolInfo>;
+    getPositionsCountByPool(pool: Address): Promise<number>;
 }
 //# sourceMappingURL=OrcaService.d.ts.map