@mysten/deepbook-v3 1.5.8 → 1.6.2

package/src/transactions/marginTPSL.ts

@@ -11,6 +11,8 @@ import type {
 import { OrderType, SelfMatchingOptions } from '../types/index.js';
 import { MAX_TIMESTAMP, FLOAT_SCALAR } from '../utils/config.js';
 import { convertQuantity, convertPrice } from '../utils/conversion.js';
+import * as marginManagerMoveCalls from '../contracts/deepbook_margin/margin_manager.js';
+import * as tpslMoveCalls from '../contracts/deepbook_margin/tpsl.js';
 
 /**
  * MarginTPSLContract class for managing Take Profit / Stop Loss operations.
@@ -46,10 +48,12 @@ export class MarginTPSLContract {
 				quoteCoin.scalar,
 				baseCoin.scalar,
 			);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::tpsl::new_condition`,
-				arguments: [tx.pure.bool(triggerBelowPrice), tx.pure.u64(inputPrice)],
-			});
+			return tx.add(
+				tpslMoveCalls.newCondition({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: { triggerBelowPrice, triggerPrice: inputPrice },
+				}),
+			);
 		};
 
 	/**
@@ -75,19 +79,21 @@ export class MarginTPSLContract {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const inputPrice = convertPrice(price, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::tpsl::new_pending_limit_order`,
-				arguments: [
-					tx.pure.u64(clientOrderId),
-					tx.pure.u8(orderType),
-					tx.pure.u8(selfMatchingOption),
-					tx.pure.u64(inputPrice),
-					tx.pure.u64(inputQuantity),
-					tx.pure.bool(isBid),
-					tx.pure.bool(payWithDeep),
-					tx.pure.u64(expireTimestamp),
-				],
-			});
+			return tx.add(
+				tpslMoveCalls.newPendingLimitOrder({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						clientOrderId: BigInt(clientOrderId),
+						orderType,
+						selfMatchingOption,
+						price: inputPrice,
+						quantity: inputQuantity,
+						isBid,
+						payWithDeep,
+						expireTimestamp,
+					},
+				}),
+			);
 		};
 
 	/**
@@ -108,16 +114,18 @@ export class MarginTPSLContract {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::tpsl::new_pending_market_order`,
-				arguments: [
-					tx.pure.u64(clientOrderId),
-					tx.pure.u8(selfMatchingOption),
-					tx.pure.u64(inputQuantity),
-					tx.pure.bool(isBid),
-					tx.pure.bool(payWithDeep),
-				],
-			});
+			return tx.add(
+				tpslMoveCalls.newPendingMarketOrder({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						clientOrderId: BigInt(clientOrderId),
+						selfMatchingOption,
+						quantity: inputQuantity,
+						isBid,
+						payWithDeep,
+					},
+				}),
+			);
 		};
 
 	// === Public Functions ===
@@ -144,21 +152,22 @@ export class MarginTPSLContract {
 			? this.newPendingLimitOrder(manager.poolKey, pendingOrder as PendingLimitOrderParams)(tx)
 			: this.newPendingMarketOrder(manager.poolKey, pendingOrder as PendingMarketOrderParams)(tx);
 
-		tx.moveCall({
-			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::add_conditional_order`,
-			arguments: [
-				tx.object(manager.address),
-				tx.object(pool.address),
-				tx.object(baseCoin.priceInfoObjectId!),
-				tx.object(quoteCoin.priceInfoObjectId!),
-				tx.object(this.#config.MARGIN_REGISTRY_ID),
-				tx.pure.u64(conditionalOrderId),
-				condition,
-				pending,
-				tx.object.clock(),
-			],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			marginManagerMoveCalls.addConditionalOrder({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					pool: pool.address,
+					basePriceInfoObject: baseCoin.priceInfoObjectId!,
+					quotePriceInfoObject: quoteCoin.priceInfoObjectId!,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					conditionalOrderId: BigInt(conditionalOrderId),
+					condition,
+					pendingOrder: pending,
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -171,11 +180,13 @@ export class MarginTPSLContract {
 		const pool = this.#config.getPool(manager.poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-		tx.moveCall({
-			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::cancel_all_conditional_orders`,
-			arguments: [tx.object(manager.address), tx.object.clock()],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			marginManagerMoveCalls.cancelAllConditionalOrders({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: manager.address },
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -190,11 +201,13 @@ export class MarginTPSLContract {
 			const pool = this.#config.getPool(manager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::cancel_conditional_order`,
-				arguments: [tx.object(manager.address), tx.pure.u64(conditionalOrderId), tx.object.clock()],
-				typeArguments: [baseCoin.type, quoteCoin.type],
-			});
+			tx.add(
+				marginManagerMoveCalls.cancelConditionalOrder({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: { self: manager.address, conditionalOrderId: BigInt(conditionalOrderId) },
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
 		};
 
 	/**
@@ -215,21 +228,64 @@ export class MarginTPSLContract {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::execute_conditional_orders_v2`,
-				arguments: [
-					tx.object(managerAddress),
-					tx.object(pool.address),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId!),
-					tx.object(quoteCoin.priceInfoObjectId!),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.pure.u64(maxOrdersToExecute),
-					tx.object.clock(),
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type],
-			});
+			return tx.add(
+				marginManagerMoveCalls.executeConditionalOrdersV2({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						self: managerAddress,
+						pool: pool.address,
+						baseMarginPool: baseMarginPool.address,
+						quoteMarginPool: quoteMarginPool.address,
+						basePriceInfoObject: baseCoin.priceInfoObjectId!,
+						quotePriceInfoObject: quoteCoin.priceInfoObjectId!,
+						registry: this.#config.MARGIN_REGISTRY_ID,
+						maxOrdersToExecute,
+					},
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
+		};
+
+	/**
+	 * @description Execute conditional orders, deleveraging on each market-type
+	 * fill. Permissionless, with the same trigger and cancellation handling as
+	 * {@link executeConditionalOrders}, but the market proceeds are repaid into
+	 * the loan before the risk check, and the gate is the *net* post-repay
+	 * `risk_ratio` being at least the pre-fill ratio.
+	 *
+	 * This is what lets a stop-loss fire in the `liquidation..min_borrow` danger
+	 * band: a swap alone only lowers the oracle-valued ratio (so the v2
+	 * borrow-floor gate rejects it), while repaying actually improves it. If a
+	 * single triggered fill would worsen net solvency the whole txn aborts — no
+	 * partial-state landing.
+	 * @param {string} managerAddress The address of the margin manager
+	 * @param {string} poolKey The key to identify the pool (e.g., 'SUI_USDC')
+	 * @param {number} maxOrdersToExecute Maximum number of orders to execute in this call
+	 * @returns A function that takes a Transaction object
+	 */
+	executeConditionalOrdersV3 =
+		(managerAddress: string, poolKey: string, maxOrdersToExecute: number) => (tx: Transaction) => {
+			const pool = this.#config.getPool(poolKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
+			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
+			return tx.add(
+				marginManagerMoveCalls.executeConditionalOrdersV3({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						self: managerAddress,
+						pool: pool.address,
+						baseMarginPool: baseMarginPool.address,
+						quoteMarginPool: quoteMarginPool.address,
+						basePriceInfoObject: baseCoin.priceInfoObjectId!,
+						quotePriceInfoObject: quoteCoin.priceInfoObjectId!,
+						registry: this.#config.MARGIN_REGISTRY_ID,
+						maxOrdersToExecute,
+					},
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
 		};
 
 	// === Read-Only Functions ===
@@ -244,11 +300,13 @@ export class MarginTPSLContract {
 		const pool = this.#config.getPool(poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-		return tx.moveCall({
-			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::conditional_order_ids`,
-			arguments: [tx.object(marginManagerId)],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		return tx.add(
+			marginManagerMoveCalls.conditionalOrderIds({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -263,11 +321,13 @@ export class MarginTPSLContract {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::conditional_order`,
-				arguments: [tx.object(marginManagerId), tx.pure.u64(conditionalOrderId)],
-				typeArguments: [baseCoin.type, quoteCoin.type],
-			});
+			return tx.add(
+				marginManagerMoveCalls.conditionalOrder({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: { self: marginManagerId, conditionalOrderId: BigInt(conditionalOrderId) },
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
 		};
 
 	/**
@@ -281,11 +341,13 @@ export class MarginTPSLContract {
 		const pool = this.#config.getPool(poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-		return tx.moveCall({
-			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::lowest_trigger_above_price`,
-			arguments: [tx.object(marginManagerId)],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		return tx.add(
+			marginManagerMoveCalls.lowestTriggerAbovePrice({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -299,10 +361,12 @@ export class MarginTPSLContract {
 		const pool = this.#config.getPool(poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-		return tx.moveCall({
-			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::highest_trigger_below_price`,
-			arguments: [tx.object(marginManagerId)],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		return tx.add(
+			marginManagerMoveCalls.highestTriggerBelowPrice({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 }