@mysten/deepbook-v3 1.5.8 → 1.6.2

package/src/transactions/marginLiquidations.ts

@@ -5,6 +5,7 @@ import { coinWithBalance } from '@mysten/sui/transactions';
 
 import type { DeepBookConfig } from '../utils/config.js';
 import { convertQuantity } from '../utils/conversion.js';
+import * as liquidationVaultMoveCalls from '../contracts/margin_liquidation/liquidation_vault.js';
 
 /**
  * MarginLiquidationsContract class for managing LiquidationVault operations.
@@ -25,10 +26,12 @@ export class MarginLiquidationsContract {
 	 * @returns A function that takes a Transaction object
 	 */
 	createLiquidationVault = (liquidationAdminCap: string) => (tx: Transaction) => {
-		tx.moveCall({
-			target: `${this.#config.LIQUIDATION_PACKAGE_ID}::liquidation_vault::create_liquidation_vault`,
-			arguments: [tx.object(liquidationAdminCap)],
-		});
+		tx.add(
+			liquidationVaultMoveCalls.createLiquidationVault({
+				package: this.#config.LIQUIDATION_PACKAGE_ID,
+				arguments: { LiquidationCap: liquidationAdminCap },
+			}),
+		);
 	};
 
 	/**
@@ -47,11 +50,13 @@ export class MarginLiquidationsContract {
 				type: coin.type,
 				balance: convertQuantity(amount, coin.scalar),
 			});
-			tx.moveCall({
-				target: `${this.#config.LIQUIDATION_PACKAGE_ID}::liquidation_vault::deposit`,
-				arguments: [tx.object(vaultId), tx.object(liquidationAdminCap), depositCoin],
-				typeArguments: [coin.type],
-			});
+			tx.add(
+				liquidationVaultMoveCalls.deposit({
+					package: this.#config.LIQUIDATION_PACKAGE_ID,
+					arguments: { self: vaultId, LiquidationCap: liquidationAdminCap, coin: depositCoin },
+					typeArguments: [coin.type],
+				}),
+			);
 		};
 
 	/**
@@ -66,15 +71,17 @@ export class MarginLiquidationsContract {
 		(vaultId: string, liquidationAdminCap: string, coinKey: string, amount: number) =>
 		(tx: Transaction) => {
 			const coin = this.#config.getCoin(coinKey);
-			return tx.moveCall({
-				target: `${this.#config.LIQUIDATION_PACKAGE_ID}::liquidation_vault::withdraw`,
-				arguments: [
-					tx.object(vaultId),
-					tx.object(liquidationAdminCap),
-					tx.pure.u64(convertQuantity(amount, coin.scalar)),
-				],
-				typeArguments: [coin.type],
-			});
+			return tx.add(
+				liquidationVaultMoveCalls.withdraw({
+					package: this.#config.LIQUIDATION_PACKAGE_ID,
+					arguments: {
+						self: vaultId,
+						LiquidationCap: liquidationAdminCap,
+						amount: convertQuantity(amount, coin.scalar),
+					},
+					typeArguments: [coin.type],
+				}),
+			);
 		};
 
 	/**
@@ -94,27 +101,30 @@ export class MarginLiquidationsContract {
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 
+			// Build the Option arg first so its pure input registers ahead of the
+			// object inputs (matches the original positional ordering — byte-identical).
 			const repayAmountArg =
 				repayAmount !== undefined
 					? tx.pure.option('u64', convertQuantity(repayAmount, baseCoin.scalar))
 					: tx.pure.option('u64', null);
 
-			tx.moveCall({
-				target: `${this.#config.LIQUIDATION_PACKAGE_ID}::liquidation_vault::liquidate_base`,
-				arguments: [
-					tx.object(vaultId),
-					tx.object(managerAddress),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseCoin.priceInfoObjectId!),
-					tx.object(quoteCoin.priceInfoObjectId!),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(pool.address),
-					repayAmountArg,
-					tx.object.clock(),
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type],
-			});
+			tx.add(
+				liquidationVaultMoveCalls.liquidateBase({
+					package: this.#config.LIQUIDATION_PACKAGE_ID,
+					arguments: {
+						self: vaultId,
+						marginManager: managerAddress,
+						registry: this.#config.MARGIN_REGISTRY_ID,
+						baseOracle: baseCoin.priceInfoObjectId!,
+						quoteOracle: quoteCoin.priceInfoObjectId!,
+						baseMarginPool: baseMarginPool.address,
+						quoteMarginPool: quoteMarginPool.address,
+						pool: pool.address,
+						repayAmount: repayAmountArg,
+					},
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
 		};
 
 	/**
@@ -134,27 +144,30 @@ export class MarginLiquidationsContract {
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 
+			// Build the Option arg first so its pure input registers ahead of the
+			// object inputs (matches the original positional ordering — byte-identical).
 			const repayAmountArg =
 				repayAmount !== undefined
 					? tx.pure.option('u64', convertQuantity(repayAmount, quoteCoin.scalar))
 					: tx.pure.option('u64', null);
 
-			tx.moveCall({
-				target: `${this.#config.LIQUIDATION_PACKAGE_ID}::liquidation_vault::liquidate_quote`,
-				arguments: [
-					tx.object(vaultId),
-					tx.object(managerAddress),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseCoin.priceInfoObjectId!),
-					tx.object(quoteCoin.priceInfoObjectId!),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(pool.address),
-					repayAmountArg,
-					tx.object.clock(),
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type],
-			});
+			tx.add(
+				liquidationVaultMoveCalls.liquidateQuote({
+					package: this.#config.LIQUIDATION_PACKAGE_ID,
+					arguments: {
+						self: vaultId,
+						marginManager: managerAddress,
+						registry: this.#config.MARGIN_REGISTRY_ID,
+						baseOracle: baseCoin.priceInfoObjectId!,
+						quoteOracle: quoteCoin.priceInfoObjectId!,
+						baseMarginPool: baseMarginPool.address,
+						quoteMarginPool: quoteMarginPool.address,
+						pool: pool.address,
+						repayAmount: repayAmountArg,
+					},
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
 		};
 
 	// === Read-Only Functions ===
@@ -167,10 +180,12 @@ export class MarginLiquidationsContract {
 	 */
 	balance = (vaultId: string, coinKey: string) => (tx: Transaction) => {
 		const coin = this.#config.getCoin(coinKey);
-		return tx.moveCall({
-			target: `${this.#config.LIQUIDATION_PACKAGE_ID}::liquidation_vault::balance`,
-			arguments: [tx.object(vaultId)],
-			typeArguments: [coin.type],
-		});
+		return tx.add(
+			liquidationVaultMoveCalls.balance({
+				package: this.#config.LIQUIDATION_PACKAGE_ID,
+				arguments: { self: vaultId },
+				typeArguments: [coin.type],
+			}),
+		);
 	};
 }

package/src/transactions/marginMaintainer.ts

@@ -11,6 +11,8 @@ import type { DeepBookConfig } from '../utils/config.js';
 import type { MarginPoolConfigParams, InterestConfigParams } from '../types/index.js';
 import { FLOAT_SCALAR } from '../utils/config.js';
 import { convertQuantity, convertRate } from '../utils/conversion.js';
+import * as marginPoolMoveCalls from '../contracts/deepbook_margin/margin_pool.js';
+import * as protocolConfigMoveCalls from '../contracts/deepbook_margin/protocol_config.js';
 
 /**
  * DeepBookMaintainerContract class for managing maintainer actions.
@@ -45,16 +47,17 @@ export class MarginMaintainerContract {
 	 */
 	createMarginPool = (coinKey: string, poolConfig: TransactionArgument) => (tx: Transaction) => {
 		const coin = this.#config.getCoin(coinKey);
-		tx.moveCall({
-			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_pool::create_margin_pool`,
-			arguments: [
-				tx.object(this.#config.MARGIN_REGISTRY_ID),
-				poolConfig,
-				tx.object(this.#marginMaintainerCap()),
-				tx.object.clock(),
-			],
-			typeArguments: [coin.type],
-		});
+		tx.add(
+			marginPoolMoveCalls.createMarginPool({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					config: poolConfig,
+					maintainerCap: this.#marginMaintainerCap(),
+				},
+				typeArguments: [coin.type],
+			}),
+		);
 	};
 
 	/**
@@ -84,10 +87,15 @@ export class MarginMaintainerContract {
 					})(tx)
 				: this.newMarginPoolConfig(coinKey, marginPoolConfig)(tx);
 			const interestConfigObject = this.newInterestConfig(interestConfig)(tx);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::protocol_config::new_protocol_config`,
-				arguments: [marginPoolConfigObject, interestConfigObject],
-			});
+			return tx.add(
+				protocolConfigMoveCalls.newProtocolConfig({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						marginPoolConfig: marginPoolConfigObject,
+						interestConfig: interestConfigObject,
+					},
+				}),
+			);
 		};
 
 	/**
@@ -100,15 +108,17 @@ export class MarginMaintainerContract {
 		(coinKey: string, marginPoolConfig: MarginPoolConfigParams) => (tx: Transaction) => {
 			const coin = this.#config.getCoin(coinKey);
 			const { supplyCap, maxUtilizationRate, protocolSpread, minBorrow } = marginPoolConfig;
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::protocol_config::new_margin_pool_config`,
-				arguments: [
-					tx.pure.u64(convertQuantity(supplyCap, coin.scalar)),
-					tx.pure.u64(convertRate(maxUtilizationRate, FLOAT_SCALAR)),
-					tx.pure.u64(convertRate(protocolSpread, FLOAT_SCALAR)),
-					tx.pure.u64(convertQuantity(minBorrow, coin.scalar)),
-				],
-			});
+			return tx.add(
+				protocolConfigMoveCalls.newMarginPoolConfig({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						supplyCap: convertQuantity(supplyCap, coin.scalar),
+						maxUtilizationRate: convertRate(maxUtilizationRate, FLOAT_SCALAR),
+						protocolSpread: convertRate(protocolSpread, FLOAT_SCALAR),
+						minBorrow: convertQuantity(minBorrow, coin.scalar),
+					},
+				}),
+			);
 		};
 
 	/**
@@ -139,18 +149,20 @@ export class MarginMaintainerContract {
 				rateLimitRefillRatePerMs,
 				rateLimitEnabled,
 			} = marginPoolConfig;
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::protocol_config::new_margin_pool_config_with_rate_limit`,
-				arguments: [
-					tx.pure.u64(convertQuantity(supplyCap, coin.scalar)),
-					tx.pure.u64(convertRate(maxUtilizationRate, FLOAT_SCALAR)),
-					tx.pure.u64(convertRate(protocolSpread, FLOAT_SCALAR)),
-					tx.pure.u64(convertQuantity(minBorrow, coin.scalar)),
-					tx.pure.u64(convertQuantity(rateLimitCapacity, coin.scalar)),
-					tx.pure.u64(convertQuantity(rateLimitRefillRatePerMs, coin.scalar)),
-					tx.pure.bool(rateLimitEnabled),
-				],
-			});
+			return tx.add(
+				protocolConfigMoveCalls.newMarginPoolConfigWithRateLimit({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						supplyCap: convertQuantity(supplyCap, coin.scalar),
+						maxUtilizationRate: convertRate(maxUtilizationRate, FLOAT_SCALAR),
+						protocolSpread: convertRate(protocolSpread, FLOAT_SCALAR),
+						minBorrow: convertQuantity(minBorrow, coin.scalar),
+						rateLimitCapacity: convertQuantity(rateLimitCapacity, coin.scalar),
+						rateLimitRefillRatePerMs: convertQuantity(rateLimitRefillRatePerMs, coin.scalar),
+						rateLimitEnabled,
+					},
+				}),
+			);
 		};
 
 	/**
@@ -160,15 +172,17 @@ export class MarginMaintainerContract {
 	 */
 	newInterestConfig = (interestConfig: InterestConfigParams) => (tx: Transaction) => {
 		const { baseRate, baseSlope, optimalUtilization, excessSlope } = interestConfig;
-		return tx.moveCall({
-			target: `${this.#config.MARGIN_PACKAGE_ID}::protocol_config::new_interest_config`,
-			arguments: [
-				tx.pure.u64(convertRate(baseRate, FLOAT_SCALAR)),
-				tx.pure.u64(convertRate(baseSlope, FLOAT_SCALAR)),
-				tx.pure.u64(convertRate(optimalUtilization, FLOAT_SCALAR)),
-				tx.pure.u64(convertRate(excessSlope, FLOAT_SCALAR)),
-			],
-		});
+		return tx.add(
+			protocolConfigMoveCalls.newInterestConfig({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					baseRate: convertRate(baseRate, FLOAT_SCALAR),
+					baseSlope: convertRate(baseSlope, FLOAT_SCALAR),
+					optimalUtilization: convertRate(optimalUtilization, FLOAT_SCALAR),
+					excessSlope: convertRate(excessSlope, FLOAT_SCALAR),
+				},
+			}),
+		);
 	};
 
 	/**
@@ -183,17 +197,18 @@ export class MarginMaintainerContract {
 		(tx: Transaction) => {
 			const deepbookPool = this.#config.getPool(deepbookPoolKey);
 			const marginPool = this.#config.getMarginPool(coinKey);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_pool::enable_deepbook_pool_for_loan`,
-				arguments: [
-					tx.object(marginPool.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.pure.id(deepbookPool.address),
-					tx.object(marginPoolCap),
-					tx.object.clock(),
-				],
-				typeArguments: [marginPool.type],
-			});
+			tx.add(
+				marginPoolMoveCalls.enableDeepbookPoolForLoan({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						self: marginPool.address,
+						registry: this.#config.MARGIN_REGISTRY_ID,
+						deepbookPoolId: deepbookPool.address,
+						marginPoolCap,
+					},
+					typeArguments: [marginPool.type],
+				}),
+			);
 		};
 
 	/**
@@ -208,17 +223,18 @@ export class MarginMaintainerContract {
 		(tx: Transaction) => {
 			const deepbookPool = this.#config.getPool(deepbookPoolKey);
 			const marginPool = this.#config.getMarginPool(coinKey);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_pool::disable_deepbook_pool_for_loan`,
-				arguments: [
-					tx.object(marginPool.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.pure.id(deepbookPool.address),
-					tx.object(marginPoolCap),
-					tx.object.clock(),
-				],
-				typeArguments: [marginPool.type],
-			});
+			tx.add(
+				marginPoolMoveCalls.disableDeepbookPoolForLoan({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						self: marginPool.address,
+						registry: this.#config.MARGIN_REGISTRY_ID,
+						deepbookPoolId: deepbookPool.address,
+						marginPoolCap,
+					},
+					typeArguments: [marginPool.type],
+				}),
+			);
 		};
 
 	/**
@@ -237,17 +253,18 @@ export class MarginMaintainerContract {
 		(tx: Transaction) => {
 			const marginPool = this.#config.getMarginPool(coinKey);
 			const interestConfigObject = this.newInterestConfig(interestConfig)(tx);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_pool::update_interest_params`,
-				arguments: [
-					tx.object(marginPool.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					interestConfigObject,
-					tx.object(marginPoolCap),
-					tx.object.clock(),
-				],
-				typeArguments: [marginPool.type],
-			});
+			tx.add(
+				marginPoolMoveCalls.updateInterestParams({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						self: marginPool.address,
+						registry: this.#config.MARGIN_REGISTRY_ID,
+						interestConfig: interestConfigObject,
+						marginPoolCap,
+					},
+					typeArguments: [marginPool.type],
+				}),
+			);
 		};
 
 	/**
@@ -277,16 +294,17 @@ export class MarginMaintainerContract {
 						rateLimitEnabled: marginPoolConfig.rateLimitEnabled!,
 					})(tx)
 				: this.newMarginPoolConfig(coinKey, marginPoolConfig)(tx);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_pool::update_margin_pool_config`,
-				arguments: [
-					tx.object(marginPool.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					marginPoolConfigObject,
-					tx.object(marginPoolCap),
-					tx.object.clock(),
-				],
-				typeArguments: [marginPool.type],
-			});
+			tx.add(
+				marginPoolMoveCalls.updateMarginPoolConfig({
+					package: this.#config.MARGIN_PACKAGE_ID,
+					arguments: {
+						self: marginPool.address,
+						registry: this.#config.MARGIN_REGISTRY_ID,
+						marginPoolConfig: marginPoolConfigObject,
+						marginPoolCap,
+					},
+					typeArguments: [marginPool.type],
+				}),
+			);
 		};
 }