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

package/dist/services/OrcaWhirlpoolsResponse.d.ts

@@ -1,77 +1,106 @@
 export interface OrcaWhirlpoolsResponse {
-    data: Whirlpool[];
-    meta: {
-        cursor: {
-            previous: string | null;
-            next: string | null;
-        };
-    };
+    whirlpools: Whirlpool[];
+    hasMore: boolean;
 }
 export interface Whirlpool {
     address: string;
-    whirlpoolsConfig: string;
-    whirlpoolBump: number[];
+    tokenA: TokenA;
+    tokenB: TokenB;
+    whitelisted: boolean;
     tickSpacing: number;
-    tickSpacingSeed: number[];
-    feeRate: number;
+    price: number;
+    lpFeeRate: number;
     protocolFeeRate: number;
-    liquidity: string;
-    sqrtPrice: string;
-    tickCurrentIndex: number;
-    protocolFeeOwedA: string;
-    protocolFeeOwedB: string;
-    tokenMintA: string;
-    tokenVaultA: string;
-    feeGrowthGlobalA: string;
-    tokenMintB: string;
-    tokenVaultB: string;
-    feeGrowthGlobalB: string;
-    rewardLastUpdatedTimestamp: string;
-    updatedAt: string;
-    updatedSlot: number;
-    writeVersion: number;
-    hasWarning: boolean;
-    poolType: string;
-    tokenA: WhirlpoolToken;
-    tokenB: WhirlpoolToken;
-    price: string;
-    tvlUsdc: string;
-    yieldOverTvl: string;
-    tokenBalanceA: string;
-    tokenBalanceB: string;
-    stats: Stats;
-    rewards: WhirlpoolReward[];
-    feeTierIndex: number;
-    adaptiveFeeEnabled: boolean;
-    tradeEnableTimestamp: string;
-}
-export interface WhirlpoolToken {
-    address: string;
-    programId: string;
-    imageURL: string;
+    whirlpoolsConfig: string;
+    modifiedTimeMs?: number;
+    tvl?: number;
+    volume?: Volume;
+    volumeDenominatedA?: VolumeDenominatedA;
+    volumeDenominatedB?: VolumeDenominatedB;
+    priceRange?: PriceRange;
+    feeApr?: FeeApr;
+    reward0Apr?: Reward0Apr;
+    reward1Apr?: Reward1Apr;
+    reward2Apr?: Reward2Apr;
+    totalApr?: TotalApr;
+}
+export interface TokenA {
+    mint: string;
+    symbol: string;
     name: string;
+    decimals: number;
+    logoURI?: string;
+    coingeckoId?: string;
+    whitelisted: boolean;
+    poolToken: boolean;
+    wrapper?: string;
+}
+export interface TokenB {
+    mint: string;
     symbol: string;
+    name: string;
     decimals: number;
-    tags: string[];
+    logoURI: string;
+    coingeckoId?: string;
+    whitelisted: boolean;
+    poolToken: boolean;
+    wrapper?: string;
 }
-export interface WhirlpoolStat {
-    volume: string;
-    fees: string;
-    rewards: string;
-    yieldOverTvl: string;
+export interface Volume {
+    day: number;
+    week: number;
+    month: number;
 }
-export interface Stats {
-    '24h': WhirlpoolStat;
-    '7d': WhirlpoolStat;
-    '30d': WhirlpoolStat;
+export interface VolumeDenominatedA {
+    day: number;
+    week: number;
+    month: number;
 }
-export interface WhirlpoolReward {
-    mint: string;
-    vault: string;
-    authority: string;
-    emissions_per_second_x64: string;
-    growth_global_x64: string;
-    active: boolean;
-    emissionsPerSecond: string;
+export interface VolumeDenominatedB {
+    day: number;
+    week: number;
+    month: number;
+}
+export interface PriceRange {
+    day: Day;
+    week: Week;
+    month: Month;
+}
+export interface Day {
+    min: number;
+    max: number;
+}
+export interface Week {
+    min: number;
+    max: number;
+}
+export interface Month {
+    min: number;
+    max: number;
+}
+export interface FeeApr {
+    day: number;
+    week: number;
+    month: number;
+}
+export interface Reward0Apr {
+    day: number;
+    week?: number;
+    month?: number;
+}
+export interface Reward1Apr {
+    day: number;
+    week: number;
+    month: number;
+}
+export interface Reward2Apr {
+    day: number;
+    week: number;
+    month: number;
+}
+export interface TotalApr {
+    day: number;
+    week?: number;
+    month?: number;
 }
 //# sourceMappingURL=OrcaWhirlpoolsResponse.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"OrcaWhirlpoolsResponse.d.ts","sourceRoot":"","sources":["../../src/services/OrcaWhirlpoolsResponse.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,IAAI,EAAE;QACJ,MAAM,EAAE;YACN,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;YACxB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;SACrB,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,0BAA0B,EAAE,MAAM,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,KAAK;IACpB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,wBAAwB,EAAE,MAAM,CAAC;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"OrcaWhirlpoolsResponse.d.ts","sourceRoot":"","sources":["../../src/services/OrcaWhirlpoolsResponse.ts"],"names":[],"mappings":"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"}

package/dist/services/PoolSimulationService.d.ts

@@ -1,8 +1,8 @@
 import { PoolSimulationResponse } from '../models/PoolSimulationResponseData';
 import Decimal from 'decimal.js';
-import { Address } from '@solana/kit';
+import { PublicKey } from '@solana/web3.js';
 export type SimulationParameters = {
-    poolAddress: Address;
+    poolAddress: PublicKey;
     depositDate: string;
     endDate: string;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"PoolSimulationService.d.ts","sourceRoot":"","sources":["../../src/services/PoolSimulationService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,oBAAoB,GAAG;IAClE,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG,oBAAoB,GAAG;IACtE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,8BAA8B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAShH;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,sBAAsB,CAAC,CAKjC"}
+{"version":3,"file":"PoolSimulationService.d.ts","sourceRoot":"","sources":["../../src/services/PoolSimulationService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,SAAS,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,oBAAoB,GAAG;IAClE,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG,oBAAoB,GAAG;IACtE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,8BAA8B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAShH;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,sBAAsB,CAAC,CAKjC"}

package/dist/services/RaydiumPoolsResponse.d.ts

@@ -1,4 +1,4 @@
-import { ClmmConfigInfo } from '@raydium-io/raydium-sdk-v2/lib';
+import { ClmmConfigInfo } from "@raydium-io/raydium-sdk-v2/lib";
 export interface RaydiumPoolsResponse {
     data: Pool[];
 }

package/dist/services/RaydiumService.d.ts

@@ -1,35 +1,21 @@
-import { Address, ProgramDerivedAddress, Rpc, SolanaRpcApi } from '@solana/kit';
+import { Connection, PublicKey } from '@solana/web3.js';
 import { Pool, RaydiumPoolsResponse } from './RaydiumPoolsResponse';
 import Decimal from 'decimal.js';
 import { WhirlpoolAprApy } from './WhirlpoolAprApy';
-import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
+import { WhirlpoolStrategy } from '../kamino-client/accounts';
 import { GenericPoolInfo, LiquidityDistribution } from '../utils';
-import { ApiV3PoolInfoConcentratedItem, ClmmRpcData, ComputeClmmPoolInfo, ReturnTypeFetchExBitmaps, ReturnTypeFetchMultipleMintInfos, ReturnTypeGetTickPrice } from '@raydium-io/raydium-sdk-v2/lib';
+import { ApiV3PoolInfoConcentratedItem } from '@raydium-io/raydium-sdk-v2/lib';
 export declare class RaydiumService {
-    private readonly _rpc;
+    private readonly _connection;
     private readonly _raydiumProgramId;
-    constructor(rpc: Rpc<SolanaRpcApi>, raydiumProgramId?: Address);
-    getRaydiumProgramId(): Address;
+    constructor(connection: Connection, raydiumProgramId?: PublicKey);
+    getRaydiumProgramId(): PublicKey;
     getRaydiumWhirlpools(): Promise<RaydiumPoolsResponse>;
-    getRaydiumPoolInfo(poolPubkey: Address): Promise<ApiV3PoolInfoConcentratedItem>;
-    getRaydiumPoolLiquidityDistribution(pool: Address, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
+    getRaydiumPoolInfo(poolPubkey: PublicKey): Promise<ApiV3PoolInfoConcentratedItem>;
+    getRaydiumPoolLiquidityDistribution(pool: PublicKey, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
     getStrategyWhirlpoolPoolAprApy: (strategy: WhirlpoolStrategy, pools?: Pool[]) => Promise<WhirlpoolAprApy>;
-    getRaydiumPositionAprApy: (poolPubkey: Address, priceLower: Decimal, priceUpper: Decimal, pools?: Pool[]) => Promise<WhirlpoolAprApy>;
-    getGenericPoolInfo(poolPubkey: Address, pools?: Pool[]): Promise<GenericPoolInfo>;
-    getPositionsCountByPool(pool: Address): Promise<number>;
-    getTickPrice(tick: number, tokenADecimals: number, tokenBDecimals: number, baseIn?: boolean): ReturnTypeGetTickPrice;
-    getRpcClmmPoolInfo(poolId: string): Promise<ClmmRpcData>;
-    fetchComputeClmmInfo(poolInfoWithAddress: ClmmRpcDataWithAddress): Promise<ComputeClmmPoolInfo>;
-    fetchExBitmaps(exBitmapAddress: Address[]): Promise<ReturnTypeFetchExBitmaps>;
-    fetchComputeMultipleClmmInfo(poolList: ClmmRpcDataWithAddress[]): Promise<Record<string, ComputeClmmPoolInfo>>;
-    fetchMultipleMintInfos(mints: Address[]): Promise<ReturnTypeFetchMultipleMintInfos>;
-    getComputeClmmPoolInfo(clmmPoolRpcInfoWithAddress: ClmmRpcDataWithAddress): Promise<ComputeClmmPoolInfo>;
-    getPoolInfoFromRpc(poolId: string): Promise<ApiV3PoolInfoConcentratedItem>;
-    clmmComputeInfoToApiInfo(pool: ComputeClmmPoolInfo): ApiV3PoolInfoConcentratedItem;
+    getRaydiumPositionAprApy: (poolPubkey: PublicKey, priceLower: Decimal, priceUpper: Decimal, pools?: Pool[]) => Promise<WhirlpoolAprApy>;
+    getGenericPoolInfo(poolPubkey: PublicKey, pools?: Pool[]): Promise<GenericPoolInfo>;
+    getPositionsCountByPool(pool: PublicKey): Promise<number>;
 }
-export interface ClmmRpcDataWithAddress {
-    address: Address;
-    clmmPoolRpcInfo: ClmmRpcData;
-}
-export declare function getPdaExBitmapAccount(programId: Address, poolId: Address): Promise<ProgramDerivedAddress>;
 //# sourceMappingURL=RaydiumService.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RaydiumService.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EAIP,qBAAqB,EACrB,GAAG,EACH,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,IAAI,EACJ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAEL,eAAe,EAGf,qBAAqB,EAQtB,MAAM,UAAU,CAAC;AAKlB,OAAO,EACL,6BAA6B,EAE7B,WAAW,EACX,mBAAmB,EAKnB,wBAAwB,EACxB,gCAAgC,EAChC,sBAAsB,EAIvB,MAAM,gCAAgC,CAAC;AAKxC,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;gBAEhC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAE,OAA4B;IAKlF,mBAAmB,IAAI,OAAO;IAIxB,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAIrD,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAI/E,mCAAmC,CACvC,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAuDjC,8BAA8B,GAAU,UAAU,iBAAiB,EAAE,QAAQ,IAAI,EAAE,KAAG,OAAO,CAAC,eAAe,CAAC,CAsE5G;IAEF,wBAAwB,GACtB,YAAY,OAAO,EACnB,YAAY,OAAO,EACnB,YAAY,OAAO,EACnB,QAAQ,IAAI,EAAE,KACb,OAAO,CAAC,eAAe,CAAC,CA+EzB;IAEI,kBAAkB,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAmCjF,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAoB7D,YAAY,CACV,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,MAAM,GAAE,OAAc,GACrB,sBAAsB;IASnB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA6BxD,oBAAoB,CAAC,mBAAmB,EAAE,sBAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAK/F,cAAc,CAAC,eAAe,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAmB7E,4BAA4B,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IA2G9G,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,gCAAgC,CAAC;IA4C5E,sBAAsB,CACjC,0BAA0B,EAAE,sBAAsB,GACjD,OAAO,CAAC,mBAAmB,CAAC;IAKzB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAiBhF,wBAAwB,CAAC,IAAI,EAAE,mBAAmB,GAAG,6BAA6B;CAgCnF;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,WAAW,CAAC;CAC9B;AAED,wBAAsB,qBAAqB,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAM/G"}
+{"version":3,"file":"RaydiumService.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAEL,IAAI,EACJ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAEL,eAAe,EAEf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAKlB,OAAO,EACL,6BAA6B,EAQ9B,MAAM,gCAAgC,CAAC;AAExC,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,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAIrD,kBAAkB,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,6BAA6B,CAAC;IASjF,mCAAmC,CACvC,IAAI,EAAE,SAAS,EACf,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAuDjC,8BAA8B,aAAoB,iBAAiB,UAAU,IAAI,EAAE,KAAG,OAAO,CAAC,eAAe,CAAC,CAsE5G;IAEF,wBAAwB,eACV,SAAS,cACT,OAAO,cACP,OAAO,UACX,IAAI,EAAE,KACb,OAAO,CAAC,eAAe,CAAC,CA+EzB;IAEI,kBAAkB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAmCnF,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAWhE"}

package/dist/services/RaydiumService.js

@@ -4,25 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RaydiumService = void 0;
-exports.getPdaExBitmapAccount = getPdaExBitmapAccount;
-const kit_1 = require("@solana/kit");
-const accounts_1 = require("../@codegen/raydium/accounts");
+const web3_js_1 = require("@solana/web3.js");
+const raydium_client_1 = require("../raydium_client");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const utils_1 = require("../utils");
 const axios_1 = __importDefault(require("axios"));
 const CreationParameters_1 = require("../utils/CreationParameters");
-const programId_1 = require("../@codegen/raydium/programId");
+const programId_1 = require("../raydium_client/programId");
 const raydium_1 = require("../utils/raydium");
 const lib_1 = require("@raydium-io/raydium-sdk-v2/lib");
-const compat_1 = require("@solana/compat");
-const token_2022_1 = require("@solana-program/token-2022");
-const pubkeys_1 = require("../constants/pubkeys");
 class RaydiumService {
-    _rpc;
+    _connection;
     _raydiumProgramId;
-    constructor(rpc, raydiumProgramId = programId_1.PROGRAM_ID) {
-        this._rpc = rpc;
+    constructor(connection, raydiumProgramId = programId_1.PROGRAM_ID) {
         this._raydiumProgramId = raydiumProgramId;
+        this._connection = connection;
     }
     getRaydiumProgramId() {
         return this._raydiumProgramId;
@@ -31,11 +27,16 @@ class RaydiumService {
         return (await axios_1.default.get(`https://api.kamino.finance/v2/raydium/ammPools`)).data;
     }
     async getRaydiumPoolInfo(poolPubkey) {
-        return this.getPoolInfoFromRpc(poolPubkey.toString());
+        const raydiumLoadParams = { connection: this._connection };
+        const raydium = await lib_1.Raydium.load(raydiumLoadParams);
+        const rayClmm = new lib_1.Clmm({ scope: raydium, moduleName: '' });
+        const otherPoolInfo = await rayClmm.getPoolInfoFromRpc(poolPubkey.toString());
+        console.log('otherPoolInfo', otherPoolInfo);
+        return otherPoolInfo.poolInfo;
     }
     async getRaydiumPoolLiquidityDistribution(pool, keepOrder = true, lowestTick, highestTick) {
         const raydiumLiqDistribution = (await axios_1.default.get(`https://api.kamino.finance/v2/raydium/positionLine/${pool.toString()}`)).data;
-        const poolState = await accounts_1.PoolState.fetch(this._rpc, pool);
+        const poolState = await raydium_client_1.PoolState.fetch(this._connection, pool);
         if (!poolState) {
             throw Error(`Raydium pool state ${pool} does not exist`);
         }
@@ -71,11 +72,11 @@ class RaydiumService {
         return liqDistribution;
     }
     getStrategyWhirlpoolPoolAprApy = async (strategy, pools) => {
-        const position = await accounts_1.PersonalPositionState.fetch(this._rpc, strategy.position);
+        const position = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategy.position);
         if (!position) {
             throw Error(`Position ${strategy.position} does not exist`);
         }
-        const poolState = await accounts_1.PoolState.fetch(this._rpc, strategy.pool);
+        const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategy.pool);
         if (!poolState) {
             throw Error(`Raydium pool state ${strategy.pool} does not exist`);
         }
@@ -124,7 +125,7 @@ class RaydiumService {
         };
     };
     getRaydiumPositionAprApy = async (poolPubkey, priceLower, priceUpper, pools) => {
-        const poolState = await accounts_1.PoolState.fetch(this._rpc, poolPubkey);
+        const poolState = await raydium_client_1.PoolState.fetch(this._connection, poolPubkey);
         if (!poolState) {
             throw Error(`Raydium pool state ${poolPubkey} does not exist`);
         }
@@ -174,7 +175,7 @@ class RaydiumService {
         };
     };
     async getGenericPoolInfo(poolPubkey, pools) {
-        const poolState = await accounts_1.PoolState.fetch(this._rpc, poolPubkey);
+        const poolState = await raydium_client_1.PoolState.fetch(this._connection, poolPubkey);
         if (!poolState) {
             throw Error(`Raydium pool state ${poolPubkey} does not exist`);
         }
@@ -190,7 +191,7 @@ class RaydiumService {
         }
         const poolInfo = {
             dex: 'RAYDIUM',
-            address: poolPubkey,
+            address: new web3_js_1.PublicKey(poolPubkey),
             tokenMintA: poolState.tokenMint0,
             tokenMintB: poolState.tokenMint1,
             price: new decimal_js_1.default(raydiumPool.price),
@@ -204,261 +205,15 @@ class RaydiumService {
         return poolInfo;
     }
     async getPositionsCountByPool(pool) {
-        const positions = await this._rpc
-            .getProgramAccounts(this._raydiumProgramId, {
+        const positions = await this._connection.getProgramAccounts(this._raydiumProgramId, {
             commitment: 'confirmed',
             filters: [
-                { dataSize: BigInt(lib_1.PositionInfoLayout.span) },
-                {
-                    memcmp: {
-                        bytes: pool.toString(),
-                        offset: BigInt(lib_1.PositionInfoLayout.offsetOf('poolId')),
-                        encoding: 'base58',
-                    },
-                },
+                { dataSize: lib_1.PositionInfoLayout.span },
+                { memcmp: { bytes: pool.toBase58(), offset: lib_1.PositionInfoLayout.offsetOf('poolId') } },
             ],
-        })
-            .send();
-        return positions.length;
-    }
-    getTickPrice(tick, tokenADecimals, tokenBDecimals, baseIn = true) {
-        const tickSqrtPriceX64 = lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(tick);
-        const tickPrice = lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(tickSqrtPriceX64, tokenADecimals, tokenBDecimals);
-        return baseIn
-            ? { tick, price: tickPrice, tickSqrtPriceX64 }
-            : { tick, price: new decimal_js_1.default(1).div(tickPrice), tickSqrtPriceX64 };
-    }
-    async getRpcClmmPoolInfo(poolId) {
-        const poolAccountInfo = await this._rpc
-            .getAccountInfo((0, kit_1.address)(poolId), { commitment: 'confirmed', encoding: 'base64' })
-            .send();
-        if (!poolAccountInfo.value) {
-            throw Error(`Raydium pool state ${poolId} does not exist`);
-        }
-        const poolState = await accounts_1.PoolState.fetch(this._rpc, (0, kit_1.address)(poolId));
-        if (!poolState) {
-            throw Error(`Raydium pool state ${poolId} does not exist`);
-        }
-        const rpc = lib_1.PoolInfoLayout.decode(Buffer.from(poolAccountInfo.value.data[0], 'base64'));
-        const currentPrice = lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(poolState.sqrtPriceX64, poolState.mintDecimals0, poolState.mintDecimals1).toNumber();
-        const data = {
-            ...rpc,
-            currentPrice,
-            programId: (0, utils_1.toLegacyPublicKey)(this._raydiumProgramId),
-        };
-        return data;
-    }
-    async fetchComputeClmmInfo(poolInfoWithAddress) {
-        const { address: poolAddress } = poolInfoWithAddress;
-        return (await this.fetchComputeMultipleClmmInfo([poolInfoWithAddress]))[poolAddress.toString()];
-    }
-    async fetchExBitmaps(exBitmapAddress) {
-        const fetchedBitmapAccount = await this._rpc
-            .getMultipleAccounts(exBitmapAddress, { commitment: 'confirmed', encoding: 'base64' })
-            .send();
-        const fetchedBitmapAccountWithAddress = exBitmapAddress.map((address, index) => ({
-            address,
-            data: fetchedBitmapAccount.value[index]?.data,
-        }));
-        const returnTypeFetchExBitmaps = {};
-        for (const { address, data } of fetchedBitmapAccountWithAddress) {
-            if (!data)
-                continue;
-            returnTypeFetchExBitmaps[address.toString()] = lib_1.TickArrayBitmapExtensionLayout.decode(Buffer.from(data[0], 'base64'));
-        }
-        return returnTypeFetchExBitmaps;
-    }
-    async fetchComputeMultipleClmmInfo(poolList) {
-        const fetchRpcList = poolList.map((p) => p.address);
-        const rpcRes = await this._rpc
-            .getMultipleAccounts(fetchRpcList, { commitment: 'confirmed', encoding: 'base64' })
-            .send();
-        const rpcResWithAddress = fetchRpcList.map((address, index) => ({
-            address,
-            data: rpcRes.value[index]?.data,
-        }));
-        const rpcDataMap = {};
-        for (const { address, data } of rpcResWithAddress) {
-            if (!data)
-                continue;
-            rpcDataMap[address.toString()] = lib_1.PoolInfoLayout.decode(Buffer.from(data[0], 'base64'));
-        }
-        // Fetch amm configs
-        const configSet = Array.from(new Set(poolList.map((p) => p.clmmPoolRpcInfo.ammConfig.toBase58())));
-        const configRes = await this._rpc
-            .getMultipleAccounts(configSet.map((s) => (0, kit_1.address)(s)), { commitment: 'confirmed', encoding: 'base64' })
-            .send();
-        const clmmConfigs = {};
-        configSet.forEach((configAddress, index) => {
-            const data = configRes.value[index]?.data;
-            if (data) {
-                clmmConfigs[configAddress] = lib_1.ClmmConfigLayout.decode(Buffer.from(data[0], 'base64'));
-            }
         });
-        // Fetch mint infos
-        const allMints = Array.from(new Set(poolList.flatMap((p) => [p.clmmPoolRpcInfo.mintA.toBase58(), p.clmmPoolRpcInfo.mintB.toBase58()])));
-        const mintInfos = await this.fetchMultipleMintInfos(allMints.map((m) => (0, kit_1.address)(m)));
-        const pdaList = await Promise.all(poolList.map(async (poolInfo) => {
-            const pda = await getPdaExBitmapAccount((0, compat_1.fromLegacyPublicKey)(poolInfo.clmmPoolRpcInfo.programId), poolInfo.address);
-            return (0, kit_1.address)(pda[0]);
-        }));
-        const exBitData = await this.fetchExBitmaps(pdaList);
-        const result = {};
-        for (let i = 0; i < poolList.length; i++) {
-            const cur = poolList[i];
-            const pda = await getPdaExBitmapAccount((0, compat_1.fromLegacyPublicKey)(cur.clmmPoolRpcInfo.programId), cur.address);
-            const ammConfigKey = cur.clmmPoolRpcInfo.ammConfig.toBase58();
-            const ammConfigData = clmmConfigs[ammConfigKey];
-            const mintAKey = cur.clmmPoolRpcInfo.mintA.toBase58();
-            const mintBKey = cur.clmmPoolRpcInfo.mintB.toBase58();
-            result[cur.address.toString()] = {
-                ...rpcDataMap[cur.address.toString()],
-                id: (0, utils_1.toLegacyPublicKey)(cur.address),
-                version: 6,
-                programId: (0, compat_1.fromLegacyPublicKey)(cur.clmmPoolRpcInfo.programId),
-                mintA: {
-                    chainId: 101,
-                    address: mintAKey,
-                    programId: mintInfos[mintAKey]?.programId.toBase58() || 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
-                    logoURI: '',
-                    symbol: '',
-                    name: '',
-                    decimals: cur.clmmPoolRpcInfo.mintDecimalsA,
-                    tags: [],
-                    extensions: { feeConfig: mintInfos[mintAKey]?.feeConfig },
-                },
-                mintB: {
-                    chainId: 101,
-                    address: mintBKey,
-                    programId: mintInfos[mintBKey]?.programId.toBase58() || 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
-                    logoURI: '',
-                    symbol: '',
-                    name: '',
-                    decimals: cur.clmmPoolRpcInfo.mintDecimalsB,
-                    tags: [],
-                    extensions: { feeConfig: mintInfos[mintBKey]?.feeConfig },
-                },
-                ammConfig: {
-                    ...ammConfigData,
-                    id: (0, utils_1.toLegacyPublicKey)((0, kit_1.address)(ammConfigKey)),
-                    fundFeeRate: 0,
-                    description: '',
-                    defaultRange: 0,
-                    defaultRangePoint: [],
-                    fundOwner: '',
-                },
-                currentPrice: new decimal_js_1.default(cur.clmmPoolRpcInfo.currentPrice),
-                exBitmapAccount: (0, utils_1.toLegacyPublicKey)(pda[0]),
-                exBitmapInfo: exBitData[pda[0].toString()],
-                startTime: rpcDataMap[cur.address.toString()].startTime.toNumber(),
-                rewardInfos: rpcDataMap[cur.address.toString()].rewardInfos,
-            };
-        }
-        return result;
-    }
-    async fetchMultipleMintInfos(mints) {
-        if (mints.length === 0)
-            return {};
-        const cleanedMints = mints.map((i) => (0, utils_1.solToWSol)(i));
-        // fetch in chunks of 100
-        const mintInfos = [];
-        for (let i = 0; i < cleanedMints.length; i += 100) {
-            const chunk = cleanedMints.slice(i, i + 100);
-            const chunkMintInfos = await (0, token_2022_1.fetchAllMint)(this._rpc, chunk);
-            mintInfos.push(...chunkMintInfos);
-        }
-        const mintInfosWithAddress = cleanedMints.map((mint, index) => ({
-            address: mint,
-            data: mintInfos[index],
-        }));
-        const mintK = {};
-        for (const { address, data } of mintInfosWithAddress) {
-            if (!data) {
-                console.log('invalid mint account', address.toString());
-                continue;
-            }
-            mintK[address] = {
-                mintAuthority: (0, utils_1.optionGetValueOrUndefined)(data.data.mintAuthority)
-                    ? (0, utils_1.toLegacyPublicKey)((0, utils_1.optionGetValue)(data.data.mintAuthority))
-                    : null,
-                programId: (0, utils_1.toLegacyPublicKey)(data.programAddress),
-                feeConfig: undefined,
-                address: (0, utils_1.toLegacyPublicKey)(address),
-                isInitialized: true,
-                tlvData: Buffer.from([]),
-                supply: data.data.supply,
-                decimals: data.data.decimals,
-                freezeAuthority: (0, utils_1.optionGetValueOrUndefined)(data.data.freezeAuthority)
-                    ? (0, utils_1.toLegacyPublicKey)((0, utils_1.optionGetValue)(data.data.freezeAuthority))
-                    : null,
-            };
-        }
-        mintK[pubkeys_1.DEFAULT_PUBLIC_KEY.toString()] = mintK[utils_1.WSOL_MINT.toString()];
-        return mintK;
-    }
-    async getComputeClmmPoolInfo(clmmPoolRpcInfoWithAddress) {
-        const computeClmmPoolInfo = await this.fetchComputeClmmInfo(clmmPoolRpcInfoWithAddress);
-        return computeClmmPoolInfo;
-    }
-    async getPoolInfoFromRpc(poolId) {
-        const rpcData = await this.getRpcClmmPoolInfo(poolId);
-        const poolInfoWithAddress = {
-            address: (0, kit_1.address)(poolId),
-            clmmPoolRpcInfo: rpcData,
-        };
-        const computeClmmPoolInfo = await this.getComputeClmmPoolInfo(poolInfoWithAddress);
-        const poolInfo = this.clmmComputeInfoToApiInfo(computeClmmPoolInfo);
-        poolInfo.mintAmountA = await (0, utils_1.getTokenAccountBalanceLamports)(this._rpc, (0, compat_1.fromLegacyPublicKey)(rpcData.vaultA));
-        poolInfo.mintAmountB = await (0, utils_1.getTokenAccountBalanceLamports)(this._rpc, (0, compat_1.fromLegacyPublicKey)(rpcData.vaultB));
-        return poolInfo;
-    }
-    clmmComputeInfoToApiInfo(pool) {
-        return {
-            ...pool,
-            type: 'Concentrated',
-            programId: pool.programId.toString(),
-            id: pool.id.toString(),
-            rewardDefaultInfos: [],
-            rewardDefaultPoolInfos: 'Clmm',
-            price: pool.currentPrice.toNumber(),
-            mintAmountA: 0,
-            mintAmountB: 0,
-            feeRate: pool.ammConfig.tradeFeeRate,
-            openTime: pool.startTime.toString(),
-            tvl: 0,
-            day: mockRewardData,
-            week: mockRewardData,
-            month: mockRewardData,
-            pooltype: [],
-            farmUpcomingCount: 0,
-            farmOngoingCount: 0,
-            farmFinishedCount: 0,
-            burnPercent: 0,
-            config: {
-                ...pool.ammConfig,
-                id: pool.ammConfig.id.toString(),
-                defaultRange: 0,
-                defaultRangePoint: [],
-            },
-        };
+        return positions.length;
     }
 }
 exports.RaydiumService = RaydiumService;
-async function getPdaExBitmapAccount(programId, poolId) {
-    const addressEncoder = (0, kit_1.getAddressEncoder)();
-    return (0, kit_1.getProgramDerivedAddress)({
-        seeds: [lib_1.POOL_TICK_ARRAY_BITMAP_SEED, addressEncoder.encode(poolId)],
-        programAddress: programId,
-    });
-}
-const mockRewardData = {
-    volume: 0,
-    volumeQuote: 0,
-    volumeFee: 0,
-    apr: 0,
-    feeApr: 0,
-    priceMin: 0,
-    priceMax: 0,
-    rewardApr: [],
-};
 //# sourceMappingURL=RaydiumService.js.map