@0dotxyz/p0-ts-sdk 2.10.0 → 2.10.1-alpha.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.
    */
@@ -78587,6 +78601,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 +79480,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 +79590,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 +79738,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 +79834,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 +79931,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 +80714,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 +80972,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 +81021,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 +81156,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 +81237,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 +81312,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 +83819,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 +83837,7 @@ async function composeBridgedSwap(params) {
     secondLeg.transactions,
     feePayer,
     blockhashOf(firstLeg),
-    maxBundleTxs
+    maxBundleTxs - reservedTxs
   );
   if (!transactions) return null;
   return {
@@ -83672,12 +83899,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({
@@ -83884,6 +84117,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 +84174,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 +84258,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) {
@@ -84356,6 +84605,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 +84632,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 +84672,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 +84733,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({
@@ -84837,6 +85105,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 +85158,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 +85231,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 +85937,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 +86075,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 +86109,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 +86157,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 +86175,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) {
@@ -90068,6 +90258,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 +90324,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;