@0dotxyz/p0-ts-sdk 2.3.3 → 2.4.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { PublicKey, SolanaJSONRPCError, ComputeBudgetProgram, SystemProgram, TransactionMessage, VersionedTransaction, Keypair, Transaction, TransactionInstruction, AddressLookupTableAccount, SYSVAR_RENT_PUBKEY, StakeProgram, LAMPORTS_PER_SOL, StakeAuthorizationLayout, SYSVAR_INSTRUCTIONS_PUBKEY, STAKE_CONFIG_ID as STAKE_CONFIG_ID$1 } from '@solana/web3.js';
 import { object, string, enums, array, assert } from 'superstruct';
 import BigNumber3, { BigNumber } from 'bignumber.js';
-import BN11, { BN } from 'bn.js';
+import BN8, { BN } from 'bn.js';
 import Decimal3, { Decimal } from 'decimal.js';
 import { BorshCoder, BorshAccountsCoder, BorshInstructionCoder, AnchorProvider, Program } from '@coral-xyz/anchor';
 import { struct, u32, u8 } from '@solana/buffer-layout';
@@ -404,7 +404,7 @@ function bigNumberToWrappedI80F48(value) {
   let decimalValue = new Decimal(value.toString());
   const isNegative = decimalValue.isNegative();
   decimalValue = decimalValue.times(I80F48_DIVISOR);
-  let wrappedValue = new BN11(decimalValue.round().toFixed()).toArray();
+  let wrappedValue = new BN8(decimalValue.round().toFixed()).toArray();
   if (wrappedValue.length < I80F48_TOTAL_BYTES) {
     const padding = Array(I80F48_TOTAL_BYTES - wrappedValue.length).fill(0);
     wrappedValue.unshift(...padding);
@@ -438,7 +438,7 @@ function toBigNumber(amount) {
 }
 function uiToNative(amount, decimals) {
   let amt = toBigNumber(amount);
-  return new BN11(amt.times(10 ** decimals).toFixed(0, BigNumber3.ROUND_FLOOR));
+  return new BN8(amt.times(10 ** decimals).toFixed(0, BigNumber3.ROUND_FLOOR));
 }
 function uiToNativeBigNumber(amount, decimals) {
   let amt = toBigNumber(amount);
@@ -15779,7 +15779,7 @@ async function makePoolAddPermissionlessStakedBankIx(mfProgram, accounts, remain
     tokenProgram = TOKEN_PROGRAM_ID,
     ...optionalAccounts
   } = accounts;
-  return mfProgram.methods.lendingPoolAddBankPermissionless(args.seed ?? new BN11(0)).accounts({
+  return mfProgram.methods.lendingPoolAddBankPermissionless(args.seed ?? new BN8(0)).accounts({
     stakedSettings,
     feePayer,
     bankMint,
@@ -15843,7 +15843,7 @@ var instructions = {
 var instructions_default = instructions;
 function serializeBankConfigOpt(bankConfigOpt) {
   const toWrappedI80F48 = (value) => value && bigNumberToWrappedI80F48(value);
-  const toBN = (value) => value && new BN11(value.toString());
+  const toBN = (value) => value && new BN8(value.toString());
   return {
     assetWeightInit: toWrappedI80F48(bankConfigOpt.assetWeightInit),
     assetWeightMaint: toWrappedI80F48(bankConfigOpt.assetWeightMaint),
@@ -16196,16 +16196,16 @@ function bankConfigToBankConfigRaw(config) {
     assetWeightMaint: bigNumberToWrappedI80F48(config.assetWeightMaint),
     liabilityWeightInit: bigNumberToWrappedI80F48(config.liabilityWeightInit),
     liabilityWeightMaint: bigNumberToWrappedI80F48(config.liabilityWeightMaint),
-    depositLimit: new BN11(config.depositLimit.toString()),
+    depositLimit: new BN8(config.depositLimit.toString()),
     interestRateConfig: serializeInterestRateConfig(config.interestRateConfig),
     operationalState: serializeOperationalState(config.operationalState),
     oracleSetup: serializeOracleSetup(config.oracleSetup),
     oracleKeys: config.oracleKeys,
     configFlags: config.configFlags,
-    borrowLimit: new BN11(config.borrowLimit.toString()),
+    borrowLimit: new BN8(config.borrowLimit.toString()),
     riskTier: serializeRiskTier(config.riskTier),
     assetTag: config.assetTag,
-    totalAssetValueInitLimit: new BN11(config.totalAssetValueInitLimit.toString()),
+    totalAssetValueInitLimit: new BN8(config.totalAssetValueInitLimit.toString()),
     oracleMaxAge: config.oracleMaxAge,
     oracleMaxConfidence: config.oracleMaxConfidence,
     fixedPrice: bigNumberToWrappedI80F48(config.fixedPrice)
@@ -16537,12 +16537,12 @@ function dtoToBankRaw(bankDto) {
     feeVaultBump: bankDto.feeVaultBump,
     feeVaultAuthorityBump: bankDto.feeVaultAuthorityBump,
     collectedGroupFeesOutstanding: bankDto.collectedGroupFeesOutstanding,
-    lastUpdate: new BN11(bankDto.lastUpdate),
+    lastUpdate: new BN8(bankDto.lastUpdate),
     config: dtoToBankConfigRaw(bankDto.config),
     totalAssetShares: bankDto.totalAssetShares,
     totalLiabilityShares: bankDto.totalLiabilityShares,
-    flags: new BN11(bankDto.flags),
-    emissionsRate: new BN11(bankDto.emissionsRate),
+    flags: new BN8(bankDto.flags),
+    emissionsRate: new BN8(bankDto.emissionsRate),
     emissionsRemaining: bankDto.emissionsRemaining,
     emissionsMint: new PublicKey(bankDto.emissionsMint),
     collectedProgramFeesOutstanding: bankDto.collectedProgramFeesOutstanding,
@@ -16558,11 +16558,11 @@ function dtoToBankRaw(bankDto) {
 }
 function dtoToRateLimitWindowRaw(window) {
   return {
-    maxOutflow: new BN11(window.maxOutflow),
-    windowDuration: new BN11(window.windowDuration),
-    windowStart: new BN11(window.windowStart),
-    prevWindowOutflow: new BN11(window.prevWindowOutflow),
-    curWindowOutflow: new BN11(window.curWindowOutflow)
+    maxOutflow: new BN8(window.maxOutflow),
+    windowDuration: new BN8(window.windowDuration),
+    windowStart: new BN8(window.windowStart),
+    prevWindowOutflow: new BN8(window.prevWindowOutflow),
+    curWindowOutflow: new BN8(window.curWindowOutflow)
   };
 }
 function dtoToBankRateLimiterRaw(rateLimiter) {
@@ -16574,8 +16574,8 @@ function dtoToBankRateLimiterRaw(rateLimiter) {
 function dtoToEmodeSettingsRaw(emodeSettingsDto) {
   return {
     emodeTag: emodeSettingsDto.emodeTag,
-    timestamp: new BN11(emodeSettingsDto.timestamp),
-    flags: new BN11(emodeSettingsDto.flags),
+    timestamp: new BN8(emodeSettingsDto.timestamp),
+    flags: new BN8(emodeSettingsDto.flags),
     emodeConfig: {
       entries: emodeSettingsDto.emodeConfig.entries.map((entry) => {
         return {
@@ -16594,11 +16594,11 @@ function dtoToBankConfigRaw(bankConfigDto) {
     assetWeightMaint: bankConfigDto.assetWeightMaint,
     liabilityWeightInit: bankConfigDto.liabilityWeightInit,
     liabilityWeightMaint: bankConfigDto.liabilityWeightMaint,
-    depositLimit: new BN11(bankConfigDto.depositLimit),
-    borrowLimit: new BN11(bankConfigDto.borrowLimit),
+    depositLimit: new BN8(bankConfigDto.depositLimit),
+    borrowLimit: new BN8(bankConfigDto.borrowLimit),
     riskTier: bankConfigDto.riskTier,
     operationalState: bankConfigDto.operationalState,
-    totalAssetValueInitLimit: new BN11(bankConfigDto.totalAssetValueInitLimit),
+    totalAssetValueInitLimit: new BN8(bankConfigDto.totalAssetValueInitLimit),
     assetTag: bankConfigDto.assetTag,
     configFlags: bankConfigDto.configFlags,
     oracleSetup: bankConfigDto.oracleSetup,
@@ -16746,7 +16746,7 @@ function getActiveEmodeFlags(flags) {
   return activeFlags;
 }
 function hasEmodeFlag(flags, flag) {
-  return !flags.and(new BN11(flag)).isZero();
+  return !flags.and(new BN8(flag)).isZero();
 }
 function getActiveEmodeEntryFlags(flags) {
   const activeFlags = [];
@@ -19735,8 +19735,8 @@ var mapSwbBanksToOraclePrices = (banks, swbOracleAiDataByKey, crossbarResponse)
       const crossbarData = crossbarResponse[oracleFeed]?.results;
       const timestamp = (/* @__PURE__ */ new Date()).getTime().toString();
       const oraclePrice = parseSwbOraclePriceData(
-        crossbarData ?? new BN11(oracleData.rawPrice),
-        new BN11(oracleData.stdev),
+        crossbarData ?? new BN8(oracleData.rawPrice),
+        new BN8(oracleData.stdev),
         timestamp,
         oracleData
       );
@@ -19762,7 +19762,7 @@ var mapBrokenFeedsToOraclePrices = (banks, swbOracleAiDataByKey, birdeyeResponse
       const timestamp = (/* @__PURE__ */ new Date()).getTime().toString();
       const oraclePrice = parseSwbOraclePriceData(
         [birdeyeData],
-        new BN11(oracleData.stdev),
+        new BN8(oracleData.stdev),
         timestamp,
         oracleData
       );
@@ -20378,7 +20378,7 @@ var EMPTY_HEALTH_CACHE = {
   liabilityValue: {
     value: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
   },
-  timestamp: new BN11(0),
+  timestamp: new BN8(0),
   flags: 0,
   prices: [],
   assetValueMaint: bigNumberToWrappedI80F48(new BigNumber3(0)),
@@ -20465,7 +20465,7 @@ function getActiveAccountFlags(flags) {
   return activeFlags;
 }
 function hasAccountFlag(flags, flag) {
-  return !flags.and(new BN11(flag)).isZero();
+  return !flags.and(new BN8(flag)).isZero();
 }
 function getActiveHealthCacheFlags(flags) {
   const activeFlags = [];
@@ -20535,7 +20535,7 @@ function dtoToHealthCache(healthCacheDto) {
   };
 }
 function accountFlagToBN(flag) {
-  return new BN11(flag);
+  return new BN8(flag);
 }
 function marginfiAccountToDto(marginfiAccount) {
   return {
@@ -35725,23 +35725,23 @@ function dtoToDriftUserStatsRaw(userStatsDto) {
     authority: new PublicKey(userStatsDto.authority),
     referrer: new PublicKey(userStatsDto.referrer),
     fees: {
-      totalFeePaid: new BN11(userStatsDto.fees.totalFeePaid),
-      totalFeeRebate: new BN11(userStatsDto.fees.totalFeeRebate),
-      totalTokenDiscount: new BN11(userStatsDto.fees.totalTokenDiscount),
-      totalRefereeDiscount: new BN11(userStatsDto.fees.totalRefereeDiscount),
-      totalReferrerReward: new BN11(userStatsDto.fees.totalReferrerReward),
-      currentEpochReferrerReward: new BN11(
+      totalFeePaid: new BN8(userStatsDto.fees.totalFeePaid),
+      totalFeeRebate: new BN8(userStatsDto.fees.totalFeeRebate),
+      totalTokenDiscount: new BN8(userStatsDto.fees.totalTokenDiscount),
+      totalRefereeDiscount: new BN8(userStatsDto.fees.totalRefereeDiscount),
+      totalReferrerReward: new BN8(userStatsDto.fees.totalReferrerReward),
+      currentEpochReferrerReward: new BN8(
         userStatsDto.fees.currentEpochReferrerReward
       )
     },
-    nextEpochTs: new BN11(userStatsDto.nextEpochTs),
-    makerVolume30d: new BN11(userStatsDto.makerVolume30d),
-    takerVolume30d: new BN11(userStatsDto.takerVolume30d),
-    fillerVolume30d: new BN11(userStatsDto.fillerVolume30d),
-    lastMakerVolume30dTs: new BN11(userStatsDto.lastMakerVolume30dTs),
-    lastTakerVolume30dTs: new BN11(userStatsDto.lastTakerVolume30dTs),
-    lastFillerVolume30dTs: new BN11(userStatsDto.lastFillerVolume30dTs),
-    ifStakedQuoteAssetAmount: new BN11(userStatsDto.ifStakedQuoteAssetAmount),
+    nextEpochTs: new BN8(userStatsDto.nextEpochTs),
+    makerVolume30d: new BN8(userStatsDto.makerVolume30d),
+    takerVolume30d: new BN8(userStatsDto.takerVolume30d),
+    fillerVolume30d: new BN8(userStatsDto.fillerVolume30d),
+    lastMakerVolume30dTs: new BN8(userStatsDto.lastMakerVolume30dTs),
+    lastTakerVolume30dTs: new BN8(userStatsDto.lastTakerVolume30dTs),
+    lastFillerVolume30dTs: new BN8(userStatsDto.lastFillerVolume30dTs),
+    ifStakedQuoteAssetAmount: new BN8(userStatsDto.ifStakedQuoteAssetAmount),
     numberOfSubAccounts: userStatsDto.numberOfSubAccounts,
     numberOfSubAccountsCreated: userStatsDto.numberOfSubAccountsCreated,
     referrerStatus: userStatsDto.referrerStatus,
@@ -35754,7 +35754,7 @@ function dtoToDriftUserStatsRaw(userStatsDto) {
     fuelPositions: userStatsDto.fuelPositions,
     fuelTaker: userStatsDto.fuelTaker,
     fuelMaker: userStatsDto.fuelMaker,
-    ifStakedGovTokenAmount: new BN11(userStatsDto.ifStakedGovTokenAmount),
+    ifStakedGovTokenAmount: new BN8(userStatsDto.ifStakedGovTokenAmount),
     lastFuelIfBonusUpdateTs: userStatsDto.lastFuelIfBonusUpdateTs,
     padding: userStatsDto.padding
   };
@@ -35763,10 +35763,10 @@ function dtoToDriftUserRaw(userDto) {
   return {
     authority: new PublicKey(userDto.authority),
     spotPositions: userDto.spotPositions.map((p) => ({
-      scaledBalance: new BN11(p.scaledBalance),
-      openBids: new BN11(p.openBids),
-      openAsks: new BN11(p.openAsks),
-      cumulativeDeposits: new BN11(p.cumulativeDeposits),
+      scaledBalance: new BN8(p.scaledBalance),
+      openBids: new BN8(p.openBids),
+      openAsks: new BN8(p.openAsks),
+      cumulativeDeposits: new BN8(p.cumulativeDeposits),
       marketIndex: p.marketIndex,
       balanceType: p.balanceType,
       openOrders: p.openOrders,
@@ -35781,10 +35781,10 @@ function dtoToDriftRewardsRaw(rewardsDto) {
     spotMarket: new PublicKey(rewardsDto.spotMarket),
     mint: new PublicKey(rewardsDto.mint),
     spotPosition: {
-      scaledBalance: new BN11(rewardsDto.spotPosition.scaledBalance),
-      openBids: new BN11(rewardsDto.spotPosition.openBids),
-      openAsks: new BN11(rewardsDto.spotPosition.openAsks),
-      cumulativeDeposits: new BN11(rewardsDto.spotPosition.cumulativeDeposits),
+      scaledBalance: new BN8(rewardsDto.spotPosition.scaledBalance),
+      openBids: new BN8(rewardsDto.spotPosition.openBids),
+      openAsks: new BN8(rewardsDto.spotPosition.openAsks),
+      cumulativeDeposits: new BN8(rewardsDto.spotPosition.cumulativeDeposits),
       marketIndex: rewardsDto.spotPosition.marketIndex,
       balanceType: rewardsDto.spotPosition.balanceType,
       openOrders: rewardsDto.spotPosition.openOrders,
@@ -35798,11 +35798,11 @@ function dtoToDriftSpotMarketRaw(spotMarketDto) {
     oracle: new PublicKey(spotMarketDto.oracle),
     mint: new PublicKey(spotMarketDto.mint),
     decimals: spotMarketDto.decimals,
-    cumulativeDepositInterest: new BN11(spotMarketDto.cumulativeDepositInterest),
+    cumulativeDepositInterest: new BN8(spotMarketDto.cumulativeDepositInterest),
     marketIndex: spotMarketDto.marketIndex,
-    depositBalance: new BN11(spotMarketDto.depositBalance),
-    borrowBalance: new BN11(spotMarketDto.borrowBalance),
-    cumulativeBorrowInterest: new BN11(spotMarketDto.cumulativeBorrowInterest),
+    depositBalance: new BN8(spotMarketDto.depositBalance),
+    borrowBalance: new BN8(spotMarketDto.borrowBalance),
+    cumulativeBorrowInterest: new BN8(spotMarketDto.cumulativeBorrowInterest),
     optimalUtilization: spotMarketDto.optimalUtilization,
     optimalBorrowRate: spotMarketDto.optimalBorrowRate,
     maxBorrowRate: spotMarketDto.maxBorrowRate,
@@ -35891,10 +35891,10 @@ function decodeDriftUserData(data) {
   return {
     authority: decoded.authority,
     spotPositions: decoded.spot_positions.map((p) => ({
-      scaledBalance: new BN11(p.scaled_balance),
-      openBids: new BN11(p.open_bids),
-      openAsks: new BN11(p.open_asks),
-      cumulativeDeposits: new BN11(p.cumulative_deposits),
+      scaledBalance: new BN8(p.scaled_balance),
+      openBids: new BN8(p.open_bids),
+      openAsks: new BN8(p.open_asks),
+      cumulativeDeposits: new BN8(p.cumulative_deposits),
       marketIndex: p.market_index,
       balanceType: p.balance_type,
       openOrders: p.open_orders,
@@ -35964,7 +35964,7 @@ function deriveDriftSpotMarket(marketIndex, programId = DRIFT_PROGRAM_ID) {
   return PublicKey.findProgramAddressSync(
     [
       Buffer.from(SEED_SPOT_MARKET),
-      new BN11(marketIndex).toArrayLike(Buffer, "le", 2)
+      new BN8(marketIndex).toArrayLike(Buffer, "le", 2)
     ],
     programId
   );
@@ -35973,7 +35973,7 @@ function deriveDriftSpotMarketVault(marketIndex, programId = DRIFT_PROGRAM_ID) {
   return PublicKey.findProgramAddressSync(
     [
       Buffer.from(SEED_SPOT_MARKET_VAULT),
-      new BN11(marketIndex).toArrayLike(Buffer, "le", 2)
+      new BN8(marketIndex).toArrayLike(Buffer, "le", 2)
     ],
     programId
   );
@@ -36367,7 +36367,7 @@ function generateDummyAccount(group, authority, accountKey) {
     assetShares: dummyWrappedI80F48,
     liabilityShares: dummyWrappedI80F48,
     emissionsOutstanding: dummyWrappedI80F48,
-    lastUpdate: new BN11(0)
+    lastUpdate: new BN8(0)
   });
   const rawAccount = {
     group,
@@ -36380,7 +36380,7 @@ function generateDummyAccount(group, authority, accountKey) {
       liabilityValue: {
         value: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
       },
-      timestamp: new BN11(0),
+      timestamp: new BN8(0),
       flags: 0,
       prices: [],
       assetValueMaint: bigNumberToWrappedI80F48(new BigNumber3(0)),
@@ -36394,7 +36394,7 @@ function generateDummyAccount(group, authority, accountKey) {
       mrgnErr: 0
     },
     emissionsDestinationAccount: new PublicKey("11111111111111111111111111111111"),
-    accountFlags: new BN11([0, 0, 0])
+    accountFlags: new BN8([0, 0, 0])
   };
   return parseMarginfiAccountRaw(accountKey, rawAccount);
 }
@@ -36427,233 +36427,63 @@ async function makeRefreshingIxs({
 }
 
 // src/vendor/klend/utils/klend/serialize.utils.ts
-function obligationRawToDto(obligationRaw) {
+function kaminoObligationToDto(obligation) {
   return {
-    tag: obligationRaw.tag.toString(),
-    lastUpdate: {
-      slot: obligationRaw.lastUpdate.slot.toString(),
-      stale: obligationRaw.lastUpdate.stale,
-      priceStatus: obligationRaw.lastUpdate.priceStatus,
-      placeholder: obligationRaw.lastUpdate.placeholder
-    },
-    lendingMarket: obligationRaw.lendingMarket.toBase58(),
-    owner: obligationRaw.owner.toBase58(),
-    deposits: obligationRaw.deposits.map(
-      (item) => obligationCollateralToDto(item)
-    ),
-    lowestReserveDepositLiquidationLtv: obligationRaw.lowestReserveDepositLiquidationLtv.toString(),
-    depositedValueSf: obligationRaw.depositedValueSf.toString(),
-    borrows: obligationRaw.borrows.map(
-      (item) => obligationLiquidityToDto(item)
-    ),
-    borrowFactorAdjustedDebtValueSf: obligationRaw.borrowFactorAdjustedDebtValueSf.toString(),
-    borrowedAssetsMarketValueSf: obligationRaw.borrowedAssetsMarketValueSf.toString(),
-    allowedBorrowValueSf: obligationRaw.allowedBorrowValueSf.toString(),
-    unhealthyBorrowValueSf: obligationRaw.unhealthyBorrowValueSf.toString(),
-    depositsAssetTiers: obligationRaw.depositsAssetTiers,
-    borrowsAssetTiers: obligationRaw.borrowsAssetTiers,
-    elevationGroup: obligationRaw.elevationGroup,
-    numOfObsoleteDepositReserves: obligationRaw.numOfObsoleteDepositReserves,
-    hasDebt: obligationRaw.hasDebt,
-    referrer: obligationRaw.referrer.toBase58(),
-    borrowingDisabled: obligationRaw.borrowingDisabled,
-    autodeleverageTargetLtvPct: obligationRaw.autodeleverageTargetLtvPct,
-    lowestReserveDepositMaxLtvPct: obligationRaw.lowestReserveDepositMaxLtvPct,
-    numOfObsoleteBorrowReserves: obligationRaw.numOfObsoleteBorrowReserves,
-    reserved: obligationRaw.reserved,
-    highestBorrowFactorPct: obligationRaw.highestBorrowFactorPct.toString(),
-    autodeleverageMarginCallStartedTimestamp: obligationRaw.autodeleverageMarginCallStartedTimestamp.toString(),
-    orders: obligationRaw.orders.map((item) => obligationOrderToDto(item)),
-    padding3: obligationRaw.padding3.map((item) => item.toString())
-  };
-}
-function reserveRawToDto(reserveRaw) {
-  return {
-    version: reserveRaw.version.toString(),
-    lastUpdate: {
-      slot: reserveRaw.lastUpdate.slot.toString(),
-      stale: reserveRaw.lastUpdate.stale,
-      priceStatus: reserveRaw.lastUpdate.priceStatus,
-      placeholder: reserveRaw.lastUpdate.placeholder
-    },
-    lendingMarket: reserveRaw.lendingMarket.toBase58(),
-    farmCollateral: reserveRaw.farmCollateral.toBase58(),
-    farmDebt: reserveRaw.farmDebt.toBase58(),
-    liquidity: reserveLiquidityFieldsToDto(reserveRaw.liquidity),
-    reserveLiquidityPadding: reserveRaw.reserveLiquidityPadding.map(
-      (item) => item.toString()
-    ),
-    collateral: {
-      mintPubkey: reserveRaw.collateral.mintPubkey.toBase58(),
-      mintTotalSupply: reserveRaw.collateral.mintTotalSupply.toString(),
-      supplyVault: reserveRaw.collateral.supplyVault.toBase58(),
-      padding1: reserveRaw.collateral.padding1.map((item) => item.toString()),
-      padding2: reserveRaw.collateral.padding2.map((item) => item.toString())
-    },
-    reserveCollateralPadding: reserveRaw.reserveCollateralPadding.map(
-      (item) => item.toString()
-    ),
-    config: reserveConfigFieldsToDto(reserveRaw.config),
-    configPadding: reserveRaw.configPadding.map((item) => item.toString()),
-    borrowedAmountOutsideElevationGroup: reserveRaw.borrowedAmountOutsideElevationGroup.toString(),
-    borrowedAmountsAgainstThisReserveInElevationGroups: reserveRaw.borrowedAmountsAgainstThisReserveInElevationGroups.map(
-      (item) => item.toString()
-    ),
-    padding: reserveRaw.padding.map((item) => item.toString())
-  };
-}
-function reserveLiquidityFieldsToDto(reserveLiquidityFields) {
-  return {
-    mintPubkey: reserveLiquidityFields.mintPubkey.toBase58(),
-    supplyVault: reserveLiquidityFields.supplyVault.toBase58(),
-    feeVault: reserveLiquidityFields.feeVault.toBase58(),
-    availableAmount: reserveLiquidityFields.availableAmount.toString(),
-    borrowedAmountSf: reserveLiquidityFields.borrowedAmountSf.toString(),
-    marketPriceSf: reserveLiquidityFields.marketPriceSf.toString(),
-    marketPriceLastUpdatedTs: reserveLiquidityFields.marketPriceLastUpdatedTs.toString(),
-    mintDecimals: reserveLiquidityFields.mintDecimals.toString(),
-    depositLimitCrossedTimestamp: reserveLiquidityFields.depositLimitCrossedTimestamp.toString(),
-    borrowLimitCrossedTimestamp: reserveLiquidityFields.borrowLimitCrossedTimestamp.toString(),
-    cumulativeBorrowRateBsf: {
-      value: reserveLiquidityFields.cumulativeBorrowRateBsf.value.map(
-        (item) => item.toString()
-      ),
-      padding: reserveLiquidityFields.cumulativeBorrowRateBsf.padding.map(
-        (item) => item.toString()
-      )
-    },
-    accumulatedProtocolFeesSf: reserveLiquidityFields.accumulatedProtocolFeesSf.toString(),
-    accumulatedReferrerFeesSf: reserveLiquidityFields.accumulatedReferrerFeesSf.toString(),
-    pendingReferrerFeesSf: reserveLiquidityFields.pendingReferrerFeesSf.toString(),
-    absoluteReferralRateSf: reserveLiquidityFields.absoluteReferralRateSf.toString(),
-    tokenProgram: reserveLiquidityFields.tokenProgram.toBase58(),
-    padding2: reserveLiquidityFields.padding2.map((item) => item.toString()),
-    padding3: reserveLiquidityFields.padding3.map((item) => item.toString())
-  };
-}
-function reserveConfigFieldsToDto(reserveConfigFields) {
-  return {
-    status: reserveConfigFields.status,
-    assetTier: reserveConfigFields.assetTier,
-    hostFixedInterestRateBps: reserveConfigFields.hostFixedInterestRateBps,
-    reserved2: reserveConfigFields.reserved2,
-    protocolOrderExecutionFeePct: reserveConfigFields.protocolOrderExecutionFeePct,
-    protocolTakeRatePct: reserveConfigFields.protocolTakeRatePct,
-    protocolLiquidationFeePct: reserveConfigFields.protocolLiquidationFeePct,
-    loanToValuePct: reserveConfigFields.loanToValuePct,
-    liquidationThresholdPct: reserveConfigFields.liquidationThresholdPct,
-    minLiquidationBonusBps: reserveConfigFields.minLiquidationBonusBps,
-    maxLiquidationBonusBps: reserveConfigFields.maxLiquidationBonusBps,
-    badDebtLiquidationBonusBps: reserveConfigFields.badDebtLiquidationBonusBps,
-    deleveragingMarginCallPeriodSecs: reserveConfigFields.deleveragingMarginCallPeriodSecs.toString(),
-    deleveragingThresholdDecreaseBpsPerDay: reserveConfigFields.deleveragingThresholdDecreaseBpsPerDay.toString(),
-    fees: {
-      borrowFeeSf: reserveConfigFields.fees.borrowFeeSf.toString(),
-      flashLoanFeeSf: reserveConfigFields.fees.flashLoanFeeSf.toString(),
-      padding: reserveConfigFields.fees.padding
-    },
-    borrowRateCurve: {
-      points: reserveConfigFields.borrowRateCurve.points.map((item) => ({
-        utilizationRateBps: item.utilizationRateBps,
-        borrowRateBps: item.borrowRateBps
-      }))
-    },
-    borrowFactorPct: reserveConfigFields.borrowFactorPct.toString(),
-    depositLimit: reserveConfigFields.depositLimit.toString(),
-    borrowLimit: reserveConfigFields.borrowLimit.toString(),
-    tokenInfo: tokenInfoFieldsToDto(reserveConfigFields.tokenInfo),
-    depositWithdrawalCap: withdrawalCapsFieldsToDto(
-      reserveConfigFields.depositWithdrawalCap
-    ),
-    debtWithdrawalCap: withdrawalCapsFieldsToDto(
-      reserveConfigFields.debtWithdrawalCap
-    ),
-    elevationGroups: reserveConfigFields.elevationGroups,
-    disableUsageAsCollOutsideEmode: reserveConfigFields.disableUsageAsCollOutsideEmode,
-    utilizationLimitBlockBorrowingAbovePct: reserveConfigFields.utilizationLimitBlockBorrowingAbovePct,
-    autodeleverageEnabled: reserveConfigFields.autodeleverageEnabled,
-    reserved1: reserveConfigFields.reserved1,
-    borrowLimitOutsideElevationGroup: reserveConfigFields.borrowLimitOutsideElevationGroup.toString(),
-    borrowLimitAgainstThisCollateralInElevationGroup: reserveConfigFields.borrowLimitAgainstThisCollateralInElevationGroup.map(
-      (item) => item.toString()
-    ),
-    deleveragingBonusIncreaseBpsPerDay: reserveConfigFields.deleveragingBonusIncreaseBpsPerDay.toString()
-  };
-}
-function tokenInfoFieldsToDto(tokenInfoFields) {
-  return {
-    name: tokenInfoFields.name,
-    heuristic: {
-      lower: tokenInfoFields.heuristic.lower.toString(),
-      upper: tokenInfoFields.heuristic.upper.toString(),
-      exp: tokenInfoFields.heuristic.exp.toString()
-    },
-    maxTwapDivergenceBps: tokenInfoFields.maxTwapDivergenceBps.toString(),
-    maxAgePriceSeconds: tokenInfoFields.maxAgePriceSeconds.toString(),
-    maxAgeTwapSeconds: tokenInfoFields.maxAgeTwapSeconds.toString(),
-    scopeConfiguration: {
-      priceFeed: tokenInfoFields.scopeConfiguration.priceFeed.toBase58(),
-      priceChain: tokenInfoFields.scopeConfiguration.priceChain,
-      twapChain: tokenInfoFields.scopeConfiguration.twapChain
-    },
-    switchboardConfiguration: {
-      priceAggregator: tokenInfoFields.switchboardConfiguration.priceAggregator.toBase58(),
-      twapAggregator: tokenInfoFields.switchboardConfiguration.twapAggregator.toBase58()
-    },
-    pythConfiguration: {
-      price: tokenInfoFields.pythConfiguration.price.toBase58()
-    },
-    blockPriceUsage: tokenInfoFields.blockPriceUsage,
-    reserved: tokenInfoFields.reserved,
-    padding: tokenInfoFields.padding.map((item) => item.toString())
-  };
-}
-function withdrawalCapsFieldsToDto(withdrawalCapsFields) {
-  return {
-    configCapacity: withdrawalCapsFields.configCapacity.toString(),
-    currentTotal: withdrawalCapsFields.currentTotal.toString(),
-    lastIntervalStartTimestamp: withdrawalCapsFields.lastIntervalStartTimestamp.toString(),
-    configIntervalLengthSeconds: withdrawalCapsFields.configIntervalLengthSeconds.toString()
-  };
-}
-function obligationCollateralToDto(obligationCollateralFields) {
-  return {
-    depositReserve: obligationCollateralFields.depositReserve.toBase58(),
-    depositedAmount: obligationCollateralFields.depositedAmount.toString(),
-    marketValueSf: obligationCollateralFields.marketValueSf.toString(),
-    borrowedAmountAgainstThisCollateralInElevationGroup: obligationCollateralFields.borrowedAmountAgainstThisCollateralInElevationGroup.toString(),
-    padding: obligationCollateralFields.padding.map((item) => item.toString())
+    lendingMarket: obligation.lendingMarket.toBase58(),
+    owner: obligation.owner.toBase58(),
+    deposits: obligation.deposits.map((item) => ({
+      depositReserve: item.depositReserve.toBase58(),
+      depositedAmount: item.depositedAmount.toString(),
+      marketValueSf: item.marketValueSf.toString()
+    })),
+    borrows: obligation.borrows.map((item) => ({
+      borrowReserve: item.borrowReserve.toBase58(),
+      borrowedAmountSf: item.borrowedAmountSf.toString(),
+      marketValueSf: item.marketValueSf.toString()
+    }))
   };
 }
-function obligationLiquidityToDto(obligationLiquidityFields) {
+function kaminoReserveToDto(reserve) {
   return {
-    borrowReserve: obligationLiquidityFields.borrowReserve.toBase58(),
-    cumulativeBorrowRateBsf: {
-      value: obligationLiquidityFields.cumulativeBorrowRateBsf.value.map(
-        (item) => item.toString()
-      ),
-      padding: obligationLiquidityFields.cumulativeBorrowRateBsf.padding.map(
-        (item) => item.toString()
-      )
+    lendingMarket: reserve.lendingMarket.toBase58(),
+    farmCollateral: reserve.farmCollateral.toBase58(),
+    liquidity: {
+      mintPubkey: reserve.liquidity.mintPubkey.toBase58(),
+      supplyVault: reserve.liquidity.supplyVault.toBase58(),
+      mintDecimals: reserve.liquidity.mintDecimals.toString(),
+      availableAmount: reserve.liquidity.availableAmount.toString(),
+      borrowedAmountSf: reserve.liquidity.borrowedAmountSf.toString(),
+      accumulatedProtocolFeesSf: reserve.liquidity.accumulatedProtocolFeesSf.toString(),
+      accumulatedReferrerFeesSf: reserve.liquidity.accumulatedReferrerFeesSf.toString(),
+      pendingReferrerFeesSf: reserve.liquidity.pendingReferrerFeesSf.toString()
     },
-    padding: obligationLiquidityFields.padding.toString(),
-    borrowedAmountSf: obligationLiquidityFields.borrowedAmountSf.toString(),
-    marketValueSf: obligationLiquidityFields.marketValueSf.toString(),
-    borrowFactorAdjustedMarketValueSf: obligationLiquidityFields.borrowFactorAdjustedMarketValueSf.toString(),
-    borrowedAmountOutsideElevationGroups: obligationLiquidityFields.borrowedAmountOutsideElevationGroups.toString(),
-    padding2: obligationLiquidityFields.padding2.map((item) => item.toString())
-  };
-}
-function obligationOrderToDto(obligationOrderFields) {
-  return {
-    conditionThresholdSf: obligationOrderFields.conditionThresholdSf.toString(),
-    opportunityParameterSf: obligationOrderFields.opportunityParameterSf.toString(),
-    minExecutionBonusBps: obligationOrderFields.minExecutionBonusBps,
-    maxExecutionBonusBps: obligationOrderFields.maxExecutionBonusBps,
-    conditionType: obligationOrderFields.conditionType,
-    opportunityType: obligationOrderFields.opportunityType,
-    padding1: obligationOrderFields.padding1,
-    padding2: obligationOrderFields.padding2.map((item) => item.toString())
+    collateral: {
+      mintPubkey: reserve.collateral.mintPubkey.toBase58(),
+      mintTotalSupply: reserve.collateral.mintTotalSupply.toString(),
+      supplyVault: reserve.collateral.supplyVault.toBase58()
+    },
+    config: {
+      protocolTakeRatePct: reserve.config.protocolTakeRatePct,
+      hostFixedInterestRateBps: reserve.config.hostFixedInterestRateBps,
+      borrowRateCurve: {
+        points: reserve.config.borrowRateCurve.points.map((item) => ({
+          utilizationRateBps: item.utilizationRateBps,
+          borrowRateBps: item.borrowRateBps
+        }))
+      },
+      tokenInfo: {
+        scopeConfiguration: {
+          priceFeed: reserve.config.tokenInfo.scopeConfiguration.priceFeed.toBase58()
+        },
+        switchboardConfiguration: {
+          priceAggregator: reserve.config.tokenInfo.switchboardConfiguration.priceAggregator.toBase58(),
+          twapAggregator: reserve.config.tokenInfo.switchboardConfiguration.twapAggregator.toBase58()
+        },
+        pythConfiguration: {
+          price: reserve.config.tokenInfo.pythConfiguration.price.toBase58()
+        }
+      }
+    }
   };
 }
 
@@ -43151,267 +42981,75 @@ function decodeKlendObligationData(data) {
   const dec = obligationLayout.decode(data.slice(8));
   return dec;
 }
-function dtoToObligationRaw(obligationDto) {
+function dtoToKaminoObligation(obligationDto) {
   return {
-    tag: new BN11(obligationDto.tag),
-    lastUpdate: {
-      slot: new BN11(obligationDto.lastUpdate.slot),
-      stale: obligationDto.lastUpdate.stale,
-      priceStatus: obligationDto.lastUpdate.priceStatus,
-      placeholder: obligationDto.lastUpdate.placeholder
-    },
     lendingMarket: new PublicKey(obligationDto.lendingMarket),
     owner: new PublicKey(obligationDto.owner),
-    deposits: obligationDto.deposits.map(
-      (item) => dtoToObligationCollateralFields(item)
-    ),
-    lowestReserveDepositLiquidationLtv: new BN11(
-      obligationDto.lowestReserveDepositLiquidationLtv
-    ),
-    depositedValueSf: new BN11(obligationDto.depositedValueSf),
-    borrows: obligationDto.borrows.map(
-      (item) => dtoToObligationLiquidityFields(item)
-    ),
-    borrowFactorAdjustedDebtValueSf: new BN11(
-      obligationDto.borrowFactorAdjustedDebtValueSf
-    ),
-    borrowedAssetsMarketValueSf: new BN11(
-      obligationDto.borrowedAssetsMarketValueSf
-    ),
-    allowedBorrowValueSf: new BN11(obligationDto.allowedBorrowValueSf),
-    unhealthyBorrowValueSf: new BN11(obligationDto.unhealthyBorrowValueSf),
-    depositsAssetTiers: obligationDto.depositsAssetTiers,
-    borrowsAssetTiers: obligationDto.borrowsAssetTiers,
-    elevationGroup: obligationDto.elevationGroup,
-    numOfObsoleteDepositReserves: obligationDto.numOfObsoleteDepositReserves,
-    hasDebt: obligationDto.hasDebt,
-    referrer: new PublicKey(obligationDto.referrer),
-    borrowingDisabled: obligationDto.borrowingDisabled,
-    autodeleverageTargetLtvPct: obligationDto.autodeleverageTargetLtvPct,
-    lowestReserveDepositMaxLtvPct: obligationDto.lowestReserveDepositMaxLtvPct,
-    numOfObsoleteBorrowReserves: obligationDto.numOfObsoleteBorrowReserves,
-    reserved: obligationDto.reserved,
-    highestBorrowFactorPct: new BN11(obligationDto.highestBorrowFactorPct),
-    autodeleverageMarginCallStartedTimestamp: new BN11(
-      obligationDto.autodeleverageMarginCallStartedTimestamp
-    ),
-    orders: obligationDto.orders.map(
-      (item) => dtoToObligationOrderFields(item)
-    ),
-    padding3: obligationDto.padding3.map((item) => new BN11(item))
+    deposits: obligationDto.deposits.map((item) => ({
+      depositReserve: new PublicKey(item.depositReserve),
+      depositedAmount: new BN8(item.depositedAmount),
+      marketValueSf: new BN8(item.marketValueSf)
+    })),
+    borrows: obligationDto.borrows.map((item) => ({
+      borrowReserve: new PublicKey(item.borrowReserve),
+      borrowedAmountSf: new BN8(item.borrowedAmountSf),
+      marketValueSf: new BN8(item.marketValueSf)
+    }))
   };
 }
-function dtoToReserveRaw(reserveDto) {
+function dtoToKaminoReserve(reserveDto) {
   return {
-    version: new BN11(reserveDto.version),
-    lastUpdate: {
-      slot: new BN11(reserveDto.lastUpdate.slot),
-      stale: reserveDto.lastUpdate.stale,
-      priceStatus: reserveDto.lastUpdate.priceStatus,
-      placeholder: reserveDto.lastUpdate.placeholder
-    },
     lendingMarket: new PublicKey(reserveDto.lendingMarket),
     farmCollateral: new PublicKey(reserveDto.farmCollateral),
-    farmDebt: new PublicKey(reserveDto.farmDebt),
-    liquidity: dtoToReserveLiquidityFields(reserveDto.liquidity),
-    reserveLiquidityPadding: reserveDto.reserveLiquidityPadding.map(
-      (item) => new BN11(item)
-    ),
-    collateral: {
-      mintPubkey: new PublicKey(reserveDto.collateral.mintPubkey),
-      mintTotalSupply: new BN11(reserveDto.collateral.mintTotalSupply),
-      supplyVault: new PublicKey(reserveDto.collateral.supplyVault),
-      padding1: reserveDto.collateral.padding1.map((item) => new BN11(item)),
-      padding2: reserveDto.collateral.padding2.map((item) => new BN11(item))
-    },
-    reserveCollateralPadding: reserveDto.reserveCollateralPadding.map(
-      (item) => new BN11(item)
-    ),
-    config: dtoToReserveConfigFields(reserveDto.config),
-    configPadding: reserveDto.configPadding.map((item) => new BN11(item)),
-    borrowedAmountOutsideElevationGroup: new BN11(
-      reserveDto.borrowedAmountOutsideElevationGroup
-    ),
-    borrowedAmountsAgainstThisReserveInElevationGroups: reserveDto.borrowedAmountsAgainstThisReserveInElevationGroups.map(
-      (item) => new BN11(item)
-    ),
-    padding: reserveDto.padding.map((item) => new BN11(item))
-  };
-}
-function dtoToReserveLiquidityFields(reserveDto) {
-  return {
-    mintPubkey: new PublicKey(reserveDto.mintPubkey),
-    supplyVault: new PublicKey(reserveDto.supplyVault),
-    feeVault: new PublicKey(reserveDto.feeVault),
-    availableAmount: new BN11(reserveDto.availableAmount),
-    borrowedAmountSf: new BN11(reserveDto.borrowedAmountSf),
-    marketPriceSf: new BN11(reserveDto.marketPriceSf),
-    marketPriceLastUpdatedTs: new BN11(reserveDto.marketPriceLastUpdatedTs),
-    mintDecimals: new BN11(reserveDto.mintDecimals),
-    depositLimitCrossedTimestamp: new BN11(
-      reserveDto.depositLimitCrossedTimestamp
-    ),
-    borrowLimitCrossedTimestamp: new BN11(reserveDto.borrowLimitCrossedTimestamp),
-    cumulativeBorrowRateBsf: {
-      value: reserveDto.cumulativeBorrowRateBsf.value.map(
-        (item) => new BN11(item)
+    liquidity: {
+      mintPubkey: new PublicKey(reserveDto.liquidity.mintPubkey),
+      supplyVault: new PublicKey(reserveDto.liquidity.supplyVault),
+      mintDecimals: new BN8(reserveDto.liquidity.mintDecimals),
+      availableAmount: new BN8(reserveDto.liquidity.availableAmount),
+      borrowedAmountSf: new BN8(reserveDto.liquidity.borrowedAmountSf),
+      accumulatedProtocolFeesSf: new BN8(
+        reserveDto.liquidity.accumulatedProtocolFeesSf
       ),
-      padding: reserveDto.cumulativeBorrowRateBsf.padding.map(
-        (item) => new BN11(item)
-      )
-    },
-    accumulatedProtocolFeesSf: new BN11(reserveDto.accumulatedProtocolFeesSf),
-    accumulatedReferrerFeesSf: new BN11(reserveDto.accumulatedReferrerFeesSf),
-    pendingReferrerFeesSf: new BN11(reserveDto.pendingReferrerFeesSf),
-    absoluteReferralRateSf: new BN11(reserveDto.absoluteReferralRateSf),
-    tokenProgram: new PublicKey(reserveDto.tokenProgram),
-    padding2: reserveDto.padding2.map((item) => new BN11(item)),
-    padding3: reserveDto.padding3.map((item) => new BN11(item))
-  };
-}
-function dtoToReserveConfigFields(reserveDto) {
-  return {
-    status: reserveDto.status,
-    assetTier: reserveDto.assetTier,
-    hostFixedInterestRateBps: reserveDto.hostFixedInterestRateBps,
-    reserved2: reserveDto.reserved2,
-    protocolOrderExecutionFeePct: reserveDto.protocolOrderExecutionFeePct,
-    protocolTakeRatePct: reserveDto.protocolTakeRatePct,
-    protocolLiquidationFeePct: reserveDto.protocolLiquidationFeePct,
-    loanToValuePct: reserveDto.loanToValuePct,
-    liquidationThresholdPct: reserveDto.liquidationThresholdPct,
-    minLiquidationBonusBps: reserveDto.minLiquidationBonusBps,
-    maxLiquidationBonusBps: reserveDto.maxLiquidationBonusBps,
-    badDebtLiquidationBonusBps: reserveDto.badDebtLiquidationBonusBps,
-    deleveragingMarginCallPeriodSecs: new BN11(
-      reserveDto.deleveragingMarginCallPeriodSecs
-    ),
-    deleveragingThresholdDecreaseBpsPerDay: new BN11(
-      reserveDto.deleveragingThresholdDecreaseBpsPerDay
-    ),
-    fees: {
-      borrowFeeSf: new BN11(reserveDto.fees.borrowFeeSf),
-      flashLoanFeeSf: new BN11(reserveDto.fees.flashLoanFeeSf),
-      padding: reserveDto.fees.padding
-    },
-    borrowRateCurve: {
-      points: reserveDto.borrowRateCurve.points.map((item) => ({
-        utilizationRateBps: item.utilizationRateBps,
-        borrowRateBps: item.borrowRateBps
-      }))
-    },
-    borrowFactorPct: new BN11(reserveDto.borrowFactorPct),
-    depositLimit: new BN11(reserveDto.depositLimit),
-    borrowLimit: new BN11(reserveDto.borrowLimit),
-    tokenInfo: dtoToTokenInfoFields(reserveDto.tokenInfo),
-    depositWithdrawalCap: dtoToWithdrawalCapsFields(
-      reserveDto.depositWithdrawalCap
-    ),
-    debtWithdrawalCap: dtoToWithdrawalCapsFields(reserveDto.debtWithdrawalCap),
-    elevationGroups: reserveDto.elevationGroups,
-    disableUsageAsCollOutsideEmode: reserveDto.disableUsageAsCollOutsideEmode,
-    utilizationLimitBlockBorrowingAbovePct: reserveDto.utilizationLimitBlockBorrowingAbovePct,
-    autodeleverageEnabled: reserveDto.autodeleverageEnabled,
-    reserved1: reserveDto.reserved1,
-    borrowLimitOutsideElevationGroup: new BN11(
-      reserveDto.borrowLimitOutsideElevationGroup
-    ),
-    borrowLimitAgainstThisCollateralInElevationGroup: reserveDto.borrowLimitAgainstThisCollateralInElevationGroup.map(
-      (item) => new BN11(item)
-    ),
-    deleveragingBonusIncreaseBpsPerDay: new BN11(
-      reserveDto.deleveragingBonusIncreaseBpsPerDay
-    )
-  };
-}
-function dtoToTokenInfoFields(tokenInfoDto) {
-  return {
-    name: tokenInfoDto.name,
-    heuristic: {
-      lower: new BN11(tokenInfoDto.heuristic.lower),
-      upper: new BN11(tokenInfoDto.heuristic.upper),
-      exp: new BN11(tokenInfoDto.heuristic.exp)
-    },
-    maxTwapDivergenceBps: new BN11(tokenInfoDto.maxTwapDivergenceBps),
-    maxAgePriceSeconds: new BN11(tokenInfoDto.maxAgePriceSeconds),
-    maxAgeTwapSeconds: new BN11(tokenInfoDto.maxAgeTwapSeconds),
-    scopeConfiguration: {
-      priceFeed: new PublicKey(tokenInfoDto.scopeConfiguration.priceFeed),
-      priceChain: tokenInfoDto.scopeConfiguration.priceChain,
-      twapChain: tokenInfoDto.scopeConfiguration.twapChain
-    },
-    switchboardConfiguration: {
-      priceAggregator: new PublicKey(
-        tokenInfoDto.switchboardConfiguration.priceAggregator
+      accumulatedReferrerFeesSf: new BN8(
+        reserveDto.liquidity.accumulatedReferrerFeesSf
       ),
-      twapAggregator: new PublicKey(
-        tokenInfoDto.switchboardConfiguration.twapAggregator
-      )
+      pendingReferrerFeesSf: new BN8(reserveDto.liquidity.pendingReferrerFeesSf)
     },
-    pythConfiguration: {
-      price: new PublicKey(tokenInfoDto.pythConfiguration.price)
-    },
-    blockPriceUsage: tokenInfoDto.blockPriceUsage,
-    reserved: tokenInfoDto.reserved,
-    padding: tokenInfoDto.padding.map((item) => new BN11(item))
-  };
-}
-function dtoToWithdrawalCapsFields(withdrawalCapsDto) {
-  return {
-    configCapacity: new BN11(withdrawalCapsDto.configCapacity),
-    currentTotal: new BN11(withdrawalCapsDto.currentTotal),
-    lastIntervalStartTimestamp: new BN11(
-      withdrawalCapsDto.lastIntervalStartTimestamp
-    ),
-    configIntervalLengthSeconds: new BN11(
-      withdrawalCapsDto.configIntervalLengthSeconds
-    )
-  };
-}
-function dtoToObligationCollateralFields(obligationCollateralDto) {
-  return {
-    depositReserve: new PublicKey(obligationCollateralDto.depositReserve),
-    depositedAmount: new BN11(obligationCollateralDto.depositedAmount),
-    marketValueSf: new BN11(obligationCollateralDto.marketValueSf),
-    borrowedAmountAgainstThisCollateralInElevationGroup: new BN11(
-      obligationCollateralDto.borrowedAmountAgainstThisCollateralInElevationGroup
-    ),
-    padding: obligationCollateralDto.padding.map((item) => new BN11(item))
-  };
-}
-function dtoToObligationLiquidityFields(obligationLiquidityDto) {
-  return {
-    borrowReserve: new PublicKey(obligationLiquidityDto.borrowReserve),
-    cumulativeBorrowRateBsf: {
-      value: obligationLiquidityDto.cumulativeBorrowRateBsf.value.map(
-        (item) => new BN11(item)
-      ),
-      padding: obligationLiquidityDto.cumulativeBorrowRateBsf.padding.map(
-        (item) => new BN11(item)
-      )
-    },
-    padding: new BN11(obligationLiquidityDto.padding),
-    borrowedAmountSf: new BN11(obligationLiquidityDto.borrowedAmountSf),
-    marketValueSf: new BN11(obligationLiquidityDto.marketValueSf),
-    borrowFactorAdjustedMarketValueSf: new BN11(
-      obligationLiquidityDto.borrowFactorAdjustedMarketValueSf
-    ),
-    borrowedAmountOutsideElevationGroups: new BN11(
-      obligationLiquidityDto.borrowedAmountOutsideElevationGroups
-    ),
-    padding2: obligationLiquidityDto.padding2.map((item) => new BN11(item))
-  };
-}
-function dtoToObligationOrderFields(obligationOrderDto) {
-  return {
-    conditionThresholdSf: new BN11(obligationOrderDto.conditionThresholdSf),
-    opportunityParameterSf: new BN11(obligationOrderDto.opportunityParameterSf),
-    minExecutionBonusBps: obligationOrderDto.minExecutionBonusBps,
-    maxExecutionBonusBps: obligationOrderDto.maxExecutionBonusBps,
-    conditionType: obligationOrderDto.conditionType,
-    opportunityType: obligationOrderDto.opportunityType,
-    padding1: obligationOrderDto.padding1,
-    padding2: obligationOrderDto.padding2.map((item) => new BN11(item))
+    collateral: {
+      mintPubkey: new PublicKey(reserveDto.collateral.mintPubkey),
+      mintTotalSupply: new BN8(reserveDto.collateral.mintTotalSupply),
+      supplyVault: new PublicKey(reserveDto.collateral.supplyVault)
+    },
+    config: {
+      protocolTakeRatePct: reserveDto.config.protocolTakeRatePct,
+      hostFixedInterestRateBps: reserveDto.config.hostFixedInterestRateBps,
+      borrowRateCurve: {
+        points: reserveDto.config.borrowRateCurve.points.map((item) => ({
+          utilizationRateBps: item.utilizationRateBps,
+          borrowRateBps: item.borrowRateBps
+        }))
+      },
+      tokenInfo: {
+        scopeConfiguration: {
+          priceFeed: new PublicKey(
+            reserveDto.config.tokenInfo.scopeConfiguration.priceFeed
+          )
+        },
+        switchboardConfiguration: {
+          priceAggregator: new PublicKey(
+            reserveDto.config.tokenInfo.switchboardConfiguration.priceAggregator
+          ),
+          twapAggregator: new PublicKey(
+            reserveDto.config.tokenInfo.switchboardConfiguration.twapAggregator
+          )
+        },
+        pythConfiguration: {
+          price: new PublicKey(
+            reserveDto.config.tokenInfo.pythConfiguration.price
+          )
+        }
+      }
+    }
   };
 }
 var SEED_LENDING_MARKET_AUTH = "lma";
@@ -43478,9 +43116,9 @@ var Fraction = class _Fraction {
   static MAX_SIZE_BF = 256;
   static FRACTIONS = 60;
   static MULTIPLIER = new FractionDecimal(2).pow(_Fraction.FRACTIONS);
-  static MAX_F_BN = new BN11(2).pow(new BN11(_Fraction.MAX_SIZE_F)).sub(new BN11(1));
-  static MAX_BF_BN = new BN11(2).pow(new BN11(_Fraction.MAX_SIZE_BF)).sub(new BN11(1));
-  static MIN_BN = new BN11(0);
+  static MAX_F_BN = new BN8(2).pow(new BN8(_Fraction.MAX_SIZE_F)).sub(new BN8(1));
+  static MAX_BF_BN = new BN8(2).pow(new BN8(_Fraction.MAX_SIZE_BF)).sub(new BN8(1));
+  static MIN_BN = new BN8(0);
   valueSf;
   constructor(valueSf) {
     if (valueSf.lt(_Fraction.MIN_BN) || valueSf.gt(_Fraction.MAX_BF_BN)) {
@@ -43496,7 +43134,7 @@ var Fraction = class _Fraction {
   static fromDecimal(n) {
     const scaledDecimal = new FractionDecimal(n).mul(_Fraction.MULTIPLIER);
     const roundedScaledDecimal = roundNearest(scaledDecimal);
-    const scaledValue = new BN11(roundedScaledDecimal.toFixed());
+    const scaledValue = new BN8(roundedScaledDecimal.toFixed());
     return new _Fraction(scaledValue);
   }
   static fromBps(n) {
@@ -43526,7 +43164,7 @@ var Fraction = class _Fraction {
     return this.valueSf.eq(x.getValue());
   }
 };
-new Fraction(new BN11(0));
+new Fraction(new BN8(0));
 function roundNearest(decimal) {
   return decimal.toDecimalPlaces(0, Decimal3.ROUND_HALF_CEIL);
 }
@@ -44126,29 +43764,29 @@ function decodeJupTokenReserveData(data, pubkey) {
   offset += 2;
   const lastUtilization = data.readUInt16LE(offset);
   offset += 2;
-  const lastUpdateTimestamp = new BN11(data.slice(offset, offset + 8), "le");
+  const lastUpdateTimestamp = new BN8(data.slice(offset, offset + 8), "le");
   offset += 8;
-  const supplyExchangePrice = new BN11(data.slice(offset, offset + 8), "le");
+  const supplyExchangePrice = new BN8(data.slice(offset, offset + 8), "le");
   offset += 8;
-  const borrowExchangePrice = new BN11(data.slice(offset, offset + 8), "le");
+  const borrowExchangePrice = new BN8(data.slice(offset, offset + 8), "le");
   offset += 8;
   const maxUtilization = data.readUInt16LE(offset);
   offset += 2;
-  const totalSupplyWithInterest = new BN11(data.slice(offset, offset + 8), "le");
+  const totalSupplyWithInterest = new BN8(data.slice(offset, offset + 8), "le");
   offset += 8;
-  const totalSupplyInterestFree = new BN11(data.slice(offset, offset + 8), "le");
+  const totalSupplyInterestFree = new BN8(data.slice(offset, offset + 8), "le");
   offset += 8;
-  const totalBorrowWithInterest = new BN11(data.slice(offset, offset + 8), "le");
+  const totalBorrowWithInterest = new BN8(data.slice(offset, offset + 8), "le");
   offset += 8;
-  const totalBorrowInterestFree = new BN11(data.slice(offset, offset + 8), "le");
+  const totalBorrowInterestFree = new BN8(data.slice(offset, offset + 8), "le");
   offset += 8;
-  const totalClaimAmount = new BN11(data.slice(offset, offset + 8), "le");
+  const totalClaimAmount = new BN8(data.slice(offset, offset + 8), "le");
   offset += 8;
   const interactingProtocol = new PublicKey(data.slice(offset, offset + 32));
   offset += 32;
-  const interactingTimestamp = new BN11(data.slice(offset, offset + 8), "le");
+  const interactingTimestamp = new BN8(data.slice(offset, offset + 8), "le");
   offset += 8;
-  const interactingBalance = new BN11(data.slice(offset, offset + 8), "le");
+  const interactingBalance = new BN8(data.slice(offset, offset + 8), "le");
   return {
     pubkey,
     mint,
@@ -44210,9 +43848,9 @@ function dtoToJupLendingStateRaw(dto) {
     lendingId: dto.lendingId,
     decimals: dto.decimals,
     rewardsRateModel: new PublicKey(dto.rewardsRateModel),
-    liquidityExchangePrice: new BN11(dto.liquidityExchangePrice),
-    tokenExchangePrice: new BN11(dto.tokenExchangePrice),
-    lastUpdateTimestamp: new BN11(dto.lastUpdateTimestamp),
+    liquidityExchangePrice: new BN8(dto.liquidityExchangePrice),
+    tokenExchangePrice: new BN8(dto.tokenExchangePrice),
+    lastUpdateTimestamp: new BN8(dto.lastUpdateTimestamp),
     tokenReservesLiquidity: new PublicKey(dto.tokenReservesLiquidity),
     supplyPositionOnLiquidity: new PublicKey(dto.supplyPositionOnLiquidity)
   };
@@ -44225,30 +43863,30 @@ function dtoToJupTokenReserveRaw(dto) {
     borrowRate: dto.borrowRate,
     feeOnInterest: dto.feeOnInterest,
     lastUtilization: dto.lastUtilization,
-    lastUpdateTimestamp: new BN11(dto.lastUpdateTimestamp),
-    supplyExchangePrice: new BN11(dto.supplyExchangePrice),
-    borrowExchangePrice: new BN11(dto.borrowExchangePrice),
+    lastUpdateTimestamp: new BN8(dto.lastUpdateTimestamp),
+    supplyExchangePrice: new BN8(dto.supplyExchangePrice),
+    borrowExchangePrice: new BN8(dto.borrowExchangePrice),
     maxUtilization: dto.maxUtilization,
-    totalSupplyWithInterest: new BN11(dto.totalSupplyWithInterest),
-    totalSupplyInterestFree: new BN11(dto.totalSupplyInterestFree),
-    totalBorrowWithInterest: new BN11(dto.totalBorrowWithInterest),
-    totalBorrowInterestFree: new BN11(dto.totalBorrowInterestFree),
-    totalClaimAmount: new BN11(dto.totalClaimAmount),
+    totalSupplyWithInterest: new BN8(dto.totalSupplyWithInterest),
+    totalSupplyInterestFree: new BN8(dto.totalSupplyInterestFree),
+    totalBorrowWithInterest: new BN8(dto.totalBorrowWithInterest),
+    totalBorrowInterestFree: new BN8(dto.totalBorrowInterestFree),
+    totalClaimAmount: new BN8(dto.totalClaimAmount),
     interactingProtocol: new PublicKey(dto.interactingProtocol),
-    interactingTimestamp: new BN11(dto.interactingTimestamp),
-    interactingBalance: new BN11(dto.interactingBalance)
+    interactingTimestamp: new BN8(dto.interactingTimestamp),
+    interactingBalance: new BN8(dto.interactingBalance)
   };
 }
 function dtoToJupLendingRewardsRateModelRaw(dto) {
   return {
     pubkey: new PublicKey(dto.pubkey),
     mint: new PublicKey(dto.mint),
-    startTvl: new BN11(dto.startTvl),
-    duration: new BN11(dto.duration),
-    startTime: new BN11(dto.startTime),
-    yearlyReward: new BN11(dto.yearlyReward),
-    nextDuration: new BN11(dto.nextDuration),
-    nextRewardAmount: new BN11(dto.nextRewardAmount)
+    startTvl: new BN8(dto.startTvl),
+    duration: new BN8(dto.duration),
+    startTime: new BN8(dto.startTime),
+    yearlyReward: new BN8(dto.yearlyReward),
+    nextDuration: new BN8(dto.nextDuration),
+    nextRewardAmount: new BN8(dto.nextRewardAmount)
   };
 }
 function dtoToJupRateModelRaw(dto) {
@@ -44339,14 +43977,14 @@ function deriveJupLendLiquiditySupplyPositionPda(underlyingMint, lendingPda, liq
     liquidityProgramId
   );
 }
-var JUP_EXCHANGE_PRICES_PRECISION = new BN11("1000000000000");
-var JUP_SECONDS_PER_YEAR = new BN11(31536e3);
-var JUP_MAX_REWARDS_RATE = new BN11("50000000000000");
+var JUP_EXCHANGE_PRICES_PRECISION = new BN8("1000000000000");
+var JUP_SECONDS_PER_YEAR = new BN8(31536e3);
+var JUP_MAX_REWARDS_RATE = new BN8("50000000000000");
 function calculateJupLendTotalAssets(lendingState, fTokenTotalSupply) {
   return lendingState.tokenExchangePrice.mul(fTokenTotalSupply).div(JUP_EXCHANGE_PRICES_PRECISION);
 }
 function calculateJupLendRewardsRateForExchangePrice(rewardsModel, totalAssets, currentTimestamp) {
-  const defaultResult = { rate: new BN11(0), rewardsStartTime: rewardsModel.startTime };
+  const defaultResult = { rate: new BN8(0), rewardsStartTime: rewardsModel.startTime };
   if (rewardsModel.startTime.isZero() || rewardsModel.duration.isZero()) {
     return defaultResult;
   }
@@ -44366,7 +44004,7 @@ function calculateJupLendNewExchangePrice(lendingState, tokenReserve, rewardsMod
   const oldTokenExchangePrice = lendingState.tokenExchangePrice;
   const oldLiquidityExchangePrice = lendingState.liquidityExchangePrice;
   const currentLiquidityExchangePrice = tokenReserve.supplyExchangePrice;
-  let rewardsRate = new BN11(0);
+  let rewardsRate = new BN8(0);
   let rewardsStartTime = lendingState.lastUpdateTimestamp;
   if (rewardsModel) {
     const totalAssets = calculateJupLendTotalAssets(lendingState, fTokenTotalSupply);
@@ -44383,12 +44021,12 @@ function calculateJupLendNewExchangePrice(lendingState, tokenReserve, rewardsMod
     lastUpdateTime = rewardsStartTime;
   }
   const secondsElapsed = currentTimestamp.sub(lastUpdateTime);
-  let totalReturnPercent = rewardsRate.mul(secondsElapsed).div(JUP_SECONDS_PER_YEAR).mul(new BN11(100));
+  let totalReturnPercent = rewardsRate.mul(secondsElapsed).div(JUP_SECONDS_PER_YEAR).mul(new BN8(100));
   const delta = currentLiquidityExchangePrice.sub(oldLiquidityExchangePrice);
   totalReturnPercent = totalReturnPercent.add(
-    delta.mul(new BN11(1e14)).div(oldLiquidityExchangePrice)
+    delta.mul(new BN8(1e14)).div(oldLiquidityExchangePrice)
   );
-  return oldTokenExchangePrice.add(oldTokenExchangePrice.mul(totalReturnPercent).div(new BN11(1e14)));
+  return oldTokenExchangePrice.add(oldTokenExchangePrice.mul(totalReturnPercent).div(new BN8(1e14)));
 }
 var UPDATE_RATE_DISCRIMINATOR = Buffer.from([
   24,
@@ -57869,7 +57507,7 @@ function exponentNumberToBigNumber(raw) {
   let value = new BigNumber(0);
   const TWO_64 = new BigNumber(2).pow(64);
   words.forEach((w, i) => {
-    const word = new BigNumber(BN11.isBN(w) ? w.toString() : String(w));
+    const word = new BigNumber(BN8.isBN(w) ? w.toString() : String(w));
     value = value.plus(word.times(TWO_64.pow(i)));
   });
   return value.div(EXPONENT_NUMBER_DENOM);
@@ -57880,7 +57518,7 @@ function pk(v) {
 function decodeExponentVault(data) {
   const d = EXPONENT_ACCOUNTS_CODER.decode("Vault", data);
   const get = (snake, camel) => d[snake] ?? d[camel];
-  const u646 = (v) => BigInt(BN11.isBN(v) ? v.toString() : String(v ?? 0));
+  const u646 = (v) => BigInt(BN8.isBN(v) ? v.toString() : String(v ?? 0));
   const cpi = get("cpi_accounts", "cpiAccounts") ?? {};
   return {
     authority: pk(get("authority", "authority")),
@@ -58227,76 +57865,25 @@ function scaledSupplies(state) {
 }
 
 // src/vendor/klend/utils/farms/serialize.utils.ts
-function farmRawToDto(farmRaw) {
+function kaminoFarmStateToDto(farmState) {
   return {
-    farmAdmin: farmRaw.farmAdmin.toBase58(),
-    globalConfig: farmRaw.globalConfig.toBase58(),
     token: {
-      mint: farmRaw.token.mint.toBase58(),
-      decimals: farmRaw.token.decimals.toString(),
-      tokenProgram: farmRaw.token.tokenProgram.toBase58(),
-      padding: farmRaw.token.padding.map((p) => p.toString())
+      mint: farmState.token.mint.toBase58(),
+      decimals: farmState.token.decimals.toString()
     },
-    rewardInfos: farmRaw.rewardInfos.map((item) => ({
+    rewardInfos: farmState.rewardInfos.map((item) => ({
       token: {
         mint: item.token.mint.toBase58(),
-        decimals: item.token.decimals.toString(),
-        tokenProgram: item.token.tokenProgram.toBase58(),
-        padding: item.token.padding.map((p) => p.toString())
+        decimals: item.token.decimals.toString()
       },
-      rewardsVault: item.rewardsVault.toBase58(),
-      rewardsAvailable: item.rewardsAvailable.toString(),
+      rewardsPerSecondDecimals: item.rewardsPerSecondDecimals,
       rewardScheduleCurve: {
         points: item.rewardScheduleCurve.points.map((p) => ({
           tsStart: p.tsStart.toString(),
           rewardPerTimeUnit: p.rewardPerTimeUnit.toString()
         }))
-      },
-      minClaimDurationSeconds: item.minClaimDurationSeconds.toString(),
-      lastIssuanceTs: item.lastIssuanceTs.toString(),
-      rewardsIssuedUnclaimed: item.rewardsIssuedUnclaimed.toString(),
-      rewardsIssuedCumulative: item.rewardsIssuedCumulative.toString(),
-      rewardPerShareScaled: item.rewardPerShareScaled.toString(),
-      placeholder0: item.placeholder0.toString(),
-      rewardType: item.rewardType,
-      rewardsPerSecondDecimals: item.rewardsPerSecondDecimals,
-      padding0: item.padding0,
-      padding1: item.padding1.map((p) => p.toString())
-    })),
-    numRewardTokens: farmRaw.numRewardTokens.toString(),
-    numUsers: farmRaw.numUsers.toString(),
-    totalStakedAmount: farmRaw.totalStakedAmount.toString(),
-    farmVault: farmRaw.farmVault.toBase58(),
-    farmVaultsAuthority: farmRaw.farmVaultsAuthority.toBase58(),
-    farmVaultsAuthorityBump: farmRaw.farmVaultsAuthorityBump.toString(),
-    delegateAuthority: farmRaw.delegateAuthority.toBase58(),
-    timeUnit: farmRaw.timeUnit,
-    isFarmFrozen: farmRaw.isFarmFrozen,
-    isFarmDelegated: farmRaw.isFarmDelegated,
-    padding0: farmRaw.padding0,
-    withdrawAuthority: farmRaw.withdrawAuthority.toBase58(),
-    depositWarmupPeriod: farmRaw.depositWarmupPeriod,
-    withdrawalCooldownPeriod: farmRaw.withdrawalCooldownPeriod,
-    totalActiveStakeScaled: farmRaw.totalActiveStakeScaled.toString(),
-    totalPendingStakeScaled: farmRaw.totalPendingStakeScaled.toString(),
-    totalPendingAmount: farmRaw.totalPendingAmount.toString(),
-    slashedAmountCurrent: farmRaw.slashedAmountCurrent.toString(),
-    slashedAmountCumulative: farmRaw.slashedAmountCumulative.toString(),
-    slashedAmountSpillAddress: farmRaw.slashedAmountSpillAddress.toBase58(),
-    lockingMode: farmRaw.lockingMode.toString(),
-    lockingStartTimestamp: farmRaw.lockingStartTimestamp.toString(),
-    lockingDuration: farmRaw.lockingDuration.toString(),
-    lockingEarlyWithdrawalPenaltyBps: farmRaw.lockingEarlyWithdrawalPenaltyBps.toString(),
-    depositCapAmount: farmRaw.depositCapAmount.toString(),
-    scopePrices: farmRaw.scopePrices.toBase58(),
-    scopeOraclePriceId: farmRaw.scopeOraclePriceId.toString(),
-    scopeOracleMaxAge: farmRaw.scopeOracleMaxAge.toString(),
-    pendingFarmAdmin: farmRaw.pendingFarmAdmin.toBase58(),
-    strategyId: farmRaw.strategyId.toBase58(),
-    delegatedRpsAdmin: farmRaw.delegatedRpsAdmin.toBase58(),
-    vaultId: farmRaw.vaultId.toBase58(),
-    secondDelegatedAuthority: farmRaw.secondDelegatedAuthority.toBase58(),
-    padding: farmRaw.padding.map((item) => item.toString())
+      }
+    }))
   };
 }
 var farmDiscriminator = Buffer.from([198, 102, 216, 74, 63, 66, 163, 190]);
@@ -58391,78 +57978,25 @@ function decodeFarmDataRaw(data) {
   const dec = farmLayout.decode(data.slice(8));
   return dec;
 }
-function dtoToFarmRaw(dto) {
+function dtoToKaminoFarmState(dto) {
   return {
-    farmAdmin: new PublicKey(dto.farmAdmin),
-    globalConfig: new PublicKey(dto.globalConfig),
     token: {
       mint: new PublicKey(dto.token.mint),
-      decimals: new BN11(dto.token.decimals),
-      tokenProgram: new PublicKey(dto.token.tokenProgram),
-      padding: dto.token.padding.map((item) => new BN11(item))
+      decimals: new BN8(dto.token.decimals)
     },
     rewardInfos: dto.rewardInfos.map((item) => ({
       token: {
         mint: new PublicKey(item.token.mint),
-        decimals: new BN11(item.token.decimals),
-        tokenProgram: new PublicKey(item.token.tokenProgram),
-        padding: item.token.padding.map((p) => new BN11(p))
+        decimals: new BN8(item.token.decimals)
       },
-      rewardsVault: new PublicKey(item.rewardsVault),
-      rewardsAvailable: new BN11(item.rewardsAvailable),
+      rewardsPerSecondDecimals: item.rewardsPerSecondDecimals,
       rewardScheduleCurve: {
         points: item.rewardScheduleCurve.points.map((p) => ({
-          tsStart: new BN11(p.tsStart),
-          rewardPerTimeUnit: new BN11(p.rewardPerTimeUnit)
+          tsStart: new BN8(p.tsStart),
+          rewardPerTimeUnit: new BN8(p.rewardPerTimeUnit)
         }))
-      },
-      minClaimDurationSeconds: new BN11(item.minClaimDurationSeconds),
-      lastIssuanceTs: new BN11(item.lastIssuanceTs),
-      rewardsIssuedUnclaimed: new BN11(item.rewardsIssuedUnclaimed),
-      rewardsIssuedCumulative: new BN11(item.rewardsIssuedCumulative),
-      rewardPerShareScaled: new BN11(item.rewardPerShareScaled),
-      placeholder0: new BN11(item.placeholder0),
-      rewardType: item.rewardType,
-      rewardsPerSecondDecimals: item.rewardsPerSecondDecimals,
-      padding0: item.padding0,
-      padding1: item.padding1.map((p) => new BN11(p))
-    })),
-    numRewardTokens: new BN11(dto.numRewardTokens),
-    numUsers: new BN11(dto.numUsers),
-    totalStakedAmount: new BN11(dto.totalStakedAmount),
-    farmVault: new PublicKey(dto.farmVault),
-    farmVaultsAuthority: new PublicKey(dto.farmVaultsAuthority),
-    farmVaultsAuthorityBump: new BN11(dto.farmVaultsAuthorityBump),
-    delegateAuthority: new PublicKey(dto.delegateAuthority),
-    timeUnit: dto.timeUnit,
-    isFarmFrozen: dto.isFarmFrozen,
-    isFarmDelegated: dto.isFarmDelegated,
-    padding0: dto.padding0,
-    withdrawAuthority: new PublicKey(dto.withdrawAuthority),
-    depositWarmupPeriod: dto.depositWarmupPeriod,
-    withdrawalCooldownPeriod: dto.withdrawalCooldownPeriod,
-    totalActiveStakeScaled: new BN11(dto.totalActiveStakeScaled),
-    totalPendingStakeScaled: new BN11(dto.totalPendingStakeScaled),
-    totalPendingAmount: new BN11(dto.totalPendingAmount),
-    slashedAmountCurrent: new BN11(dto.slashedAmountCurrent),
-    slashedAmountCumulative: new BN11(dto.slashedAmountCumulative),
-    slashedAmountSpillAddress: new PublicKey(dto.slashedAmountSpillAddress),
-    lockingMode: new BN11(dto.lockingMode),
-    lockingStartTimestamp: new BN11(dto.lockingStartTimestamp),
-    lockingDuration: new BN11(dto.lockingDuration),
-    lockingEarlyWithdrawalPenaltyBps: new BN11(
-      dto.lockingEarlyWithdrawalPenaltyBps
-    ),
-    depositCapAmount: new BN11(dto.depositCapAmount),
-    scopePrices: new PublicKey(dto.scopePrices),
-    scopeOraclePriceId: new BN11(dto.scopeOraclePriceId),
-    scopeOracleMaxAge: new BN11(dto.scopeOracleMaxAge),
-    pendingFarmAdmin: new PublicKey(dto.pendingFarmAdmin),
-    strategyId: new PublicKey(dto.strategyId),
-    delegatedRpsAdmin: new PublicKey(dto.delegatedRpsAdmin),
-    vaultId: new PublicKey(dto.vaultId),
-    secondDelegatedAuthority: new PublicKey(dto.secondDelegatedAuthority),
-    padding: dto.padding.map((item) => new BN11(item))
+      }
+    }))
   };
 }
 var KAMINO_PROGRAM_ID = new PublicKey("KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD");
@@ -59137,7 +58671,7 @@ function makePoolAddPermissionlessStakedBankIx2(programId, accounts, remainingAc
   keys.push(...remainingAccounts);
   const data = Buffer.concat([
     DISCRIMINATORS.LENDING_POOL_ADD_BANK_PERMISSIONLESS,
-    encodeU64(args.seed || new BN11(0))
+    encodeU64(args.seed || new BN8(0))
   ]);
   return new TransactionInstruction({
     keys,
@@ -60641,7 +60175,7 @@ function deserializeSwapEngineResult(s) {
     setupInstructions: s.setupInstructions.map(deserializeInstruction),
     swapLuts: s.swapLuts.map(deserializeLut),
     quoteResponse: s.quoteResponse,
-    outputAmountNative: new BN11(s.outputAmountNative),
+    outputAmountNative: new BN8(s.outputAmountNative),
     provider: s.provider
   };
 }
@@ -61440,8 +60974,8 @@ async function buildCandidates(req, apiConfig) {
         swapInstructions: [deserializeJupiterInstruction2(build.swapInstruction)],
         setupInstructions: (build.setupInstructions ?? []).map(deserializeJupiterInstruction2),
         luts,
-        outAmountNative: new BN11(build.outAmount),
-        otherAmountThresholdNative: new BN11(build.otherAmountThreshold),
+        outAmountNative: new BN8(build.outAmount),
+        otherAmountThresholdNative: new BN8(build.otherAmountThreshold),
         quoteResult: mapBuildToQuoteResult(build),
         label: `jupiter:maxAccounts=${maxAccounts}`
       };
@@ -61538,8 +61072,8 @@ async function buildCandidates2(req, apiConfig) {
         swapInstructions,
         setupInstructions: [],
         luts,
-        outAmountNative: new BN11(quote.outAmount),
-        otherAmountThresholdNative: new BN11(quote.otherAmountThreshold),
+        outAmountNative: new BN8(quote.outAmount),
+        otherAmountThresholdNative: new BN8(quote.otherAmountThreshold),
         quoteResult: { ...quote, provider: "TITAN" /* TITAN */ },
         label: "titan:v3"
       }
@@ -61595,14 +61129,14 @@ async function makeBeginFlashLoanIx3(program, marginfiAccountPk, endIndex, autho
       marginfiAccount: marginfiAccountPk,
       authority
     },
-    { endIndex: new BN11(endIndex) }
+    { endIndex: new BN8(endIndex) }
   ) : await instructions_default.makeBeginFlashLoanIx(
     program,
     {
       marginfiAccount: marginfiAccountPk,
       authority
     },
-    { endIndex: new BN11(endIndex) }
+    { endIndex: new BN8(endIndex) }
   );
   return { instructions: [ix], keys: [] };
 }
@@ -62281,7 +61815,7 @@ function computeFlashLoanNonSwapBudget({
   const beginFlIx = sync_instructions_default.makeBeginFlashLoanIx(
     program.programId,
     { marginfiAccount: marginfiAccount.address, authority: marginfiAccount.authority },
-    { endIndex: new BN11(endIndex) }
+    { endIndex: new BN8(endIndex) }
   );
   const endFlRemainingAccounts = computeHealthAccountMetas(projectedActiveBanks);
   const endFlIx = sync_instructions_default.makeEndFlashLoanIx(
@@ -62860,7 +62394,7 @@ async function buildLoopFlashloanTx(params) {
   const engineResult = await runLoopSwapEngine(descriptor, params);
   const finalIxs = [...descriptor.innerIxs];
   finalIxs.splice(descriptor.swapSlotIndex, 0, ...engineResult.swapInstructions);
-  const principalNative = depositOpts.loopMode === "DEPOSIT" ? uiToNative(depositOpts.inputDepositAmount, depositOpts.depositBank.mintDecimals) : new BN11(0);
+  const principalNative = depositOpts.loopMode === "DEPOSIT" ? uiToNative(depositOpts.inputDepositAmount, depositOpts.depositBank.mintDecimals) : new BN8(0);
   const finalDepositNative = engineResult.outputAmountNative.add(principalNative);
   const depositIxPosition = descriptor.depositIxIndex + engineResult.swapInstructions.length;
   patchDepositAmount(finalIxs[depositIxPosition], finalDepositNative);
@@ -63072,7 +62606,7 @@ async function runLoopSwapEngine(descriptor, params) {
         otherAmountThreshold: "0",
         slippageBps: 0
       },
-      outputAmountNative: new BN11(0)
+      outputAmountNative: new BN8(0)
     };
   }
   const runEngine = swapEngineRunner ?? runSwapEngine;
@@ -64093,7 +63627,7 @@ async function buildRollPtFlashloanTx({
   if (!depositIxToPatch) {
     throw new Error("roll-pt: could not locate deposit instruction for amount patching");
   }
-  patchDepositAmount(depositIxToPatch, new BN11(minPtOut.toString()));
+  patchDepositAmount(depositIxToPatch, new BN8(minPtOut.toString()));
   const allNonFlIxs = [
     ...cuRequestIxs,
     ...withdrawIxs.instructions,
@@ -66643,9 +66177,9 @@ function dtoToBankMetadataMap(bankMetadataDto) {
 function dtoToBankMetadata(bankMetadataDto) {
   return {
     kaminoStates: bankMetadataDto.kaminoStates ? {
-      reserveState: dtoToReserveRaw(bankMetadataDto.kaminoStates.reserveState),
-      obligationState: dtoToObligationRaw(bankMetadataDto.kaminoStates.obligationState),
-      farmState: bankMetadataDto.kaminoStates.farmState ? dtoToFarmRaw(bankMetadataDto.kaminoStates.farmState) : void 0
+      reserveState: dtoToKaminoReserve(bankMetadataDto.kaminoStates.reserveState),
+      obligationState: dtoToKaminoObligation(bankMetadataDto.kaminoStates.obligationState),
+      farmState: bankMetadataDto.kaminoStates.farmState ? dtoToKaminoFarmState(bankMetadataDto.kaminoStates.farmState) : void 0
     } : void 0,
     driftStates: bankMetadataDto.driftStates ? {
       spotMarketState: dtoToDriftSpotMarketRaw(bankMetadataDto.driftStates.spotMarketState),
@@ -66660,16 +66194,16 @@ function dtoToBankMetadata(bankMetadataDto) {
       ),
       jupRewardsRateModel: bankMetadataDto.jupLendStates.jupRewardsRateModel ? dtoToJupLendingRewardsRateModelRaw(bankMetadataDto.jupLendStates.jupRewardsRateModel) : null,
       jupRateModel: bankMetadataDto.jupLendStates.jupRateModel ? dtoToJupRateModelRaw(bankMetadataDto.jupLendStates.jupRateModel) : null,
-      fTokenTotalSupply: new BN11(bankMetadataDto.jupLendStates.fTokenTotalSupply)
+      fTokenTotalSupply: new BN8(bankMetadataDto.jupLendStates.fTokenTotalSupply)
     } : void 0
   };
 }
 function bankMetadataToDto(bankMetadata) {
   return {
     kaminoStates: bankMetadata.kaminoStates ? {
-      reserveState: reserveRawToDto(bankMetadata.kaminoStates.reserveState),
-      obligationState: obligationRawToDto(bankMetadata.kaminoStates.obligationState),
-      farmState: bankMetadata.kaminoStates.farmState ? farmRawToDto(bankMetadata.kaminoStates.farmState) : void 0
+      reserveState: kaminoReserveToDto(bankMetadata.kaminoStates.reserveState),
+      obligationState: kaminoObligationToDto(bankMetadata.kaminoStates.obligationState),
+      farmState: bankMetadata.kaminoStates.farmState ? kaminoFarmStateToDto(bankMetadata.kaminoStates.farmState) : void 0
     } : void 0,
     driftStates: bankMetadata.driftStates ? {
       spotMarketState: driftSpotMarketRawToDto(bankMetadata.driftStates.spotMarketState),
@@ -66978,8 +66512,8 @@ var fetchSwbOracleData = async (banks, opts) => {
   const brokenSwbFeeds = [];
   Object.keys(swbOracleAiDataByKey).forEach((oracleKey) => {
     const oracleAiData = swbOracleAiDataByKey[oracleKey];
-    const rawPriceBN = new BN11(oracleAiData.rawPrice);
-    const isFeedBroken = rawPriceBN.isZero() || rawPriceBN.eq(new BN11(1e-6)) || rawPriceBN.eq(new BN11(1e-8));
+    const rawPriceBN = new BN8(oracleAiData.rawPrice);
+    const isFeedBroken = rawPriceBN.isZero() || rawPriceBN.eq(new BN8(1e-6)) || rawPriceBN.eq(new BN8(1e-8));
     if (isFeedBroken) {
       const bank = switchboardBanks.find(
         (bank2) => bank2.config.oracleKeys[0].toBase58() === oracleKey
@@ -67878,7 +67412,7 @@ async function makeAddPermissionlessStakedBankIx(program, group, voteAccountAddr
       isWritable: false
     })),
     {
-      seed: new BN11(0)
+      seed: new BN8(0)
     }
   );
   return {
@@ -68810,9 +68344,9 @@ async function getKaminoMetadata(options) {
   for (const [bankAddress, state] of Object.entries(kaminoStates)) {
     kaminoMetadataMap.set(bankAddress, {
       kaminoStates: {
-        reserveState: dtoToReserveRaw(state.reserveState),
-        obligationState: dtoToObligationRaw(state.obligationState),
-        farmState: state.farmState ? dtoToFarmRaw(state.farmState) : void 0
+        reserveState: dtoToKaminoReserve(state.reserveState),
+        obligationState: dtoToKaminoObligation(state.obligationState),
+        farmState: state.farmState ? dtoToKaminoFarmState(state.farmState) : void 0
       }
     });
   }
@@ -68844,8 +68378,8 @@ async function getKaminoStatesDto(connection, kaminoBanks) {
       bankByFarmKey[reserveState.farmCollateral.toBase58()] = bank.bankAddress;
     }
     kaminoStatesMap[bank.bankAddress] = {
-      reserveState: reserveRawToDto(reserveState),
-      obligationState: obligationRawToDto(obligationState)
+      reserveState: kaminoReserveToDto(reserveState),
+      obligationState: kaminoObligationToDto(obligationState)
     };
   }
   const allFarmKeys = Object.keys(bankByFarmKey);
@@ -68868,7 +68402,7 @@ async function getKaminoStatesDto(connection, kaminoBanks) {
       const decodedFarmState = decodeFarmDataRaw(farmState.data);
       kaminoStatesMap[bankKey] = {
         ...kaminoState,
-        farmState: farmRawToDto(decodedFarmState)
+        farmState: kaminoFarmStateToDto(decodedFarmState)
       };
     }
   }
@@ -68999,7 +68533,7 @@ async function getJupLendMetadata(options) {
         jupTokenReserveState: dtoToJupTokenReserveRaw(state.jupTokenReserveState),
         jupRewardsRateModel: state.jupRewardsRateModel ? dtoToJupLendingRewardsRateModelRaw(state.jupRewardsRateModel) : null,
         jupRateModel: state.jupRateModel ? dtoToJupRateModelRaw(state.jupRateModel) : null,
-        fTokenTotalSupply: new BN11(state.fTokenTotalSupply)
+        fTokenTotalSupply: new BN8(state.fTokenTotalSupply)
       }
     });
   }
@@ -69114,7 +68648,7 @@ async function getJupLendStatesDto(connection, jupLendBanks) {
   return jupLendStatesMap;
 }
 function getJupLendFTokenMultiplier(lendingState, tokenReserve, rewardsModel, fTokenTotalSupply, nowSeconds) {
-  const currentTimestamp = new BN11(nowSeconds);
+  const currentTimestamp = new BN8(nowSeconds);
   const newExchangePrice = calculateJupLendNewExchangePrice(
     lendingState,
     tokenReserve,