@kamino-finance/klend-sdk 5.11.14 → 5.11.16

package/src/client_kamino_manager.ts

@@ -16,6 +16,7 @@ import {
   Chain,
   DEFAULT_RECENT_SLOT_DURATION_MS,
   encodeTokenName,
+  getMedianSlotDurationInMsFromLastEpochs,
   initLookupTableIx,
   KaminoManager,
   KaminoMarket,
@@ -84,7 +85,12 @@ async function main() {
 
       const multisigPk = multisig ? new PublicKey(multisig) : PublicKey.default;
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const { market: marketKp, ixns: createMarketIxns } = await kaminoManager.createMarketIxs({
         admin: mode === 'multisig' ? multisigPk : env.payer.publicKey,
@@ -118,7 +124,12 @@ async function main() {
       }
 
       const multisigPk = multisig ? new PublicKey(multisig) : PublicKey.default;
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const reserveConfigFromFile = JSON.parse(fs.readFileSync(reserveConfigPath, 'utf8'));
 
@@ -184,7 +195,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const reserveConfigFromFile = JSON.parse(fs.readFileSync(reserveConfigPath, 'utf8'));
 
@@ -247,7 +263,12 @@ async function main() {
       }
 
       const multisigPk = multisig ? new PublicKey(multisig) : PublicKey.default;
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const tokenProgramID = await getAccountOwner(env.connection, tokenMint);
       const kaminoVaultConfig = new KaminoVaultConfig({
@@ -293,7 +314,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const instructions = await kaminoManager.updateVaultConfigIxs(kaminoVault, new PendingVaultAdmin(), newAdmin);
@@ -329,7 +355,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const instructions = await kaminoManager.updateVaultConfigIxs(kaminoVault, field, value);
@@ -364,7 +395,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const instructions = await kaminoManager.updateVaultConfigIxs(kaminoVault, new ManagementFeeBps(), feeBps);
@@ -401,7 +437,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const instructions = await kaminoManager.insertIntoLUTIxs(env.payer.publicKey, lutAddress, addressesArr);
 
@@ -435,7 +476,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const syncLUTIxs = await kaminoManager.syncVaultLUTIxs(kaminoVault);
@@ -471,7 +517,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const instructions = await kaminoManager.updateVaultConfigIxs(kaminoVault, new PerformanceFeeBps(), feeBps);
@@ -505,7 +556,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const instructions = await kaminoManager.acceptVaultOwnershipIxs(kaminoVault);
@@ -540,7 +596,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const instruction = await kaminoManager.giveUpPendingFeesIx(kaminoVault, new Decimal(maxAmountToGiveUp));
@@ -567,7 +628,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const instructions = await kaminoManager.withdrawPendingFeesIxs(
@@ -595,10 +661,12 @@ async function main() {
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
 
-      const stakeIxs = await new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId).stakeSharesIxs(
-        env.payer.publicKey,
-        kaminoVault
-      );
+      const stakeIxs = await new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      ).stakeSharesIxs(env.payer.publicKey, kaminoVault);
 
       if (mode === 'multisig' && !multisig) {
         throw new Error('If using multisig mode, multisig is required');
@@ -631,7 +699,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
       const reserveState = await Reserve.fetch(env.connection, reserveAddress, env.kLendProgramId);
       if (!reserveState) {
         throw new Error('Reserve not found');
@@ -682,7 +755,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const depositInstructions = await kaminoManager.depositToVaultIxs(env.payer.publicKey, kaminoVault, amount);
@@ -711,7 +789,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const withdrawIxs = await kaminoManager.withdrawFromVaultIxs(
@@ -751,7 +834,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const instructions = await kaminoManager.investAllReservesIxs(env.payer.publicKey, kaminoVault);
@@ -783,7 +871,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const reserveState = await Reserve.fetch(env.connection, new PublicKey(reserve), env.kLendProgramId);
@@ -828,8 +921,9 @@ async function main() {
     .requiredOption('--vault <string>', 'Vault address')
     .action(async ({ vault }) => {
       const env = initializeClient(false, false);
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
 
       const vaultAddress = new PublicKey(vault);
       const vaultState = await new KaminoVault(vaultAddress, undefined, env.kVaultProgramId).getState(env.connection);
@@ -850,8 +944,9 @@ async function main() {
     .requiredOption('--vault <string>', 'Vault address')
     .action(async ({ vault }) => {
       const env = initializeClient(false, false);
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
 
       const vaultAddress = new PublicKey(vault);
       const vaultState = await new KaminoVault(vaultAddress, undefined, env.kVaultProgramId).getState(env.connection);
@@ -869,8 +964,9 @@ async function main() {
     .requiredOption('--vault <string>', 'Vault address')
     .action(async ({ vault }) => {
       const env = initializeClient(false, false);
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
 
       const vaultAddress = new PublicKey(vault);
       const vaultState = await new KaminoVault(vaultAddress, undefined, env.kVaultProgramId).getState(env.connection);
@@ -888,8 +984,9 @@ async function main() {
     .requiredOption('--wallet <string>', 'User wailt address')
     .action(async ({ vault, wallet }) => {
       const env = initializeClient(false, false);
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
 
       const vaultAddress = new PublicKey(vault);
       const walletAddress = new PublicKey(wallet);
@@ -903,8 +1000,9 @@ async function main() {
     .requiredOption('--wallet <string>', 'User wailt address')
     .action(async ({ wallet }) => {
       const env = initializeClient(false, false);
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
 
       const walletAddress = new PublicKey(wallet);
       const userShares = await kaminoManager.getUserSharesBalanceAllVaults(walletAddress);
@@ -918,8 +1016,9 @@ async function main() {
     .requiredOption('--vault <string>', 'Vault address')
     .action(async ({ vault }) => {
       const env = initializeClient(false, false);
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
 
       const vaultAddress = new PublicKey(vault);
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
@@ -935,8 +1034,9 @@ async function main() {
     .requiredOption('--vault <string>', 'Vault address')
     .action(async ({ vault }) => {
       const env = initializeClient(false, false);
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
 
       const vaultAddress = new PublicKey(vault);
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
@@ -961,7 +1061,12 @@ async function main() {
 
   commands.command('get-oracle-mappings').action(async () => {
     const env = initializeClient(false, false);
-    const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+    const kaminoManager = new KaminoManager(
+      env.connection,
+      DEFAULT_RECENT_SLOT_DURATION_MS,
+      env.kLendProgramId,
+      env.kVaultProgramId
+    );
 
     console.log('Getting  oracle mappings');
     const oracleConfigs = await kaminoManager.getScopeOracleConfigs();
@@ -970,15 +1075,21 @@ async function main() {
 
   commands.command('get-all-vaults').action(async () => {
     const env = initializeClient(false, false);
-    const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+    const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
+    const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
     const allVaults = await kaminoManager.getAllVaults();
     console.log('all vaults', allVaults);
   });
 
   commands.command('get-all-vaults-pks').action(async () => {
     const env = initializeClient(false, false);
-    const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+    const kaminoManager = new KaminoManager(
+      env.connection,
+      DEFAULT_RECENT_SLOT_DURATION_MS,
+      env.kLendProgramId,
+      env.kVaultProgramId
+    );
 
     const allVaults = await kaminoManager.getAllVaults();
     console.log(
@@ -994,8 +1105,9 @@ async function main() {
       const env = initializeClient(false, false);
 
       const vaultAddress = new PublicKey(vault);
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
       const vaultState = await new KaminoVault(vaultAddress, undefined, env.kVaultProgramId).getState(env.connection);
 
       const simulatedHoldings = await kaminoManager.calculateSimulatedHoldingsWithInterest(vaultState);
@@ -1036,8 +1148,9 @@ async function main() {
       const env = initializeClient(false, false);
 
       const vaultAddress = new PublicKey(vault);
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(env.connection, slotDuration, env.kLendProgramId, env.kVaultProgramId);
       const vaultState = await new KaminoVault(vaultAddress, undefined, env.kVaultProgramId).getState(env.connection);
 
       const computedAllocation = await kaminoManager.getVaultComputedReservesAllocation(vaultState);
@@ -1117,7 +1230,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const newLendingMarket = LendingMarket.fromJSON(JSON.parse(fs.readFileSync(lendingMarketConfigPath, 'utf8')));
 
@@ -1157,7 +1275,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const ixn = kaminoManager.updateLendingMarketOwnerIxs(marketWithAddress);
 
@@ -1195,7 +1318,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const currentName = parseZeroPaddedUtf8(lendingMarketState.name);
       const newNameEncoded = encodeTokenName(newName);
@@ -1251,7 +1379,12 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
 
-      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
 
       const newReserveConfigFields: ReserveConfigFields = {
         ...reserveState.config,
@@ -1427,64 +1560,64 @@ function createAddExtraComputeUnitFeeTransaction(units: number, microLamports: n
   return ixns;
 }
 
-function parseReserveConfigFromFile(farmConfigFromFile: any): ReserveConfig {
+function parseReserveConfigFromFile(reserveConfigFromFile: any): ReserveConfig {
   const reserveConfigFields: ReserveConfigFields = {
-    status: farmConfigFromFile.status,
-    loanToValuePct: farmConfigFromFile.loanToValuePct,
-    liquidationThresholdPct: farmConfigFromFile.liquidationThresholdPct,
-    minLiquidationBonusBps: farmConfigFromFile.minLiquidationBonusBps,
-    protocolLiquidationFeePct: farmConfigFromFile.protocolLiquidationFeePct,
-    protocolTakeRatePct: farmConfigFromFile.protocolLiquidationFeePct,
-    assetTier: farmConfigFromFile.assetTier,
-    maxLiquidationBonusBps: farmConfigFromFile.maxLiquidationBonusBps,
-    badDebtLiquidationBonusBps: farmConfigFromFile.badDebtLiquidationBonusBps,
+    status: reserveConfigFromFile.status,
+    loanToValuePct: reserveConfigFromFile.loanToValuePct,
+    liquidationThresholdPct: reserveConfigFromFile.liquidationThresholdPct,
+    minLiquidationBonusBps: reserveConfigFromFile.minLiquidationBonusBps,
+    protocolLiquidationFeePct: reserveConfigFromFile.protocolLiquidationFeePct,
+    protocolTakeRatePct: reserveConfigFromFile.protocolLiquidationFeePct,
+    assetTier: reserveConfigFromFile.assetTier,
+    maxLiquidationBonusBps: reserveConfigFromFile.maxLiquidationBonusBps,
+    badDebtLiquidationBonusBps: reserveConfigFromFile.badDebtLiquidationBonusBps,
     fees: {
-      borrowFeeSf: Fraction.fromDecimal(new Decimal(farmConfigFromFile.fees.borrowFee)).valueSf,
-      flashLoanFeeSf: Fraction.fromDecimal(new Decimal(farmConfigFromFile.fees.flashLoanFee)).valueSf,
+      borrowFeeSf: Fraction.fromDecimal(new Decimal(reserveConfigFromFile.fees.borrowFee)).valueSf,
+      flashLoanFeeSf: Fraction.fromDecimal(new Decimal(reserveConfigFromFile.fees.flashLoanFee)).valueSf,
       padding: Array(8).fill(0),
     },
-    depositLimit: new BN(farmConfigFromFile.depositLimit),
-    borrowLimit: new BN(farmConfigFromFile.borrowLimit),
+    depositLimit: new BN(reserveConfigFromFile.depositLimit),
+    borrowLimit: new BN(reserveConfigFromFile.borrowLimit),
     tokenInfo: {
-      name: encodeTokenName(farmConfigFromFile.tokenInfo.name),
+      name: encodeTokenName(reserveConfigFromFile.tokenInfo.name),
       heuristic: new PriceHeuristic({
-        lower: new BN(farmConfigFromFile.tokenInfo.heuristic.lower),
-        upper: new BN(farmConfigFromFile.tokenInfo.heuristic.upper),
-        exp: new BN(farmConfigFromFile.tokenInfo.heuristic.exp),
+        lower: new BN(reserveConfigFromFile.tokenInfo.heuristic.lower),
+        upper: new BN(reserveConfigFromFile.tokenInfo.heuristic.upper),
+        exp: new BN(reserveConfigFromFile.tokenInfo.heuristic.exp),
       }),
-      maxTwapDivergenceBps: new BN(farmConfigFromFile.tokenInfo.maxTwapDivergenceBps),
-      maxAgePriceSeconds: new BN(farmConfigFromFile.tokenInfo.maxAgePriceSeconds),
-      maxAgeTwapSeconds: new BN(farmConfigFromFile.tokenInfo.maxAgeTwapSeconds),
-      ...parseOracleConfiguration(farmConfigFromFile),
-      blockPriceUsage: farmConfigFromFile.tokenInfo.blockPriceUsage,
+      maxTwapDivergenceBps: new BN(reserveConfigFromFile.tokenInfo.maxTwapDivergenceBps),
+      maxAgePriceSeconds: new BN(reserveConfigFromFile.tokenInfo.maxAgePriceSeconds),
+      maxAgeTwapSeconds: new BN(reserveConfigFromFile.tokenInfo.maxAgeTwapSeconds),
+      ...parseOracleConfiguration(reserveConfigFromFile),
+      blockPriceUsage: reserveConfigFromFile.tokenInfo.blockPriceUsage,
       reserved: Array(7).fill(0),
       padding: Array(19).fill(new BN(0)),
     } as TokenInfo,
-    borrowRateCurve: parseBorrowRateCurve(farmConfigFromFile),
+    borrowRateCurve: parseBorrowRateCurve(reserveConfigFromFile),
     depositWithdrawalCap: new WithdrawalCaps({
-      configCapacity: new BN(farmConfigFromFile.depositWithdrawalCap.configCapacity),
+      configCapacity: new BN(reserveConfigFromFile.depositWithdrawalCap.configCapacity),
       currentTotal: new BN(0),
       lastIntervalStartTimestamp: new BN(0),
-      configIntervalLengthSeconds: new BN(farmConfigFromFile.depositWithdrawalCap.configIntervalLengthSeconds),
+      configIntervalLengthSeconds: new BN(reserveConfigFromFile.depositWithdrawalCap.configIntervalLengthSeconds),
     }),
     debtWithdrawalCap: new WithdrawalCaps({
-      configCapacity: new BN(farmConfigFromFile.debtWithdrawalCap.configCapacity),
+      configCapacity: new BN(reserveConfigFromFile.debtWithdrawalCap.configCapacity),
       currentTotal: new BN(0),
       lastIntervalStartTimestamp: new BN(0),
-      configIntervalLengthSeconds: new BN(farmConfigFromFile.debtWithdrawalCap.configIntervalLengthSeconds),
+      configIntervalLengthSeconds: new BN(reserveConfigFromFile.debtWithdrawalCap.configIntervalLengthSeconds),
     }),
-    deleveragingMarginCallPeriodSecs: new BN(farmConfigFromFile.deleveragingMarginCallPeriodSecs),
-    borrowFactorPct: new BN(farmConfigFromFile.borrowFactorPct),
-    elevationGroups: farmConfigFromFile.elevationGroups,
-    deleveragingThresholdDecreaseBpsPerDay: new BN(farmConfigFromFile.deleveragingThresholdDecreaseBpsPerDay),
-    disableUsageAsCollOutsideEmode: farmConfigFromFile.disableUsageAsCollOutsideEmode,
-    utilizationLimitBlockBorrowingAbovePct: farmConfigFromFile.utilizationLimitBlockBorrowingAbovePct,
-    hostFixedInterestRateBps: farmConfigFromFile.hostFixedInterestRateBps,
-    autodeleverageEnabled: farmConfigFromFile.autodeleverageEnabled,
-    borrowLimitOutsideElevationGroup: new BN(farmConfigFromFile.borrowLimitOutsideElevationGroup),
-    borrowLimitAgainstThisCollateralInElevationGroup: parseReserveBorrowLimitAgainstCollInEmode(farmConfigFromFile),
-    deleveragingBonusIncreaseBpsPerDay: new BN(farmConfigFromFile.deleveragingBonusIncreaseBpsPerDay),
-    reserved1: Array(2).fill(0),
+    deleveragingMarginCallPeriodSecs: new BN(reserveConfigFromFile.deleveragingMarginCallPeriodSecs),
+    borrowFactorPct: new BN(reserveConfigFromFile.borrowFactorPct),
+    elevationGroups: reserveConfigFromFile.elevationGroups,
+    deleveragingThresholdDecreaseBpsPerDay: new BN(reserveConfigFromFile.deleveragingThresholdDecreaseBpsPerDay),
+    disableUsageAsCollOutsideEmode: reserveConfigFromFile.disableUsageAsCollOutsideEmode,
+    utilizationLimitBlockBorrowingAbovePct: reserveConfigFromFile.utilizationLimitBlockBorrowingAbovePct,
+    hostFixedInterestRateBps: reserveConfigFromFile.hostFixedInterestRateBps,
+    autodeleverageEnabled: reserveConfigFromFile.autodeleverageEnabled,
+    borrowLimitOutsideElevationGroup: new BN(reserveConfigFromFile.borrowLimitOutsideElevationGroup),
+    borrowLimitAgainstThisCollateralInElevationGroup: parseReserveBorrowLimitAgainstCollInEmode(reserveConfigFromFile),
+    deleveragingBonusIncreaseBpsPerDay: new BN(reserveConfigFromFile.deleveragingBonusIncreaseBpsPerDay),
+    reserved1: Array(1).fill(0),
     reserved2: Array(2).fill(0),
     reserved3: Array(8).fill(0),
   };
@@ -1492,29 +1625,29 @@ function parseReserveConfigFromFile(farmConfigFromFile: any): ReserveConfig {
   return new ReserveConfig(reserveConfigFields);
 }
 
-function parseOracleConfiguration(farmConfigFromFile: any): {
+function parseOracleConfiguration(reserveConfigFromFile: any): {
   pythConfiguration: PythConfiguration;
   switchboardConfiguration: SwitchboardConfiguration;
   scopeConfiguration: ScopeConfiguration;
 } {
   const pythConfiguration = new PythConfiguration({
-    price: new PublicKey(farmConfigFromFile.tokenInfo.pythConfiguration.price),
+    price: new PublicKey(reserveConfigFromFile.tokenInfo.pythConfiguration.price),
   });
   const switchboardConfiguration = new SwitchboardConfiguration({
-    priceAggregator: new PublicKey(farmConfigFromFile.tokenInfo.switchboardConfiguration.priceAggregator),
-    twapAggregator: new PublicKey(farmConfigFromFile.tokenInfo.switchboardConfiguration.twapAggregator),
+    priceAggregator: new PublicKey(reserveConfigFromFile.tokenInfo.switchboardConfiguration.priceAggregator),
+    twapAggregator: new PublicKey(reserveConfigFromFile.tokenInfo.switchboardConfiguration.twapAggregator),
   });
   const priceChain = [65535, 65535, 65535, 65535];
   const twapChain = [65535, 65535, 65535, 65535];
 
-  const priceChainFromFile: number[] = farmConfigFromFile.tokenInfo.scopeConfiguration.priceChain;
-  const twapChainFromFile: number[] = farmConfigFromFile.tokenInfo.scopeConfiguration.twapChain;
+  const priceChainFromFile: number[] = reserveConfigFromFile.tokenInfo.scopeConfiguration.priceChain;
+  const twapChainFromFile: number[] = reserveConfigFromFile.tokenInfo.scopeConfiguration.twapChain;
 
   priceChainFromFile.forEach((value, index) => (priceChain[index] = value));
   twapChainFromFile.forEach((value, index) => (twapChain[index] = value));
 
   const scopeConfiguration = new ScopeConfiguration({
-    priceFeed: new PublicKey(farmConfigFromFile.tokenInfo.scopeConfiguration.priceFeed),
+    priceFeed: new PublicKey(reserveConfigFromFile.tokenInfo.scopeConfiguration.priceFeed),
     priceChain: priceChain,
     twapChain: twapChain,
   });
@@ -1526,29 +1659,29 @@ function parseOracleConfiguration(farmConfigFromFile: any): {
   };
 }
 
-function parseBorrowRateCurve(farmConfigFromFile: any): BorrowRateCurve {
+function parseBorrowRateCurve(reserveConfigFromFile: any): BorrowRateCurve {
   const curvePoints: CurvePointFields[] = [];
 
-  farmConfigFromFile.borrowRateCurve.points.forEach((curvePoint: { utilizationRateBps: any; borrowRateBps: any }) =>
+  reserveConfigFromFile.borrowRateCurve.points.forEach((curvePoint: { utilizationRateBps: any; borrowRateBps: any }) =>
     curvePoints.push({
       utilizationRateBps: curvePoint.utilizationRateBps,
       borrowRateBps: curvePoint.borrowRateBps,
     })
   );
 
-  const finalCruvePoints: CurvePointFields[] = Array(11).fill(curvePoints[curvePoints.length - 1]);
+  const finalCurvePoints: CurvePointFields[] = Array(11).fill(curvePoints[curvePoints.length - 1]);
 
-  curvePoints.forEach((curvePoint, index) => (finalCruvePoints[index] = curvePoint));
+  curvePoints.forEach((curvePoint, index) => (finalCurvePoints[index] = curvePoint));
 
-  const borrowRateCurve = new BorrowRateCurve({ points: finalCruvePoints });
+  const borrowRateCurve = new BorrowRateCurve({ points: finalCurvePoints });
 
   return borrowRateCurve;
 }
 
-function parseReserveBorrowLimitAgainstCollInEmode(farmConfigFromFile: any): BN[] {
+function parseReserveBorrowLimitAgainstCollInEmode(reserveConfigFromFile: any): BN[] {
   const reserveBorrowLimitAgainstCollInEmode: BN[] = Array(32).fill(new BN(0));
 
-  farmConfigFromFile.borrowLimitAgainstThisCollateralInElevationGroup.forEach(
+  reserveConfigFromFile.borrowLimitAgainstThisCollateralInElevationGroup.forEach(
     (limit: any, index: number) => (reserveBorrowLimitAgainstCollInEmode[index] = new BN(limit))
   );