@kamino-finance/kliquidity-sdk 7.0.1 → 7.0.3

package/src/Kamino.ts

@@ -64,7 +64,7 @@ import {
   TotalStrategyVaultTokens,
   TreasuryFeeVault,
 } from './models';
-import { PROGRAM_ID_CLI as WHIRLPOOL_PROGRAM_ID, setWhirlpoolsProgramId } from './whirlpools-client/programId';
+import { setWhirlpoolsProgramId } from './whirlpools-client/programId';
 import { OraclePrices, Scope } from '@kamino-finance/scope-sdk';
 import {
   batchFetch,
@@ -179,7 +179,7 @@ import {
   StrategyStatusKind,
 } from './kamino-client/types';
 import { AmmConfig, PersonalPositionState, PoolState } from './raydium_client';
-import { PROGRAM_ID as RAYDIUM_PROGRAM_ID, setRaydiumProgramId } from './raydium_client/programId';
+import { setRaydiumProgramId } from './raydium_client/programId';
 import {
   getPdaProtocolPositionAddress,
   i32ToBytes,
@@ -330,7 +330,7 @@ import {
 } from './rebalance_methods/autodriftRebalance';
 import { KaminoPrices, OraclePricesAndCollateralInfos } from './models';
 import { getRemoveLiquidityQuote } from './whirlpools-client/shim/remove-liquidity';
-import { METEORA_PROGRAM_ID, setMeteoraProgramId } from './meteora_client/programId';
+import { setMeteoraProgramId } from './meteora_client/programId';
 import { computeMeteoraFee, MeteoraPool, MeteoraService } from './services/MeteoraService';
 import {
   binIdToBinArrayIndex,
@@ -401,19 +401,17 @@ export class Kamino {
       setWhirlpoolsProgramId(whirlpoolProgramId);
     }
 
-    if (cluster === 'localnet') {
-      if (raydiumProgramId) {
-        setRaydiumProgramId(raydiumProgramId);
-      }
+    if (raydiumProgramId) {
+      setRaydiumProgramId(raydiumProgramId);
     }
 
     if (meteoraProgramId) {
       setMeteoraProgramId(meteoraProgramId);
     }
 
-    this._orcaService = new OrcaService(connection, cluster, this._globalConfig, this._kaminoProgramId);
-    this._raydiumService = new RaydiumService(connection, cluster);
-    this._meteoraService = new MeteoraService(connection, this._globalConfig);
+    this._orcaService = new OrcaService(connection, cluster, whirlpoolProgramId);
+    this._raydiumService = new RaydiumService(connection, raydiumProgramId);
+    this._meteoraService = new MeteoraService(connection, meteoraProgramId);
   }
 
   getConnection = () => this._connection;
@@ -2332,7 +2330,7 @@ export class Kamino {
     if (positionPk.equals(PublicKey.default)) {
       return { lowerPrice: ZERO, upperPrice: ZERO };
     }
-    const position = await Position.fetch(this._connection, positionPk);
+    const position = await Position.fetch(this._connection, positionPk, this._orcaService.getWhirlpoolProgramId());
     if (!position) {
       return { lowerPrice: ZERO, upperPrice: ZERO };
     }
@@ -2352,7 +2350,11 @@ export class Kamino {
     if (positionPk.equals(PublicKey.default)) {
       return { lowerPrice: ZERO, upperPrice: ZERO };
     }
-    const position = await PersonalPositionState.fetch(this._connection, positionPk);
+    const position = await PersonalPositionState.fetch(
+      this._connection,
+      positionPk,
+      this._raydiumService.getRaydiumProgramId()
+    );
     if (!position) {
       return { lowerPrice: ZERO, upperPrice: ZERO };
     }
@@ -2381,7 +2383,7 @@ export class Kamino {
     if (positionPk.equals(PublicKey.default)) {
       return { lowerPrice: ZERO, upperPrice: ZERO };
     }
-    const position = await PositionV2.fetch(this._connection, positionPk);
+    const position = await PositionV2.fetch(this._connection, positionPk, this._meteoraService.getMeteoraProgramId());
     if (!position) {
       return { lowerPrice: ZERO, upperPrice: ZERO };
     }
@@ -2431,7 +2433,9 @@ export class Kamino {
       whirlpoolMap.set(whirlpools[0], whirlpool);
       return whirlpoolMap;
     }
-    const fetched = await batchFetch(uniqueWhirlpools, (chunk) => Whirlpool.fetchMultiple(this._connection, chunk));
+    const fetched = await batchFetch(uniqueWhirlpools, (chunk) =>
+      Whirlpool.fetchMultiple(this._connection, chunk, this._orcaService.getWhirlpoolProgramId())
+    );
     fetched.reduce((map: Record<string, Whirlpool | null>, whirlpool, i) => {
       whirlpoolMap.set(uniqueWhirlpools[i], whirlpool);
       map[uniqueWhirlpools[i].toBase58()] = whirlpool;
@@ -2446,7 +2450,9 @@ export class Kamino {
    */
   getOrcaPositions = async (positions: PublicKey[]): Promise<(Position | null)[]> => {
     const nonDefaults = positions.filter((value) => value.toBase58() !== PublicKey.default.toBase58());
-    const fetched = await batchFetch(nonDefaults, (chunk) => Position.fetchMultiple(this._connection, chunk));
+    const fetched = await batchFetch(nonDefaults, (chunk) =>
+      Position.fetchMultiple(this._connection, chunk, this._orcaService.getWhirlpoolProgramId())
+    );
     const fetchedMap: Record<string, Position | null> = fetched.reduce(
       (map: Record<string, Position | null>, position, i) => {
         map[nonDefaults[i].toBase58()] = position;
@@ -2464,7 +2470,7 @@ export class Kamino {
   getRaydiumPositions = async (positions: PublicKey[]): Promise<(PersonalPositionState | null)[]> => {
     const nonDefaults = positions.filter((value) => value.toBase58() !== PublicKey.default.toBase58());
     const fetched = await batchFetch(nonDefaults, (chunk) =>
-      PersonalPositionState.fetchMultiple(this._connection, chunk)
+      PersonalPositionState.fetchMultiple(this._connection, chunk, this._raydiumService.getRaydiumProgramId())
     );
     const fetchedMap: Record<string, PersonalPositionState | null> = fetched.reduce(
       (map: Record<string, PersonalPositionState | null>, position, i) => {
@@ -2478,7 +2484,9 @@ export class Kamino {
 
   getMeteoraPositions = async (positions: PublicKey[]): Promise<(PositionV2 | null)[]> => {
     const nonDefaults = positions.filter((value) => !value.equals(PublicKey.default));
-    const fetched = await batchFetch(nonDefaults, (chunk) => PositionV2.fetchMultiple(this._connection, chunk));
+    const fetched = await batchFetch(nonDefaults, (chunk) =>
+      PositionV2.fetchMultiple(this._connection, chunk, this._meteoraService.getMeteoraProgramId())
+    );
     const fetchedMap: Record<string, PositionV2 | null> = fetched.reduce(
       (map: Record<string, PositionV2 | null>, position, i) => {
         map[nonDefaults[i].toBase58()] = position;
@@ -2493,7 +2501,8 @@ export class Kamino {
    * Get whirlpool from public key
    * @param whirlpool pubkey of the orca whirlpool
    */
-  getWhirlpoolByAddress = (whirlpool: PublicKey) => Whirlpool.fetch(this._connection, whirlpool);
+  getWhirlpoolByAddress = (whirlpool: PublicKey) =>
+    Whirlpool.fetch(this._connection, whirlpool, this._orcaService.getWhirlpoolProgramId());
 
   /**
    * Get a list of Raydium pools from public keys
@@ -2509,7 +2518,9 @@ export class Kamino {
       const pool = await this.getRaydiumPoolByAddress(pools[0]);
       poolsMap.set(pools[0], pool);
     }
-    const fetched = await batchFetch(uniquePools, (chunk) => PoolState.fetchMultiple(this._connection, chunk));
+    const fetched = await batchFetch(uniquePools, (chunk) =>
+      PoolState.fetchMultiple(this._connection, chunk, this._raydiumService.getRaydiumProgramId())
+    );
     fetched.reduce((map, whirlpool, i) => {
       poolsMap.set(uniquePools[i], whirlpool);
       return map;
@@ -2527,7 +2538,9 @@ export class Kamino {
       const pool = await this.getMeteoraPoolByAddress(pools[0]);
       poolsMap.set(pools[0], pool);
     }
-    const fetched = await batchFetch(uniquePools, (chunk) => LbPair.fetchMultiple(this._connection, chunk));
+    const fetched = await batchFetch(uniquePools, (chunk) =>
+      LbPair.fetchMultiple(this._connection, chunk, this._meteoraService.getMeteoraProgramId())
+    );
     fetched.reduce((map, whirlpool, i) => {
       poolsMap.set(uniquePools[i], whirlpool);
       return map;
@@ -2535,15 +2548,18 @@ export class Kamino {
     return poolsMap;
   };
 
-  getRaydiumAmmConfig = (config: PublicKey) => AmmConfig.fetch(this._connection, config);
+  getRaydiumAmmConfig = (config: PublicKey) =>
+    AmmConfig.fetch(this._connection, config, this._raydiumService.getRaydiumProgramId());
 
   /**
    * Get Raydium pool from public key
    * @param pool pubkey of the orca whirlpool
    */
-  getRaydiumPoolByAddress = (pool: PublicKey) => PoolState.fetch(this._connection, pool);
+  getRaydiumPoolByAddress = (pool: PublicKey) =>
+    PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
 
-  getMeteoraPoolByAddress = (pool: PublicKey) => LbPair.fetch(this._connection, pool);
+  getMeteoraPoolByAddress = (pool: PublicKey) =>
+    LbPair.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
 
   getEventAuthorityPDA = (dex: BN): PublicKey => {
     if (dex.toNumber() == dexToNumber('ORCA') || dex.toNumber() == dexToNumber('RAYDIUM')) {
@@ -2551,7 +2567,10 @@ export class Kamino {
     }
 
     if (dex.toNumber() == dexToNumber('METEORA')) {
-      const [key, _] = PublicKey.findProgramAddressSync([Buffer.from('__event_authority')], METEORA_PROGRAM_ID);
+      const [key, _] = PublicKey.findProgramAddressSync(
+        [Buffer.from('__event_authority')],
+        this._meteoraService.getMeteoraProgramId()
+      );
       return key;
     }
     throw new Error('Invalid dex');
@@ -2643,7 +2662,11 @@ export class Kamino {
     //  add rewards vaults accounts to withdraw
     const isRaydium = strategyState.strategy.strategyDex.toNumber() == dexToNumber('RAYDIUM');
     if (isRaydium) {
-      const raydiumPosition = await PersonalPositionState.fetch(this._connection, strategyState.strategy.position);
+      const raydiumPosition = await PersonalPositionState.fetch(
+        this._connection,
+        strategyState.strategy.position,
+        this._raydiumService.getRaydiumProgramId()
+      );
       if (!raydiumPosition) {
         throw new Error('Position is not found');
       }
@@ -2870,7 +2893,11 @@ export class Kamino {
   getAllDepositAccounts = async (strategy: PublicKey | StrategyWithAddress, owner: PublicKey): Promise<PublicKey[]> => {
     const strategyState = await this.getStrategyStateIfNotFetched(strategy);
 
-    const globalConfig = await GlobalConfig.fetch(this._connection, strategyState.strategy.globalConfig);
+    const globalConfig = await GlobalConfig.fetch(
+      this._connection,
+      strategyState.strategy.globalConfig,
+      this._kaminoProgram.programId
+    );
     if (!globalConfig) {
       throw Error(`Could not fetch global config with pubkey ${strategyState.strategy.globalConfig.toString()}`);
     }
@@ -3751,21 +3778,25 @@ export class Kamino {
     let tokenAMint = PublicKey.default;
     let tokenBMint = PublicKey.default;
     if (dex == 'ORCA') {
-      const whirlpoolState = await Whirlpool.fetch(this._connection, pool);
+      const whirlpoolState = await Whirlpool.fetch(this._connection, pool, this._orcaService.getWhirlpoolProgramId());
       if (!whirlpoolState) {
         throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
       }
       tokenAMint = whirlpoolState.tokenMintA;
       tokenBMint = whirlpoolState.tokenMintB;
     } else if (dex == 'RAYDIUM') {
-      const raydiumPoolState = await PoolState.fetch(this._connection, pool);
+      const raydiumPoolState = await PoolState.fetch(
+        this._connection,
+        pool,
+        this._raydiumService.getRaydiumProgramId()
+      );
       if (!raydiumPoolState) {
         throw Error(`Could not fetch Raydium pool state with pubkey ${pool.toString()}`);
       }
       tokenAMint = raydiumPoolState.tokenMint0;
       tokenBMint = raydiumPoolState.tokenMint1;
     } else if (dex == 'METEORA') {
-      const meteoraPoolState = await LbPair.fetch(this._connection, pool);
+      const meteoraPoolState = await LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
       if (!meteoraPoolState) {
         throw Error(`Could not fetch Meteora pool state with pubkey ${pool.toString()}`);
       }
@@ -4111,7 +4142,7 @@ export class Kamino {
       strategyState.tokenBMint
     );
 
-    let programId = WHIRLPOOL_PROGRAM_ID;
+    let programId = this._orcaService.getWhirlpoolProgramId();
 
     let poolRewardVault0 = PublicKey.default;
     let poolRewardVault1 = PublicKey.default;
@@ -4119,8 +4150,12 @@ export class Kamino {
     let rewardMint0 = PublicKey.default;
     let rewardMint1 = PublicKey.default;
     let rewardMint2 = PublicKey.default;
-    if (strategyState.strategyDex.toNumber() == dexToNumber('ORCA')) {
-      const whirlpool = await Whirlpool.fetch(this._connection, strategyState.pool);
+    if (strategyState.strategyDex.toNumber() === dexToNumber('ORCA')) {
+      const whirlpool = await Whirlpool.fetch(
+        this._connection,
+        strategyState.pool,
+        this._orcaService.getWhirlpoolProgramId()
+      );
       if (!whirlpool) {
         throw Error(`Could not fetch whirlpool state with pubkey ${strategyState.pool.toString()}`);
       }
@@ -4131,10 +4166,14 @@ export class Kamino {
       rewardMint0 = whirlpool.rewardInfos[0].mint;
       rewardMint1 = whirlpool.rewardInfos[1].mint;
       rewardMint2 = whirlpool.rewardInfos[2].mint;
-    } else if (strategyState.strategyDex.toNumber() == dexToNumber('RAYDIUM')) {
-      programId = RAYDIUM_PROGRAM_ID;
+    } else if (strategyState.strategyDex.toNumber() === dexToNumber('RAYDIUM')) {
+      programId = this._raydiumService.getRaydiumProgramId();
 
-      const poolState = await PoolState.fetch(this._connection, strategyState.pool);
+      const poolState = await PoolState.fetch(
+        this._connection,
+        strategyState.pool,
+        this._raydiumService.getRaydiumProgramId()
+      );
       if (!poolState) {
         throw Error(`Could not fetch Raydium pool state with pubkey ${strategyState.pool.toString()}`);
       }
@@ -4145,9 +4184,13 @@ export class Kamino {
       rewardMint1 = poolState.rewardInfos[1].tokenMint;
       rewardMint2 = poolState.rewardInfos[2].tokenMint;
     } else if (strategyState.strategyDex.toNumber() == dexToNumber('METEORA')) {
-      programId = METEORA_PROGRAM_ID;
+      programId = this._meteoraService.getMeteoraProgramId();
 
-      const poolState = await LbPair.fetch(this._connection, strategyState.pool);
+      const poolState = await LbPair.fetch(
+        this._connection,
+        strategyState.pool,
+        this._meteoraService.getMeteoraProgramId()
+      );
       if (!poolState) {
         throw Error(`Could not fetch Meteora pool state with pubkey ${strategyState.pool.toString()}`);
       }
@@ -4215,7 +4258,7 @@ export class Kamino {
     if (strategyState.strategyDex.toNumber() == dexToNumber('RAYDIUM')) {
       const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = PublicKey.findProgramAddressSync(
         [Buffer.from('pool_tick_array_bitmap_extension'), strategyState.pool.toBuffer()],
-        RAYDIUM_PROGRAM_ID
+        this._raydiumService.getRaydiumProgramId()
       );
 
       ixn.keys.push({ pubkey: poolTickArrayBitmap, isSigner: false, isWritable: true });
@@ -4231,7 +4274,7 @@ export class Kamino {
   getMetadataProgramAddressesOrca = (positionMint: PublicKey): MetadataProgramAddressesOrca => {
     const [position, positionBump] = PublicKey.findProgramAddressSync(
       [Buffer.from('position'), positionMint.toBuffer()],
-      WHIRLPOOL_PROGRAM_ID
+      this._orcaService.getWhirlpoolProgramId()
     );
 
     const [positionMetadata, positionMetadataBump] = PublicKey.findProgramAddressSync(
@@ -4254,7 +4297,7 @@ export class Kamino {
     tickUpperIndex: number
   ): MetadataProgramAddressesRaydium => {
     const { publicKey: protocolPosition, nonce: protocolPositionBump } = getPdaProtocolPositionAddress(
-      RAYDIUM_PROGRAM_ID,
+      this._raydiumService.getRaydiumProgramId(),
       pool,
       tickLowerIndex,
       tickUpperIndex
@@ -4262,7 +4305,7 @@ export class Kamino {
 
     const [position, positionBump] = PublicKey.findProgramAddressSync(
       [Buffer.from('position'), positionMint.toBuffer()],
-      RAYDIUM_PROGRAM_ID
+      this._raydiumService.getRaydiumProgramId()
     );
 
     const [positionMetadata, positionMetadataBump] = PublicKey.findProgramAddressSync(
@@ -4291,11 +4334,11 @@ export class Kamino {
 
     const [lowerTickPubkey, lowerTickBump] = PublicKey.findProgramAddressSync(
       [Buffer.from('tick_array'), whirlpool.toBuffer(), Buffer.from(startTickIndex.toString())],
-      WHIRLPOOL_PROGRAM_ID
+      this._orcaService.getWhirlpoolProgramId()
     );
     const [upperTickPubkey, upperTickBump] = PublicKey.findProgramAddressSync(
       [Buffer.from('tick_array'), whirlpool.toBuffer(), Buffer.from(endTickIndex.toString())],
-      WHIRLPOOL_PROGRAM_ID
+      this._orcaService.getWhirlpoolProgramId()
     );
     return {
       lowerTick: lowerTickPubkey,
@@ -4316,11 +4359,11 @@ export class Kamino {
 
     const [lowerTickPubkey, lowerTickBump] = PublicKey.findProgramAddressSync(
       [Buffer.from('tick_array'), pool.toBuffer(), i32ToBytes(startTickIndex)],
-      RAYDIUM_PROGRAM_ID
+      this._raydiumService.getRaydiumProgramId()
     );
     const [upperTickPubkey, upperTickBump] = PublicKey.findProgramAddressSync(
       [Buffer.from('tick_array'), pool.toBuffer(), i32ToBytes(endTickIndex)],
-      RAYDIUM_PROGRAM_ID
+      this._raydiumService.getRaydiumProgramId()
     );
     return {
       lowerTick: lowerTickPubkey,
@@ -4331,8 +4374,8 @@ export class Kamino {
   };
 
   private readMeteoraPosition = async (poolPk: PublicKey, positionPk: PublicKey): Promise<MeteoraPosition> => {
-    const pool = await LbPair.fetch(this._connection, poolPk);
-    const position = await PositionV2.fetch(this._connection, positionPk);
+    const pool = await LbPair.fetch(this._connection, poolPk, this._meteoraService.getMeteoraProgramId());
+    const position = await PositionV2.fetch(this._connection, positionPk, this._meteoraService.getMeteoraProgramId());
     if (!pool || !position) {
       return {
         publicKey: positionPk,
@@ -4345,8 +4388,16 @@ export class Kamino {
       poolPk,
       position.lowerBinId
     );
-    const lowerBinArray = await BinArray.fetch(this._connection, lowerTickPk);
-    const upperBinArray = await BinArray.fetch(this._connection, upperTickPk);
+    const lowerBinArray = await BinArray.fetch(
+      this._connection,
+      lowerTickPk,
+      this._meteoraService.getMeteoraProgramId()
+    );
+    const upperBinArray = await BinArray.fetch(
+      this._connection,
+      upperTickPk,
+      this._meteoraService.getMeteoraProgramId()
+    );
     if (!lowerBinArray || !upperBinArray) {
       return {
         publicKey: positionPk,
@@ -4385,7 +4436,7 @@ export class Kamino {
     pool: PublicKey,
     tickLowerIndex: number
   ): LowerAndUpperTickPubkeys => {
-    const meteoraProgramId = METEORA_PROGRAM_ID;
+    const meteoraProgramId = this._meteoraService.getMeteoraProgramId();
 
     const lowerBinArrayIndex = binIdToBinArrayIndex(new BN(tickLowerIndex));
     const [lowerTick, lowerTickBump] = deriveBinArray(pool, lowerBinArrayIndex, meteoraProgramId);
@@ -4543,7 +4594,7 @@ export class Kamino {
     eventAuthority: PublicKey,
     status: StrategyStatusKind = new Uninitialized()
   ): Promise<TransactionInstruction> => {
-    const whirlpool = await Whirlpool.fetch(this._connection, pool);
+    const whirlpool = await Whirlpool.fetch(this._connection, pool, this._orcaService.getWhirlpoolProgramId());
     if (!whirlpool) {
       throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
     }
@@ -4599,7 +4650,7 @@ export class Kamino {
       tokenProgram: TOKEN_PROGRAM_ID,
       tokenProgram2022: TOKEN_2022_PROGRAM_ID,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-      poolProgram: WHIRLPOOL_PROGRAM_ID,
+      poolProgram: this._orcaService.getWhirlpoolProgramId(),
       oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
       oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
       oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
@@ -4663,7 +4714,7 @@ export class Kamino {
     strategyReward1Vault?: PublicKey,
     strategyReward2Vault?: PublicKey
   ): Promise<TransactionInstruction> => {
-    const poolState = await PoolState.fetch(this._connection, pool);
+    const poolState = await PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
     if (!poolState) {
       throw Error(`Could not fetch Raydium pool state with pubkey ${pool.toString()}`);
     }
@@ -4729,7 +4780,7 @@ export class Kamino {
       tokenProgram: TOKEN_PROGRAM_ID,
       tokenProgram2022: TOKEN_2022_PROGRAM_ID,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-      poolProgram: RAYDIUM_PROGRAM_ID,
+      poolProgram: this._raydiumService.getRaydiumProgramId(),
       oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
       oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
       oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
@@ -4754,7 +4805,7 @@ export class Kamino {
     };
     const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = PublicKey.findProgramAddressSync(
       [Buffer.from('pool_tick_array_bitmap_extension'), pool.toBuffer()],
-      RAYDIUM_PROGRAM_ID
+      this._raydiumService.getRaydiumProgramId()
     );
 
     const ix = openLiquidityPosition(args, accounts);
@@ -4821,7 +4872,7 @@ export class Kamino {
     eventAuthority: PublicKey,
     status: StrategyStatusKind = new Uninitialized()
   ): Promise<TransactionInstruction> => {
-    const lbPair = await LbPair.fetch(this._connection, pool);
+    const lbPair = await LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
     if (!lbPair) {
       throw Error(`Could not fetch meteora lbpair state with pubkey ${pool.toString()}`);
     }
@@ -4869,7 +4920,7 @@ export class Kamino {
       tokenProgram: TOKEN_PROGRAM_ID,
       tokenProgram2022: TOKEN_2022_PROGRAM_ID,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-      poolProgram: WHIRLPOOL_PROGRAM_ID,
+      poolProgram: this._orcaService.getWhirlpoolProgramId(),
       oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
       oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
       oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
@@ -5323,7 +5374,7 @@ export class Kamino {
     let tokenMintB: PublicKey;
     let tickSpacing: number;
     if (dex == 'ORCA') {
-      const whirlpoolState = await Whirlpool.fetch(this._connection, pool);
+      const whirlpoolState = await Whirlpool.fetch(this._connection, pool, this._orcaService.getWhirlpoolProgramId());
       if (!whirlpoolState) {
         throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
       }
@@ -5331,7 +5382,11 @@ export class Kamino {
       tokenMintB = whirlpoolState.tokenMintB;
       tickSpacing = whirlpoolState.tickSpacing;
     } else if (dex == 'RAYDIUM') {
-      const raydiumPoolState = await PoolState.fetch(this._connection, pool);
+      const raydiumPoolState = await PoolState.fetch(
+        this._connection,
+        pool,
+        this._raydiumService.getRaydiumProgramId()
+      );
       if (!raydiumPoolState) {
         throw Error(`Could not fetch Raydium pool state with pubkey ${pool.toString()}`);
       }
@@ -5339,7 +5394,7 @@ export class Kamino {
       tokenMintB = raydiumPoolState.tokenMint1;
       tickSpacing = raydiumPoolState.tickSpacing;
     } else if (dex == 'METEORA') {
-      const meteoraPoolState = await LbPair.fetch(this._connection, pool);
+      const meteoraPoolState = await LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
       if (!meteoraPoolState) {
         throw Error(`Could not fetch Meteora pool state with pubkey ${pool.toString()}`);
       }
@@ -5604,19 +5659,23 @@ export class Kamino {
 
   async getPoolTickSpacing(dex: Dex, pool: PublicKey): Promise<number> {
     if (dex == 'ORCA') {
-      const whirlpoolState = await Whirlpool.fetch(this._connection, pool);
+      const whirlpoolState = await Whirlpool.fetch(this._connection, pool, this._orcaService.getWhirlpoolProgramId());
       if (!whirlpoolState) {
         throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
       }
       return whirlpoolState.tickSpacing;
     } else if (dex == 'RAYDIUM') {
-      const raydiumPoolState = await PoolState.fetch(this._connection, pool);
+      const raydiumPoolState = await PoolState.fetch(
+        this._connection,
+        pool,
+        this._raydiumService.getRaydiumProgramId()
+      );
       if (!raydiumPoolState) {
         throw Error(`Could not fetch Raydium pool state with pubkey ${pool.toString()}`);
       }
       return raydiumPoolState.tickSpacing;
     } else if (dex == 'METEORA') {
-      const meteoraPoolState = await LbPair.fetch(this._connection, pool);
+      const meteoraPoolState = await LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
       if (!meteoraPoolState) {
         throw Error(`Could not fetch Meteora pool state with pubkey ${pool.toString()}`);
       }
@@ -5939,7 +5998,7 @@ export class Kamino {
   }
 
   async getRaydiumPoolPrice(pool: PublicKey): Promise<Decimal> {
-    const poolState = await PoolState.fetch(this._connection, pool);
+    const poolState = await PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
     if (!poolState) {
       throw new Error(`Raydium poolState ${pool.toString()} is not found`);
     }
@@ -5953,7 +6012,7 @@ export class Kamino {
   }
 
   async getMeteoraPoolPrice(pool: PublicKey): Promise<Decimal> {
-    const poolState = await LbPair.fetch(this._connection, pool);
+    const poolState = await LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
     if (!poolState) {
       throw new Error(`Meteora poolState ${pool.toString()} is not found`);
     }
@@ -6672,7 +6731,7 @@ export class Kamino {
     const tokenAAmountToDeposit = new Decimal(100.0);
 
     if (dex == 'RAYDIUM') {
-      const poolState = await PoolState.fetch(this._connection, pool);
+      const poolState = await PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
       if (!poolState) {
         throw new Error(`Raydium poolState ${pool.toString()} is not found`);
       }
@@ -6691,7 +6750,7 @@ export class Kamino {
       const amountBDecimal = new Decimal(amountB.toString());
       return [lamportsToNumberDecimal(amountADecimal, decimalsA), lamportsToNumberDecimal(amountBDecimal, decimalsB)];
     } else if (dex == 'ORCA') {
-      const whirlpoolState = await Whirlpool.fetch(this._connection, pool);
+      const whirlpoolState = await Whirlpool.fetch(this._connection, pool, this._orcaService.getWhirlpoolProgramId());
       if (!whirlpoolState) {
         throw new Error(`Raydium poolState ${pool.toString()} is not found`);
       }
@@ -6727,7 +6786,7 @@ export class Kamino {
         lamportsToNumberDecimal(addLiqResult.estTokenB.toNumber(), decimalsB),
       ];
     } else if (dex == 'METEORA') {
-      const poolState = await LbPair.fetch(this._connection, pool);
+      const poolState = await LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
       if (!poolState) {
         throw new Error(`Meteora poolState ${pool.toString()} is not found`);
       }
@@ -6840,7 +6899,11 @@ export class Kamino {
     const isRaydium = dexToNumber('RAYDIUM') === dex;
     const isMeteora = dexToNumber('METEORA') === dex;
     if (isOrca) {
-      const whirlpool = await Whirlpool.fetch(this._connection, strategyState.pool);
+      const whirlpool = await Whirlpool.fetch(
+        this._connection,
+        strategyState.pool,
+        this._orcaService.getWhirlpoolProgramId()
+      );
       if (!whirlpool) {
         throw new Error(`Unable to get Orca whirlpool for pubkey ${strategyState.pool}`);
       }
@@ -6881,7 +6944,7 @@ export class Kamino {
       return [new Decimal(0), new Decimal(0)];
     }
     // Given A in ATA, calc how much A and B
-    const accessor = new OrcaDAL(whirlpoolConfig, WHIRLPOOL_PROGRAM_ID, this._connection);
+    const accessor = new OrcaDAL(whirlpoolConfig, this._orcaService.getWhirlpoolProgramId(), this._connection);
     const orcaPosition = new OrcaPosition(accessor);
     const defaultSlippagePercentage = Percentage.fromFraction(1, 1000); // 0.1%
 
@@ -6936,8 +6999,16 @@ export class Kamino {
       return [new Decimal(0), new Decimal(0)];
     }
 
-    const poolState = await PoolState.fetch(this._connection, strategyState.pool);
-    const position = await PersonalPositionState.fetch(this._connection, strategyState.position);
+    const poolState = await PoolState.fetch(
+      this._connection,
+      strategyState.pool,
+      this._raydiumService.getRaydiumProgramId()
+    );
+    const position = await PersonalPositionState.fetch(
+      this._connection,
+      strategyState.position,
+      this._raydiumService.getRaydiumProgramId()
+    );
 
     if (!position) {
       throw new Error(`position ${strategyState.position.toString()} is not found`);
@@ -7007,7 +7078,11 @@ export class Kamino {
       return [new Decimal(0), new Decimal(0)];
     }
 
-    const poolState = await LbPair.fetch(this._connection, strategyState.pool);
+    const poolState = await LbPair.fetch(
+      this._connection,
+      strategyState.pool,
+      this._meteoraService.getMeteoraProgramId()
+    );
     if (!poolState) {
       throw new Error(`poolState ${strategyState.pool.toString()} is not found`);
     }
@@ -7018,8 +7093,12 @@ export class Kamino {
       return [tokenAAmount, tokenBAmount];
     } else {
       const binArrayIndex = binIdToBinArrayIndex(new BN(poolState.activeId));
-      const [binArrayPk] = deriveBinArray(strategyState.pool, binArrayIndex, METEORA_PROGRAM_ID);
-      const binArray = await BinArray.fetch(this._connection, binArrayPk);
+      const [binArrayPk] = deriveBinArray(
+        strategyState.pool,
+        binArrayIndex,
+        this._meteoraService.getMeteoraProgramId()
+      );
+      const binArray = await BinArray.fetch(this._connection, binArrayPk, this._meteoraService.getMeteoraProgramId());
       if (!binArray) {
         throw new Error(`bin array ${binArrayPk.toString()} is not found`);
       }
@@ -7160,12 +7239,20 @@ export class Kamino {
   ): Promise<{ amountSlippageA: BN; amountSlippageB: BN }> {
     const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
 
-    const whirlpool = await Whirlpool.fetch(this._connection, strategyState.pool);
+    const whirlpool = await Whirlpool.fetch(
+      this._connection,
+      strategyState.pool,
+      this._orcaService.getWhirlpoolProgramId()
+    );
     if (!whirlpool) {
       throw Error(`Could not fetch whirlpool state with pubkey ${strategyState.pool.toString()}`);
     }
 
-    const position = await Position.fetch(this._connection, strategyState.position);
+    const position = await Position.fetch(
+      this._connection,
+      strategyState.position,
+      this._orcaService.getWhirlpoolProgramId()
+    );
     if (!position) {
       throw new Error(`Whirlpool position ${strategyState.position} does not exist`);
     }
@@ -7192,8 +7279,16 @@ export class Kamino {
   ): Promise<{ amountSlippageA: BN; amountSlippageB: BN }> {
     const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
 
-    const poolStatePromise = LbPair.fetch(this._connection, strategyState.pool);
-    const positionPromise = PositionV2.fetch(this._connection, strategyState.position);
+    const poolStatePromise = LbPair.fetch(
+      this._connection,
+      strategyState.pool,
+      this._meteoraService.getMeteoraProgramId()
+    );
+    const positionPromise = PositionV2.fetch(
+      this._connection,
+      strategyState.position,
+      this._meteoraService.getMeteoraProgramId()
+    );
 
     const [poolState, _position] = await Promise.all([poolStatePromise, positionPromise]);
     if (!poolState) {
@@ -7208,9 +7303,10 @@ export class Kamino {
   ): Promise<{ amountSlippageA: BN; amountSlippageB: BN }> {
     const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
 
-    const poolStatePromise = await LbPair.fetch(this._connection, strategyState.pool);
-    const positionPromise = await PositionV2.fetch(this._connection, strategyState.position);
-    const [poolState, _position] = await Promise.all([poolStatePromise, positionPromise]);
+    const [poolState, _position] = await Promise.all([
+      LbPair.fetch(this._connection, strategyState.pool, this._meteoraService.getMeteoraProgramId()),
+      PositionV2.fetch(this._connection, strategyState.position, this._meteoraService.getMeteoraProgramId()),
+    ]);
 
     if (!poolState) {
       throw Error(`Could not fetch lb pair state with pubkey ${strategyState.pool.toString()}`);
@@ -7225,12 +7321,20 @@ export class Kamino {
   ): Promise<{ amountSlippageA: BN; amountSlippageB: BN }> => {
     const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
 
-    const whirlpool = await Whirlpool.fetch(this._connection, strategyState.pool);
+    const whirlpool = await Whirlpool.fetch(
+      this._connection,
+      strategyState.pool,
+      this._orcaService.getWhirlpoolProgramId()
+    );
     if (!whirlpool) {
       throw Error(`Could not fetch whirlpool state with pubkey ${strategyState.pool.toString()}`);
     }
 
-    const position = await Position.fetch(this._connection, strategyState.position);
+    const position = await Position.fetch(
+      this._connection,
+      strategyState.position,
+      this._orcaService.getWhirlpoolProgramId()
+    );
     if (!position) {
       throw new Error(`Whirlpool position ${strategyState.position} does not exist`);
     }
@@ -7258,8 +7362,16 @@ export class Kamino {
   ): Promise<{ amountSlippageA: BN; amountSlippageB: BN }> => {
     const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
 
-    const poolState = await PoolState.fetch(this._connection, strategyState.pool);
-    const positionState = await PersonalPositionState.fetch(this._connection, strategyState.position);
+    const poolState = await PoolState.fetch(
+      this._connection,
+      strategyState.pool,
+      this._raydiumService.getRaydiumProgramId()
+    );
+    const positionState = await PersonalPositionState.fetch(
+      this._connection,
+      strategyState.position,
+      this._raydiumService.getRaydiumProgramId()
+    );
 
     if (!positionState) {
       throw new Error(`Raydium position ${strategyState.position.toString()} could not be found.`);
@@ -7291,8 +7403,16 @@ export class Kamino {
   ): Promise<{ amountSlippageA: BN; amountSlippageB: BN }> => {
     const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
 
-    const poolState = await PoolState.fetch(this._connection, strategyState.pool);
-    const positionState = await PersonalPositionState.fetch(this._connection, strategyState.position);
+    const poolState = await PoolState.fetch(
+      this._connection,
+      strategyState.pool,
+      this._raydiumService.getRaydiumProgramId()
+    );
+    const positionState = await PersonalPositionState.fetch(
+      this._connection,
+      strategyState.position,
+      this._raydiumService.getRaydiumProgramId()
+    );
 
     if (!positionState) {
       throw new Error(`Raydium position ${strategyState.position.toString()} could not be found.`);
@@ -7430,7 +7550,11 @@ export class Kamino {
     const collateralInfos = await this.getCollateralInfo(globalConfig.tokenInfos);
     const result: [TransactionInstruction, Keypair][] = [];
     if (strategyState.strategyDex.toNumber() == dexToNumber('ORCA')) {
-      const whirlpool = await Whirlpool.fetch(this._connection, strategyState.pool);
+      const whirlpool = await Whirlpool.fetch(
+        this._connection,
+        strategyState.pool,
+        this._orcaService.getWhirlpoolProgramId()
+      );
       if (!whirlpool) {
         throw Error(`Could not fetch whirlpool state with pubkey ${strategyState.pool.toString()}`);
       }
@@ -7468,7 +7592,11 @@ export class Kamino {
       }
       return result;
     } else if (strategyState.strategyDex.toNumber() == dexToNumber('RAYDIUM')) {
-      const poolState = await PoolState.fetch(this._connection, strategyState.pool);
+      const poolState = await PoolState.fetch(
+        this._connection,
+        strategyState.pool,
+        this._raydiumService.getRaydiumProgramId()
+      );
       if (!poolState) {
         throw new Error(`Could not fetch whirlpool state with pubkey ${strategyState.pool.toString()}`);
       }
@@ -7506,7 +7634,11 @@ export class Kamino {
       }
       return result;
     } else if (strategyState.strategyDex.toNumber() == dexToNumber('METEORA')) {
-      const poolState = await LbPair.fetch(this._connection, strategyState.pool);
+      const poolState = await LbPair.fetch(
+        this._connection,
+        strategyState.pool,
+        this._meteoraService.getMeteoraProgramId()
+      );
       if (!poolState) {
         throw new Error(`Could not fetch meteora state with pubkey ${strategyState.pool.toString()}`);
       }
@@ -7567,8 +7699,12 @@ export class Kamino {
     const tickIndex = getNextValidTickIndex(priceToTickIndex(price, decimalsA, decimalsB), whilrpoolState.tickSpacing);
     const startTickIndex = getStartTickIndex(tickIndex, whilrpoolState.tickSpacing);
 
-    const [startTickIndexPk, _startTickIndexBump] = getTickArray(WHIRLPOOL_PROGRAM_ID, poolAddress, startTickIndex);
-    const tick = await TickArray.fetch(this._connection, startTickIndexPk);
+    const [startTickIndexPk, _startTickIndexBump] = getTickArray(
+      this._orcaService.getWhirlpoolProgramId(),
+      poolAddress,
+      startTickIndex
+    );
+    const tick = await TickArray.fetch(this._connection, startTickIndexPk, this._orcaService.getWhirlpoolProgramId());
     // initialize tick if it doesn't exist
     if (!tick) {
       const initTickArrayArgs: InitializeTickArrayArgs = {
@@ -7603,8 +7739,12 @@ export class Kamino {
     const binArray = getBinIdFromPriceWithDecimals(price, poolState.binStep, true, decimalsA, decimalsB);
     const binArrayIndex = binIdToBinArrayIndex(new BN(binArray));
 
-    const [startTickIndexPk, _startTickIndexBump] = deriveBinArray(poolAddress, binArrayIndex, METEORA_PROGRAM_ID);
-    const tick = await TickArray.fetch(this._connection, startTickIndexPk);
+    const [startTickIndexPk, _startTickIndexBump] = deriveBinArray(
+      poolAddress,
+      binArrayIndex,
+      this._meteoraService.getMeteoraProgramId()
+    );
+    const tick = await TickArray.fetch(this._connection, startTickIndexPk, this._meteoraService.getMeteoraProgramId());
     // initialize tick if it doesn't exist
     if (!tick) {
       const initTickArrayArgs: InitializeBinArrayArgs = {