@kamino-finance/klend-sdk 6.0.3 → 6.0.5-beta.0

package/dist/classes/reserve.d.ts

@@ -1,26 +1,26 @@
-import { Address, IInstruction, Slot, TransactionSigner, Rpc, GetMinimumBalanceForRentExemptionApi, Option, GetProgramAccountsApi, GetAccountInfoApi, GetMultipleAccountsApi } from '@solana/kit';
+import { AccountInfo, Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 import { MarketWithAddress, TokenOracleData } from '../utils';
 import { FeeCalculation, Fees, ReserveDataType, ReserveRewardYield } from './shared';
-import { Reserve } from '../@codegen/klend/accounts';
-import { ReserveConfig, UpdateConfigModeKind } from '../@codegen/klend/types';
+import { Reserve } from '../idl_codegen/accounts';
+import { ReserveConfig, UpdateConfigModeKind } from '../idl_codegen/types';
 import { ConfigUpdater } from './configItems';
 import { ActionType } from './action';
 import { BorrowCapsAndCounters, KaminoMarket } from './market';
 import { KaminoPrices } from '@kamino-finance/kliquidity-sdk';
-export type KaminoReserveRpcApi = GetProgramAccountsApi & GetAccountInfoApi & GetMultipleAccountsApi;
 export declare const DEFAULT_RECENT_SLOT_DURATION_MS = 450;
 export declare class KaminoReserve {
     state: Reserve;
-    address: Address;
+    address: PublicKey;
     symbol: string;
     tokenOraclePrice: TokenOracleData;
     stats: ReserveDataType;
     private farmData;
-    private rpc;
+    private buffer;
+    private connection;
     private readonly recentSlotDurationMs;
-    constructor(state: Reserve, address: Address, tokenOraclePrice: TokenOracleData, connection: Rpc<KaminoReserveRpcApi>, recentSlotDurationMs: number);
-    static initialize(address: Address, state: Reserve, tokenOraclePrice: TokenOracleData, rpc: Rpc<KaminoReserveRpcApi>, recentSlotDurationMs: number): KaminoReserve;
+    constructor(state: Reserve, address: PublicKey, tokenOraclePrice: TokenOracleData, connection: Connection, recentSlotDurationMs: number);
+    static initialize(accountData: AccountInfo<Buffer>, address: PublicKey, state: Reserve, tokenOraclePrice: TokenOracleData, connection: Connection, recentSlotDurationMs: number): KaminoReserve;
     /**
      * @returns the parsed token symbol of the reserve
      */
@@ -77,7 +77,7 @@ export declare class KaminoReserve {
     /**
      * Calculates the total liquidity supply of the reserve
      */
-    getEstimatedTotalSupply(slot: Slot, referralFeeBps: number): Decimal;
+    getEstimatedTotalSupply(slot: number, referralFeeBps: number): Decimal;
     /**
      * Use getEstimatedCumulativeBorrowRate() for the most accurate value
      * @returns the stale cumulative borrow rate of the reserve from the last refresh
@@ -86,7 +86,7 @@ export declare class KaminoReserve {
     /**
      * @Returns estimated cumulative borrow rate of the reserve
      */
-    getEstimatedCumulativeBorrowRate(currentSlot: Slot, referralFeeBps: number): Decimal;
+    getEstimatedCumulativeBorrowRate(currentSlot: number, referralFeeBps: number): Decimal;
     /**
      * Use getEstimatedCollateralExchangeRate() for the most accurate value
      * @returns the stale exchange rate between the collateral tokens and the liquidity - this is a decimal number scaled by 1e18
@@ -96,7 +96,7 @@ export declare class KaminoReserve {
      *
      * @returns the estimated exchange rate between the collateral tokens and the liquidity - this is a decimal number scaled by 1e18
      */
-    getEstimatedCollateralExchangeRate(slot: Slot, referralFeeBps: number): Decimal;
+    getEstimatedCollateralExchangeRate(slot: number, referralFeeBps: number): Decimal;
     /**
      *
      * @returns the total USD value of the existing collateral in the reserve
@@ -115,14 +115,6 @@ export declare class KaminoReserve {
      * @returns mint_decimals of the liquidity token
      */
     getMintDecimals(): number;
-    /**
-     * @returns the collateral farm address if it is set, otherwise none
-     */
-    getCollateralFarmAddress(): Option<Address>;
-    /**
-     * @returns the debt farm address if it is set, otherwise none
-     */
-    getDebtFarmAddress(): Option<Address>;
     /**
      * @Returns true if the total liquidity supply of the reserve is greater than the deposit limit
      */
@@ -140,7 +132,7 @@ export declare class KaminoReserve {
      *
      * @returns the current capacity of the daily deposit withdrawal cap
      */
-    getDepositWithdrawalCapCurrent(slot: Slot): Decimal;
+    getDepositWithdrawalCapCurrent(slot: number): Decimal;
     /**
      *
      * @returns the max capacity of the daily debt withdrawal cap
@@ -170,46 +162,47 @@ export declare class KaminoReserve {
      *
      * @returns the current capacity of the daily debt withdrawal cap
      */
-    getDebtWithdrawalCapCurrent(slot: Slot): Decimal;
+    getDebtWithdrawalCapCurrent(slot: number): Decimal;
     getBorrowFactor(): Decimal;
-    calculateSupplyAPR(slot: Slot, referralFeeBps: number): number;
-    getEstimatedDebtAndSupply(slot: Slot, referralFeeBps: number): {
+    calculateSupplyAPR(slot: number, referralFeeBps: number): number;
+    getEstimatedDebtAndSupply(slot: number, referralFeeBps: number): {
         totalBorrow: Decimal;
         totalSupply: Decimal;
     };
-    getEstimatedAccumulatedProtocolFees(slot: Slot, referralFeeBps: number): {
+    getEstimatedAccumulatedProtocolFees(slot: number, referralFeeBps: number): {
         accumulatedProtocolFees: Decimal;
         compoundedVariableProtocolFee: Decimal;
         compoundedFixedHostFee: Decimal;
     };
     calculateUtilizationRatio(): number;
-    getEstimatedUtilizationRatio(slot: Slot, referralFeeBps: number): number;
-    calcSimulatedUtilizationRatio(amount: Decimal, action: ActionType, slot: Slot, referralFeeBps: number, outflowAmount?: Decimal): number;
-    getMaxBorrowAmountWithCollReserve(market: KaminoMarket, collReserve: KaminoReserve, slot: Slot): Decimal;
-    calcSimulatedBorrowRate(amount: Decimal, action: ActionType, slot: Slot, referralFeeBps: number, outflowAmount?: Decimal): number;
-    calcSimulatedBorrowAPR(amount: Decimal, action: ActionType, slot: Slot, referralFeeBps: number, outflowAmount?: Decimal): number;
-    calcSimulatedSupplyAPR(amount: Decimal, action: ActionType, slot: Slot, referralFeeBps: number, outflowAmount?: Decimal): number;
+    getEstimatedUtilizationRatio(slot: number, referralFeeBps: number): number;
+    calcSimulatedUtilizationRatio(amount: Decimal, action: ActionType, slot: number, referralFeeBps: number, outflowAmount?: Decimal): number;
+    getMaxBorrowAmountWithCollReserve(market: KaminoMarket, collReserve: KaminoReserve, slot: number): Decimal;
+    calcSimulatedBorrowRate(amount: Decimal, action: ActionType, slot: number, referralFeeBps: number, outflowAmount?: Decimal): number;
+    calcSimulatedBorrowAPR(amount: Decimal, action: ActionType, slot: number, referralFeeBps: number, outflowAmount?: Decimal): number;
+    calcSimulatedSupplyAPR(amount: Decimal, action: ActionType, slot: number, referralFeeBps: number, outflowAmount?: Decimal): number;
     slotAdjustmentFactor(): number;
     calculateBorrowRate(): number;
-    calculateEstimatedBorrowRate(slot: Slot, referralFeeBps: number): number;
-    calculateBorrowAPR(slot: Slot, referralFeeBps: number): number;
+    calculateEstimatedBorrowRate(slot: number, referralFeeBps: number): number;
+    calculateBorrowAPR(slot: number, referralFeeBps: number): number;
     /**
      * @returns the mint of the reserve liquidity token
      */
-    getLiquidityMint(): Address;
+    getLiquidityMint(): PublicKey;
     /**
      * @returns the token program of the reserve liquidity mint
      */
-    getLiquidityTokenProgram(): Address;
+    getLiquidityTokenProgram(): PublicKey;
     /**
      * @returns the mint of the reserve collateral token , i.e. the cToken minted for depositing the liquidity token
      */
-    getCTokenMint(): Address;
+    getCTokenMint(): PublicKey;
     calculateFees(amountLamports: Decimal, borrowFeeRate: Decimal, feeCalculation: FeeCalculation, referralFeeBps: number, hasReferrer: boolean): Fees;
     calculateFlashLoanFees(flashLoanAmountLamports: Decimal, referralFeeBps: number, hasReferrer: boolean): Fees;
+    setBuffer(buffer: AccountInfo<Buffer> | null): void;
     load(tokenOraclePrice: TokenOracleData): Promise<void>;
-    totalSupplyAPY(currentSlot: Slot): number;
-    totalBorrowAPY(currentSlot: Slot): number;
+    totalSupplyAPY(currentSlot: number): number;
+    totalBorrowAPY(currentSlot: number): number;
     loadFarmStates(): Promise<void>;
     getRewardYields(prices: KaminoPrices): Promise<ReserveRewardYield[]>;
     private calculateRewardYield;
@@ -237,15 +230,15 @@ export declare class KaminoReserve {
      */
     private approximateCompoundedInterest;
     getBorrowCapForReserve(market: KaminoMarket): BorrowCapsAndCounters;
-    getLiquidityAvailableForDebtReserveGivenCaps(market: KaminoMarket, elevationGroups: number[], collateralReserves?: Address[]): Decimal[];
+    getLiquidityAvailableForDebtReserveGivenCaps(market: KaminoMarket, elevationGroups: number[], collateralReserves?: PublicKey[]): Decimal[];
 }
-export declare function createReserveIxs(rpc: Rpc<GetMinimumBalanceForRentExemptionApi>, owner: TransactionSigner, ownerLiquiditySource: Address, lendingMarket: Address, liquidityMint: Address, liquidityMintTokenProgram: Address, reserveAddress: TransactionSigner, programId: Address): Promise<IInstruction[]>;
-export declare function updateReserveConfigIx(signer: TransactionSigner, marketAddress: Address, reserveAddress: Address, mode: UpdateConfigModeKind, value: Uint8Array, programId: Address, skipConfigIntegrityValidation?: boolean): Promise<IInstruction>;
+export declare function createReserveIxs(connection: Connection, owner: PublicKey, ownerLiquiditySource: PublicKey, lendingMarket: PublicKey, liquidityMint: PublicKey, reserveAddress: PublicKey, programId: PublicKey): Promise<TransactionInstruction[]>;
+export declare function updateReserveConfigIx(signer: PublicKey, marketAddress: PublicKey, reserveAddress: PublicKey, mode: UpdateConfigModeKind, value: Uint8Array, programId: PublicKey, skipConfigIntegrityValidation?: boolean): TransactionInstruction;
 export declare const RESERVE_CONFIG_UPDATER: ConfigUpdater<UpdateConfigModeKind, ReserveConfig>;
-export declare function updateEntireReserveConfigIx(signer: TransactionSigner, marketAddress: Address, reserveAddress: Address, reserveConfig: ReserveConfig, programId: Address): Promise<IInstruction>;
-export declare function parseForChangesReserveConfigAndGetIxs(marketWithAddress: MarketWithAddress, reserve: Reserve | undefined, reserveAddress: Address, reserveConfig: ReserveConfig, programId: Address, lendingMarketOwner?: TransactionSigner): Promise<IInstruction[]>;
+export declare function updateEntireReserveConfigIx(signer: PublicKey, marketAddress: PublicKey, reserveAddress: PublicKey, reserveConfig: ReserveConfig, programId: PublicKey): TransactionInstruction;
+export declare function parseForChangesReserveConfigAndGetIxs(marketWithAddress: MarketWithAddress, reserve: Reserve | undefined, reserveAddress: PublicKey, reserveConfig: ReserveConfig, programId: PublicKey): TransactionInstruction[];
 export type ReserveWithAddress = {
-    address: Address;
+    address: PublicKey;
     state: Reserve;
 };
 //# sourceMappingURL=reserve.d.ts.map

package/dist/classes/reserve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reserve.d.ts","sourceRoot":"","sources":["../../src/classes/reserve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reserve.d.ts","sourceRoot":"","sources":["../../src/classes/reserve.ts"],"names":[],"mappings":"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"}

package/dist/classes/reserve.js

@@ -9,23 +9,19 @@ exports.updateReserveConfigIx = updateReserveConfigIx;
 exports.updateEntireReserveConfigIx = updateEntireReserveConfigIx;
 exports.parseForChangesReserveConfigAndGetIxs = parseForChangesReserveConfigAndGetIxs;
 /* eslint-disable max-classes-per-file */
-const kit_1 = require("@solana/kit");
+const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const utils_1 = require("../utils");
 const shared_1 = require("./shared");
-const accounts_1 = require("../@codegen/klend/accounts");
-const types_1 = require("../@codegen/klend/types");
+const accounts_1 = require("../idl_codegen/accounts");
+const types_1 = require("../idl_codegen/types");
 const utils_2 = require("./utils");
 const configItems_1 = require("./configItems");
 const fraction_1 = require("./fraction");
 const lib_1 = require("../lib");
+const spl_token_1 = require("@solana/spl-token");
 const kliquidity_sdk_1 = require("@kamino-finance/kliquidity-sdk");
 const farms_sdk_1 = require("@kamino-finance/farms-sdk");
-const token_1 = require("@solana-program/token");
-const bigint_1 = require("../utils/bigint");
-const system_1 = require("@solana-program/system");
-const sysvars_1 = require("@solana/sysvars");
-const signer_1 = require("../utils/signer");
 exports.DEFAULT_RECENT_SLOT_DURATION_MS = 450;
 class KaminoReserve {
     state;
@@ -34,19 +30,22 @@ class KaminoReserve {
     tokenOraclePrice;
     stats;
     farmData = { fetched: false, farmStates: [] };
-    rpc;
+    buffer;
+    connection;
     recentSlotDurationMs;
     constructor(state, address, tokenOraclePrice, connection, recentSlotDurationMs) {
         this.state = state;
         this.address = address;
+        this.buffer = null;
         this.tokenOraclePrice = tokenOraclePrice;
         this.stats = {};
-        this.rpc = connection;
+        this.connection = connection;
         this.symbol = (0, utils_2.parseTokenSymbol)(state.config.tokenInfo.name);
         this.recentSlotDurationMs = recentSlotDurationMs;
     }
-    static initialize(address, state, tokenOraclePrice, rpc, recentSlotDurationMs) {
-        const reserve = new KaminoReserve(state, address, tokenOraclePrice, rpc, recentSlotDurationMs);
+    static initialize(accountData, address, state, tokenOraclePrice, connection, recentSlotDurationMs) {
+        const reserve = new KaminoReserve(state, address, tokenOraclePrice, connection, recentSlotDurationMs);
+        reserve.setBuffer(accountData);
         reserve.stats = reserve.formatReserveData(state);
         return reserve;
     }
@@ -154,7 +153,7 @@ class KaminoReserve {
      */
     getEstimatedCumulativeBorrowRate(currentSlot, referralFeeBps) {
         const currentBorrowRate = new decimal_js_1.default(this.calculateBorrowAPR(currentSlot, referralFeeBps));
-        const slotsElapsed = (0, bigint_1.maxBigInt)(currentSlot - BigInt(this.state.lastUpdate.slot.toString()), 0n);
+        const slotsElapsed = Math.max(currentSlot - this.state.lastUpdate.slot.toNumber(), 0);
         const compoundInterest = this.approximateCompoundedInterest(currentBorrowRate, slotsElapsed);
         const previousCumulativeBorrowRate = this.getCumulativeBorrowRate();
         return previousCumulativeBorrowRate.mul(compoundInterest);
@@ -213,24 +212,6 @@ class KaminoReserve {
     getMintDecimals() {
         return this.state.liquidity.mintDecimals.toNumber();
     }
-    /**
-     * @returns the collateral farm address if it is set, otherwise none
-     */
-    getCollateralFarmAddress() {
-        if (this.state.farmCollateral === utils_1.DEFAULT_PUBLIC_KEY) {
-            return (0, kit_1.none)();
-        }
-        return (0, kit_1.some)(this.state.farmCollateral);
-    }
-    /**
-     * @returns the debt farm address if it is set, otherwise none
-     */
-    getDebtFarmAddress() {
-        if (this.state.farmDebt === utils_1.DEFAULT_PUBLIC_KEY) {
-            return (0, kit_1.none)();
-        }
-        return (0, kit_1.some)(this.state.farmDebt);
-    }
     /**
      * @Returns true if the total liquidity supply of the reserve is greater than the deposit limit
      */
@@ -255,7 +236,7 @@ class KaminoReserve {
      * @returns the current capacity of the daily deposit withdrawal cap
      */
     getDepositWithdrawalCapCurrent(slot) {
-        const slotsElapsed = (0, bigint_1.maxBigInt)(slot - BigInt(this.state.lastUpdate.slot.toString()), 0n);
+        const slotsElapsed = Math.max(slot - this.state.lastUpdate.slot.toNumber(), 0);
         if (slotsElapsed > utils_1.SLOTS_PER_DAY) {
             return new decimal_js_1.default(0);
         }
@@ -303,7 +284,7 @@ class KaminoReserve {
      * @returns the current capacity of the daily debt withdrawal cap
      */
     getDebtWithdrawalCapCurrent(slot) {
-        const slotsElapsed = (0, bigint_1.maxBigInt)(slot - BigInt(this.state.lastUpdate.slot.toString()), 0n);
+        const slotsElapsed = Math.max(slot - this.state.lastUpdate.slot.toNumber(), 0);
         if (slotsElapsed > utils_1.SLOTS_PER_DAY) {
             return new decimal_js_1.default(0);
         }
@@ -321,10 +302,10 @@ class KaminoReserve {
         return currentUtilization * borrowRate * protocolTakeRatePct;
     }
     getEstimatedDebtAndSupply(slot, referralFeeBps) {
-        const slotsElapsed = (0, bigint_1.maxBigInt)(slot - BigInt(this.state.lastUpdate.slot.toNumber()), 0n);
+        const slotsElapsed = Math.max(slot - this.state.lastUpdate.slot.toNumber(), 0);
         let totalBorrow;
         let totalSupply;
-        if (slotsElapsed === 0n) {
+        if (slotsElapsed === 0) {
             totalBorrow = this.getBorrowedAmount();
             totalSupply = this.getTotalSupply();
         }
@@ -341,11 +322,11 @@ class KaminoReserve {
         return { totalBorrow, totalSupply };
     }
     getEstimatedAccumulatedProtocolFees(slot, referralFeeBps) {
-        const slotsElapsed = (0, bigint_1.maxBigInt)(slot - BigInt(this.state.lastUpdate.slot.toString()), 0n);
+        const slotsElapsed = Math.max(slot - this.state.lastUpdate.slot.toNumber(), 0);
         let accumulatedProtocolFees;
         let compoundedVariableProtocolFee;
         let compoundedFixedHostFee;
-        if (slotsElapsed === 0n) {
+        if (slotsElapsed === 0) {
             accumulatedProtocolFees = this.getAccumulatedProtocolFees();
             compoundedVariableProtocolFee = new decimal_js_1.default(0);
             compoundedFixedHostFee = new decimal_js_1.default(0);
@@ -557,8 +538,17 @@ class KaminoReserve {
     calculateFlashLoanFees(flashLoanAmountLamports, referralFeeBps, hasReferrer) {
         return this.calculateFees(flashLoanAmountLamports, this.getFlashLoanFee(), shared_1.FeeCalculation.Exclusive, referralFeeBps, hasReferrer);
     }
+    setBuffer(buffer) {
+        this.buffer = buffer;
+    }
     async load(tokenOraclePrice) {
-        const parsedData = await accounts_1.Reserve.fetch(this.rpc, this.address);
+        if (!this.buffer) {
+            this.setBuffer(await this.connection.getAccountInfo(this.address, 'processed'));
+        }
+        if (!this.buffer) {
+            throw Error(`Error requesting account info for ${this.symbol}`);
+        }
+        const parsedData = await accounts_1.Reserve.fetch(this.connection, this.address);
         if (!parsedData) {
             throw Error(`Unable to parse data of reserve ${this.symbol}`);
         }
@@ -583,16 +573,14 @@ class KaminoReserve {
     async loadFarmStates() {
         if (!this.farmData.fetched) {
             const farmStates = [];
-            const debtFarmAddress = this.getDebtFarmAddress();
-            if ((0, kit_1.isSome)(debtFarmAddress)) {
-                const farmState = await farms_sdk_1.FarmState.fetch(this.rpc, debtFarmAddress.value);
+            if (!this.state.farmDebt.equals(web3_js_1.PublicKey.default)) {
+                const farmState = await farms_sdk_1.FarmState.fetch(this.connection, this.state.farmDebt);
                 if (farmState !== null) {
                     farmStates.push(farmState);
                 }
             }
-            const collateralFarmAddress = this.getCollateralFarmAddress();
-            if ((0, kit_1.isSome)(collateralFarmAddress)) {
-                const farmState = await farms_sdk_1.FarmState.fetch(this.rpc, collateralFarmAddress.value);
+            if (!this.state.farmCollateral.equals(web3_js_1.PublicKey.default)) {
+                const farmState = await farms_sdk_1.FarmState.fetch(this.connection, this.state.farmCollateral);
                 if (farmState !== null) {
                     farmStates.push(farmState);
                 }
@@ -606,11 +594,11 @@ class KaminoReserve {
         if (!stats) {
             throw Error('KaminoMarket must call loadReserves.');
         }
-        const isDebtReward = this.state.farmDebt === this.address;
+        const isDebtReward = this.state.farmDebt.equals(this.address);
         await this.loadFarmStates();
         const yields = [];
         for (const farmState of this.farmData.farmStates) {
-            for (const rewardInfo of farmState.rewardInfos.filter((x) => x.token.mint !== utils_1.DEFAULT_PUBLIC_KEY && !x.rewardsAvailable.isZero())) {
+            for (const rewardInfo of farmState.rewardInfos.filter((x) => !x.token.mint.equals(web3_js_1.PublicKey.default) && !x.rewardsAvailable.isZero())) {
                 const { apy, apr } = this.calculateRewardYield(prices, rewardInfo, isDebtReward);
                 if (apy.isZero() && apr.isZero()) {
                     continue;
@@ -754,27 +742,27 @@ class KaminoReserve {
     approximateCompoundedInterest(rate, elapsedSlots) {
         const base = rate.div(utils_1.SLOTS_PER_YEAR);
         switch (elapsedSlots) {
-            case 0n:
+            case 0:
                 return new decimal_js_1.default(1);
-            case 1n:
+            case 1:
                 return base.add(1);
-            case 2n:
+            case 2:
                 return base.add(1).mul(base.add(1));
-            case 3n:
+            case 3:
                 return base.add(1).mul(base.add(1)).mul(base.add(1));
-            case 4n:
+            case 4:
                 // eslint-disable-next-line no-case-declarations
                 const pow2 = base.add(1).mul(base.add(1));
                 return pow2.mul(pow2);
         }
         const exp = elapsedSlots;
-        const expMinus1 = exp - 1n;
-        const expMinus2 = exp - 2n;
+        const expMinus1 = exp - 1;
+        const expMinus2 = exp - 2;
         const basePow2 = base.mul(base);
         const basePow3 = basePow2.mul(base);
-        const firstTerm = base.mul(exp.toString());
-        const secondTerm = basePow2.mul(exp.toString()).mul(expMinus1.toString()).div(2);
-        const thirdTerm = basePow3.mul(exp.toString()).mul(expMinus1.toString()).mul(expMinus2.toString()).div(6);
+        const firstTerm = base.mul(exp);
+        const secondTerm = basePow2.mul(exp).mul(expMinus1).div(2);
+        const thirdTerm = basePow3.mul(exp).mul(expMinus1).mul(expMinus2).div(6);
         return new decimal_js_1.default(1).add(firstTerm).add(secondTerm).add(thirdTerm);
     }
     getBorrowCapForReserve(market) {
@@ -786,9 +774,9 @@ class KaminoReserve {
         // Debt against collaterals in elevation groups
         const debtAgainstCollateralReserveCaps = market
             .getMarketElevationGroupDescriptions()
-            .filter((x) => x.debtReserve === this.address)
-            .map((elevationGroupDescription) => [...elevationGroupDescription.collateralReserves].map((collateralReserveAddress) => {
-            const collRes = market.reserves.get(collateralReserveAddress);
+            .filter((x) => x.debtReserve.equals(this.address))
+            .map((elevationGroupDescription) => elevationGroupDescription.collateralReserves.toArray().map((collateralReserveAddress) => {
+            const collRes = market.reserves.get(new web3_js_1.PublicKey(collateralReserveAddress));
             const debtLimitAgainstThisCollInGroup = collRes.state.config.borrowLimitAgainstThisCollateralInElevationGroup[elevationGroupDescription.elevationGroup - 1].toString();
             const debtCounterAgainstThisCollInGroup = collRes.state.borrowedAmountsAgainstThisReserveInElevationGroups[elevationGroupDescription.elevationGroup - 1].toString();
             return {
@@ -842,7 +830,7 @@ class KaminoReserve {
                 if (capsGivenEgroup.length > 0) {
                     remainingInsideEmodeCaps = decimal_js_1.default.min(...capsGivenEgroup.map((x) => {
                         // check reserve is part of collReserves array
-                        if (collateralReserves.find((collateralReserve) => collateralReserve === x.collateralReserve)) {
+                        if (collateralReserves.find((collateralReserve) => collateralReserve.equals(x.collateralReserve))) {
                             return x.maxDebt.minus(x.currentValue);
                         }
                         else {
@@ -867,43 +855,43 @@ const truncateBorrowCurve = (points) => {
     }
     return curve;
 };
-async function createReserveIxs(rpc, owner, ownerLiquiditySource, lendingMarket, liquidityMint, liquidityMintTokenProgram, reserveAddress, programId) {
-    const size = BigInt(accounts_1.Reserve.layout.span + 8);
-    const createReserveIx = (0, system_1.getCreateAccountInstruction)({
-        payer: owner,
+async function createReserveIxs(connection, owner, ownerLiquiditySource, lendingMarket, liquidityMint, reserveAddress, programId) {
+    const size = accounts_1.Reserve.layout.span + 8;
+    const createReserveIx = web3_js_1.SystemProgram.createAccount({
+        fromPubkey: owner,
+        newAccountPubkey: reserveAddress,
+        lamports: await connection.getMinimumBalanceForRentExemption(size),
         space: size,
-        lamports: await rpc.getMinimumBalanceForRentExemption(size).send(),
-        programAddress: programId,
-        newAccount: reserveAddress,
+        programId: programId,
     });
-    const { liquiditySupplyVault, collateralMint, collateralSupplyVault, feeVault } = await (0, utils_1.reservePdas)(programId, lendingMarket, liquidityMint);
-    const [lendingMarketAuthority] = await (0, utils_1.lendingMarketAuthPda)(lendingMarket, programId);
+    const { liquiditySupplyVault, collateralMint, collateralSupplyVault, feeVault } = (0, utils_1.reservePdas)(programId, lendingMarket, liquidityMint);
+    const [lendingMarketAuthority, _] = (0, utils_1.lendingMarketAuthPda)(lendingMarket, programId);
     const accounts = {
         lendingMarketOwner: owner,
         lendingMarket: lendingMarket,
         lendingMarketAuthority: lendingMarketAuthority,
-        reserve: reserveAddress.address,
+        reserve: reserveAddress,
         reserveLiquidityMint: liquidityMint,
         reserveLiquiditySupply: liquiditySupplyVault,
         feeReceiver: feeVault,
         reserveCollateralMint: collateralMint,
         reserveCollateralSupply: collateralSupplyVault,
         initialLiquiditySource: ownerLiquiditySource,
-        liquidityTokenProgram: liquidityMintTokenProgram,
-        collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-        systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
-        rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+        liquidityTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        systemProgram: web3_js_1.SystemProgram.programId,
+        rent: web3_js_1.SYSVAR_RENT_PUBKEY,
     };
     const initReserveIx = (0, lib_1.initReserve)(accounts, programId);
     return [createReserveIx, initReserveIx];
 }
-async function updateReserveConfigIx(signer, marketAddress, reserveAddress, mode, value, programId, skipConfigIntegrityValidation = false) {
+function updateReserveConfigIx(signer, marketAddress, reserveAddress, mode, value, programId, skipConfigIntegrityValidation = false) {
     const args = {
         mode,
         value,
         skipConfigIntegrityValidation,
     };
-    const globalConfig = await (0, utils_1.globalConfigPda)(programId);
+    const [globalConfig] = (0, utils_1.globalConfigPda)(programId);
     const accounts = {
         signer,
         lendingMarket: marketAddress,
@@ -964,13 +952,13 @@ exports.RESERVE_CONFIG_UPDATER = new configItems_1.ConfigUpdater(types_1.UpdateC
     [types_1.UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDay.kind]: config.deleveragingBonusIncreaseBpsPerDay,
     [types_1.UpdateConfigMode.UpdateProtocolOrderExecutionFee.kind]: config.protocolOrderExecutionFeePct,
 }));
-async function updateEntireReserveConfigIx(signer, marketAddress, reserveAddress, reserveConfig, programId) {
+function updateEntireReserveConfigIx(signer, marketAddress, reserveAddress, reserveConfig, programId) {
     const args = {
         mode: new types_1.UpdateConfigMode.UpdateEntireReserveConfig(),
         value: (0, configItems_1.encodeUsingLayout)(types_1.ReserveConfig.layout(), reserveConfig),
         skipConfigIntegrityValidation: false,
     };
-    const globalConfig = await (0, utils_1.globalConfigPda)(programId);
+    const [globalConfig] = (0, utils_1.globalConfigPda)(programId);
     const accounts = {
         signer,
         lendingMarket: marketAddress,
@@ -980,10 +968,10 @@ async function updateEntireReserveConfigIx(signer, marketAddress, reserveAddress
     const ix = (0, lib_1.updateReserveConfig)(args, accounts, programId);
     return ix;
 }
-function parseForChangesReserveConfigAndGetIxs(marketWithAddress, reserve, reserveAddress, reserveConfig, programId, lendingMarketOwner = (0, signer_1.noopSigner)(marketWithAddress.state.lendingMarketOwner)) {
+function parseForChangesReserveConfigAndGetIxs(marketWithAddress, reserve, reserveAddress, reserveConfig, programId) {
     const encodedConfigUpdates = exports.RESERVE_CONFIG_UPDATER.encodeAllUpdates(reserve?.config, reserveConfig);
     encodedConfigUpdates.sort((left, right) => priorityOf(left.mode) - priorityOf(right.mode));
-    return Promise.all(encodedConfigUpdates.map(async (encodedConfigUpdate) => updateReserveConfigIx(lendingMarketOwner, marketWithAddress.address, reserveAddress, encodedConfigUpdate.mode, encodedConfigUpdate.value, programId, shouldSkipValidation(encodedConfigUpdate.mode, reserve))));
+    return encodedConfigUpdates.map((encodedConfigUpdate) => updateReserveConfigIx(marketWithAddress.state.lendingMarketOwner, marketWithAddress.address, reserveAddress, encodedConfigUpdate.mode, encodedConfigUpdate.value, programId, shouldSkipValidation(encodedConfigUpdate.mode, reserve)));
 }
 const NON_VALIDATED_DISCRIMINATORS = [
     types_1.UpdateConfigMode.UpdateScopePriceFeed.discriminator,