@gbozee/ultimate 0.0.2-next.73 → 0.0.2-next.75

package/dist/index.js

@@ -71936,9 +71936,18 @@ class BaseExchange {
   async previewSpotMarginHedge(_payload) {
     throw new Error("Spot margin hedge preview is not supported on this exchange");
   }
+  async previewFuturesReplay(_payload) {
+    throw new Error("Futures replay preview is not supported on this exchange");
+  }
   async placeSpotMarginHedge(_payload) {
     throw new Error("Spot margin hedge placement is not supported on this exchange");
   }
+  async placeFuturesReplay(_payload) {
+    throw new Error("Futures replay placement is not supported on this exchange");
+  }
+  async placeFuturesExactTrade(_payload) {
+    throw new Error("Futures exact trade placement is not supported on this exchange");
+  }
   async placeSpotLimitOrders(_payload) {}
   async buildCumulative(payload) {
     const {
@@ -72347,19 +72356,198 @@ class BaseExchange {
 // src/exchanges/binance/index.ts
 var import_p_limit = __toESM(require_p_limit(), 1);
 
-// src/exchanges/binance/spot-margin-hedge.ts
+// src/exchanges/binance/futures-replay.ts
 function roundNumber(value2, digits = 8) {
   return Number(value2.toFixed(digits));
 }
-var STOP_LIMIT_SPREAD_PERCENT = 0.0005;
+function parseNumber2(value2) {
+  if (value2 === undefined || value2 === null || value2 === "")
+    return;
+  const parsed = Number(value2);
+  if (!Number.isFinite(parsed) || parsed <= 0)
+    return;
+  return roundNumber(parsed);
+}
 function normalizeOrderInput(order) {
+  const stop = parseNumber2(order.stop) ?? parseNumber2(order.stopPrice) ?? parseNumber2(order.triggerPrice);
+  const type = order.type ? order.type.toUpperCase() : undefined;
+  const quantity = order.quantity ?? order.qty ?? 0;
   return {
-    price: roundNumber(order.price),
-    quantity: roundNumber(order.quantity)
+    price: roundNumber(Number(order.price)),
+    quantity: roundNumber(Number(quantity)),
+    ...stop ? { stop } : {},
+    ...type && type !== "LIMIT" ? { type } : {}
+  };
+}
+function sortReplayOrders(orders) {
+  return [...orders].sort((left, right) => {
+    const leftTrigger = left.stop ?? left.price;
+    const rightTrigger = right.stop ?? right.price;
+    if (leftTrigger !== rightTrigger)
+      return leftTrigger - rightTrigger;
+    if (left.price !== right.price)
+      return left.price - right.price;
+    return left.quantity - right.quantity;
+  });
+}
+function buildReplayStopLimitPrice(payload) {
+  const spread = payload.stop > 30000 ? 1.00005 : 1.0002;
+  return roundNumber(payload.kind === "long" ? payload.stop * spread ** -1 : payload.stop * spread);
+}
+function normalizeRequestedEntryOrders(orders) {
+  return sortReplayOrders(orders.map((order) => ({
+    price: roundNumber(Number(order.price)),
+    quantity: roundNumber(Number(order.quantity))
+  })));
+}
+function normalizeRequestedStopOrders(payload) {
+  return sortReplayOrders(payload.orders.map((order) => {
+    const stop = parseNumber2(order.stop) ?? roundNumber(Number(order.price));
+    return {
+      price: order.price !== undefined ? roundNumber(Number(order.price)) : buildReplayStopLimitPrice({
+        kind: payload.kind,
+        stop
+      }),
+      quantity: roundNumber(Number(order.quantity)),
+      stop,
+      type: (order.type || "STOP").toUpperCase()
+    };
+  }));
+}
+function normalizeRequestedTakeProfitOrders(orders) {
+  return sortReplayOrders(orders.map((order) => {
+    const stop = parseNumber2(order.stop);
+    const type = order.type?.toUpperCase();
+    return {
+      price: roundNumber(Number(order.price)),
+      quantity: roundNumber(Number(order.quantity)),
+      ...stop ? { stop } : {},
+      ...type ? { type } : stop ? { type: "TAKE_PROFIT" } : {}
+    };
+  }));
+}
+function buildOrderKey(order) {
+  return [
+    order.type || "LIMIT",
+    order.price,
+    order.quantity,
+    order.stop ?? ""
+  ].join(":");
+}
+function buildComparisonBucket(options) {
+  const expected = sortReplayOrders(options.expected);
+  const actual = sortReplayOrders(options.actual);
+  const expected_keys = expected.map(buildOrderKey);
+  const actual_keys = actual.map(buildOrderKey);
+  return {
+    expected,
+    actual,
+    missing: expected_keys.filter((key) => !actual_keys.includes(key)),
+    extra: actual_keys.filter((key) => !expected_keys.includes(key))
+  };
+}
+function buildFuturesReplaySnapshot(payload) {
+  const entry_side = payload.kind === "long" ? "buy" : "sell";
+  const close_side = payload.kind === "long" ? "sell" : "buy";
+  const entry_orders = [];
+  const stop_orders = [];
+  const take_profit_orders = [];
+  for (const order of payload.open_orders) {
+    if (order.kind !== payload.kind)
+      continue;
+    const normalized_order = normalizeOrderInput(order);
+    const type = (normalized_order.type || "LIMIT").toUpperCase();
+    if (order.side === entry_side) {
+      entry_orders.push(normalized_order);
+      continue;
+    }
+    if (order.side !== close_side)
+      continue;
+    if (type.includes("TAKE_PROFIT") || normalized_order.stop === undefined) {
+      take_profit_orders.push(normalized_order);
+      continue;
+    }
+    stop_orders.push(normalized_order);
+  }
+  return {
+    symbol: payload.symbol,
+    kind: payload.kind,
+    current_price: payload.current_price,
+    position: payload.position,
+    open_orders: payload.open_orders.filter((order) => order.kind === payload.kind),
+    entry_orders: sortReplayOrders(entry_orders),
+    stop_orders: sortReplayOrders(stop_orders),
+    take_profit_orders: sortReplayOrders(take_profit_orders)
+  };
+}
+function inferFuturesReplayInputFromLiveOrders(payload) {
+  const snapshot = buildFuturesReplaySnapshot(payload);
+  return {
+    symbol: payload.symbol,
+    kind: payload.kind,
+    current_price: payload.current_price,
+    position: payload.position,
+    entry_orders: snapshot.entry_orders,
+    stop_orders: snapshot.stop_orders,
+    take_profit_orders: snapshot.take_profit_orders
+  };
+}
+function compareFuturesReplayOrders(payload) {
+  const entry = buildComparisonBucket({
+    expected: payload.entry_orders,
+    actual: payload.snapshot.entry_orders
+  });
+  const stop = buildComparisonBucket({
+    expected: payload.stop_orders,
+    actual: payload.snapshot.stop_orders
+  });
+  const take_profit = buildComparisonBucket({
+    expected: payload.take_profit_orders,
+    actual: payload.snapshot.take_profit_orders
+  });
+  return {
+    matches: entry.missing.length === 0 && entry.extra.length === 0 && stop.missing.length === 0 && stop.extra.length === 0 && take_profit.missing.length === 0 && take_profit.extra.length === 0,
+    entry,
+    stop,
+    take_profit
+  };
+}
+function buildFuturesReplayPlan(payload) {
+  return {
+    symbol: payload.symbol,
+    kind: payload.kind,
+    orders_to_cancel: payload.snapshot.open_orders,
+    orders_to_create: {
+      entry: sortReplayOrders(payload.entry_orders),
+      stop: sortReplayOrders(payload.stop_orders),
+      take_profit: sortReplayOrders(payload.take_profit_orders)
+    }
+  };
+}
+function normalizeFuturesReplayInput(payload) {
+  return {
+    entry_orders: normalizeRequestedEntryOrders(payload.entry_orders),
+    stop_orders: normalizeRequestedStopOrders({
+      kind: payload.kind,
+      orders: payload.stop_orders
+    }),
+    take_profit_orders: normalizeRequestedTakeProfitOrders(payload.take_profit_orders)
+  };
+}
+
+// src/exchanges/binance/spot-margin-hedge.ts
+function roundNumber2(value2, digits = 8) {
+  return Number(value2.toFixed(digits));
+}
+var STOP_LIMIT_SPREAD_PERCENT = 0.0005;
+function normalizeOrderInput2(order) {
+  return {
+    price: roundNumber2(order.price),
+    quantity: roundNumber2(order.quantity)
   };
 }
 function sortOrderInputs(orders) {
-  return [...orders].map(normalizeOrderInput).sort((left, right) => left.price - right.price);
+  return [...orders].map(normalizeOrderInput2).sort((left, right) => left.price - right.price);
 }
 function normalizeOrderForComparison(order) {
   const type = (order.type || "limit").toLowerCase();
@@ -72368,9 +72556,9 @@ function normalizeOrderForComparison(order) {
   return {
     side: order.side,
     type,
-    price: roundNumber(order.price),
-    quantity: roundNumber(order.quantity),
-    stop: parsed_stop !== undefined && Number.isFinite(parsed_stop) && parsed_stop > 0 ? roundNumber(parsed_stop) : undefined
+    price: roundNumber2(order.price),
+    quantity: roundNumber2(order.quantity),
+    stop: parsed_stop !== undefined && Number.isFinite(parsed_stop) && parsed_stop > 0 ? roundNumber2(parsed_stop) : undefined
   };
 }
 function normalizeOrders(orders) {
@@ -72393,7 +72581,7 @@ function toPlannedOrders(orders) {
     stop: order.stop
   }));
 }
-function buildOrderKey(order) {
+function buildOrderKey2(order) {
   return [
     order.side,
     order.type,
@@ -72403,8 +72591,8 @@ function buildOrderKey(order) {
   ].join(":");
 }
 function buildDiff(options) {
-  const expectedKeys = options.expected.map(buildOrderKey);
-  const actualKeys = options.actual.map(buildOrderKey);
+  const expectedKeys = options.expected.map(buildOrderKey2);
+  const actualKeys = options.actual.map(buildOrderKey2);
   return {
     missing: expectedKeys.filter((key) => !actualKeys.includes(key)),
     extra: actualKeys.filter((key) => !expectedKeys.includes(key))
@@ -72416,10 +72604,10 @@ function getQuoteAsset(symbol) {
   return target || symbol.slice(-4);
 }
 function sumNotional(orders) {
-  return roundNumber(orders.reduce((sum, order) => sum + order.price * order.quantity, 0), 8);
+  return roundNumber2(orders.reduce((sum, order) => sum + order.price * order.quantity, 0), 8);
 }
 function sumQuantity(orders) {
-  return roundNumber(orders.reduce((sum, order) => sum + order.quantity, 0), 8);
+  return roundNumber2(orders.reduce((sum, order) => sum + order.quantity, 0), 8);
 }
 function buildLongOrderPlacement(options) {
   const { order, current_price } = options;
@@ -72428,7 +72616,7 @@ function buildLongOrderPlacement(options) {
       side: "buy",
       type: "stop_loss_limit",
       price: order.price,
-      stop: roundNumber(order.price * (1 - STOP_LIMIT_SPREAD_PERCENT)),
+      stop: roundNumber2(order.price * (1 - STOP_LIMIT_SPREAD_PERCENT)),
       quantity: order.quantity
     };
   }
@@ -72496,11 +72684,11 @@ function buildSpotMarginHedgePlan(options) {
   }));
   const spot_orders_to_create = options.placement_overrides?.spot || default_spot_orders_to_create;
   const margin_orders_to_create = options.placement_overrides?.margin || default_margin_orders_to_create;
-  const borrow_delta = roundNumber(Math.max(0, options.borrow_amount - options.snapshot.borrowed_quote_amount));
+  const borrow_delta = roundNumber2(Math.max(0, options.borrow_amount - options.snapshot.borrowed_quote_amount));
   const spot_long_notional = sumNotional(spot_long_orders);
-  const transfer_to_spot_amount = roundNumber(Math.max(0, spot_long_notional - options.snapshot.spot_quote_free));
+  const transfer_to_spot_amount = roundNumber2(Math.max(0, options.margin_type === "cross" ? options.borrow_amount : spot_long_notional - options.snapshot.spot_quote_free));
   const short_quantity = sumQuantity(short_orders);
-  const transfer_base_to_spot_amount = roundNumber(Math.max(0, short_quantity - options.snapshot.spot_base_free));
+  const transfer_base_to_spot_amount = roundNumber2(Math.max(0, short_quantity - options.snapshot.spot_base_free));
   return {
     borrow_amount: options.borrow_amount,
     borrow_delta,
@@ -73002,17 +73190,17 @@ async function createMarginLimitOrdersParallel(client, symbol, priceFormat, quan
     return Object.fromEntries(Object.entries(v).filter(([, value2]) => value2 !== undefined));
   };
   const newOrders = orders.map(createMarginOrder);
-  const limit = import_p_limit.default(ORDERS_PER_SECOND);
-  const results = await Promise.all(newOrders.map((orderPayload) => limit(async () => {
+  const results = [];
+  for (const orderPayload of newOrders) {
     try {
       const result = await client.marginAccountNewOrder(orderPayload);
       console.log("Margin order result:", result);
-      return result;
+      results.push(result);
     } catch (error) {
       console.error("Error processing margin order:", error);
       throw error;
     }
-  })));
+  }
   return results;
 }
 async function getIsolatedMarginAccountInfo(client, symbol) {
@@ -74159,6 +74347,30 @@ class BinanceExchange extends BaseExchange {
       throw error;
     }
   }
+  async getFuturesSymbolFormats(symbol) {
+    if (typeof this.client.getExchangeInfo !== "function") {
+      return {
+        price_places: "%.8f",
+        decimal_places: "%.8f"
+      };
+    }
+    try {
+      const exchange_info = await this.client.getExchangeInfo();
+      const symbol_info = exchange_info?.symbols?.find((item) => item.symbol === symbol.toUpperCase());
+      const price_filter = symbol_info?.filters?.find((filter) => filter.filterType === "PRICE_FILTER");
+      const lot_size_filter = symbol_info?.filters?.find((filter) => filter.filterType === "LOT_SIZE");
+      return {
+        price_places: getPrintfFormatFromStepSize(price_filter?.tickSize, "%.8f"),
+        decimal_places: getPrintfFormatFromStepSize(lot_size_filter?.stepSize, "%.8f")
+      };
+    } catch (error) {
+      console.error("Error fetching futures symbol formats:", error);
+      return {
+        price_places: "%.8f",
+        decimal_places: "%.8f"
+      };
+    }
+  }
   async getSpotSymbolFormats(symbol) {
     if (!this.main_client || typeof this.main_client.getExchangeInfo !== "function") {
       return {
@@ -74213,28 +74425,146 @@ class BinanceExchange extends BaseExchange {
     }
     return await getMarginOpenOrders(this.main_client, symbol, isIsolated);
   }
+  async getFuturesReplaySnapshot(payload) {
+    const symbol = payload.symbol.toUpperCase();
+    const [open_orders, position_info, current_price] = await Promise.all([
+      this.getOpenOrders({ symbol }),
+      this.getPositionInfo(symbol),
+      this.getCurrentPrice(symbol)
+    ]);
+    return buildFuturesReplaySnapshot({
+      symbol,
+      kind: payload.kind,
+      current_price,
+      position: {
+        size: position_info[payload.kind]?.size || 0
+      },
+      open_orders
+    });
+  }
+  async previewFuturesReplay(payload) {
+    const snapshot = payload.snapshot ? {
+      ...payload.snapshot,
+      current_price: payload.snapshot.current_price ?? await this.getCurrentPrice(payload.symbol)
+    } : await this.getFuturesReplaySnapshot({
+      symbol: payload.symbol,
+      kind: payload.kind
+    });
+    const shouldInferEntryOrders = !payload.entry_orders || payload.entry_orders.length === 0;
+    const shouldInferStopOrders = !payload.stop_orders || payload.stop_orders.length === 0;
+    const shouldInferTakeProfitOrders = !payload.take_profit_orders || payload.take_profit_orders.length === 0;
+    const inferred_input = shouldInferEntryOrders || shouldInferStopOrders || shouldInferTakeProfitOrders ? inferFuturesReplayInputFromLiveOrders({
+      symbol: payload.symbol,
+      kind: payload.kind,
+      current_price: snapshot.current_price,
+      position: snapshot.position,
+      open_orders: snapshot.open_orders
+    }) : undefined;
+    const explicit_input = normalizeFuturesReplayInput({
+      kind: payload.kind,
+      entry_orders: payload.entry_orders || [],
+      stop_orders: payload.stop_orders || [],
+      take_profit_orders: payload.take_profit_orders || []
+    });
+    const entry_orders = shouldInferEntryOrders ? inferred_input?.entry_orders || [] : explicit_input.entry_orders;
+    const stop_orders = shouldInferStopOrders ? inferred_input?.stop_orders || [] : explicit_input.stop_orders;
+    const take_profit_orders = shouldInferTakeProfitOrders ? inferred_input?.take_profit_orders || [] : explicit_input.take_profit_orders;
+    const requested_input = {
+      symbol: payload.symbol,
+      kind: payload.kind,
+      entry_orders,
+      stop_orders,
+      take_profit_orders
+    };
+    const plan = buildFuturesReplayPlan({
+      ...requested_input,
+      snapshot
+    });
+    const comparison = compareFuturesReplayOrders({
+      ...requested_input,
+      snapshot
+    });
+    return {
+      snapshot,
+      inferred_input,
+      requested_input,
+      plan,
+      comparison
+    };
+  }
+  async placeFuturesReplay(payload) {
+    const preview = await this.previewFuturesReplay(payload);
+    if (!payload.place) {
+      return preview;
+    }
+    const symbol = payload.symbol.toUpperCase();
+    await cancelAllOrders(this.client, symbol, {
+      kind: payload.kind
+    });
+    const refreshed_snapshot = await this.getFuturesReplaySnapshot({
+      symbol,
+      kind: payload.kind
+    });
+    const execution_plan = buildFuturesReplayPlan({
+      symbol,
+      kind: payload.kind,
+      entry_orders: preview.requested_input.entry_orders,
+      stop_orders: preview.requested_input.stop_orders,
+      take_profit_orders: preview.requested_input.take_profit_orders,
+      snapshot: refreshed_snapshot
+    });
+    const { price_places, decimal_places } = await this.getFuturesSymbolFormats(symbol);
+    const entry_orders = execution_plan.orders_to_create.entry.map((order) => ({
+      ...order,
+      side: payload.kind === "long" ? "buy" : "sell",
+      kind: payload.kind
+    }));
+    const stop_orders = execution_plan.orders_to_create.stop.map((order) => ({
+      ...order,
+      side: payload.kind === "long" ? "sell" : "buy",
+      kind: payload.kind,
+      type: order.type || "STOP"
+    }));
+    const take_profit_orders = execution_plan.orders_to_create.take_profit.map((order) => ({
+      ...order,
+      side: payload.kind === "long" ? "sell" : "buy",
+      kind: payload.kind,
+      ...order.stop ? { type: order.type || "TAKE_PROFIT" } : {}
+    }));
+    const execution = entry_orders.length > 0 || stop_orders.length > 0 || take_profit_orders.length > 0 ? await createLimitPurchaseOrdersParallel(this.client, symbol, price_places, decimal_places, [...entry_orders, ...stop_orders, ...take_profit_orders]) : [];
+    return {
+      ...preview,
+      execution_plan,
+      refreshed_snapshot,
+      execution
+    };
+  }
+  async placeFuturesExactTrade(payload) {
+    return await this.placeFuturesReplay(payload);
+  }
   async getSpotMarginHedgeSnapshot(payload) {
     if (!this.main_client) {
       throw new Error("Main client not available for spot and margin trading");
     }
-    if (payload.margin_type !== "isolated") {
-      throw new Error(`Unsupported margin type: ${payload.margin_type}. Only isolated is supported for replay right now.`);
-    }
     const symbol = payload.symbol.toUpperCase();
     const quoteAssets = ["USDT", "USDC", "BUSD", "BTC", "ETH"];
     const quoteAsset = quoteAssets.find((asset) => symbol.endsWith(asset)) || symbol.slice(-4);
     const baseAsset = symbol.slice(0, symbol.length - quoteAsset.length);
-    const [spot_orders, margin_orders, spot_balances, isolated_margin_position] = await Promise.all([
+    const is_isolated = payload.margin_type === "isolated";
+    const [spot_orders, margin_orders, spot_balances, margin_account] = await Promise.all([
       this.getSpotOpenOrders(symbol),
-      this.getMarginOpenOrders(symbol, true),
+      this.getMarginOpenOrders(symbol, is_isolated),
       this.getSpotBalances([baseAsset, quoteAsset]),
-      this.getIsolatedMarginPosition(symbol)
+      is_isolated ? this.getIsolatedMarginPosition(symbol) : this.getCrossMarginAccount()
     ]);
     const current_price = await this.getSpotCurrentPrice(symbol);
     const spot_quote_balance = spot_balances.find((balance) => balance.asset.toUpperCase() === quoteAsset);
     const spot_base_balance = spot_balances.find((balance) => balance.asset.toUpperCase() === baseAsset);
-    const isolated_asset = isolated_margin_position?.assets?.[0];
-    const borrowed_quote_amount = parseFloat(isolated_asset?.quoteAsset?.borrowed?.toString?.() || "0");
+    const isolated_margin_account = is_isolated ? margin_account : undefined;
+    const cross_margin_account = !is_isolated ? margin_account : undefined;
+    const isolated_asset = isolated_margin_account?.assets?.[0];
+    const cross_quote_asset = !is_isolated ? cross_margin_account?.userAssets?.find((asset) => asset.asset?.toUpperCase?.() === quoteAsset) : undefined;
+    const borrowed_quote_amount = parseFloat(isolated_asset?.quoteAsset?.borrowed?.toString?.() || cross_quote_asset?.borrowed?.toString?.() || "0");
     return {
       symbol,
       margin_type: payload.margin_type,
@@ -74247,7 +74577,8 @@ class BinanceExchange extends BaseExchange {
       margin_orders,
       current_price,
       spot_balances,
-      isolated_margin_position
+      isolated_margin_position: isolated_margin_account,
+      cross_margin_account
     };
   }
   async previewSpotMarginHedge(payload) {
@@ -74304,14 +74635,12 @@ class BinanceExchange extends BaseExchange {
     if (!this.main_client) {
       throw new Error("Main client not available for spot and margin trading");
     }
-    if (payload.margin_type !== "isolated") {
-      throw new Error(`Unsupported margin type: ${payload.margin_type}. Only isolated placement is supported right now.`);
-    }
     const symbol = payload.symbol.toUpperCase();
     const quoteAssets = ["USDT", "USDC", "BUSD", "BTC", "ETH"];
     const quote_asset = quoteAssets.find((asset) => symbol.endsWith(asset)) || symbol.slice(-4);
     const base_asset = symbol.slice(0, symbol.length - quote_asset.length);
     const requested_input = preview.requested_input;
+    const is_isolated = payload.margin_type === "isolated";
     if (preview.snapshot.spot_orders.length > 0) {
       await this.cancelSpotOrders(symbol, preview.snapshot.spot_orders.map((order) => ({
         orderId: order.orderId || order.order_id || order.id,
@@ -74319,7 +74648,7 @@ class BinanceExchange extends BaseExchange {
       })));
     }
     if (preview.snapshot.margin_orders.length > 0) {
-      await this.cancelMarginOrders(symbol, true, preview.snapshot.margin_orders.map((order) => ({
+      await this.cancelMarginOrders(symbol, is_isolated, preview.snapshot.margin_orders.map((order) => ({
         orderId: order.orderId || order.order_id || order.id,
         origClientOrderId: order.origClientOrderId
       })));
@@ -74341,50 +74670,120 @@ class BinanceExchange extends BaseExchange {
     });
     let borrow_result = null;
     if (execution_plan.borrow_delta > 0) {
-      borrow_result = await this.main_client.submitMarginAccountBorrowRepay({
+      const borrow_payload = {
         asset: quote_asset,
         amount: execution_plan.borrow_delta,
-        isIsolated: "TRUE",
-        symbol,
         type: "BORROW"
+      };
+      if (is_isolated) {
+        borrow_payload.isIsolated = "TRUE";
+        borrow_payload.symbol = symbol;
+      }
+      borrow_result = await this.main_client.submitMarginAccountBorrowRepay(borrow_payload);
+    }
+    async function getCrossTransferAmount(asset, amount) {
+      if (is_isolated) {
+        return amount;
+      }
+      if (!this.main_client || typeof this.main_client.queryMaxTransferOutAmount !== "function") {
+        return amount;
+      }
+      const response = await this.main_client.queryMaxTransferOutAmount({
+        asset
       });
+      const allowed_amount = parseFloat(response?.amount?.toString?.() || "0");
+      if (!Number.isFinite(allowed_amount)) {
+        return amount;
+      }
+      return Math.max(0, Math.min(amount, allowed_amount));
     }
     let quote_transfer_result = null;
+    let quote_transfer_amount = execution_plan.transfer_to_spot_amount;
     if (execution_plan.transfer_to_spot_amount > 0) {
-      quote_transfer_result = await this.main_client.isolatedMarginAccountTransfer({
-        asset: quote_asset,
-        amount: execution_plan.transfer_to_spot_amount,
-        symbol,
-        transFrom: "ISOLATED_MARGIN",
-        transTo: "SPOT"
-      });
+      quote_transfer_amount = await getCrossTransferAmount.call(this, quote_asset, execution_plan.transfer_to_spot_amount);
+      if (quote_transfer_amount > 0) {
+        quote_transfer_result = is_isolated ? await this.main_client.isolatedMarginAccountTransfer({
+          asset: quote_asset,
+          amount: quote_transfer_amount,
+          symbol,
+          transFrom: "ISOLATED_MARGIN",
+          transTo: "SPOT"
+        }) : await this.main_client.submitUniversalTransfer({
+          type: "MARGIN_MAIN",
+          asset: quote_asset,
+          amount: quote_transfer_amount
+        });
+      }
     }
     let base_transfer_result = null;
+    let base_transfer_amount = execution_plan.transfer_base_to_spot_amount;
     if (execution_plan.transfer_base_to_spot_amount > 0) {
-      base_transfer_result = await this.main_client.isolatedMarginAccountTransfer({
-        asset: base_asset,
-        amount: execution_plan.transfer_base_to_spot_amount,
-        symbol,
-        transFrom: "ISOLATED_MARGIN",
-        transTo: "SPOT"
-      });
+      base_transfer_amount = await getCrossTransferAmount.call(this, base_asset, execution_plan.transfer_base_to_spot_amount);
+      if (base_transfer_amount > 0) {
+        base_transfer_result = is_isolated ? await this.main_client.isolatedMarginAccountTransfer({
+          asset: base_asset,
+          amount: base_transfer_amount,
+          symbol,
+          transFrom: "ISOLATED_MARGIN",
+          transTo: "SPOT"
+        }) : await this.main_client.submitUniversalTransfer({
+          type: "MARGIN_MAIN",
+          asset: base_asset,
+          amount: base_transfer_amount
+        });
+      }
     }
-    const spot_result = execution_plan.orders_to_create.spot.length > 0 ? await this.createSpotLimitOrders({
+    const spot_quote_available = refreshed_snapshot.spot_quote_free + quote_transfer_amount;
+    const requested_max_spot_buy_orders = requested_input.max_spot_buy_orders ?? 5;
+    const sorted_long_orders = [...requested_input.long_orders].sort((a, b) => a.price - b.price);
+    let affordable_spot_buy_orders = 0;
+    let affordable_spot_buy_notional = 0;
+    for (const order of sorted_long_orders.slice(0, requested_max_spot_buy_orders)) {
+      const next_notional = affordable_spot_buy_notional + order.price * order.quantity;
+      if (next_notional <= spot_quote_available + 0.00000001) {
+        affordable_spot_buy_orders += 1;
+        affordable_spot_buy_notional = next_notional;
+      } else {
+        break;
+      }
+    }
+    const placement_plan = buildSpotMarginHedgePlan({
+      borrow_amount: requested_input.borrow_amount,
+      symbol: requested_input.symbol,
+      margin_type: requested_input.margin_type,
+      long_orders: requested_input.long_orders,
+      short_orders: requested_input.short_orders,
+      current_price: refreshed_snapshot.current_price,
+      max_spot_buy_orders: affordable_spot_buy_orders,
+      snapshot: {
+        ...refreshed_snapshot,
+        borrowed_quote_amount: refreshed_snapshot.borrowed_quote_amount + execution_plan.borrow_delta,
+        spot_quote_free: spot_quote_available,
+        spot_base_free: refreshed_snapshot.spot_base_free + base_transfer_amount
+      }
+    });
+    const spot_result = placement_plan.orders_to_create.spot.length > 0 ? await this.createSpotLimitOrders({
       symbol,
-      orders: execution_plan.orders_to_create.spot,
+      orders: placement_plan.orders_to_create.spot,
       price_places: symbol_formats.price_places,
       decimal_places: symbol_formats.decimal_places
     }) : [];
-    const margin_result = execution_plan.orders_to_create.margin.length > 0 ? await this.createMarginLimitOrders({
+    const margin_result = placement_plan.orders_to_create.margin.length > 0 ? await this.createMarginLimitOrders({
       symbol,
-      orders: execution_plan.orders_to_create.margin,
-      isIsolated: true,
+      orders: placement_plan.orders_to_create.margin,
+      isIsolated: is_isolated,
       price_places: symbol_formats.price_places,
       decimal_places: symbol_formats.decimal_places
     }) : [];
     return {
       ...preview,
-      execution_plan,
+      execution_plan: {
+        ...placement_plan,
+        borrow_amount: execution_plan.borrow_amount,
+        borrow_delta: execution_plan.borrow_delta,
+        transfer_to_spot_amount: quote_transfer_amount,
+        transfer_base_to_spot_amount: base_transfer_amount
+      },
       refreshed_snapshot,
       execution: {
         borrow: borrow_result ? {
@@ -74394,12 +74793,12 @@ class BinanceExchange extends BaseExchange {
         } : null,
         quote_transfer: quote_transfer_result ? {
           asset: quote_asset,
-          amount: execution_plan.transfer_to_spot_amount,
+          amount: quote_transfer_amount,
           response: quote_transfer_result
         } : null,
         base_transfer: base_transfer_result ? {
           asset: base_asset,
-          amount: execution_plan.transfer_base_to_spot_amount,
+          amount: base_transfer_amount,
           response: base_transfer_result
         } : null,
         spot_orders: spot_result,