@kamino-finance/kliquidity-sdk 7.0.1 → 7.0.3

package/dist/Kamino.js

@@ -100,17 +100,15 @@ class Kamino {
         if (whirlpoolProgramId) {
             (0, programId_2.setWhirlpoolsProgramId)(whirlpoolProgramId);
         }
-        if (cluster === 'localnet') {
-            if (raydiumProgramId) {
-                (0, programId_3.setRaydiumProgramId)(raydiumProgramId);
-            }
+        if (raydiumProgramId) {
+            (0, programId_3.setRaydiumProgramId)(raydiumProgramId);
         }
         if (meteoraProgramId) {
             (0, programId_4.setMeteoraProgramId)(meteoraProgramId);
         }
-        this._orcaService = new services_1.OrcaService(connection, cluster, this._globalConfig, this._kaminoProgramId);
-        this._raydiumService = new services_1.RaydiumService(connection, cluster);
-        this._meteoraService = new MeteoraService_1.MeteoraService(connection, this._globalConfig);
+        this._orcaService = new services_1.OrcaService(connection, cluster, whirlpoolProgramId);
+        this._raydiumService = new services_1.RaydiumService(connection, raydiumProgramId);
+        this._meteoraService = new MeteoraService_1.MeteoraService(connection, meteoraProgramId);
     }
     getConnection = () => this._connection;
     getProgramID = () => this._kaminoProgramId;
@@ -1474,7 +1472,7 @@ class Kamino {
         if (positionPk.equals(web3_js_1.PublicKey.default)) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
-        const position = await whirlpools_client_1.Position.fetch(this._connection, positionPk);
+        const position = await whirlpools_client_1.Position.fetch(this._connection, positionPk, this._orcaService.getWhirlpoolProgramId());
         if (!position) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
@@ -1487,7 +1485,7 @@ class Kamino {
         if (positionPk.equals(web3_js_1.PublicKey.default)) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
-        const position = await raydium_client_1.PersonalPositionState.fetch(this._connection, positionPk);
+        const position = await raydium_client_1.PersonalPositionState.fetch(this._connection, positionPk, this._raydiumService.getRaydiumProgramId());
         if (!position) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
@@ -1500,7 +1498,7 @@ class Kamino {
         if (positionPk.equals(web3_js_1.PublicKey.default)) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
-        const position = await accounts_2.PositionV2.fetch(this._connection, positionPk);
+        const position = await accounts_2.PositionV2.fetch(this._connection, positionPk, this._meteoraService.getMeteoraProgramId());
         if (!position) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
@@ -1544,7 +1542,7 @@ class Kamino {
             whirlpoolMap.set(whirlpools[0], whirlpool);
             return whirlpoolMap;
         }
-        const fetched = await (0, utils_1.batchFetch)(uniqueWhirlpools, (chunk) => whirlpools_client_1.Whirlpool.fetchMultiple(this._connection, chunk));
+        const fetched = await (0, utils_1.batchFetch)(uniqueWhirlpools, (chunk) => whirlpools_client_1.Whirlpool.fetchMultiple(this._connection, chunk, this._orcaService.getWhirlpoolProgramId()));
         fetched.reduce((map, whirlpool, i) => {
             whirlpoolMap.set(uniqueWhirlpools[i], whirlpool);
             map[uniqueWhirlpools[i].toBase58()] = whirlpool;
@@ -1558,7 +1556,7 @@ class Kamino {
      */
     getOrcaPositions = async (positions) => {
         const nonDefaults = positions.filter((value) => value.toBase58() !== web3_js_1.PublicKey.default.toBase58());
-        const fetched = await (0, utils_1.batchFetch)(nonDefaults, (chunk) => whirlpools_client_1.Position.fetchMultiple(this._connection, chunk));
+        const fetched = await (0, utils_1.batchFetch)(nonDefaults, (chunk) => whirlpools_client_1.Position.fetchMultiple(this._connection, chunk, this._orcaService.getWhirlpoolProgramId()));
         const fetchedMap = fetched.reduce((map, position, i) => {
             map[nonDefaults[i].toBase58()] = position;
             return map;
@@ -1571,7 +1569,7 @@ class Kamino {
      */
     getRaydiumPositions = async (positions) => {
         const nonDefaults = positions.filter((value) => value.toBase58() !== web3_js_1.PublicKey.default.toBase58());
-        const fetched = await (0, utils_1.batchFetch)(nonDefaults, (chunk) => raydium_client_1.PersonalPositionState.fetchMultiple(this._connection, chunk));
+        const fetched = await (0, utils_1.batchFetch)(nonDefaults, (chunk) => raydium_client_1.PersonalPositionState.fetchMultiple(this._connection, chunk, this._raydiumService.getRaydiumProgramId()));
         const fetchedMap = fetched.reduce((map, position, i) => {
             map[nonDefaults[i].toBase58()] = position;
             return map;
@@ -1580,7 +1578,7 @@ class Kamino {
     };
     getMeteoraPositions = async (positions) => {
         const nonDefaults = positions.filter((value) => !value.equals(web3_js_1.PublicKey.default));
-        const fetched = await (0, utils_1.batchFetch)(nonDefaults, (chunk) => accounts_2.PositionV2.fetchMultiple(this._connection, chunk));
+        const fetched = await (0, utils_1.batchFetch)(nonDefaults, (chunk) => accounts_2.PositionV2.fetchMultiple(this._connection, chunk, this._meteoraService.getMeteoraProgramId()));
         const fetchedMap = fetched.reduce((map, position, i) => {
             map[nonDefaults[i].toBase58()] = position;
             return map;
@@ -1591,7 +1589,7 @@ class Kamino {
      * Get whirlpool from public key
      * @param whirlpool pubkey of the orca whirlpool
      */
-    getWhirlpoolByAddress = (whirlpool) => whirlpools_client_1.Whirlpool.fetch(this._connection, whirlpool);
+    getWhirlpoolByAddress = (whirlpool) => whirlpools_client_1.Whirlpool.fetch(this._connection, whirlpool, this._orcaService.getWhirlpoolProgramId());
     /**
      * Get a list of Raydium pools from public keys
      * @param pools
@@ -1605,7 +1603,7 @@ class Kamino {
             const pool = await this.getRaydiumPoolByAddress(pools[0]);
             poolsMap.set(pools[0], pool);
         }
-        const fetched = await (0, utils_1.batchFetch)(uniquePools, (chunk) => raydium_client_1.PoolState.fetchMultiple(this._connection, chunk));
+        const fetched = await (0, utils_1.batchFetch)(uniquePools, (chunk) => raydium_client_1.PoolState.fetchMultiple(this._connection, chunk, this._raydiumService.getRaydiumProgramId()));
         fetched.reduce((map, whirlpool, i) => {
             poolsMap.set(uniquePools[i], whirlpool);
             return map;
@@ -1621,26 +1619,26 @@ class Kamino {
             const pool = await this.getMeteoraPoolByAddress(pools[0]);
             poolsMap.set(pools[0], pool);
         }
-        const fetched = await (0, utils_1.batchFetch)(uniquePools, (chunk) => accounts_2.LbPair.fetchMultiple(this._connection, chunk));
+        const fetched = await (0, utils_1.batchFetch)(uniquePools, (chunk) => accounts_2.LbPair.fetchMultiple(this._connection, chunk, this._meteoraService.getMeteoraProgramId()));
         fetched.reduce((map, whirlpool, i) => {
             poolsMap.set(uniquePools[i], whirlpool);
             return map;
         }, {});
         return poolsMap;
     };
-    getRaydiumAmmConfig = (config) => raydium_client_1.AmmConfig.fetch(this._connection, config);
+    getRaydiumAmmConfig = (config) => raydium_client_1.AmmConfig.fetch(this._connection, config, this._raydiumService.getRaydiumProgramId());
     /**
      * Get Raydium pool from public key
      * @param pool pubkey of the orca whirlpool
      */
-    getRaydiumPoolByAddress = (pool) => raydium_client_1.PoolState.fetch(this._connection, pool);
-    getMeteoraPoolByAddress = (pool) => accounts_2.LbPair.fetch(this._connection, pool);
+    getRaydiumPoolByAddress = (pool) => raydium_client_1.PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
+    getMeteoraPoolByAddress = (pool) => accounts_2.LbPair.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
     getEventAuthorityPDA = (dex) => {
         if (dex.toNumber() == (0, utils_1.dexToNumber)('ORCA') || dex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
             return this._kaminoProgramId;
         }
         if (dex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
-            const [key, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('__event_authority')], programId_4.METEORA_PROGRAM_ID);
+            const [key, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('__event_authority')], this._meteoraService.getMeteoraProgramId());
             return key;
         }
         throw new Error('Invalid dex');
@@ -1704,7 +1702,7 @@ class Kamino {
         //  add rewards vaults accounts to withdraw
         const isRaydium = strategyState.strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM');
         if (isRaydium) {
-            const raydiumPosition = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategyState.strategy.position);
+            const raydiumPosition = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategyState.strategy.position, this._raydiumService.getRaydiumProgramId());
             if (!raydiumPosition) {
                 throw new Error('Position is not found');
             }
@@ -1869,7 +1867,7 @@ class Kamino {
      */
     getAllDepositAccounts = async (strategy, owner) => {
         const strategyState = await this.getStrategyStateIfNotFetched(strategy);
-        const globalConfig = await accounts_1.GlobalConfig.fetch(this._connection, strategyState.strategy.globalConfig);
+        const globalConfig = await accounts_1.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()}`);
         }
@@ -2360,7 +2358,7 @@ class Kamino {
         let tokenAMint = web3_js_1.PublicKey.default;
         let tokenBMint = web3_js_1.PublicKey.default;
         if (dex == 'ORCA') {
-            const whirlpoolState = await whirlpools_client_1.Whirlpool.fetch(this._connection, pool);
+            const whirlpoolState = await whirlpools_client_1.Whirlpool.fetch(this._connection, pool, this._orcaService.getWhirlpoolProgramId());
             if (!whirlpoolState) {
                 throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
             }
@@ -2368,7 +2366,7 @@ class Kamino {
             tokenBMint = whirlpoolState.tokenMintB;
         }
         else if (dex == 'RAYDIUM') {
-            const raydiumPoolState = await raydium_client_1.PoolState.fetch(this._connection, pool);
+            const raydiumPoolState = await raydium_client_1.PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
             if (!raydiumPoolState) {
                 throw Error(`Could not fetch Raydium pool state with pubkey ${pool.toString()}`);
             }
@@ -2376,7 +2374,7 @@ class Kamino {
             tokenBMint = raydiumPoolState.tokenMint1;
         }
         else if (dex == 'METEORA') {
-            const meteoraPoolState = await accounts_2.LbPair.fetch(this._connection, pool);
+            const meteoraPoolState = await accounts_2.LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
             if (!meteoraPoolState) {
                 throw Error(`Could not fetch Meteora pool state with pubkey ${pool.toString()}`);
             }
@@ -2627,15 +2625,15 @@ class Kamino {
         const { address: strategyPubkey, strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
         const eventAuthority = this.getEventAuthorityPDA(strategyState.strategyDex);
         const { treasuryFeeTokenAVault, treasuryFeeTokenBVault, treasuryFeeVaultAuthority } = this.getTreasuryFeeVaultPDAs(strategyState.tokenAMint, strategyState.tokenBMint);
-        let programId = programId_2.PROGRAM_ID_CLI;
+        let programId = this._orcaService.getWhirlpoolProgramId();
         let poolRewardVault0 = web3_js_1.PublicKey.default;
         let poolRewardVault1 = web3_js_1.PublicKey.default;
         let poolRewardVault2 = web3_js_1.PublicKey.default;
         let rewardMint0 = web3_js_1.PublicKey.default;
         let rewardMint1 = web3_js_1.PublicKey.default;
         let rewardMint2 = web3_js_1.PublicKey.default;
-        if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('ORCA')) {
-            const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, strategyState.pool);
+        if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA')) {
+            const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, strategyState.pool, this._orcaService.getWhirlpoolProgramId());
             if (!whirlpool) {
                 throw Error(`Could not fetch whirlpool state with pubkey ${strategyState.pool.toString()}`);
             }
@@ -2646,9 +2644,9 @@ class Kamino {
             rewardMint1 = whirlpool.rewardInfos[1].mint;
             rewardMint2 = whirlpool.rewardInfos[2].mint;
         }
-        else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
-            programId = programId_3.PROGRAM_ID;
-            const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool);
+        else if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM')) {
+            programId = this._raydiumService.getRaydiumProgramId();
+            const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool, this._raydiumService.getRaydiumProgramId());
             if (!poolState) {
                 throw Error(`Could not fetch Raydium pool state with pubkey ${strategyState.pool.toString()}`);
             }
@@ -2660,8 +2658,8 @@ class Kamino {
             rewardMint2 = poolState.rewardInfos[2].tokenMint;
         }
         else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
-            programId = programId_4.METEORA_PROGRAM_ID;
-            const poolState = await accounts_2.LbPair.fetch(this._connection, strategyState.pool);
+            programId = this._meteoraService.getMeteoraProgramId();
+            const poolState = await accounts_2.LbPair.fetch(this._connection, strategyState.pool, this._meteoraService.getMeteoraProgramId());
             if (!poolState) {
                 throw Error(`Could not fetch Meteora pool state with pubkey ${strategyState.pool.toString()}`);
             }
@@ -2721,7 +2719,7 @@ class Kamino {
             }
         }
         if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
-            const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('pool_tick_array_bitmap_extension'), strategyState.pool.toBuffer()], programId_3.PROGRAM_ID);
+            const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('pool_tick_array_bitmap_extension'), strategyState.pool.toBuffer()], this._raydiumService.getRaydiumProgramId());
             ixn.keys.push({ pubkey: poolTickArrayBitmap, isSigner: false, isWritable: true });
         }
         return ixn;
@@ -2731,7 +2729,7 @@ class Kamino {
      * @param positionMint mint account of the position
      */
     getMetadataProgramAddressesOrca = (positionMint) => {
-        const [position, positionBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), positionMint.toBuffer()], programId_2.PROGRAM_ID_CLI);
+        const [position, positionBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), positionMint.toBuffer()], this._orcaService.getWhirlpoolProgramId());
         const [positionMetadata, positionMetadataBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('metadata'), constants_1.METADATA_PROGRAM_ID.toBuffer(), positionMint.toBuffer()], constants_1.METADATA_PROGRAM_ID);
         return {
             position,
@@ -2741,8 +2739,8 @@ class Kamino {
         };
     };
     getMetadataProgramAddressesRaydium = (positionMint, pool, tickLowerIndex, tickUpperIndex) => {
-        const { publicKey: protocolPosition, nonce: protocolPositionBump } = (0, raydium_sdk_1.getPdaProtocolPositionAddress)(programId_3.PROGRAM_ID, pool, tickLowerIndex, tickUpperIndex);
-        const [position, positionBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), positionMint.toBuffer()], programId_3.PROGRAM_ID);
+        const { publicKey: protocolPosition, nonce: protocolPositionBump } = (0, raydium_sdk_1.getPdaProtocolPositionAddress)(this._raydiumService.getRaydiumProgramId(), pool, tickLowerIndex, tickUpperIndex);
+        const [position, positionBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), positionMint.toBuffer()], this._raydiumService.getRaydiumProgramId());
         const [positionMetadata, positionMetadataBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('metadata'), constants_1.METADATA_PROGRAM_ID.toBuffer(), positionMint.toBuffer()], constants_1.METADATA_PROGRAM_ID);
         return {
             position,
@@ -2756,8 +2754,8 @@ class Kamino {
     getStartEndTicketIndexProgramAddressesOrca = (whirlpool, whirlpoolState, tickLowerIndex, tickUpperIndex) => {
         const startTickIndex = (0, whirlpool_sdk_1.getStartTickIndex)(tickLowerIndex, whirlpoolState.tickSpacing, 0);
         const endTickIndex = (0, whirlpool_sdk_1.getStartTickIndex)(tickUpperIndex, whirlpoolState.tickSpacing, 0);
-        const [lowerTickPubkey, lowerTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), whirlpool.toBuffer(), Buffer.from(startTickIndex.toString())], programId_2.PROGRAM_ID_CLI);
-        const [upperTickPubkey, upperTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), whirlpool.toBuffer(), Buffer.from(endTickIndex.toString())], programId_2.PROGRAM_ID_CLI);
+        const [lowerTickPubkey, lowerTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), whirlpool.toBuffer(), Buffer.from(startTickIndex.toString())], this._orcaService.getWhirlpoolProgramId());
+        const [upperTickPubkey, upperTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), whirlpool.toBuffer(), Buffer.from(endTickIndex.toString())], this._orcaService.getWhirlpoolProgramId());
         return {
             lowerTick: lowerTickPubkey,
             lowerTickBump,
@@ -2768,8 +2766,8 @@ class Kamino {
     getStartEndTicketIndexProgramAddressesRaydium = (pool, poolState, tickLowerIndex, tickUpperIndex) => {
         const startTickIndex = raydium_sdk_1.TickUtils.getTickArrayStartIndexByTick(tickLowerIndex, poolState.tickSpacing);
         const endTickIndex = raydium_sdk_1.TickUtils.getTickArrayStartIndexByTick(tickUpperIndex, poolState.tickSpacing);
-        const [lowerTickPubkey, lowerTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), pool.toBuffer(), (0, raydium_sdk_1.i32ToBytes)(startTickIndex)], programId_3.PROGRAM_ID);
-        const [upperTickPubkey, upperTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), pool.toBuffer(), (0, raydium_sdk_1.i32ToBytes)(endTickIndex)], programId_3.PROGRAM_ID);
+        const [lowerTickPubkey, lowerTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), pool.toBuffer(), (0, raydium_sdk_1.i32ToBytes)(startTickIndex)], this._raydiumService.getRaydiumProgramId());
+        const [upperTickPubkey, upperTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), pool.toBuffer(), (0, raydium_sdk_1.i32ToBytes)(endTickIndex)], this._raydiumService.getRaydiumProgramId());
         return {
             lowerTick: lowerTickPubkey,
             lowerTickBump,
@@ -2778,8 +2776,8 @@ class Kamino {
         };
     };
     readMeteoraPosition = async (poolPk, positionPk) => {
-        const pool = await accounts_2.LbPair.fetch(this._connection, poolPk);
-        const position = await accounts_2.PositionV2.fetch(this._connection, positionPk);
+        const pool = await accounts_2.LbPair.fetch(this._connection, poolPk, this._meteoraService.getMeteoraProgramId());
+        const position = await accounts_2.PositionV2.fetch(this._connection, positionPk, this._meteoraService.getMeteoraProgramId());
         if (!pool || !position) {
             return {
                 publicKey: positionPk,
@@ -2788,8 +2786,8 @@ class Kamino {
             };
         }
         const { lowerTick: lowerTickPk, upperTick: upperTickPk } = this.getStartEndTicketIndexProgramAddressesMeteora(poolPk, position.lowerBinId);
-        const lowerBinArray = await accounts_2.BinArray.fetch(this._connection, lowerTickPk);
-        const upperBinArray = await accounts_2.BinArray.fetch(this._connection, upperTickPk);
+        const lowerBinArray = await accounts_2.BinArray.fetch(this._connection, lowerTickPk, this._meteoraService.getMeteoraProgramId());
+        const upperBinArray = await accounts_2.BinArray.fetch(this._connection, upperTickPk, this._meteoraService.getMeteoraProgramId());
         if (!lowerBinArray || !upperBinArray) {
             return {
                 publicKey: positionPk,
@@ -2823,7 +2821,7 @@ class Kamino {
         };
     };
     getStartEndTicketIndexProgramAddressesMeteora = (pool, tickLowerIndex) => {
-        const meteoraProgramId = programId_4.METEORA_PROGRAM_ID;
+        const meteoraProgramId = this._meteoraService.getMeteoraProgramId();
         const lowerBinArrayIndex = (0, meteora_1.binIdToBinArrayIndex)(new bn_js_1.default(tickLowerIndex));
         const [lowerTick, lowerTickBump] = (0, meteora_1.deriveBinArray)(pool, lowerBinArrayIndex, meteoraProgramId);
         const upperBinArrayIndex = lowerBinArrayIndex.add(new bn_js_1.default(1));
@@ -2883,7 +2881,7 @@ class Kamino {
      * @param status strategy status
      */
     openPositionOrca = async (adminAuthority, strategy, baseVaultAuthority, pool, positionMint, priceLower, priceUpper, tokenAVault, tokenBVault, tokenAMint, tokenBMint, tokenATokenProgram, tokenBTokenProgram, oldPositionOrBaseVaultAuthority, oldPositionMintOrBaseVaultAuthority, oldPositionTokenAccountOrBaseVaultAuthority, oldTickArrayLowerOrBaseVaultAuthority, oldTickArrayUpperOrBaseVaultAuthority, eventAuthority, status = new StrategyStatus_1.Uninitialized()) => {
-        const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, pool);
+        const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, pool, this._orcaService.getWhirlpoolProgramId());
         if (!whirlpool) {
             throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
         }
@@ -2920,7 +2918,7 @@ class Kamino {
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
             associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-            poolProgram: programId_2.PROGRAM_ID_CLI,
+            poolProgram: this._orcaService.getWhirlpoolProgramId(),
             oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
             oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
             oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
@@ -2957,7 +2955,7 @@ class Kamino {
      * @param status strategy status
      */
     openPositionRaydium = async (adminAuthority, strategy, baseVaultAuthority, pool, positionMint, priceLower, priceUpper, tokenAVault, tokenBVault, tokenAMint, tokenBMint, tokenATokenProgram, tokenBTokenProgram, oldTickArrayLowerOrBaseVaultAuthority, oldTickArrayUpperOrBaseVaultAuthority, oldPositionOrBaseVaultAuthority, oldPositionMintOrBaseVaultAuthority, oldPositionTokenAccountOrBaseVaultAuthority, oldProtocolPositionOrBaseVaultAuthority, eventAuthority, status = new StrategyStatus_1.Uninitialized(), strategyRewardOVault, strategyReward1Vault, strategyReward2Vault) => {
-        const poolState = await raydium_client_1.PoolState.fetch(this._connection, pool);
+        const poolState = await raydium_client_1.PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
         if (!poolState) {
             throw Error(`Could not fetch Raydium pool state with pubkey ${pool.toString()}`);
         }
@@ -2994,7 +2992,7 @@ class Kamino {
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
             associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-            poolProgram: programId_3.PROGRAM_ID,
+            poolProgram: this._raydiumService.getRaydiumProgramId(),
             oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
             oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
             oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
@@ -3017,7 +3015,7 @@ class Kamino {
             tokenBTokenProgram: (0, utils_1.keyOrDefault)(tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
             memoProgram: pubkeys_1.MEMO_PROGRAM_ID,
         };
-        const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('pool_tick_array_bitmap_extension'), pool.toBuffer()], programId_3.PROGRAM_ID);
+        const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('pool_tick_array_bitmap_extension'), pool.toBuffer()], this._raydiumService.getRaydiumProgramId());
         const ix = (0, instructions_1.openLiquidityPosition)(args, accounts);
         ix.keys = ix.keys.concat([
             { pubkey: protocolPosition, isSigner: false, isWritable: true },
@@ -3059,7 +3057,7 @@ class Kamino {
      * @param status strategy status
      */
     openPositionMeteora = async (adminAuthority, strategy, baseVaultAuthority, pool, position, priceLower, priceUpper, tokenAVault, tokenBVault, tokenAMint, tokenBMint, tokenATokenProgram, tokenBTokenProgram, oldPositionOrBaseVaultAuthority, oldPositionMintOrBaseVaultAuthority, oldPositionTokenAccountOrBaseVaultAuthority, oldTickArrayLowerOrBaseVaultAuthority, oldTickArrayUpperOrBaseVaultAuthority, eventAuthority, status = new StrategyStatus_1.Uninitialized()) => {
-        const lbPair = await accounts_2.LbPair.fetch(this._connection, pool);
+        const lbPair = await accounts_2.LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
         if (!lbPair) {
             throw Error(`Could not fetch meteora lbpair state with pubkey ${pool.toString()}`);
         }
@@ -3096,7 +3094,7 @@ class Kamino {
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
             associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-            poolProgram: programId_2.PROGRAM_ID_CLI,
+            poolProgram: this._orcaService.getWhirlpoolProgramId(),
             oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
             oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
             oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
@@ -3429,7 +3427,7 @@ class Kamino {
         let tokenMintB;
         let tickSpacing;
         if (dex == 'ORCA') {
-            const whirlpoolState = await whirlpools_client_1.Whirlpool.fetch(this._connection, pool);
+            const whirlpoolState = await whirlpools_client_1.Whirlpool.fetch(this._connection, pool, this._orcaService.getWhirlpoolProgramId());
             if (!whirlpoolState) {
                 throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
             }
@@ -3438,7 +3436,7 @@ class Kamino {
             tickSpacing = whirlpoolState.tickSpacing;
         }
         else if (dex == 'RAYDIUM') {
-            const raydiumPoolState = await raydium_client_1.PoolState.fetch(this._connection, pool);
+            const raydiumPoolState = await raydium_client_1.PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
             if (!raydiumPoolState) {
                 throw Error(`Could not fetch Raydium pool state with pubkey ${pool.toString()}`);
             }
@@ -3447,7 +3445,7 @@ class Kamino {
             tickSpacing = raydiumPoolState.tickSpacing;
         }
         else if (dex == 'METEORA') {
-            const meteoraPoolState = await accounts_2.LbPair.fetch(this._connection, pool);
+            const meteoraPoolState = await accounts_2.LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
             if (!meteoraPoolState) {
                 throw Error(`Could not fetch Meteora pool state with pubkey ${pool.toString()}`);
             }
@@ -3576,21 +3574,21 @@ class Kamino {
     }
     async getPoolTickSpacing(dex, pool) {
         if (dex == 'ORCA') {
-            const whirlpoolState = await whirlpools_client_1.Whirlpool.fetch(this._connection, pool);
+            const whirlpoolState = await whirlpools_client_1.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 raydium_client_1.PoolState.fetch(this._connection, pool);
+            const raydiumPoolState = await raydium_client_1.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 accounts_2.LbPair.fetch(this._connection, pool);
+            const meteoraPoolState = await accounts_2.LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
             if (!meteoraPoolState) {
                 throw Error(`Could not fetch Meteora pool state with pubkey ${pool.toString()}`);
             }
@@ -3844,7 +3842,7 @@ class Kamino {
         return poolData.price;
     }
     async getRaydiumPoolPrice(pool) {
-        const poolState = await raydium_client_1.PoolState.fetch(this._connection, pool);
+        const poolState = await raydium_client_1.PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
         if (!poolState) {
             throw new Error(`Raydium poolState ${pool.toString()} is not found`);
         }
@@ -3852,7 +3850,7 @@ class Kamino {
         return price;
     }
     async getMeteoraPoolPrice(pool) {
-        const poolState = await accounts_2.LbPair.fetch(this._connection, pool);
+        const poolState = await accounts_2.LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
         if (!poolState) {
             throw new Error(`Meteora poolState ${pool.toString()} is not found`);
         }
@@ -4373,7 +4371,7 @@ class Kamino {
     calculateAmountsDistributionWithPriceRange = async (dex, pool, lowerPrice, upperPrice) => {
         const tokenAAmountToDeposit = new decimal_js_1.default(100.0);
         if (dex == 'RAYDIUM') {
-            const poolState = await raydium_client_1.PoolState.fetch(this._connection, pool);
+            const poolState = await raydium_client_1.PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
             if (!poolState) {
                 throw new Error(`Raydium poolState ${pool.toString()} is not found`);
             }
@@ -4385,7 +4383,7 @@ class Kamino {
             return [(0, utils_1.lamportsToNumberDecimal)(amountADecimal, decimalsA), (0, utils_1.lamportsToNumberDecimal)(amountBDecimal, decimalsB)];
         }
         else if (dex == 'ORCA') {
-            const whirlpoolState = await whirlpools_client_1.Whirlpool.fetch(this._connection, pool);
+            const whirlpoolState = await whirlpools_client_1.Whirlpool.fetch(this._connection, pool, this._orcaService.getWhirlpoolProgramId());
             if (!whirlpoolState) {
                 throw new Error(`Raydium poolState ${pool.toString()} is not found`);
             }
@@ -4413,7 +4411,7 @@ class Kamino {
             ];
         }
         else if (dex == 'METEORA') {
-            const poolState = await accounts_2.LbPair.fetch(this._connection, pool);
+            const poolState = await accounts_2.LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
             if (!poolState) {
                 throw new Error(`Meteora poolState ${pool.toString()} is not found`);
             }
@@ -4501,7 +4499,7 @@ class Kamino {
         const isRaydium = (0, utils_1.dexToNumber)('RAYDIUM') === dex;
         const isMeteora = (0, utils_1.dexToNumber)('METEORA') === dex;
         if (isOrca) {
-            const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, strategyState.pool);
+            const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, strategyState.pool, this._orcaService.getWhirlpoolProgramId());
             if (!whirlpool) {
                 throw new Error(`Unable to get Orca whirlpool for pubkey ${strategyState.pool}`);
             }
@@ -4529,7 +4527,7 @@ class Kamino {
             return [new decimal_js_1.default(0), new decimal_js_1.default(0)];
         }
         // Given A in ATA, calc how much A and B
-        const accessor = new orca_dal_1.OrcaDAL(whirlpoolConfig, programId_2.PROGRAM_ID_CLI, this._connection);
+        const accessor = new orca_dal_1.OrcaDAL(whirlpoolConfig, this._orcaService.getWhirlpoolProgramId(), this._connection);
         const orcaPosition = new orca_position_1.OrcaPosition(accessor);
         const defaultSlippagePercentage = whirlpool_sdk_1.Percentage.fromFraction(1, 1000); // 0.1%
         const primaryTokenAmount = tokenAAmount || tokenBAmount;
@@ -4569,8 +4567,8 @@ class Kamino {
         if (!tokenAAmount && !tokenBAmount) {
             return [new decimal_js_1.default(0), new decimal_js_1.default(0)];
         }
-        const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool);
-        const position = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategyState.position);
+        const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool, this._raydiumService.getRaydiumProgramId());
+        const position = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategyState.position, this._raydiumService.getRaydiumProgramId());
         if (!position) {
             throw new Error(`position ${strategyState.position.toString()} is not found`);
         }
@@ -4606,7 +4604,7 @@ class Kamino {
         if (!tokenAAmount && !tokenBAmount) {
             return [new decimal_js_1.default(0), new decimal_js_1.default(0)];
         }
-        const poolState = await accounts_2.LbPair.fetch(this._connection, strategyState.pool);
+        const poolState = await accounts_2.LbPair.fetch(this._connection, strategyState.pool, this._meteoraService.getMeteoraProgramId());
         if (!poolState) {
             throw new Error(`poolState ${strategyState.pool.toString()} is not found`);
         }
@@ -4617,8 +4615,8 @@ class Kamino {
         }
         else {
             const binArrayIndex = (0, meteora_1.binIdToBinArrayIndex)(new bn_js_1.default(poolState.activeId));
-            const [binArrayPk] = (0, meteora_1.deriveBinArray)(strategyState.pool, binArrayIndex, programId_4.METEORA_PROGRAM_ID);
-            const binArray = await accounts_2.BinArray.fetch(this._connection, binArrayPk);
+            const [binArrayPk] = (0, meteora_1.deriveBinArray)(strategyState.pool, binArrayIndex, this._meteoraService.getMeteoraProgramId());
+            const binArray = await accounts_2.BinArray.fetch(this._connection, binArrayPk, this._meteoraService.getMeteoraProgramId());
             if (!binArray) {
                 throw new Error(`bin array ${binArrayPk.toString()} is not found`);
             }
@@ -4731,11 +4729,11 @@ class Kamino {
     }
     async getDepositRatioFromAOrca(strategy, amountA) {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, strategyState.pool);
+        const whirlpool = await whirlpools_client_1.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 whirlpools_client_1.Position.fetch(this._connection, strategyState.position);
+        const position = await whirlpools_client_1.Position.fetch(this._connection, strategyState.position, this._orcaService.getWhirlpoolProgramId());
         if (!position) {
             throw new Error(`Whirlpool position ${strategyState.position} does not exist`);
         }
@@ -4755,8 +4753,8 @@ class Kamino {
     }
     async getDepositRatioFromAMeteora(strategy) {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const poolStatePromise = accounts_2.LbPair.fetch(this._connection, strategyState.pool);
-        const positionPromise = accounts_2.PositionV2.fetch(this._connection, strategyState.position);
+        const poolStatePromise = accounts_2.LbPair.fetch(this._connection, strategyState.pool, this._meteoraService.getMeteoraProgramId());
+        const positionPromise = accounts_2.PositionV2.fetch(this._connection, strategyState.position, this._meteoraService.getMeteoraProgramId());
         const [poolState, _position] = await Promise.all([poolStatePromise, positionPromise]);
         if (!poolState) {
             throw Error(`Could not fetch lb pair state with pubkey ${strategyState.pool.toString()}`);
@@ -4765,9 +4763,10 @@ class Kamino {
     }
     async getDepositRatioFromBMeteora(strategy) {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const poolStatePromise = await accounts_2.LbPair.fetch(this._connection, strategyState.pool);
-        const positionPromise = await accounts_2.PositionV2.fetch(this._connection, strategyState.position);
-        const [poolState, _position] = await Promise.all([poolStatePromise, positionPromise]);
+        const [poolState, _position] = await Promise.all([
+            accounts_2.LbPair.fetch(this._connection, strategyState.pool, this._meteoraService.getMeteoraProgramId()),
+            accounts_2.PositionV2.fetch(this._connection, strategyState.position, this._meteoraService.getMeteoraProgramId()),
+        ]);
         if (!poolState) {
             throw Error(`Could not fetch lb pair state with pubkey ${strategyState.pool.toString()}`);
         }
@@ -4775,11 +4774,11 @@ class Kamino {
     }
     getDepositRatioFromBOrca = async (strategy, amountB) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, strategyState.pool);
+        const whirlpool = await whirlpools_client_1.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 whirlpools_client_1.Position.fetch(this._connection, strategyState.position);
+        const position = await whirlpools_client_1.Position.fetch(this._connection, strategyState.position, this._orcaService.getWhirlpoolProgramId());
         if (!position) {
             throw new Error(`Whirlpool position ${strategyState.position} does not exist`);
         }
@@ -4799,8 +4798,8 @@ class Kamino {
     };
     getDepositRatioFromARaydium = async (strategy, amountA) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool);
-        const positionState = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategyState.position);
+        const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool, this._raydiumService.getRaydiumProgramId());
+        const positionState = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategyState.position, this._raydiumService.getRaydiumProgramId());
         if (!positionState) {
             throw new Error(`Raydium position ${strategyState.position.toString()} could not be found.`);
         }
@@ -4815,8 +4814,8 @@ class Kamino {
     };
     getDepositRatioFromBRaydium = async (strategy, amountB) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool);
-        const positionState = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategyState.position);
+        const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool, this._raydiumService.getRaydiumProgramId());
+        const positionState = await raydium_client_1.PersonalPositionState.fetch(this._connection, strategyState.position, this._raydiumService.getRaydiumProgramId());
         if (!positionState) {
             throw new Error(`Raydium position ${strategyState.position.toString()} could not be found.`);
         }
@@ -4887,7 +4886,7 @@ class Kamino {
         const collateralInfos = await this.getCollateralInfo(globalConfig.tokenInfos);
         const result = [];
         if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('ORCA')) {
-            const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, strategyState.pool);
+            const whirlpool = await whirlpools_client_1.Whirlpool.fetch(this._connection, strategyState.pool, this._orcaService.getWhirlpoolProgramId());
             if (!whirlpool) {
                 throw Error(`Could not fetch whirlpool state with pubkey ${strategyState.pool.toString()}`);
             }
@@ -4923,7 +4922,7 @@ class Kamino {
             return result;
         }
         else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
-            const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool);
+            const poolState = await raydium_client_1.PoolState.fetch(this._connection, strategyState.pool, this._raydiumService.getRaydiumProgramId());
             if (!poolState) {
                 throw new Error(`Could not fetch whirlpool state with pubkey ${strategyState.pool.toString()}`);
             }
@@ -4959,7 +4958,7 @@ class Kamino {
             return result;
         }
         else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
-            const poolState = await accounts_2.LbPair.fetch(this._connection, strategyState.pool);
+            const poolState = await accounts_2.LbPair.fetch(this._connection, strategyState.pool, this._meteoraService.getMeteoraProgramId());
             if (!poolState) {
                 throw new Error(`Could not fetch meteora state with pubkey ${strategyState.pool.toString()}`);
             }
@@ -5011,8 +5010,8 @@ class Kamino {
         const decimalsB = await (0, utils_1.getMintDecimals)(this._connection, whilrpoolState.tokenMintB);
         const tickIndex = (0, whirlpool_sdk_1.getNextValidTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(price, decimalsA, decimalsB), whilrpoolState.tickSpacing);
         const startTickIndex = (0, whirlpool_sdk_1.getStartTickIndex)(tickIndex, whilrpoolState.tickSpacing);
-        const [startTickIndexPk, _startTickIndexBump] = (0, utils_1.getTickArray)(programId_2.PROGRAM_ID_CLI, poolAddress, startTickIndex);
-        const tick = await whirlpools_client_1.TickArray.fetch(this._connection, startTickIndexPk);
+        const [startTickIndexPk, _startTickIndexBump] = (0, utils_1.getTickArray)(this._orcaService.getWhirlpoolProgramId(), poolAddress, startTickIndex);
+        const tick = await whirlpools_client_1.TickArray.fetch(this._connection, startTickIndexPk, this._orcaService.getWhirlpoolProgramId());
         // initialize tick if it doesn't exist
         if (!tick) {
             const initTickArrayArgs = {
@@ -5040,8 +5039,8 @@ class Kamino {
         const decimalsB = await (0, utils_1.getMintDecimals)(this._connection, poolState.tokenYMint);
         const binArray = (0, meteora_1.getBinIdFromPriceWithDecimals)(price, poolState.binStep, true, decimalsA, decimalsB);
         const binArrayIndex = (0, meteora_1.binIdToBinArrayIndex)(new bn_js_1.default(binArray));
-        const [startTickIndexPk, _startTickIndexBump] = (0, meteora_1.deriveBinArray)(poolAddress, binArrayIndex, programId_4.METEORA_PROGRAM_ID);
-        const tick = await whirlpools_client_1.TickArray.fetch(this._connection, startTickIndexPk);
+        const [startTickIndexPk, _startTickIndexBump] = (0, meteora_1.deriveBinArray)(poolAddress, binArrayIndex, this._meteoraService.getMeteoraProgramId());
+        const tick = await whirlpools_client_1.TickArray.fetch(this._connection, startTickIndexPk, this._meteoraService.getMeteoraProgramId());
         // initialize tick if it doesn't exist
         if (!tick) {
             const initTickArrayArgs = {