@kamino-finance/kliquidity-sdk 8.1.0 → 8.1.3

package/dist/Kamino.js

@@ -3,65 +3,70 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Kamino = void 0;
+exports.Kamino = exports.KAMINO_IDL = void 0;
 const hubble_config_1 = require("@hubbleprotocol/hubble-config");
-const kit_1 = require("@solana/kit");
+const web3_js_1 = require("@solana/web3.js");
 const bs58_1 = __importDefault(require("bs58"));
-const accounts_1 = require("./@codegen/kliquidity/accounts");
+const programId_1 = require("./kamino-client/programId");
+const accounts_1 = require("./kamino-client/accounts");
 const decimal_js_1 = __importDefault(require("decimal.js"));
-const instructions_1 = require("./@codegen/whirlpools/instructions");
-const accounts_2 = require("./@codegen/whirlpools/accounts");
+const whirlpools_client_1 = require("./whirlpools-client");
 const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
 const orca_dal_1 = require("@orca-so/whirlpool-sdk/dist/dal/orca-dal");
 const orca_position_1 = require("@orca-so/whirlpool-sdk/dist/position/orca-position");
 const models_1 = require("./models");
+const programId_2 = require("./whirlpools-client/programId");
 const scope_sdk_1 = require("@kamino-finance/scope-sdk");
 const utils_1 = require("./utils");
-const instructions_2 = require("./@codegen/kliquidity/instructions");
+const spl_token_1 = require("@solana/spl-token");
+const instructions_1 = require("./kamino-client/instructions");
 const bn_js_1 = __importDefault(require("bn.js"));
-const StrategyStatus_1 = require("./@codegen/kliquidity/types/StrategyStatus");
+const anchor_1 = require("@coral-xyz/anchor");
+const StrategyStatus_1 = require("./kamino-client/types/StrategyStatus");
 const constants_1 = require("./constants");
-const types_1 = require("./@codegen/kliquidity/types");
-const accounts_3 = require("./@codegen/raydium/accounts");
+const types_1 = require("./kamino-client/types");
+const raydium_client_1 = require("./raydium_client");
+const programId_3 = require("./raydium_client/programId");
+const idl_json_1 = __importDefault(require("./kamino-client/idl.json"));
 const services_1 = require("./services");
 const add_liquidity_1 = require("@orca-so/whirlpool-sdk/dist/position/quotes/add-liquidity");
-const StrategyConfigOption_1 = require("./@codegen/kliquidity/types/StrategyConfigOption");
+const instructions_2 = require("./kamino-client/instructions");
+const StrategyConfigOption_1 = require("./kamino-client/types/StrategyConfigOption");
 const DefaultStrategyConfig_1 = require("./constants/DefaultStrategyConfig");
 const pubkeys_1 = require("./constants/pubkeys");
 const CreationParameters_1 = require("./utils/CreationParameters");
 const deposit_method_1 = require("./constants/deposit_method");
 const JupService_1 = require("./services/JupService");
 const PoolSimulationService_1 = require("./services/PoolSimulationService");
-const RebalanceType_1 = require("./@codegen/kliquidity/types/RebalanceType");
+const RebalanceType_1 = require("./kamino-client/types/RebalanceType");
 const transactions_1 = require("./utils/transactions");
 const rebalance_methods_1 = require("./rebalance_methods");
+const rebalance_methods_2 = require("./rebalance_methods");
+const rebalance_methods_3 = require("./rebalance_methods");
+const rebalance_methods_4 = require("./rebalance_methods");
+const rebalance_methods_5 = require("./rebalance_methods");
 const priceReferenceTypes_1 = require("./utils/priceReferenceTypes");
 const utils_2 = require("./rebalance_methods/utils");
 const consts_1 = require("./rebalance_methods/consts");
 const autodriftRebalance_1 = require("./rebalance_methods/autodriftRebalance");
-const whirlpools_1 = require("./utils/whirlpools");
+const remove_liquidity_1 = require("./whirlpools-client/shim/remove-liquidity");
+const programId_4 = require("./meteora_client/programId");
 const MeteoraService_1 = require("./services/MeteoraService");
 const meteora_1 = require("./utils/meteora");
-const accounts_4 = require("./@codegen/meteora/accounts");
-const instructions_3 = require("./@codegen/meteora/instructions");
+const accounts_2 = require("./meteora_client/accounts");
+const instructions_3 = require("./meteora_client/instructions");
+const pubkey_1 = require("./utils/pubkey");
 const lib_1 = require("@raydium-io/raydium-sdk-v2/lib");
-const token_2022_1 = require("@solana-program/token-2022");
-const token_1 = require("@solana-program/token");
-const system_1 = require("@solana-program/system");
-const sysvars_1 = require("@solana/sysvars");
-const compat_1 = require("@solana/compat");
-const address_lookup_table_1 = require("@solana-program/address-lookup-table");
-const lookupTable_1 = require("./utils/lookupTable");
-const compat_2 = require("./utils/compat");
-const addressEncoder = (0, kit_1.getAddressEncoder)();
+exports.KAMINO_IDL = idl_json_1.default;
 class Kamino {
     _cluster;
-    _rpc;
-    _legacyConnection;
+    _connection;
     _config;
     _globalConfig;
     _scope;
-    _kliquidityProgramId;
+    _provider;
+    _kaminoProgram;
+    _kaminoProgramId;
     _orcaService;
     _raydiumService;
     _meteoraService;
@@ -69,45 +74,56 @@ class Kamino {
     /**
      * Create a new instance of the Kamino SDK class.
      * @param cluster Name of the Solana cluster
-     * @param rpc Connection to the Solana cluster
-     * @param legacyConnection Connection to the Solana cluster
+     * @param connection Connection to the Solana cluster
      * @param globalConfig override kamino global config
      * @param programId override kamino program id
      * @param whirlpoolProgramId override whirlpool program id
      * @param raydiumProgramId override raydium program id
-     * @param meteoraProgramId
-     * @param jupBaseAPI
      */
-    constructor(cluster, rpc, legacyConnection, globalConfig, programId, whirlpoolProgramId, raydiumProgramId, meteoraProgramId, jupBaseAPI) {
+    constructor(cluster, connection, globalConfig, programId, whirlpoolProgramId, raydiumProgramId, meteoraProgramId, jupBaseAPI) {
         this._cluster = cluster;
-        this._rpc = rpc;
-        this._legacyConnection = legacyConnection;
+        this._connection = connection;
         this._config = (0, hubble_config_1.getConfigByCluster)(cluster);
-        if (programId && programId === pubkeys_1.STAGING_KAMINO_PROGRAM_ID) {
-            this._kliquidityProgramId = programId;
+        this._provider = new anchor_1.AnchorProvider(connection, (0, utils_1.getReadOnlyWallet)(), {
+            commitment: connection.commitment,
+        });
+        if (programId && programId.equals(pubkeys_1.STAGING_KAMINO_PROGRAM_ID)) {
+            this._kaminoProgramId = programId;
             this._globalConfig = pubkeys_1.STAGING_GLOBAL_CONFIG;
         }
         else {
-            this._kliquidityProgramId = programId ? programId : (0, compat_1.fromLegacyPublicKey)(this._config.kamino.programId);
-            this._globalConfig = globalConfig ? globalConfig : (0, compat_1.fromLegacyPublicKey)(this._config.kamino.globalConfig);
+            this._kaminoProgramId = programId ? programId : this._config.kamino.programId;
+            this._globalConfig = globalConfig ? globalConfig : new web3_js_1.PublicKey(this._config.kamino.globalConfig);
+        }
+        this._kaminoProgram = new anchor_1.Program(exports.KAMINO_IDL, this._kaminoProgramId, this._provider);
+        this._scope = new scope_sdk_1.Scope(cluster, connection);
+        (0, programId_1.setKaminoProgramId)(this._kaminoProgramId);
+        if (whirlpoolProgramId) {
+            (0, programId_2.setWhirlpoolsProgramId)(whirlpoolProgramId);
+        }
+        if (raydiumProgramId) {
+            (0, programId_3.setRaydiumProgramId)(raydiumProgramId);
         }
-        this._scope = new scope_sdk_1.Scope(cluster, rpc);
-        this._orcaService = new services_1.OrcaService(rpc, legacyConnection, cluster, whirlpoolProgramId);
-        this._raydiumService = new services_1.RaydiumService(rpc, legacyConnection, raydiumProgramId);
-        this._meteoraService = new MeteoraService_1.MeteoraService(rpc, meteoraProgramId);
+        if (meteoraProgramId) {
+            (0, programId_4.setMeteoraProgramId)(meteoraProgramId);
+        }
+        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);
         if (jupBaseAPI) {
             this._jupBaseAPI = jupBaseAPI;
         }
     }
-    getConnection = () => this._rpc;
-    getProgramID = () => this._kliquidityProgramId;
+    getConnection = () => this._connection;
+    getProgramID = () => this._kaminoProgramId;
+    getProgram = () => this._kaminoProgram;
     setGlobalConfig = (globalConfig) => {
         this._globalConfig = globalConfig;
     };
     getGlobalConfig = () => this._globalConfig;
     getDepositableTokens = async () => {
         const collateralInfos = await this.getCollateralInfos();
-        return collateralInfos.filter((x) => x.mint !== pubkeys_1.DEFAULT_PUBLIC_KEY);
+        return collateralInfos.filter((x) => !x.mint.equals(web3_js_1.SystemProgram.programId));
     };
     getCollateralInfos = async () => {
         const config = await this.getGlobalConfigState(this._globalConfig);
@@ -118,19 +134,19 @@ class Kamino {
     };
     getDisabledTokensPrices = async (collateralInfos) => {
         const collInfos = collateralInfos ? collateralInfos : await this.getCollateralInfos();
-        const disabledTokens = collInfos.filter((x) => x.disabled && x.mint !== pubkeys_1.DEFAULT_PUBLIC_KEY);
+        const disabledTokens = collInfos.filter((x) => x.disabled && !x.mint.equals(web3_js_1.PublicKey.default));
         return JupService_1.JupService.getDollarPrices(disabledTokens.map((x) => x.mint), this._jupBaseAPI);
     };
     getSupportedDexes = () => ['ORCA', 'RAYDIUM', 'METEORA'];
     // todo: see if we can read this dynamically
     getFeeTiersForDex = (dex) => {
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             return [new decimal_js_1.default(0.0001), new decimal_js_1.default(0.0005), new decimal_js_1.default(0.003), new decimal_js_1.default(0.01)];
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             return [new decimal_js_1.default(0.0001), new decimal_js_1.default(0.0005), new decimal_js_1.default(0.0025), new decimal_js_1.default(0.01)];
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             return [new decimal_js_1.default(0.0001), new decimal_js_1.default(0.0005), new decimal_js_1.default(0.0025), new decimal_js_1.default(0.01)];
         }
         else {
@@ -214,13 +230,13 @@ class Kamino {
     getFieldsForManualRebalanceMethod = async (dex, fieldOverrides, tokenAMint, tokenBMint, poolPrice) => {
         const price = poolPrice ? poolPrice : new decimal_js_1.default(await this.getPriceForPair(dex, tokenAMint, tokenBMint));
         const defaultFields = (0, rebalance_methods_1.getDefaultManualRebalanceFieldInfos)(price);
-        let lowerPrice = defaultFields.find((x) => x.label === 'rangePriceLower').value;
-        const lowerPriceInput = fieldOverrides.find((x) => x.label === 'rangePriceLower');
+        let lowerPrice = defaultFields.find((x) => x.label == 'rangePriceLower').value;
+        const lowerPriceInput = fieldOverrides.find((x) => x.label == 'rangePriceLower');
         if (lowerPriceInput) {
             lowerPrice = lowerPriceInput.value;
         }
-        let upperPrice = defaultFields.find((x) => x.label === 'rangePriceUpper').value;
-        const upperPriceInput = fieldOverrides.find((x) => x.label === 'rangePriceUpper');
+        let upperPrice = defaultFields.find((x) => x.label == 'rangePriceUpper').value;
+        const upperPriceInput = fieldOverrides.find((x) => x.label == 'rangePriceUpper');
         if (upperPriceInput) {
             upperPrice = upperPriceInput.value;
         }
@@ -228,196 +244,196 @@ class Kamino {
     };
     getFieldsForPricePercentageMethod = async (dex, fieldOverrides, tokenAMint, tokenBMint, poolPrice) => {
         const price = poolPrice ? poolPrice : new decimal_js_1.default(await this.getPriceForPair(dex, tokenAMint, tokenBMint));
-        const defaultFields = (0, rebalance_methods_1.getDefaultPricePercentageRebalanceFieldInfos)(price);
-        let lowerPriceDifferenceBPS = defaultFields.find((x) => x.label === 'lowerRangeBps').value;
-        const lowerPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'lowerRangeBps');
+        const defaultFields = (0, rebalance_methods_2.getDefaultPricePercentageRebalanceFieldInfos)(price);
+        let lowerPriceDifferenceBPS = defaultFields.find((x) => x.label == 'lowerRangeBps').value;
+        const lowerPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'lowerRangeBps');
         if (lowerPriceDifferenceBPSInput) {
             lowerPriceDifferenceBPS = lowerPriceDifferenceBPSInput.value;
         }
-        let upperPriceDifferenceBPS = defaultFields.find((x) => x.label === 'upperRangeBps').value;
-        const upperPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'upperRangeBps');
+        let upperPriceDifferenceBPS = defaultFields.find((x) => x.label == 'upperRangeBps').value;
+        const upperPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'upperRangeBps');
         if (upperPriceDifferenceBPSInput) {
             upperPriceDifferenceBPS = upperPriceDifferenceBPSInput.value;
         }
-        return (0, rebalance_methods_1.getPricePercentageRebalanceFieldInfos)(price, new decimal_js_1.default(lowerPriceDifferenceBPS), new decimal_js_1.default(upperPriceDifferenceBPS));
+        return (0, rebalance_methods_2.getPricePercentageRebalanceFieldInfos)(price, new decimal_js_1.default(lowerPriceDifferenceBPS), new decimal_js_1.default(upperPriceDifferenceBPS));
     };
     getFieldsForPricePercentageWithResetMethod = async (dex, fieldOverrides, tokenAMint, tokenBMint, poolPrice) => {
         const price = poolPrice ? poolPrice : new decimal_js_1.default(await this.getPriceForPair(dex, tokenAMint, tokenBMint));
-        const defaultFields = (0, rebalance_methods_1.getDefaultPricePercentageWithResetRebalanceFieldInfos)(price);
-        let lowerPriceDifferenceBPS = defaultFields.find((x) => x.label === 'lowerRangeBps').value;
-        const lowerPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'lowerRangeBps');
+        const defaultFields = (0, rebalance_methods_3.getDefaultPricePercentageWithResetRebalanceFieldInfos)(price);
+        let lowerPriceDifferenceBPS = defaultFields.find((x) => x.label == 'lowerRangeBps').value;
+        const lowerPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'lowerRangeBps');
         if (lowerPriceDifferenceBPSInput) {
             lowerPriceDifferenceBPS = lowerPriceDifferenceBPSInput.value;
         }
-        let upperPriceDifferenceBPS = defaultFields.find((x) => x.label === 'upperRangeBps').value;
-        const upperPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'upperRangeBps');
+        let upperPriceDifferenceBPS = defaultFields.find((x) => x.label == 'upperRangeBps').value;
+        const upperPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'upperRangeBps');
         if (upperPriceDifferenceBPSInput) {
             upperPriceDifferenceBPS = upperPriceDifferenceBPSInput.value;
         }
-        let lowerResetPriceDifferenceBPS = defaultFields.find((x) => x.label === 'resetLowerRangeBps').value;
-        const lowerResetPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'resetLowerRangeBps');
+        let lowerResetPriceDifferenceBPS = defaultFields.find((x) => x.label == 'resetLowerRangeBps').value;
+        const lowerResetPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'resetLowerRangeBps');
         if (lowerResetPriceDifferenceBPSInput) {
             lowerResetPriceDifferenceBPS = lowerResetPriceDifferenceBPSInput.value;
         }
-        let upperResetPriceDifferenceBPS = defaultFields.find((x) => x.label === 'resetUpperRangeBps').value;
-        const upperResetPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'resetUpperRangeBps');
+        let upperResetPriceDifferenceBPS = defaultFields.find((x) => x.label == 'resetUpperRangeBps').value;
+        const upperResetPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'resetUpperRangeBps');
         if (upperResetPriceDifferenceBPSInput) {
             upperResetPriceDifferenceBPS = upperResetPriceDifferenceBPSInput.value;
         }
-        return (0, rebalance_methods_1.getPricePercentageWithResetRebalanceFieldInfos)(price, new decimal_js_1.default(lowerPriceDifferenceBPS), new decimal_js_1.default(upperPriceDifferenceBPS), new decimal_js_1.default(lowerResetPriceDifferenceBPS), new decimal_js_1.default(upperResetPriceDifferenceBPS));
+        return (0, rebalance_methods_3.getPricePercentageWithResetRebalanceFieldInfos)(price, new decimal_js_1.default(lowerPriceDifferenceBPS), new decimal_js_1.default(upperPriceDifferenceBPS), new decimal_js_1.default(lowerResetPriceDifferenceBPS), new decimal_js_1.default(upperResetPriceDifferenceBPS));
     };
     getFieldsForDriftRebalanceMethod = async (dex, fieldOverrides, tickSpacing, tokenAMint, tokenBMint, poolPrice) => {
-        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, tokenAMint);
-        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, tokenBMint);
+        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, tokenAMint);
+        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, tokenBMint);
         const price = poolPrice ? poolPrice : new decimal_js_1.default(await this.getPriceForPair(dex, tokenAMint, tokenBMint));
-        const defaultFields = (0, rebalance_methods_1.getDefaultDriftRebalanceFieldInfos)(dex, tickSpacing, price, tokenADecimals, tokenBDecimals);
-        let startMidTick = defaultFields.find((x) => x.label === 'startMidTick').value;
-        const startMidTickInput = fieldOverrides.find((x) => x.label === 'startMidTick');
+        const defaultFields = (0, rebalance_methods_4.getDefaultDriftRebalanceFieldInfos)(dex, tickSpacing, price, tokenADecimals, tokenBDecimals);
+        let startMidTick = defaultFields.find((x) => x.label == 'startMidTick').value;
+        const startMidTickInput = fieldOverrides.find((x) => x.label == 'startMidTick');
         if (startMidTickInput) {
             startMidTick = startMidTickInput.value;
         }
-        let ticksBelowMid = defaultFields.find((x) => x.label === 'ticksBelowMid').value;
-        const ticksBelowMidInput = fieldOverrides.find((x) => x.label === 'ticksBelowMid');
+        let ticksBelowMid = defaultFields.find((x) => x.label == 'ticksBelowMid').value;
+        const ticksBelowMidInput = fieldOverrides.find((x) => x.label == 'ticksBelowMid');
         if (ticksBelowMidInput) {
             ticksBelowMid = ticksBelowMidInput.value;
         }
-        let ticksAboveMid = defaultFields.find((x) => x.label === 'ticksAboveMid').value;
-        const ticksAboveMidInput = fieldOverrides.find((x) => x.label === 'ticksAboveMid');
+        let ticksAboveMid = defaultFields.find((x) => x.label == 'ticksAboveMid').value;
+        const ticksAboveMidInput = fieldOverrides.find((x) => x.label == 'ticksAboveMid');
         if (ticksAboveMidInput) {
             ticksAboveMid = ticksAboveMidInput.value;
         }
-        let secondsPerTick = defaultFields.find((x) => x.label === 'secondsPerTick').value;
-        const secondsPerTickInput = fieldOverrides.find((x) => x.label === 'secondsPerTick');
+        let secondsPerTick = defaultFields.find((x) => x.label == 'secondsPerTick').value;
+        const secondsPerTickInput = fieldOverrides.find((x) => x.label == 'secondsPerTick');
         if (secondsPerTickInput) {
             secondsPerTick = secondsPerTickInput.value;
         }
-        let direction = defaultFields.find((x) => x.label === 'direction').value;
-        const directionInput = fieldOverrides.find((x) => x.label === 'direction');
+        let direction = defaultFields.find((x) => x.label == 'direction').value;
+        const directionInput = fieldOverrides.find((x) => x.label == 'direction');
         if (directionInput) {
             direction = directionInput.value;
         }
-        const fieldInfos = (0, rebalance_methods_1.getDriftRebalanceFieldInfos)(dex, tokenADecimals, tokenBDecimals, tickSpacing, new decimal_js_1.default(startMidTick), new decimal_js_1.default(ticksBelowMid), new decimal_js_1.default(ticksAboveMid), new decimal_js_1.default(secondsPerTick), new decimal_js_1.default(direction));
+        const fieldInfos = (0, rebalance_methods_4.getDriftRebalanceFieldInfos)(dex, tokenADecimals, tokenBDecimals, tickSpacing, new decimal_js_1.default(startMidTick), new decimal_js_1.default(ticksBelowMid), new decimal_js_1.default(ticksAboveMid), new decimal_js_1.default(secondsPerTick), new decimal_js_1.default(direction));
         return fieldInfos;
     };
     getFieldsForTakeProfitRebalanceMethod = async (dex, fieldOverrides, tokenAMint, tokenBMint, poolPrice) => {
         const price = poolPrice ? poolPrice : new decimal_js_1.default(await this.getPriceForPair(dex, tokenAMint, tokenBMint));
-        const defaultFields = (0, rebalance_methods_1.getDefaultTakeProfitRebalanceFieldsInfos)(price);
-        let lowerRangePrice = defaultFields.find((x) => x.label === 'rangePriceLower').value;
-        const lowerRangePriceInput = fieldOverrides.find((x) => x.label === 'rangePriceLower');
+        const defaultFields = (0, rebalance_methods_5.getDefaultTakeProfitRebalanceFieldsInfos)(price);
+        let lowerRangePrice = defaultFields.find((x) => x.label == 'rangePriceLower').value;
+        const lowerRangePriceInput = fieldOverrides.find((x) => x.label == 'rangePriceLower');
         if (lowerRangePriceInput) {
             lowerRangePrice = lowerRangePriceInput.value;
         }
-        let upperRangePrice = defaultFields.find((x) => x.label === 'rangePriceUpper').value;
-        const upperRangePriceInput = fieldOverrides.find((x) => x.label === 'rangePriceUpper');
+        let upperRangePrice = defaultFields.find((x) => x.label == 'rangePriceUpper').value;
+        const upperRangePriceInput = fieldOverrides.find((x) => x.label == 'rangePriceUpper');
         if (upperRangePriceInput) {
             upperRangePrice = upperRangePriceInput.value;
         }
-        let destinationToken = defaultFields.find((x) => x.label === 'destinationToken').value;
-        const destinationTokenInput = fieldOverrides.find((x) => x.label === 'destinationToken');
+        let destinationToken = defaultFields.find((x) => x.label == 'destinationToken').value;
+        const destinationTokenInput = fieldOverrides.find((x) => x.label == 'destinationToken');
         if (destinationTokenInput) {
             destinationToken = destinationTokenInput.value;
         }
-        return (0, rebalance_methods_1.getTakeProfitRebalanceFieldsInfos)(new decimal_js_1.default(lowerRangePrice), new decimal_js_1.default(upperRangePrice), new decimal_js_1.default(destinationToken), true);
+        return (0, rebalance_methods_5.getTakeProfitRebalanceFieldsInfos)(new decimal_js_1.default(lowerRangePrice), new decimal_js_1.default(upperRangePrice), new decimal_js_1.default(destinationToken), true);
     };
     getFieldsForPeriodicRebalanceMethod = async (dex, fieldOverrides, tokenAMint, tokenBMint, poolPrice) => {
         const price = poolPrice ? poolPrice : new decimal_js_1.default(await this.getPriceForPair(dex, tokenAMint, tokenBMint));
-        const defaultFields = (0, rebalance_methods_1.getDefaultPeriodicRebalanceFieldInfos)(price);
-        let period = new decimal_js_1.default(defaultFields.find((x) => x.label === 'period').value);
-        const periodInput = fieldOverrides.find((x) => x.label === 'period');
+        const defaultFields = (0, rebalance_methods_5.getDefaultPeriodicRebalanceFieldInfos)(price);
+        let period = new decimal_js_1.default(defaultFields.find((x) => x.label == 'period').value);
+        const periodInput = fieldOverrides.find((x) => x.label == 'period');
         if (periodInput) {
             period = new decimal_js_1.default(periodInput.value);
         }
-        let lowerPriceDifferenceBPS = defaultFields.find((x) => x.label === 'lowerRangeBps').value;
-        const lowerPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'lowerRangeBps');
+        let lowerPriceDifferenceBPS = defaultFields.find((x) => x.label == 'lowerRangeBps').value;
+        const lowerPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'lowerRangeBps');
         if (lowerPriceDifferenceBPSInput) {
             lowerPriceDifferenceBPS = lowerPriceDifferenceBPSInput.value;
         }
-        let upperPriceDifferenceBPS = defaultFields.find((x) => x.label === 'upperRangeBps').value;
-        const upperPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'upperRangeBps');
+        let upperPriceDifferenceBPS = defaultFields.find((x) => x.label == 'upperRangeBps').value;
+        const upperPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'upperRangeBps');
         if (upperPriceDifferenceBPSInput) {
             upperPriceDifferenceBPS = upperPriceDifferenceBPSInput.value;
         }
-        return (0, rebalance_methods_1.getPeriodicRebalanceRebalanceFieldInfos)(price, period, new decimal_js_1.default(lowerPriceDifferenceBPS), new decimal_js_1.default(upperPriceDifferenceBPS));
+        return (0, rebalance_methods_5.getPeriodicRebalanceRebalanceFieldInfos)(price, period, new decimal_js_1.default(lowerPriceDifferenceBPS), new decimal_js_1.default(upperPriceDifferenceBPS));
     };
     getFieldsForExpanderRebalanceMethod = async (dex, fieldOverrides, tokenAMint, tokenBMint, poolPrice) => {
         const price = poolPrice ? poolPrice : new decimal_js_1.default(await this.getPriceForPair(dex, tokenAMint, tokenBMint));
-        const defaultFields = (0, rebalance_methods_1.getDefaultExpanderRebalanceFieldInfos)(price);
-        let lowerPriceDifferenceBPS = defaultFields.find((x) => x.label === 'lowerRangeBps').value;
-        const lowerPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'lowerRangeBps');
+        const defaultFields = (0, rebalance_methods_5.getDefaultExpanderRebalanceFieldInfos)(price);
+        let lowerPriceDifferenceBPS = defaultFields.find((x) => x.label == 'lowerRangeBps').value;
+        const lowerPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'lowerRangeBps');
         if (lowerPriceDifferenceBPSInput) {
             lowerPriceDifferenceBPS = lowerPriceDifferenceBPSInput.value;
         }
-        let upperPriceDifferenceBPS = defaultFields.find((x) => x.label === 'upperRangeBps').value;
-        const upperPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'upperRangeBps');
+        let upperPriceDifferenceBPS = defaultFields.find((x) => x.label == 'upperRangeBps').value;
+        const upperPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'upperRangeBps');
         if (upperPriceDifferenceBPSInput) {
             upperPriceDifferenceBPS = upperPriceDifferenceBPSInput.value;
         }
-        let lowerResetPriceDifferenceBPS = defaultFields.find((x) => x.label === 'resetLowerRangeBps').value;
-        const lowerResetPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'resetLowerRangeBps');
+        let lowerResetPriceDifferenceBPS = defaultFields.find((x) => x.label == 'resetLowerRangeBps').value;
+        const lowerResetPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'resetLowerRangeBps');
         if (lowerResetPriceDifferenceBPSInput) {
             lowerResetPriceDifferenceBPS = lowerResetPriceDifferenceBPSInput.value;
         }
-        let upperResetPriceDifferenceBPS = defaultFields.find((x) => x.label === 'resetUpperRangeBps').value;
-        const upperResetPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label === 'resetUpperRangeBps');
+        let upperResetPriceDifferenceBPS = defaultFields.find((x) => x.label == 'resetUpperRangeBps').value;
+        const upperResetPriceDifferenceBPSInput = fieldOverrides.find((x) => x.label == 'resetUpperRangeBps');
         if (upperResetPriceDifferenceBPSInput) {
             upperResetPriceDifferenceBPS = upperResetPriceDifferenceBPSInput.value;
         }
-        let expansionBPS = defaultFields.find((x) => x.label === 'expansionBps').value;
-        const expansionBPSInput = fieldOverrides.find((x) => x.label === 'expansionBps');
+        let expansionBPS = defaultFields.find((x) => x.label == 'expansionBps').value;
+        const expansionBPSInput = fieldOverrides.find((x) => x.label == 'expansionBps');
         if (expansionBPSInput) {
             expansionBPS = expansionBPSInput.value;
         }
-        let maxNumberOfExpansions = defaultFields.find((x) => x.label === 'maxNumberOfExpansions').value;
-        const maxNumberOfExpansionsInput = fieldOverrides.find((x) => x.label === 'maxNumberOfExpansions');
+        let maxNumberOfExpansions = defaultFields.find((x) => x.label == 'maxNumberOfExpansions').value;
+        const maxNumberOfExpansionsInput = fieldOverrides.find((x) => x.label == 'maxNumberOfExpansions');
         if (maxNumberOfExpansionsInput) {
             maxNumberOfExpansions = maxNumberOfExpansionsInput.value;
         }
-        let swapUnevenAllowed = defaultFields.find((x) => x.label === 'swapUnevenAllowed').value;
-        const swapUnevenAllowedInput = fieldOverrides.find((x) => x.label === 'swapUnevenAllowed');
+        let swapUnevenAllowed = defaultFields.find((x) => x.label == 'swapUnevenAllowed').value;
+        const swapUnevenAllowedInput = fieldOverrides.find((x) => x.label == 'swapUnevenAllowed');
         if (swapUnevenAllowedInput) {
             swapUnevenAllowed = swapUnevenAllowedInput.value;
         }
-        return (0, rebalance_methods_1.getExpanderRebalanceFieldInfos)(price, new decimal_js_1.default(lowerPriceDifferenceBPS), new decimal_js_1.default(upperPriceDifferenceBPS), new decimal_js_1.default(lowerResetPriceDifferenceBPS), new decimal_js_1.default(upperResetPriceDifferenceBPS), new decimal_js_1.default(expansionBPS), new decimal_js_1.default(maxNumberOfExpansions), new decimal_js_1.default(swapUnevenAllowed));
+        return (0, rebalance_methods_5.getExpanderRebalanceFieldInfos)(price, new decimal_js_1.default(lowerPriceDifferenceBPS), new decimal_js_1.default(upperPriceDifferenceBPS), new decimal_js_1.default(lowerResetPriceDifferenceBPS), new decimal_js_1.default(upperResetPriceDifferenceBPS), new decimal_js_1.default(expansionBPS), new decimal_js_1.default(maxNumberOfExpansions), new decimal_js_1.default(swapUnevenAllowed));
     };
     getFieldsForAutodriftRebalanceMethod = async (dex, fieldOverrides, tokenAMint, tokenBMint, tickSpacing, poolPrice) => {
-        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, tokenAMint);
-        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, tokenBMint);
+        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, tokenAMint);
+        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, tokenBMint);
         const price = poolPrice ? poolPrice : new decimal_js_1.default(await this.getPriceForPair(dex, tokenAMint, tokenBMint));
         // TODO: maybe we will need to get real staking price instead of pool price for this to be accurate.
         const defaultFields = (0, autodriftRebalance_1.getDefaultAutodriftRebalanceFieldInfos)(dex, price, tokenADecimals, tokenBDecimals, tickSpacing);
-        const lastMidTick = defaultFields.find((x) => x.label === 'lastMidTick').value;
-        let initDriftTicksPerEpoch = defaultFields.find((x) => x.label === 'initDriftTicksPerEpoch').value;
-        const initDriftTicksPerEpochInput = fieldOverrides.find((x) => x.label === 'initDriftTicksPerEpoch');
+        const lastMidTick = defaultFields.find((x) => x.label == 'lastMidTick').value;
+        let initDriftTicksPerEpoch = defaultFields.find((x) => x.label == 'initDriftTicksPerEpoch').value;
+        const initDriftTicksPerEpochInput = fieldOverrides.find((x) => x.label == 'initDriftTicksPerEpoch');
         if (initDriftTicksPerEpochInput) {
             initDriftTicksPerEpoch = initDriftTicksPerEpochInput.value;
         }
-        let ticksBelowMid = defaultFields.find((x) => x.label === 'ticksBelowMid').value;
-        const ticksBelowMidInput = fieldOverrides.find((x) => x.label === 'ticksBelowMid');
+        let ticksBelowMid = defaultFields.find((x) => x.label == 'ticksBelowMid').value;
+        const ticksBelowMidInput = fieldOverrides.find((x) => x.label == 'ticksBelowMid');
         if (ticksBelowMidInput) {
             ticksBelowMid = ticksBelowMidInput.value;
         }
-        let ticksAboveMid = defaultFields.find((x) => x.label === 'ticksAboveMid').value;
-        const ticksAboveMidInput = fieldOverrides.find((x) => x.label === 'ticksAboveMid');
+        let ticksAboveMid = defaultFields.find((x) => x.label == 'ticksAboveMid').value;
+        const ticksAboveMidInput = fieldOverrides.find((x) => x.label == 'ticksAboveMid');
         if (ticksAboveMidInput) {
             ticksAboveMid = ticksAboveMidInput.value;
         }
-        let frontrunMultiplierBps = defaultFields.find((x) => x.label === 'frontrunMultiplierBps').value;
-        const frontrunMultiplierBpsInput = fieldOverrides.find((x) => x.label === 'frontrunMultiplierBps');
+        let frontrunMultiplierBps = defaultFields.find((x) => x.label == 'frontrunMultiplierBps').value;
+        const frontrunMultiplierBpsInput = fieldOverrides.find((x) => x.label == 'frontrunMultiplierBps');
         if (frontrunMultiplierBpsInput) {
             frontrunMultiplierBps = frontrunMultiplierBpsInput.value;
         }
-        let stakingRateASource = defaultFields.find((x) => x.label === 'stakingRateASource').value;
-        const stakingRateASourceInput = fieldOverrides.find((x) => x.label === 'stakingRateASource');
+        let stakingRateASource = defaultFields.find((x) => x.label == 'stakingRateASource').value;
+        const stakingRateASourceInput = fieldOverrides.find((x) => x.label == 'stakingRateASource');
         if (stakingRateASourceInput) {
             stakingRateASource = stakingRateASourceInput.value;
         }
-        let stakingRateBSource = defaultFields.find((x) => x.label === 'stakingRateBSource').value;
-        const stakingRateBSourceInput = fieldOverrides.find((x) => x.label === 'stakingRateBSource');
+        let stakingRateBSource = defaultFields.find((x) => x.label == 'stakingRateBSource').value;
+        const stakingRateBSourceInput = fieldOverrides.find((x) => x.label == 'stakingRateBSource');
         if (stakingRateBSourceInput) {
             stakingRateBSource = stakingRateBSourceInput.value;
         }
-        let initialDriftDirection = defaultFields.find((x) => x.label === 'initialDriftDirection').value;
-        const initialDriftDirectionInput = fieldOverrides.find((x) => x.label === 'initialDriftDirection');
+        let initialDriftDirection = defaultFields.find((x) => x.label == 'initialDriftDirection').value;
+        const initialDriftDirectionInput = fieldOverrides.find((x) => x.label == 'initialDriftDirection');
         if (initialDriftDirectionInput) {
             initialDriftDirection = initialDriftDirectionInput.value;
         }
@@ -430,27 +446,27 @@ class Kamino {
      * @param amountA
      */
     getPriceForPair = async (dex, poolTokenA, poolTokenB) => {
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             const pools = await this.getOrcaPoolsForTokens(poolTokenA, poolTokenB);
-            if (pools.length === 0) {
+            if (pools.length == 0) {
                 throw new Error(`No pool found for ${poolTokenA.toString()} and ${poolTokenB.toString()}`);
             }
             return pools[0].price;
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             const pools = await this.getRaydiumPoolsForTokens(poolTokenA, poolTokenB);
-            if (pools.length === 0) {
+            if (pools.length == 0) {
                 throw new Error(`No pool found for ${poolTokenA.toString()} and ${poolTokenB.toString()}`);
             }
             return pools[0].price;
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             const pools = await this.getMeteoraPoolsForTokens(poolTokenA, poolTokenB);
-            if (pools.length === 0) {
+            if (pools.length == 0) {
                 throw new Error(`No pool found for ${poolTokenA.toString()} and ${poolTokenB.toString()}`);
             }
-            const decimalsX = await (0, utils_1.getMintDecimals)(this._rpc, poolTokenA);
-            const decimalsY = await (0, utils_1.getMintDecimals)(this._rpc, poolTokenB);
+            const decimalsX = await (0, utils_1.getMintDecimals)(this._connection, poolTokenA);
+            const decimalsY = await (0, utils_1.getMintDecimals)(this._connection, poolTokenB);
             return (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(pools[0].pool.activeId, pools[0].pool.binStep, decimalsX, decimalsY).toNumber();
         }
         else {
@@ -459,23 +475,23 @@ class Kamino {
     };
     getDefaultRebalanceFields = async (dex, poolTokenA, poolTokenB, tickSpacing, rebalanceMethod) => {
         const price = new decimal_js_1.default(await this.getPriceForPair(dex, poolTokenA, poolTokenB));
-        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, poolTokenA);
-        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, poolTokenB);
+        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, poolTokenA);
+        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, poolTokenB);
         switch (rebalanceMethod) {
             case CreationParameters_1.ManualRebalanceMethod:
                 return (0, rebalance_methods_1.getDefaultManualRebalanceFieldInfos)(price);
             case CreationParameters_1.PricePercentageRebalanceMethod:
-                return (0, rebalance_methods_1.getDefaultPricePercentageRebalanceFieldInfos)(price);
+                return (0, rebalance_methods_2.getDefaultPricePercentageRebalanceFieldInfos)(price);
             case CreationParameters_1.PricePercentageWithResetRangeRebalanceMethod:
-                return (0, rebalance_methods_1.getDefaultPricePercentageWithResetRebalanceFieldInfos)(price);
+                return (0, rebalance_methods_3.getDefaultPricePercentageWithResetRebalanceFieldInfos)(price);
             case CreationParameters_1.DriftRebalanceMethod:
-                return (0, rebalance_methods_1.getDefaultDriftRebalanceFieldInfos)(dex, tickSpacing, price, tokenADecimals, tokenBDecimals);
+                return (0, rebalance_methods_4.getDefaultDriftRebalanceFieldInfos)(dex, tickSpacing, price, tokenADecimals, tokenBDecimals);
             case CreationParameters_1.TakeProfitMethod:
-                return (0, rebalance_methods_1.getDefaultTakeProfitRebalanceFieldsInfos)(price);
+                return (0, rebalance_methods_5.getDefaultTakeProfitRebalanceFieldsInfos)(price);
             case CreationParameters_1.PeriodicRebalanceMethod:
-                return (0, rebalance_methods_1.getDefaultPeriodicRebalanceFieldInfos)(price);
+                return (0, rebalance_methods_5.getDefaultPeriodicRebalanceFieldInfos)(price);
             case CreationParameters_1.ExpanderMethod:
-                return (0, rebalance_methods_1.getDefaultExpanderRebalanceFieldInfos)(price);
+                return (0, rebalance_methods_5.getDefaultExpanderRebalanceFieldInfos)(price);
             case CreationParameters_1.AutodriftMethod:
                 return (0, autodriftRebalance_1.getDefaultAutodriftRebalanceFieldInfos)(dex, price, tokenADecimals, tokenBDecimals, tickSpacing);
             default:
@@ -486,17 +502,17 @@ class Kamino {
      * Return a the pubkey of the pool in a given dex, for given mints and fee tier; if that pool doesn't exist, return default pubkey
      */
     getPoolInitializedForDexPairTier = async (dex, poolTokenA, poolTokenB, feeBPS) => {
-        if (dex === 'ORCA') {
-            let pool = pubkeys_1.DEFAULT_PUBLIC_KEY;
+        if (dex == 'ORCA') {
+            let pool = web3_js_1.PublicKey.default;
             const orcaPools = await this.getOrcaPoolsForTokens(poolTokenA, poolTokenB);
             orcaPools.forEach((element) => {
-                if (element.lpFeeRate * CreationParameters_1.FullBPS === feeBPS.toNumber()) {
-                    pool = (0, kit_1.address)(element.address);
+                if (element.lpFeeRate * CreationParameters_1.FullBPS == feeBPS.toNumber()) {
+                    pool = new web3_js_1.PublicKey(element.address);
                 }
             });
             return pool;
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             const pools = [];
             const raydiumPools = await this.getRaydiumPoolsForTokens(poolTokenA, poolTokenB);
             raydiumPools.forEach((element) => {
@@ -504,26 +520,26 @@ class Kamino {
                     pools.push(element);
                 }
             });
-            if (pools.length === 0) {
-                return pubkeys_1.DEFAULT_PUBLIC_KEY;
+            if (pools.length == 0) {
+                return web3_js_1.PublicKey.default;
             }
-            let pool = pubkeys_1.DEFAULT_PUBLIC_KEY;
+            let pool = web3_js_1.PublicKey.default;
             let tickSpacing = Number.MAX_VALUE;
             pools.forEach((element) => {
                 if (element.ammConfig.tickSpacing < tickSpacing) {
-                    pool = (0, kit_1.address)(element.id);
+                    pool = new web3_js_1.PublicKey(element.id);
                     tickSpacing = element.ammConfig.tickSpacing;
                 }
             });
             return pool;
         }
-        else if (dex === 'METEORA') {
-            let pool = pubkeys_1.DEFAULT_PUBLIC_KEY;
+        else if (dex == 'METEORA') {
+            let pool = web3_js_1.PublicKey.default;
             const pools = await this.getMeteoraPoolsForTokens(poolTokenA, poolTokenB);
             pools.forEach((element) => {
                 const feeRateBps = element.pool.parameters.baseFactor * element.pool.binStep;
-                if (feeRateBps === feeBPS.toNumber()) {
-                    pool = (0, kit_1.address)(element.key);
+                if (feeRateBps == feeBPS.toNumber()) {
+                    pool = new web3_js_1.PublicKey(element.key);
                 }
             });
             return pool;
@@ -536,21 +552,21 @@ class Kamino {
      * Return generic information for all pools in a given dex, for given mints and fee tier
      */
     async getExistentPoolsForPair(dex, tokenMintA, tokenMintB) {
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             const pools = await this.getOrcaPoolsForTokens(tokenMintA, tokenMintB);
             const genericPoolInfos = await Promise.all(pools.map(async (pool) => {
-                const positionsCount = new decimal_js_1.default(await this.getPositionsCountForPool(dex, (0, kit_1.address)(pool.address)));
+                const positionsCount = new decimal_js_1.default(await this.getPositionsCountForPool(dex, new web3_js_1.PublicKey(pool.address)));
                 // read price from pool
-                const poolData = await this._orcaService.getPool((0, kit_1.address)(pool.address));
+                const poolData = await this._orcaService.getPool(new web3_js_1.PublicKey(pool.address));
                 if (!poolData) {
                     throw new Error(`Pool ${pool.address} not found`);
                 }
                 const poolInfo = {
                     dex,
-                    address: (0, kit_1.address)(pool.address),
-                    price: (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(poolData.sqrtPrice, pool.tokenA.decimals, pool.tokenB.decimals),
-                    tokenMintA: (0, kit_1.address)(pool.tokenA.mint),
-                    tokenMintB: (0, kit_1.address)(pool.tokenB.mint),
+                    address: new web3_js_1.PublicKey(pool.address),
+                    price: poolData.price,
+                    tokenMintA: new web3_js_1.PublicKey(pool.tokenA.mint),
+                    tokenMintB: new web3_js_1.PublicKey(pool.tokenB.mint),
                     tvl: pool.tvl ? new decimal_js_1.default(pool.tvl) : undefined,
                     feeRate: new decimal_js_1.default(pool.lpFeeRate).mul(CreationParameters_1.FullBPS),
                     volumeOnLast7d: pool.volume ? new decimal_js_1.default(pool.volume.week) : undefined,
@@ -561,16 +577,16 @@ class Kamino {
             }));
             return genericPoolInfos;
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             const pools = await this.getRaydiumPoolsForTokens(tokenMintA, tokenMintB);
             const genericPoolInfos = await Promise.all(pools.map(async (pool) => {
-                const positionsCount = new decimal_js_1.default(await this.getPositionsCountForPool(dex, (0, kit_1.address)(pool.id)));
+                const positionsCount = new decimal_js_1.default(await this.getPositionsCountForPool(dex, new web3_js_1.PublicKey(pool.id)));
                 const poolInfo = {
                     dex,
-                    address: (0, kit_1.address)(pool.id),
+                    address: new web3_js_1.PublicKey(pool.id),
                     price: new decimal_js_1.default(pool.price),
-                    tokenMintA: (0, kit_1.address)(pool.mintA),
-                    tokenMintB: (0, kit_1.address)(pool.mintB),
+                    tokenMintA: new web3_js_1.PublicKey(pool.mintA),
+                    tokenMintB: new web3_js_1.PublicKey(pool.mintB),
                     tvl: new decimal_js_1.default(pool.tvl),
                     feeRate: new decimal_js_1.default(pool.ammConfig.tradeFeeRate).div(new decimal_js_1.default(CreationParameters_1.FullPercentage)),
                     volumeOnLast7d: new decimal_js_1.default(pool.week.volume),
@@ -581,12 +597,12 @@ class Kamino {
             }));
             return genericPoolInfos;
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             const pools = await this.getMeteoraPoolsForTokens(tokenMintA, tokenMintB);
             const genericPoolInfos = await Promise.all(pools.map(async (pool) => {
                 const positionsCount = new decimal_js_1.default(await this.getPositionsCountForPool(dex, pool.key));
-                const decimalsX = await (0, utils_1.getMintDecimals)(this._rpc, pool.pool.tokenXMint);
-                const decimalsY = await (0, utils_1.getMintDecimals)(this._rpc, pool.pool.tokenYMint);
+                const decimalsX = await (0, utils_1.getMintDecimals)(this._connection, pool.pool.tokenXMint);
+                const decimalsY = await (0, utils_1.getMintDecimals)(this._connection, pool.pool.tokenYMint);
                 const price = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(pool.pool.activeId, pool.pool.binStep, decimalsX, decimalsY);
                 const poolInfo = {
                     dex,
@@ -614,8 +630,8 @@ class Kamino {
         const poolTokenBString = poolTokenB.toString();
         const whirlpools = await this._orcaService.getOrcaWhirlpools();
         whirlpools.whirlpools.forEach((element) => {
-            if ((element.tokenA.mint === poolTokenAString && element.tokenB.mint === poolTokenBString) ||
-                (element.tokenA.mint === poolTokenBString && element.tokenB.mint === poolTokenAString))
+            if ((element.tokenA.mint == poolTokenAString && element.tokenB.mint == poolTokenBString) ||
+                (element.tokenA.mint == poolTokenBString && element.tokenB.mint == poolTokenAString))
                 pools.push(element);
         });
         return pools;
@@ -626,8 +642,8 @@ class Kamino {
         const poolTokenBString = poolTokenB.toString();
         const raydiumPools = await this._raydiumService.getRaydiumWhirlpools();
         raydiumPools.data.forEach((element) => {
-            if ((element.mintA === poolTokenAString && element.mintB === poolTokenBString) ||
-                (element.mintA === poolTokenBString && element.mintB === poolTokenAString)) {
+            if ((element.mintA == poolTokenAString && element.mintB == poolTokenBString) ||
+                (element.mintA == poolTokenBString && element.mintB == poolTokenAString)) {
                 pools.push(element);
             }
         });
@@ -637,8 +653,8 @@ class Kamino {
         const pools = [];
         const meteoraPools = await this._meteoraService.getMeteoraPools();
         meteoraPools.forEach((element) => {
-            if ((element.pool.tokenXMint === poolTokenA && element.pool.tokenYMint === poolTokenB) ||
-                (element.pool.tokenXMint === poolTokenB && element.pool.tokenYMint === poolTokenA)) {
+            if ((element.pool.tokenXMint.equals(poolTokenA) && element.pool.tokenYMint.equals(poolTokenB)) ||
+                (element.pool.tokenXMint.equals(poolTokenB) && element.pool.tokenYMint.equals(poolTokenA))) {
                 pools.push(element);
             }
         });
@@ -677,39 +693,35 @@ class Kamino {
     getAllStrategiesWithFilters = async (strategyFilters) => {
         const filters = [];
         filters.push({
-            dataSize: BigInt(accounts_1.WhirlpoolStrategy.layout.span + 8),
+            dataSize: accounts_1.WhirlpoolStrategy.layout.span + 8,
         });
         filters.push({
             memcmp: {
-                offset: 0n,
+                offset: 0,
                 bytes: bs58_1.default.encode(accounts_1.WhirlpoolStrategy.discriminator),
-                encoding: 'base58',
             },
         });
         if (strategyFilters.owner) {
             filters.push({
                 memcmp: {
-                    offset: 8n,
-                    bytes: strategyFilters.owner,
-                    encoding: 'base58',
+                    bytes: strategyFilters.owner.toBase58(),
+                    offset: 8,
                 },
             });
         }
         if (strategyFilters.strategyCreationStatus) {
             filters.push({
                 memcmp: {
-                    offset: 1625n,
                     bytes: (0, utils_1.strategyCreationStatusToBase58)(strategyFilters.strategyCreationStatus),
-                    encoding: 'base58',
+                    offset: 1625,
                 },
             });
         }
         if (strategyFilters.strategyType) {
             filters.push({
                 memcmp: {
-                    offset: 1120n,
                     bytes: (0, utils_1.strategyTypeToBase58)(strategyFilters.strategyType).toString(),
-                    encoding: 'base58',
+                    offset: 1120,
                 },
             });
         }
@@ -717,20 +729,16 @@ class Kamino {
             const value = !strategyFilters.isCommunity ? '1' : '2';
             filters.push({
                 memcmp: {
-                    offset: 1664n,
                     bytes: value,
-                    encoding: 'base58',
+                    offset: 1664,
                 },
             });
         }
-        return (await this._rpc
-            .getProgramAccounts(this.getProgramID(), {
+        return (await this._connection.getProgramAccounts(this._kaminoProgramId, {
             filters,
-            encoding: 'base64',
-        })
-            .send()).map((x) => {
+        })).map((x) => {
             const res = {
-                strategy: accounts_1.WhirlpoolStrategy.decode(Buffer.from(x.account.data[0], 'base64')),
+                strategy: accounts_1.WhirlpoolStrategy.decode(x.account.data),
                 address: x.pubkey,
             };
             return res;
@@ -746,38 +754,32 @@ class Kamino {
      * @param kTokenMint - mint address of the kToken
      */
     getStrategyByKTokenMint = async (kTokenMint) => {
-        const filters = [
-            {
-                dataSize: BigInt(accounts_1.WhirlpoolStrategy.layout.span + 8),
-            },
-            {
-                memcmp: {
-                    offset: 0n,
-                    bytes: bs58_1.default.encode(accounts_1.WhirlpoolStrategy.discriminator),
-                    encoding: 'base58',
+        const matchingStrategies = await this._connection.getProgramAccounts(this._kaminoProgram.programId, {
+            filters: [
+                {
+                    dataSize: accounts_1.WhirlpoolStrategy.layout.span + 8,
                 },
-            },
-            {
-                memcmp: {
-                    bytes: kTokenMint,
-                    offset: 720n,
-                    encoding: 'base58',
+                {
+                    memcmp: {
+                        offset: 0,
+                        bytes: bs58_1.default.encode(accounts_1.WhirlpoolStrategy.discriminator),
+                    },
                 },
-            },
-        ];
-        const matchingStrategies = await this._rpc
-            .getProgramAccounts(this.getProgramID(), {
-            filters,
-            encoding: 'base64',
-        })
-            .send();
+                {
+                    memcmp: {
+                        bytes: kTokenMint.toBase58(),
+                        offset: 720,
+                    },
+                },
+            ],
+        });
         if (matchingStrategies.length === 0) {
             return null;
         }
         if (matchingStrategies.length > 1) {
-            throw new Error(`Multiple strategies found for kToken mint: ${kTokenMint}. Strategies found: ${matchingStrategies.map((x) => x.pubkey)}`);
+            throw new Error(`Multiple strategies found for kToken mint: ${kTokenMint.toBase58()}. Strategies found: ${matchingStrategies.map((x) => x.pubkey.toBase58())}`);
         }
-        const decodedStrategy = accounts_1.WhirlpoolStrategy.decode(Buffer.from(matchingStrategies[0].account.data[0], 'base64'));
+        const decodedStrategy = accounts_1.WhirlpoolStrategy.decode(matchingStrategies[0].account.data);
         return {
             address: matchingStrategies[0].pubkey,
             strategy: decodedStrategy,
@@ -800,19 +802,6 @@ class Kamino {
             return { price: balances.computedHoldings.totalSum.div(sharesIssued).mul(sharesFactor), balance: balances };
         }
     };
-    /**
-     * Get the token A and B per share for the specified Kamino whirlpool strategy
-     * @param strategy
-     */
-    getTokenAAndBPerShare = async (strategy) => {
-        const strategyState = await this.getStrategyStateIfNotFetched(strategy);
-        const sharesIssued = new decimal_js_1.default(strategyState.strategy.sharesIssued.toString());
-        const balances = await this.getStrategyBalances(strategyState.strategy);
-        if (sharesIssued.isZero()) {
-            return { a: new decimal_js_1.default(0), b: new decimal_js_1.default(0) };
-        }
-        return { a: balances.tokenAAmounts.div(sharesIssued), b: balances.tokenBAmounts.div(sharesIssued) };
-    };
     /**
      * Batch fetch share data for all or a filtered list of strategies
      * @param strategyFilters strategy filters or a list of strategy public keys
@@ -828,16 +817,16 @@ class Kamino {
         const allScopePrices = strategiesWithAddresses.map((x) => x.strategy.scopePrices);
         const scopePrices = await this._scope.getMultipleOraclePrices(allScopePrices);
         const scopePricesMap = scopePrices.reduce((map, [address, price]) => {
-            map[address] = price;
+            map[address.toBase58()] = price;
             return map;
         }, {});
-        const raydiumStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM') && x.strategy.position !== pubkeys_1.DEFAULT_PUBLIC_KEY);
+        const raydiumStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM') && !x.strategy.position.equals(web3_js_1.PublicKey.default));
         const raydiumPoolsPromise = this.getRaydiumPools(raydiumStrategies.map((x) => x.strategy.pool));
         const raydiumPositionsPromise = this.getRaydiumPositions(raydiumStrategies.map((x) => x.strategy.position));
-        const orcaStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA') && x.strategy.position !== pubkeys_1.DEFAULT_PUBLIC_KEY);
+        const orcaStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA') && !x.strategy.position.equals(web3_js_1.PublicKey.default));
         const orcaPoolsPromise = this.getWhirlpools(orcaStrategies.map((x) => x.strategy.pool));
         const orcaPositionsPromise = this.getOrcaPositions(orcaStrategies.map((x) => x.strategy.position));
-        const meteoraStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA') && x.strategy.position !== pubkeys_1.DEFAULT_PUBLIC_KEY);
+        const meteoraStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA') && !x.strategy.position.equals(web3_js_1.PublicKey.default));
         const meteoraPoolsPromise = this.getMeteoraPools(meteoraStrategies.map((x) => x.strategy.pool));
         const meteoraPositionsPromise = this.getMeteoraPositions(meteoraStrategies.map((x) => x.strategy.position));
         const [raydiumPools, raydiumPositions, orcaPools, orcaPositions, meteoraPools, meteoraPositions] = await Promise.all([
@@ -848,11 +837,11 @@ class Kamino {
             meteoraPoolsPromise,
             meteoraPositionsPromise,
         ]);
-        const inactiveStrategies = strategiesWithAddresses.filter((x) => x.strategy.position === pubkeys_1.DEFAULT_PUBLIC_KEY);
+        const inactiveStrategies = strategiesWithAddresses.filter((x) => x.strategy.position.equals(web3_js_1.PublicKey.default));
         const collInfos = collateralInfos ? collateralInfos : await this.getCollateralInfos();
         const disabledPrices = disabledTokensPrices ? disabledTokensPrices : await this.getDisabledTokensPrices(collInfos);
         for (const { strategy, address } of inactiveStrategies) {
-            const strategyPrices = await this.getStrategyPrices(strategy, collInfos, scopePricesMap[strategy.scopePrices], disabledPrices);
+            const strategyPrices = await this.getStrategyPrices(strategy, collInfos, scopePricesMap[strategy.scopePrices.toBase58()], disabledPrices);
             result.push({
                 address,
                 strategy,
@@ -904,7 +893,7 @@ class Kamino {
             if (!position) {
                 throw new Error(`Position ${strategy.position.toString()} could not be found.`);
             }
-            fetchBalances.push(fetchBalance(strategy, pool, position, collateralInfos, prices ? prices[strategy.scopePrices] : undefined, disabledTokensPrices).then((balance) => {
+            fetchBalances.push(fetchBalance(strategy, pool, position, collateralInfos, prices ? prices[strategy.scopePrices.toBase58()] : undefined, disabledTokensPrices).then((balance) => {
                 return { balance, strategyWithAddress: { strategy, address } };
             }));
         }
@@ -927,11 +916,11 @@ class Kamino {
         let upperResetPrice = null;
         const dex = (0, utils_1.numberToDex)(strategy.strategyDex.toNumber());
         if (rebalanceKind.kind === RebalanceType_1.PricePercentageWithReset.kind) {
-            const state = (0, rebalance_methods_1.deserializePricePercentageWithResetRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
+            const state = (0, rebalance_methods_3.deserializePricePercentageWithResetRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
             [lowerResetPrice, upperResetPrice] = (0, utils_2.extractPricesFromDeserializedState)(state);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Expander.kind) {
-            const state = (0, rebalance_methods_1.deserializeExpanderRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
+            const state = (0, rebalance_methods_5.deserializeExpanderRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
             [lowerResetPrice, upperResetPrice] = (0, utils_2.extractPricesFromDeserializedState)(state);
         }
         const balance = {
@@ -965,11 +954,11 @@ class Kamino {
         let upperResetPrice = null;
         const dex = (0, utils_1.numberToDex)(strategy.strategyDex.toNumber());
         if (rebalanceKind.kind === RebalanceType_1.PricePercentageWithReset.kind) {
-            const state = (0, rebalance_methods_1.deserializePricePercentageWithResetRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
+            const state = (0, rebalance_methods_3.deserializePricePercentageWithResetRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
             [lowerResetPrice, upperResetPrice] = (0, utils_2.extractPricesFromDeserializedState)(state);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Expander.kind) {
-            const state = (0, rebalance_methods_1.deserializeExpanderRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
+            const state = (0, rebalance_methods_5.deserializeExpanderRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
             [lowerResetPrice, upperResetPrice] = (0, utils_2.extractPricesFromDeserializedState)(state);
         }
         const balance = {
@@ -1044,11 +1033,11 @@ class Kamino {
         let upperResetPrice = null;
         const dex = (0, utils_1.numberToDex)(strategy.strategyDex.toNumber());
         if (rebalanceKind.kind === RebalanceType_1.PricePercentageWithReset.kind) {
-            const state = (0, rebalance_methods_1.deserializePricePercentageWithResetRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
+            const state = (0, rebalance_methods_3.deserializePricePercentageWithResetRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
             [lowerResetPrice, upperResetPrice] = (0, utils_2.extractPricesFromDeserializedState)(state);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Expander.kind) {
-            const state = (0, rebalance_methods_1.deserializeExpanderRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
+            const state = (0, rebalance_methods_5.deserializeExpanderRebalanceWithStateOverride)(dex, decimalsA, decimalsB, poolPrice, strategy.rebalanceRaw);
             [lowerResetPrice, upperResetPrice] = (0, utils_2.extractPricesFromDeserializedState)(state);
         }
         const balance = {
@@ -1060,7 +1049,7 @@ class Kamino {
         return balance;
     };
     getOrcaTokensBalances = (strategy, pool, position, mode = 'WITHDRAW') => {
-        const quote = (0, whirlpools_1.getRemoveLiquidityQuote)({
+        const quote = (0, remove_liquidity_1.getRemoveLiquidityQuote)({
             positionAddress: strategy.position,
             liquidity: position.liquidity,
             slippageTolerance: whirlpool_sdk_1.Percentage.fromFraction(0, 1000),
@@ -1110,7 +1099,7 @@ class Kamino {
         }
     };
     getTokenAccountBalance = async (tokenAccount) => {
-        const tokenAccountBalance = await this._rpc.getTokenAccountBalance(tokenAccount).send();
+        const tokenAccountBalance = await this._connection.getTokenAccountBalance(tokenAccount);
         if (!tokenAccountBalance.value) {
             throw new Error(`Could not get token account balance for ${tokenAccount.toString()}.`);
         }
@@ -1121,7 +1110,7 @@ class Kamino {
      * @param tokenAccount
      */
     getTokenAccountBalanceOrZero = async (tokenAccount) => {
-        const tokenAccountExists = await (0, transactions_1.checkIfAccountExists)(this._rpc, tokenAccount);
+        const tokenAccountExists = await (0, transactions_1.checkIfAccountExists)(this._connection, tokenAccount);
         if (tokenAccountExists) {
             return await this.getTokenAccountBalance(tokenAccount);
         }
@@ -1135,13 +1124,13 @@ class Kamino {
         if (!disabledPrices) {
             disabledPrices = await this.getDisabledTokensPrices(collateralInfos);
         }
-        if (strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA')) {
+        if (strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('ORCA')) {
             return this.getStrategyBalancesOrca(strategy, collateralInfos, scopePrices, disabledPrices);
         }
-        else if (strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM')) {
+        else if (strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
             return this.getStrategyBalancesRaydium(strategy, collateralInfos, scopePrices, disabledPrices);
         }
-        else if (strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA')) {
+        else if (strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
             return this.getStrategyBalancesMeteora(strategy, collateralInfos, scopePrices, disabledPrices);
         }
         else {
@@ -1149,31 +1138,41 @@ class Kamino {
         }
     };
     getStrategyTokensBalances = async (strategy, mode = 'WITHDRAW') => {
-        if (strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA')) {
-            const [whirlpoolAcc, positionAcc] = (await this.getConnection().getMultipleAccounts([strategy.pool, strategy.position]).send()).value;
+        if (strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('ORCA')) {
+            const [whirlpoolAcc, positionAcc] = await this.getConnection().getMultipleAccountsInfo([
+                strategy.pool,
+                strategy.position,
+            ]);
             if (!whirlpoolAcc) {
                 throw Error(`Could not fetch Orca whirlpool state with pubkey ${strategy.pool.toString()}`);
             }
             if (!positionAcc) {
                 throw Error(`Could not fetch Orca whirlpool position state with pubkey ${strategy.position.toString()}`);
             }
-            const whirlpool = accounts_2.Whirlpool.decode(Buffer.from(whirlpoolAcc.data[0], 'base64'));
-            const position = accounts_2.Position.decode(Buffer.from(positionAcc.data[0], 'base64'));
+            const [whirlpool, position] = await Promise.all([
+                whirlpools_client_1.Whirlpool.decode(whirlpoolAcc.data),
+                whirlpools_client_1.Position.decode(positionAcc.data),
+            ]);
             return this.getOrcaTokensBalances(strategy, whirlpool, position, mode);
         }
-        else if (strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM')) {
-            const [poolStateAcc, positionAcc] = (await this.getConnection().getMultipleAccounts([strategy.pool, strategy.position]).send()).value;
+        else if (strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
+            const [poolStateAcc, positionAcc] = await this.getConnection().getMultipleAccountsInfo([
+                strategy.pool,
+                strategy.position,
+            ]);
             if (!poolStateAcc) {
                 throw Error(`Could not fetch Raydium pool state with pubkey ${strategy.pool.toString()}`);
             }
             if (!positionAcc) {
                 throw Error(`Could not fetch Raydium position state with pubkey ${strategy.position.toString()}`);
             }
-            const poolState = accounts_3.PoolState.decode(Buffer.from(poolStateAcc.data[0], 'base64'));
-            const position = accounts_3.PersonalPositionState.decode(Buffer.from(positionAcc.data[0], 'base64'));
+            const [poolState, position] = await Promise.all([
+                raydium_client_1.PoolState.decode(poolStateAcc.data),
+                raydium_client_1.PersonalPositionState.decode(positionAcc.data),
+            ]);
             return this.getRaydiumTokensBalances(strategy, poolState, position, mode);
         }
-        else if (strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA')) {
+        else if (strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
             return this.getMeteoraTokensBalances(strategy);
         }
         else {
@@ -1188,21 +1187,21 @@ class Kamino {
         const strategies = await this.getStrategiesShareData({ strategyCreationStatus: 'LIVE' });
         let totalTokenAmount = new decimal_js_1.default(0);
         const vaults = [];
-        for (const { strategy, address: ad, shareData } of strategies) {
+        for (const { strategy, address, shareData } of strategies) {
             const aTotal = shareData.balance.computedHoldings.invested.a.plus(shareData.balance.computedHoldings.available.a);
             const bTotal = shareData.balance.computedHoldings.invested.b.plus(shareData.balance.computedHoldings.available.b);
             let amount = new decimal_js_1.default(0);
-            if (strategy.tokenAMint === (0, kit_1.address)(tokenMint) && aTotal.greaterThan(0)) {
+            if (strategy.tokenAMint.equals(new web3_js_1.PublicKey(tokenMint)) && aTotal.greaterThan(0)) {
                 amount = aTotal;
             }
-            else if (strategy.tokenBMint === (0, kit_1.address)(tokenMint) && bTotal.greaterThan(0)) {
+            else if (strategy.tokenBMint.equals(new web3_js_1.PublicKey(tokenMint)) && bTotal.greaterThan(0)) {
                 amount = bTotal;
             }
             if (amount.greaterThan(0)) {
                 totalTokenAmount = totalTokenAmount.plus(amount);
                 vaults.push({
-                    address: ad,
-                    frontendUrl: `${constants_1.FRONTEND_KAMINO_STRATEGY_URL}/${ad}`,
+                    address: address,
+                    frontendUrl: `${constants_1.FRONTEND_KAMINO_STRATEGY_URL}/${address}`,
                     amount,
                 });
             }
@@ -1210,53 +1209,66 @@ class Kamino {
         return { totalTokenAmount, vaults, timestamp: new Date() };
     };
     getAccountOwner = async (pk) => {
-        const acc = await this.getConnection().getAccountInfo(pk).send();
-        if (acc.value === null) {
-            throw Error(`Could not fetch mint ${pk}`);
+        const acc = await this.getConnection().getAccountInfo(pk);
+        if (acc == null) {
+            throw Error(`Could not fetch mint ${pk.toString()}`);
         }
-        return acc.value.owner;
+        return acc.owner;
     };
     getStrategyBalancesOrca = async (strategy, collateralInfos, scopePrices, disabledTokensPrices) => {
-        const res = await this.getConnection().getMultipleAccounts([strategy.pool, strategy.position]).send();
-        const [whirlpoolAcc, positionAcc] = res.value;
+        const [whirlpoolAcc, positionAcc] = await this.getConnection().getMultipleAccountsInfo([
+            strategy.pool,
+            strategy.position,
+        ]);
         if (!whirlpoolAcc) {
             throw Error(`Could not fetch Orca whirlpool state with pubkey ${strategy.pool.toString()}`);
         }
         if (!positionAcc) {
             throw Error(`Could not fetch Orca whirlpool position state with pubkey ${strategy.position.toString()}`);
         }
-        const whirlpool = accounts_2.Whirlpool.decode(Buffer.from(whirlpoolAcc.data[0], 'base64'));
-        const position = accounts_2.Position.decode(Buffer.from(positionAcc.data[0], 'base64'));
+        const [whirlpool, position] = await Promise.all([
+            whirlpools_client_1.Whirlpool.decode(whirlpoolAcc.data),
+            whirlpools_client_1.Position.decode(positionAcc.data),
+        ]);
         return this.getOrcaBalances(strategy, whirlpool, position, collateralInfos, scopePrices, disabledTokensPrices, undefined);
     };
     getStrategyBalancesRaydium = async (strategy, collateralInfos, scopePrices, disabledTokensPrices) => {
-        const res = await (0, kit_1.fetchEncodedAccounts)(this.getConnection(), [strategy.pool, strategy.position]);
-        const [poolStateAcc, positionAcc] = res;
-        if (!poolStateAcc.exists) {
-            throw Error(`Could not fetch Raydium pool state with pubkey ${strategy.pool}`);
+        const [poolStateAcc, positionAcc] = await this.getConnection().getMultipleAccountsInfo([
+            strategy.pool,
+            strategy.position,
+        ]);
+        if (!poolStateAcc) {
+            throw Error(`Could not fetch Raydium pool state with pubkey ${strategy.pool.toString()}`);
         }
-        if (!positionAcc.exists) {
-            throw Error(`Could not fetch Raydium position state with pubkey ${strategy.position}`);
+        if (!positionAcc) {
+            throw Error(`Could not fetch Raydium position state with pubkey ${strategy.position.toString()}`);
         }
-        const poolState = accounts_3.PoolState.decode(Buffer.from(poolStateAcc.data));
-        const position = accounts_3.PersonalPositionState.decode(Buffer.from(positionAcc.data));
+        const [poolState, position] = await Promise.all([
+            raydium_client_1.PoolState.decode(poolStateAcc.data),
+            raydium_client_1.PersonalPositionState.decode(positionAcc.data),
+        ]);
         return this.getRaydiumBalances(strategy, poolState, position, collateralInfos, scopePrices, disabledTokensPrices);
     };
     getStrategyBalancesMeteora = async (strategy, collateralInfos, scopePrices, disabledTokensPrices) => {
-        const res = await this.getConnection().getMultipleAccounts([strategy.pool, strategy.position]).send();
-        const [poolStateAcc, positionAcc] = res.value;
+        const [poolStateAcc, positionAcc] = await this.getConnection().getMultipleAccountsInfo([
+            strategy.pool,
+            strategy.position,
+        ]);
         if (!poolStateAcc) {
-            throw Error(`Could not fetch Meteora pool state with pubkey ${strategy.pool}`);
+            throw Error(`Could not fetch Meteora pool state with pubkey ${strategy.pool.toString()}`);
         }
         if (!positionAcc) {
-            throw Error(`Could not fetch Meteora position state with pubkey ${strategy.position}`);
+            throw Error(`Could not fetch Meteora position state with pubkey ${strategy.position.toString()}`);
         }
-        const poolState = accounts_4.LbPair.decode(Buffer.from(poolStateAcc.data[0], 'base64'));
         try {
-            const position = accounts_4.PositionV2.decode(Buffer.from(positionAcc.data[0], 'base64'));
+            const [poolState, position] = await Promise.all([
+                accounts_2.LbPair.decode(poolStateAcc.data),
+                accounts_2.PositionV2.decode(positionAcc.data),
+            ]);
             return this.getMeteoraBalances(strategy, poolState, position, collateralInfos, scopePrices, disabledTokensPrices);
         }
         catch (e) {
+            const poolState = accounts_2.LbPair.decode(poolStateAcc.data);
             return this.getMeteoraBalances(strategy, poolState, undefined, collateralInfos, scopePrices, disabledTokensPrices);
         }
     };
@@ -1313,7 +1325,7 @@ class Kamino {
                 }
             }
             else {
-                if (collateralInfo.mint === pubkeys_1.DEFAULT_PUBLIC_KEY) {
+                if (collateralInfo.mint.equals(web3_js_1.PublicKey.default)) {
                     continue;
                 }
                 disabledTokens.push(collateralInfo.mint);
@@ -1324,7 +1336,7 @@ class Kamino {
                 ? disabledTokensPrices
                 : await JupService_1.JupService.getDollarPrices(disabledTokens, this._jupBaseAPI);
             for (const [token, price] of tokensPrices) {
-                const collInfo = collateralInfos.find((x) => x.mint === token);
+                const collInfo = collateralInfos.find((x) => x.mint.equals(token));
                 if (!collInfo) {
                     console.log(`Could not find collateral info for token ${token.toString()}`);
                     continue;
@@ -1372,7 +1384,7 @@ class Kamino {
         else {
             prices = await this._scope.getOraclePrices({ prices: strategy.scopePrices });
         }
-        let jupPrices;
+        let jupPrices = new pubkey_1.PubkeyHashMap();
         if (disabledTokensPrices) {
             jupPrices = disabledTokensPrices;
         }
@@ -1429,28 +1441,22 @@ class Kamino {
     /**
      * Get all token accounts for the specified share mint
      */
-    getShareTokenAccounts = async (shareMint) => {
+    getShareTokenAccounts = (shareMint) => {
         //how to get all token accounts for specific mint: https://spl.solana.com/token#finding-all-token-accounts-for-a-specific-mint
         //get it from the hardcoded token program and create a filter with the actual mint address
         //datasize:165 filter selects all token accounts, memcmp filter selects based on the mint address withing each token account
-        return this._rpc
-            .getProgramAccounts(token_1.TOKEN_PROGRAM_ADDRESS, {
-            filters: [{ dataSize: 165n }, { memcmp: { offset: 0n, bytes: shareMint, encoding: 'base58' } }],
-            encoding: 'jsonParsed',
-        })
-            .send();
+        return this._connection.getParsedProgramAccounts(spl_token_1.TOKEN_PROGRAM_ID, {
+            filters: [{ dataSize: 165 }, { memcmp: { offset: 0, bytes: shareMint.toBase58() } }],
+        });
     };
     /**
      * Get all token accounts for the specified wallet
      */
-    getAllTokenAccounts = async (wallet) => {
+    getAllTokenAccounts = (wallet) => {
         //how to get all token accounts for specific wallet: https://spl.solana.com/token#finding-all-token-accounts-for-a-wallet
-        return this._rpc
-            .getProgramAccounts(token_1.TOKEN_PROGRAM_ADDRESS, {
-            filters: [{ dataSize: 165n }, { memcmp: { offset: 32n, bytes: wallet, encoding: 'base58' } }],
-            encoding: 'jsonParsed',
-        })
-            .send();
+        return this._connection.getParsedProgramAccounts(spl_token_1.TOKEN_PROGRAM_ID, {
+            filters: [{ dataSize: 165 }, { memcmp: { offset: 32, bytes: wallet.toString() } }],
+        });
     };
     /**
      * Get all token accounts that are holding a specific Kamino whirlpool strategy
@@ -1464,13 +1470,13 @@ class Kamino {
      */
     getStrategyRange = async (strategy) => {
         const stratWithAddress = await this.getStrategyStateIfNotFetched(strategy);
-        if (stratWithAddress.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA')) {
+        if (stratWithAddress.strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('ORCA')) {
             return this.getStrategyRangeOrca(strategy);
         }
-        else if (stratWithAddress.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM')) {
+        else if (stratWithAddress.strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
             return this.getStrategyRangeRaydium(strategy);
         }
-        else if (stratWithAddress.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA')) {
+        else if (stratWithAddress.strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
             return this.getStrategyRangeMeteora(strategy);
         }
         else {
@@ -1479,7 +1485,7 @@ class Kamino {
     };
     getStrategyRangeOrca = async (strategy) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        if (strategyState.position === pubkeys_1.DEFAULT_PUBLIC_KEY) {
+        if (strategyState.position == web3_js_1.PublicKey.default) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
         else {
@@ -1488,7 +1494,7 @@ class Kamino {
     };
     getStrategyRangeRaydium = async (strategy) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        if (strategyState.position === pubkeys_1.DEFAULT_PUBLIC_KEY) {
+        if (strategyState.position == web3_js_1.PublicKey.default) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
         else {
@@ -1497,7 +1503,7 @@ class Kamino {
     };
     getStrategyRangeMeteora = async (strategy) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        if (strategyState.position === pubkeys_1.DEFAULT_PUBLIC_KEY) {
+        if (strategyState.position == web3_js_1.PublicKey.default) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
         else {
@@ -1505,13 +1511,13 @@ class Kamino {
         }
     };
     getPositionRange = async (dex, position, decimalsA, decimalsB) => {
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             return this.getPositionRangeOrca(position, decimalsA, decimalsB);
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             return this.getPositionRangeRaydium(position, decimalsA, decimalsB);
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             return this.getPositionRangeMeteora(position, decimalsA, decimalsB);
         }
         else {
@@ -1519,10 +1525,10 @@ class Kamino {
         }
     };
     getPositionRangeOrca = async (positionPk, decimalsA, decimalsB) => {
-        if (positionPk === pubkeys_1.DEFAULT_PUBLIC_KEY) {
+        if (positionPk.equals(web3_js_1.PublicKey.default)) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
-        const position = await accounts_2.Position.fetch(this._rpc, positionPk, this._orcaService.getWhirlpoolProgramId());
+        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 };
         }
@@ -1532,10 +1538,10 @@ class Kamino {
         return positionRange;
     };
     getPositionRangeRaydium = async (positionPk, decimalsA, decimalsB) => {
-        if (positionPk === pubkeys_1.DEFAULT_PUBLIC_KEY) {
+        if (positionPk.equals(web3_js_1.PublicKey.default)) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
-        const position = await accounts_3.PersonalPositionState.fetch(this._rpc, positionPk, this._raydiumService.getRaydiumProgramId());
+        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 };
         }
@@ -1545,14 +1551,14 @@ class Kamino {
         return positionRange;
     };
     getPositionRangeMeteora = async (positionPk, decimalsA, decimalsB) => {
-        if (positionPk === pubkeys_1.DEFAULT_PUBLIC_KEY) {
+        if (positionPk.equals(web3_js_1.PublicKey.default)) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
-        const position = await accounts_4.PositionV2.fetch(this._rpc, positionPk, this._meteoraService.getMeteoraProgramId());
+        const position = await accounts_2.PositionV2.fetch(this._connection, positionPk, this._meteoraService.getMeteoraProgramId());
         if (!position) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
-        const pool = await accounts_4.LbPair.fetch(this._rpc, position.lbPair);
+        const pool = await accounts_2.LbPair.fetch(this._connection, position.lbPair);
         if (!pool) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
@@ -1571,14 +1577,10 @@ class Kamino {
         const result = [];
         for (const tokenAccount of tokenAccounts) {
             const accountData = tokenAccount.account.data;
-            if ('parsed' in accountData) {
-                result.push({
-                    // @ts-ignore
-                    holderPubkey: (0, kit_1.address)(accountData.parsed.info.owner),
-                    // @ts-ignore
-                    amount: new decimal_js_1.default(accountData.parsed.info.tokenAmount.uiAmountString),
-                });
-            }
+            result.push({
+                holderPubkey: new web3_js_1.PublicKey(accountData.parsed.info.owner),
+                amount: new decimal_js_1.default(accountData.parsed.info.tokenAmount.uiAmountString),
+            });
         }
         return result;
     };
@@ -1588,17 +1590,18 @@ class Kamino {
      */
     getWhirlpools = async (whirlpools) => {
         // todo: make this map have Pubkey as key
-        const whirlpoolMap = new Map();
-        const uniqueWhirlpools = [...new Set(whirlpools)];
+        const whirlpoolMap = new pubkey_1.PubkeyHashMap();
+        const whirlpoolStrings = whirlpools.map((whirlpool) => whirlpool.toBase58());
+        const uniqueWhirlpools = [...new Set(whirlpoolStrings)].map((value) => new web3_js_1.PublicKey(value));
         if (uniqueWhirlpools.length === 1) {
             const whirlpool = await this.getWhirlpoolByAddress(whirlpools[0]);
             whirlpoolMap.set(whirlpools[0], whirlpool);
             return whirlpoolMap;
         }
-        const fetched = await (0, utils_1.batchFetch)(uniqueWhirlpools, (chunk) => accounts_2.Whirlpool.fetchMultiple(this._rpc, chunk, this._orcaService.getWhirlpoolProgramId()));
+        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]] = whirlpool;
+            map[uniqueWhirlpools[i].toBase58()] = whirlpool;
             return map;
         }, {});
         return whirlpoolMap;
@@ -1608,54 +1611,55 @@ class Kamino {
      * @param positions
      */
     getOrcaPositions = async (positions) => {
-        const nonDefaults = positions.filter((value) => value !== pubkeys_1.DEFAULT_PUBLIC_KEY);
-        const fetched = await (0, utils_1.batchFetch)(nonDefaults, (chunk) => accounts_2.Position.fetchMultiple(this._rpc, chunk, this._orcaService.getWhirlpoolProgramId()));
+        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, this._orcaService.getWhirlpoolProgramId()));
         const fetchedMap = fetched.reduce((map, position, i) => {
-            map[nonDefaults[i]] = position;
+            map[nonDefaults[i].toBase58()] = position;
             return map;
         }, {});
-        return positions.map((position) => fetchedMap[position] || null);
+        return positions.map((position) => fetchedMap[position.toBase58()] || null);
     };
     /**
      * Get a list of Raydium positions from public keys
      * @param positions
      */
     getRaydiumPositions = async (positions) => {
-        const nonDefaults = positions.filter((value) => value !== pubkeys_1.DEFAULT_PUBLIC_KEY);
-        const fetched = await (0, utils_1.batchFetch)(nonDefaults, (chunk) => accounts_3.PersonalPositionState.fetchMultiple(this._rpc, chunk, this._raydiumService.getRaydiumProgramId()));
+        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, this._raydiumService.getRaydiumProgramId()));
         const fetchedMap = fetched.reduce((map, position, i) => {
-            map[nonDefaults[i]] = position;
+            map[nonDefaults[i].toBase58()] = position;
             return map;
         }, {});
-        return positions.map((position) => fetchedMap[position] || null);
+        return positions.map((position) => fetchedMap[position.toBase58()] || null);
     };
     getMeteoraPositions = async (positions) => {
-        const nonDefaults = positions.filter((value) => value !== pubkeys_1.DEFAULT_PUBLIC_KEY);
-        const fetched = await (0, utils_1.batchFetch)(nonDefaults, (chunk) => accounts_4.PositionV2.fetchMultiple(this._rpc, chunk, this._meteoraService.getMeteoraProgramId()));
+        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, this._meteoraService.getMeteoraProgramId()));
         const fetchedMap = fetched.reduce((map, position, i) => {
-            map[nonDefaults[i]] = position;
+            map[nonDefaults[i].toBase58()] = position;
             return map;
         }, {});
-        return positions.map((position) => fetchedMap[position] || null);
+        return positions.map((position) => fetchedMap[position.toBase58()] || null);
     };
     /**
      * Get whirlpool from public key
      * @param whirlpool pubkey of the orca whirlpool
      */
-    getWhirlpoolByAddress = (whirlpool) => accounts_2.Whirlpool.fetch(this._rpc, whirlpool, this._orcaService.getWhirlpoolProgramId());
+    getWhirlpoolByAddress = (whirlpool) => whirlpools_client_1.Whirlpool.fetch(this._connection, whirlpool, this._orcaService.getWhirlpoolProgramId());
     /**
      * Get a list of Raydium pools from public keys
      * @param pools
      */
     getRaydiumPools = async (pools) => {
         // todo: make this map have Pubkey as key
-        const poolsMap = new Map();
-        const uniquePools = [...new Set(pools)];
+        const poolsMap = new pubkey_1.PubkeyHashMap();
+        const poolStrings = pools.map((pool) => pool.toBase58());
+        const uniquePools = [...new Set(poolStrings)].map((value) => new web3_js_1.PublicKey(value));
         if (uniquePools.length === 1) {
             const pool = await this.getRaydiumPoolByAddress(pools[0]);
             poolsMap.set(pools[0], pool);
         }
-        const fetched = await (0, utils_1.batchFetch)(uniquePools, (chunk) => accounts_3.PoolState.fetchMultiple(this._rpc, chunk, this._raydiumService.getRaydiumProgramId()));
+        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;
@@ -1664,36 +1668,34 @@ class Kamino {
     };
     getMeteoraPools = async (pools) => {
         // todo: make this map have Pubkey as key
-        const poolsMap = new Map();
-        const uniquePools = [...new Set(pools)];
+        const poolsMap = new pubkey_1.PubkeyHashMap();
+        const poolStrings = pools.map((pool) => pool.toBase58());
+        const uniquePools = [...new Set(poolStrings)].map((value) => new web3_js_1.PublicKey(value));
         if (uniquePools.length === 1) {
             const pool = await this.getMeteoraPoolByAddress(pools[0]);
             poolsMap.set(pools[0], pool);
         }
-        const fetched = await (0, utils_1.batchFetch)(uniquePools, (chunk) => accounts_4.LbPair.fetchMultiple(this._rpc, chunk, this._meteoraService.getMeteoraProgramId()));
+        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) => accounts_3.AmmConfig.fetch(this._rpc, config, this._raydiumService.getRaydiumProgramId());
+    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) => accounts_3.PoolState.fetch(this._rpc, pool, this._raydiumService.getRaydiumProgramId());
-    getMeteoraPoolByAddress = (pool) => accounts_4.LbPair.fetch(this._rpc, pool, this._meteoraService.getMeteoraProgramId());
-    getEventAuthorityPDA = async (dex) => {
-        if (dex.toNumber() === (0, utils_1.dexToNumber)('ORCA') || dex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM')) {
-            return (0, kit_1.none)();
-        }
-        if (dex.toNumber() === (0, utils_1.dexToNumber)('METEORA')) {
-            const [key] = await (0, kit_1.getProgramDerivedAddress)({
-                seeds: [Buffer.from('__event_authority')],
-                programAddress: this._meteoraService.getMeteoraProgramId(),
-            });
-            return (0, kit_1.some)(key);
+    getRaydiumPoolByAddress = (pool) => raydium_client_1.PoolState.fetch(this._connection, pool, this._raydiumService.getRaydiumProgramId());
+    getMeteoraPoolByAddress = (pool) => accounts_2.LbPair.fetch(this._connection, pool, this._meteoraService.getMeteoraProgramId());
+    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')], this._meteoraService.getMeteoraProgramId());
+            return key;
         }
         throw new Error('Invalid dex');
     };
@@ -1709,15 +1711,15 @@ class Kamino {
             throw Error('Shares amount cant be lower than or equal to 0.');
         }
         const strategyState = await this.getStrategyStateIfNotFetched(strategy);
-        const eventAuthority = await this.getEventAuthorityPDA(strategyState.strategy.strategyDex);
-        const { treasuryFeeTokenAVault, treasuryFeeTokenBVault } = await this.getTreasuryFeeVaultPDAs(strategyState.strategy.tokenAMint, strategyState.strategy.tokenBMint);
+        const eventAuthority = this.getEventAuthorityPDA(strategyState.strategy.strategyDex);
+        const { treasuryFeeTokenAVault, treasuryFeeTokenBVault } = this.getTreasuryFeeVaultPDAs(strategyState.strategy.tokenAMint, strategyState.strategy.tokenBMint);
         const [sharesAta, tokenAAta, tokenBAta] = await Promise.all([
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.sharesMint, owner.address),
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenAMint, owner.address, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenBMint, owner.address, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.sharesMint, owner),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenAMint, owner, true, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID)),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenBMint, owner, true, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID)),
         ]);
         const sharesAmountInLamports = sharesAmount.mul(new decimal_js_1.default(10).pow(strategyState.strategy.sharesMintDecimals.toString()));
-        const programId = this.getDexProgramId(strategyState.strategy);
+        const programId = (0, utils_1.getDexProgramId)(strategyState.strategy);
         const args = { sharesAmount: new bn_js_1.default(sharesAmountInLamports.floor().toString()) };
         const accounts = {
             user: owner,
@@ -1738,25 +1740,25 @@ class Kamino {
             sharesMint: strategyState.strategy.sharesMint,
             treasuryFeeTokenAVault,
             treasuryFeeTokenBVault,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-            tokenProgram2022: token_2022_1.TOKEN_2022_PROGRAM_ADDRESS,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
             positionTokenAccount: strategyState.strategy.positionTokenAccount,
             poolProgram: programId,
-            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             tokenAMint: strategyState.strategy.tokenAMint,
             tokenBMint: strategyState.strategy.tokenBMint,
             eventAuthority,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
             memoProgram: pubkeys_1.MEMO_PROGRAM_ID,
         };
-        let withdrawIx = (0, instructions_2.withdraw)(args, accounts, this.getProgramID());
+        const withdrawIx = (0, instructions_1.withdraw)(args, accounts);
         let collectFeesAndRewardsIxns = [];
         //  for Raydium strats we need to collect fees and rewards before withdrawal
         //  add rewards vaults accounts to withdraw
-        const isRaydium = strategyState.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM');
+        const isRaydium = strategyState.strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM');
         if (isRaydium) {
-            const raydiumPosition = await accounts_3.PersonalPositionState.fetch(this._rpc, strategyState.strategy.position, this._raydiumService.getRaydiumProgramId());
+            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');
             }
@@ -1767,94 +1769,39 @@ class Kamino {
             if (!poolState) {
                 throw new Error('Pool is not found');
             }
-            withdrawIx = {
-                ...withdrawIx,
-                accounts: withdrawIx.accounts?.concat([
-                    {
-                        address: strategyState.strategy.raydiumPoolConfigOrBaseVaultAuthority,
-                        role: kit_1.AccountRole.WRITABLE,
-                    },
-                ]),
-            };
+            withdrawIx.keys.push({
+                pubkey: strategyState.strategy.raydiumProtocolPositionOrBaseVaultAuthority,
+                isSigner: false,
+                isWritable: true,
+            });
             if (strategyState.strategy.reward0Decimals.toNumber() > 0) {
-                withdrawIx = {
-                    ...withdrawIx,
-                    accounts: withdrawIx.accounts?.concat([
-                        {
-                            address: poolState.rewardInfos[0].tokenVault,
-                            role: kit_1.AccountRole.WRITABLE,
-                        },
-                        {
-                            address: strategyState.strategy.reward0Vault,
-                            role: kit_1.AccountRole.WRITABLE,
-                        },
-                        {
-                            address: poolState.rewardInfos[0].tokenMint,
-                            role: kit_1.AccountRole.WRITABLE,
-                        },
-                    ]),
-                };
+                withdrawIx.keys = withdrawIx.keys.concat([
+                    { pubkey: poolState.rewardInfos[0].tokenVault, isSigner: false, isWritable: true },
+                    { pubkey: strategyState.strategy.reward0Vault, isSigner: false, isWritable: true },
+                    { pubkey: poolState.rewardInfos[0].tokenMint, isSigner: false, isWritable: true },
+                ]);
             }
             if (strategyState.strategy.reward1Decimals.toNumber() > 0) {
-                withdrawIx = {
-                    ...withdrawIx,
-                    accounts: withdrawIx.accounts?.concat([
-                        {
-                            address: poolState.rewardInfos[1].tokenVault,
-                            role: kit_1.AccountRole.WRITABLE,
-                        },
-                        {
-                            address: strategyState.strategy.reward1Vault,
-                            role: kit_1.AccountRole.WRITABLE,
-                        },
-                        {
-                            address: poolState.rewardInfos[1].tokenMint,
-                            role: kit_1.AccountRole.WRITABLE,
-                        },
-                    ]),
-                };
+                withdrawIx.keys = withdrawIx.keys.concat([
+                    { pubkey: poolState.rewardInfos[1].tokenVault, isSigner: false, isWritable: true },
+                    { pubkey: strategyState.strategy.reward1Vault, isSigner: false, isWritable: true },
+                    { pubkey: poolState.rewardInfos[1].tokenMint, isSigner: false, isWritable: true },
+                ]);
             }
             if (strategyState.strategy.reward2Decimals.toNumber() > 0) {
-                withdrawIx = {
-                    ...withdrawIx,
-                    accounts: withdrawIx.accounts?.concat([
-                        {
-                            address: poolState.rewardInfos[2].tokenVault,
-                            role: kit_1.AccountRole.WRITABLE,
-                        },
-                        {
-                            address: strategyState.strategy.reward2Vault,
-                            role: kit_1.AccountRole.WRITABLE,
-                        },
-                        {
-                            address: poolState.rewardInfos[2].tokenMint,
-                            role: kit_1.AccountRole.WRITABLE,
-                        },
-                    ]),
-                };
+                withdrawIx.keys = withdrawIx.keys.concat([
+                    { pubkey: poolState.rewardInfos[2].tokenVault, isSigner: false, isWritable: true },
+                    { pubkey: strategyState.strategy.reward2Vault, isSigner: false, isWritable: true },
+                    { pubkey: poolState.rewardInfos[2].tokenMint, isSigner: false, isWritable: true },
+                ]);
             }
-            const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = await (0, kit_1.getProgramDerivedAddress)({
-                seeds: [Buffer.from('pool_tick_array_bitmap_extension'), addressEncoder.encode(strategyState.strategy.pool)],
-                programAddress: this._raydiumService.getRaydiumProgramId(),
-            });
-            withdrawIx = {
-                ...withdrawIx,
-                accounts: withdrawIx.accounts?.concat([
-                    {
-                        address: poolTickArrayBitmap,
-                        role: kit_1.AccountRole.WRITABLE,
-                    },
-                ]),
-            };
+            const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('pool_tick_array_bitmap_extension'), strategyState.strategy.pool.toBuffer()], this._raydiumService.getRaydiumProgramId());
+            withdrawIx.keys.push({ pubkey: poolTickArrayBitmap, isSigner: false, isWritable: true });
         }
         const res = { prerequisiteIxs: collectFeesAndRewardsIxns, withdrawIx };
         // if we withdraw everything also close the shares ATA
         if (sharesAtaBalance && sharesAtaBalance.lte(sharesAmount)) {
-            res.closeSharesAtaIx = (0, token_2022_1.getCloseAccountInstruction)({
-                owner,
-                account: sharesAta,
-                destination: owner.address,
-            }, { programAddress: token_1.TOKEN_PROGRAM_ADDRESS });
+            res.closeSharesAtaIx = (0, spl_token_1.createCloseAccountInstruction)(sharesAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID);
         }
         return res;
     };
@@ -1873,31 +1820,31 @@ class Kamino {
     getCreateAssociatedTokenAccountInstructionsIfNotExist = async (owner, strategyState, tokenAData, tokenAAta, tokenBData, tokenBAta, sharesMintData, sharesAta) => {
         const instructions = [];
         if (!tokenAData) {
-            const tokenProgramA = strategyState.strategy.tokenATokenProgram === pubkeys_1.DEFAULT_PUBLIC_KEY
-                ? token_1.TOKEN_PROGRAM_ADDRESS
+            const tokenProgramA = strategyState.strategy.tokenATokenProgram == web3_js_1.PublicKey.default
+                ? spl_token_1.TOKEN_PROGRAM_ID
                 : strategyState.strategy.tokenATokenProgram;
-            instructions.push((0, utils_1.createAssociatedTokenAccountInstruction)(owner, tokenAAta, owner.address, strategyState.strategy.tokenAMint, tokenProgramA));
+            instructions.push((0, utils_1.createAssociatedTokenAccountInstruction)(owner, tokenAAta, owner, strategyState.strategy.tokenAMint, tokenProgramA));
         }
         if (!tokenBData) {
-            const tokenProgramB = strategyState.strategy.tokenBTokenProgram === pubkeys_1.DEFAULT_PUBLIC_KEY
-                ? token_1.TOKEN_PROGRAM_ADDRESS
+            const tokenProgramB = strategyState.strategy.tokenBTokenProgram == web3_js_1.PublicKey.default
+                ? spl_token_1.TOKEN_PROGRAM_ID
                 : strategyState.strategy.tokenBTokenProgram;
-            instructions.push((0, utils_1.createAssociatedTokenAccountInstruction)(owner, tokenBAta, owner.address, strategyState.strategy.tokenBMint, tokenProgramB));
+            instructions.push((0, utils_1.createAssociatedTokenAccountInstruction)(owner, tokenBAta, owner, strategyState.strategy.tokenBMint, tokenProgramB));
         }
         if (!sharesMintData) {
-            instructions.push((0, utils_1.createAssociatedTokenAccountInstruction)(owner, sharesAta, owner.address, strategyState.strategy.sharesMint));
+            instructions.push((0, utils_1.createAssociatedTokenAccountInstruction)(owner, sharesAta, owner, strategyState.strategy.sharesMint));
         }
         return instructions;
     };
     /**
      * Check if strategy has already been fetched (is StrategyWithAddress type) and return that,
-     * otherwise fetch it first from Address and return it
+     * otherwise fetch it first from PublicKey and return it
      * @param strategy
      * @private
      */
     getStrategyStateIfNotFetched = async (strategy) => {
         const hasStrategyBeenFetched = (object) => {
-            return !(typeof object === 'string' && (0, kit_1.isAddress)(object));
+            return 'strategy' in object;
         };
         if (hasStrategyBeenFetched(strategy)) {
             return strategy;
@@ -1946,21 +1893,10 @@ class Kamino {
      * @param tokenBMint
      * @private
      */
-    getTreasuryFeeVaultPDAs = async (tokenAMint, tokenBMint) => {
-        const [[treasuryFeeTokenAVault], [treasuryFeeTokenBVault], [treasuryFeeVaultAuthority]] = await Promise.all([
-            (0, kit_1.getProgramDerivedAddress)({
-                seeds: [Buffer.from('treasury_fee_vault'), addressEncoder.encode(tokenAMint)],
-                programAddress: this.getProgramID(),
-            }),
-            (0, kit_1.getProgramDerivedAddress)({
-                seeds: [Buffer.from('treasury_fee_vault'), addressEncoder.encode(tokenBMint)],
-                programAddress: this.getProgramID(),
-            }),
-            (0, kit_1.getProgramDerivedAddress)({
-                seeds: [Buffer.from('treasury_fee_vault_authority')],
-                programAddress: this.getProgramID(),
-            }),
-        ]);
+    getTreasuryFeeVaultPDAs = (tokenAMint, tokenBMint) => {
+        const [treasuryFeeTokenAVault, _treasuryFeeTokenAVaultBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('treasury_fee_vault'), tokenAMint.toBuffer()], this.getProgramID());
+        const [treasuryFeeTokenBVault, _treasuryFeeTokenBVaultBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('treasury_fee_vault'), tokenBMint.toBuffer()], this.getProgramID());
+        const [treasuryFeeVaultAuthority, _treasuryFeeVaultAuthorityBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('treasury_fee_vault_authority')], this.getProgramID());
         return { treasuryFeeTokenAVault, treasuryFeeTokenBVault, treasuryFeeVaultAuthority };
     };
     /**
@@ -1971,12 +1907,15 @@ class Kamino {
      */
     withdrawAllShares = async (strategy, owner) => {
         const strategyState = await this.getStrategyStateIfNotFetched(strategy);
-        const [, sharesData] = await (0, utils_1.getAssociatedTokenAddressAndAccount)(this._rpc, strategyState.strategy.sharesMint, owner.address);
-        if (!sharesData || sharesData.data.amount === 0n) {
+        const [sharesAta, sharesData] = await (0, utils_1.getAssociatedTokenAddressAndData)(this._connection, strategyState.strategy.sharesMint, owner);
+        if (!sharesData) {
             return null;
         }
-        const amount = new decimal_js_1.default(sharesData.data.amount.toString()).div(new decimal_js_1.default(10).pow(strategyState.strategy.sharesMintDecimals.toString()));
-        return this.withdrawShares(strategyState, amount, owner);
+        const balance = await this.getTokenAccountBalance(sharesAta);
+        if (balance.isZero()) {
+            return null;
+        }
+        return this.withdrawShares(strategyState, balance, owner);
     };
     /**
      * Get all the accounts needed by the deposit tx, without the swap.
@@ -1986,14 +1925,14 @@ class Kamino {
      */
     getAllDepositAccounts = async (strategy, owner) => {
         const strategyState = await this.getStrategyStateIfNotFetched(strategy);
-        const globalConfig = await accounts_1.GlobalConfig.fetch(this._rpc, strategyState.strategy.globalConfig, this.getProgramID());
+        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()}`);
         }
         const [sharesAta, tokenAAta, tokenBAta] = await Promise.all([
             (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.sharesMint, owner),
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenAMint, owner, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenBMint, owner, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenAMint, owner, true, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID)),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenBMint, owner, true, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID)),
         ]);
         const accounts = [
             owner,
@@ -2013,10 +1952,10 @@ class Kamino {
             strategyState.strategy.sharesMintAuthority,
             strategyState.strategy.scopePrices,
             globalConfig.tokenInfos,
-            token_1.TOKEN_PROGRAM_ADDRESS,
-            (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
+            spl_token_1.TOKEN_PROGRAM_ID,
+            (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             strategyState.strategy.tickArrayLower,
             strategyState.strategy.tickArrayUpper,
         ];
@@ -2039,11 +1978,9 @@ class Kamino {
         if (!globalConfig) {
             throw Error(`Could not fetch global config with pubkey ${strategyState.strategy.globalConfig.toString()}`);
         }
-        const [sharesAta, tokenAAta, tokenBAta] = await Promise.all([
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.sharesMint, owner.address),
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenAMint, owner.address, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.strategy.tokenBMint, owner.address, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
-        ]);
+        const [sharesAta] = await (0, utils_1.getAssociatedTokenAddressAndData)(this._connection, strategyState.strategy.sharesMint, owner);
+        const [tokenAAta] = await (0, utils_1.getAssociatedTokenAddressAndData)(this._connection, strategyState.strategy.tokenAMint, owner, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID));
+        const [tokenBAta] = await (0, utils_1.getAssociatedTokenAddressAndData)(this._connection, strategyState.strategy.tokenBMint, owner, (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID));
         const lamportsA = amountA.mul(new decimal_js_1.default(10).pow(strategyState.strategy.tokenAMintDecimals.toString()));
         const lamportsB = amountB.mul(new decimal_js_1.default(10).pow(strategyState.strategy.tokenBMintDecimals.toString()));
         const depositArgs = {
@@ -2068,29 +2005,29 @@ class Kamino {
             sharesMintAuthority: strategyState.strategy.sharesMintAuthority,
             scopePrices: strategyState.strategy.scopePrices,
             tokenInfos: globalConfig.tokenInfos,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             tickArrayLower: strategyState.strategy.tickArrayLower,
             tickArrayUpper: strategyState.strategy.tickArrayUpper,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.strategy.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.strategy.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
         };
-        return (0, instructions_2.deposit)(depositArgs, depositAccounts, this.getProgramID());
+        return (0, instructions_1.deposit)(depositArgs, depositAccounts);
     };
     singleSidedDepositTokenA = async (strategy, amountToDeposit, owner, slippageBps, profiler = utils_1.noopProfiledFunctionExecution, swapIxsBuilder, initialUserTokenAtaBalances, priceAInB, includeAtaIxns = true, // if true it includes create and close wsol and token atas,
     onlyDirectRoutes) => {
         const strategyWithAddress = await this.getStrategyStateIfNotFetched(strategy);
-        const userTokenBalances = await profiler(this.getInitialUserTokenBalances(owner.address, strategyWithAddress.strategy.tokenAMint, strategyWithAddress.strategy.tokenBMint, initialUserTokenAtaBalances), 'A-getInitialUserTokenBalances', []);
+        const userTokenBalances = await profiler(this.getInitialUserTokenBalances(owner, strategyWithAddress.strategy.tokenAMint, strategyWithAddress.strategy.tokenBMint, initialUserTokenAtaBalances), 'A-getInitialUserTokenBalances', []);
         const userTokenBalancesWithoutSolBalanace = {
             a: userTokenBalances.a,
             b: userTokenBalances.b,
         };
         // if any of the tokens is SOL, we need to read how much SOL the user has, not how much wSOL which is what getInitialUserTokenBalances returns
         if ((0, utils_1.isSOLMint)(strategyWithAddress.strategy.tokenAMint)) {
-            userTokenBalances.a = userTokenBalances.a?.add((0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default((await this._rpc.getBalance(owner.address).send()).value.toString()), utils_1.DECIMALS_SOL));
+            userTokenBalances.a = userTokenBalances.a?.add((0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default(await this._connection.getBalance(owner)), utils_1.DECIMALS_SOL));
         }
         if ((0, utils_1.isSOLMint)(strategyWithAddress.strategy.tokenBMint)) {
-            userTokenBalances.b = userTokenBalances.b?.add((0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default((await this._rpc.getBalance(owner.address).send()).value.toString()), utils_1.DECIMALS_SOL));
+            userTokenBalances.b = userTokenBalances.b?.add((0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default(await this._connection.getBalance(owner)), utils_1.DECIMALS_SOL));
         }
         if (!userTokenBalances.a || !userTokenBalances.b) {
             throw Error('Error reading user token balances');
@@ -2098,7 +2035,7 @@ class Kamino {
         const tokenAMinPostDepositBalance = userTokenBalances.a?.sub(amountToDeposit);
         const swapper = swapIxsBuilder
             ? swapIxsBuilder
-            : (input, tokenAMint, tokenBMint, user, slippageBps, allAccounts) => this.getJupSwapIxsV6(input, tokenAMint, tokenBMint, user.address, slippageBps, false, allAccounts, profiler, onlyDirectRoutes);
+            : (input, tokenAMint, tokenBMint, user, slippageBps, allAccounts) => this.getJupSwapIxsV6(input, tokenAMint, tokenBMint, user, slippageBps, false, allAccounts, profiler, onlyDirectRoutes);
         console.log('single sided deposit tokenA tokenAMinPostDepositBalance', tokenAMinPostDepositBalance);
         console.log('single sided deposit tokenA userTokenBalances.b', userTokenBalances.b);
         return await profiler(this.getSingleSidedDepositIxs(strategyWithAddress, (0, utils_1.collToLamportsDecimal)(tokenAMinPostDepositBalance, strategyWithAddress.strategy.tokenAMintDecimals.toNumber()), (0, utils_1.collToLamportsDecimal)(userTokenBalances.b, strategyWithAddress.strategy.tokenBMintDecimals.toNumber()), owner, slippageBps, swapper, profiler, userTokenBalancesWithoutSolBalanace, priceAInB, includeAtaIxns), 'A-getSingleSidedDepositIxs', []);
@@ -2106,17 +2043,17 @@ class Kamino {
     singleSidedDepositTokenB = async (strategy, amountToDeposit, owner, slippageBps, profiler = utils_1.noopProfiledFunctionExecution, swapIxsBuilder, initialUserTokenAtaBalances, priceAInB, includeAtaIxns = true, // if true it includes create and close wsol and token atas,
     onlyDirectRoutes) => {
         const strategyWithAddress = await this.getStrategyStateIfNotFetched(strategy);
-        const userTokenBalances = await profiler(this.getInitialUserTokenBalances(owner.address, strategyWithAddress.strategy.tokenAMint, strategyWithAddress.strategy.tokenBMint, initialUserTokenAtaBalances), 'A-getInitialUserTokenBalances', []);
+        const userTokenBalances = await profiler(this.getInitialUserTokenBalances(owner, strategyWithAddress.strategy.tokenAMint, strategyWithAddress.strategy.tokenBMint, initialUserTokenAtaBalances), 'A-getInitialUserTokenBalances', []);
         const userTokenBalancesWithoutSolBalanace = {
             a: userTokenBalances.a,
             b: userTokenBalances.b,
         };
         // if any of the tokens is SOL, we need to read how much SOL the user has, not how much wSOL which is what getInitialUserTokenBalances returns
         if ((0, utils_1.isSOLMint)(strategyWithAddress.strategy.tokenAMint)) {
-            userTokenBalances.a = userTokenBalances.a?.add((0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default((await this._rpc.getBalance(owner.address).send()).value.toString()), utils_1.DECIMALS_SOL));
+            userTokenBalances.a = userTokenBalances.a?.add((0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default(await this._connection.getBalance(owner)), utils_1.DECIMALS_SOL));
         }
         if ((0, utils_1.isSOLMint)(strategyWithAddress.strategy.tokenBMint)) {
-            userTokenBalances.b = userTokenBalances.b?.add((0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default((await this._rpc.getBalance(owner.address).send()).value.toString()), utils_1.DECIMALS_SOL));
+            userTokenBalances.b = userTokenBalances.b?.add((0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default(await this._connection.getBalance(owner)), utils_1.DECIMALS_SOL));
         }
         if (!userTokenBalances.a || !userTokenBalances.b) {
             throw Error('Error reading user token balances');
@@ -2124,7 +2061,7 @@ class Kamino {
         const tokenBMinPostDepositBalance = userTokenBalances.b.sub(amountToDeposit);
         const swapper = swapIxsBuilder
             ? swapIxsBuilder
-            : (input, tokenAMint, tokenBMint, user, slippageBps, allAccounts) => this.getJupSwapIxsV6(input, tokenAMint, tokenBMint, user.address, slippageBps, false, allAccounts, profiler, onlyDirectRoutes);
+            : (input, tokenAMint, tokenBMint, user, slippageBps, allAccounts) => this.getJupSwapIxsV6(input, tokenAMint, tokenBMint, user, slippageBps, false, allAccounts, profiler, onlyDirectRoutes);
         return await profiler(this.getSingleSidedDepositIxs(strategyWithAddress, (0, utils_1.collToLamportsDecimal)(userTokenBalances.a, strategyWithAddress.strategy.tokenAMintDecimals.toNumber()), (0, utils_1.collToLamportsDecimal)(tokenBMinPostDepositBalance, strategyWithAddress.strategy.tokenBMintDecimals.toNumber()), owner, slippageBps, swapper, profiler, userTokenBalancesWithoutSolBalanace, priceAInB, includeAtaIxns), 'A-getSingleSidedDepositIxs', []);
     };
     getInitialUserTokenBalances = async (owner, tokenAMint, tokenBMint, initialUserTokenBalances) => {
@@ -2135,8 +2072,8 @@ class Kamino {
         }
         else {
             const tokenATokenProgram = await this.getAccountOwner(tokenAMint);
-            const tokenAAta = await (0, utils_1.getAssociatedTokenAddress)(tokenAMint, owner, (0, utils_1.keyOrDefault)(tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS));
-            const ataExists = await (0, transactions_1.checkIfAccountExists)(this._rpc, tokenAAta);
+            const [tokenAAta] = await (0, utils_1.getAssociatedTokenAddressAndData)(this._connection, tokenAMint, owner, (0, utils_1.keyOrDefault)(tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID));
+            const ataExists = await (0, transactions_1.checkIfAccountExists)(this._connection, tokenAAta);
             if (!ataExists) {
                 initialUserTokenABalance = new decimal_js_1.default(0);
             }
@@ -2149,8 +2086,8 @@ class Kamino {
         }
         else {
             const tokenBTokenProgram = await this.getAccountOwner(tokenBMint);
-            const tokenBAta = await (0, utils_1.getAssociatedTokenAddress)(tokenBMint, owner, (0, utils_1.keyOrDefault)(tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS));
-            const ataExists = await (0, transactions_1.checkIfAccountExists)(this._rpc, tokenBAta);
+            const [tokenBAta] = await (0, utils_1.getAssociatedTokenAddressAndData)(this._connection, tokenBMint, owner, (0, utils_1.keyOrDefault)(tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID));
+            const ataExists = await (0, transactions_1.checkIfAccountExists)(this._connection, tokenBAta);
             if (!ataExists) {
                 initialUserTokenBBalance = new decimal_js_1.default(0);
             }
@@ -2172,9 +2109,9 @@ class Kamino {
             throw Error('Token A or B post deposit amount cant be lower than 0.');
         }
         const [sharesAta, tokenAAta, tokenBAta] = await Promise.all([
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.sharesMint, owner.address),
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.tokenAMint, owner.address, (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.tokenBMint, owner.address, (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.sharesMint, owner),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.tokenAMint, owner, true, (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID)),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.tokenBMint, owner, true, (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID)),
         ]);
         let tokenAAtaBalance = initialUserTokenAtaBalances.a;
         let tokenBAtaBalance = initialUserTokenAtaBalances.b;
@@ -2184,7 +2121,7 @@ class Kamino {
         const createWsolAtasIxns = [];
         if ((0, utils_1.isSOLMint)(strategyState.tokenAMint)) {
             // read how much SOL the user has and calculate the amount to deposit and balance based on it
-            const solBalance = new decimal_js_1.default((await this._rpc.getBalance(owner.address).send()).value.toString());
+            const solBalance = new decimal_js_1.default(await this._connection.getBalance(owner));
             const tokenAAtaBalanceLamports = (0, utils_1.collToLamportsDecimal)(tokenAAtaBalance, strategyState.tokenAMintDecimals.toNumber());
             const availableSol = solBalance.add(tokenAAtaBalanceLamports);
             const solToDeposit = availableSol.sub(tokenAMinPostDepositBalanceLamports);
@@ -2194,9 +2131,9 @@ class Kamino {
                     tokenAAtaBalance = (0, utils_1.lamportsToNumberDecimal)(aToDeposit, utils_1.DECIMALS_SOL);
                 }
             }
-            const createWSolAtaIxns = await (0, transactions_1.createWsolAtaIfMissing)(this._rpc, new decimal_js_1.default((0, utils_1.lamportsToNumberDecimal)(solToDeposit, utils_1.DECIMALS_SOL)), owner);
+            const createWSolAtaIxns = await (0, transactions_1.createWsolAtaIfMissing)(this._connection, new decimal_js_1.default((0, utils_1.lamportsToNumberDecimal)(solToDeposit, utils_1.DECIMALS_SOL)), owner);
             // if the wSOL ata is not created, expect to have 0 remaining after the deposit
-            const wSolAtaExists = await (0, transactions_1.checkIfAccountExists)(this._rpc, createWSolAtaIxns.ata);
+            const wSolAtaExists = await (0, transactions_1.checkIfAccountExists)(this._connection, createWSolAtaIxns.ata);
             if (!wSolAtaExists) {
                 realTokenAMinPostDepositBalanceLamports = new decimal_js_1.default(0);
             }
@@ -2214,7 +2151,7 @@ class Kamino {
             }
         }
         if ((0, utils_1.isSOLMint)(strategyState.tokenBMint)) {
-            const solBalance = new decimal_js_1.default((await this._rpc.getBalance(owner.address).send()).value.toString());
+            const solBalance = new decimal_js_1.default(await this._connection.getBalance(owner));
             const tokenBAtaBalanceLamports = (0, utils_1.collToLamportsDecimal)(tokenBAtaBalance, strategyState.tokenBMintDecimals.toNumber());
             const availableSol = solBalance.add(tokenBAtaBalanceLamports);
             const solToDeposit = availableSol.sub(tokenBMinPostDepositBalanceLamports);
@@ -2225,8 +2162,8 @@ class Kamino {
                     tokenBAtaBalance = (0, utils_1.lamportsToNumberDecimal)(bToDeposit, utils_1.DECIMALS_SOL);
                 }
             }
-            const createWSolAtaIxns = await (0, transactions_1.createWsolAtaIfMissing)(this._rpc, new decimal_js_1.default((0, utils_1.lamportsToNumberDecimal)(solToDeposit, utils_1.DECIMALS_SOL)), owner);
-            const wSolAtaExists = await (0, transactions_1.checkIfAccountExists)(this._rpc, createWSolAtaIxns.ata);
+            const createWSolAtaIxns = await (0, transactions_1.createWsolAtaIfMissing)(this._connection, new decimal_js_1.default((0, utils_1.lamportsToNumberDecimal)(solToDeposit, utils_1.DECIMALS_SOL)), owner);
+            const wSolAtaExists = await (0, transactions_1.checkIfAccountExists)(this._connection, createWSolAtaIxns.ata);
             if (!wSolAtaExists) {
                 realTokenBMinPostDepositBalanceLamports = new decimal_js_1.default(0);
             }
@@ -2247,20 +2184,14 @@ class Kamino {
         if (aToDeposit.lessThan(0) || bToDeposit.lessThan(0)) {
             throw Error(`Token A or B to deposit amount cannot be lower than 0; aToDeposit=${aToDeposit.toString()} bToDeposit=${bToDeposit.toString()}`);
         }
-        const createAtaList = [[strategyState.sharesMint, token_1.TOKEN_PROGRAM_ADDRESS]];
+        const createAtaList = [[strategyState.sharesMint, spl_token_1.TOKEN_PROGRAM_ID]];
         if (!tokenAAtaBalance.greaterThan(0)) {
-            createAtaList.push([
-                strategyState.tokenAMint,
-                (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            ]);
+            createAtaList.push([strategyState.tokenAMint, (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID)]);
         }
         if (!tokenBAtaBalance.greaterThan(0)) {
-            createAtaList.push([
-                strategyState.tokenBMint,
-                (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            ]);
+            createAtaList.push([strategyState.tokenBMint, (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID)]);
         }
-        const createAtasIxnsPromise = (0, transactions_1.getAtasWithCreateIxnsIfMissing)(this._rpc, createAtaList.filter(([mint, _tokenProgram]) => !(0, utils_1.isSOLMint)(mint)), owner);
+        const createAtasIxnsPromise = (0, transactions_1.getAtasWithCreateIxnsIfMissing)(this._connection, createAtaList.filter(([mint, _tokenProgram]) => !(0, utils_1.isSOLMint)(mint)), owner);
         const getGlobalConfigPromise = this.getGlobalConfigState(strategyState.globalConfig);
         const [createAtasIxns, amountsToDepositWithSwap, globalConfig] = await Promise.all([
             createAtasIxnsPromise,
@@ -2293,20 +2224,20 @@ class Kamino {
             sharesMintAuthority: strategyState.sharesMintAuthority,
             scopePrices: strategyState.scopePrices,
             tokenInfos: globalConfig.tokenInfos,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             tickArrayLower: strategyWithAddress.strategy.tickArrayLower,
             tickArrayUpper: strategyWithAddress.strategy.tickArrayUpper,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyWithAddress.strategy.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyWithAddress.strategy.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyWithAddress.strategy.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyWithAddress.strategy.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
         };
-        const singleSidedDepositIx = (0, instructions_2.singleTokenDepositWithMin)(args, accounts, this.getProgramID());
+        const singleSidedDepositIx = (0, instructions_1.singleTokenDepositWithMin)(args, accounts);
         let result = [];
         if (includeAtaIxns) {
             result.push(...createAtasIxns, ...createWsolAtasIxns);
         }
         // get all unique accounts in the tx so we can use the remaining space (MAX_ACCOUNTS_PER_TRANSACTION - accounts_used) for the swap
-        const extractKeys = (ixs) => ixs.flatMap((ix) => ix.accounts?.map((key) => key.address) || []);
+        const extractKeys = (ixs) => ixs.flatMap((ix) => ix.keys?.map((key) => key.pubkey) || []);
         const allKeys = [
             ...extractKeys(result),
             ...extractKeys([checkExpectedVaultsBalancesIx]),
@@ -2345,15 +2276,15 @@ class Kamino {
      * @param amountLamports Amount of SOL to deposit into topup vault
      * @returns transaction instruction for adding SOL to topup vault
      */
-    upkeepTopupVault = async (owner, amountLamports) => {
+    upkeepTopupVault = (owner, amountLamports) => {
         if (amountLamports.lessThanOrEqualTo(0)) {
             throw Error('Must deposit a positive amount of SOL.');
         }
-        const topupVault = await this.getUserTopupVault(owner.address);
-        const ix = (0, system_1.getTransferSolInstruction)({
-            source: owner,
-            destination: topupVault,
-            amount: BigInt(amountLamports.floor().toString()),
+        const topupVault = this.getUserTopupVault(owner);
+        const ix = web3_js_1.SystemProgram.transfer({
+            fromPubkey: owner,
+            toPubkey: topupVault,
+            lamports: BigInt(amountLamports.floor().toString()),
         });
         return ix;
     };
@@ -2363,8 +2294,8 @@ class Kamino {
      * @returns SOL amount in topup vault
      */
     topupVaultBalance = async (owner) => {
-        const topupVault = await this.getUserTopupVault(owner);
-        return (0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default((await this._rpc.getBalance(topupVault).send()).value.toString()), utils_1.DECIMALS_SOL);
+        const topupVault = this.getUserTopupVault(owner);
+        return (0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default(await this._connection.getBalance(topupVault)), utils_1.DECIMALS_SOL);
     };
     /**
      * Get transaction instruction to withdraw SOL from the topup vault.
@@ -2376,10 +2307,10 @@ class Kamino {
         if (amount.lessThanOrEqualTo(0)) {
             throw Error('Must withdraw a positive amount of SOL.');
         }
-        const topupVault = await this.getUserTopupVault(owner.address);
+        const topupVault = this.getUserTopupVault(owner);
         let solToWithdraw;
         if (amount.eq(new decimal_js_1.default(constants_1.U64_MAX))) {
-            solToWithdraw = new decimal_js_1.default((await this._rpc.getBalance(topupVault).send()).value.toString());
+            solToWithdraw = new decimal_js_1.default(await this._connection.getBalance(topupVault));
         }
         else {
             solToWithdraw = (0, utils_1.collToLamportsDecimal)(amount, utils_1.DECIMALS_SOL);
@@ -2390,29 +2321,25 @@ class Kamino {
         const accounts = {
             adminAuthority: owner,
             topupVault,
-            system: system_1.SYSTEM_PROGRAM_ADDRESS,
+            system: web3_js_1.SystemProgram.programId,
         };
-        const withdrawIxn = (0, instructions_2.withdrawFromTopup)(args, accounts, this.getProgramID());
+        const withdrawIxn = (0, instructions_1.withdrawFromTopup)(args, accounts);
         return withdrawIxn;
     };
     getJupSwapIxsWithMaxAccounts = async (input, tokenAMint, tokenBMint, owner, slippageBps, useOnlyLegacyTransaction, existingAccounts, maxAccounts, profiler = utils_1.noopProfiledFunctionExecution, onlyDirectRoutes) => {
         const jupiterQuote = input.tokenAToSwapAmount.lt(utils_1.ZERO)
             ? await profiler(JupService_1.JupService.getBestRouteV6(owner, input.tokenAToSwapAmount.abs(), tokenAMint, tokenBMint, slippageBps.toNumber(), useOnlyLegacyTransaction, maxAccounts, onlyDirectRoutes), 'C-getBestRouteV6', [])
             : await profiler(JupService_1.JupService.getBestRouteV6(owner, input.tokenBToSwapAmount.abs(), tokenBMint, tokenAMint, slippageBps.toNumber(), useOnlyLegacyTransaction, maxAccounts, onlyDirectRoutes), 'C-getBestRouteV6', []);
-        const allJupIxs = [
-            ...(jupiterQuote.tokenLedgerInstruction ? [jupiterQuote.tokenLedgerInstruction] : []),
-            ...(0, transactions_1.removeBudgetAndAtaIxns)(jupiterQuote.setupInstructions, [tokenAMint, tokenBMint]),
-            jupiterQuote.swapInstruction,
-            ...(jupiterQuote.cleanupInstruction ? [jupiterQuote.cleanupInstruction] : []),
-        ];
-        const allJupAccounts = allJupIxs.flatMap((ix) => ix.accounts?.map((key) => key.address) || []);
+        const { txMessage, lookupTablesAddresses } = await profiler(JupService_1.JupService.deserealizeVersionedTransactions(this._connection, [jupiterQuote.swapTransaction]), 'C-deserealizeVersionedTransactions', []);
+        const allJupIxs = [...(0, transactions_1.removeBudgetAndAtaIxns)(txMessage[0].instructions, [tokenAMint, tokenBMint])];
+        const allJupAccounts = allJupIxs.flatMap((ix) => ix.keys?.map((key) => key.pubkey) || []);
         const allAccounts = new Set([...existingAccounts, ...allJupAccounts]);
         const prefix = 'getSingleSidedJupRoute:';
         console.log(`${prefix} All distinct existing accounts number ${new Set(existingAccounts).size}`);
         console.log(`${prefix} All distinct Jup accounts number ${new Set(allJupAccounts).size}`);
         console.log(`${prefix} All accounts number ${allAccounts.size}`);
         if (allAccounts.size < transactions_1.MAX_ACCOUNTS_PER_TRANSACTION) {
-            return [allJupIxs, jupiterQuote.addressLookupTableAddresses];
+            return [allJupIxs, lookupTablesAddresses];
         }
         // if none of the swap TXs returned by Jup have less than max allowed accounts throw error as the tx will fail because we lock too many accounts
         throw new Error('All Jupiter swap routes have too many accounts in the instructions');
@@ -2472,7 +2399,7 @@ class Kamino {
             tokenAAta,
             tokenBAta,
         };
-        return (0, instructions_2.checkExpectedVaultsBalances)(args, accounts, this.getProgramID());
+        return (0, instructions_1.checkExpectedVaultsBalances)(args, accounts);
     };
     /**
      * Get transaction instruction to create a new Kamino strategy.
@@ -2486,26 +2413,26 @@ class Kamino {
      * @returns transaction instruction for Kamino strategy creation
      */
     createStrategy = async (strategy, pool, owner, dex) => {
-        let tokenAMint = pubkeys_1.DEFAULT_PUBLIC_KEY;
-        let tokenBMint = pubkeys_1.DEFAULT_PUBLIC_KEY;
-        if (dex === 'ORCA') {
-            const whirlpoolState = await accounts_2.Whirlpool.fetch(this._rpc, pool, this._orcaService.getWhirlpoolProgramId());
+        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, 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 accounts_3.PoolState.fetch(this._rpc, pool, this._raydiumService.getRaydiumProgramId());
+        else if (dex == 'RAYDIUM') {
+            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()}`);
             }
             tokenAMint = raydiumPoolState.tokenMint0;
             tokenBMint = raydiumPoolState.tokenMint1;
         }
-        else if (dex === 'METEORA') {
-            const meteoraPoolState = await accounts_4.LbPair.fetch(this._rpc, pool, this._meteoraService.getMeteoraProgramId());
+        else if (dex == 'METEORA') {
+            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()}`);
             }
@@ -2519,11 +2446,11 @@ class Kamino {
             throw Error(`Could not fetch globalConfig  with pubkey ${this.getGlobalConfig().toString()}`);
         }
         const collateralInfos = await this.getCollateralInfo(config.tokenInfos);
-        const tokenACollateralId = collateralInfos.findIndex((x) => x.mint === tokenAMint);
+        const tokenACollateralId = collateralInfos.findIndex((x) => x.mint.equals(tokenAMint));
         if (tokenACollateralId === -1) {
             throw Error(`Could not find token A (mint ${tokenAMint}) in collateral infos`);
         }
-        const tokenBCollateralId = collateralInfos.findIndex((x) => x.mint === tokenBMint);
+        const tokenBCollateralId = collateralInfos.findIndex((x) => x.mint.equals(tokenBMint));
         if (tokenBCollateralId === -1) {
             throw Error(`Could not find token A (mint ${tokenBMint}) in collateral infos`);
         }
@@ -2546,36 +2473,30 @@ class Kamino {
             sharesMint: programAddresses.sharesMint,
             sharesMintAuthority: programAddresses.sharesMintAuthority,
             tokenInfos: config.tokenInfos,
-            systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
-            rent: sysvars_1.SYSVAR_RENT_ADDRESS,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             tokenATokenProgram,
             tokenBTokenProgram,
         };
-        let ix = (0, instructions_2.initializeStrategy)(strategyArgs, strategyAccounts, this.getProgramID());
-        ix = {
-            ...ix,
-            accounts: ix.accounts?.concat([
-                { address: config.scopePriceId, role: kit_1.AccountRole.READONLY },
-                { address: config.scopeProgramId, role: kit_1.AccountRole.READONLY },
-            ]),
-        };
+        const ix = (0, instructions_1.initializeStrategy)(strategyArgs, strategyAccounts);
+        ix.keys.push({ pubkey: config.scopePriceId, isSigner: false, isWritable: false });
+        ix.keys.push({ pubkey: config.scopeProgramId, isSigner: false, isWritable: false });
         return ix;
     };
     /**
      * Get transaction instruction to close Kamino strategy, including its position if there is any
      * and strategy token accounts.
      * @param strategy public key of the strategy
-     * @param admin signer to close the strategy
      * @returns instruction to close the strategy
      */
-    withdrawAllAndCloseStrategy = async (admin, strategy) => {
+    withdrawAllAndCloseStrategy = async (strategy) => {
         const strategyWithAddress = await this.getStrategyStateIfNotFetched(strategy);
-        const withdrawIxns = await this.withdrawAllShares(strategyWithAddress, admin);
-        if (withdrawIxns === null) {
+        const withdrawIxns = await this.withdrawAllShares(strategyWithAddress, strategyWithAddress.strategy.adminAuthority);
+        if (withdrawIxns == null) {
             return null;
         }
-        const closeIxn = await this.closeStrategy(admin, strategyWithAddress);
+        const closeIxn = await this.closeStrategy(strategyWithAddress);
         return {
             withdrawIxns: [...withdrawIxns.prerequisiteIxs, withdrawIxns.withdrawIx],
             closeIxn,
@@ -2584,21 +2505,20 @@ class Kamino {
     /**
      * Get transaction instruction to close Kamino strategy, including its position if there is any
      * and strategy token accounts.
-     * @param admin signer to close the strategy
      * @param strategy public key of the strategy
      * @returns instruction to close the strategy
      */
-    closeStrategy = async (admin, strategy) => {
+    closeStrategy = async (strategy) => {
         const { address: strategyPubkey, strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
         const collInfos = await this.getCollateralInfos();
-        const eventAuthority = await this.getEventAuthorityPDA(strategyState.strategyDex);
-        const poolProgram = this.getDexProgramId(strategyState);
+        const eventAuthority = this.getEventAuthorityPDA(strategyState.strategyDex);
+        const poolProgram = (0, utils_1.getDexProgramId)(strategyState);
         let oldPositionOrBaseVaultAuthority = strategyState.baseVaultAuthority;
         let oldPositionMintOrBaseVaultAuthority = strategyState.baseVaultAuthority;
         let oldPositionTokenAccountOrBaseVaultAuthority = strategyState.baseVaultAuthority;
         let oldTickArrayLowerOrBaseVaultAuthority = strategyState.baseVaultAuthority;
         let oldTickArrayUpperOrBaseVaultAuthority = strategyState.baseVaultAuthority;
-        if (strategyState.position !== pubkeys_1.DEFAULT_PUBLIC_KEY) {
+        if (!strategyState.position.equals(web3_js_1.PublicKey.default)) {
             oldPositionOrBaseVaultAuthority = strategyState.position;
             oldPositionMintOrBaseVaultAuthority = strategyState.positionMint;
             oldPositionTokenAccountOrBaseVaultAuthority = strategyState.positionTokenAccount;
@@ -2606,18 +2526,18 @@ class Kamino {
             oldTickArrayUpperOrBaseVaultAuthority = strategyState.tickArrayUpper;
         }
         const [userTokenAAta, userTokenBAta] = await Promise.all([
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.tokenAMint, strategyState.adminAuthority, (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
-            (0, utils_1.getAssociatedTokenAddress)(strategyState.tokenBMint, strategyState.adminAuthority, (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS)),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.tokenAMint, strategyState.adminAuthority, true, (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID)),
+            (0, utils_1.getAssociatedTokenAddress)(strategyState.tokenBMint, strategyState.adminAuthority, true, (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID)),
         ]);
         const rewardMints = Array(6).fill(strategyState.pool);
-        const rewardTokenPrograms = Array(6).fill(token_1.TOKEN_PROGRAM_ADDRESS);
+        const rewardTokenPrograms = Array(6).fill(spl_token_1.TOKEN_PROGRAM_ID);
         let reward0Vault = strategyState.baseVaultAuthority;
         let userReward0Ata = strategyState.baseVaultAuthority;
         if ((0, utils_1.isVaultInitialized)(strategyState.reward0Vault, strategyState.reward0Decimals)) {
             reward0Vault = strategyState.reward0Vault;
             rewardMints[0] = collInfos[strategyState.reward0CollateralId.toNumber()].mint;
             rewardTokenPrograms[0] = await this.getAccountOwner(rewardMints[0]);
-            userReward0Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[0], strategyState.adminAuthority, rewardTokenPrograms[0]);
+            userReward0Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[0], strategyState.adminAuthority, true, rewardTokenPrograms[0]);
         }
         let reward1Vault = strategyState.baseVaultAuthority;
         let userReward1Ata = strategyState.baseVaultAuthority;
@@ -2625,7 +2545,7 @@ class Kamino {
             reward1Vault = strategyState.reward1Vault;
             rewardMints[1] = collInfos[strategyState.reward1CollateralId.toNumber()].mint;
             rewardTokenPrograms[1] = await this.getAccountOwner(rewardMints[1]);
-            userReward1Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[1], strategyState.adminAuthority, rewardTokenPrograms[1]);
+            userReward1Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[1], strategyState.adminAuthority, true, rewardTokenPrograms[1]);
         }
         let reward2Vault = strategyState.baseVaultAuthority;
         let userReward2Ata = strategyState.baseVaultAuthority;
@@ -2633,7 +2553,7 @@ class Kamino {
             reward2Vault = strategyState.reward2Vault;
             rewardMints[2] = collInfos[strategyState.reward2CollateralId.toNumber()].mint;
             rewardTokenPrograms[2] = await this.getAccountOwner(rewardMints[2]);
-            userReward2Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[2], strategyState.adminAuthority, rewardTokenPrograms[2]);
+            userReward2Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[2], strategyState.adminAuthority, true, rewardTokenPrograms[2]);
         }
         let kaminoReward0Vault = strategyState.baseVaultAuthority;
         const userKaminoReward0Ata = strategyState.baseVaultAuthority;
@@ -2641,7 +2561,7 @@ class Kamino {
             kaminoReward0Vault = strategyState.kaminoRewards[0].rewardVault;
             rewardMints[3] = strategyState.kaminoRewards[0].rewardVault;
             rewardTokenPrograms[3] = await this.getAccountOwner(rewardMints[3]);
-            userReward0Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[3], strategyState.adminAuthority, rewardTokenPrograms[3]);
+            userReward0Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[3], strategyState.adminAuthority, true, rewardTokenPrograms[3]);
         }
         let kaminoReward1Vault = strategyState.baseVaultAuthority;
         const userKaminoReward1Ata = strategyState.baseVaultAuthority;
@@ -2649,7 +2569,7 @@ class Kamino {
             kaminoReward1Vault = strategyState.kaminoRewards[1].rewardVault;
             rewardMints[4] = strategyState.kaminoRewards[1].rewardVault;
             rewardTokenPrograms[4] = await this.getAccountOwner(rewardMints[4]);
-            userReward1Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[4], strategyState.adminAuthority, rewardTokenPrograms[4]);
+            userReward1Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[4], strategyState.adminAuthority, true, rewardTokenPrograms[4]);
         }
         let kaminoReward2Vault = strategyState.baseVaultAuthority;
         const userKaminoReward2Ata = strategyState.baseVaultAuthority;
@@ -2657,10 +2577,10 @@ class Kamino {
             kaminoReward2Vault = strategyState.kaminoRewards[2].rewardVault;
             rewardMints[5] = strategyState.kaminoRewards[2].rewardVault;
             rewardTokenPrograms[5] = await this.getAccountOwner(rewardMints[5]);
-            userReward2Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[5], admin.address, rewardTokenPrograms[5]);
+            userReward2Ata = await (0, utils_1.getAssociatedTokenAddress)(rewardMints[5], strategyState.adminAuthority, true, rewardTokenPrograms[5]);
         }
         const strategyAccounts = {
-            adminAuthority: admin,
+            adminAuthority: strategyState.adminAuthority,
             strategy: strategyPubkey,
             oldPositionOrBaseVaultAuthority,
             oldPositionMintOrBaseVaultAuthority,
@@ -2668,8 +2588,8 @@ class Kamino {
             tokenAVault: strategyState.tokenAVault,
             tokenBVault: strategyState.tokenBVault,
             baseVaultAuthority: strategyState.baseVaultAuthority,
-            system: system_1.SYSTEM_PROGRAM_ADDRESS,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
+            system: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             poolProgram: poolProgram,
             userTokenAAta,
             userTokenBAta,
@@ -2689,28 +2609,20 @@ class Kamino {
             oldTickArrayUpperOrBaseVaultAuthority,
             pool: strategyState.pool,
             eventAuthority,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
             tokenAMint: strategyState.tokenAMint,
             tokenBMint: strategyState.tokenBMint,
         };
-        let ix = (0, instructions_2.closeStrategy)(strategyAccounts, this.getProgramID());
+        const ix = (0, instructions_1.closeStrategy)(strategyAccounts);
         for (let i = 0; i < 6; i++) {
-            ix = {
-                ...ix,
-                accounts: ix.accounts?.concat([
-                    { address: rewardMints[i], role: kit_1.AccountRole.READONLY },
-                    { address: rewardTokenPrograms[i], role: kit_1.AccountRole.READONLY },
-                ]),
-            };
+            ix.keys.push({ pubkey: rewardMints[i], isSigner: false, isWritable: false });
+            ix.keys.push({ pubkey: rewardTokenPrograms[i], isSigner: false, isWritable: false });
         }
         return ix;
     };
-    getUserTopupVault = async (user) => {
-        const [topupVault] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('topup_vault'), addressEncoder.encode(user)],
-            programAddress: this.getProgramID(),
-        });
+    getUserTopupVault = (user) => {
+        const [topupVault, _topupVaultBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('topup_vault'), user.toBuffer()], this.getProgramID());
         return topupVault;
     };
     /**
@@ -2722,31 +2634,11 @@ class Kamino {
      * @returns object with program addresses for kamino strategy creation
      */
     getStrategyProgramAddresses = async (strategy, tokenMintA, tokenMintB) => {
-        const [tokenAVault, tokenABump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('svault_a'), addressEncoder.encode(strategy)],
-            programAddress: this.getProgramID(),
-        });
-        const [tokenBVault, tokenBBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('svault_b'), addressEncoder.encode(strategy)],
-            programAddress: this.getProgramID(),
-        });
-        const [baseVaultAuthority, baseVaultAuthorityBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('authority'), addressEncoder.encode(tokenAVault), addressEncoder.encode(tokenBVault)],
-            programAddress: this.getProgramID(),
-        });
-        const [sharesMint, sharesMintBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [
-                Buffer.from('shares'),
-                addressEncoder.encode(strategy),
-                addressEncoder.encode(tokenMintA),
-                addressEncoder.encode(tokenMintB),
-            ],
-            programAddress: this.getProgramID(),
-        });
-        const [sharesMintAuthority, sharesMintAuthorityBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('authority'), addressEncoder.encode(sharesMint)],
-            programAddress: this.getProgramID(),
-        });
+        const [tokenAVault, tokenABump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('svault_a'), strategy.toBuffer()], this.getProgramID());
+        const [tokenBVault, tokenBBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('svault_b'), strategy.toBuffer()], this.getProgramID());
+        const [baseVaultAuthority, baseVaultAuthorityBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('authority'), tokenAVault.toBuffer(), tokenBVault.toBuffer()], this.getProgramID());
+        const [sharesMint, sharesMintBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('shares'), strategy.toBuffer(), tokenMintA.toBuffer(), tokenMintB.toBuffer()], this.getProgramID());
+        const [sharesMintAuthority, sharesMintAuthorityBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('authority'), sharesMint.toBuffer()], this.getProgramID());
         return {
             sharesMintAuthority,
             tokenAVault,
@@ -2767,17 +2659,17 @@ class Kamino {
      * @returns transaction instruction to create the account
      */
     createStrategyAccount = async (payer, newStrategy) => {
-        const accountSize = BigInt(accounts_1.WhirlpoolStrategy.layout.span + 8);
+        const accountSize = this._kaminoProgram.account.whirlpoolStrategy.size;
         return this.createAccountRentExempt(payer, newStrategy, accountSize);
     };
-    createAccountRentExempt = async (payer, newAccount, size) => {
-        const lamports = await this._rpc.getMinimumBalanceForRentExemption(size).send();
-        return (0, system_1.getCreateAccountInstruction)({
-            newAccount,
+    createAccountRentExempt = async (payer, newAccountPubkey, size) => {
+        const lamports = await this._connection.getMinimumBalanceForRentExemption(size);
+        return web3_js_1.SystemProgram.createAccount({
+            programId: this.getProgramID(),
+            fromPubkey: payer,
+            newAccountPubkey,
             space: size,
             lamports,
-            payer,
-            programAddress: this.getProgramID(),
         });
     };
     /**
@@ -2789,17 +2681,17 @@ class Kamino {
      */
     collectFeesAndRewards = async (strategy, owner) => {
         const { address: strategyPubkey, strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const eventAuthority = await this.getEventAuthorityPDA(strategyState.strategyDex);
-        const { treasuryFeeTokenAVault, treasuryFeeTokenBVault, treasuryFeeVaultAuthority } = await this.getTreasuryFeeVaultPDAs(strategyState.tokenAMint, strategyState.tokenBMint);
+        const eventAuthority = this.getEventAuthorityPDA(strategyState.strategyDex);
+        const { treasuryFeeTokenAVault, treasuryFeeTokenBVault, treasuryFeeVaultAuthority } = this.getTreasuryFeeVaultPDAs(strategyState.tokenAMint, strategyState.tokenBMint);
         let programId = this._orcaService.getWhirlpoolProgramId();
-        let poolRewardVault0 = pubkeys_1.DEFAULT_PUBLIC_KEY;
-        let poolRewardVault1 = pubkeys_1.DEFAULT_PUBLIC_KEY;
-        let poolRewardVault2 = pubkeys_1.DEFAULT_PUBLIC_KEY;
-        let rewardMint0 = pubkeys_1.DEFAULT_PUBLIC_KEY;
-        let rewardMint1 = pubkeys_1.DEFAULT_PUBLIC_KEY;
-        let rewardMint2 = pubkeys_1.DEFAULT_PUBLIC_KEY;
+        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 accounts_2.Whirlpool.fetch(this._rpc, strategyState.pool, this._orcaService.getWhirlpoolProgramId());
+            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()}`);
             }
@@ -2812,7 +2704,7 @@ class Kamino {
         }
         else if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM')) {
             programId = this._raydiumService.getRaydiumProgramId();
-            const poolState = await accounts_3.PoolState.fetch(this._rpc, strategyState.pool, 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()}`);
             }
@@ -2823,9 +2715,9 @@ class Kamino {
             rewardMint1 = poolState.rewardInfos[1].tokenMint;
             rewardMint2 = poolState.rewardInfos[2].tokenMint;
         }
-        else if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA')) {
+        else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
             programId = this._meteoraService.getMeteoraProgramId();
-            const poolState = await accounts_4.LbPair.fetch(this._rpc, strategyState.pool, 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()}`);
             }
@@ -2834,7 +2726,7 @@ class Kamino {
             poolRewardVault2 = strategyPubkey;
             rewardMint0 = poolState.rewardInfos[0].mint;
             rewardMint1 = poolState.rewardInfos[1].mint;
-            rewardMint2 = this.getProgramID();
+            rewardMint2 = this._kaminoProgramId;
         }
         const accounts = {
             user: owner || strategyState.adminAuthority,
@@ -2863,15 +2755,15 @@ class Kamino {
             tickArrayUpper: strategyState.tickArrayUpper,
             raydiumProtocolPositionOrBaseVaultAuthority: strategyState.raydiumProtocolPositionOrBaseVaultAuthority,
             poolProgram: programId,
-            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             eventAuthority,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
             memoProgram: pubkeys_1.MEMO_PROGRAM_ID,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-            tokenProgram2022: token_2022_1.TOKEN_2022_PROGRAM_ADDRESS,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
         };
-        let ix = (0, instructions_2.collectFeesAndRewards)(accounts, this.getProgramID());
+        const ixn = (0, instructions_1.collectFeesAndRewards)(accounts);
         const pairs = [
             [strategyState.reward0Decimals.toNumber(), rewardMint0],
             [strategyState.reward1Decimals.toNumber(), rewardMint1],
@@ -2879,41 +2771,24 @@ class Kamino {
         ];
         for (const [decimals, mint] of pairs) {
             if (decimals > 0) {
+                ixn.keys.push({ pubkey: mint, isSigner: false, isWritable: false });
                 const tokenProgram = await this.getAccountOwner(mint);
-                ix = {
-                    ...ix,
-                    accounts: ix.accounts?.concat([
-                        { address: mint, role: kit_1.AccountRole.READONLY },
-                        { address: tokenProgram, role: kit_1.AccountRole.READONLY },
-                    ]),
-                };
+                ixn.keys.push({ pubkey: tokenProgram, isSigner: false, isWritable: false });
             }
         }
-        if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM')) {
-            const [poolTickArrayBitmap] = await (0, kit_1.getProgramDerivedAddress)({
-                seeds: [Buffer.from('pool_tick_array_bitmap_extension'), addressEncoder.encode(strategyState.pool)],
-                programAddress: this._raydiumService.getRaydiumProgramId(),
-            });
-            ix = {
-                ...ix,
-                accounts: ix.accounts?.concat([{ address: poolTickArrayBitmap, role: kit_1.AccountRole.READONLY }]),
-            };
+        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()], this._raydiumService.getRaydiumProgramId());
+            ixn.keys.push({ pubkey: poolTickArrayBitmap, isSigner: false, isWritable: true });
         }
-        return ix;
+        return ixn;
     };
     /**
      * Get orca position metadata program addresses
      * @param positionMint mint account of the position
      */
-    getMetadataProgramAddressesOrca = async (positionMint) => {
-        const [position, positionBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('position'), addressEncoder.encode(positionMint)],
-            programAddress: this._orcaService.getWhirlpoolProgramId(),
-        });
-        const [positionMetadata, positionMetadataBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('metadata'), addressEncoder.encode(constants_1.METADATA_PROGRAM_ID), addressEncoder.encode(positionMint)],
-            programAddress: constants_1.METADATA_PROGRAM_ID,
-        });
+    getMetadataProgramAddressesOrca = (positionMint) => {
+        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,
             positionBump,
@@ -2921,36 +2796,24 @@ class Kamino {
             positionMetadataBump,
         };
     };
-    getMetadataProgramAddressesRaydium = async (positionMint, pool, tickLowerIndex, tickUpperIndex) => {
-        const { publicKey: protocolPosition, nonce: protocolPositionBump } = (0, lib_1.getPdaProtocolPositionAddress)((0, compat_2.toLegacyPublicKey)(this._raydiumService.getRaydiumProgramId()), (0, compat_2.toLegacyPublicKey)(pool), tickLowerIndex, tickUpperIndex);
-        const [position, positionBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('position'), addressEncoder.encode(positionMint)],
-            programAddress: this._raydiumService.getRaydiumProgramId(),
-        });
-        const [positionMetadata, positionMetadataBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('metadata'), addressEncoder.encode(constants_1.METADATA_PROGRAM_ID), addressEncoder.encode(positionMint)],
-            programAddress: constants_1.METADATA_PROGRAM_ID,
-        });
+    getMetadataProgramAddressesRaydium = (positionMint, pool, tickLowerIndex, tickUpperIndex) => {
+        const { publicKey: protocolPosition, nonce: protocolPositionBump } = (0, lib_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,
             positionBump,
-            protocolPosition: (0, compat_1.fromLegacyPublicKey)(protocolPosition),
+            protocolPosition,
             protocolPositionBump,
             positionMetadata,
             positionMetadataBump,
         };
     };
-    getStartEndTicketIndexProgramAddressesOrca = async (whirlpool, whirlpoolState, tickLowerIndex, tickUpperIndex) => {
+    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] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('tick_array'), addressEncoder.encode(whirlpool), Buffer.from(startTickIndex.toString())],
-            programAddress: this._orcaService.getWhirlpoolProgramId(),
-        });
-        const [upperTickPubkey, upperTickBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('tick_array'), addressEncoder.encode(whirlpool), Buffer.from(endTickIndex.toString())],
-            programAddress: this._orcaService.getWhirlpoolProgramId(),
-        });
+        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,
@@ -2958,17 +2821,11 @@ class Kamino {
             upperTickBump,
         };
     };
-    getStartEndTicketIndexProgramAddressesRaydium = async (pool, poolState, tickLowerIndex, tickUpperIndex) => {
+    getStartEndTicketIndexProgramAddressesRaydium = (pool, poolState, tickLowerIndex, tickUpperIndex) => {
         const startTickIndex = lib_1.TickUtils.getTickArrayStartIndexByTick(tickLowerIndex, poolState.tickSpacing);
         const endTickIndex = lib_1.TickUtils.getTickArrayStartIndexByTick(tickUpperIndex, poolState.tickSpacing);
-        const [lowerTickPubkey, lowerTickBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('tick_array'), addressEncoder.encode(pool), (0, lib_1.i32ToBytes)(startTickIndex)],
-            programAddress: this._raydiumService.getRaydiumProgramId(),
-        });
-        const [upperTickPubkey, upperTickBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('tick_array'), addressEncoder.encode(pool), (0, lib_1.i32ToBytes)(endTickIndex)],
-            programAddress: this._raydiumService.getRaydiumProgramId(),
-        });
+        const [lowerTickPubkey, lowerTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), pool.toBuffer(), (0, lib_1.i32ToBytes)(startTickIndex)], this._raydiumService.getRaydiumProgramId());
+        const [upperTickPubkey, upperTickBump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('tick_array'), pool.toBuffer(), (0, lib_1.i32ToBytes)(endTickIndex)], this._raydiumService.getRaydiumProgramId());
         return {
             lowerTick: lowerTickPubkey,
             lowerTickBump,
@@ -2977,21 +2834,21 @@ class Kamino {
         };
     };
     readMeteoraPosition = async (poolPk, positionPk) => {
-        const pool = await accounts_4.LbPair.fetch(this._rpc, poolPk, this._meteoraService.getMeteoraProgramId());
-        const position = await accounts_4.PositionV2.fetch(this._rpc, positionPk, this._meteoraService.getMeteoraProgramId());
+        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 {
-                Address: positionPk,
+                publicKey: positionPk,
                 amountX: new decimal_js_1.default(0),
                 amountY: new decimal_js_1.default(0),
             };
         }
-        const { lowerTick: lowerTickPk, upperTick: upperTickPk } = await this.getStartEndTicketIndexProgramAddressesMeteora(poolPk, position.lowerBinId);
-        const lowerBinArray = await accounts_4.BinArray.fetch(this._rpc, lowerTickPk, this._meteoraService.getMeteoraProgramId());
-        const upperBinArray = await accounts_4.BinArray.fetch(this._rpc, upperTickPk, this._meteoraService.getMeteoraProgramId());
+        const { lowerTick: lowerTickPk, upperTick: upperTickPk } = this.getStartEndTicketIndexProgramAddressesMeteora(poolPk, position.lowerBinId);
+        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 {
-                Address: positionPk,
+                publicKey: positionPk,
                 amountX: new decimal_js_1.default(0),
                 amountY: new decimal_js_1.default(0),
             };
@@ -3016,17 +2873,17 @@ class Kamino {
             }
         }
         return {
-            Address: positionPk,
+            publicKey: positionPk,
             amountX: totalAmountX,
             amountY: totalAmountY,
         };
     };
-    getStartEndTicketIndexProgramAddressesMeteora = async (pool, tickLowerIndex) => {
+    getStartEndTicketIndexProgramAddressesMeteora = (pool, tickLowerIndex) => {
         const meteoraProgramId = this._meteoraService.getMeteoraProgramId();
         const lowerBinArrayIndex = (0, meteora_1.binIdToBinArrayIndex)(new bn_js_1.default(tickLowerIndex));
-        const [lowerTick, lowerTickBump] = await (0, meteora_1.deriveBinArray)(pool, lowerBinArrayIndex, meteoraProgramId);
+        const [lowerTick, lowerTickBump] = (0, meteora_1.deriveBinArray)(pool, lowerBinArrayIndex, meteoraProgramId);
         const upperBinArrayIndex = lowerBinArrayIndex.add(new bn_js_1.default(1));
-        const [upperTick, upperTickBump] = await (0, meteora_1.deriveBinArray)(pool, upperBinArrayIndex, meteoraProgramId);
+        const [upperTick, upperTickBump] = (0, meteora_1.deriveBinArray)(pool, upperBinArrayIndex, meteoraProgramId);
         return {
             lowerTick,
             lowerTickBump,
@@ -3036,23 +2893,22 @@ class Kamino {
     };
     /**
      * Get a transaction to open liquidity position for a Kamino strategy
-     * @param admin strategy admin authority
      * @param strategy strategy you want to open liquidity position for
-     * @param positionMint position mint keypair
+     * @param positionMint position mint pubkey
      * @param priceLower new position's lower price of the range
      * @param priceUpper new position's upper price of the range
      * @param status strategy status
      */
-    openPosition = async (admin, strategy, positionMint, priceLower, priceUpper, status = new StrategyStatus_1.Uninitialized()) => {
+    openPosition = async (strategy, positionMint, priceLower, priceUpper, status = new StrategyStatus_1.Uninitialized()) => {
         const { strategy: strategyState, address: strategyAddress } = await this.getStrategyStateIfNotFetched(strategy);
         if (!strategyState) {
             throw Error(`Could not fetch strategy state with pubkey ${strategy.toString()}`);
         }
-        const eventAuthority = await this.getEventAuthorityPDA(strategyState.strategyDex);
-        if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA')) {
-            return this.openPositionOrca(admin, strategyAddress, strategyState.baseVaultAuthority, strategyState.pool, positionMint, priceLower, priceUpper, strategyState.tokenAVault, strategyState.tokenBVault, strategyState.tokenAMint, strategyState.tokenBMint, strategyState.tokenATokenProgram, strategyState.tokenBTokenProgram, strategyState.position, strategyState.positionMint, strategyState.positionTokenAccount, strategyState.tickArrayLower, strategyState.tickArrayUpper, status);
+        const eventAuthority = this.getEventAuthorityPDA(strategyState.strategyDex);
+        if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('ORCA')) {
+            return this.openPositionOrca(strategyState.adminAuthority, strategyAddress, strategyState.baseVaultAuthority, strategyState.pool, positionMint, priceLower, priceUpper, strategyState.tokenAVault, strategyState.tokenBVault, strategyState.tokenAMint, strategyState.tokenBMint, strategyState.tokenATokenProgram, strategyState.tokenBTokenProgram, strategyState.position, strategyState.positionMint, strategyState.positionTokenAccount, strategyState.tickArrayLower, strategyState.tickArrayUpper, eventAuthority, status);
         }
-        else if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM')) {
+        else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
             let reward0Vault = undefined;
             let reward1Vault = undefined;
             let reward2Vault = undefined;
@@ -3065,10 +2921,10 @@ class Kamino {
             if (strategyState.reward2Decimals.toNumber() > 0) {
                 reward2Vault = strategyState.reward2Vault;
             }
-            return this.openPositionRaydium(admin, strategyAddress, strategyState.baseVaultAuthority, strategyState.pool, positionMint, priceLower, priceUpper, strategyState.tokenAVault, strategyState.tokenBVault, strategyState.tokenAMint, strategyState.tokenBMint, strategyState.tokenATokenProgram, strategyState.tokenBTokenProgram, strategyState.tickArrayLower, strategyState.tickArrayUpper, strategyState.position, strategyState.positionMint, strategyState.positionTokenAccount, strategyState.raydiumProtocolPositionOrBaseVaultAuthority, eventAuthority, status, reward0Vault, reward1Vault, reward2Vault);
+            return this.openPositionRaydium(strategyState.adminAuthority, strategyAddress, strategyState.baseVaultAuthority, strategyState.pool, positionMint, priceLower, priceUpper, strategyState.tokenAVault, strategyState.tokenBVault, strategyState.tokenAMint, strategyState.tokenBMint, strategyState.tokenATokenProgram, strategyState.tokenBTokenProgram, strategyState.tickArrayLower, strategyState.tickArrayUpper, strategyState.position, strategyState.positionMint, strategyState.positionTokenAccount, strategyState.raydiumProtocolPositionOrBaseVaultAuthority, eventAuthority, status, reward0Vault, reward1Vault, reward2Vault);
         }
-        else if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA')) {
-            return this.openPositionMeteora(admin, strategyAddress, strategyState.baseVaultAuthority, strategyState.pool, positionMint, priceLower, priceUpper, strategyState.tokenAVault, strategyState.tokenBVault, strategyState.tokenAMint, strategyState.tokenBMint, strategyState.tokenATokenProgram, strategyState.tokenBTokenProgram, strategyState.position, strategyState.positionMint, strategyState.positionTokenAccount, strategyState.tickArrayLower, strategyState.tickArrayUpper, eventAuthority, status);
+        else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
+            return this.openPositionMeteora(strategyState.adminAuthority, strategyAddress, strategyState.baseVaultAuthority, strategyState.pool, positionMint, priceLower, priceUpper, strategyState.tokenAVault, strategyState.tokenBVault, strategyState.tokenAMint, strategyState.tokenBMint, strategyState.tokenATokenProgram, strategyState.tokenBTokenProgram, strategyState.position, strategyState.positionMint, strategyState.positionTokenAccount, strategyState.tickArrayLower, strategyState.tickArrayUpper, eventAuthority, status);
         }
         else {
             throw new Error(`Invalid dex ${strategyState.strategyDex.toString()}`);
@@ -3082,24 +2938,24 @@ class Kamino {
      * @param priceUpper new position's upper price of the range
      * @param status strategy status
      */
-    openPositionOrca = async (adminAuthority, strategy, baseVaultAuthority, pool, positionMint, priceLower, priceUpper, tokenAVault, tokenBVault, tokenAMint, tokenBMint, tokenATokenProgram, tokenBTokenProgram, oldPositionOrBaseVaultAuthority, oldPositionMintOrBaseVaultAuthority, oldPositionTokenAccountOrBaseVaultAuthority, oldTickArrayLowerOrBaseVaultAuthority, oldTickArrayUpperOrBaseVaultAuthority, status = new StrategyStatus_1.Uninitialized()) => {
-        const whirlpool = await accounts_2.Whirlpool.fetch(this._rpc, pool, this._orcaService.getWhirlpoolProgramId());
+    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, this._orcaService.getWhirlpoolProgramId());
         if (!whirlpool) {
             throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
         }
         const isRebalancing = status.discriminator === StrategyStatus_1.Rebalancing.discriminator;
-        const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, whirlpool.tokenMintA);
-        const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, whirlpool.tokenMintB);
+        const decimalsA = await (0, utils_1.getMintDecimals)(this._connection, whirlpool.tokenMintA);
+        const decimalsB = await (0, utils_1.getMintDecimals)(this._connection, whirlpool.tokenMintB);
         const tickLowerIndex = (0, whirlpool_sdk_1.getNextValidTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(priceLower, decimalsA, decimalsB), whirlpool.tickSpacing);
         const tickUpperIndex = (0, whirlpool_sdk_1.getNextValidTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(priceUpper, decimalsA, decimalsB), whirlpool.tickSpacing);
-        const { position, positionBump, positionMetadata } = await this.getMetadataProgramAddressesOrca(positionMint.address);
-        const positionTokenAccount = await (0, utils_1.getAssociatedTokenAddress)(positionMint.address, baseVaultAuthority);
+        const { position, positionBump, positionMetadata } = this.getMetadataProgramAddressesOrca(positionMint);
+        const positionTokenAccount = await (0, utils_1.getAssociatedTokenAddress)(positionMint, baseVaultAuthority);
         const args = {
             tickLowerIndex: new bn_js_1.default(tickLowerIndex),
             tickUpperIndex: new bn_js_1.default(tickUpperIndex),
             bump: positionBump,
         };
-        const { lowerTick: startTickIndex, upperTick: endTickIndex } = await this.getStartEndTicketIndexProgramAddressesOrca(pool, whirlpool, tickLowerIndex, tickUpperIndex);
+        const { lowerTick: startTickIndex, upperTick: endTickIndex } = this.getStartEndTicketIndexProgramAddressesOrca(pool, whirlpool, tickLowerIndex, tickUpperIndex);
         const globalConfig = await this.getGlobalConfigState(this._globalConfig);
         if (!globalConfig) {
             throw Error(`Could not fetch global config with pubkey ${this._globalConfig.toString()}`);
@@ -3112,17 +2968,17 @@ class Kamino {
             tickArrayUpper: endTickIndex,
             baseVaultAuthority: baseVaultAuthority,
             position,
-            positionMint: positionMint.address,
+            positionMint,
             positionMetadataAccount: positionMetadata,
             positionTokenAccount,
-            rent: sysvars_1.SYSVAR_RENT_ADDRESS,
-            system: system_1.SYSTEM_PROGRAM_ADDRESS,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-            tokenProgram2022: token_2022_1.TOKEN_2022_PROGRAM_ADDRESS,
-            associatedTokenProgram: token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            system: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
             poolProgram: this._orcaService.getWhirlpoolProgramId(),
             oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
-            oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint.address,
+            oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
             oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
                 ? oldPositionTokenAccountOrBaseVaultAuthority
                 : positionTokenAccount,
@@ -3137,27 +2993,16 @@ class Kamino {
             tokenInfos: globalConfig.tokenInfos,
             tokenAMint,
             tokenBMint,
-            eventAuthority: (0, kit_1.none)(),
+            eventAuthority,
             consensusAccount: pubkeys_1.CONSENSUS_ID,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
             memoProgram: pubkeys_1.MEMO_PROGRAM_ID,
         };
-        const ix = (0, instructions_2.openLiquidityPosition)(args, accounts, this.getProgramID());
-        const accs = [...(ix.accounts || [])];
-        const accountIndex = accs.findIndex((acc) => acc.address === positionMint.address);
-        if (accountIndex >= 0) {
-            accs[accountIndex] = {
-                ...accs[accountIndex],
-                role: kit_1.AccountRole.WRITABLE_SIGNER,
-                // @ts-ignore
-                signer: positionMint,
-            };
-        }
-        return {
-            ...ix,
-            accounts: accs,
-        };
+        const ixn = (0, instructions_1.openLiquidityPosition)(args, accounts);
+        const accountIndex = ixn.keys.findIndex((accs) => accs.pubkey.equals(positionMint));
+        ixn.keys[accountIndex].isSigner = true;
+        return ixn;
     };
     /**
      * Get a transaction to open liquidity position for a Kamino strategy
@@ -3168,23 +3013,23 @@ 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 accounts_3.PoolState.fetch(this._rpc, pool, this._raydiumService.getRaydiumProgramId());
+        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()}`);
         }
         const isRebalancing = status.discriminator === StrategyStatus_1.Rebalancing.discriminator;
-        const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, poolState.tokenMint0);
-        const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, poolState.tokenMint1);
+        const decimalsA = await (0, utils_1.getMintDecimals)(this._connection, poolState.tokenMint0);
+        const decimalsB = await (0, utils_1.getMintDecimals)(this._connection, poolState.tokenMint1);
         const tickLowerIndex = lib_1.TickMath.getTickWithPriceAndTickspacing(lib_1.TickMath.roundPriceWithTickspacing(priceLower, poolState.tickSpacing, decimalsA, decimalsB), poolState.tickSpacing, decimalsA, decimalsB);
         const tickUpperIndex = lib_1.TickMath.getTickWithPriceAndTickspacing(lib_1.TickMath.roundPriceWithTickspacing(priceUpper, poolState.tickSpacing, decimalsA, decimalsB), poolState.tickSpacing, decimalsA, decimalsB);
-        const { position, positionBump, protocolPosition, positionMetadata } = await this.getMetadataProgramAddressesRaydium(positionMint.address, pool, tickLowerIndex, tickUpperIndex);
-        const positionTokenAccount = await (0, utils_1.getAssociatedTokenAddress)(positionMint.address, baseVaultAuthority);
+        const { position, positionBump, protocolPosition, positionMetadata } = this.getMetadataProgramAddressesRaydium(positionMint, pool, tickLowerIndex, tickUpperIndex);
+        const positionTokenAccount = await (0, utils_1.getAssociatedTokenAddress)(positionMint, baseVaultAuthority);
         const args = {
             tickLowerIndex: new bn_js_1.default(tickLowerIndex),
             tickUpperIndex: new bn_js_1.default(tickUpperIndex),
             bump: positionBump,
         };
-        const { lowerTick: startTickIndex, upperTick: endTickIndex } = await this.getStartEndTicketIndexProgramAddressesRaydium(pool, poolState, tickLowerIndex, tickUpperIndex);
+        const { lowerTick: startTickIndex, upperTick: endTickIndex } = this.getStartEndTicketIndexProgramAddressesRaydium(pool, poolState, tickLowerIndex, tickUpperIndex);
         const globalConfig = await this.getGlobalConfigState(this._globalConfig);
         if (!globalConfig) {
             throw Error(`Could not fetch global config with pubkey ${this._globalConfig.toString()}`);
@@ -3197,17 +3042,17 @@ class Kamino {
             tickArrayUpper: endTickIndex,
             baseVaultAuthority: baseVaultAuthority,
             position,
-            positionMint: positionMint.address,
+            positionMint,
             positionMetadataAccount: positionMetadata,
             positionTokenAccount,
-            rent: sysvars_1.SYSVAR_RENT_ADDRESS,
-            system: system_1.SYSTEM_PROGRAM_ADDRESS,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-            tokenProgram2022: token_2022_1.TOKEN_2022_PROGRAM_ADDRESS,
-            associatedTokenProgram: token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            system: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
             poolProgram: this._raydiumService.getRaydiumProgramId(),
             oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
-            oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint.address,
+            oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
             oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
                 ? oldPositionTokenAccountOrBaseVaultAuthority
                 : positionTokenAccount,
@@ -3224,68 +3069,42 @@ class Kamino {
             tokenBMint,
             eventAuthority,
             consensusAccount: pubkeys_1.CONSENSUS_ID,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
             memoProgram: pubkeys_1.MEMO_PROGRAM_ID,
         };
-        const [poolTickArrayBitmap] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: [Buffer.from('pool_tick_array_bitmap_extension'), addressEncoder.encode(pool)],
-            programAddress: this._raydiumService.getRaydiumProgramId(),
-        });
-        let ix = (0, instructions_2.openLiquidityPosition)(args, accounts, this.getProgramID());
-        ix = {
-            ...ix,
-            accounts: ix.accounts?.concat([
-                { address: protocolPosition, role: kit_1.AccountRole.WRITABLE },
-                { address: oldProtocolPositionOrBaseVaultAuthority, role: kit_1.AccountRole.WRITABLE },
-                { address: constants_1.METADATA_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
-                { address: poolTickArrayBitmap, role: kit_1.AccountRole.WRITABLE },
-            ]),
-        };
+        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 },
+            { pubkey: oldProtocolPositionOrBaseVaultAuthority, isSigner: false, isWritable: true },
+            { pubkey: constants_1.METADATA_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: poolTickArrayBitmap, isSigner: false, isWritable: true },
+        ]);
         if (strategyRewardOVault) {
-            ix = {
-                ...ix,
-                accounts: ix.accounts?.concat([
-                    { address: poolState.rewardInfos[0].tokenVault, role: kit_1.AccountRole.WRITABLE },
-                    { address: strategyRewardOVault, role: kit_1.AccountRole.WRITABLE },
-                    { address: poolState.rewardInfos[0].tokenMint, role: kit_1.AccountRole.READONLY },
-                ]),
-            };
+            ix.keys = ix.keys.concat([
+                { pubkey: poolState.rewardInfos[0].tokenVault, isSigner: false, isWritable: true },
+                { pubkey: strategyRewardOVault, isSigner: false, isWritable: true },
+                { pubkey: poolState.rewardInfos[0].tokenMint, isSigner: false, isWritable: false },
+            ]);
         }
         if (strategyReward1Vault) {
-            ix = {
-                ...ix,
-                accounts: ix.accounts?.concat([
-                    { address: poolState.rewardInfos[1].tokenVault, role: kit_1.AccountRole.WRITABLE },
-                    { address: strategyReward1Vault, role: kit_1.AccountRole.WRITABLE },
-                    { address: poolState.rewardInfos[1].tokenMint, role: kit_1.AccountRole.READONLY },
-                ]),
-            };
+            ix.keys = ix.keys.concat([
+                { pubkey: poolState.rewardInfos[1].tokenVault, isSigner: false, isWritable: true },
+                { pubkey: strategyReward1Vault, isSigner: false, isWritable: true },
+                { pubkey: poolState.rewardInfos[1].tokenMint, isSigner: false, isWritable: false },
+            ]);
         }
         if (strategyReward2Vault) {
-            ix = {
-                ...ix,
-                accounts: ix.accounts?.concat([
-                    { address: poolState.rewardInfos[2].tokenVault, role: kit_1.AccountRole.WRITABLE },
-                    { address: strategyReward2Vault, role: kit_1.AccountRole.WRITABLE },
-                    { address: poolState.rewardInfos[2].tokenMint, role: kit_1.AccountRole.READONLY },
-                ]),
-            };
-        }
-        const accs = [...(ix.accounts || [])];
-        const accountIndex = accs.findIndex((acc) => acc.address === positionMint.address);
-        if (accountIndex >= 0) {
-            accs[accountIndex] = {
-                ...accs[accountIndex],
-                role: kit_1.AccountRole.WRITABLE_SIGNER,
-                // @ts-ignore
-                signer: positionMint,
-            };
+            ix.keys = ix.keys.concat([
+                { pubkey: poolState.rewardInfos[2].tokenVault, isSigner: false, isWritable: true },
+                { pubkey: strategyReward2Vault, isSigner: false, isWritable: true },
+                { pubkey: poolState.rewardInfos[2].tokenMint, isSigner: false, isWritable: false },
+            ]);
         }
-        return {
-            ...ix,
-            accounts: accs,
-        };
+        const accountIndex = ix.keys.findIndex((accs) => accs.pubkey.equals(positionMint));
+        ix.keys[accountIndex].isSigner = true;
+        return ix;
     };
     /**
      * Get a transaction to open liquidity position for a Kamino strategy
@@ -3296,23 +3115,23 @@ 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_4.LbPair.fetch(this._rpc, pool, this._meteoraService.getMeteoraProgramId());
+        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()}`);
         }
         const isRebalancing = status.discriminator === StrategyStatus_1.Rebalancing.discriminator;
-        const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, lbPair.tokenXMint);
-        const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, lbPair.tokenYMint);
+        const decimalsA = await (0, utils_1.getMintDecimals)(this._connection, lbPair.tokenXMint);
+        const decimalsB = await (0, utils_1.getMintDecimals)(this._connection, lbPair.tokenYMint);
         const tickLowerIndex = (0, meteora_1.getBinIdFromPriceWithDecimals)(priceLower, lbPair.binStep, true, decimalsA, decimalsB);
         const tickUpperIndex = (0, meteora_1.getBinIdFromPriceWithDecimals)(priceUpper, lbPair.binStep, true, decimalsA, decimalsB);
-        const { position: positionMint, positionBump, positionMetadata, } = await this.getMetadataProgramAddressesOrca(position.address);
-        const positionTokenAccount = await (0, utils_1.getAssociatedTokenAddress)(position.address, baseVaultAuthority);
+        const { position: positionMint, positionBump, positionMetadata } = this.getMetadataProgramAddressesOrca(position);
+        const positionTokenAccount = await (0, utils_1.getAssociatedTokenAddress)(position, baseVaultAuthority);
         const args = {
             tickLowerIndex: new bn_js_1.default(tickLowerIndex),
             tickUpperIndex: new bn_js_1.default(tickUpperIndex),
             bump: positionBump,
         };
-        const { lowerTick: startTickIndex, upperTick: endTickIndex } = await this.getStartEndTicketIndexProgramAddressesMeteora(pool, tickLowerIndex);
+        const { lowerTick: startTickIndex, upperTick: endTickIndex } = this.getStartEndTicketIndexProgramAddressesMeteora(pool, tickLowerIndex);
         const globalConfig = await this.getGlobalConfigState(this._globalConfig);
         if (!globalConfig) {
             throw Error(`Could not fetch global config with pubkey ${this._globalConfig.toString()}`);
@@ -3324,16 +3143,16 @@ class Kamino {
             tickArrayLower: startTickIndex,
             tickArrayUpper: endTickIndex,
             baseVaultAuthority: baseVaultAuthority,
-            position: position.address,
+            position,
             positionMint,
             positionMetadataAccount: positionMetadata,
             positionTokenAccount,
-            rent: sysvars_1.SYSVAR_RENT_ADDRESS,
-            system: system_1.SYSTEM_PROGRAM_ADDRESS,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-            tokenProgram2022: token_2022_1.TOKEN_2022_PROGRAM_ADDRESS,
-            associatedTokenProgram: token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
-            poolProgram: this._meteoraService.getMeteoraProgramId(),
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            system: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+            poolProgram: this._orcaService.getWhirlpoolProgramId(),
             oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
             oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
             oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
@@ -3352,25 +3171,14 @@ class Kamino {
             tokenBMint,
             eventAuthority,
             consensusAccount: pubkeys_1.CONSENSUS_ID,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
             memoProgram: pubkeys_1.MEMO_PROGRAM_ID,
         };
-        const ix = (0, instructions_2.openLiquidityPosition)(args, accounts, this.getProgramID());
-        const accs = [...(ix.accounts || [])];
-        const accountIndex = accs.findIndex((acc) => acc.address === position.address);
-        if (accountIndex >= 0) {
-            accs[accountIndex] = {
-                ...accs[accountIndex],
-                role: kit_1.AccountRole.WRITABLE_SIGNER,
-                // @ts-ignore
-                signer: position,
-            };
-        }
-        return {
-            ...ix,
-            accounts: accs,
-        };
+        const ixn = (0, instructions_1.openLiquidityPosition)(args, accounts);
+        const accountIndex = ixn.keys.findIndex((accs) => accs.pubkey.equals(position));
+        ixn.keys[accountIndex].isSigner = true;
+        return ixn;
     };
     /**
      * Get a transaction for executive withdrawal from a Kamino strategy.
@@ -3378,19 +3186,19 @@ class Kamino {
      * @param action withdrawal action
      * @returns transaction for executive withdrawal
      */
-    executiveWithdraw = async (admin, strategy, action) => {
+    executiveWithdraw = async (strategy, action) => {
         const { address: strategyPubkey, strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const eventAuthority = await this.getEventAuthorityPDA(strategyState.strategyDex);
+        const eventAuthority = this.getEventAuthorityPDA(strategyState.strategyDex);
         const globalConfig = await this.getGlobalConfigState(strategyState.globalConfig);
-        if (globalConfig === null) {
+        if (globalConfig == null) {
             throw new Error(`Unable to fetch GlobalConfig with Pubkey ${strategyState.globalConfig}`);
         }
         const args = {
             action: action.discriminator,
         };
-        const programId = this.getDexProgramId(strategyState);
+        const programId = (0, utils_1.getDexProgramId)(strategyState);
         const accounts = {
-            adminAuthority: admin,
+            adminAuthority: strategyState.adminAuthority,
             strategy: strategyPubkey,
             globalConfig: strategyState.globalConfig,
             pool: strategyState.pool,
@@ -3410,60 +3218,50 @@ class Kamino {
             poolProgram: programId,
             tokenInfos: globalConfig.tokenInfos,
             eventAuthority,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
             memoProgram: pubkeys_1.MEMO_PROGRAM_ID,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-            tokenProgram2022: token_2022_1.TOKEN_2022_PROGRAM_ADDRESS,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
         };
-        let executiveWithdrawIx = (0, instructions_2.executiveWithdraw)(args, accounts, this.getProgramID());
+        const executiveWithdrawIx = (0, instructions_1.executiveWithdraw)(args, accounts);
         //  for Raydium strats we need to collect fees and rewards before withdrawal
         //  add rewards vaults accounts to withdraw
-        const isRaydium = strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM');
+        const isRaydium = strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM');
         if (isRaydium) {
             const poolState = await this.getRaydiumPoolByAddress(strategyState.pool);
             if (!poolState) {
                 throw new Error('Pool is not found');
             }
             if (strategyState.reward0Decimals.toNumber() > 0) {
-                executiveWithdrawIx = {
-                    ...executiveWithdrawIx,
-                    accounts: executiveWithdrawIx.accounts?.concat([
-                        { address: poolState.rewardInfos[0].tokenVault, role: kit_1.AccountRole.WRITABLE },
-                        { address: strategyState.reward0Vault, role: kit_1.AccountRole.WRITABLE },
-                    ]),
-                };
+                executiveWithdrawIx.keys = executiveWithdrawIx.keys.concat([
+                    { pubkey: poolState.rewardInfos[0].tokenVault, isSigner: false, isWritable: true },
+                    { pubkey: strategyState.reward0Vault, isSigner: false, isWritable: true },
+                ]);
             }
             if (strategyState.reward1Decimals.toNumber() > 0) {
-                executiveWithdrawIx = {
-                    ...executiveWithdrawIx,
-                    accounts: executiveWithdrawIx.accounts?.concat([
-                        { address: poolState.rewardInfos[1].tokenVault, role: kit_1.AccountRole.WRITABLE },
-                        { address: strategyState.reward1Vault, role: kit_1.AccountRole.WRITABLE },
-                    ]),
-                };
+                executiveWithdrawIx.keys = executiveWithdrawIx.keys.concat([
+                    { pubkey: poolState.rewardInfos[1].tokenVault, isSigner: false, isWritable: true },
+                    { pubkey: strategyState.reward1Vault, isSigner: false, isWritable: true },
+                ]);
             }
             if (strategyState.reward2Decimals.toNumber() > 0) {
-                executiveWithdrawIx = {
-                    ...executiveWithdrawIx,
-                    accounts: executiveWithdrawIx.accounts?.concat([
-                        { address: poolState.rewardInfos[2].tokenVault, role: kit_1.AccountRole.WRITABLE },
-                        { address: strategyState.reward2Vault, role: kit_1.AccountRole.WRITABLE },
-                    ]),
-                };
+                executiveWithdrawIx.keys = executiveWithdrawIx.keys.concat([
+                    { pubkey: poolState.rewardInfos[2].tokenVault, isSigner: false, isWritable: true },
+                    { pubkey: strategyState.reward2Vault, isSigner: false, isWritable: true },
+                ]);
             }
         }
         return executiveWithdrawIx;
     };
     /**
      * Get a an instruction to update the reference price type of a strategy
-     * @param admin transaction signer
      * @param strategy strategy pubkey or object
      * @param referencePriceType new reference price type
      */
-    getUpdateReferencePriceTypeIx = async (admin, strategy, referencePriceType) => {
-        const { address } = await this.getStrategyStateIfNotFetched(strategy);
-        return (0, utils_1.getUpdateStrategyConfigIx)(admin, this._globalConfig, address, new StrategyConfigOption_1.UpdateReferencePriceType(), new decimal_js_1.default(referencePriceType.discriminator), this.getProgramID());
+    getUpdateReferencePriceTypeIx = async (strategy, referencePriceType) => {
+        const { address, strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
+        return (0, utils_1.getUpdateStrategyConfigIx)(strategyState.adminAuthority, this._globalConfig, address, new StrategyConfigOption_1.UpdateReferencePriceType(), new decimal_js_1.default(referencePriceType.discriminator));
     };
     /**
      * Get a transaction to invest funds from the Kamino vaults and put them into the DEX pool as liquidity.
@@ -3480,8 +3278,8 @@ class Kamino {
         if (!globalConfig) {
             throw Error(`Could not fetch global config with pubkey ${strategyState.globalConfig.toString()}`);
         }
-        const programId = this.getDexProgramId(strategyState);
-        const eventAuthority = await this.getEventAuthorityPDA(strategyState.strategyDex);
+        const programId = (0, utils_1.getDexProgramId)(strategyState);
+        const eventAuthority = this.getEventAuthorityPDA(strategyState.strategyDex);
         const accounts = {
             position: strategyState.position,
             positionTokenAccount: strategyState.positionTokenAccount,
@@ -3500,17 +3298,17 @@ class Kamino {
             raydiumProtocolPositionOrBaseVaultAuthority: strategyState.raydiumProtocolPositionOrBaseVaultAuthority,
             tokenInfos: globalConfig.tokenInfos,
             poolProgram: programId,
-            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             tokenAMint: strategyState.tokenAMint,
             tokenBMint: strategyState.tokenBMint,
             eventAuthority,
-            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
-            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, token_1.TOKEN_PROGRAM_ADDRESS),
+            tokenATokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenATokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
+            tokenBTokenProgram: (0, utils_1.keyOrDefault)(strategyState.tokenBTokenProgram, spl_token_1.TOKEN_PROGRAM_ID),
             memoProgram: pubkeys_1.MEMO_PROGRAM_ID,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-            tokenProgram2022: token_2022_1.TOKEN_2022_PROGRAM_ADDRESS,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram2022: pubkeys_1.TOKEN_2022_PROGRAM_ID,
         };
-        return (0, instructions_2.invest)(accounts, this.getProgramID());
+        return (0, instructions_1.invest)(accounts);
     };
     /**
      * Get a list of instructions to collect the pending fees and invest them into the Kamino strategy's position.
@@ -3533,11 +3331,11 @@ class Kamino {
      */
     getPendingFees = async (strategies) => {
         const strategiesWithAddresses = await this.getStrategiesWithAddresses(strategies);
-        const raydiumStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM') && x.strategy.position !== pubkeys_1.DEFAULT_PUBLIC_KEY);
+        const raydiumStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM') && !x.strategy.position.equals(web3_js_1.PublicKey.default));
         const raydiumPositionsPromise = this.getRaydiumPositions(raydiumStrategies.map((x) => x.strategy.position));
-        const orcaStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA') && x.strategy.position !== pubkeys_1.DEFAULT_PUBLIC_KEY);
+        const orcaStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA') && !x.strategy.position.equals(web3_js_1.PublicKey.default));
         const orcaPositionsPromise = this.getOrcaPositions(orcaStrategies.map((x) => x.strategy.position));
-        const meteoraStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA') && x.strategy.position !== pubkeys_1.DEFAULT_PUBLIC_KEY);
+        const meteoraStrategies = strategiesWithAddresses.filter((x) => x.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA') && !x.strategy.position.equals(web3_js_1.PublicKey.default));
         const meteoraPositionsPromise = this.getMeteoraPositions(meteoraStrategies.map((x) => x.strategy.position));
         const [raydiumPositions, orcaPositions, meteoraPositions] = await Promise.all([
             raydiumPositionsPromise,
@@ -3602,20 +3400,20 @@ class Kamino {
         const rebalanceParams = rebalanceFieldInfos
             .filter((x) => x.label != consts_1.RebalanceTypeLabelName && x.enabled)
             .map((f) => new decimal_js_1.default(f.value));
-        return this.getUpdateRebalancingParamsIxns(strategyAdmin, strategyWithAddress.address, rebalanceParams, rebalanceType, strategyWithAddress.strategy.tokenAMintDecimals.toNumber(), strategyWithAddress.strategy.tokenBMintDecimals.toNumber());
+        return this.getUpdateRebalancingParmsIxns(strategyAdmin, strategyWithAddress.address, rebalanceParams, rebalanceType, strategyWithAddress.strategy.tokenAMintDecimals.toNumber(), strategyWithAddress.strategy.tokenBMintDecimals.toNumber());
     };
     processRebalanceParams = async (dex, pool, rebalanceType, rebalanceParams) => {
         const processedRebalanceParams = [...rebalanceParams];
         const rebalanceTypeKind = (0, utils_1.numberToRebalanceType)(rebalanceType.toNumber());
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             const { whirlpool: whilrpoolState } = await this.getWhirlpoolStateIfNotFetched(pool);
-            if (rebalanceTypeKind.kind === types_1.RebalanceType.Drift.kind) {
+            if (rebalanceTypeKind.kind == types_1.RebalanceType.Drift.kind) {
                 processedRebalanceParams[0] = new decimal_js_1.default((0, whirlpool_sdk_1.getNearestValidTickIndexFromTickIndex)(rebalanceParams[0].toNumber(), whilrpoolState.tickSpacing));
             }
         }
         return processedRebalanceParams;
     };
-    getUpdateRebalancingParamsIxns = async (strategyAdmin, strategy, rebalanceParams, rebalanceType, tokenADecimals, tokenBDecimals) => {
+    getUpdateRebalancingParmsIxns = async (strategyAdmin, strategy, rebalanceParams, rebalanceType, tokenADecimals, tokenBDecimals) => {
         const { address: strategyAddress, strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
         if (!rebalanceType) {
             rebalanceType = (0, utils_1.numberToRebalanceType)(strategyState.rebalanceType);
@@ -3630,12 +3428,12 @@ class Kamino {
         };
         const accounts = {
             adminAuthority: strategyAdmin,
-            newAccount: pubkeys_1.DEFAULT_PUBLIC_KEY, // not used
+            newAccount: web3_js_1.PublicKey.default, // not used
             globalConfig: this._globalConfig,
             strategy: strategyAddress,
-            systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
+            systemProgram: web3_js_1.SystemProgram.programId,
         };
-        return (0, instructions_2.updateStrategyConfig)(args, accounts, this.getProgramID());
+        return (0, instructions_1.updateStrategyConfig)(args, accounts);
     };
     getUpdateRebalancingParamsForUninitializedStratIx = async (strategyAdmin, strategy, rebalanceParams, rebalanceType, tokenADecimals, tokenBDecimals) => {
         const value = (0, utils_1.buildStrategyRebalanceParams)(rebalanceParams, rebalanceType, tokenADecimals, tokenBDecimals);
@@ -3645,12 +3443,12 @@ class Kamino {
         };
         const accounts = {
             adminAuthority: strategyAdmin,
-            newAccount: pubkeys_1.DEFAULT_PUBLIC_KEY, // not used
+            newAccount: web3_js_1.PublicKey.default, // not used
             globalConfig: this._globalConfig,
             strategy,
-            systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
+            systemProgram: web3_js_1.SystemProgram.programId,
         };
-        return (0, instructions_2.updateStrategyConfig)(args, accounts, this.getProgramID());
+        return (0, instructions_1.updateStrategyConfig)(args, accounts);
     };
     buildStrategyRebalanceParams = async (strategy) => {
         const strategyState = await this.getStrategyStateIfNotFetched(strategy);
@@ -3678,7 +3476,7 @@ class Kamino {
             throw Error(`Token mint ${tokenAMint.toString()} is not supported`);
         }
         const pool = await this.getPoolInitializedForDexPairTier(dex, tokenAMint, tokenBMint, feeTier.mul(CreationParameters_1.FullBPS));
-        if (pool === pubkeys_1.DEFAULT_PUBLIC_KEY) {
+        if (pool == web3_js_1.PublicKey.default) {
             throw Error(`Pool for tokens ${tokenAMint.toString()} and ${tokenBMint.toString()} for feeTier ${feeTier.toString()} does not exist`);
         }
         const processedRebalanceParams = await this.processRebalanceParams(dex, pool, rebalanceType, rebalanceParams);
@@ -3686,8 +3484,8 @@ class Kamino {
         let tokenMintA;
         let tokenMintB;
         let tickSpacing;
-        if (dex === 'ORCA') {
-            const whirlpoolState = await accounts_2.Whirlpool.fetch(this._rpc, pool, this._orcaService.getWhirlpoolProgramId());
+        if (dex == 'ORCA') {
+            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()}`);
             }
@@ -3695,8 +3493,8 @@ class Kamino {
             tokenMintB = whirlpoolState.tokenMintB;
             tickSpacing = whirlpoolState.tickSpacing;
         }
-        else if (dex === 'RAYDIUM') {
-            const raydiumPoolState = await accounts_3.PoolState.fetch(this._rpc, pool, this._raydiumService.getRaydiumProgramId());
+        else if (dex == 'RAYDIUM') {
+            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()}`);
             }
@@ -3704,8 +3502,8 @@ class Kamino {
             tokenMintB = raydiumPoolState.tokenMint1;
             tickSpacing = raydiumPoolState.tickSpacing;
         }
-        else if (dex === 'METEORA') {
-            const meteoraPoolState = await accounts_4.LbPair.fetch(this._rpc, pool, this._meteoraService.getMeteoraProgramId());
+        else if (dex == 'METEORA') {
+            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()}`);
             }
@@ -3719,8 +3517,8 @@ class Kamino {
         const tokenATokenProgram = await this.getAccountOwner(tokenAMint);
         const tokenBTokenProgram = await this.getAccountOwner(tokenBMint);
         const initStrategyIx = await this.createStrategy(strategy, pool, strategyAdmin, dex);
-        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, tokenMintA);
-        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, tokenMintB);
+        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, tokenMintA);
+        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, tokenMintB);
         const rebalanceKind = (0, utils_1.numberToRebalanceType)(rebalanceType.toNumber());
         const updateRebalanceParamsIx = await this.getUpdateRebalancingParamsForUninitializedStratIx(strategyAdmin, strategy, processedRebalanceParams, rebalanceKind, tokenADecimals, tokenBDecimals);
         const updateStrategyParamsIxs = await this.getUpdateStrategyParamsIxs(strategyAdmin, strategy, rebalanceType, withdrawFeeBps, performanceFeeBps);
@@ -3730,15 +3528,15 @@ class Kamino {
         const tokenBVault = programAddresses.tokenBVault;
         const { lowerPrice, upperPrice } = await this.getRebalancePositionRange(dex, price, tokenAMint, tokenBMint, tickSpacing, rebalanceKind, rebalanceParams);
         const openPositionIxs = [];
-        const eventAuthority = await this.getEventAuthorityPDA(new bn_js_1.default((0, utils_1.dexToNumber)(dex)));
-        if (dex === 'ORCA') {
+        const eventAuthority = this.getEventAuthorityPDA(new bn_js_1.default((0, utils_1.dexToNumber)(dex)));
+        if (dex == 'ORCA') {
             const whirlpoolWithAddress = await this.getWhirlpoolStateIfNotFetched(pool);
             if (!whirlpoolWithAddress) {
                 throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
             }
             const initLowerTickIfNeeded = await this.initializeTickForOrcaPool(strategyAdmin, pool, lowerPrice);
             const initUpperTickIfNeeded = await this.initializeTickForOrcaPool(strategyAdmin, pool, upperPrice);
-            const openPositionIx = await this.openPositionOrca(strategyAdmin, strategy, baseVaultAuthority, pool, positionMint, lowerPrice, upperPrice, tokenAVault, tokenBVault, tokenAMint, tokenBMint, tokenATokenProgram, tokenBTokenProgram, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority);
+            const openPositionIx = await this.openPositionOrca(strategyAdmin, strategy, baseVaultAuthority, pool, positionMint, lowerPrice, upperPrice, tokenAVault, tokenBVault, tokenAMint, tokenBMint, tokenATokenProgram, tokenBTokenProgram, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority, eventAuthority);
             if (initLowerTickIfNeeded.initTickIx) {
                 openPositionIxs.push(initLowerTickIfNeeded.initTickIx);
             }
@@ -3747,11 +3545,11 @@ class Kamino {
             }
             openPositionIxs.push(openPositionIx);
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             const openPositionIx = await this.openPositionRaydium(strategyAdmin, strategy, baseVaultAuthority, pool, positionMint, lowerPrice, upperPrice, tokenAVault, tokenBVault, tokenAMint, tokenBMint, tokenATokenProgram, tokenBTokenProgram, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority, baseVaultAuthority, eventAuthority);
             openPositionIxs.push(openPositionIx);
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             const lbPair = await this.getMeteoraStateIfNotFetched(pool);
             if (!lbPair) {
                 throw Error(`Could not fetch whirlpool state with pubkey ${pool.toString()}`);
@@ -3787,23 +3585,23 @@ class Kamino {
         return this.getRebalancePositionRange(dex, price, tokenAMint, tokenBMint, tickSpacing, rebalanceKind, rebalanceParams);
     }
     async getRebalancePositionRange(dex, price, tokenAMint, tokenBMint, tickSpacing, rebalanceKind, rebalanceParams) {
-        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, tokenAMint);
-        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, tokenBMint);
+        const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, tokenAMint);
+        const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, tokenBMint);
         switch (rebalanceKind.kind) {
             case types_1.RebalanceType.Manual.kind:
                 return { lowerPrice: rebalanceParams[0], upperPrice: rebalanceParams[1] };
             case types_1.RebalanceType.TakeProfit.kind:
                 return { lowerPrice: rebalanceParams[0], upperPrice: rebalanceParams[1] };
             case types_1.RebalanceType.PricePercentage.kind:
-                return (0, rebalance_methods_1.getPositionRangeFromPercentageRebalanceParams)(price, rebalanceParams[0], rebalanceParams[1]);
+                return (0, rebalance_methods_2.getPositionRangeFromPercentageRebalanceParams)(price, rebalanceParams[0], rebalanceParams[1]);
             case types_1.RebalanceType.PricePercentageWithReset.kind:
-                return (0, rebalance_methods_1.getPositionRangeFromPricePercentageWithResetParams)(price, rebalanceParams[0], rebalanceParams[1]);
+                return (0, rebalance_methods_3.getPositionRangeFromPricePercentageWithResetParams)(price, rebalanceParams[0], rebalanceParams[1]);
             case types_1.RebalanceType.Drift.kind:
-                return (0, rebalance_methods_1.getPositionRangeFromDriftParams)(dex, tickSpacing, tokenADecimals, tokenBDecimals, rebalanceParams[0], rebalanceParams[1], rebalanceParams[2]);
+                return (0, rebalance_methods_4.getPositionRangeFromDriftParams)(dex, tickSpacing, tokenADecimals, tokenBDecimals, rebalanceParams[0], rebalanceParams[1], rebalanceParams[2]);
             case types_1.RebalanceType.PeriodicRebalance.kind:
-                return (0, rebalance_methods_1.getPositionRangeFromPeriodicRebalanceParams)(price, rebalanceParams[1], rebalanceParams[2]);
+                return (0, rebalance_methods_5.getPositionRangeFromPeriodicRebalanceParams)(price, rebalanceParams[1], rebalanceParams[2]);
             case types_1.RebalanceType.Expander.kind:
-                return (0, rebalance_methods_1.getPositionRangeFromExpanderParams)(price, rebalanceParams[0], rebalanceParams[1]);
+                return (0, rebalance_methods_5.getPositionRangeFromExpanderParams)(price, rebalanceParams[0], rebalanceParams[1]);
             case types_1.RebalanceType.Autodrift.kind:
                 const currentTickIndex = (0, whirlpool_sdk_1.priceToTickIndex)(price, tokenADecimals, tokenBDecimals);
                 const startMidTick = new decimal_js_1.default(currentTickIndex);
@@ -3819,13 +3617,13 @@ class Kamino {
         return this.getCurrentPriceFromPool(dex, pool);
     }
     async getCurrentPriceFromPool(dex, pool) {
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             return this.getOrcaPoolPrice(pool);
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             return this.getRaydiumPoolPrice(pool);
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             return this.getMeteoraPoolPrice(pool);
         }
         else {
@@ -3833,22 +3631,22 @@ class Kamino {
         }
     }
     async getPoolTickSpacing(dex, pool) {
-        if (dex === 'ORCA') {
-            const whirlpoolState = await accounts_2.Whirlpool.fetch(this._rpc, pool, this._orcaService.getWhirlpoolProgramId());
+        if (dex == 'ORCA') {
+            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 accounts_3.PoolState.fetch(this._rpc, pool, this._raydiumService.getRaydiumProgramId());
+        else if (dex == 'RAYDIUM') {
+            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_4.LbPair.fetch(this._rpc, pool, this._meteoraService.getMeteoraProgramId());
+        else if (dex == 'METEORA') {
+            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()}`);
             }
@@ -3860,13 +3658,13 @@ class Kamino {
     }
     async getPriceRangePercentageBasedFromPool(dex, pool, lowerPriceBpsDifference, upperPriceBpsDifference) {
         let poolPrice;
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             poolPrice = await this.getOrcaPoolPrice(pool);
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             poolPrice = await this.getRaydiumPoolPrice(pool);
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             poolPrice = await this.getMeteoraPoolPrice(pool);
         }
         else {
@@ -3885,24 +3683,24 @@ class Kamino {
             rebalanceFields = [];
         }
         else if (rebalanceKind.kind === RebalanceType_1.PricePercentage.kind) {
-            rebalanceFields = (0, rebalance_methods_1.readPricePercentageRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
+            rebalanceFields = (0, rebalance_methods_2.readPricePercentageRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.PricePercentageWithReset.kind) {
-            rebalanceFields = (0, rebalance_methods_1.readPricePercentageWithResetRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
+            rebalanceFields = (0, rebalance_methods_3.readPricePercentageWithResetRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Drift.kind) {
-            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_1.readDriftRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
+            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_4.readDriftRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
         }
         else if (rebalanceKind.kind === RebalanceType_1.TakeProfit.kind) {
-            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenAMint);
-            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenBMint);
-            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_1.readTakeProfitRebalanceParamsFromStrategy)(tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw));
+            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenAMint);
+            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenBMint);
+            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_5.readTakeProfitRebalanceParamsFromStrategy)(tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw));
         }
         else if (rebalanceKind.kind === RebalanceType_1.PeriodicRebalance.kind) {
-            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_1.readPeriodicRebalanceRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
+            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_5.readPeriodicRebalanceRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
         }
         else if (rebalanceKind.kind === RebalanceType_1.Expander.kind) {
-            rebalanceFields = (0, rebalance_methods_1.readExpanderRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
+            rebalanceFields = (0, rebalance_methods_5.readExpanderRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Autodrift.kind) {
             rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, autodriftRebalance_1.readAutodriftRebalanceParamsFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
@@ -3923,22 +3721,22 @@ class Kamino {
             rebalanceFields = [];
         }
         else if (rebalanceKind.kind === RebalanceType_1.PricePercentage.kind) {
-            rebalanceFields = (0, rebalance_methods_1.readRawPricePercentageRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
+            rebalanceFields = (0, rebalance_methods_2.readRawPricePercentageRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.PricePercentageWithReset.kind) {
-            rebalanceFields = (0, rebalance_methods_1.readRawPricePercentageWithResetRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
+            rebalanceFields = (0, rebalance_methods_3.readRawPricePercentageWithResetRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Drift.kind) {
-            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_1.readRawDriftRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
+            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_4.readRawDriftRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
         }
         else if (rebalanceKind.kind === RebalanceType_1.TakeProfit.kind) {
-            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_1.readTakeProfitRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
+            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_5.readTakeProfitRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
         }
         else if (rebalanceKind.kind === RebalanceType_1.PeriodicRebalance.kind) {
-            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_1.readPeriodicRebalanceRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
+            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_5.readPeriodicRebalanceRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
         }
         else if (rebalanceKind.kind === RebalanceType_1.Expander.kind) {
-            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_1.readRawExpanderRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
+            rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, rebalance_methods_5.readRawExpanderRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
         }
         else if (rebalanceKind.kind === RebalanceType_1.Autodrift.kind) {
             rebalanceFields = (0, utils_1.rebalanceFieldsDictToInfo)((0, autodriftRebalance_1.readRawAutodriftRebalanceStateFromStrategy)(strategyWithAddress.strategy.rebalanceRaw));
@@ -3948,46 +3746,6 @@ class Kamino {
         }
         return rebalanceFields;
     }
-    /**
-     * Get the current withdrawal caps for a strategy
-     */
-    async getStrategyCurrentWithdrawalCaps(strategy) {
-        const strategyWithAddress = await this.getStrategyStateIfNotFetched(strategy);
-        const tokenAWithdrawalCap = strategyWithAddress.strategy.withdrawalCapA;
-        const tokenBWithdrawalCap = strategyWithAddress.strategy.withdrawalCapB;
-        let tokenAWithdrawalCapTokens = decimal_js_1.default.max(new decimal_js_1.default(tokenAWithdrawalCap.configCapacity.toString()).sub(tokenAWithdrawalCap.currentTotal.toString()), utils_1.ZERO);
-        let tokenBWithdrawalCapTokens = decimal_js_1.default.max(new decimal_js_1.default(tokenBWithdrawalCap.configCapacity.toString()).sub(tokenBWithdrawalCap.currentTotal.toString()), utils_1.ZERO);
-        if (tokenAWithdrawalCap.configIntervalLengthSeconds.toNumber() == 0) {
-            tokenAWithdrawalCapTokens = new decimal_js_1.default(Number.MAX_VALUE);
-        }
-        if (tokenBWithdrawalCap.configIntervalLengthSeconds.toNumber() == 0) {
-            tokenBWithdrawalCapTokens = new decimal_js_1.default(Number.MAX_VALUE);
-        }
-        return {
-            a: (0, utils_1.lamportsToNumberDecimal)(tokenAWithdrawalCapTokens, strategyWithAddress.strategy.tokenAMintDecimals.toNumber()),
-            b: (0, utils_1.lamportsToNumberDecimal)(tokenBWithdrawalCapTokens, strategyWithAddress.strategy.tokenBMintDecimals.toNumber()),
-        };
-    }
-    /**
-     * Get the max USD value that can be deposited per ix for a strategy
-     */
-    async getStrategyDepositCapInUSDPerIx(strategy) {
-        const strategyWithAddress = await this.getStrategyStateIfNotFetched(strategy);
-        return (0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default(strategyWithAddress.strategy.depositCapUsdPerIxn.toString()), 6);
-    }
-    async getStrategyMaxDepositInUSD(strategy) {
-        const strategyWithAddress = await this.getStrategyStateIfNotFetched(strategy);
-        const depositCapInUSDPerIx = await this.getStrategyDepositCapInUSDPerIx(strategy);
-        // return the min between deposit cap per ix and the cap left in the deposit
-        const depositCapInTokens = (0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default(strategyWithAddress.strategy.depositCapUsd.toString()), 6);
-        // read the tvl from API
-        const url = `https://api.hubbleprotocol.io/strategies/${strategyWithAddress.address.toString()}/metrics?env=mainnet-beta`;
-        const response = await fetch(url);
-        const data = (await response.json());
-        const tvl = new decimal_js_1.default(data.totalValueLocked);
-        const spaceLeftInDeposit = decimal_js_1.default.max(depositCapInTokens.sub(tvl), utils_1.ZERO);
-        return decimal_js_1.default.min(depositCapInUSDPerIx, spaceLeftInDeposit);
-    }
     /**
      * Get the prices for rebalancing params (range and reset range, if strategy involves a reset range)
      */
@@ -4000,36 +3758,36 @@ class Kamino {
         }
         else if (rebalanceKind.kind === RebalanceType_1.PricePercentage.kind) {
             const price = await this.getCurrentPrice(strategyWithAddress);
-            return (0, rebalance_methods_1.deserializePricePercentageRebalanceFromOnchainParams)(price, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_2.deserializePricePercentageRebalanceFromOnchainParams)(price, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.PricePercentageWithReset.kind) {
             const price = await this.getCurrentPrice(strategyWithAddress);
-            return (0, rebalance_methods_1.deserializePricePercentageWithResetRebalanceFromOnchainParams)(price, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_3.deserializePricePercentageWithResetRebalanceFromOnchainParams)(price, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Drift.kind) {
             const dex = (0, utils_1.numberToDex)(strategyWithAddress.strategy.strategyDex.toNumber());
-            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenAMint);
-            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenBMint);
+            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenAMint);
+            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenBMint);
             const tickSpacing = await this.getPoolTickSpacing(dex, strategyWithAddress.strategy.pool);
-            return (0, rebalance_methods_1.deserializeDriftRebalanceFromOnchainParams)(dex, tickSpacing, tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_4.deserializeDriftRebalanceFromOnchainParams)(dex, tickSpacing, tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.TakeProfit.kind) {
-            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenAMint);
-            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenBMint);
-            return (0, rebalance_methods_1.deserializeTakeProfitRebalanceFromOnchainParams)(tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw);
+            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenAMint);
+            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenBMint);
+            return (0, rebalance_methods_5.deserializeTakeProfitRebalanceFromOnchainParams)(tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.PeriodicRebalance.kind) {
             const price = await this.getCurrentPrice(strategyWithAddress);
-            return (0, rebalance_methods_1.deserializePeriodicRebalanceFromOnchainParams)(price, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_5.deserializePeriodicRebalanceFromOnchainParams)(price, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Expander.kind) {
             const price = await this.getCurrentPrice(strategyWithAddress);
-            return (0, rebalance_methods_1.readExpanderRebalanceFieldInfosFromStrategy)(price, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_5.readExpanderRebalanceFieldInfosFromStrategy)(price, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Autodrift.kind) {
             const dex = (0, utils_1.numberToDex)(strategyWithAddress.strategy.strategyDex.toNumber());
-            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenAMint);
-            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenBMint);
+            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenAMint);
+            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenBMint);
             const tickSpacing = await this.getPoolTickSpacing(dex, strategyWithAddress.strategy.pool);
             return (0, autodriftRebalance_1.deserializeAutodriftRebalanceFromOnchainParams)(dex, tokenADecimals, tokenBDecimals, tickSpacing, strategyWithAddress.strategy.rebalanceRaw);
         }
@@ -4052,36 +3810,36 @@ class Kamino {
         }
         else if (rebalanceKind.kind === RebalanceType_1.PricePercentage.kind) {
             const price = await this.getCurrentPrice(strategyWithAddress);
-            return (0, rebalance_methods_1.deserializePricePercentageRebalanceWithStateOverride)(dex, tokenADecimals, tokenBDecimals, price, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_2.deserializePricePercentageRebalanceWithStateOverride)(dex, tokenADecimals, tokenBDecimals, price, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.PricePercentageWithReset.kind) {
             const price = await this.getCurrentPrice(strategyWithAddress);
-            return (0, rebalance_methods_1.deserializePricePercentageWithResetRebalanceWithStateOverride)(dex, tokenADecimals, tokenBDecimals, price, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_3.deserializePricePercentageWithResetRebalanceWithStateOverride)(dex, tokenADecimals, tokenBDecimals, price, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Drift.kind) {
             const dex = (0, utils_1.numberToDex)(strategyWithAddress.strategy.strategyDex.toNumber());
-            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenAMint);
-            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenBMint);
+            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenAMint);
+            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenBMint);
             const tickSpacing = await this.getPoolTickSpacing(dex, strategyWithAddress.strategy.pool);
-            return (0, rebalance_methods_1.deserializeDriftRebalanceWithStateOverride)(dex, tickSpacing, tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_4.deserializeDriftRebalanceWithStateOverride)(dex, tickSpacing, tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.TakeProfit.kind) {
-            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenAMint);
-            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenBMint);
-            return (0, rebalance_methods_1.deserializeTakeProfitRebalanceFromOnchainParams)(tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw);
+            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenAMint);
+            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenBMint);
+            return (0, rebalance_methods_5.deserializeTakeProfitRebalanceFromOnchainParams)(tokenADecimals, tokenBDecimals, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.PeriodicRebalance.kind) {
             const price = await this.getCurrentPrice(strategyWithAddress);
-            return (0, rebalance_methods_1.deserializePeriodicRebalanceFromOnchainParams)(price, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_5.deserializePeriodicRebalanceFromOnchainParams)(price, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Expander.kind) {
             const price = await this.getCurrentPrice(strategyWithAddress);
-            return (0, rebalance_methods_1.deserializeExpanderRebalanceWithStateOverride)(dex, tokenADecimals, tokenBDecimals, price, strategyWithAddress.strategy.rebalanceRaw);
+            return (0, rebalance_methods_5.deserializeExpanderRebalanceWithStateOverride)(dex, tokenADecimals, tokenBDecimals, price, strategyWithAddress.strategy.rebalanceRaw);
         }
         else if (rebalanceKind.kind === RebalanceType_1.Autodrift.kind) {
             const dex = (0, utils_1.numberToDex)(strategyWithAddress.strategy.strategyDex.toNumber());
-            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenAMint);
-            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._rpc, strategyWithAddress.strategy.tokenBMint);
+            const tokenADecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenAMint);
+            const tokenBDecimals = await (0, utils_1.getMintDecimals)(this._connection, strategyWithAddress.strategy.tokenBMint);
             const tickSpacing = await this.getPoolTickSpacing(dex, strategyWithAddress.strategy.pool);
             return (0, autodriftRebalance_1.deserializeAutodriftRebalanceWithStateOverride)(dex, tokenADecimals, tokenBDecimals, tickSpacing, strategyWithAddress.strategy.rebalanceRaw);
         }
@@ -4097,7 +3855,7 @@ class Kamino {
      */
     getUpdatedRebalanceFieldInfos(initialRebalanceFieldInfos, updatedFields) {
         const newRebalanceFieldInfos = initialRebalanceFieldInfos.map((f) => {
-            const updatedField = updatedFields.find((x) => x.label === f.label);
+            const updatedField = updatedFields.find((x) => x.label == f.label);
             if (updatedField) {
                 return { ...f, value: updatedField.value };
             }
@@ -4117,13 +3875,13 @@ class Kamino {
      * Read the pool price for a specific dex and pool
      */
     async getPoolPrice(dex, pool) {
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             return this.getOrcaPoolPrice(pool);
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             return this.getRaydiumPoolPrice(pool);
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             return this.getMeteoraPoolPrice(pool);
         }
         else {
@@ -4131,14 +3889,18 @@ class Kamino {
         }
     }
     async getOrcaPoolPrice(pool) {
-        const poolData = await this._orcaService.getPool(pool);
+        const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
+            connection: this._connection,
+            network: this._cluster === 'mainnet-beta' ? whirlpool_sdk_1.OrcaNetwork.MAINNET : whirlpool_sdk_1.OrcaNetwork.DEVNET,
+        });
+        const poolData = await orca.getPool(pool);
         if (!poolData) {
             throw Error(`Could not fetch Whirlpool data for ${pool.toString()}`);
         }
         return poolData.price;
     }
     async getRaydiumPoolPrice(pool) {
-        const poolState = await accounts_3.PoolState.fetch(this._rpc, pool, this._raydiumService.getRaydiumProgramId());
+        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`);
         }
@@ -4146,23 +3908,23 @@ class Kamino {
         return price;
     }
     async getMeteoraPoolPrice(pool) {
-        const poolState = await accounts_4.LbPair.fetch(this._rpc, pool, this._meteoraService.getMeteoraProgramId());
+        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`);
         }
-        const decimalsX = await (0, utils_1.getMintDecimals)(this._rpc, poolState.tokenXMint);
-        const decimalsY = await (0, utils_1.getMintDecimals)(this._rpc, poolState.tokenYMint);
+        const decimalsX = await (0, utils_1.getMintDecimals)(this._connection, poolState.tokenXMint);
+        const decimalsY = await (0, utils_1.getMintDecimals)(this._connection, poolState.tokenYMint);
         return (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(poolState.activeId, poolState.binStep, decimalsX, decimalsY);
     }
     async getGenericPoolInfo(dex, pool) {
         let poolInfo;
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             poolInfo = await this._orcaService.getGenericPoolInfo(pool);
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             poolInfo = await this._raydiumService.getGenericPoolInfo(pool);
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             poolInfo = await this._meteoraService.getGenericPoolInfo(pool);
         }
         else {
@@ -4173,75 +3935,74 @@ class Kamino {
     mintIsSupported = (collateralInfos, tokenMint) => {
         let found = false;
         collateralInfos.forEach((element) => {
-            if (element.mint === tokenMint) {
+            if (element.mint.equals(tokenMint)) {
                 found = true;
             }
         });
         return found;
     };
     getCollateralInfoFromMint = (mint, collateralInfos) => {
-        const collInfosForMint = collateralInfos.filter((x) => x.mint === mint);
-        if (collInfosForMint.length === 0) {
+        const collInfosForMint = collateralInfos.filter((x) => x.mint.equals(mint));
+        if (collInfosForMint.length == 0) {
             return undefined;
         }
         return collInfosForMint[0];
     };
     getCollateralIdFromMint = (mint, collateralInfos) => {
         for (let i = 0; i < collateralInfos.length; i++) {
-            if (collateralInfos[i].mint === mint) {
+            if (collateralInfos[i].mint.equals(mint)) {
                 return i;
             }
         }
         return -1;
     };
     getMainLookupTablePks = async () => {
-        if (this.getProgramID() === pubkeys_1.STAGING_KAMINO_PROGRAM_ID ||
-            this._cluster === 'mainnet-beta' ||
-            this._cluster === 'devnet') {
-            return await this._rpc
-                .getProgramAccounts(address_lookup_table_1.ADDRESS_LOOKUP_TABLE_PROGRAM_ADDRESS, {
-                filters: [{ memcmp: { offset: 22n, bytes: pubkeys_1.LUT_OWNER_KEY, encoding: 'base58' } }],
+        if (this._kaminoProgramId.equals(pubkeys_1.STAGING_KAMINO_PROGRAM_ID) ||
+            this._cluster == 'mainnet-beta' ||
+            this._cluster == 'devnet') {
+            return await this._connection
+                .getProgramAccounts(pubkeys_1.ADDRESS_LUT_PROGRAM_ID, {
+                filters: [{ memcmp: { offset: 22, bytes: new web3_js_1.PublicKey(pubkeys_1.LUT_OWNER_KEY).toString() } }],
                 dataSlice: { length: 0, offset: 0 },
             })
-                .send()
                 .then((res) => res.map((raw) => raw.pubkey));
         }
         return [];
     };
     getMainLookupTable = async () => {
         const pks = await this.getMainLookupTablePks();
-        if (this.getProgramID() === pubkeys_1.STAGING_KAMINO_PROGRAM_ID ||
-            this._cluster === 'mainnet-beta' ||
-            this._cluster === 'devnet') {
-            return (0, lookupTable_1.fetchMultipleLookupTableAccounts)(this._rpc, pks);
+        if (this._kaminoProgramId.equals(pubkeys_1.STAGING_KAMINO_PROGRAM_ID) ||
+            this._cluster == 'mainnet-beta' ||
+            this._cluster == 'devnet') {
+            return await this._connection.getMultipleAccountsInfo(pks).then((res) => res.map((raw, i) => {
+                return new web3_js_1.AddressLookupTableAccount({
+                    key: pks[i],
+                    state: web3_js_1.AddressLookupTableAccount.deserialize(raw.data),
+                });
+            }));
         }
         else {
             return undefined;
         }
     };
     getInitLookupTableIx = async (authority, slot) => {
-        let recentSlot;
-        if (slot) {
-            recentSlot = slot;
-        }
-        else {
-            recentSlot = await this._rpc.getSlot({ commitment: 'finalized' }).send();
+        let recentSlot = slot;
+        if (!recentSlot) {
+            recentSlot = await this._connection.getSlot();
         }
-        const pda = await (0, address_lookup_table_1.findAddressLookupTablePda)({ authority: authority.address, recentSlot });
-        const createLookupTableIx = (0, address_lookup_table_1.getCreateLookupTableInstruction)({
-            authority: authority,
+        const slots = await this._connection.getBlocks(recentSlot - 20, recentSlot, 'confirmed');
+        return web3_js_1.AddressLookupTableProgram.createLookupTable({
+            authority,
             payer: authority,
-            address: pda,
-            recentSlot: recentSlot,
+            recentSlot: slots[0],
         });
-        return [createLookupTableIx, pda[0]];
     };
     getPopulateLookupTableIxs = async (authority, lookupTable, strategy) => {
         const { strategy: strategyState, address } = await this.getStrategyStateIfNotFetched(strategy);
         if (!strategyState) {
             throw Error(`Could not fetch strategy state with pubkey ${strategy.toString()}`);
         }
-        const { treasuryFeeTokenAVault, treasuryFeeTokenBVault, treasuryFeeVaultAuthority } = await this.getTreasuryFeeVaultPDAs(strategyState.tokenAMint, strategyState.tokenBMint);
+        const { treasuryFeeTokenAVault, treasuryFeeTokenBVault, treasuryFeeVaultAuthority } = this.getTreasuryFeeVaultPDAs(strategyState.tokenAMint, strategyState.tokenBMint);
         const accountsToBeInserted = [
             address,
             strategyState.adminAuthority,
@@ -4268,48 +4029,87 @@ class Kamino {
         const txs = [];
         for (let i = 0; i < entries.length; i += chunkSize) {
             const chunk = entries.slice(i, i + chunkSize);
-            txs.push((0, address_lookup_table_1.getExtendLookupTableInstruction)({
-                authority,
+            txs.push(web3_js_1.AddressLookupTableProgram.extendLookupTable({
                 payer: authority,
-                address: lookupTable,
+                authority,
+                lookupTable,
                 addresses: chunk,
             }));
         }
         return txs;
     };
     getLookupTable = async (tablePk) => {
-        const lut = await (0, address_lookup_table_1.fetchMaybeAddressLookupTable)(this._rpc, tablePk);
-        if (!lut.exists) {
-            throw new Error(`Could not get lookup table ${tablePk}`);
+        const lookupTableAccount = await this._connection.getAddressLookupTable(tablePk).then((res) => res.value);
+        if (!lookupTableAccount) {
+            throw new Error(`Could not get lookup table ${tablePk.toString()}`);
         }
-        return lut;
+        return lookupTableAccount;
     };
     setupStrategyLookupTable = async (authority, strategy, slot) => {
-        const [createLookupTableIx, lookupTable] = await this.getInitLookupTableIx(authority, slot);
-        const populateLookupTableIxs = await this.getPopulateLookupTableIxs(authority, lookupTable, strategy);
-        const strategyPk = typeof strategy === 'string' && (0, kit_1.isAddress)(strategy) ? strategy : strategy.address;
-        const updateStrategyLookupTableIx = await (0, utils_1.getUpdateStrategyConfigIx)(authority, this._globalConfig, strategyPk, new StrategyConfigOption_1.UpdateLookupTable(), new decimal_js_1.default(0), this.getProgramID(), lookupTable);
-        return {
-            lookupTable,
-            createLookupTableIx,
-            populateLookupTableIxs,
-            updateStrategyLookupTableIx,
-        };
+        const [createLookupTableIx, lookupTable] = await this.getInitLookupTableIx(authority.publicKey, slot);
+        const populateLookupTableIx = await this.getPopulateLookupTableIxs(authority.publicKey, lookupTable, strategy);
+        const strategyPk = 'address' in strategy ? strategy.address : strategy;
+        const getUpdateStrategyLookupTableIx = await (0, utils_1.getUpdateStrategyConfigIx)(authority.publicKey, this._globalConfig, strategyPk, new StrategyConfigOption_1.UpdateLookupTable(), new decimal_js_1.default(0), lookupTable);
+        const createTableTx = new web3_js_1.Transaction().add(createLookupTableIx);
+        await (0, utils_1.sendTransactionWithLogs)(this._connection, createTableTx, authority.publicKey, [authority]);
+        for (const ix of populateLookupTableIx) {
+            const populateLookupTableTx = new web3_js_1.Transaction().add(ix);
+            await (0, utils_1.sendTransactionWithLogs)(this._connection, populateLookupTableTx, authority.publicKey, [authority]);
+        }
+        const updateStrategyLookupTableTx = new web3_js_1.Transaction().add(getUpdateStrategyLookupTableIx);
+        const sig = await (0, utils_1.sendTransactionWithLogs)(this._connection, updateStrategyLookupTableTx, authority.publicKey, [
+            authority,
+        ]);
+        console.log('Updated strategy', strategyPk, 'lookup table', sig);
+        return lookupTable;
+    };
+    // the optional param is a list of pubkeys of lookup tables and they will be read from chain and used in the tx
+    getTransactionV2Message = async (payer, instructions, lookupTables) => {
+        const lookupTable = await this.getMainLookupTable();
+        let allLookupTables = [];
+        if (lookupTable) {
+            allLookupTables = allLookupTables.concat(lookupTable);
+        }
+        if (lookupTables) {
+            for (const table of lookupTables) {
+                const lookupTableData = await this.getLookupTable(table);
+                allLookupTables.push(lookupTableData);
+            }
+        }
+        return await this.getTransactionV2MessageWithFetchedLookupTables(payer, instructions, allLookupTables);
+    };
+    // the optional param is the lookup table list of the tables that are already feteched from chain
+    getTransactionV2MessageWithFetchedLookupTables = async (payer, instructions, lookupTables) => {
+        const lookupTable = await this.getMainLookupTable();
+        const blockhash = await this._connection.getLatestBlockhash();
+        let allLookupTables = [];
+        if (lookupTables) {
+            allLookupTables.push(...lookupTables);
+        }
+        if (lookupTable) {
+            allLookupTables = allLookupTables.concat(lookupTable);
+        }
+        const v2Tx = new web3_js_1.TransactionMessage({
+            payerKey: payer,
+            recentBlockhash: blockhash.blockhash,
+            instructions: instructions,
+        }).compileToV0Message(allLookupTables);
+        return v2Tx;
     };
     // todo(silviu): implement this
     // getEstimatedApyAndVolumeOnRange = async (
     //   dex: Dex,
-    //   pool: Address,
+    //   pool: PublicKey,
     //   lowerPrice: Decimal,
     //   upperPrice: Decimal,
     //   _startDate: Date,
     //   _endDate: Date
     // ): Promise<GenericPositionRangeInfo> => {
-    //   if (dex === 'ORCA') {
+    //   if (dex == 'ORCA') {
     //     return this.getEstimatedApyAndVolumeOnRangeOrca();
-    //   } else if (dex === 'RAYDIUM') {
+    //   } else if (dex == 'RAYDIUM') {
     //     return this.getEstimatedApyAndVolumeOnRangeRaydium();
-    //   } else if (dex === 'METEORA') {
+    //   } else if (dex == 'METEORA') {
     //     return this.getEstimatedApyAndVolumeOnRangeMeteora();
     //   } else {
     //     throw new Error(`Dex ${dex} is not supported`);
@@ -4346,25 +4146,24 @@ class Kamino {
     };
     /**
      * Get a list of transactions to rebalance a Kamino strategy.
-     * @param admin pool admin
      * @param strategy strategy pubkey or object
      * @param newPosition new liquidity position account pubkey
      * @param priceLower new position's lower price of the range
      * @param priceUpper new position's upper price of the range
      * @returns list of transactions to rebalance (executive withdraw, collect fees/rewards, open new position, invest)
      */
-    rebalance = async (admin, strategy, newPosition, priceLower, priceUpper) => {
+    rebalance = async (strategy, newPosition, priceLower, priceUpper) => {
         // todo: refactor this to return an object, not a list
         const strategyWithAddress = await this.getStrategyStateIfNotFetched(strategy);
         const ixs = [];
         // if there are no invested tokens we don't need to collect fees and rewards
         const stratTokenBalances = await this.getStrategyTokensBalances(strategyWithAddress.strategy);
-        if (strategyWithAddress.strategy.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA') ||
+        if (strategyWithAddress.strategy.strategyDex.toNumber() == (0, utils_1.dexToNumber)('ORCA') ||
             stratTokenBalances.invested.a.greaterThan(utils_1.ZERO) ||
             stratTokenBalances.invested.b.greaterThan(utils_1.ZERO)) {
-            ixs.push(await this.collectFeesAndRewards(strategyWithAddress, admin));
+            ixs.push(await this.collectFeesAndRewards(strategyWithAddress));
         }
-        ixs.push(await this.openPosition(admin, strategyWithAddress, newPosition, priceLower, priceUpper, new StrategyStatus_1.Rebalancing()));
+        ixs.push(await this.openPosition(strategyWithAddress, newPosition, priceLower, priceUpper, new StrategyStatus_1.Rebalancing()));
         return ixs;
     };
     /**
@@ -4379,18 +4178,14 @@ class Kamino {
         const positions = [];
         for (const tokenAccount of userTokenAccounts) {
             const accountData = tokenAccount.account.data;
-            if ('parsed' in accountData) {
-                // @ts-ignore
-                const strategy = liveStrategies.find((x) => x.strategy.sharesMint === accountData.parsed.info.mint);
-                if (strategy) {
-                    positions.push({
-                        shareMint: strategy.strategy.sharesMint,
-                        strategy: strategy.address,
-                        // @ts-ignore
-                        sharesAmount: new decimal_js_1.default(accountData.parsed.info.tokenAmount.uiAmountString),
-                        strategyDex: (0, utils_1.numberToDex)(strategy.strategy.strategyDex.toNumber()),
-                    });
-                }
+            const strategy = liveStrategies.find((x) => x.strategy.sharesMint.toString() === accountData.parsed.info.mint);
+            if (strategy) {
+                positions.push({
+                    shareMint: strategy.strategy.sharesMint,
+                    strategy: strategy.address,
+                    sharesAmount: new decimal_js_1.default(accountData.parsed.info.tokenAmount.uiAmountString),
+                    strategyDex: (0, utils_1.numberToDex)(strategy.strategy.strategyDex.toNumber()),
+                });
             }
         }
         return positions;
@@ -4398,57 +4193,53 @@ class Kamino {
     /**
      * Get a list of user's Kamino strategy positions
      * @param wallet user wallet address
-     * @param strategiesWithShareMintsMap
-     * @param strategiesWithAddressMap
      * @returns list of kamino strategy positions
      */
     getUserPositionsByStrategiesMap = async (wallet, strategiesWithShareMintsMap, strategiesWithAddressMap) => {
-        const tokenAccounts = await this._rpc
-            .getTokenAccountsByOwner(wallet, { programId: token_1.TOKEN_PROGRAM_ADDRESS }, { encoding: 'jsonParsed' })
-            .send();
+        const tokenAccounts = await this._connection.getParsedTokenAccountsByOwner(wallet, {
+            programId: spl_token_1.TOKEN_PROGRAM_ID,
+        });
         const mints = tokenAccounts.value.map((accountInfo) => {
-            return accountInfo.account.data.parsed.info.mint;
+            return new web3_js_1.PublicKey(accountInfo.account.data.parsed.info.mint);
         });
-        const mintInfos = await (0, utils_1.batchFetch)(mints, async (chunk) => await (0, token_2022_1.fetchAllMint)(this.getConnection(), chunk));
-        const kaminoStrategyAddresses = [];
+        const mintInfos = await (0, utils_1.batchFetch)(mints, (chunk) => this.getConnection().getMultipleAccountsInfo(chunk));
+        const kaminoStrategyAdresses = [];
         const kaminoAccountInfos = [];
-        for (let i = 0; i < mints.length; i++) {
-            const mint = mints[i];
-            const mintInfo = mintInfos[i];
-            const accountInfo = tokenAccounts.value[i];
+        for (const index of mints.keys()) {
+            const mint = mints[index];
+            const mintInfo = mintInfos[index];
+            const accountInfo = tokenAccounts.value[index];
             if (!mint || !mintInfo || !accountInfo)
                 continue;
-            const [expectedMintAuthority] = await (0, kit_1.getProgramDerivedAddress)({
-                seeds: [Buffer.from('authority'), addressEncoder.encode(mint)],
-                programAddress: this.getProgramID(),
-            });
-            if ((0, kit_1.isSome)(mintInfo.data.mintAuthority) && mintInfo.data.mintAuthority.value === expectedMintAuthority) {
-                const shareMintAddress = tokenAccounts.value[i].account.data.parsed.info.mint;
-                const addr = strategiesWithShareMintsMap.get(shareMintAddress)?.address;
-                if (!addr)
+            const [expectedMintAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('authority'), mint.toBuffer()], this.getProgramID());
+            const mintData = (0, spl_token_1.unpackMint)(mint, mintInfo, mintInfo.owner);
+            if (mintData.mintAuthority !== null && mintData.mintAuthority.equals(expectedMintAuthority)) {
+                const shareMintAddress = tokenAccounts.value[index].account.data.parsed.info.mint;
+                const address = strategiesWithShareMintsMap.get(new web3_js_1.PublicKey(shareMintAddress))?.address;
+                if (!address)
                     continue;
-                kaminoStrategyAddresses.push(addr);
-                kaminoAccountInfos.push(accountInfo.account.data.parsed.info);
+                kaminoStrategyAdresses.push(new web3_js_1.PublicKey(address));
+                kaminoAccountInfos.push(accountInfo.account);
             }
         }
         let strategies = strategiesWithAddressMap
             ? Array.from(strategiesWithAddressMap.values())
             : [];
-        const missingStrategies = kaminoStrategyAddresses.filter((x) => !strategiesWithAddressMap || !strategiesWithAddressMap.has(x));
+        const missingStrategies = kaminoStrategyAdresses.filter((x) => !strategiesWithAddressMap || !strategiesWithAddressMap.has(x));
         const missingStrategiesState = await (0, utils_1.batchFetch)(missingStrategies, (chunk) => this.getStrategies(chunk));
         strategies = strategies.concat(missingStrategiesState);
         const positions = [];
         for (const index of strategies.keys()) {
             const strategy = strategies[index];
             const accountData = kaminoAccountInfos[index];
-            const address = kaminoStrategyAddresses[index];
+            const address = kaminoStrategyAdresses[index];
             if (!strategy || !accountData) {
                 continue;
             }
             positions.push({
                 shareMint: strategy.sharesMint,
                 strategy: address,
-                sharesAmount: new decimal_js_1.default(accountData.tokenAmount.uiAmountString),
+                sharesAmount: new decimal_js_1.default(accountData.data.parsed.info.tokenAmount.uiAmountString),
                 strategyDex: (0, utils_1.numberToDex)(strategy.strategyDex.toNumber()),
             });
         }
@@ -4466,7 +4257,7 @@ class Kamino {
         const isOrca = (0, utils_1.dexToNumber)('ORCA') === dex;
         const isRaydium = (0, utils_1.dexToNumber)('RAYDIUM') === dex;
         const isMeteora = (0, utils_1.dexToNumber)('METEORA') === dex;
-        if (strategyState.position === pubkeys_1.DEFAULT_PUBLIC_KEY) {
+        if (strategyState.position.equals(web3_js_1.PublicKey.default)) {
             return {
                 totalApr: utils_1.ZERO,
                 feeApr: utils_1.ZERO,
@@ -4496,7 +4287,7 @@ class Kamino {
     getStrategyPerformanceFees = async (strategy, globalConfig) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
         const globalConfigState = globalConfig || (await this.getGlobalConfigState(strategyState.globalConfig));
-        if (globalConfigState === null) {
+        if (globalConfigState == null) {
             throw new Error(`Unable to fetch GlobalConfig with Pubkey ${strategyState.globalConfig}`);
         }
         const globalConfigMinPerformanceFee = new decimal_js_1.default(globalConfigState.minPerformanceFeeBps.toString());
@@ -4521,13 +4312,13 @@ class Kamino {
         return this._orcaService.getWhirlpoolLiquidityDistribution(pool, keepOrder, lowestTick, highestTick);
     };
     getLiquidityDistribution = async (dex, pool, keepOrder = true, lowestTick, highestTick) => {
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             return this.getLiquidityDistributionOrcaWhirlpool(pool, keepOrder, lowestTick, highestTick);
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             return this.getLiquidityDistributionRaydiumPool(pool, keepOrder, lowestTick, highestTick);
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             return this.getLiquidityDistributionMeteoraPool(pool, keepOrder, lowestTick, highestTick);
         }
         else {
@@ -4535,13 +4326,13 @@ class Kamino {
         }
     };
     getPositionsCountForPool = async (dex, pool) => {
-        if (dex === 'ORCA') {
+        if (dex == 'ORCA') {
             return this._orcaService.getPositionsCountByPool(pool);
         }
-        else if (dex === 'RAYDIUM') {
+        else if (dex == 'RAYDIUM') {
             return this._raydiumService.getPositionsCountByPool(pool);
         }
-        else if (dex === 'METEORA') {
+        else if (dex == 'METEORA') {
             return this._meteoraService.getPositionsCountByPool(pool);
         }
         else {
@@ -4637,8 +4428,8 @@ class Kamino {
      */
     calculateAmountsDistributionWithPriceRange = async (dex, pool, lowerPrice, upperPrice) => {
         const tokenAAmountToDeposit = new decimal_js_1.default(100.0);
-        if (dex === 'RAYDIUM') {
-            const poolState = await accounts_3.PoolState.fetch(this._rpc, pool, this._raydiumService.getRaydiumProgramId());
+        if (dex == 'RAYDIUM') {
+            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`);
             }
@@ -4649,23 +4440,23 @@ class Kamino {
             const amountBDecimal = new decimal_js_1.default(amountB.toString());
             return [(0, utils_1.lamportsToNumberDecimal)(amountADecimal, decimalsA), (0, utils_1.lamportsToNumberDecimal)(amountBDecimal, decimalsB)];
         }
-        else if (dex === 'ORCA') {
-            const whirlpoolState = await accounts_2.Whirlpool.fetch(this._rpc, pool, this._orcaService.getWhirlpoolProgramId());
+        else if (dex == 'ORCA') {
+            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`);
             }
             const tokenMintA = whirlpoolState.tokenMintA;
             const tokenMintB = whirlpoolState.tokenMintB;
-            const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, tokenMintA);
-            const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, tokenMintB);
+            const decimalsA = await (0, utils_1.getMintDecimals)(this._connection, tokenMintA);
+            const decimalsB = await (0, utils_1.getMintDecimals)(this._connection, tokenMintB);
             const tickLowerIndex = (0, whirlpool_sdk_1.getNearestValidTickIndexFromTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(lowerPrice, decimalsA, decimalsB), whirlpoolState.tickSpacing);
             const tickUpperIndex = (0, whirlpool_sdk_1.getNearestValidTickIndexFromTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(upperPrice, decimalsA, decimalsB), whirlpoolState.tickSpacing);
             const params = {
-                tokenMintA: (0, compat_2.toLegacyPublicKey)(tokenMintA),
-                tokenMintB: (0, compat_2.toLegacyPublicKey)(tokenMintB),
+                tokenMintA,
+                tokenMintB,
                 tickCurrentIndex: whirlpoolState.tickCurrentIndex,
                 sqrtPrice: whirlpoolState.sqrtPrice,
-                inputTokenMint: (0, compat_2.toLegacyPublicKey)(tokenMintA),
+                inputTokenMint: tokenMintA,
                 inputTokenAmount: new bn_js_1.default((0, utils_1.collToLamportsDecimal)(tokenAAmountToDeposit, decimalsA).toString()),
                 tickLowerIndex,
                 tickUpperIndex,
@@ -4677,8 +4468,8 @@ class Kamino {
                 (0, utils_1.lamportsToNumberDecimal)(addLiqResult.estTokenB.toNumber(), decimalsB),
             ];
         }
-        else if (dex === 'METEORA') {
-            const poolState = await accounts_4.LbPair.fetch(this._rpc, pool, this._meteoraService.getMeteoraProgramId());
+        else if (dex == 'METEORA') {
+            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`);
             }
@@ -4694,7 +4485,7 @@ class Kamino {
     };
     calculateAmountsToBeDeposited = async (strategy, tokenAAmount, tokenBAmount, profiledFunctionExecution = utils_1.noopProfiledFunctionExecution) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        if (strategyState.shareCalculationMethod === deposit_method_1.DOLLAR_BASED) {
+        if (strategyState.shareCalculationMethod === deposit_method_1.DOLAR_BASED) {
             return this.calculateDepostAmountsDollarBased(strategy, tokenAAmount, tokenBAmount);
         }
         else if (strategyState.shareCalculationMethod === deposit_method_1.PROPORTION_BASED) {
@@ -4707,7 +4498,7 @@ class Kamino {
     /// Returns an amount of tokenA and an amount of tokenB that define the ratio of the amounts that can be deposited
     calculateAmountsRatioToBeDeposited = async (strategy, holdings, profiler = utils_1.noopProfiledFunctionExecution) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        if (strategyState.shareCalculationMethod === deposit_method_1.DOLLAR_BASED) {
+        if (strategyState.shareCalculationMethod === deposit_method_1.DOLAR_BASED) {
             return this.calculateDepostAmountsDollarBased(strategy, new decimal_js_1.default(100), undefined);
         }
         else if (strategyState.shareCalculationMethod === deposit_method_1.PROPORTION_BASED) {
@@ -4766,7 +4557,7 @@ class Kamino {
         const isRaydium = (0, utils_1.dexToNumber)('RAYDIUM') === dex;
         const isMeteora = (0, utils_1.dexToNumber)('METEORA') === dex;
         if (isOrca) {
-            const whirlpool = await accounts_2.Whirlpool.fetch(this._rpc, strategyState.pool, this._orcaService.getWhirlpoolProgramId());
+            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}`);
             }
@@ -4794,7 +4585,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, this._orcaService.getWhirlpoolProgramId(), this._legacyConnection);
+        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;
@@ -4834,8 +4625,8 @@ class Kamino {
         if (!tokenAAmount && !tokenBAmount) {
             return [new decimal_js_1.default(0), new decimal_js_1.default(0)];
         }
-        const poolState = await accounts_3.PoolState.fetch(this._rpc, strategyState.pool, this._raydiumService.getRaydiumProgramId());
-        const position = await accounts_3.PersonalPositionState.fetch(this._rpc, strategyState.position, this._raydiumService.getRaydiumProgramId());
+        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`);
         }
@@ -4871,7 +4662,7 @@ class Kamino {
         if (!tokenAAmount && !tokenBAmount) {
             return [new decimal_js_1.default(0), new decimal_js_1.default(0)];
         }
-        const poolState = await accounts_4.LbPair.fetch(this._rpc, strategyState.pool, this._meteoraService.getMeteoraProgramId());
+        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`);
         }
@@ -4882,8 +4673,8 @@ class Kamino {
         }
         else {
             const binArrayIndex = (0, meteora_1.binIdToBinArrayIndex)(new bn_js_1.default(poolState.activeId));
-            const [binArrayPk] = await (0, meteora_1.deriveBinArray)(strategyState.pool, binArrayIndex, this._meteoraService.getMeteoraProgramId());
-            const binArray = await accounts_4.BinArray.fetch(this._rpc, binArrayPk, this._meteoraService.getMeteoraProgramId());
+            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`);
             }
@@ -4902,8 +4693,8 @@ class Kamino {
                 throw new Error(`bin ${poolState.activeId.toString()} is not found`);
             }
             if (amountADecimal.eq(utils_1.ZERO) && amountBDecimal.eq(utils_1.ZERO)) {
-                const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, strategyState.tokenAMint);
-                const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, strategyState.tokenBMint);
+                const decimalsA = await (0, utils_1.getMintDecimals)(this._connection, strategyState.tokenAMint);
+                const decimalsB = await (0, utils_1.getMintDecimals)(this._connection, strategyState.tokenBMint);
                 const poolPrice = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(poolState.activeId, poolState.binStep, decimalsA, decimalsB);
                 return [tokenAAmount || tokenBAmount.div(poolPrice), tokenBAmount || tokenAAmount.mul(poolPrice)];
             }
@@ -4971,12 +4762,9 @@ class Kamino {
      * @param owner
      */
     async getUserTermsSignatureState(owner) {
-        const pdaSeed = [Buffer.from('signature'), addressEncoder.encode(owner)];
-        const [signatureStateKey, _signatureStateBump] = await (0, kit_1.getProgramDerivedAddress)({
-            seeds: pdaSeed,
-            programAddress: this.getProgramID(),
-        });
-        return await accounts_1.TermsSignature.fetch(this._rpc, signatureStateKey, this.getProgramID());
+        const pdaSeed = [Buffer.from('signature'), owner.toBuffer()];
+        const [signatureStateKey, _signatureStateBump] = web3_js_1.PublicKey.findProgramAddressSync(pdaSeed, this._kaminoProgramId);
+        return await accounts_1.TermsSignature.fetch(this._connection, signatureStateKey);
     }
     /**
      * Get the instruction to store the on chain owner signature of terms&conditions
@@ -4984,35 +4772,35 @@ class Kamino {
      * @param signature
      */
     async getUserTermsSignatureIx(owner, signature) {
-        const pdaSeed = [Buffer.from('signature'), addressEncoder.encode(owner.address)];
-        const [signatureStateKey] = await (0, kit_1.getProgramDerivedAddress)({ seeds: pdaSeed, programAddress: this.getProgramID() });
+        const pdaSeed = [Buffer.from('signature'), owner.toBuffer()];
+        const [signatureStateKey, _signatureStateBump] = web3_js_1.PublicKey.findProgramAddressSync(pdaSeed, this._kaminoProgramId);
         const args = {
             signature: Array.from(signature),
         };
         const accounts = {
             owner: owner,
             ownerSignatureState: signatureStateKey,
-            systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
-            rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
         };
-        return (0, instructions_2.signTerms)(args, accounts, this.getProgramID());
+        return (0, instructions_2.signTerms)(args, accounts);
     }
     async getDepositRatioFromAOrca(strategy, amountA) {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const whirlpool = await accounts_2.Whirlpool.fetch(this._rpc, strategyState.pool, this._orcaService.getWhirlpoolProgramId());
+        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 accounts_2.Position.fetch(this._rpc, strategyState.position, this._orcaService.getWhirlpoolProgramId());
+        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`);
         }
         const params = {
-            tokenMintA: (0, compat_2.toLegacyPublicKey)(strategyState.tokenAMint),
-            tokenMintB: (0, compat_2.toLegacyPublicKey)(strategyState.tokenBMint),
+            tokenMintA: strategyState.tokenAMint,
+            tokenMintB: strategyState.tokenBMint,
             tickCurrentIndex: whirlpool.tickCurrentIndex,
             sqrtPrice: whirlpool.sqrtPrice,
-            inputTokenMint: (0, compat_2.toLegacyPublicKey)(strategyState.tokenAMint),
+            inputTokenMint: strategyState.tokenAMint,
             inputTokenAmount: amountA,
             tickLowerIndex: position.tickLowerIndex,
             tickUpperIndex: position.tickUpperIndex,
@@ -5023,8 +4811,8 @@ class Kamino {
     }
     async getDepositRatioFromAMeteora(strategy) {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const poolStatePromise = accounts_4.LbPair.fetch(this._rpc, strategyState.pool, this._meteoraService.getMeteoraProgramId());
-        const positionPromise = accounts_4.PositionV2.fetch(this._rpc, strategyState.position, this._meteoraService.getMeteoraProgramId());
+        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()}`);
@@ -5034,8 +4822,8 @@ class Kamino {
     async getDepositRatioFromBMeteora(strategy) {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
         const [poolState, _position] = await Promise.all([
-            accounts_4.LbPair.fetch(this._rpc, strategyState.pool, this._meteoraService.getMeteoraProgramId()),
-            accounts_4.PositionV2.fetch(this._rpc, strategyState.position, this._meteoraService.getMeteoraProgramId()),
+            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()}`);
@@ -5044,20 +4832,20 @@ class Kamino {
     }
     getDepositRatioFromBOrca = async (strategy, amountB) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const whirlpool = await accounts_2.Whirlpool.fetch(this._rpc, strategyState.pool, this._orcaService.getWhirlpoolProgramId());
+        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 accounts_2.Position.fetch(this._rpc, strategyState.position, this._orcaService.getWhirlpoolProgramId());
+        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`);
         }
         const params = {
-            tokenMintA: (0, compat_2.toLegacyPublicKey)(strategyState.tokenAMint),
-            tokenMintB: (0, compat_2.toLegacyPublicKey)(strategyState.tokenBMint),
+            tokenMintA: strategyState.tokenAMint,
+            tokenMintB: strategyState.tokenBMint,
             tickCurrentIndex: whirlpool.tickCurrentIndex,
             sqrtPrice: whirlpool.sqrtPrice,
-            inputTokenMint: (0, compat_2.toLegacyPublicKey)(strategyState.tokenBMint),
+            inputTokenMint: strategyState.tokenBMint,
             inputTokenAmount: amountB,
             tickLowerIndex: position.tickLowerIndex,
             tickUpperIndex: position.tickUpperIndex,
@@ -5068,8 +4856,8 @@ class Kamino {
     };
     getDepositRatioFromARaydium = async (strategy, amountA) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const poolState = await accounts_3.PoolState.fetch(this._rpc, strategyState.pool, this._raydiumService.getRaydiumProgramId());
-        const positionState = await accounts_3.PersonalPositionState.fetch(this._rpc, strategyState.position, this._raydiumService.getRaydiumProgramId());
+        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.`);
         }
@@ -5084,8 +4872,8 @@ class Kamino {
     };
     getDepositRatioFromBRaydium = async (strategy, amountB) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
-        const poolState = await accounts_3.PoolState.fetch(this._rpc, strategyState.pool, this._raydiumService.getRaydiumProgramId());
-        const positionState = await accounts_3.PersonalPositionState.fetch(this._rpc, strategyState.position, this._raydiumService.getRaydiumProgramId());
+        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.`);
         }
@@ -5099,20 +4887,20 @@ class Kamino {
         return amountsSlippage;
     };
     getCollateralInfo = async (address) => {
-        const collateralInfos = await accounts_1.CollateralInfos.fetch(this._rpc, address, this.getProgramID());
+        const collateralInfos = await accounts_1.CollateralInfos.fetch(this._connection, address, this._kaminoProgramId);
         if (collateralInfos === null) {
             throw new Error('Could not fetch CollateralInfos');
         }
         return collateralInfos.infos;
     };
     getGlobalConfigState = async (address) => {
-        return await accounts_1.GlobalConfig.fetch(this._rpc, address, this.getProgramID());
+        return await accounts_1.GlobalConfig.fetch(this._connection, address, this._kaminoProgramId);
     };
     getWhirlpoolStrategy = async (address) => {
-        return await accounts_1.WhirlpoolStrategy.fetch(this._rpc, address, this.getProgramID());
+        return await accounts_1.WhirlpoolStrategy.fetch(this._connection, address, this._kaminoProgramId);
     };
     getWhirlpoolStrategies = async (addresses) => {
-        return await accounts_1.WhirlpoolStrategy.fetchMultiple(this._rpc, addresses, this.getProgramID());
+        return await accounts_1.WhirlpoolStrategy.fetchMultiple(this._connection, addresses, this._kaminoProgramId);
     };
     getStrategyVaultBalances = async (strategy) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
@@ -5125,18 +4913,18 @@ class Kamino {
         return { aVault, bVault };
     };
     getUpdateStrategyParamsIxs = async (strategyAdmin, strategy, rebalanceType, withdrawFeeBps, performanceFeeBps) => {
-        const updateRebalanceTypeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateRebalanceType(), rebalanceType, this.getProgramID());
+        const updateRebalanceTypeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateRebalanceType(), rebalanceType);
         let updateWithdrawalFeeIx = null;
         if (withdrawFeeBps) {
-            updateWithdrawalFeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateWithdrawFee(), withdrawFeeBps, this.getProgramID());
+            updateWithdrawalFeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateWithdrawFee(), withdrawFeeBps);
         }
         if (!performanceFeeBps) {
             performanceFeeBps = DefaultStrategyConfig_1.DefaultPerformanceFeeBps;
         }
-        const updateFeesFeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateCollectFeesFee(), performanceFeeBps, this.getProgramID());
-        const updateRewards0FeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateReward0Fee(), performanceFeeBps, this.getProgramID());
-        const updateRewards1FeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateReward1Fee(), performanceFeeBps, this.getProgramID());
-        const updateRewards2FeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateReward2Fee(), performanceFeeBps, this.getProgramID());
+        const updateFeesFeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateCollectFeesFee(), performanceFeeBps);
+        const updateRewards0FeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateReward0Fee(), performanceFeeBps);
+        const updateRewards1FeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateReward1Fee(), performanceFeeBps);
+        const updateRewards2FeeIx = await (0, utils_1.getUpdateStrategyConfigIx)(strategyAdmin, this._globalConfig, strategy, new StrategyConfigOption_1.UpdateReward2Fee(), performanceFeeBps);
         const ixs = [updateRebalanceTypeIx, updateFeesFeeIx, updateRewards0FeeIx, updateRewards1FeeIx, updateRewards2FeeIx];
         if (updateWithdrawalFeeIx) {
             ixs.push(updateWithdrawalFeeIx);
@@ -5155,18 +4943,18 @@ class Kamino {
         }
         const collateralInfos = await this.getCollateralInfo(globalConfig.tokenInfos);
         const result = [];
-        if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('ORCA')) {
-            const whirlpool = await accounts_2.Whirlpool.fetch(this._rpc, strategyState.pool, this._orcaService.getWhirlpoolProgramId());
+        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()}`);
             }
             for (let i = 0; i < 3; i++) {
-                if (whirlpool.rewardInfos[i].mint !== pubkeys_1.DEFAULT_PUBLIC_KEY) {
+                if (!whirlpool.rewardInfos[i].mint.equals(web3_js_1.PublicKey.default)) {
                     const collateralId = this.getCollateralIdFromMint(whirlpool.rewardInfos[i].mint, collateralInfos);
-                    if (collateralId === -1) {
+                    if (collateralId == -1) {
                         throw Error(`Could not find collateral id for mint ${whirlpool.rewardInfos[i].mint.toString()}`);
                     }
-                    const rewardVault = await (0, kit_1.generateKeyPairSigner)();
+                    const rewardVault = web3_js_1.Keypair.generate();
                     const args = {
                         rewardIndex: i,
                         collateralToken: collateralId,
@@ -5178,31 +4966,31 @@ class Kamino {
                         strategy: strategyWithAddress.address,
                         pool: strategyState.pool,
                         rewardMint: whirlpool.rewardInfos[i].mint,
-                        rewardVault: rewardVault,
+                        rewardVault: rewardVault.publicKey,
                         baseVaultAuthority: strategyState.baseVaultAuthority,
-                        systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
-                        rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+                        systemProgram: web3_js_1.SystemProgram.programId,
+                        rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                         tokenProgram,
                         tokenInfos: globalConfig.tokenInfos,
                     };
-                    const ix = (0, instructions_2.updateRewardMapping)(args, accounts, this.getProgramID());
+                    const ix = (0, instructions_1.updateRewardMapping)(args, accounts);
                     result.push([ix, rewardVault]);
                 }
             }
             return result;
         }
-        else if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('RAYDIUM')) {
-            const poolState = await accounts_3.PoolState.fetch(this._rpc, strategyState.pool, this._raydiumService.getRaydiumProgramId());
+        else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
+            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()}`);
             }
             for (let i = 0; i < 3; i++) {
-                if (poolState.rewardInfos[i].tokenMint !== pubkeys_1.DEFAULT_PUBLIC_KEY) {
+                if (!poolState.rewardInfos[i].tokenMint.equals(web3_js_1.PublicKey.default)) {
                     const collateralId = this.getCollateralIdFromMint(poolState.rewardInfos[i].tokenMint, collateralInfos);
-                    if (collateralId === -1) {
+                    if (collateralId == -1) {
                         throw Error(`Could not find collateral id for mint ${poolState.rewardInfos[i].tokenMint.toString()}`);
                     }
-                    const rewardVault = await (0, kit_1.generateKeyPairSigner)();
+                    const rewardVault = web3_js_1.Keypair.generate();
                     const args = {
                         rewardIndex: i,
                         collateralToken: collateralId,
@@ -5214,31 +5002,31 @@ class Kamino {
                         strategy: strategyWithAddress.address,
                         pool: strategyState.pool,
                         rewardMint: poolState.rewardInfos[i].tokenMint,
-                        rewardVault: rewardVault,
+                        rewardVault: rewardVault.publicKey,
                         baseVaultAuthority: strategyState.baseVaultAuthority,
-                        systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
-                        rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+                        systemProgram: web3_js_1.SystemProgram.programId,
+                        rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                         tokenProgram,
                         tokenInfos: globalConfig.tokenInfos,
                     };
-                    const ix = (0, instructions_2.updateRewardMapping)(args, accounts, this.getProgramID());
+                    const ix = (0, instructions_1.updateRewardMapping)(args, accounts);
                     result.push([ix, rewardVault]);
                 }
             }
             return result;
         }
-        else if (strategyState.strategyDex.toNumber() === (0, utils_1.dexToNumber)('METEORA')) {
-            const poolState = await accounts_4.LbPair.fetch(this._rpc, strategyState.pool, this._meteoraService.getMeteoraProgramId());
+        else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
+            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()}`);
             }
             for (let i = 0; i < 2; i++) {
-                if (poolState.rewardInfos[i].mint !== pubkeys_1.DEFAULT_PUBLIC_KEY) {
+                if (!poolState.rewardInfos[i].mint.equals(web3_js_1.PublicKey.default)) {
                     const collateralId = this.getCollateralIdFromMint(poolState.rewardInfos[i].mint, collateralInfos);
-                    if (collateralId === -1) {
+                    if (collateralId == -1) {
                         throw Error(`Could not find collateral id for mint ${poolState.rewardInfos[i].mint.toString()}`);
                     }
-                    const rewardVault = await (0, kit_1.generateKeyPairSigner)();
+                    const rewardVault = web3_js_1.Keypair.generate();
                     const args = {
                         rewardIndex: i,
                         collateralToken: collateralId,
@@ -5250,14 +5038,14 @@ class Kamino {
                         strategy: strategyWithAddress.address,
                         pool: strategyState.pool,
                         rewardMint: poolState.rewardInfos[i].mint,
-                        rewardVault: rewardVault,
+                        rewardVault: rewardVault.publicKey,
                         baseVaultAuthority: strategyState.baseVaultAuthority,
-                        systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
-                        rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+                        systemProgram: web3_js_1.SystemProgram.programId,
+                        rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                         tokenProgram,
                         tokenInfos: globalConfig.tokenInfos,
                     };
-                    const ix = (0, instructions_2.updateRewardMapping)(args, accounts, this.getProgramID());
+                    const ix = (0, instructions_1.updateRewardMapping)(args, accounts);
                     result.push([ix, rewardVault]);
                 }
             }
@@ -5276,12 +5064,12 @@ class Kamino {
      */
     initializeTickForOrcaPool = async (payer, pool, price) => {
         const { address: poolAddress, whirlpool: whilrpoolState } = await this.getWhirlpoolStateIfNotFetched(pool);
-        const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, whilrpoolState.tokenMintA);
-        const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, whilrpoolState.tokenMintB);
+        const decimalsA = await (0, utils_1.getMintDecimals)(this._connection, whilrpoolState.tokenMintA);
+        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] = await (0, utils_1.getTickArray)(this._orcaService.getWhirlpoolProgramId(), poolAddress, startTickIndex);
-        const tick = await accounts_2.TickArray.fetch(this._rpc, startTickIndexPk, this._orcaService.getWhirlpoolProgramId());
+        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 = {
@@ -5291,11 +5079,11 @@ class Kamino {
                 whirlpool: poolAddress,
                 funder: payer,
                 tickArray: startTickIndexPk,
-                systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
+                systemProgram: web3_js_1.SystemProgram.programId,
             };
             return {
                 tick: startTickIndexPk,
-                initTickIx: (0, instructions_1.initializeTickArray)(initTickArrayArgs, initTickArrayAccounts),
+                initTickIx: (0, whirlpools_client_1.initializeTickArray)(initTickArrayArgs, initTickArrayAccounts),
             };
         }
         return {
@@ -5305,12 +5093,12 @@ class Kamino {
     };
     initializeTickForMeteoraPool = async (payer, pool, price) => {
         const { address: poolAddress, pool: poolState } = await this.getMeteoraStateIfNotFetched(pool);
-        const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, poolState.tokenXMint);
-        const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, poolState.tokenYMint);
+        const decimalsA = await (0, utils_1.getMintDecimals)(this._connection, poolState.tokenXMint);
+        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] = await (0, meteora_1.deriveBinArray)(poolAddress, binArrayIndex, this._meteoraService.getMeteoraProgramId());
-        const tick = await accounts_2.TickArray.fetch(this._rpc, startTickIndexPk, this._meteoraService.getMeteoraProgramId());
+        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 = {
@@ -5319,7 +5107,7 @@ class Kamino {
             const initTickArrayAccounts = {
                 funder: payer,
                 binArray: startTickIndexPk,
-                systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
+                systemProgram: web3_js_1.SystemProgram.programId,
                 lbPair: poolAddress,
             };
             return {
@@ -5332,20 +5120,6 @@ class Kamino {
             initTickIx: undefined,
         };
     };
-    getDexProgramId(strategyState) {
-        if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('ORCA')) {
-            return this._orcaService.getWhirlpoolProgramId();
-        }
-        else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('RAYDIUM')) {
-            return this._raydiumService.getRaydiumProgramId();
-        }
-        else if (strategyState.strategyDex.toNumber() == (0, utils_1.dexToNumber)('METEORA')) {
-            return this._meteoraService.getMeteoraProgramId();
-        }
-        else {
-            throw Error(`Invalid DEX ${strategyState.strategyDex.toString()}`);
-        }
-    }
 }
 exports.Kamino = Kamino;
 exports.default = Kamino;