@haneullabs/deepbook-v3 0.1.0 → 1.2.1

package/src/transactions/flashLoans.ts

@@ -3,6 +3,7 @@
 import type { Transaction, TransactionObjectArgument } from '@haneullabs/haneul/transactions';
 
 import type { DeepBookConfig } from '../utils/config.js';
+import { convertQuantity } from '../utils/conversion.js';
 
 /**
  * FlashLoanContract class for managing flash loans.
@@ -27,7 +28,7 @@ export class FlashLoanContract {
 		const pool = this.#config.getPool(poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-		const inputQuantity = Math.round(borrowAmount * baseCoin.scalar);
+		const inputQuantity = convertQuantity(borrowAmount, baseCoin.scalar);
 		const [baseCoinResult, flashLoan] = tx.moveCall({
 			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::borrow_flashloan_base`,
 			arguments: [tx.object(pool.address), tx.pure.u64(inputQuantity)],
@@ -58,7 +59,7 @@ export class FlashLoanContract {
 			const borrowScalar = baseCoin.scalar;
 
 			const [baseCoinReturn] = tx.splitCoins(baseCoinInput, [
-				tx.pure.u64(Math.round(borrowAmount * borrowScalar)),
+				tx.pure.u64(convertQuantity(borrowAmount, borrowScalar)),
 			]);
 			tx.moveCall({
 				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::return_flashloan_base`,
@@ -79,7 +80,7 @@ export class FlashLoanContract {
 		const pool = this.#config.getPool(poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-		const inputQuantity = Math.round(borrowAmount * quoteCoin.scalar);
+		const inputQuantity = convertQuantity(borrowAmount, quoteCoin.scalar);
 		const [quoteCoinResult, flashLoan] = tx.moveCall({
 			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::borrow_flashloan_quote`,
 			arguments: [tx.object(pool.address), tx.pure.u64(inputQuantity)],
@@ -110,7 +111,7 @@ export class FlashLoanContract {
 			const borrowScalar = quoteCoin.scalar;
 
 			const [quoteCoinReturn] = tx.splitCoins(quoteCoinInput, [
-				tx.pure.u64(Math.round(borrowAmount * borrowScalar)),
+				tx.pure.u64(convertQuantity(borrowAmount, borrowScalar)),
 			]);
 			tx.moveCall({
 				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::return_flashloan_quote`,

package/src/transactions/governance.ts

@@ -5,6 +5,7 @@ import type { Transaction } from '@haneullabs/haneul/transactions';
 import type { ProposalParams } from '../types/index.js';
 import type { DeepBookConfig } from '../utils/config.js';
 import { DEEP_SCALAR, FLOAT_SCALAR } from '../utils/config.js';
+import { convertQuantity, convertRate } from '../utils/conversion.js';
 
 /**
  * GovernanceContract class for managing governance operations in DeepBook.
@@ -33,7 +34,7 @@ export class GovernanceContract {
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			const stakeInput = Math.round(stakeAmount * DEEP_SCALAR);
+			const stakeInput = convertQuantity(stakeAmount, DEEP_SCALAR);
 
 			tx.moveCall({
 				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::stake`,
@@ -87,9 +88,9 @@ export class GovernanceContract {
 				tx.object(pool.address),
 				tx.object(balanceManager.address),
 				tradeProof,
-				tx.pure.u64(Math.round(takerFee * FLOAT_SCALAR)),
-				tx.pure.u64(Math.round(makerFee * FLOAT_SCALAR)),
-				tx.pure.u64(Math.round(stakeRequired * DEEP_SCALAR)),
+				tx.pure.u64(convertRate(takerFee, FLOAT_SCALAR)),
+				tx.pure.u64(convertRate(makerFee, FLOAT_SCALAR)),
+				tx.pure.u64(convertQuantity(stakeRequired, DEEP_SCALAR)),
 			],
 			typeArguments: [baseCoin.type, quoteCoin.type],
 		});

package/src/transactions/marginAdmin.ts

@@ -7,7 +7,8 @@ import type { DeepBookConfig } from '../utils/config.js';
 import type { TransactionArgument } from '@haneullabs/haneul/transactions';
 import type { PoolConfigParams } from '../types/index.js';
 import { FLOAT_SCALAR } from '../utils/config.js';
-import { hexToBytes } from '@noble/hashes/utils';
+import { convertRate } from '../utils/conversion.js';
+import { hexToBytes } from '@noble/hashes/utils.js';
 
 /**
  * MarginAdminContract class for managing admin actions.
@@ -239,12 +240,12 @@ export class MarginAdminContract {
 			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::new_pool_config`,
 			arguments: [
 				tx.object(this.#config.MARGIN_REGISTRY_ID),
-				tx.pure.u64(minWithdrawRiskRatio * FLOAT_SCALAR),
-				tx.pure.u64(minBorrowRiskRatio * FLOAT_SCALAR),
-				tx.pure.u64(liquidationRiskRatio * FLOAT_SCALAR),
-				tx.pure.u64(targetLiquidationRiskRatio * FLOAT_SCALAR),
-				tx.pure.u64(userLiquidationReward * FLOAT_SCALAR),
-				tx.pure.u64(poolLiquidationReward * FLOAT_SCALAR),
+				tx.pure.u64(convertRate(minWithdrawRiskRatio, FLOAT_SCALAR)),
+				tx.pure.u64(convertRate(minBorrowRiskRatio, FLOAT_SCALAR)),
+				tx.pure.u64(convertRate(liquidationRiskRatio, FLOAT_SCALAR)),
+				tx.pure.u64(convertRate(targetLiquidationRiskRatio, FLOAT_SCALAR)),
+				tx.pure.u64(convertRate(userLiquidationReward, FLOAT_SCALAR)),
+				tx.pure.u64(convertRate(poolLiquidationReward, FLOAT_SCALAR)),
 			],
 			typeArguments: [baseCoin.type, quoteCoin.type],
 		});
@@ -262,7 +263,10 @@ export class MarginAdminContract {
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 		tx.moveCall({
 			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::new_pool_config_with_leverage`,
-			arguments: [tx.object(this.#config.MARGIN_REGISTRY_ID), tx.pure.u64(leverage * FLOAT_SCALAR)],
+			arguments: [
+				tx.object(this.#config.MARGIN_REGISTRY_ID),
+				tx.pure.u64(convertRate(leverage, FLOAT_SCALAR)),
+			],
 			typeArguments: [baseCoin.type, quoteCoin.type],
 		});
 	};

package/src/transactions/marginLiquidations.ts

@@ -4,6 +4,7 @@ import type { Transaction } from '@haneullabs/haneul/transactions';
 import { coinWithBalance } from '@haneullabs/haneul/transactions';
 
 import type { DeepBookConfig } from '../utils/config.js';
+import { convertQuantity } from '../utils/conversion.js';
 
 /**
  * MarginLiquidationsContract class for managing LiquidationVault operations.
@@ -44,7 +45,7 @@ export class MarginLiquidationsContract {
 			const coin = this.#config.getCoin(coinKey);
 			const depositCoin = coinWithBalance({
 				type: coin.type,
-				balance: amount * coin.scalar,
+				balance: convertQuantity(amount, coin.scalar),
 			});
 			tx.moveCall({
 				target: `${this.#config.LIQUIDATION_PACKAGE_ID}::liquidation_vault::deposit`,
@@ -70,7 +71,7 @@ export class MarginLiquidationsContract {
 				arguments: [
 					tx.object(vaultId),
 					tx.object(liquidationAdminCap),
-					tx.pure.u64(amount * coin.scalar),
+					tx.pure.u64(convertQuantity(amount, coin.scalar)),
 				],
 				typeArguments: [coin.type],
 			});
@@ -95,7 +96,7 @@ export class MarginLiquidationsContract {
 
 			const repayAmountArg =
 				repayAmount !== undefined
-					? tx.pure.option('u64', BigInt(Math.floor(repayAmount * baseCoin.scalar)))
+					? tx.pure.option('u64', convertQuantity(repayAmount, baseCoin.scalar))
 					: tx.pure.option('u64', null);
 
 			tx.moveCall({
@@ -135,7 +136,7 @@ export class MarginLiquidationsContract {
 
 			const repayAmountArg =
 				repayAmount !== undefined
-					? tx.pure.option('u64', BigInt(Math.floor(repayAmount * quoteCoin.scalar)))
+					? tx.pure.option('u64', convertQuantity(repayAmount, quoteCoin.scalar))
 					: tx.pure.option('u64', null);
 
 			tx.moveCall({

package/src/transactions/marginMaintainer.ts

@@ -10,6 +10,7 @@ import type {
 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';
 
 /**
  * DeepBookMaintainerContract class for managing maintainer actions.
@@ -102,10 +103,10 @@ export class MarginMaintainerContract {
 			return tx.moveCall({
 				target: `${this.#config.MARGIN_PACKAGE_ID}::protocol_config::new_margin_pool_config`,
 				arguments: [
-					tx.pure.u64(supplyCap * coin.scalar),
-					tx.pure.u64(maxUtilizationRate * FLOAT_SCALAR),
-					tx.pure.u64(referralSpread * FLOAT_SCALAR),
-					tx.pure.u64(Math.round(minBorrow * coin.scalar)),
+					tx.pure.u64(convertQuantity(supplyCap, coin.scalar)),
+					tx.pure.u64(convertRate(maxUtilizationRate, FLOAT_SCALAR)),
+					tx.pure.u64(convertRate(referralSpread, FLOAT_SCALAR)),
+					tx.pure.u64(convertQuantity(minBorrow, coin.scalar)),
 				],
 			});
 		};
@@ -141,12 +142,12 @@ export class MarginMaintainerContract {
 			return tx.moveCall({
 				target: `${this.#config.MARGIN_PACKAGE_ID}::protocol_config::new_margin_pool_config_with_rate_limit`,
 				arguments: [
-					tx.pure.u64(supplyCap * coin.scalar),
-					tx.pure.u64(maxUtilizationRate * FLOAT_SCALAR),
-					tx.pure.u64(referralSpread * FLOAT_SCALAR),
-					tx.pure.u64(Math.round(minBorrow * coin.scalar)),
-					tx.pure.u64(Math.round(rateLimitCapacity * coin.scalar)),
-					tx.pure.u64(Math.round(rateLimitRefillRatePerMs * coin.scalar)),
+					tx.pure.u64(convertQuantity(supplyCap, coin.scalar)),
+					tx.pure.u64(convertRate(maxUtilizationRate, FLOAT_SCALAR)),
+					tx.pure.u64(convertRate(referralSpread, 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),
 				],
 			});
@@ -162,10 +163,10 @@ export class MarginMaintainerContract {
 		return tx.moveCall({
 			target: `${this.#config.MARGIN_PACKAGE_ID}::protocol_config::new_interest_config`,
 			arguments: [
-				tx.pure.u64(baseRate * FLOAT_SCALAR),
-				tx.pure.u64(baseSlope * FLOAT_SCALAR),
-				tx.pure.u64(optimalUtilization * FLOAT_SCALAR),
-				tx.pure.u64(excessSlope * FLOAT_SCALAR),
+				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)),
 			],
 		});
 	};
@@ -253,7 +254,7 @@ export class MarginMaintainerContract {
 	 * @description Update the margin pool config
 	 * @param {string} coinKey The key to identify the margin pool
 	 * @param {TransactionObjectArgument} marginPoolCap The margin pool cap
-	 * @param {MarginPoolConfigParams} marginPoolConfig The configuration for the margin pool
+	 * @param {MarginPoolConfigParams} marginPoolConfig The configuration for the margin pool (with optional rate limit)
 	 * @returns A function that takes a Transaction object
 	 */
 	updateMarginPoolConfig =
@@ -264,7 +265,18 @@ export class MarginMaintainerContract {
 		) =>
 		(tx: Transaction) => {
 			const marginPool = this.#config.getMarginPool(coinKey);
-			const marginPoolConfigObject = this.newMarginPoolConfig(coinKey, marginPoolConfig)(tx);
+			const hasRateLimit =
+				marginPoolConfig.rateLimitCapacity !== undefined &&
+				marginPoolConfig.rateLimitRefillRatePerMs !== undefined &&
+				marginPoolConfig.rateLimitEnabled !== undefined;
+			const marginPoolConfigObject = hasRateLimit
+				? this.newMarginPoolConfigWithRateLimit(coinKey, {
+						...marginPoolConfig,
+						rateLimitCapacity: marginPoolConfig.rateLimitCapacity!,
+						rateLimitRefillRatePerMs: marginPoolConfig.rateLimitRefillRatePerMs!,
+						rateLimitEnabled: marginPoolConfig.rateLimitEnabled!,
+					})(tx)
+				: this.newMarginPoolConfig(coinKey, marginPoolConfig)(tx);
 			tx.moveCall({
 				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_pool::update_margin_pool_config`,
 				arguments: [

package/src/transactions/marginManager.ts

@@ -4,6 +4,8 @@ import type { Transaction, TransactionArgument } from '@haneullabs/haneul/transa
 import { coinWithBalance } from '@haneullabs/haneul/transactions';
 
 import type { DeepBookConfig } from '../utils/config.js';
+import type { DepositParams, DepositDuringInitParams } from '../types/index.js';
+import { convertQuantity } from '../utils/conversion.js';
 
 /**
  * MarginManagerContract class for managing MarginManager operations.
@@ -81,21 +83,62 @@ export class MarginManagerContract {
 			});
 		};
 
+	/**
+	 * @description Deposit into a margin manager during initialization (before sharing).
+	 * Use this when you need to deposit funds into a newly created manager in the same transaction.
+	 * @param {DepositDuringInitParams} params The deposit parameters
+	 * @returns A function that takes a Transaction object
+	 */
+	depositDuringInitialization = (params: DepositDuringInitParams) => (tx: Transaction) => {
+		const { manager, poolKey, coinType } = params;
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		// Get the deposit coin from config using the coinType key (e.g., 'HANEUL', 'DBUSDC', 'DEEP')
+		const depositCoin = this.#config.getCoin(coinType);
+
+		// If amount is provided, create a coin with balance; otherwise use the provided coin
+		const coin =
+			'amount' in params && params.amount !== undefined
+				? coinWithBalance({
+						type: depositCoin.type,
+						balance: convertQuantity(params.amount, depositCoin.scalar),
+					})
+				: params.coin;
+
+		tx.moveCall({
+			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::deposit`,
+			arguments: [
+				manager,
+				tx.object(this.#config.MARGIN_REGISTRY_ID),
+				tx.object(baseCoin.priceInfoObjectId!),
+				tx.object(quoteCoin.priceInfoObjectId!),
+				coin,
+				tx.object.clock(),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type, depositCoin.type],
+		});
+	};
+
 	/**
 	 * @description Deposit base into a margin manager
-	 * @param {string} managerKey The key to identify the manager
-	 * @param {number} amount The amount to deposit
+	 * @param {DepositParams} params The deposit parameters
 	 * @returns A function that takes a Transaction object
 	 */
-	depositBase = (managerKey: string, amount: number) => (tx: Transaction) => {
+	depositBase = (params: DepositParams) => (tx: Transaction) => {
+		const { managerKey } = params;
 		const manager = this.#config.getMarginManager(managerKey);
 		const pool = this.#config.getPool(manager.poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-		const coin = coinWithBalance({
-			type: baseCoin.type,
-			balance: amount * baseCoin.scalar,
-		});
+		const coin =
+			'amount' in params && params.amount !== undefined
+				? coinWithBalance({
+						type: baseCoin.type,
+						balance: convertQuantity(params.amount, baseCoin.scalar),
+					})
+				: params.coin;
 		tx.moveCall({
 			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::deposit`,
 			arguments: [
@@ -112,19 +155,22 @@ export class MarginManagerContract {
 
 	/**
 	 * @description Deposit quote into a margin manager
-	 * @param {string} managerKey The key to identify the manager
-	 * @param {number} amount The amount to deposit
+	 * @param {DepositParams} params The deposit parameters
 	 * @returns A function that takes a Transaction object
 	 */
-	depositQuote = (managerKey: string, amount: number) => (tx: Transaction) => {
+	depositQuote = (params: DepositParams) => (tx: Transaction) => {
+		const { managerKey } = params;
 		const manager = this.#config.getMarginManager(managerKey);
 		const pool = this.#config.getPool(manager.poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-		const coin = coinWithBalance({
-			type: quoteCoin.type,
-			balance: amount * quoteCoin.scalar,
-		});
+		const coin =
+			'amount' in params && params.amount !== undefined
+				? coinWithBalance({
+						type: quoteCoin.type,
+						balance: convertQuantity(params.amount, quoteCoin.scalar),
+					})
+				: params.coin;
 		tx.moveCall({
 			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::deposit`,
 			arguments: [
@@ -141,20 +187,23 @@ export class MarginManagerContract {
 
 	/**
 	 * @description Deposit deep into a margin manager
-	 * @param {string} managerKey The key to identify the manager
-	 * @param {number} amount The amount to deposit
+	 * @param {DepositParams} params The deposit parameters
 	 * @returns A function that takes a Transaction object
 	 */
-	depositDeep = (managerKey: string, amount: number) => (tx: Transaction) => {
+	depositDeep = (params: DepositParams) => (tx: Transaction) => {
+		const { managerKey } = params;
 		const manager = this.#config.getMarginManager(managerKey);
 		const pool = this.#config.getPool(manager.poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 		const deepCoin = this.#config.getCoin('DEEP');
-		const coin = coinWithBalance({
-			type: deepCoin.type,
-			balance: amount * deepCoin.scalar,
-		});
+		const coin =
+			'amount' in params && params.amount !== undefined
+				? coinWithBalance({
+						type: deepCoin.type,
+						balance: convertQuantity(params.amount, deepCoin.scalar),
+					})
+				: params.coin;
 		tx.moveCall({
 			target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::deposit`,
 			arguments: [
@@ -192,7 +241,7 @@ export class MarginManagerContract {
 				tx.object(baseCoin.priceInfoObjectId!),
 				tx.object(quoteCoin.priceInfoObjectId!),
 				tx.object(pool.address),
-				tx.pure.u64(amount * baseCoin.scalar),
+				tx.pure.u64(convertQuantity(amount, baseCoin.scalar)),
 				tx.object.clock(),
 			],
 			typeArguments: [baseCoin.type, quoteCoin.type, baseCoin.type],
@@ -222,7 +271,7 @@ export class MarginManagerContract {
 				tx.object(baseCoin.priceInfoObjectId!),
 				tx.object(quoteCoin.priceInfoObjectId!),
 				tx.object(pool.address),
-				tx.pure.u64(amount * quoteCoin.scalar),
+				tx.pure.u64(convertQuantity(amount, quoteCoin.scalar)),
 				tx.object.clock(),
 			],
 			typeArguments: [baseCoin.type, quoteCoin.type, quoteCoin.type],
@@ -253,7 +302,7 @@ export class MarginManagerContract {
 				tx.object(baseCoin.priceInfoObjectId!),
 				tx.object(quoteCoin.priceInfoObjectId!),
 				tx.object(pool.address),
-				tx.pure.u64(amount * deepCoin.scalar),
+				tx.pure.u64(convertQuantity(amount, deepCoin.scalar)),
 				tx.object.clock(),
 			],
 			typeArguments: [baseCoin.type, quoteCoin.type, deepCoin.type],
@@ -281,7 +330,7 @@ export class MarginManagerContract {
 				tx.object(baseCoin.priceInfoObjectId!),
 				tx.object(quoteCoin.priceInfoObjectId!),
 				tx.object(pool.address),
-				tx.pure.u64(amount * baseCoin.scalar),
+				tx.pure.u64(convertQuantity(amount, baseCoin.scalar)),
 				tx.object.clock(),
 			],
 			typeArguments: [baseCoin.type, quoteCoin.type],
@@ -309,7 +358,7 @@ export class MarginManagerContract {
 				tx.object(baseCoin.priceInfoObjectId!),
 				tx.object(quoteCoin.priceInfoObjectId!),
 				tx.object(pool.address),
-				tx.pure.u64(amount * quoteCoin.scalar),
+				tx.pure.u64(convertQuantity(amount, quoteCoin.scalar)),
 				tx.object.clock(),
 			],
 			typeArguments: [baseCoin.type, quoteCoin.type],
@@ -336,7 +385,7 @@ export class MarginManagerContract {
 				tx.object(baseMarginPool.address),
 				tx.object.option({
 					type: 'u64',
-					value: amount ? tx.pure.u64(amount * baseCoin.scalar) : null,
+					value: amount ? tx.pure.u64(convertQuantity(amount, baseCoin.scalar)) : null,
 				}),
 				tx.object.clock(),
 			],
@@ -364,7 +413,7 @@ export class MarginManagerContract {
 				tx.object(quoteMarginPool.address),
 				tx.object.option({
 					type: 'u64',
-					value: amount ? tx.pure.u64(amount * quoteCoin.scalar) : null,
+					value: amount ? tx.pure.u64(convertQuantity(amount, quoteCoin.scalar)) : null,
 				}),
 				tx.object.clock(),
 			],
@@ -406,7 +455,7 @@ export class MarginManagerContract {
 					repayCoin,
 					tx.object.clock(),
 				],
-				typeArguments: [baseCoin.type, quoteCoin.type],
+				typeArguments: [baseCoin.type, quoteCoin.type, debtIsBase ? baseCoin.type : quoteCoin.type],
 			});
 		};
 

package/src/transactions/marginPool.ts

@@ -4,6 +4,7 @@ import { coinWithBalance } from '@haneullabs/haneul/transactions';
 import type { Transaction, TransactionObjectArgument } from '@haneullabs/haneul/transactions';
 
 import type { DeepBookConfig } from '../utils/config.js';
+import { convertQuantity } from '../utils/conversion.js';
 
 /**
  * MarginPoolContract class for managing MarginPool operations.
@@ -48,7 +49,7 @@ export class MarginPoolContract {
 			tx.setSenderIfNotSet(this.#config.address);
 			const marginPool = this.#config.getMarginPool(coinKey);
 			const coin = this.#config.getCoin(coinKey);
-			const depositInput = Math.round(amountToDeposit * coin.scalar);
+			const depositInput = convertQuantity(amountToDeposit, coin.scalar);
 			const supply = coinWithBalance({
 				type: coin.type,
 				balance: depositInput,
@@ -72,10 +73,10 @@ export class MarginPoolContract {
 		};
 
 	/**
-	 * @description Withdraw from a margin pool
+	 * @description Withdraw from a margin pool. If amountToWithdraw is not provided, withdraws all.
 	 * @param {string} coinKey The key to identify the pool
 	 * @param {TransactionObjectArgument} supplierCap The supplier cap object
-	 * @param {number} amountToWithdraw The amount to withdraw
+	 * @param {number} [amountToWithdraw] The amount to withdraw. If omitted, withdraws all.
 	 * @returns A function that takes a Transaction object
 	 */
 	withdrawFromMarginPool =
@@ -83,16 +84,15 @@ export class MarginPoolContract {
 		(tx: Transaction) => {
 			const marginPool = this.#config.getMarginPool(coinKey);
 			const coin = this.#config.getCoin(coinKey);
-			const withdrawInput = amountToWithdraw
-				? tx.pure.u64(Math.round(amountToWithdraw * coin.scalar))
-				: null;
+			const withdrawInput =
+				amountToWithdraw !== undefined ? convertQuantity(amountToWithdraw, coin.scalar) : null;
 			return tx.moveCall({
 				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_pool::withdraw`,
 				arguments: [
 					tx.object(marginPool.address),
 					tx.object(this.#config.MARGIN_REGISTRY_ID),
 					supplierCap,
-					tx.object.option({ type: 'u64', value: withdrawInput }),
+					tx.pure.option('u64', withdrawInput),
 					tx.object.clock(),
 				],
 				typeArguments: [marginPool.type],

package/src/transactions/marginTPSL.ts

@@ -10,6 +10,7 @@ import type {
 } from '../types/index.js';
 import { OrderType, SelfMatchingOptions } from '../types/index.js';
 import { MAX_TIMESTAMP, FLOAT_SCALAR } from '../utils/config.js';
+import { convertQuantity, convertPrice } from '../utils/conversion.js';
 
 /**
  * MarginTPSLContract class for managing Take Profit / Stop Loss operations.
@@ -34,12 +35,16 @@ export class MarginTPSLContract {
 	 * @returns A function that takes a Transaction object
 	 */
 	newCondition =
-		(poolKey: string, triggerBelowPrice: boolean, triggerPrice: number) => (tx: Transaction) => {
+		(poolKey: string, triggerBelowPrice: boolean, triggerPrice: number | bigint) =>
+		(tx: Transaction) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			const inputPrice = Math.round(
-				(triggerPrice * FLOAT_SCALAR * quoteCoin.scalar) / baseCoin.scalar,
+			const inputPrice = convertPrice(
+				triggerPrice,
+				FLOAT_SCALAR,
+				quoteCoin.scalar,
+				baseCoin.scalar,
 			);
 			return tx.moveCall({
 				target: `${this.#config.MARGIN_PACKAGE_ID}::tpsl::new_condition`,
@@ -68,8 +73,8 @@ export class MarginTPSLContract {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			const inputPrice = Math.round((price * FLOAT_SCALAR * quoteCoin.scalar) / baseCoin.scalar);
-			const inputQuantity = Math.round(quantity * baseCoin.scalar);
+			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: [
@@ -102,7 +107,7 @@ export class MarginTPSLContract {
 			} = params;
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
-			const inputQuantity = Math.round(quantity * baseCoin.scalar);
+			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
 			return tx.moveCall({
 				target: `${this.#config.MARGIN_PACKAGE_ID}::tpsl::new_pending_market_order`,
 				arguments: [
@@ -195,20 +200,20 @@ export class MarginTPSLContract {
 	/**
 	 * @description Execute conditional orders that have been triggered
 	 * This is a permissionless function that can be called by anyone
-	 * @param {string} marginManagerKey The key to identify the margin manager
+	 * @param {string} managerAddress The address of the margin manager
+	 * @param {string} poolKey The key to identify the pool (e.g., 'HANEUL_USDC')
 	 * @param {number} maxOrdersToExecute Maximum number of orders to execute in this call
 	 * @returns A function that takes a Transaction object
 	 */
 	executeConditionalOrders =
-		(marginManagerKey: string, maxOrdersToExecute: number) => (tx: Transaction) => {
-			const manager = this.#config.getMarginManager(marginManagerKey);
-			const pool = this.#config.getPool(manager.poolKey);
+		(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);
 			return tx.moveCall({
 				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::execute_conditional_orders`,
 				arguments: [
-					tx.object(manager.address),
+					tx.object(managerAddress),
 					tx.object(pool.address),
 					tx.object(baseCoin.priceInfoObjectId!),
 					tx.object(quoteCoin.priceInfoObjectId!),