@0dotxyz/p0-ts-sdk 2.5.5-alpha.3 → 2.5.5-alpha.4

package/dist/index.cjs

@@ -20084,12 +20084,8 @@ var NATIVE_STAKE_LUT_KEYS = new Set(
   Object.values(ADDRESS_LOOKUP_TABLE_FOR_GROUP_NATIVE_STAKE).flat().map((key) => key.toBase58())
 );
 function selectLutsForBanks(luts, banks) {
-  const nativeStakeLuts = luts.filter(
-    (lut) => NATIVE_STAKE_LUT_KEYS.has(lut.key.toBase58())
-  );
-  const generalLuts = luts.filter(
-    (lut) => !NATIVE_STAKE_LUT_KEYS.has(lut.key.toBase58())
-  );
+  const nativeStakeLuts = luts.filter((lut) => NATIVE_STAKE_LUT_KEYS.has(lut.key.toBase58()));
+  const generalLuts = luts.filter((lut) => !NATIVE_STAKE_LUT_KEYS.has(lut.key.toBase58()));
   const allStakedOrSol = banks.length > 0 && banks.every(
     (bank) => bank.config.assetTag === 2 /* STAKED */ || bank.config.assetTag === 1 /* SOL */
   );
@@ -20136,37 +20132,54 @@ async function makeVersionedTransaction(blockhash, transaction, payer, addressLo
   const versionedMessage = addressLookupTables ? message.compileToV0Message(addressLookupTables) : message.compileToLegacyMessage();
   return new web3_js.VersionedTransaction(versionedMessage);
 }
+function countTxAccountLocks(tx) {
+  const message = tx.message;
+  const lookupKeys = (message.addressTableLookups ?? []).reduce(
+    (count, lookup) => count + lookup.writableIndexes.length + lookup.readonlyIndexes.length,
+    0
+  );
+  return message.staticAccountKeys.length + lookupKeys;
+}
 function splitInstructionsToFitTransactions(mandatoryIxs, ixs, opts) {
   const result = [];
   let buffer = [];
-  function buildTx(mandatoryIxs2, extraIxs, opts2) {
+  const maxSize = MAX_TX_SIZE - (opts.sizeMargin ?? 0);
+  function buildTx(extraIxs) {
     const messageV0 = new web3_js.TransactionMessage({
-      payerKey: opts2.payerKey,
-      recentBlockhash: opts2.blockhash,
-      instructions: [...mandatoryIxs2, ...extraIxs]
-    }).compileToV0Message(opts2.luts);
+      payerKey: opts.payerKey,
+      recentBlockhash: opts.blockhash,
+      instructions: [...mandatoryIxs, ...extraIxs]
+    }).compileToV0Message(opts.luts);
     return new web3_js.VersionedTransaction(messageV0);
   }
+  function fits(extraIxs) {
+    try {
+      const tx = buildTx(extraIxs);
+      if (getTxSize(tx) > maxSize) return false;
+      if (opts.maxAccountLocks !== void 0 && countTxAccountLocks(tx) > opts.maxAccountLocks) {
+        return false;
+      }
+      return true;
+    } catch {
+      return false;
+    }
+  }
   for (const ix of ixs) {
-    const trial = buildTx(mandatoryIxs, [...buffer, ix], opts);
-    if (getTxSize(trial) <= MAX_TX_SIZE) {
+    if (fits([...buffer, ix])) {
       buffer.push(ix);
-    } else {
-      if (buffer.length === 0) {
-        throw new Error("Single instruction too large to fit in a transaction");
-      }
-      const tx = buildTx(mandatoryIxs, buffer, opts);
-      result.push(tx);
-      buffer = [ix];
-      const solo = buildTx(mandatoryIxs, buffer, opts);
-      if (getTxSize(solo) > MAX_TX_SIZE) {
-        throw new Error("Single instruction too large to fit in a transaction");
-      }
+      continue;
+    }
+    if (buffer.length === 0) {
+      throw new Error("Single instruction too large to fit in a transaction");
+    }
+    result.push(buildTx(buffer));
+    buffer = [ix];
+    if (!fits(buffer)) {
+      throw new Error("Single instruction too large to fit in a transaction");
     }
   }
   if (buffer.length > 0) {
-    const tx = buildTx(mandatoryIxs, buffer, opts);
-    result.push(tx);
+    result.push(buildTx(buffer));
   }
   return result;
 }
@@ -26425,7 +26438,13 @@ BigInt(200);
 BigInt(82);
 
 // src/services/account/utils/compute/transaction-projection.utils.ts
-function computeHealthCheckAccounts(balances, banksMap, mandatoryBanks = [], excludedBanks = []) {
+function computeHealthCheckAccounts({
+  account,
+  banksMap,
+  mandatoryBanks = [],
+  excludedBanks = []
+}) {
+  const balances = account.balances;
   const activeBalances = balances.filter((b) => b.active);
   const mandatoryBanksSet = new Set(mandatoryBanks.map((b) => b.toBase58()));
   const excludedBanksSet = new Set(excludedBanks.map((b) => b.toBase58()));
@@ -26455,7 +26474,11 @@ function computeHealthCheckAccounts(balances, banksMap, mandatoryBanks = [], exc
   });
   return projectedActiveBanks;
 }
-function computeHealthAccountMetas(banksToInclude, enableSorting = true, trailingBanks = []) {
+function computeHealthAccountMetas({
+  banksToInclude,
+  enableSorting = true,
+  trailingBanks = []
+}) {
   let wrapperFn = enableSorting ? composeRemainingAccounts : (banksAndOracles) => banksAndOracles.flat();
   const accounts = wrapperFn(banksToInclude.map(computeBankRiskAccountKeys));
   for (const bank of trailingBanks) {
@@ -26485,14 +26508,22 @@ function computeBankRiskAccountKeys(bank) {
   }
   return keys;
 }
-function computeProjectedActiveBanksNoCpi(balances, instructions2, program) {
-  let projectedBalances = [...balances.map((b) => ({ active: b.active, bankPk: b.bankPk }))];
+function computeProjectedActiveBanksNoCpi({
+  account,
+  instructions: instructions2,
+  program
+}) {
+  let projectedBalances = [
+    ...account.balances.map((b) => ({ active: b.active, bankPk: b.bankPk }))
+  ];
   for (let index = 0; index < instructions2.length; index++) {
     const ix = instructions2[index];
     if (!ix?.programId.equals(program.programId)) continue;
     const borshCoder = new anchor.BorshInstructionCoder(program.idl);
     const decoded = borshCoder.decode(ix.data, "base58");
     if (!decoded) continue;
+    const ixMarginfiAccount = ix.keys[1]?.pubkey;
+    if (!ixMarginfiAccount?.equals(account.address)) continue;
     const ixArgs = decoded.data;
     switch (decoded.name) {
       case "lendingAccountBorrow":
@@ -26540,8 +26571,14 @@ function computeProjectedActiveBanksNoCpi(balances, instructions2, program) {
   }
   return projectedBalances.filter((b) => b.active).map((b) => b.bankPk);
 }
-function computeProjectedActiveBalancesNoCpi(balances, instructions2, program, banksMap, assetShareValueMultiplierByBank) {
-  let projectedBalances = balances.map((b) => ({
+function computeProjectedActiveBalancesNoCpi({
+  account,
+  instructions: instructions2,
+  program,
+  banksMap,
+  assetShareValueMultiplierByBank
+}) {
+  let projectedBalances = account.balances.map((b) => ({
     active: b.active,
     bankPk: b.bankPk,
     assetShares: new BigNumber3__default.default(b.assetShares),
@@ -26558,6 +26595,8 @@ function computeProjectedActiveBalancesNoCpi(balances, instructions2, program, b
     const borshCoder = new anchor.BorshInstructionCoder(program.idl);
     const decoded = borshCoder.decode(ix.data, "base58");
     if (!decoded) continue;
+    const ixMarginfiAccount = ix.keys[1]?.pubkey;
+    if (!ixMarginfiAccount?.equals(account.address)) continue;
     const ixArgs = decoded.data;
     switch (decoded.name) {
       // Instructions that open or add to a position
@@ -41567,13 +41606,18 @@ async function makeSetupIx({ connection, authority, tokens }) {
     return [];
   }
 }
-async function makePulseHealthIx2(program, marginfiAccountPk, banks, balances, mandatoryBanks, excludedBanks) {
-  const healthAccounts = computeHealthCheckAccounts(balances, banks, mandatoryBanks, excludedBanks);
-  const accountMetas = computeHealthAccountMetas(healthAccounts);
+async function makePulseHealthIx2(program, marginfiAccount, banks, mandatoryBanks, excludedBanks) {
+  const healthAccounts = computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: banks,
+    mandatoryBanks,
+    excludedBanks
+  });
+  const accountMetas = computeHealthAccountMetas({ banksToInclude: healthAccounts });
   const ix = await instructions_default.makePulseHealthIx(
     program,
     {
-      marginfiAccount: marginfiAccountPk
+      marginfiAccount: marginfiAccount.address
     },
     accountMetas.map((account) => ({
       pubkey: account,
@@ -63746,7 +63790,15 @@ async function makeDriftWithdrawIx3({
     );
     withdrawIxs.push(createAtaIdempotentIx);
   }
-  const healthAccounts = withdrawAll ? computeHealthCheckAccounts(marginfiAccount.balances, bankMap, [], [bank.address]) : computeHealthCheckAccounts(marginfiAccount.balances, bankMap, [bank.address], []);
+  const healthAccounts = withdrawAll ? computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: bankMap,
+    excludedBanks: [bank.address]
+  }) : computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: bankMap,
+    mandatoryBanks: [bank.address]
+  });
   const marketIndex = driftSpotMarket.marketIndex;
   const driftOracle = driftSpotMarket.oracle;
   const { driftState, driftSigner, driftSpotMarketVault } = getAllDerivedDriftAccounts(marketIndex);
@@ -63756,7 +63808,10 @@ async function makeDriftWithdrawIx3({
   if (opts.observationBanksOverride) {
     remainingAccounts.push(...opts.observationBanksOverride);
   } else {
-    const accountMetas = computeHealthAccountMetas(healthAccounts, true, withdrawAll ? [bank] : []);
+    const accountMetas = computeHealthAccountMetas({
+      banksToInclude: healthAccounts,
+      trailingBanks: withdrawAll ? [bank] : []
+    });
     remainingAccounts.push(...accountMetas);
   }
   if (userRewards.length > 2) {
@@ -63871,19 +63926,7 @@ async function makeDriftWithdrawTx(params) {
     updateFeedIxs = _updateFeedIxs;
     feedLuts = _feedLuts;
   }
-  const updateJupLendRateIxs = makeUpdateJupLendRateIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [withdrawIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [withdrawIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const kaminoRefreshIxs = makeRefreshKaminoBanksIxs(
+  const refreshIntegrationIxs = makeRefreshIntegrationBanksIxs(
     params.marginfiAccount,
     params.bankMap,
     [withdrawIxParams.bank.address],
@@ -63913,23 +63956,13 @@ async function makeDriftWithdrawTx(params) {
   const withdrawTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [
-          ...kaminoRefreshIxs.instructions,
-          ...updateDriftMarketIxs.instructions,
-          ...updateJupLendRateIxs.instructions,
-          ...withdrawIxs.instructions
-        ],
+        instructions: [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
     ),
     {
-      signers: [
-        ...kaminoRefreshIxs.keys,
-        ...updateDriftMarketIxs.keys,
-        ...updateJupLendRateIxs.keys,
-        ...withdrawIxs.keys
-      ],
+      signers: [...refreshIntegrationIxs.keys, ...withdrawIxs.keys],
       addressLookupTables: selectedLuts,
       type: "WITHDRAW" /* WITHDRAW */
     }
@@ -63965,7 +63998,15 @@ async function makeKaminoWithdrawIx3({
     );
     withdrawIxs.push(createAtaIdempotentIx);
   }
-  const healthAccounts = withdrawAll ? computeHealthCheckAccounts(marginfiAccount.balances, bankMap, [], [bank.address]) : computeHealthCheckAccounts(marginfiAccount.balances, bankMap, [bank.address], []);
+  const healthAccounts = withdrawAll ? computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: bankMap,
+    excludedBanks: [bank.address]
+  }) : computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: bankMap,
+    mandatoryBanks: [bank.address]
+  });
   const lendingMarket = reserve.lendingMarket;
   const reserveLiquiditySupply = reserve.liquidity.supplyVault;
   const reserveCollateralMint = reserve.collateral.mintPubkey;
@@ -63985,7 +64026,10 @@ async function makeKaminoWithdrawIx3({
   if (opts.observationBanksOverride) {
     remainingAccounts.push(...opts.observationBanksOverride);
   } else {
-    const accountMetas = computeHealthAccountMetas(healthAccounts, true, withdrawAll ? [bank] : []);
+    const accountMetas = computeHealthAccountMetas({
+      banksToInclude: healthAccounts,
+      trailingBanks: withdrawAll ? [bank] : []
+    });
     remainingAccounts.push(...accountMetas);
   }
   const withdrawIx = isSync ? sync_instructions_default.makeKaminoWithdrawIx(
@@ -64080,7 +64124,15 @@ async function makeWithdrawIx3({
     );
     withdrawIxs.push(createAtaIdempotentIx);
   }
-  const healthAccounts = withdrawAll ? computeHealthCheckAccounts(marginfiAccount.balances, bankMap, [], [bank.address]) : computeHealthCheckAccounts(marginfiAccount.balances, bankMap, [bank.address], []);
+  const healthAccounts = withdrawAll ? computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: bankMap,
+    excludedBanks: [bank.address]
+  }) : computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: bankMap,
+    mandatoryBanks: [bank.address]
+  });
   const remainingAccounts = [];
   if (tokenProgram.equals(TOKEN_2022_PROGRAM_ID)) {
     remainingAccounts.push(bank.mint);
@@ -64088,7 +64140,10 @@ async function makeWithdrawIx3({
   if (opts.observationBanksOverride) {
     remainingAccounts.push(...opts.observationBanksOverride);
   } else {
-    const accountMetas = computeHealthAccountMetas(healthAccounts, true, withdrawAll ? [bank] : []);
+    const accountMetas = computeHealthAccountMetas({
+      banksToInclude: healthAccounts,
+      trailingBanks: withdrawAll ? [bank] : []
+    });
     remainingAccounts.push(...accountMetas);
   }
   const withdrawIx = isSync ? sync_instructions_default.makeWithdrawIx(
@@ -64161,19 +64216,7 @@ async function makeWithdrawTx(params) {
     updateFeedIxs = _updateFeedIxs;
     feedLuts = _feedLuts;
   }
-  const updateJupLendRateIxs = makeUpdateJupLendRateIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [withdrawIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [withdrawIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const refreshIxs = makeRefreshKaminoBanksIxs(
+  const refreshIntegrationIxs = makeRefreshIntegrationBanksIxs(
     params.marginfiAccount,
     params.bankMap,
     [withdrawIxParams.bank.address],
@@ -64203,23 +64246,13 @@ async function makeWithdrawTx(params) {
   const withdrawTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [
-          ...refreshIxs.instructions,
-          ...updateDriftMarketIxs.instructions,
-          ...updateJupLendRateIxs.instructions,
-          ...withdrawIxs.instructions
-        ],
+        instructions: [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
     ),
     {
-      signers: [
-        ...refreshIxs.keys,
-        ...updateDriftMarketIxs.keys,
-        ...updateJupLendRateIxs.keys,
-        ...withdrawIxs.keys
-      ],
+      signers: [...refreshIntegrationIxs.keys, ...withdrawIxs.keys],
       addressLookupTables: selectedLuts,
       type: "WITHDRAW" /* WITHDRAW */
     }
@@ -64241,19 +64274,7 @@ async function makeKaminoWithdrawTx(params) {
   const { value: amountValue, type: amountType } = resolveAmount(amount);
   const multiplier = assetShareValueMultiplierByBank.get(withdrawIxParams.bank.address.toBase58()) ?? new BigNumber3.BigNumber(1);
   const adjustedAmount = amountType === "cToken" ? new BigNumber3.BigNumber(amountValue).toNumber() : new BigNumber3.BigNumber(amountValue).div(multiplier).toNumber();
-  const updateJupLendRateIxs = makeUpdateJupLendRateIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [withdrawIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const refreshIxs = makeRefreshKaminoBanksIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [withdrawIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
+  const refreshIntegrationIxs = makeRefreshIntegrationBanksIxs(
     params.marginfiAccount,
     params.bankMap,
     [withdrawIxParams.bank.address],
@@ -64297,23 +64318,13 @@ async function makeKaminoWithdrawTx(params) {
   const withdrawTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [
-          ...refreshIxs.instructions,
-          ...updateDriftMarketIxs.instructions,
-          ...updateJupLendRateIxs.instructions,
-          ...withdrawIxs.instructions
-        ],
+        instructions: [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
     ),
     {
-      signers: [
-        ...refreshIxs.keys,
-        ...updateDriftMarketIxs.keys,
-        ...updateJupLendRateIxs.keys,
-        ...withdrawIxs.keys
-      ],
+      signers: [...refreshIntegrationIxs.keys, ...withdrawIxs.keys],
       addressLookupTables: selectedLuts,
       type: "WITHDRAW" /* WITHDRAW */
     }
@@ -64348,7 +64359,15 @@ async function makeJuplendWithdrawIx2({
     );
     withdrawIxs.push(createAtaIdempotentIx);
   }
-  const healthAccounts = withdrawAll ? computeHealthCheckAccounts(marginfiAccount.balances, bankMap, [], [bank.address]) : computeHealthCheckAccounts(marginfiAccount.balances, bankMap, [bank.address], []);
+  const healthAccounts = withdrawAll ? computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: bankMap,
+    excludedBanks: [bank.address]
+  }) : computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: bankMap,
+    mandatoryBanks: [bank.address]
+  });
   if (!bank.jupLendIntegrationAccounts) {
     throw new Error("Bank has no JupLend integration accounts");
   }
@@ -64361,7 +64380,10 @@ async function makeJuplendWithdrawIx2({
   if (opts.observationBanksOverride) {
     remainingAccounts.push(...opts.observationBanksOverride);
   } else {
-    const accountMetas = computeHealthAccountMetas(healthAccounts, true, withdrawAll ? [bank] : []);
+    const accountMetas = computeHealthAccountMetas({
+      banksToInclude: healthAccounts,
+      trailingBanks: withdrawAll ? [bank] : []
+    });
     remainingAccounts.push(...accountMetas);
   }
   const withdrawIx = await instructions_default.makeJuplendWithdrawIx(
@@ -64435,19 +64457,7 @@ async function makeJuplendWithdrawTx(params) {
     updateFeedIxs = _updateFeedIxs;
     feedLuts = _feedLuts;
   }
-  const updateJupLendRateIxs = makeUpdateJupLendRateIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [withdrawIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [withdrawIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const refreshIxs = makeRefreshKaminoBanksIxs(
+  const refreshIntegrationIxs = makeRefreshIntegrationBanksIxs(
     params.marginfiAccount,
     params.bankMap,
     [withdrawIxParams.bank.address],
@@ -64477,18 +64487,13 @@ async function makeJuplendWithdrawTx(params) {
   const withdrawTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [
-          ...refreshIxs.instructions,
-          ...updateDriftMarketIxs.instructions,
-          ...updateJupLendRateIxs.instructions,
-          ...withdrawIxs.instructions
-        ],
+        instructions: [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
     ),
     {
-      signers: [...refreshIxs.keys, ...withdrawIxs.keys],
+      signers: [...refreshIntegrationIxs.keys, ...withdrawIxs.keys],
       addressLookupTables: selectedLuts,
       type: "WITHDRAW" /* WITHDRAW */
     }
@@ -64522,12 +64527,11 @@ async function makeBorrowIx3({
     borrowIxs.push(createAtaIdempotentIx);
   }
   const mandatoryBanks = [bank.address, ...opts.additionalHealthCheckBanks ?? []];
-  const healthAccounts = computeHealthCheckAccounts(
-    marginfiAccount.balances,
-    bankMap,
-    mandatoryBanks,
-    []
-  );
+  const healthAccounts = computeHealthCheckAccounts({
+    account: marginfiAccount,
+    banksMap: bankMap,
+    mandatoryBanks
+  });
   const remainingAccounts = [];
   if (tokenProgram.equals(TOKEN_2022_PROGRAM_ID)) {
     remainingAccounts.push(bank.mint);
@@ -64535,7 +64539,7 @@ async function makeBorrowIx3({
   if (opts?.observationBanksOverride) {
     remainingAccounts.push(...opts.observationBanksOverride);
   } else {
-    const accountMetas = computeHealthAccountMetas(healthAccounts);
+    const accountMetas = computeHealthAccountMetas({ banksToInclude: healthAccounts });
     remainingAccounts.push(...accountMetas);
   }
   const borrowIx = isSync ? sync_instructions_default.makeBorrowIx(
@@ -64589,19 +64593,7 @@ async function makeBorrowTx(params) {
     params.bankMap,
     borrowIxParams.opts?.additionalHealthCheckBanks
   );
-  const updateJupLendRateIxs = makeUpdateJupLendRateIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [borrowIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [borrowIxParams.bank.address],
-    params.bankMetadataMap
-  );
-  const kaminoRefreshIxs = makeRefreshKaminoBanksIxs(
+  const refreshIntegrationIxs = makeRefreshIntegrationBanksIxs(
     params.marginfiAccount,
     params.bankMap,
     [borrowIxParams.bank.address],
@@ -64642,18 +64634,13 @@ async function makeBorrowTx(params) {
   const borrowTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [
-          ...kaminoRefreshIxs.instructions,
-          ...updateDriftMarketIxs.instructions,
-          ...updateJupLendRateIxs.instructions,
-          ...borrowIxs.instructions
-        ],
+        instructions: [...refreshIntegrationIxs.instructions, ...borrowIxs.instructions],
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
     ),
     {
-      signers: [...kaminoRefreshIxs.keys, ...borrowIxs.keys],
+      signers: [...refreshIntegrationIxs.keys, ...borrowIxs.keys],
       addressLookupTables: selectedLuts,
       type: "BORROW" /* BORROW */
     }
@@ -66157,7 +66144,7 @@ async function makeBeginFlashLoanIx3(program, marginfiAccountPk, endIndex, autho
   return { instructions: [ix], keys: [] };
 }
 async function makeEndFlashLoanIx3(program, marginfiAccountPk, projectedActiveBanks, authority, isSync) {
-  const remainingAccounts = computeHealthAccountMetas(projectedActiveBanks);
+  const remainingAccounts = computeHealthAccountMetas({ banksToInclude: projectedActiveBanks });
   const ix = isSync && authority ? sync_instructions_default.makeEndFlashLoanIx(
     program.programId,
     {
@@ -66194,11 +66181,11 @@ async function makeFlashLoanTx({
   isSync
 }) {
   const endIndex = ixs.length + 1;
-  const projectedActiveBanksKeys = computeProjectedActiveBanksNoCpi(
-    marginfiAccount.balances,
-    ixs,
+  const projectedActiveBanksKeys = computeProjectedActiveBanksNoCpi({
+    account: marginfiAccount,
+    instructions: ixs,
     program
-  );
+  });
   const projectedActiveBanks = projectedActiveBanksKeys.map((account) => {
     const b = bankMap.get(account.toBase58());
     if (!b) throw Error(`Bank ${account.toBase58()} not found, in makeFlashLoanTx function`);
@@ -66327,23 +66314,12 @@ async function makeRepayWithCollatTx(params) {
       }
     ]
   });
-  const updateJuplendMarketIxs = makeUpdateJupLendRateIxs(
+  const refreshIntegrationIxs = makeRefreshIntegrationBanksIxs(
     marginfiAccount,
     bankMap,
     [withdrawOpts.withdrawBank.address],
-    bankMetadataMap
-  );
-  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
-    marginfiAccount,
-    bankMap,
-    [withdrawOpts.withdrawBank.address],
-    bankMetadataMap
-  );
-  const kaminoRefreshIxs = makeRefreshKaminoBanksIxs(
-    marginfiAccount,
-    bankMap,
-    [withdrawOpts.withdrawBank.address, repayOpts.repayBank.address],
-    bankMetadataMap
+    bankMetadataMap,
+    [withdrawOpts.withdrawBank.address, repayOpts.repayBank.address]
   );
   const { flashloanTx, setupInstructions, swapQuote, amountToRepay, withdrawIxs, repayIxs } = await buildRepayWithCollatFlashloanTx({
     ...params,
@@ -66373,13 +66349,8 @@ async function makeRepayWithCollatTx(params) {
     crossbarUrl
   });
   let additionalTxs = [];
-  if (setupIxs.length > 0 || kaminoRefreshIxs.instructions.length > 0 || updateDriftMarketIxs.instructions.length > 0 || updateJuplendMarketIxs.instructions.length > 0) {
-    const ixs = [
-      ...setupIxs,
-      ...kaminoRefreshIxs.instructions,
-      ...updateDriftMarketIxs.instructions,
-      ...updateJuplendMarketIxs.instructions
-    ];
+  if (setupIxs.length > 0 || refreshIntegrationIxs.instructions.length > 0) {
+    const ixs = [...setupIxs, ...refreshIntegrationIxs.instructions];
     const txs = splitInstructionsToFitTransactions([], ixs, {
       blockhash,
       payerKey: marginfiAccount.authority,
@@ -66817,11 +66788,11 @@ function computeFlashLoanNonSwapBudget({
   bankMap,
   addressLookupTableAccounts
 }) {
-  const projectedActiveBanksKeys = computeProjectedActiveBanksNoCpi(
-    marginfiAccount.balances,
-    ixs,
+  const projectedActiveBanksKeys = computeProjectedActiveBanksNoCpi({
+    account: marginfiAccount,
+    instructions: ixs,
     program
-  );
+  });
   const projectedActiveBanks = projectedActiveBanksKeys.map((key) => {
     const b = bankMap.get(key.toBase58());
     if (!b) throw new Error(`Bank ${key.toBase58()} not found in computeFlashLoanNonSwapBudget`);
@@ -66833,7 +66804,9 @@ function computeFlashLoanNonSwapBudget({
     { marginfiAccount: marginfiAccount.address, authority: marginfiAccount.authority },
     { endIndex: new BN9__default.default(endIndex) }
   );
-  const endFlRemainingAccounts = computeHealthAccountMetas(projectedActiveBanks);
+  const endFlRemainingAccounts = computeHealthAccountMetas({
+    banksToInclude: projectedActiveBanks
+  });
   const endFlIx = sync_instructions_default.makeEndFlashLoanIx(
     program.programId,
     { marginfiAccount: marginfiAccount.address, authority: marginfiAccount.authority },
@@ -67294,23 +67267,12 @@ async function makeLoopTx(params) {
       }
     ]
   });
-  const updateJupLendRateIxs = makeUpdateJupLendRateIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [depositOpts.depositBank.address],
-    params.bankMetadataMap
-  );
-  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
+  const refreshIntegrationIxs = makeRefreshIntegrationBanksIxs(
     params.marginfiAccount,
     params.bankMap,
     [depositOpts.depositBank.address],
-    params.bankMetadataMap
-  );
-  const kaminoRefreshIxs = makeRefreshKaminoBanksIxs(
-    marginfiAccount,
-    bankMap,
-    [borrowOpts.borrowBank.address, depositOpts.depositBank.address],
-    bankMetadataMap
+    params.bankMetadataMap,
+    [borrowOpts.borrowBank.address, depositOpts.depositBank.address]
   );
   const { flashloanTx, setupInstructions, swapQuote, depositIxs, borrowIxs } = await buildLoopFlashloanTx({
     ...params,
@@ -67345,14 +67307,8 @@ async function makeLoopTx(params) {
       ...makeWrapSolIxs(marginfiAccount.authority, new BigNumber3.BigNumber(depositOpts.inputDepositAmount))
     );
   }
-  if (setupIxs.length > 0 || additionalIxs.length > 0 || kaminoRefreshIxs.instructions.length > 0 || updateDriftMarketIxs.instructions.length > 0 || updateJupLendRateIxs.instructions.length > 0) {
-    const ixs = [
-      ...additionalIxs,
-      ...setupIxs,
-      ...kaminoRefreshIxs.instructions,
-      ...updateDriftMarketIxs.instructions,
-      ...updateJupLendRateIxs.instructions
-    ];
+  if (setupIxs.length > 0 || additionalIxs.length > 0 || refreshIntegrationIxs.instructions.length > 0) {
+    const ixs = [...additionalIxs, ...setupIxs, ...refreshIntegrationIxs.instructions];
     const txs = splitInstructionsToFitTransactions([], ixs, {
       blockhash,
       payerKey: marginfiAccount.authority,
@@ -67504,7 +67460,9 @@ async function buildLoopNonSwapIxs(params) {
   const innerIxs = [...innerIxsBeforeSwap, ...depositIxs.instructions];
   const depositIxIndex = innerIxs.findIndex(isDepositIx);
   if (depositIxIndex < 0) {
-    throw new Error("buildLoopNonSwapIxs: could not locate deposit instruction for amount patching");
+    throw new Error(
+      "buildLoopNonSwapIxs: could not locate deposit instruction for amount patching"
+    );
   }
   const descriptor = {
     innerIxs,
@@ -67715,19 +67673,7 @@ async function makeSwapCollateralTx(params) {
       { mint: depositOpts.depositBank.mint, tokenProgram: depositOpts.tokenProgram }
     ]
   });
-  const updateJupLendRateIxs = makeUpdateJupLendRateIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [depositOpts.depositBank.address],
-    params.bankMetadataMap
-  );
-  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
-    marginfiAccount,
-    bankMap,
-    [withdrawOpts.withdrawBank.address],
-    bankMetadataMap
-  );
-  const kaminoRefreshIxs = makeRefreshKaminoBanksIxs(
+  const refreshIntegrationIxs = makeRefreshIntegrationBanksIxs(
     marginfiAccount,
     bankMap,
     [withdrawOpts.withdrawBank.address, depositOpts.depositBank.address],
@@ -67761,13 +67707,8 @@ async function makeSwapCollateralTx(params) {
     crossbarUrl
   });
   let additionalTxs = [];
-  if (setupIxs.length > 0 || kaminoRefreshIxs.instructions.length > 0 || updateDriftMarketIxs.instructions.length > 0 || updateJupLendRateIxs.instructions.length > 0) {
-    const ixs = [
-      ...setupIxs,
-      ...kaminoRefreshIxs.instructions,
-      ...updateDriftMarketIxs.instructions,
-      ...updateJupLendRateIxs.instructions
-    ];
+  if (setupIxs.length > 0 || refreshIntegrationIxs.instructions.length > 0) {
+    const ixs = [...setupIxs, ...refreshIntegrationIxs.instructions];
     const txs = splitInstructionsToFitTransactions([], ixs, {
       blockhash,
       payerKey: marginfiAccount.authority,
@@ -68156,23 +68097,12 @@ async function makeSwapDebtTx(params) {
       { mint: borrowOpts.borrowBank.mint, tokenProgram: borrowOpts.tokenProgram }
     ]
   });
-  const updateJupLendRateIxs = makeUpdateJupLendRateIxs(
-    params.marginfiAccount,
-    params.bankMap,
-    [],
-    params.bankMetadataMap
-  );
-  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
+  const refreshIntegrationIxs = makeRefreshIntegrationBanksIxs(
     marginfiAccount,
     bankMap,
     [],
-    bankMetadataMap
-  );
-  const kaminoRefreshIxs = makeRefreshKaminoBanksIxs(
-    marginfiAccount,
-    bankMap,
-    [repayOpts.repayBank.address, borrowOpts.borrowBank.address],
-    bankMetadataMap
+    bankMetadataMap,
+    [repayOpts.repayBank.address, borrowOpts.borrowBank.address]
   );
   const { flashloanTx, setupInstructions, swapQuote, borrowIxs, repayIxs } = await buildSwapDebtFlashloanTx({
     ...params,
@@ -68202,14 +68132,8 @@ async function makeSwapDebtTx(params) {
     crossbarUrl
   });
   let additionalTxs = [];
-  if (setupIxs.length > 0 || kaminoRefreshIxs.instructions.length > 0 || updateDriftMarketIxs.instructions.length > 0 || updateJupLendRateIxs.instructions.length > 0) {
-    const ixs = [
-      ...additionalIxs,
-      ...setupIxs,
-      ...kaminoRefreshIxs.instructions,
-      ...updateDriftMarketIxs.instructions,
-      ...updateJupLendRateIxs.instructions
-    ];
+  if (setupIxs.length > 0 || refreshIntegrationIxs.instructions.length > 0) {
+    const ixs = [...additionalIxs, ...setupIxs, ...refreshIntegrationIxs.instructions];
     const txs = splitInstructionsToFitTransactions([], ixs, {
       blockhash,
       payerKey: marginfiAccount.authority,
@@ -69160,7 +69084,12 @@ var MarginfiAccount = class _MarginfiAccount {
    * @returns Array of banks needed for health checks
    */
   getHealthCheckAccounts(banks, mandatoryBanks = [], excludedBanks = []) {
-    return computeHealthCheckAccounts(this.balances, banks, mandatoryBanks, excludedBanks);
+    return computeHealthCheckAccounts({
+      account: this,
+      banksMap: banks,
+      mandatoryBanks,
+      excludedBanks
+    });
   }
   /**
    * Determines which E-mode pairs are currently active for this account.
@@ -69360,14 +69289,7 @@ var MarginfiAccount = class _MarginfiAccount {
    * @see {@link makePulseHealthIx} for implementation
    */
   async makePulseHealthIx(program, banks, mandatoryBanks, excludedBanks) {
-    return makePulseHealthIx2(
-      program,
-      this.address,
-      banks,
-      this.balances,
-      mandatoryBanks,
-      excludedBanks
-    );
+    return makePulseHealthIx2(program, this, banks, mandatoryBanks, excludedBanks);
   }
   /**
    * Computes which banks will be active after executing the given instructions.
@@ -69383,7 +69305,7 @@ var MarginfiAccount = class _MarginfiAccount {
    * @see {@link computeProjectedActiveBanksNoCpi} for implementation
    */
   computeProjectedActiveBanksNoCpi(program, instructions2) {
-    return computeProjectedActiveBanksNoCpi(this.balances, instructions2, program);
+    return computeProjectedActiveBanksNoCpi({ account: this, instructions: instructions2, program });
   }
   /**
    * Computes projected active balances after executing the given instructions.
@@ -69400,13 +69322,13 @@ var MarginfiAccount = class _MarginfiAccount {
    * @see {@link computeProjectedActiveBalancesNoCpi} for implementation
    */
   computeProjectedActiveBalancesNoCpi(program, instructions2, banksMap, assetShareValueMultiplierByBank) {
-    const { projectedBalances, ...rest } = computeProjectedActiveBalancesNoCpi(
-      this.balances,
-      instructions2,
+    const { projectedBalances, ...rest } = computeProjectedActiveBalancesNoCpi({
+      account: this,
+      instructions: instructions2,
       program,
       banksMap,
       assetShareValueMultiplierByBank
-    );
+    });
     return {
       projectedBalances: projectedBalances.map(Balance.fromBalanceType),
       ...rest
@@ -69837,13 +69759,13 @@ function projectAccountAfterFirstLeg(account, firstLegFlashloanTxs, program, ban
     const luts = tx.addressLookupTables ?? [];
     ixs.push(...decompileV0Transaction(tx, luts).instructions);
   }
-  const { projectedBalances } = computeProjectedActiveBalancesNoCpi(
-    account.balances,
-    ixs,
+  const { projectedBalances } = computeProjectedActiveBalancesNoCpi({
+    account,
+    instructions: ixs,
     program,
     banksMap,
-    multipliers
-  );
+    assetShareValueMultiplierByBank: multipliers
+  });
   return new MarginfiAccount(
     account.address,
     account.group,
@@ -70203,7 +70125,7 @@ async function buildInnerIxs(ctx, positions, isSync) {
   const borrowIxs = [];
   const repayIxs = [];
   for (const position of collateral) {
-    const observationBanksOverride = ctx.groupRateLimiterEnabled ? computeHealthAccountMetas([], true, [position.bank]) : [];
+    const observationBanksOverride = ctx.groupRateLimiterEnabled ? computeHealthAccountMetas({ banksToInclude: [], trailingBanks: [position.bank] }) : [];
     const legs = await buildCollateralLegIxs(ctx, position, isSync, observationBanksOverride);
     withdrawIxs.push(...legs.withdrawIxs);
     depositIxs.push(...legs.depositIxs);
@@ -70224,7 +70146,7 @@ async function buildInnerIxs(ctx, positions, isSync) {
       ...collateralBanks,
       ...borrowedSoFar
     ]);
-    const observationBanksOverride = computeHealthAccountMetas(activeBanks);
+    const observationBanksOverride = computeHealthAccountMetas({ banksToInclude: activeBanks });
     const borrowUi = position.uiAmount.times(1 + ctx.borrowPaddingBps / 1e4);
     const borrow = await makeBorrowIx3({
       program: ctx.program,
@@ -70393,15 +70315,8 @@ async function makeTransferPositionsTx(params) {
       )
     );
   }
-  const destinationOnlyBalances = accountB.balances.filter(
-    (b) => b.active && !accountA.balances.some((a) => a.active && a.bankPk.equals(b.bankPk))
-  );
-  const crankBalanceView = {
-    ...accountA,
-    balances: [...accountA.balances, ...destinationOnlyBalances]
-  };
-  const { instructions: updateFeedIxs, luts: feedLuts } = await makeSmartCrankSwbFeedIx({
-    marginfiAccount: crankBalanceView,
+  const { instructions: updateFeedIxs, luts: feedLuts } = await makeSmartCrankSwbFeedIxForAccounts({
+    marginfiAccounts: [accountA, accountB],
     bankMap,
     oraclePrices,
     assetShareValueMultiplierByBank,
@@ -70431,34 +70346,6 @@ async function makeTransferPositionsTx(params) {
   };
 }
 var BULK_TX_SIZE_MARGIN = 128;
-function computeV0TxSizeSafe(ixs, payer, luts) {
-  try {
-    return computeV0TxSize(ixs, payer, luts);
-  } catch {
-    return { size: Number.MAX_SAFE_INTEGER, accountCount: Number.MAX_SAFE_INTEGER };
-  }
-}
-function fitsInTx(ixs, payer, luts) {
-  const { size, accountCount } = computeV0TxSizeSafe(ixs, payer, luts);
-  return size <= MAX_TX_SIZE - BULK_TX_SIZE_MARGIN && accountCount <= MAX_ACCOUNT_LOCKS;
-}
-function buildTxRefreshIxs(args) {
-  const { marginfiAccount, bankMap, bankMetadataMap, txBanks } = args;
-  const ixs = [];
-  const kaminoPks = txBanks.filter((b) => b.config.assetTag === 3 /* KAMINO */).map((b) => b.address);
-  if (kaminoPks.length > 0) {
-    ixs.push(
-      ...makeRefreshKaminoBanksIxs(marginfiAccount, bankMap, kaminoPks, bankMetadataMap).instructions
-    );
-  }
-  const jupPksInTx = txBanks.filter((b) => b.config.assetTag === 6 /* JUPLEND */).map((b) => b.address);
-  if (jupPksInTx.length > 0) {
-    ixs.push(
-      ...makeUpdateJupLendRateIxs(marginfiAccount, bankMap, jupPksInTx, bankMetadataMap).instructions
-    );
-  }
-  return ixs;
-}
 async function makeBulkWithdrawTx(params) {
   const {
     program,
@@ -70470,14 +70357,19 @@ async function makeBulkWithdrawTx(params) {
     oraclePrices,
     assetShareValueMultiplierByBank,
     tokenProgramsByBank,
-    overrideInferAccounts
+    overrideInferAccounts,
+    luts
   } = params;
-  const luts = params.addressLookupTableAccounts ?? [];
-  const groupRateLimiterEnabled = params.groupRateLimiterEnabled ?? false;
   const authority = marginfiAccount.authority;
   if (bankAddresses.length === 0) throw new Error("no banks to withdraw");
   const activeBalances = marginfiAccount.balances.filter((b) => b.active);
-  const legs = [];
+  const involvedBanks = [
+    ...bankAddresses.map((pk2) => requireBank(bankMap, pk2)),
+    ...activeBalances.flatMap((b) => bankMap.get(b.bankPk.toBase58()) ?? [])
+  ];
+  const selectedLuts = selectLutsForBanks(luts, involvedBanks);
+  const withdrawIxs = [];
+  const setupTokens = [];
   const withdrawnSoFar = [];
   for (const bankAddress of bankAddresses) {
     const bank = requireBank(bankMap, bankAddress);
@@ -70486,15 +70378,15 @@ async function makeBulkWithdrawTx(params) {
     if (!balance || !balance.assetShares.gt(0)) {
       throw new Error(`no active deposit for bank ${bankAddress.toBase58()}`);
     }
-    const multiplier = assetShareValueMultiplierByBank.get(bankAddress.toBase58());
-    const uiAmount = computeQuantityUi(balance, bank, multiplier).assets;
-    const packBanks = computeHealthCheckAccounts(
-      marginfiAccount.balances,
-      bankMap,
-      [],
-      [...withdrawnSoFar, bankAddress]
-    );
-    const observationBanksOverride = computeHealthAccountMetas(packBanks, true, [bank]);
+    const packBanks = computeHealthCheckAccounts({
+      account: marginfiAccount,
+      banksMap: bankMap,
+      excludedBanks: [...withdrawnSoFar, bankAddress]
+    });
+    const observationBanksOverride = computeHealthAccountMetas({
+      banksToInclude: packBanks,
+      trailingBanks: [bank]
+    });
     const shared = {
       program,
       bank,
@@ -70503,11 +70395,14 @@ async function makeBulkWithdrawTx(params) {
       marginfiAccount,
       authority,
       bankMetadataMap,
+      // every venue's withdraw ix ignores the amount when the withdraw-all flag is
+      // set and derives the full position on-chain, so all legs pass amount 0
       withdrawAll: true,
       opts: {
         createAtas: false,
         // ATAs are created in the prelude txs
-        wrapAndUnwrapSol: true,
+        wrapAndUnwrapSol: false,
+        // one unwrap ix is appended after the last withdraw
         overrideInferAccounts,
         observationBanksOverride
       }
@@ -70521,7 +70416,7 @@ async function makeBulkWithdrawTx(params) {
         }
         const withdraw = await makeKaminoWithdrawIx3({
           ...shared,
-          cTokenAmount: uiAmount.div(multiplier ?? new BigNumber3.BigNumber(1)),
+          cTokenAmount: 0,
           reserve
         });
         instructions2 = withdraw.instructions;
@@ -70534,7 +70429,7 @@ async function makeBulkWithdrawTx(params) {
         }
         const withdraw = await makeJuplendWithdrawIx2({
           ...shared,
-          amount: uiAmount,
+          amount: 0,
           jupLendingState
         });
         instructions2 = withdraw.instructions;
@@ -70547,7 +70442,7 @@ async function makeBulkWithdrawTx(params) {
         }
         const withdraw = await makeDriftWithdrawIx3({
           ...shared,
-          amount: uiAmount,
+          amount: 0,
           driftSpotMarket: driftState.spotMarketState,
           userRewards: driftState.userRewards
         });
@@ -70557,76 +70452,49 @@ async function makeBulkWithdrawTx(params) {
       default: {
         const withdraw = await makeWithdrawIx3({
           ...shared,
-          amount: uiAmount
+          amount: 0
         });
         instructions2 = withdraw.instructions;
         break;
       }
     }
-    legs.push({ bank, instructions: instructions2 });
+    withdrawIxs.push(...instructions2);
+    setupTokens.push({ mint: bank.mint, tokenProgram });
     withdrawnSoFar.push(bankAddress);
   }
-  const bundles = [];
-  let current = [];
-  const assembleTxIxs = (bundle) => [
-    ...buildTxRefreshIxs({
-      marginfiAccount,
-      bankMap,
-      bankMetadataMap,
-      txBanks: bundle.map((l) => l.bank)
-    }),
-    ...bundle.flatMap((l) => l.instructions)
-  ];
-  for (const leg of legs) {
-    const candidate = [...current, leg];
-    if (current.length > 0 && !fitsInTx(assembleTxIxs(candidate), authority, luts)) {
-      bundles.push(current);
-      current = [leg];
-    } else {
-      current = candidate;
-    }
-  }
-  if (current.length > 0) bundles.push(current);
-  for (const bundle of bundles) {
-    const ixs = assembleTxIxs(bundle);
-    if (bundle.length === 1 && !fitsInTx(ixs, authority, luts)) {
-      throw new Error(
-        `withdraw for bank ${bundle[0].bank.address.toBase58()} does not fit one transaction`
-      );
-    }
+  if (setupTokens.some((t) => t.mint.equals(NATIVE_MINT))) {
+    withdrawIxs.push(makeUnwrapSolIx(authority));
   }
   const { blockhash } = await connection.getLatestBlockhash("confirmed");
-  const withdrawTxs = bundles.map((bundle) => {
-    const message = new web3_js.TransactionMessage({
-      payerKey: authority,
-      recentBlockhash: blockhash,
-      instructions: assembleTxIxs(bundle)
-    }).compileToV0Message(luts);
-    return addTransactionMetadata(new web3_js.VersionedTransaction(message), {
-      addressLookupTables: luts,
+  const withdrawTxs = splitInstructionsToFitTransactions([], withdrawIxs, {
+    blockhash,
+    payerKey: authority,
+    luts: selectedLuts,
+    sizeMargin: BULK_TX_SIZE_MARGIN,
+    maxAccountLocks: MAX_ACCOUNT_LOCKS
+  }).map(
+    (tx) => addTransactionMetadata(tx, {
+      addressLookupTables: selectedLuts,
       type: "WITHDRAW" /* WITHDRAW */
-    });
-  });
+    })
+  );
   const additionalTxs = [];
   const setupIxs = await makeSetupIx({
     connection,
     authority,
-    tokens: legs.map((l) => ({
-      mint: l.bank.mint,
-      tokenProgram: requireTokenProgram(tokenProgramsByBank, l.bank.address)
-    }))
+    tokens: setupTokens
   });
   if (setupIxs.length > 0) {
     const setupTxs = splitInstructionsToFitTransactions([], setupIxs, {
       blockhash,
       payerKey: authority,
-      luts
+      luts: selectedLuts
     });
     additionalTxs.push(
       ...setupTxs.map(
         (tx) => addTransactionMetadata(tx, {
           type: "CREATE_ATA" /* CREATE_ATA */,
-          addressLookupTables: luts
+          addressLookupTables: selectedLuts
         })
       )
     );
@@ -70636,11 +70504,10 @@ async function makeBulkWithdrawTx(params) {
     bankMap,
     oraclePrices,
     assetShareValueMultiplierByBank,
-    instructions: legs.flatMap((l) => l.instructions),
+    instructions: withdrawIxs,
     program,
     connection,
-    crossbarUrl: params.crossbarUrl,
-    groupRateLimiterEnabled
+    crossbarUrl: params.crossbarUrl
   });
   if (crankIxs.length > 0) {
     const message = new web3_js.TransactionMessage({
@@ -70655,6 +70522,27 @@ async function makeBulkWithdrawTx(params) {
       })
     );
   }
+  const refreshIxs = makeRefreshIntegrationBanksIxs(
+    marginfiAccount,
+    bankMap,
+    bankAddresses,
+    bankMetadataMap
+  ).instructions;
+  if (refreshIxs.length > 0) {
+    const refreshTxs = splitInstructionsToFitTransactions([], refreshIxs, {
+      blockhash,
+      payerKey: authority,
+      luts: selectedLuts
+    });
+    additionalTxs.push(
+      ...refreshTxs.map(
+        (tx) => addTransactionMetadata(tx, {
+          type: "CRANK" /* CRANK */,
+          addressLookupTables: selectedLuts
+        })
+      )
+    );
+  }
   return {
     transactions: [...additionalTxs, ...withdrawTxs],
     actionTxIndex: additionalTxs.length
@@ -70674,7 +70562,7 @@ async function makeBulkRepayTx(params) {
   const authority = marginfiAccount.authority;
   if (bankAddresses.length === 0) throw new Error("no banks to repay");
   const activeBalances = marginfiAccount.balances.filter((b) => b.active);
-  const legs = [];
+  const repayIxs = [];
   for (const bankAddress of bankAddresses) {
     const bank = requireBank(bankMap, bankAddress);
     const tokenProgram = requireTokenProgram(tokenProgramsByBank, bankAddress);
@@ -70696,33 +70584,21 @@ async function makeBulkRepayTx(params) {
         overrideInferAccounts
       }
     });
-    legs.push({ bank, instructions: repay.instructions });
-  }
-  const bundles = [];
-  let current = [];
-  for (const leg of legs) {
-    const candidate = [...current, leg];
-    const candidateIxs = candidate.flatMap((l) => l.instructions);
-    if (current.length > 0 && !fitsInTx(candidateIxs, authority, luts)) {
-      bundles.push(current);
-      current = [leg];
-    } else {
-      current = candidate;
-    }
+    repayIxs.push(...repay.instructions);
   }
-  if (current.length > 0) bundles.push(current);
   const { blockhash } = await connection.getLatestBlockhash("confirmed");
-  const transactions = bundles.map((bundle) => {
-    const message = new web3_js.TransactionMessage({
-      payerKey: authority,
-      recentBlockhash: blockhash,
-      instructions: bundle.flatMap((l) => l.instructions)
-    }).compileToV0Message(luts);
-    return addTransactionMetadata(new web3_js.VersionedTransaction(message), {
+  const transactions = splitInstructionsToFitTransactions([], repayIxs, {
+    blockhash,
+    payerKey: authority,
+    luts,
+    sizeMargin: BULK_TX_SIZE_MARGIN,
+    maxAccountLocks: MAX_ACCOUNT_LOCKS
+  }).map(
+    (tx) => addTransactionMetadata(tx, {
       addressLookupTables: luts,
       type: "REPAY" /* REPAY */
-    });
-  });
+    })
+  );
   return { transactions, actionTxIndex: 0 };
 }
 
@@ -70861,9 +70737,8 @@ async function simulateAccountHealthCache(params) {
   );
   const healthPulseIxs = await makePulseHealthIx2(
     program,
-    marginfiAccount.address,
+    marginfiAccount,
     banksMap,
-    marginfiAccount.balances,
     activeBalances.map((b) => b.bankPk),
     []
   );
@@ -71051,9 +70926,8 @@ async function getHealthSimulationTransactions({
   );
   const healthPulseIx = await makePulseHealthIx2(
     program,
-    marginfiAccount.address,
+    marginfiAccount,
     bankMap,
-    marginfiAccount.balances,
     mandatoryBanks,
     excludedBanks
   );
@@ -71514,13 +71388,13 @@ async function computeSmartCrank({
   assetShareValueMultiplierByBank,
   groupRateLimiterEnabled = false
 }) {
-  const { projectedBalances, withdrawnBanks } = computeProjectedActiveBalancesNoCpi(
-    marginfiAccount.balances,
-    instructions2,
+  const { projectedBalances, withdrawnBanks } = computeProjectedActiveBalancesNoCpi({
+    account: marginfiAccount,
+    instructions: instructions2,
     program,
-    bankMap,
+    banksMap: bankMap,
     assetShareValueMultiplierByBank
-  );
+  });
   const isSwitchboard = (bank) => getOracleSourceFromBank(bank).key === "switchboard";
   const rateLimitBanks = groupRateLimiterEnabled ? withdrawnBanks.map((pk2) => bankMap.get(pk2)).filter((bank) => bank !== void 0).filter(isSwitchboard) : [];
   let rateLimitOracles = [];
@@ -71828,6 +71702,55 @@ async function makeSmartCrankSwbFeedIx(params) {
   });
   return { instructions: instructions2, luts };
 }
+async function makeSmartCrankSwbFeedIxForAccounts(params) {
+  const crankResults = await Promise.all(
+    params.marginfiAccounts.map(
+      (marginfiAccount) => computeSmartCrank({ ...params, marginfiAccount })
+    )
+  );
+  const uncrankableLiabilities = crankResults.flatMap((r) => r.uncrankableLiabilities);
+  const uncrankableAssets = crankResults.flatMap((r) => r.uncrankableAssets);
+  if (uncrankableLiabilities.length > 0) {
+    console.log(
+      "Uncrankable liability details:",
+      uncrankableLiabilities.map((l) => ({
+        symbol: l.bank.tokenSymbol,
+        reason: l.reason
+      }))
+    );
+  }
+  if (uncrankableAssets.length > 0) {
+    console.log(
+      "Uncrankable asset details:",
+      uncrankableAssets.map((a) => ({
+        symbol: a.bank.tokenSymbol,
+        reason: a.reason
+      }))
+    );
+  }
+  if (crankResults.some((r) => !r.isCrankable)) {
+    throw TransactionBuildingError.oracleCrankFailed(
+      uncrankableLiabilities.map((liability) => ({
+        bankAddress: liability.bank.address.toBase58(),
+        mint: liability.bank.mint.toBase58(),
+        symbol: liability.bank.tokenSymbol,
+        reason: liability.reason
+      })),
+      uncrankableAssets.map((asset) => ({
+        bankAddress: asset.bank.address.toBase58(),
+        mint: asset.bank.mint.toBase58(),
+        symbol: asset.bank.tokenSymbol,
+        reason: asset.reason
+      }))
+    );
+  }
+  return makeUpdateSwbFeedIx({
+    swbPullOracles: crankResults.flatMap((r) => r.requiredOracles),
+    feePayer: params.marginfiAccounts[0].authority,
+    connection: params.connection,
+    crossbarUrl: params.crossbarUrl
+  });
+}
 var DEFAULT_CROSSBAR_URL = "https://crossbar.0.xyz";
 var DEFAULT_FALLBACK_CROSSBAR_URL = "https://crossbar.switchboard.xyz";
 async function makeCrankSwbFeedIx(marginfiAccount, bankMap, newBanksPk, provider, crossbarUrl) {
@@ -71998,6 +71921,36 @@ function makeUpdateJupLendRateIxs(marginfiAccount, bankMap, banksToExclude, bank
     keys: []
   };
 }
+
+// src/services/price/actions/refresh-integration-banks.ts
+function makeRefreshIntegrationBanksIxs(marginfiAccount, bankMap, banksToExclude, bankMetadataMap, kaminoNewBanksPk = banksToExclude) {
+  const kaminoRefreshIxs = makeRefreshKaminoBanksIxs(
+    marginfiAccount,
+    bankMap,
+    kaminoNewBanksPk,
+    bankMetadataMap
+  );
+  const updateDriftMarketIxs = makeUpdateDriftMarketIxs(
+    marginfiAccount,
+    bankMap,
+    banksToExclude,
+    bankMetadataMap
+  );
+  const updateJupLendRateIxs = makeUpdateJupLendRateIxs(
+    marginfiAccount,
+    bankMap,
+    banksToExclude,
+    bankMetadataMap
+  );
+  return {
+    instructions: [
+      ...kaminoRefreshIxs.instructions,
+      ...updateDriftMarketIxs.instructions,
+      ...updateJupLendRateIxs.instructions
+    ],
+    keys: [...kaminoRefreshIxs.keys, ...updateDriftMarketIxs.keys, ...updateJupLendRateIxs.keys]
+  };
+}
 function bankMetadataMapToDto(bankMetadataMap) {
   return Object.fromEntries(
     Object.entries(bankMetadataMap).map(([bankPk, bankMetadata]) => [
@@ -76403,6 +76356,7 @@ exports.makePriorityFeeMicroIx = makePriorityFeeMicroIx;
 exports.makePulseHealthIx = makePulseHealthIx2;
 exports.makeRedeemStakedLstIx = makeRedeemStakedLstIx;
 exports.makeRedeemStakedLstTx = makeRedeemStakedLstTx;
+exports.makeRefreshIntegrationBanksIxs = makeRefreshIntegrationBanksIxs;
 exports.makeRefreshKaminoBanksIxs = makeRefreshKaminoBanksIxs;
 exports.makeRepayIx = makeRepayIx3;
 exports.makeRepayTx = makeRepayTx;
@@ -76410,6 +76364,7 @@ exports.makeRepayWithCollatTx = makeRepayWithCollatTx;
 exports.makeRollPtTx = makeRollPtTx;
 exports.makeSetupIx = makeSetupIx;
 exports.makeSmartCrankSwbFeedIx = makeSmartCrankSwbFeedIx;
+exports.makeSmartCrankSwbFeedIxForAccounts = makeSmartCrankSwbFeedIxForAccounts;
 exports.makeSwapCollateralTx = makeSwapCollateralTx;
 exports.makeSwapDebtTx = makeSwapDebtTx;
 exports.makeTransferPositionsTx = makeTransferPositionsTx;