@kamino-finance/kliquidity-sdk 7.0.1 → 7.0.3

package/src/services/MeteoraService.ts

@@ -22,11 +22,15 @@ export interface MeteoraPool {
 
 export class MeteoraService {
   private readonly _connection: Connection;
-  private readonly _globalConfig: PublicKey;
+  private readonly _meteoraProgramId: PublicKey;
 
-  constructor(connection: Connection, globalConfig: PublicKey) {
+  constructor(connection: Connection, meteoraProgramId: PublicKey = METEORA_PROGRAM_ID) {
     this._connection = connection;
-    this._globalConfig = globalConfig;
+    this._meteoraProgramId = meteoraProgramId;
+  }
+
+  getMeteoraProgramId(): PublicKey {
+    return this._meteoraProgramId;
   }
 
   async getPool(poolAddress: PublicKey): Promise<LbPair | null> {

package/src/services/OrcaService.ts

@@ -25,28 +25,22 @@ import {
 import { WHIRLPOOL_PROGRAM_ID } from '../whirlpools-client/programId';
 import { CollateralInfo } from '../kamino-client/types';
 import { KaminoPrices } from '../models';
-import { PROGRAM_ID } from '../kamino-client/programId';
 
 export class OrcaService {
   private readonly _connection: Connection;
-  private readonly _cluster: SolanaCluster;
+  private readonly _whirilpoolProgramId: PublicKey;
   private readonly _orcaNetwork: OrcaNetwork;
   private readonly _orcaApiUrl: string;
-  private readonly _globalConfig: PublicKey;
-  private readonly _kaminoProgramId: PublicKey;
-
-  constructor(
-    connection: Connection,
-    cluster: SolanaCluster,
-    globalConfig: PublicKey,
-    kaminoProgramId: PublicKey = PROGRAM_ID
-  ) {
+
+  constructor(connection: Connection, cluster: SolanaCluster, whirlpoolProgramId: PublicKey = WHIRLPOOL_PROGRAM_ID) {
     this._connection = connection;
-    this._cluster = cluster;
-    this._globalConfig = globalConfig;
+    this._whirilpoolProgramId = whirlpoolProgramId;
     this._orcaNetwork = cluster === 'mainnet-beta' ? OrcaNetwork.MAINNET : OrcaNetwork.DEVNET;
     this._orcaApiUrl = `https://api.${cluster === 'mainnet-beta' ? 'mainnet' : 'devnet'}.orca.so`;
-    this._kaminoProgramId = kaminoProgramId;
+  }
+
+  getWhirlpoolProgramId(): PublicKey {
+    return this._whirilpoolProgramId;
   }
 
   async getOrcaWhirlpools() {

package/src/services/RaydiumService.ts

@@ -1,5 +1,4 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { SolanaCluster } from '@hubbleprotocol/hubble-config';
 import {
   LiquidityDistribution as RaydiumLiquidityDistribuion,
   Pool,
@@ -25,11 +24,15 @@ import { priceToTickIndexWithRounding } from '../utils/raydium';
 
 export class RaydiumService {
   private readonly _connection: Connection;
-  private readonly _cluster: SolanaCluster;
+  private readonly _raydiumProgramId: PublicKey;
 
-  constructor(connection: Connection, cluster: SolanaCluster) {
+  constructor(connection: Connection, raydiumProgramId: PublicKey = RAYDIUM_PROGRAM_ID) {
+    this._raydiumProgramId = raydiumProgramId;
     this._connection = connection;
-    this._cluster = cluster;
+  }
+
+  getRaydiumProgramId(): PublicKey {
+    return this._raydiumProgramId;
   }
 
   async getRaydiumWhirlpools(): Promise<RaydiumPoolsResponse> {
@@ -307,7 +310,7 @@ export class RaydiumService {
   }
 
   async getPositionsCountByPool(pool: PublicKey): Promise<number> {
-    const positions = await this._connection.getProgramAccounts(RAYDIUM_PROGRAM_ID, {
+    const positions = await this._connection.getProgramAccounts(this._raydiumProgramId, {
       commitment: 'confirmed',
       filters: [
         { dataSize: PositionInfoLayout.span },