@0dotxyz/p0-ts-sdk 2.10.0 → 2.11.0

package/dist/index.cjs

@@ -216,6 +216,7 @@ var TransactionBuildingErrorCode = /* @__PURE__ */ ((TransactionBuildingErrorCod
   TransactionBuildingErrorCode2["BRIDGE_CONFLICT"] = "BRIDGE_CONFLICT";
   TransactionBuildingErrorCode2["ORDER_INVALID_TRIGGER"] = "ORDER_INVALID_TRIGGER";
   TransactionBuildingErrorCode2["ORDER_INVALID_SLIPPAGE"] = "ORDER_INVALID_SLIPPAGE";
+  TransactionBuildingErrorCode2["ORDER_CLOSES_DONT_FIT"] = "ORDER_CLOSES_DONT_FIT";
   TransactionBuildingErrorCode2["COSTLY_POSITION_LIMIT_EXCEEDED"] = "COSTLY_POSITION_LIMIT_EXCEEDED";
   TransactionBuildingErrorCode2["ACCOUNT_DISABLED"] = "ACCOUNT_DISABLED";
   return TransactionBuildingErrorCode2;
@@ -384,6 +385,19 @@ var TransactionBuildingError = class _TransactionBuildingError extends Error {
       { maxSlippagePercent, maxAllowedPercent }
     );
   }
+  /**
+   * Closing the orders an action touches doesn't fit in one transaction: next to the action, or in
+   * the one order transaction after a multi-transaction action. Builders throw rather than leave the
+   * closes out, since an order on a changed position can still fire: close the orders on their own
+   * first, then retry the action.
+   */
+  static orderClosesDontFit(orderAddresses) {
+    return new _TransactionBuildingError(
+      "ORDER_CLOSES_DONT_FIT" /* ORDER_CLOSES_DONT_FIT */,
+      `Closing ${orderAddresses.length} order(s) doesn't fit in one transaction`,
+      { orderAddresses }
+    );
+  }
   /**
    * The marginfi account is disabled (e.g. already transferred to a new account), so it can't act.
    */
@@ -76840,18 +76854,12 @@ function computeHealthComponentsFromBalances(params) {
   let totalLiabilities = new BigNumber3__default.default(0);
   for (const accountBalance of filteredBalances) {
     const bankKey = accountBalance.bankPk.toBase58();
-    const bank = banksMap.get(bankKey);
-    if (!bank) {
-      console.warn(
-        `Bank ${shortenAddress(accountBalance.bankPk)} not found, excluding from health computation`
-      );
-      continue;
-    }
+    const bank = requireBank(banksMap, accountBalance.bankPk);
     const oraclePrice = oraclePricesByBank.get(bankKey);
     if (!oraclePrice) {
-      console.warn(
-        `Price info for bank ${shortenAddress(accountBalance.bankPk)} not found, excluding from health computation`
-      );
+      if (accountBalance.liabilityShares.gt(0)) {
+        throw Error(`Oracle price for ${bankKey} not found`);
+      }
       continue;
     }
     const emodeWeight = activeEmodeWeightsByBank?.get(bankKey);
@@ -77060,7 +77068,7 @@ function computeLiquidationPriceForBank(params) {
   const { bank, oraclePrice, marginfiAccount, assetShareValueMultiplier, activeEmodeWeights } = params;
   const balance = getBalance(bank.address, marginfiAccount.balances);
   if (!balance.active) return null;
-  const { assets: assetBank, liabilities: liabilitiesBank } = computeBalanceUsdValue({
+  const { assets: assetBank, liabilities: liabilitiesBank } = getBalanceUsdValueWithPriceBias({
     balance,
     bank,
     oraclePrice,
@@ -77074,7 +77082,8 @@ function computeLiquidationPriceForBank(params) {
   const isLending = balance.liabilityShares.isZero();
   const { assets: assetQuantityUi, liabilities: liabQuantitiesUi } = computeQuantityUi(
     balance,
-    bank
+    bank,
+    assetShareValueMultiplier
   );
   let liquidationPrice;
   if (isLending) {
@@ -77180,6 +77189,8 @@ function computeBankRiskAccountKeys(bank) {
     } else if (bank.stakedOracleUsesOnramp && bank.stakedIntegrationAccounts && !bank.stakedIntegrationAccounts.validatorVoteAccount.equals(web3_js.PublicKey.default)) {
       const pool = findPoolAddress(bank.stakedIntegrationAccounts.validatorVoteAccount);
       keys.push(findPoolOnRampAddress(pool));
+    } else {
+      keys.push(web3_js.PublicKey.default);
     }
   }
   return keys;
@@ -78218,7 +78229,6 @@ function createJupiterClient(config = {}) {
 // src/services/account/utils/swap.utils.ts
 function resolvePinnedSwapRoute(swapIxs, expectedInAmountNative) {
   const { quoteResponse } = swapIxs;
-  const expectedIn = new BN8__default.default(expectedInAmountNative);
   let minOut;
   try {
     minOut = new BN8__default.default(quoteResponse.otherAmountThreshold);
@@ -78231,15 +78241,15 @@ function resolvePinnedSwapRoute(swapIxs, expectedInAmountNative) {
     );
   }
   const pinnedIn = new BN8__default.default(quoteResponse.inAmount);
-  if (!pinnedIn.eq(expectedIn)) {
+  if (expectedInAmountNative !== void 0 && !pinnedIn.eq(new BN8__default.default(expectedInAmountNative))) {
     throw new Error(
-      `Pinned swap route (swapOpts.swapIxs) was quoted for a different input amount than the flow will swap: quote inAmount=${pinnedIn.toString()}, flow swap input=${expectedIn.toString()} (native units). Re-quote the pinned route for the exact flow amount.`
+      `Pinned swap route (swapOpts.swapIxs) was quoted for a different input amount than the flow will swap: quote inAmount=${pinnedIn.toString()}, flow swap input=${expectedInAmountNative.toString()} (native units). Re-quote the pinned route for the exact flow amount.`
     );
   }
   return {
     swapInstructions: swapIxs.instructions,
     setupInstructions: [],
-    lookupTables: swapIxs.lookupTables,
+    swapLuts: swapIxs.lookupTables,
     quoteResponse,
     outputAmountNative: minOut
   };
@@ -78353,7 +78363,7 @@ var getSwapIxsForFlashloan = async (params) => {
     return {
       swapInstructions: pinned.swapInstructions,
       setupInstructions: pinned.setupInstructions,
-      addressLookupTableAddresses: pinned.lookupTables,
+      addressLookupTableAddresses: pinned.swapLuts,
       quoteResponse: pinned.quoteResponse
     };
   }
@@ -78551,17 +78561,8 @@ var getJupiterSwapIxsForFlashloan = async ({
     quoteResponse: mapJupiterQuoteToSwapQuoteResult(swapQuote)
   };
 };
-
-// src/services/account/utils/misc.utils.ts
-function floor(value, decimals) {
-  return Math.floor(value * 10 ** decimals) / 10 ** decimals;
-}
-function ceil(value, decimals) {
-  return Math.ceil(value * 10 ** decimals) / 10 ** decimals;
-}
 function computeClosePositionTokenAmount(position, mintDecimals) {
-  const closePositionTokenAmount = position.isLending ? floor(position.amount, mintDecimals) : ceil(position.amount, mintDecimals);
-  return closePositionTokenAmount;
+  return new BigNumber3.BigNumber(position.amount).decimalPlaces(mintDecimals, position.isLending ? BigNumber3.BigNumber.ROUND_FLOOR : BigNumber3.BigNumber.ROUND_CEIL).toNumber();
 }
 function isWholePosition(position, amount, mintDecimals) {
   const closePositionTokenAmount = computeClosePositionTokenAmount(position, mintDecimals);
@@ -78587,6 +78588,162 @@ function exceedsCostlyPositionLimit(balances, bankMap, bank) {
   }).length;
   return held >= MAX_COSTLY_POSITIONS;
 }
+function buildOrderTrigger(params) {
+  const { stopLossUsd, takeProfitUsd } = params;
+  const maxSlippage = percentToMaxSlippageU32(params.maxSlippagePercent);
+  const invalidTrigger = (reason) => TransactionBuildingError.orderInvalidTrigger(
+    reason,
+    takeProfitUsd?.toString(),
+    stopLossUsd?.toString()
+  );
+  if (stopLossUsd && !stopLossUsd.gt(0)) {
+    throw invalidTrigger(`stop-loss threshold (${stopLossUsd}) must be above 0`);
+  }
+  if (takeProfitUsd && !takeProfitUsd.gt(0)) {
+    throw invalidTrigger(`take-profit threshold (${takeProfitUsd}) must be above 0`);
+  }
+  if (stopLossUsd && takeProfitUsd) {
+    if (takeProfitUsd.lte(stopLossUsd)) {
+      throw invalidTrigger(
+        `take-profit threshold (${takeProfitUsd}) must be above stop-loss threshold (${stopLossUsd})`
+      );
+    }
+    return {
+      both: {
+        stopLoss: bigNumberToWrappedI80F48(stopLossUsd),
+        takeProfit: bigNumberToWrappedI80F48(takeProfitUsd),
+        maxSlippage
+      }
+    };
+  }
+  if (stopLossUsd) {
+    return { stopLoss: { threshold: bigNumberToWrappedI80F48(stopLossUsd), maxSlippage } };
+  }
+  if (takeProfitUsd) {
+    return { takeProfit: { threshold: bigNumberToWrappedI80F48(takeProfitUsd), maxSlippage } };
+  }
+  throw invalidTrigger("an order needs a stop-loss threshold, a take-profit threshold, or both");
+}
+async function makePlaceOrderIx2(params) {
+  const { program, marginfiAccount, collateralBank, debtBank, trigger, feePayer } = params;
+  const [order] = deriveOrderPda(program.programId, marginfiAccount.address, [
+    collateralBank,
+    debtBank
+  ]);
+  const globalFeeWallet = params.globalFeeWallet ?? (await program.account.feeState.fetch(deriveFeeState(program.programId)[0])).globalFeeWallet;
+  const placeOrderIx = await instructions_default3.makePlaceOrderIx(
+    program,
+    {
+      marginfiAccount: marginfiAccount.address,
+      feePayer: feePayer ?? marginfiAccount.authority,
+      authority: marginfiAccount.authority,
+      order,
+      globalFeeWallet,
+      group: marginfiAccount.group
+    },
+    { bankKeys: [collateralBank, debtBank], trigger: buildOrderTrigger(trigger) }
+  );
+  return { instructions: [placeOrderIx], keys: [] };
+}
+async function makeCloseOrderIx2(params) {
+  const { program, marginfiAccount, order, feeRecipient } = params;
+  const closeOrderIx = await instructions_default3.makeCloseOrderIx(program, {
+    marginfiAccount: marginfiAccount.address,
+    authority: marginfiAccount.authority,
+    order,
+    feeRecipient: feeRecipient ?? marginfiAccount.authority,
+    group: marginfiAccount.group
+  });
+  return { instructions: [closeOrderIx], keys: [] };
+}
+async function compileOrderTx(params, payerKey, ixs, type) {
+  const blockhash = params.blockhash ?? (await params.connection.getLatestBlockhashAndContext("confirmed")).value.blockhash;
+  return addTransactionMetadata(
+    new web3_js.VersionedTransaction(
+      new web3_js.TransactionMessage({
+        instructions: ixs.flatMap((ix) => ix.instructions),
+        payerKey,
+        recentBlockhash: blockhash
+      }).compileToV0Message(params.luts)
+    ),
+    { type, signers: ixs.flatMap((ix) => ix.keys), addressLookupTables: params.luts }
+  );
+}
+async function makePlaceOrderTx(params) {
+  const placeIxs = await makePlaceOrderIx2(params);
+  const payerKey = params.feePayer ?? params.marginfiAccount.authority;
+  return compileOrderTx(params, payerKey, [placeIxs], "PLACE_ORDER" /* PLACE_ORDER */);
+}
+async function makeCloseOrderTx(params) {
+  const closeIxs = await makeCloseOrderIx2(params);
+  return compileOrderTx(
+    params,
+    params.marginfiAccount.authority,
+    [closeIxs],
+    "CLOSE_ORDER" /* CLOSE_ORDER */
+  );
+}
+async function makeUpdateOrderTx(params) {
+  const [order] = deriveOrderPda(params.program.programId, params.marginfiAccount.address, [
+    params.collateralBank,
+    params.debtBank
+  ]);
+  const closeIxs = await makeCloseOrderIx2({ ...params, order, feeRecipient: params.feePayer });
+  const placeIxs = await makePlaceOrderIx2(params);
+  const payerKey = params.feePayer ?? params.marginfiAccount.authority;
+  return compileOrderTx(params, payerKey, [closeIxs, placeIxs], "UPDATE_ORDER" /* UPDATE_ORDER */);
+}
+var SEND_PIPELINE_MARGINS = {
+  sizeMargin: PRIORITY_TX_SIZE + BUNDLE_TX_SIZE,
+  maxAccountLocks: MAX_ACCOUNT_LOCKS - 3
+};
+async function makeOrderChangesIxs(params) {
+  const { program, marginfiAccount, ordersToClose = [], placeOrder } = params;
+  const wrappers = await Promise.all([
+    ...ordersToClose.map((order) => makeCloseOrderIx2({ program, marginfiAccount, order })),
+    ...placeOrder ? [makePlaceOrderIx2({ ...placeOrder, program, marginfiAccount })] : []
+  ]);
+  return wrappers.flatMap((wrapper) => wrapper.instructions);
+}
+async function prependOrderCloses(params, actionIxs, luts) {
+  const { program, marginfiAccount, ordersToClose = [] } = params;
+  if (ordersToClose.length === 0) return actionIxs;
+  const closeIxs = await makeOrderChangesIxs({ program, marginfiAccount, ordersToClose });
+  const withCloses = [...closeIxs, ...actionIxs];
+  if (!fitsInOneTransaction(withCloses, {
+    payerKey: params.authority,
+    luts,
+    ...SEND_PIPELINE_MARGINS
+  })) {
+    throw TransactionBuildingError.orderClosesDontFit(
+      ordersToClose.map((order) => order.toBase58())
+    );
+  }
+  return withCloses;
+}
+async function makeOrderChangesTx(params) {
+  const { program, marginfiAccount, ordersToClose = [], placeOrder, luts } = params;
+  const ixs = await makeOrderChangesIxs(params);
+  if (ixs.length === 0) return void 0;
+  if (!fitsInOneTransaction(ixs, {
+    payerKey: marginfiAccount.authority,
+    luts,
+    ...SEND_PIPELINE_MARGINS
+  })) {
+    throw TransactionBuildingError.orderClosesDontFit(
+      ordersToClose.map((order) => order.toBase58())
+    );
+  }
+  let type = "CLOSE_ORDER" /* CLOSE_ORDER */;
+  if (placeOrder) {
+    const [placedOrder] = deriveOrderPda(program.programId, marginfiAccount.address, [
+      placeOrder.collateralBank,
+      placeOrder.debtBank
+    ]);
+    type = ordersToClose.some((order) => order.equals(placedOrder)) ? "UPDATE_ORDER" /* UPDATE_ORDER */ : "PLACE_ORDER" /* PLACE_ORDER */;
+  }
+  return compileOrderTx(params, marginfiAccount.authority, [{ instructions: ixs, keys: [] }], type);
+}
 var KAMINO_PROGRAM_ID = new web3_js.PublicKey("KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD");
 var FARMS_PROGRAM_ID2 = new web3_js.PublicKey("FarmsPZpWu9i7Kky8tPN37rs2TpmMrAZrC7S7vJa91Hr");
 function encodeU642(value) {
@@ -79310,13 +79467,18 @@ async function makeBorrowTx(params) {
     params.bankMetadataMap
   );
   const borrowIxs = await makeBorrowIx3(borrowIxParams);
+  const ixs = await prependOrderCloses(
+    params,
+    [...refreshIntegrationIxs.instructions, ...borrowIxs.instructions],
+    selectedLuts
+  );
   const {
     value: { blockhash }
   } = await connection.getLatestBlockhashAndContext("confirmed");
   const borrowTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [...refreshIntegrationIxs.instructions, ...borrowIxs.instructions],
+        instructions: ixs,
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
@@ -79415,9 +79577,14 @@ async function makeDriftDepositTx(params) {
     amount,
     ...depositIxParams
   });
-  const { instructions: instructions2, luts: selectedLuts } = await appendPremiumRefresh(
+  const actionIxs = await prependOrderCloses(
     params,
     depositIxs.instructions,
+    selectLutsForBanks(luts, [params.bank])
+  );
+  const { instructions: instructions2, luts: selectedLuts } = await appendPremiumRefresh(
+    params,
+    actionIxs,
     [params.bank.address],
     []
   );
@@ -79558,9 +79725,14 @@ async function makeKaminoDepositTx(params) {
     amount,
     ...depositIxParams
   });
-  const { instructions: instructions2, luts: selectedLuts } = await appendPremiumRefresh(
+  const actionIxs = await prependOrderCloses(
     params,
     [...refreshIxs, ...depositIxs.instructions],
+    selectLutsForBanks(luts, [params.bank])
+  );
+  const { instructions: instructions2, luts: selectedLuts } = await appendPremiumRefresh(
+    params,
+    actionIxs,
     [params.bank.address],
     []
   );
@@ -79649,9 +79821,14 @@ async function makeDepositTx(params) {
     throw TransactionBuildingError.costlyPositionLimitExceeded(params.bank.address.toBase58());
   }
   const ixs = await makeDepositIx3(depositIxParams);
-  const { instructions: instructions2, luts: selectedLuts } = await appendPremiumRefresh(
+  const actionIxs = await prependOrderCloses(
     params,
     ixs.instructions,
+    selectLutsForBanks(luts, [params.bank])
+  );
+  const { instructions: instructions2, luts: selectedLuts } = await appendPremiumRefresh(
+    params,
+    actionIxs,
     [params.bank.address],
     []
   );
@@ -79741,9 +79918,14 @@ async function makeJuplendDepositTx(params) {
     amount,
     ...depositIxParams
   });
-  const { instructions: instructions2, luts: selectedLuts } = await appendPremiumRefresh(
+  const actionIxs = await prependOrderCloses(
     params,
     depositIxs.instructions,
+    selectLutsForBanks(luts, [params.bank])
+  );
+  const { instructions: instructions2, luts: selectedLuts } = await appendPremiumRefresh(
+    params,
+    actionIxs,
     [params.bank.address],
     []
   );
@@ -80519,13 +80701,18 @@ async function makeDriftWithdrawTx(params) {
     [withdrawIxParams.bank.address],
     params.bankMetadataMap
   );
+  const ixs = await prependOrderCloses(
+    params,
+    [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
+    selectedLuts
+  );
   const {
     value: { blockhash }
   } = await connection.getLatestBlockhashAndContext("confirmed");
   const withdrawTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
+        instructions: ixs,
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
@@ -80772,13 +80959,18 @@ async function makeWithdrawTx(params) {
     [withdrawIxParams.bank.address],
     params.bankMetadataMap
   );
+  const ixs = await prependOrderCloses(
+    params,
+    [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
+    selectedLuts
+  );
   const {
     value: { blockhash }
   } = await connection.getLatestBlockhashAndContext("confirmed");
   const withdrawTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
+        instructions: ixs,
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
@@ -80816,13 +81008,18 @@ async function makeKaminoWithdrawTx(params) {
     cTokenAmount: adjustedAmount,
     ...withdrawIxParams
   });
+  const ixs = await prependOrderCloses(
+    params,
+    [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
+    selectedLuts
+  );
   const {
     value: { blockhash }
   } = await connection.getLatestBlockhashAndContext("confirmed");
   const withdrawTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
+        instructions: ixs,
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
@@ -80946,13 +81143,18 @@ async function makeJuplendWithdrawTx(params) {
     [withdrawIxParams.bank.address],
     params.bankMetadataMap
   );
+  const ixs = await prependOrderCloses(
+    params,
+    [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
+    selectedLuts
+  );
   const {
     value: { blockhash }
   } = await connection.getLatestBlockhashAndContext("confirmed");
   const withdrawTx = addTransactionMetadata(
     new web3_js.VersionedTransaction(
       new web3_js.TransactionMessage({
-        instructions: [...refreshIntegrationIxs.instructions, ...withdrawIxs.instructions],
+        instructions: ixs,
         payerKey: params.authority,
         recentBlockhash: blockhash
       }).compileToV0Message(selectedLuts)
@@ -81022,10 +81224,15 @@ async function makeRepayIx3({
 async function makeRepayTx(params) {
   const { luts, ...repayIxParams } = params;
   const ixs = await makeRepayIx3(repayIxParams);
+  const actionIxs = await prependOrderCloses(
+    params,
+    ixs.instructions,
+    selectLutsForBanks(luts, [params.bank])
+  );
   const closedBanks = params.repayAll ? [params.bank.address] : [];
   const { instructions: instructions2, luts: selectedLuts } = await appendPremiumRefresh(
     params,
-    ixs.instructions,
+    actionIxs,
     [],
     closedBanks
   );
@@ -81092,12 +81299,18 @@ async function makeRepayWithCollatTx(params) {
     payerKey: marginfiAccount.authority,
     luts: addressLookupTableAccounts ?? []
   });
+  const orderTx = await makeOrderChangesTx({
+    ...params,
+    luts: addressLookupTableAccounts ?? [],
+    blockhash
+  });
   const transactions = [...additionalTxs, flashloanTx];
+  if (orderTx) transactions.push(orderTx);
   return {
     transactions,
     swapQuote,
     amountToRepay,
-    mustBeAtomicBundle: refreshIntegrationIxs.instructions.length > 0
+    mustBeAtomicBundle: transactions.length > 1
   };
 }
 async function buildRepayWithCollatFlashloanTx({
@@ -83593,7 +83806,8 @@ async function composeBridgedSwap(params) {
     banksMap,
     assetShareValueMultiplierByBank,
     feePayer,
-    maxBundleTxs = MAX_BRIDGED_BUNDLE_TXS
+    maxBundleTxs = MAX_BRIDGED_BUNDLE_TXS,
+    reservedTxs = 0
   } = params;
   if (!firstLeg.quoteResponse) return null;
   const projectedAccount = projectAccountAfterFirstLeg(
@@ -83610,7 +83824,7 @@ async function composeBridgedSwap(params) {
     secondLeg.transactions,
     feePayer,
     blockhashOf(firstLeg),
-    maxBundleTxs
+    maxBundleTxs - reservedTxs
   );
   if (!transactions) return null;
   return {
@@ -83672,12 +83886,18 @@ async function makeSwapDebtTx(params) {
       luts: addressLookupTableAccounts ?? []
     }
   );
+  const orderTx = await makeOrderChangesTx({
+    ...params,
+    luts: addressLookupTableAccounts ?? [],
+    blockhash
+  });
   const transactions = [...additionalTxs, flashloanTx];
+  if (orderTx) transactions.push(orderTx);
   return {
     transactions,
-    actionTxIndex: transactions.length - 1,
+    actionTxIndex: additionalTxs.length,
     quoteResponse: swapQuote,
-    mustBeAtomicBundle: refreshIntegrationIxs.instructions.length > 0
+    mustBeAtomicBundle: transactions.length > 1
   };
 }
 async function buildSwapDebtFlashloanTx({
@@ -83754,7 +83974,7 @@ async function buildSwapDebtFlashloanTx({
     opts: { wrapAndUnwrapSol: false, overrideInferAccounts }
   });
   const runEngine = swapEngineRunner ?? runSwapEngine;
-  const engineResult = await runEngine({
+  const engineResult = swapOpts.swapIxs ? resolvePinnedSwapRoute(swapOpts.swapIxs) : await runEngine({
     inputMint: borrowBank.mint.toBase58(),
     outputMint: repayBank.mint.toBase58(),
     amountNative: uiToNative(estimatedBorrowAmount, borrowBank.mintDecimals).toNumber(),
@@ -83780,7 +84000,8 @@ async function buildSwapDebtFlashloanTx({
   const quoteResponse = engineResult.quoteResponse;
   const outAmount = nativeToUi(quoteResponse.outAmount, repayBank.mintDecimals);
   const outAmountThreshold = nativeToUi(quoteResponse.otherAmountThreshold, repayBank.mintDecimals);
-  const amountToRepay = outAmount > totalPositionAmount ? totalPositionAmount : outAmountThreshold;
+  const repayAll = outAmount > totalPositionAmount;
+  const amountToRepay = repayAll ? totalPositionAmount : outAmountThreshold;
   const borrowAmount = nativeToUi(quoteResponse.inAmount, borrowBank.mintDecimals);
   const borrowIxs = await makeBorrowIx3({
     program,
@@ -83804,14 +84025,7 @@ async function buildSwapDebtFlashloanTx({
     amount: amountToRepay,
     accountAddress: marginfiAccount.address,
     authority: marginfiAccount.authority,
-    repayAll: isWholePosition(
-      {
-        amount: totalPositionAmount,
-        isLending: false
-      },
-      amountToRepay,
-      repayBank.mintDecimals
-    ),
+    repayAll,
     isSync: true,
     opts: {
       wrapAndUnwrapSol: false,
@@ -83884,6 +84098,10 @@ async function tryBridgedDebtSwap(params, bridgeOpts) {
     bridgeTokenSide: "borrow",
     bridgeCandidateMints: bridgeOpts?.bridgeCandidateMints
   });
+  const orderTx = await makeOrderChangesTx({
+    ...params,
+    luts: params.addressLookupTableAccounts ?? []
+  });
   const tokenProgramCache = new Map(bridgeOpts?.tokenProgramByMint);
   return tryBridgeCandidates({
     usableBridgeBanks,
@@ -83937,11 +84155,12 @@ async function tryBridgedDebtSwap(params, bridgeOpts) {
         banksMap: params.bankMap,
         assetShareValueMultiplierByBank: params.assetShareValueMultiplierByBank,
         feePayer: params.overrideInferAccounts?.authority ?? params.marginfiAccount.authority,
-        maxBundleTxs: bridgeOpts?.maxBundleTxs
+        maxBundleTxs: bridgeOpts?.maxBundleTxs,
+        reservedTxs: orderTx ? 1 : 0
       });
       if (!result) return null;
       return {
-        transactions: result.transactions,
+        transactions: orderTx ? [...result.transactions, orderTx] : result.transactions,
         actionTxIndex: result.transactions.length - 1,
         quoteResponse: mergeBridgeQuotesDebt(result.firstLegQuote, result.secondLegQuote),
         bridgeMint: bridgeBank.mint,
@@ -84020,12 +84239,23 @@ async function makeLoopTx(params) {
       luts: addressLookupTableAccounts ?? []
     }
   );
+  const orderTx = await makeOrderChangesTx({
+    ...params,
+    placeOrder: params.placeOrder && {
+      collateralBank: depositOpts.depositBank.address,
+      debtBank: borrowOpts.borrowBank.address,
+      trigger: params.placeOrder
+    },
+    luts: addressLookupTableAccounts ?? [],
+    blockhash
+  });
   const transactions = [...additionalTxs, flashloanTx];
+  if (orderTx) transactions.push(orderTx);
   return {
     transactions,
-    actionTxIndex: transactions.length - 1,
+    actionTxIndex: additionalTxs.length,
     quoteResponse: swapQuote,
-    mustBeAtomicBundle: refreshIntegrationIxs.instructions.length > 0
+    mustBeAtomicBundle: transactions.length > 1
   };
 }
 async function buildLoopFlashloanTx(params) {
@@ -84254,16 +84484,7 @@ async function buildDepositIxs(params, amountUi) {
 }
 async function runLoopSwapEngine(descriptor, params) {
   const { connection, swapOpts, marginfiAccount, swapEngineRunner } = params;
-  if (swapOpts.swapIxs) {
-    const pinned = resolvePinnedSwapRoute(swapOpts.swapIxs, descriptor.inAmountNative);
-    return {
-      swapInstructions: pinned.swapInstructions,
-      setupInstructions: pinned.setupInstructions,
-      swapLuts: pinned.lookupTables,
-      quoteResponse: pinned.quoteResponse,
-      outputAmountNative: pinned.outputAmountNative
-    };
-  }
+  if (swapOpts.swapIxs) return resolvePinnedSwapRoute(swapOpts.swapIxs, descriptor.inAmountNative);
   const runEngine = swapEngineRunner ?? runSwapEngine;
   const engineResult = await runEngine({
     inputMint: descriptor.inputMint,
@@ -84356,6 +84577,15 @@ async function tryBridgedLoop(params, bridgeOpts) {
   const oraclePriceOf = (bank) => params.oraclePrices.get(bank.address.toBase58())?.priceRealtime.price.toNumber() ?? 0;
   const borrowBankPrice = oraclePriceOf(borrowBank);
   if (borrowBankPrice <= 0) return null;
+  const orderTx = await makeOrderChangesTx({
+    ...params,
+    placeOrder: params.placeOrder && {
+      collateralBank: depositBank.address,
+      debtBank: borrowBank.address,
+      trigger: params.placeOrder
+    },
+    luts: params.addressLookupTableAccounts ?? []
+  });
   const tokenProgramCache = new Map(bridgeOpts?.tokenProgramByMint);
   return tryBridgeCandidates({
     usableBridgeBanks,
@@ -84374,6 +84604,9 @@ async function tryBridgedLoop(params, bridgeOpts) {
       );
       const firstLeg = await makeLoopTx({
         ...params,
+        // The order changes run after the second leg, once the loop's final debt exists
+        ordersToClose: void 0,
+        placeOrder: void 0,
         depositOpts: {
           ...params.depositOpts,
           marketPrice: oraclePriceOf(depositBank)
@@ -84411,11 +84644,12 @@ async function tryBridgedLoop(params, bridgeOpts) {
         banksMap: params.bankMap,
         assetShareValueMultiplierByBank: params.assetShareValueMultiplierByBank,
         feePayer: params.overrideInferAccounts?.authority ?? params.marginfiAccount.authority,
-        maxBundleTxs: bridgeOpts?.maxBundleTxs
+        maxBundleTxs: bridgeOpts?.maxBundleTxs,
+        reservedTxs: orderTx ? 1 : 0
       });
       if (!result) return null;
       return {
-        transactions: result.transactions,
+        transactions: orderTx ? [...result.transactions, orderTx] : result.transactions,
         actionTxIndex: result.transactions.length - 1,
         quoteResponse: mergeBridgeQuotesLoop(result.firstLegQuote, result.secondLegQuote),
         bridgeMint: bridgeBank.mint,
@@ -84471,12 +84705,18 @@ async function makeSwapCollateralTx(params) {
     payerKey: marginfiAccount.authority,
     luts: addressLookupTableAccounts ?? []
   });
+  const orderTx = await makeOrderChangesTx({
+    ...params,
+    luts: addressLookupTableAccounts ?? [],
+    blockhash
+  });
   const transactions = [...additionalTxs, flashloanTx];
+  if (orderTx) transactions.push(orderTx);
   return {
     transactions,
-    actionTxIndex: transactions.length - 1,
+    actionTxIndex: additionalTxs.length,
     quoteResponse: swapQuote,
-    mustBeAtomicBundle: refreshIntegrationIxs.instructions.length > 0
+    mustBeAtomicBundle: transactions.length > 1
   };
 }
 async function buildSwapCollateralFlashloanTx({
@@ -84740,10 +84980,11 @@ async function buildSwapCollateralFlashloanTx({
     });
     sizeConstraintUsed = swapConstraints.sizeConstraint;
     const runEngine = swapEngineRunner ?? runSwapEngine;
-    const engineResult = await runEngine({
+    const amountNative = uiToNative(actualWithdrawAmount, withdrawBank.mintDecimals);
+    const engineResult = swapOpts.swapIxs ? resolvePinnedSwapRoute(swapOpts.swapIxs, amountNative) : await runEngine({
       inputMint: withdrawBank.mint.toBase58(),
       outputMint: depositBank.mint.toBase58(),
-      amountNative: uiToNative(actualWithdrawAmount, withdrawBank.mintDecimals).toNumber(),
+      amountNative: amountNative.toNumber(),
       inputDecimals: withdrawBank.mintDecimals,
       outputDecimals: depositBank.mintDecimals,
       ...swapEngineQuoteFieldsFromOpts(swapOpts),
@@ -84751,7 +84992,11 @@ async function buildSwapCollateralFlashloanTx({
       destinationTokenAccount,
       connection,
       footprint: {
-        instructions: [...cuRequestIxs, ...withdrawIxs.instructions, ...depositIxs.instructions],
+        instructions: [
+          ...cuRequestIxs,
+          ...withdrawIxs.instructions,
+          ...depositIxs.instructions
+        ],
         luts: addressLookupTableAccounts ?? [],
         payer: marginfiAccount.authority,
         sizeConstraint: swapConstraints.sizeConstraint,
@@ -84837,6 +85082,10 @@ async function tryBridgedCollateralSwap(params, bridgeOpts) {
     bridgeTokenSide: "deposit",
     bridgeCandidateMints: bridgeOpts?.bridgeCandidateMints
   });
+  const orderTx = await makeOrderChangesTx({
+    ...params,
+    luts: params.addressLookupTableAccounts ?? []
+  });
   const tokenProgramCache = new Map(bridgeOpts?.tokenProgramByMint);
   return tryBridgeCandidates({
     usableBridgeBanks,
@@ -84886,11 +85135,12 @@ async function tryBridgedCollateralSwap(params, bridgeOpts) {
         banksMap: params.bankMap,
         assetShareValueMultiplierByBank: params.assetShareValueMultiplierByBank,
         feePayer: params.overrideInferAccounts?.authority ?? params.marginfiAccount.authority,
-        maxBundleTxs: bridgeOpts?.maxBundleTxs
+        maxBundleTxs: bridgeOpts?.maxBundleTxs,
+        reservedTxs: orderTx ? 1 : 0
       });
       if (!result) return null;
       return {
-        transactions: result.transactions,
+        transactions: orderTx ? [...result.transactions, orderTx] : result.transactions,
         actionTxIndex: result.transactions.length - 1,
         quoteResponse: mergeBridgeQuotes(result.firstLegQuote, result.secondLegQuote),
         bridgeMint: bridgeBank.mint,
@@ -84958,12 +85208,18 @@ async function makeRollPtTx(params) {
     payerKey: marginfiAccount.authority,
     luts: addressLookupTableAccounts ?? []
   });
+  const orderTx = await makeOrderChangesTx({
+    ...params,
+    luts: addressLookupTableAccounts ?? [],
+    blockhash
+  });
   const transactions = [...additionalTxs, flashloanTx];
+  if (orderTx) transactions.push(orderTx);
   return {
     transactions,
-    actionTxIndex: transactions.length - 1,
+    actionTxIndex: additionalTxs.length,
     quoteResponse: swapQuote,
-    mustBeAtomicBundle: refreshIntegrationIxs.instructions.length > 0
+    mustBeAtomicBundle: transactions.length > 1
   };
 }
 async function buildRollPtFlashloanTx({
@@ -85658,12 +85914,22 @@ async function makeTransferPositionsTx(params) {
     payerKey: accountA.authority,
     luts
   });
+  const sourceOrderTx = await makeOrderChangesTx({ ...params, luts, blockhash });
+  const destinationOrderTx = await makeOrderChangesTx({
+    ...params,
+    marginfiAccount: accountB,
+    ordersToClose: params.destinationOrdersToClose,
+    luts,
+    blockhash
+  });
   const transactions = [...additionalTxs, flashloanTx];
+  if (sourceOrderTx) transactions.push(sourceOrderTx);
+  if (destinationOrderTx) transactions.push(destinationOrderTx);
   return {
     transactions,
     actionTxIndex: additionalTxs.length,
     destinationAccount: accountB,
-    mustBeAtomicBundle: refreshIxs.length > 0
+    mustBeAtomicBundle: transactions.length > 1
   };
 }
 
@@ -85786,8 +86052,10 @@ async function makeBulkWithdrawTx(params) {
   if (setupTokens.some((t) => t.mint.equals(NATIVE_MINT))) {
     withdrawIxs.push(makeUnwrapSolIx(authority));
   }
+  const closeIxs = await makeOrderChangesIxs(params);
+  const actionIxs = [...closeIxs, ...withdrawIxs];
   const { blockhash } = await connection.getLatestBlockhash("confirmed");
-  const withdrawTxs = splitInstructionsToFitTransactions([], withdrawIxs, {
+  const withdrawTxs = splitInstructionsToFitTransactions([], actionIxs, {
     blockhash,
     payerKey: authority,
     luts: selectedLuts,
@@ -85818,7 +86086,8 @@ async function makeBulkWithdrawTx(params) {
   return {
     transactions: [...additionalTxs, ...withdrawTxs],
     actionTxIndex: additionalTxs.length,
-    mustBeAtomicBundle: refreshIxs.length > 0
+    // Order closes must land with every withdraw
+    mustBeAtomicBundle: refreshIxs.length > 0 || closeIxs.length > 0 && withdrawTxs.length > 1
   };
 }
 async function makeBulkRepayTx(params) {
@@ -85865,8 +86134,10 @@ async function makeBulkRepayTx(params) {
     [],
     bankAddresses
   ) : [];
+  const closeIxs = await makeOrderChangesIxs(params);
+  const actionIxs = [...closeIxs, ...repayIxs, ...premiumIxs];
   const { blockhash } = await connection.getLatestBlockhash("confirmed");
-  const transactions = splitInstructionsToFitTransactions([], [...repayIxs, ...premiumIxs], {
+  const transactions = splitInstructionsToFitTransactions([], actionIxs, {
     blockhash,
     payerKey: authority,
     luts,
@@ -85881,115 +86152,11 @@ async function makeBulkRepayTx(params) {
   return {
     transactions,
     actionTxIndex: 0,
-    // Venue refreshes only count in the pulse's slot, and the pulse must follow every repay
-    mustBeAtomicBundle: premiumIxs.length > 0 && transactions.length > 1
+    // Venue refreshes only count in the pulse's slot, and the pulse must follow every repay;
+    // order closes must land with every repay
+    mustBeAtomicBundle: (premiumIxs.length > 0 || closeIxs.length > 0) && transactions.length > 1
   };
 }
-function buildOrderTrigger(params) {
-  const { stopLossUsd, takeProfitUsd } = params;
-  const maxSlippage = percentToMaxSlippageU32(params.maxSlippagePercent);
-  const invalidTrigger = (reason) => TransactionBuildingError.orderInvalidTrigger(
-    reason,
-    takeProfitUsd?.toString(),
-    stopLossUsd?.toString()
-  );
-  if (stopLossUsd && !stopLossUsd.gt(0)) {
-    throw invalidTrigger(`stop-loss threshold (${stopLossUsd}) must be above 0`);
-  }
-  if (takeProfitUsd && !takeProfitUsd.gt(0)) {
-    throw invalidTrigger(`take-profit threshold (${takeProfitUsd}) must be above 0`);
-  }
-  if (stopLossUsd && takeProfitUsd) {
-    if (takeProfitUsd.lte(stopLossUsd)) {
-      throw invalidTrigger(
-        `take-profit threshold (${takeProfitUsd}) must be above stop-loss threshold (${stopLossUsd})`
-      );
-    }
-    return {
-      both: {
-        stopLoss: bigNumberToWrappedI80F48(stopLossUsd),
-        takeProfit: bigNumberToWrappedI80F48(takeProfitUsd),
-        maxSlippage
-      }
-    };
-  }
-  if (stopLossUsd) {
-    return { stopLoss: { threshold: bigNumberToWrappedI80F48(stopLossUsd), maxSlippage } };
-  }
-  if (takeProfitUsd) {
-    return { takeProfit: { threshold: bigNumberToWrappedI80F48(takeProfitUsd), maxSlippage } };
-  }
-  throw invalidTrigger("an order needs a stop-loss threshold, a take-profit threshold, or both");
-}
-async function makePlaceOrderIx2(params) {
-  const { program, marginfiAccount, collateralBank, debtBank, trigger, feePayer } = params;
-  const [order] = deriveOrderPda(program.programId, marginfiAccount.address, [
-    collateralBank,
-    debtBank
-  ]);
-  const globalFeeWallet = params.globalFeeWallet ?? (await program.account.feeState.fetch(deriveFeeState(program.programId)[0])).globalFeeWallet;
-  const placeOrderIx = await instructions_default3.makePlaceOrderIx(
-    program,
-    {
-      marginfiAccount: marginfiAccount.address,
-      feePayer: feePayer ?? marginfiAccount.authority,
-      authority: marginfiAccount.authority,
-      order,
-      globalFeeWallet,
-      group: marginfiAccount.group
-    },
-    { bankKeys: [collateralBank, debtBank], trigger: buildOrderTrigger(trigger) }
-  );
-  return { instructions: [placeOrderIx], keys: [] };
-}
-async function makeCloseOrderIx2(params) {
-  const { program, marginfiAccount, order, feeRecipient } = params;
-  const closeOrderIx = await instructions_default3.makeCloseOrderIx(program, {
-    marginfiAccount: marginfiAccount.address,
-    authority: marginfiAccount.authority,
-    order,
-    feeRecipient: feeRecipient ?? marginfiAccount.authority,
-    group: marginfiAccount.group
-  });
-  return { instructions: [closeOrderIx], keys: [] };
-}
-async function compileOrderTx(params, payerKey, ixs, type) {
-  const blockhash = params.blockhash ?? (await params.connection.getLatestBlockhashAndContext("confirmed")).value.blockhash;
-  return addTransactionMetadata(
-    new web3_js.VersionedTransaction(
-      new web3_js.TransactionMessage({
-        instructions: ixs.flatMap((ix) => ix.instructions),
-        payerKey,
-        recentBlockhash: blockhash
-      }).compileToV0Message(params.luts)
-    ),
-    { type, signers: ixs.flatMap((ix) => ix.keys), addressLookupTables: params.luts }
-  );
-}
-async function makePlaceOrderTx(params) {
-  const placeIxs = await makePlaceOrderIx2(params);
-  const payerKey = params.feePayer ?? params.marginfiAccount.authority;
-  return compileOrderTx(params, payerKey, [placeIxs], "PLACE_ORDER" /* PLACE_ORDER */);
-}
-async function makeCloseOrderTx(params) {
-  const closeIxs = await makeCloseOrderIx2(params);
-  return compileOrderTx(
-    params,
-    params.marginfiAccount.authority,
-    [closeIxs],
-    "CLOSE_ORDER" /* CLOSE_ORDER */
-  );
-}
-async function makeUpdateOrderTx(params) {
-  const [order] = deriveOrderPda(params.program.programId, params.marginfiAccount.address, [
-    params.collateralBank,
-    params.debtBank
-  ]);
-  const closeIxs = await makeCloseOrderIx2({ ...params, order, feeRecipient: params.feePayer });
-  const placeIxs = await makePlaceOrderIx2(params);
-  const payerKey = params.feePayer ?? params.marginfiAccount.authority;
-  return compileOrderTx(params, payerKey, [closeIxs, placeIxs], "UPDATE_ORDER" /* UPDATE_ORDER */);
-}
 
 // src/services/account/services/account-simulation.service.ts
 async function simulateAccountHealthCacheWithFallback(params) {
@@ -86528,7 +86695,7 @@ var fetchStakePoolActiveStates = async (connection, validatorVoteAccounts) => {
   });
   const poolStakeAddressKeys = Object.keys(poolStakeAddressRecord);
   const poolStakeAccounts = Object.fromEntries(
-    (await chunkedGetRawMultipleAccountInfoOrdered(connection, poolStakeAddressKeys)).map((ai, index) => {
+    (await chunkedGetRawMultipleAccountInfoOrderedWithNulls(connection, poolStakeAddressKeys)).map((ai, index) => {
       const key = poolStakeAddressKeys[index];
       const validatorVote = key ? poolStakeAddressRecord[key] : void 0;
       return [validatorVote, ai?.data || null];
@@ -86536,7 +86703,8 @@ var fetchStakePoolActiveStates = async (connection, validatorVoteAccounts) => {
   );
   validatorVoteAccounts.map((validatorVoteAccount) => {
     const voteAccountKey = validatorVoteAccount.toBase58();
-    const stakeAccount = fetchStakeAccount(poolStakeAccounts[voteAccountKey]);
+    const stakeData = poolStakeAccounts[voteAccountKey];
+    const stakeAccount = stakeData ? fetchStakeAccount(stakeData) : null;
     const poolMintAddress = poolMintAddressRecord[voteAccountKey];
     if (!poolMintAddress) {
       return;
@@ -86623,26 +86791,28 @@ var fetchStakePoolMev = async (connection, validatorVoteAccounts) => {
   const allAddresses = [...poolStakeAddresses, ...onRampAddresses].map(
     (address) => address.toBase58()
   );
-  return chunkedGetRawMultipleAccountInfoOrdered(connection, allAddresses).then((accountInfos) => {
-    const poolStakeInfos = accountInfos.slice(0, poolStakeAddresses.length);
-    const onRampInfos = accountInfos.slice(poolStakeAddresses.length);
-    const rent = 2282280;
-    validatorVoteAccounts.forEach((validatorVoteAccount, index) => {
-      const poolStakeInfo = poolStakeInfos[index];
-      const onRampInfo = onRampInfos[index];
-      if (poolStakeInfo && onRampInfo) {
-        const stakeDecoded = fetchStakeAccount(poolStakeInfo.data);
-        const onrampDecoded = fetchStakeAccount(onRampInfo.data);
-        const poolLamps = poolStakeInfo.lamports - rent - Number(stakeDecoded.stake.delegation.stake.toString());
-        const onrampStake = Number(onrampDecoded.stake.delegation.stake.toString());
-        mev.set(validatorVoteAccount.toBase58(), {
-          pool: poolLamps >= 1e3 ? poolLamps : 0,
-          onramp: onrampStake
-        });
-      }
-    });
-    return mev;
-  });
+  return chunkedGetRawMultipleAccountInfoOrderedWithNulls(connection, allAddresses).then(
+    (accountInfos) => {
+      const poolStakeInfos = accountInfos.slice(0, poolStakeAddresses.length);
+      const onRampInfos = accountInfos.slice(poolStakeAddresses.length);
+      const rent = 2282280;
+      validatorVoteAccounts.forEach((validatorVoteAccount, index) => {
+        const poolStakeInfo = poolStakeInfos[index];
+        const onRampInfo = onRampInfos[index];
+        if (poolStakeInfo && onRampInfo) {
+          const stakeDecoded = fetchStakeAccount(poolStakeInfo.data);
+          const onrampDecoded = fetchStakeAccount(onRampInfo.data);
+          const poolLamps = poolStakeInfo.lamports - rent - Number(stakeDecoded.stake.delegation.stake.toString());
+          const onrampStake = Number(onrampDecoded.stake.delegation.stake.toString());
+          mev.set(validatorVoteAccount.toBase58(), {
+            pool: poolLamps >= 1e3 ? poolLamps : 0,
+            onramp: onrampStake
+          });
+        }
+      });
+      return mev;
+    }
+  );
 };
 
 // src/services/native-stake/utils/serialize.utils.ts
@@ -87082,55 +87252,67 @@ function getValidatorVoteAccountByBank() {
   }
   return _voteAccountByBank;
 }
+var POOL_BOOTSTRAP_LAMPORTS = 1000000000n;
+var STAKE_STATE_DELEGATED = 2;
 async function computeStakedBankMultipliers(stakedBanks, connection) {
   const multiplierByBank = /* @__PURE__ */ new Map();
   if (stakedBanks.length === 0) {
     return multiplierByBank;
   }
   const metadataMap = getStakedBankMetadataMap();
-  const stakedBankAddresses = [];
+  const resolvedBanks = [];
   const poolStakeAddresses = [];
   const lstMintAddresses = [];
+  const onrampAddresses = [];
   for (const bank of stakedBanks) {
     const metadata = metadataMap.get(bank.address.toBase58());
     if (!metadata) {
-      multiplierByBank.set(bank.address.toBase58(), new BigNumber3__default.default(1));
+      multiplierByBank.set(bank.address.toBase58(), new BigNumber3.BigNumber(1));
       continue;
     }
     const pool = findPoolAddress(new web3_js.PublicKey(metadata.validatorVoteAccount));
-    stakedBankAddresses.push(bank.address.toBase58());
+    resolvedBanks.push(bank);
     poolStakeAddresses.push(findPoolStakeAddress(pool));
     lstMintAddresses.push(findPoolMintAddress(pool));
+    onrampAddresses.push(findPoolOnRampAddress(pool));
   }
-  if (stakedBankAddresses.length === 0) {
+  if (resolvedBanks.length === 0) {
     return multiplierByBank;
   }
-  const allAddresses = [
-    ...poolStakeAddresses.map((a) => a.toBase58()),
-    ...lstMintAddresses.map((a) => a.toBase58())
-  ];
-  const accountInfos = await chunkedGetRawMultipleAccountInfoOrdered(connection, allAddresses);
-  const poolStakeInfos = accountInfos.slice(0, poolStakeAddresses.length);
-  const lstMintInfos = accountInfos.slice(poolStakeAddresses.length);
-  for (let i = 0; i < stakedBankAddresses.length; i++) {
-    const bankAddr = stakedBankAddresses[i];
-    const poolStakeInfo = poolStakeInfos[i];
-    const lstMintInfo = lstMintInfos[i];
-    if (!poolStakeInfo || !lstMintInfo) {
-      multiplierByBank.set(bankAddr, new BigNumber3__default.default(1));
-      continue;
+  const allAddresses = [...poolStakeAddresses, ...lstMintAddresses, ...onrampAddresses].map(
+    (a) => a.toBase58()
+  );
+  const [accountInfos, stakeRent] = await Promise.all([
+    chunkedGetRawMultipleAccountInfoOrderedWithNulls(connection, allAddresses),
+    resolvedBanks.some((bank) => bank.stakedOracleUsesOnramp) ? connection.getMinimumBalanceForRentExemption(web3_js.StakeProgram.space) : 0
+  ]);
+  const count = resolvedBanks.length;
+  const aboveRent = (lamports) => Math.max(lamports - stakeRent, 0);
+  resolvedBanks.forEach((bank, i) => {
+    const bankAddr = bank.address.toBase58();
+    const poolStakeInfo = accountInfos[i];
+    const lstMintInfo = accountInfos[count + i];
+    const onrampInfo = accountInfos[2 * count + i];
+    const lstMintSupply = lstMintInfo ? buffer.Buffer.from(lstMintInfo.data.subarray(36, 44)).readBigUInt64LE(0) : 0n;
+    if (!poolStakeInfo || lstMintSupply === 0n) {
+      multiplierByBank.set(bankAddr, new BigNumber3.BigNumber(1));
+      return;
     }
-    const stakeLamports = poolStakeInfo.lamports;
-    const supplyBuffer = lstMintInfo.data.slice(36, 44);
-    const lstMintSupply = Number(buffer.Buffer.from(supplyBuffer).readBigUInt64LE(0));
-    if (lstMintSupply === 0) {
-      multiplierByBank.set(bankAddr, new BigNumber3__default.default(1));
-      continue;
+    if (bank.stakedOracleUsesOnramp) {
+      const value = aboveRent(poolStakeInfo.lamports) + (onrampInfo ? aboveRent(onrampInfo.lamports) : 0);
+      multiplierByBank.set(
+        bankAddr,
+        new BigNumber3.BigNumber(value).dividedBy((lstMintSupply + POOL_BOOTSTRAP_LAMPORTS).toString())
+      );
+      return;
     }
-    const adjustedStake = Math.max(stakeLamports - web3_js.LAMPORTS_PER_SOL, 0);
-    const multiplier = new BigNumber3__default.default(adjustedStake).dividedBy(lstMintSupply);
-    multiplierByBank.set(bankAddr, multiplier);
-  }
+    const delegated = poolStakeInfo.data.readUInt32LE(0) === STAKE_STATE_DELEGATED ? fetchStakeAccount(poolStakeInfo.data).stake.delegation.stake : 0n;
+    const delegatedAboveBootstrap = delegated > POOL_BOOTSTRAP_LAMPORTS ? delegated - POOL_BOOTSTRAP_LAMPORTS : 0n;
+    multiplierByBank.set(
+      bankAddr,
+      new BigNumber3.BigNumber(delegatedAboveBootstrap.toString()).dividedBy(lstMintSupply.toString())
+    );
+  });
   return multiplierByBank;
 }
 var SYSVAR_CLOCK_ID2 = new web3_js.PublicKey("SysvarC1ock11111111111111111111111111111111");
@@ -87959,7 +88141,7 @@ async function fetchBankIntegrationMetadata(options) {
 
 // src/models/bank.ts
 var Bank = class _Bank {
-  constructor(address, mint, mintDecimals, group, assetShareValue, liabilityShareValue, liquidityVault, liquidityVaultBump, liquidityVaultAuthorityBump, insuranceVault, insuranceVaultBump, insuranceVaultAuthorityBump, collectedInsuranceFeesOutstanding, feeVault, feeVaultBump, feeVaultAuthorityBump, collectedGroupFeesOutstanding, lastUpdate, config, totalAssetShares, totalLiabilityShares, emissionsActiveBorrowing, emissionsActiveLending, emissionsRate, emissionsMint, emissionsRemaining, collectedProgramFeesOutstanding, oracleKey, emode, premiumTag, premiumActive, premiumActivatedAt, kaminoEmergency, rateLimiter, kaminoIntegrationAccounts, driftIntegrationAccounts, solendIntegrationAccounts, jupLendIntegrationAccounts, feesDestinationAccount, lendingPositionCount, borrowingPositionCount, tokenSymbol) {
+  constructor(address, mint, mintDecimals, group, assetShareValue, liabilityShareValue, liquidityVault, liquidityVaultBump, liquidityVaultAuthorityBump, insuranceVault, insuranceVaultBump, insuranceVaultAuthorityBump, collectedInsuranceFeesOutstanding, feeVault, feeVaultBump, feeVaultAuthorityBump, collectedGroupFeesOutstanding, lastUpdate, config, totalAssetShares, totalLiabilityShares, emissionsActiveBorrowing, emissionsActiveLending, emissionsRate, emissionsMint, emissionsRemaining, collectedProgramFeesOutstanding, oracleKey, emode, premiumTag, premiumActive, premiumActivatedAt, kaminoEmergency, rateLimiter, kaminoIntegrationAccounts, driftIntegrationAccounts, solendIntegrationAccounts, jupLendIntegrationAccounts, feesDestinationAccount, lendingPositionCount, borrowingPositionCount, tokenSymbol, stakedOracleDisabled, stakedOracleUsesOnramp, stakedIntegrationAccounts) {
     this.address = address;
     this.mint = mint;
     this.mintDecimals = mintDecimals;
@@ -88002,6 +88184,9 @@ var Bank = class _Bank {
     this.lendingPositionCount = lendingPositionCount;
     this.borrowingPositionCount = borrowingPositionCount;
     this.tokenSymbol = tokenSymbol;
+    this.stakedOracleDisabled = stakedOracleDisabled;
+    this.stakedOracleUsesOnramp = stakedOracleUsesOnramp;
+    this.stakedIntegrationAccounts = stakedIntegrationAccounts;
   }
   static async fetch(address, program, bankMetadata) {
     const data = await program.account.bank.fetch(address);
@@ -88077,7 +88262,10 @@ var Bank = class _Bank {
       bankType.feesDestinationAccount,
       bankType.lendingPositionCount,
       bankType.borrowingPositionCount,
-      bankType.tokenSymbol
+      bankType.tokenSymbol,
+      bankType.stakedOracleDisabled,
+      bankType.stakedOracleUsesOnramp,
+      bankType.stakedIntegrationAccounts
     );
   }
   static fromAccountParsed(address, accountParsed, bankMetadata) {
@@ -88124,7 +88312,10 @@ var Bank = class _Bank {
       props.feesDestinationAccount,
       props.lendingPositionCount,
       props.borrowingPositionCount,
-      props.tokenSymbol
+      props.tokenSymbol,
+      props.stakedOracleDisabled,
+      props.stakedOracleUsesOnramp,
+      props.stakedIntegrationAccounts
     );
   }
   static withEmodeWeights(bank, emodeWeights) {
@@ -90068,6 +90259,8 @@ exports.makeLoopTx = makeLoopTx;
 exports.makeMergeStakeAccountsTx = makeMergeStakeAccountsTx;
 exports.makeMintStakedLstIx = makeMintStakedLstIx;
 exports.makeMintStakedLstTx = makeMintStakedLstTx;
+exports.makeOrderChangesIxs = makeOrderChangesIxs;
+exports.makeOrderChangesTx = makeOrderChangesTx;
 exports.makePlaceOrderIx = makePlaceOrderIx2;
 exports.makePlaceOrderTx = makePlaceOrderTx;
 exports.makePoolAddBankIx = makePoolAddBankIx2;
@@ -90132,6 +90325,7 @@ exports.parseRiskTier = parseRiskTier;
 exports.parseRpcPythPriceData = parseRpcPythPriceData;
 exports.patchDepositAmount = patchDepositAmount;
 exports.percentToMaxSlippageU32 = percentToMaxSlippageU32;
+exports.prependOrderCloses = prependOrderCloses;
 exports.rateFromU32 = rateFromU32;
 exports.requireBank = requireBank;
 exports.requireTokenProgram = requireTokenProgram;