@mysten/deepbook-v3 1.5.8 → 1.6.2

package/dist/transactions/deepbook.mjs

@@ -1,6 +1,8 @@
 import { convertPrice, convertQuantity, convertRate } from "../utils/conversion.mjs";
 import { DEEP_SCALAR, FLOAT_SCALAR, GAS_BUDGET, MAX_TIMESTAMP, POOL_CREATION_FEE_DEEP } from "../utils/config.mjs";
 import { OrderType, SelfMatchingOptions } from "../types/index.mjs";
+import { account, accountExists, accountOpenOrders, addDeepPricePoint, burnDeep, canPlaceLimitOrder, canPlaceMarketOrder, cancelAllOrders, cancelLiveOrder, cancelLiveOrders, cancelOrder, cancelOrders, checkLimitOrderParams, checkMarketOrderParams, claimPoolReferralRewards, claimRebates, createPermissionlessPool, getAccountOrderDetails, getBaseQuantityIn, getBaseQuantityOut, getBaseQuantityOutInputFee, getLevel2Range, getLevel2TicksFromMid, getOrder, getOrderDeepPrice, getOrderDeepRequired, getOrders, getPoolIdByAsset, getPoolReferralBalances, getQuantityOut, getQuantityOutInputFee, getQuoteQuantityIn, getQuoteQuantityOut, getQuoteQuantityOutInputFee, id, lockedBalance, midPrice, mintReferral, modifyOrder, placeLimitOrder, placeMarketOrder, poolBookParams, poolReferralMultiplier, poolTradeParams, poolTradeParamsNext, quorum, registeredPool, stablePool, swapExactBaseForQuote, swapExactBaseForQuoteWithManager, swapExactQuantity, swapExactQuantityWithManager, swapExactQuoteForBase, swapExactQuoteForBaseWithManager, updatePoolAllowedVersions, updatePoolReferralMultiplier, vaultBalances, whitelisted, withdrawSettledAmounts, withdrawSettledAmountsPermissionless } from "../contracts/deepbook/pool.mjs";
+import { getBalanceManagerIds } from "../contracts/deepbook/registry.mjs";
 import { coinWithBalance } from "@mysten/sui/transactions";
 
 //#region src/transactions/deepbook.ts
@@ -23,24 +25,23 @@ var DeepBookContract = class {
 			const inputPrice = convertPrice(price, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::place_limit_order`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
+			tx.add(placeLimitOrder({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					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(expiration),
-					tx.object.clock()
-				],
+					clientOrderId: BigInt(clientOrderId),
+					orderType,
+					selfMatchingOption,
+					price: inputPrice,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep,
+					expireTimestamp: expiration
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.placeMarketOrder = (params) => (tx) => {
 			const { poolKey, balanceManagerKey, clientOrderId, quantity, isBid, selfMatchingOption = SelfMatchingOptions.SELF_MATCHING_ALLOWED, payWithDeep = true } = params;
@@ -51,21 +52,20 @@ var DeepBookContract = class {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::place_market_order`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
+			tx.add(placeMarketOrder({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					tx.pure.u64(clientOrderId),
-					tx.pure.u8(selfMatchingOption),
-					tx.pure.u64(inputQuantity),
-					tx.pure.bool(isBid),
-					tx.pure.bool(payWithDeep),
-					tx.object.clock()
-				],
+					clientOrderId: BigInt(clientOrderId),
+					selfMatchingOption,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.modifyOrder = (poolKey, balanceManagerKey, orderId, newQuantity) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -74,18 +74,17 @@ var DeepBookContract = class {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
 			const inputQuantity = convertQuantity(newQuantity, baseCoin.scalar);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::modify_order`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
+			tx.add(modifyOrder({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					tx.pure.u128(orderId),
-					tx.pure.u64(inputQuantity),
-					tx.object.clock()
-				],
+					orderId: BigInt(orderId),
+					newQuantity: inputQuantity
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.cancelOrder = (poolKey, balanceManagerKey, orderId) => (tx) => {
 			tx.setGasBudgetIfNotSet(GAS_BUDGET);
@@ -94,17 +93,16 @@ var DeepBookContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::cancel_order`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
+			tx.add(cancelOrder({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					tx.pure.u128(orderId),
-					tx.object.clock()
-				],
+					orderId: BigInt(orderId)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.cancelOrders = (poolKey, balanceManagerKey, orderIds) => (tx) => {
 			tx.setGasBudgetIfNotSet(GAS_BUDGET);
@@ -113,17 +111,16 @@ var DeepBookContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::cancel_orders`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
+			tx.add(cancelOrders({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					tx.pure.vector("u128", orderIds),
-					tx.object.clock()
-				],
+					orderIds: orderIds.map(BigInt)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.cancelLiveOrder = (poolKey, balanceManagerKey, orderId) => (tx) => {
 			tx.setGasBudgetIfNotSet(GAS_BUDGET);
@@ -132,17 +129,16 @@ var DeepBookContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::cancel_live_order`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
+			tx.add(cancelLiveOrder({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					tx.pure.u128(orderId),
-					tx.object.clock()
-				],
+					orderId: BigInt(orderId)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.cancelLiveOrders = (poolKey, balanceManagerKey, orderIds) => (tx) => {
 			tx.setGasBudgetIfNotSet(GAS_BUDGET);
@@ -151,17 +147,16 @@ var DeepBookContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::cancel_live_orders`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
+			tx.add(cancelLiveOrders({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					tx.pure.vector("u128", orderIds),
-					tx.object.clock()
-				],
+					orderIds: orderIds.map(BigInt)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.cancelAllOrders = (poolKey, balanceManagerKey) => (tx) => {
 			tx.setGasBudgetIfNotSet(GAS_BUDGET);
@@ -170,16 +165,15 @@ var DeepBookContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::cancel_all_orders`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
-					tradeProof,
-					tx.object.clock()
-				],
+			tx.add(cancelAllOrders({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
+					tradeProof
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.withdrawSettledAmounts = (poolKey, balanceManagerKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -187,36 +181,42 @@ var DeepBookContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::withdraw_settled_amounts`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
+			tx.add(withdrawSettledAmounts({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof
-				],
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.withdrawSettledAmountsPermissionless = (poolKey, balanceManagerKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::withdraw_settled_amounts_permissionless`,
-				arguments: [tx.object(pool.address), tx.object(balanceManager.address)],
+			tx.add(withdrawSettledAmountsPermissionless({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.withdrawSettledAmountsManagerID = (poolKey, balanceManagerId) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::withdraw_settled_amounts_permissionless`,
-				arguments: [tx.object(pool.address), tx.object(balanceManagerId)],
+			tx.add(withdrawSettledAmountsPermissionless({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManagerId
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.addDeepPricePoint = (targetPoolKey, referencePoolKey) => (tx) => {
 			const targetPool = this.#config.getPool(targetPoolKey);
@@ -225,20 +225,19 @@ var DeepBookContract = class {
 			const targetQuoteCoin = this.#config.getCoin(targetPool.quoteCoin);
 			const referenceBaseCoin = this.#config.getCoin(referencePool.baseCoin);
 			const referenceQuoteCoin = this.#config.getCoin(referencePool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::add_deep_price_point`,
-				arguments: [
-					tx.object(targetPool.address),
-					tx.object(referencePool.address),
-					tx.object.clock()
-				],
+			tx.add(addDeepPricePoint({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					targetPool: targetPool.address,
+					referencePool: referencePool.address
+				},
 				typeArguments: [
 					targetBaseCoin.type,
 					targetQuoteCoin.type,
 					referenceBaseCoin.type,
 					referenceQuoteCoin.type
 				]
-			});
+			}));
 		};
 		this.claimRebates = (poolKey, balanceManagerKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -246,51 +245,57 @@ var DeepBookContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::claim_rebates`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
+			tx.add(claimRebates({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof
-				],
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.mintReferral = (poolKey, multiplier) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const adjustedNumber = convertRate(multiplier, FLOAT_SCALAR);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::mint_referral`,
-				arguments: [tx.object(pool.address), tx.pure.u64(adjustedNumber)],
+			tx.add(mintReferral({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					multiplier: adjustedNumber
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.updatePoolReferralMultiplier = (poolKey, referral, multiplier) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const adjustedNumber = convertRate(multiplier, FLOAT_SCALAR);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::update_pool_referral_multiplier`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(referral),
-					tx.pure.u64(adjustedNumber)
-				],
+			tx.add(updatePoolReferralMultiplier({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					referral,
+					multiplier: adjustedNumber
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.claimPoolReferralRewards = (poolKey, referral) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			const [baseRewards, quoteRewards, deepRewards] = tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::claim_pool_referral_rewards`,
-				arguments: [tx.object(pool.address), tx.object(referral)],
+			const [baseRewards, quoteRewards, deepRewards] = tx.add(claimPoolReferralRewards({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					referral
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 			return {
 				baseRewards,
 				quoteRewards,
@@ -301,164 +306,174 @@ var DeepBookContract = class {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::update_pool_allowed_versions`,
-				arguments: [tx.object(pool.address), tx.object(this.#config.REGISTRY_ID)],
+			tx.add(updatePoolAllowedVersions({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					registry: this.#config.REGISTRY_ID
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getOrder = (poolKey, orderId) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_order`,
-				arguments: [tx.object(pool.address), tx.pure.u128(orderId)],
+			tx.add(getOrder({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					orderId: BigInt(orderId)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getOrders = (poolKey, orderIds) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_orders`,
-				arguments: [tx.object(pool.address), tx.pure.vector("u128", orderIds)],
+			tx.add(getOrders({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					orderIds: orderIds.map(BigInt)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.burnDeep = (poolKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::burn_deep`,
-				arguments: [tx.object(pool.address), tx.object(this.#config.DEEP_TREASURY_ID)],
+			tx.add(burnDeep({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					treasuryCap: this.#config.DEEP_TREASURY_ID
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.midPrice = (poolKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::mid_price`,
-				arguments: [tx.object(pool.address), tx.object.clock()],
+			tx.add(midPrice({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.whitelisted = (poolKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::whitelisted`,
-				arguments: [tx.object(pool.address)],
+			tx.add(whitelisted({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getQuoteQuantityOut = (poolKey, baseQuantity) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_quote_quantity_out`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(baseQuantity, baseCoin.scalar)),
-					tx.object.clock()
-				],
+			tx.add(getQuoteQuantityOut({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					baseQuantity: convertQuantity(baseQuantity, baseCoin.scalar)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getBaseQuantityOut = (poolKey, quoteQuantity) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const quoteScalar = quoteCoin.scalar;
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_base_quantity_out`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(quoteQuantity, quoteScalar)),
-					tx.object.clock()
-				],
+			tx.add(getBaseQuantityOut({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					quoteQuantity: convertQuantity(quoteQuantity, quoteScalar)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getQuantityOut = (poolKey, baseQuantity, quoteQuantity) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const quoteScalar = quoteCoin.scalar;
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_quantity_out`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(baseQuantity, baseCoin.scalar)),
-					tx.pure.u64(convertQuantity(quoteQuantity, quoteScalar)),
-					tx.object.clock()
-				],
+			tx.add(getQuantityOut({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					baseQuantity: convertQuantity(baseQuantity, baseCoin.scalar),
+					quoteQuantity: convertQuantity(quoteQuantity, quoteScalar)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.accountOpenOrders = (poolKey, managerKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const manager = this.#config.getBalanceManager(managerKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::account_open_orders`,
-				arguments: [tx.object(pool.address), tx.object(manager.address)],
+			tx.add(accountOpenOrders({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: manager.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getLevel2Range = (poolKey, priceLow, priceHigh, isBid) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_level2_range`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(convertPrice(priceLow, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar)),
-					tx.pure.u64(convertPrice(priceHigh, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar)),
-					tx.pure.bool(isBid),
-					tx.object.clock()
-				],
+			tx.add(getLevel2Range({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					priceLow: convertPrice(priceLow, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar),
+					priceHigh: convertPrice(priceHigh, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar),
+					isBid
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getLevel2TicksFromMid = (poolKey, tickFromMid) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_level2_ticks_from_mid`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(tickFromMid),
-					tx.object.clock()
-				],
+			tx.add(getLevel2TicksFromMid({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					ticks: tickFromMid
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.vaultBalances = (poolKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::vault_balances`,
-				arguments: [tx.object(pool.address)],
+			tx.add(vaultBalances({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getPoolIdByAssets = (baseType, quoteType) => (tx) => {
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_pool_id_by_asset`,
-				arguments: [tx.object(this.#config.REGISTRY_ID)],
+			tx.add(getPoolIdByAsset({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { registry: this.#config.REGISTRY_ID },
 				typeArguments: [baseType, quoteType]
-			});
+			}));
 		};
 		this.swapExactBaseForQuote = (params) => (tx) => {
 			tx.setGasBudgetIfNotSet(GAS_BUDGET);
@@ -478,17 +493,16 @@ var DeepBookContract = class {
 				balance: convertQuantity(deepAmount, DEEP_SCALAR)
 			});
 			const minQuoteInput = convertQuantity(minQuote, quoteCoin.scalar);
-			const [baseCoinResult, quoteCoinResult, deepCoinResult] = tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::swap_exact_base_for_quote`,
-				arguments: [
-					tx.object(pool.address),
-					baseCoinInput,
-					deepCoin,
-					tx.pure.u64(minQuoteInput),
-					tx.object.clock()
-				],
+			const [baseCoinResult, quoteCoinResult, deepCoinResult] = tx.add(swapExactBaseForQuote({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					baseIn: baseCoinInput,
+					deepIn: deepCoin,
+					minQuoteOut: minQuoteInput
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 			return [
 				baseCoinResult,
 				quoteCoinResult,
@@ -513,17 +527,16 @@ var DeepBookContract = class {
 				balance: convertQuantity(deepAmount, DEEP_SCALAR)
 			});
 			const minBaseInput = convertQuantity(minBase, baseCoin.scalar);
-			const [baseCoinResult, quoteCoinResult, deepCoinResult] = tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::swap_exact_quote_for_base`,
-				arguments: [
-					tx.object(pool.address),
-					quoteCoinInput,
-					deepCoin,
-					tx.pure.u64(minBaseInput),
-					tx.object.clock()
-				],
+			const [baseCoinResult, quoteCoinResult, deepCoinResult] = tx.add(swapExactQuoteForBase({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					quoteIn: quoteCoinInput,
+					deepIn: deepCoin,
+					minBaseOut: minBaseInput
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 			return [
 				baseCoinResult,
 				quoteCoinResult,
@@ -557,18 +570,17 @@ var DeepBookContract = class {
 				balance: convertQuantity(deepAmount, DEEP_SCALAR)
 			});
 			const minOutInput = convertQuantity(minOut, isBaseToCoin ? quoteCoinType.scalar : baseCoinType.scalar);
-			const [baseCoinResult, quoteCoinResult, deepCoinResult] = tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::swap_exact_quantity`,
-				arguments: [
-					tx.object(pool.address),
-					baseCoinInput,
-					quoteCoinInput,
-					deepCoinInput,
-					tx.pure.u64(minOutInput),
-					tx.object.clock()
-				],
+			const [baseCoinResult, quoteCoinResult, deepCoinResult] = tx.add(swapExactQuantity({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					baseIn: baseCoinInput,
+					quoteIn: quoteCoinInput,
+					deepIn: deepCoinInput,
+					minOut: minOutInput
+				},
 				typeArguments: [baseCoinType.type, quoteCoinType.type]
-			});
+			}));
 			return [
 				baseCoinResult,
 				quoteCoinResult,
@@ -587,20 +599,19 @@ var DeepBookContract = class {
 				balance: convertQuantity(baseAmount, baseCoinType.scalar)
 			});
 			const minQuoteInput = convertQuantity(minQuote, quoteCoinType.scalar);
-			const [baseCoinResult, quoteCoinResult] = tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::swap_exact_base_for_quote_with_manager`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
-					tx.object(tradeCap),
-					tx.object(depositCap),
-					tx.object(withdrawCap),
-					baseCoinInput,
-					tx.pure.u64(minQuoteInput),
-					tx.object.clock()
-				],
+			const [baseCoinResult, quoteCoinResult] = tx.add(swapExactBaseForQuoteWithManager({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
+					tradeCap,
+					depositCap,
+					withdrawCap,
+					baseIn: baseCoinInput,
+					minQuoteOut: minQuoteInput
+				},
 				typeArguments: [baseCoinType.type, quoteCoinType.type]
-			});
+			}));
 			return [baseCoinResult, quoteCoinResult];
 		};
 		this.swapExactQuoteForBaseWithManager = (params) => (tx) => {
@@ -615,20 +626,19 @@ var DeepBookContract = class {
 				balance: convertQuantity(quoteAmount, quoteCoinType.scalar)
 			});
 			const minBaseInput = convertQuantity(minBase, baseCoinType.scalar);
-			const [baseCoinResult, quoteCoinResult] = tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::swap_exact_quote_for_base_with_manager`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
-					tx.object(tradeCap),
-					tx.object(depositCap),
-					tx.object(withdrawCap),
-					quoteCoinInput,
-					tx.pure.u64(minBaseInput),
-					tx.object.clock()
-				],
+			const [baseCoinResult, quoteCoinResult] = tx.add(swapExactQuoteForBaseWithManager({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
+					tradeCap,
+					depositCap,
+					withdrawCap,
+					quoteIn: quoteCoinInput,
+					minBaseOut: minBaseInput
+				},
 				typeArguments: [baseCoinType.type, quoteCoinType.type]
-			});
+			}));
 			return [baseCoinResult, quoteCoinResult];
 		};
 		this.swapExactQuantityWithManager = (params) => (tx) => {
@@ -653,21 +663,20 @@ var DeepBookContract = class {
 				balance: convertQuantity(amount, quoteCoinType.scalar)
 			});
 			const minOutInput = convertQuantity(minOut, isBaseToCoin ? quoteCoinType.scalar : baseCoinType.scalar);
-			const [baseCoinResult, quoteCoinResult] = tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::swap_exact_quantity_with_manager`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
-					tx.object(tradeCap),
-					tx.object(depositCap),
-					tx.object(withdrawCap),
-					baseCoinInput,
-					quoteCoinInput,
-					tx.pure.u64(minOutInput),
-					tx.object.clock()
-				],
+			const [baseCoinResult, quoteCoinResult] = tx.add(swapExactQuantityWithManager({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
+					tradeCap,
+					depositCap,
+					withdrawCap,
+					baseIn: baseCoinInput,
+					quoteIn: quoteCoinInput,
+					minOut: minOutInput
+				},
 				typeArguments: [baseCoinType.type, quoteCoinType.type]
-			});
+			}));
 			return [baseCoinResult, quoteCoinResult];
 		};
 		this.createPermissionlessPool = (params) => (tx) => {
@@ -685,199 +694,212 @@ var DeepBookContract = class {
 				type: deepCoinType,
 				balance: POOL_CREATION_FEE_DEEP
 			});
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::create_permissionless_pool`,
-				arguments: [
-					tx.object(this.#config.REGISTRY_ID),
-					tx.pure.u64(adjustedTickSize),
-					tx.pure.u64(adjustedLotSize),
-					tx.pure.u64(adjustedMinSize),
-					deepCoinInput
-				],
+			tx.add(createPermissionlessPool({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.REGISTRY_ID,
+					tickSize: adjustedTickSize,
+					lotSize: adjustedLotSize,
+					minSize: adjustedMinSize,
+					creationFee: deepCoinInput
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.poolTradeParams = (poolKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::pool_trade_params`,
-				arguments: [tx.object(pool.address)],
+			tx.add(poolTradeParams({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.poolBookParams = (poolKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::pool_book_params`,
-				arguments: [tx.object(pool.address)],
+			tx.add(poolBookParams({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.account = (poolKey, managerKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const managerId = this.#config.getBalanceManager(managerKey).address;
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::account`,
-				arguments: [tx.object(pool.address), tx.object(managerId)],
+			tx.add(account({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: managerId
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.lockedBalance = (poolKey, managerKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const managerId = this.#config.getBalanceManager(managerKey).address;
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::locked_balance`,
-				arguments: [tx.object(pool.address), tx.object(managerId)],
+			tx.add(lockedBalance({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: managerId
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getPoolDeepPrice = (poolKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_order_deep_price`,
-				arguments: [tx.object(pool.address)],
+			tx.add(getOrderDeepPrice({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getBalanceManagerIds = (owner) => (tx) => {
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::get_balance_manager_ids`,
-				arguments: [tx.object(this.#config.REGISTRY_ID), tx.pure.address(owner)]
-			});
+			tx.add(getBalanceManagerIds({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: this.#config.REGISTRY_ID,
+					owner
+				}
+			}));
 		};
 		this.getPoolReferralBalances = (poolKey, referral) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::get_pool_referral_balances`,
-				arguments: [tx.object(pool.address), tx.object(referral)],
+			return tx.add(getPoolReferralBalances({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					referral
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.poolReferralMultiplier = (poolKey, referral) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::pool_referral_multiplier`,
-				arguments: [tx.object(pool.address), tx.object(referral)],
+			return tx.add(poolReferralMultiplier({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					referral
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.stablePool = (poolKey) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::stable_pool`,
-				arguments: [tx.object(pool.address)],
+			return tx.add(stablePool({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.registeredPool = (poolKey) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::registered_pool`,
-				arguments: [tx.object(pool.address)],
+			return tx.add(registeredPool({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getQuoteQuantityOutInputFee = (poolKey, baseQuantity) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::get_quote_quantity_out_input_fee`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(baseQuantity, baseCoin.scalar)),
-					tx.object.clock()
-				],
+			return tx.add(getQuoteQuantityOutInputFee({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					baseQuantity: convertQuantity(baseQuantity, baseCoin.scalar)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getBaseQuantityOutInputFee = (poolKey, quoteQuantity) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::get_base_quantity_out_input_fee`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(quoteQuantity, quoteCoin.scalar)),
-					tx.object.clock()
-				],
+			return tx.add(getBaseQuantityOutInputFee({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					quoteQuantity: convertQuantity(quoteQuantity, quoteCoin.scalar)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getQuantityOutInputFee = (poolKey, baseQuantity, quoteQuantity) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::get_quantity_out_input_fee`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(baseQuantity, baseCoin.scalar)),
-					tx.pure.u64(convertQuantity(quoteQuantity, quoteCoin.scalar)),
-					tx.object.clock()
-				],
+			return tx.add(getQuantityOutInputFee({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					baseQuantity: convertQuantity(baseQuantity, baseCoin.scalar),
+					quoteQuantity: convertQuantity(quoteQuantity, quoteCoin.scalar)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getBaseQuantityIn = (poolKey, targetQuoteQuantity, payWithDeep) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::get_base_quantity_in`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(targetQuoteQuantity, quoteCoin.scalar)),
-					tx.pure.bool(payWithDeep),
-					tx.object.clock()
-				],
+			return tx.add(getBaseQuantityIn({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					targetQuoteQuantity: convertQuantity(targetQuoteQuantity, quoteCoin.scalar),
+					payWithDeep
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getQuoteQuantityIn = (poolKey, targetBaseQuantity, payWithDeep) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::get_quote_quantity_in`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(targetBaseQuantity, baseCoin.scalar)),
-					tx.pure.bool(payWithDeep),
-					tx.object.clock()
-				],
+			return tx.add(getQuoteQuantityIn({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					targetBaseQuantity: convertQuantity(targetBaseQuantity, baseCoin.scalar),
+					payWithDeep
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getAccountOrderDetails = (poolKey, managerKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const manager = this.#config.getBalanceManager(managerKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_account_order_details`,
-				arguments: [tx.object(pool.address), tx.object(manager.address)],
+			return tx.add(getAccountOrderDetails({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: manager.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getOrderDeepRequired = (poolKey, baseQuantity, price) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -885,56 +907,59 @@ var DeepBookContract = class {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const inputPrice = convertPrice(price, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar);
 			const inputQuantity = convertQuantity(baseQuantity, baseCoin.scalar);
-			return tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_order_deep_required`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(inputQuantity),
-					tx.pure.u64(inputPrice)
-				],
+			return tx.add(getOrderDeepRequired({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					baseQuantity: inputQuantity,
+					price: inputPrice
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.accountExists = (poolKey, managerKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const manager = this.#config.getBalanceManager(managerKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::account_exists`,
-				arguments: [tx.object(pool.address), tx.object(manager.address)],
+			return tx.add(accountExists({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: manager.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.poolTradeParamsNext = (poolKey) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::pool_trade_params_next`,
-				arguments: [tx.object(pool.address)],
+			return tx.add(poolTradeParamsNext({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.quorum = (poolKey) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::quorum`,
-				arguments: [tx.object(pool.address)],
+			return tx.add(quorum({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.poolId = (poolKey) => (tx) => {
 			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.DEEPBOOK_PACKAGE_ID}::pool::id`,
-				arguments: [tx.object(pool.address)],
+			return tx.add(id({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.canPlaceLimitOrder = (params) => (tx) => {
 			const { poolKey, balanceManagerKey, price, quantity, isBid, payWithDeep, expireTimestamp } = params;
@@ -944,20 +969,19 @@ var DeepBookContract = class {
 			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.DEEPBOOK_PACKAGE_ID}::pool::can_place_limit_order`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(manager.address),
-					tx.pure.u64(inputPrice),
-					tx.pure.u64(inputQuantity),
-					tx.pure.bool(isBid),
-					tx.pure.bool(payWithDeep),
-					tx.pure.u64(expireTimestamp),
-					tx.object.clock()
-				],
+			return tx.add(canPlaceLimitOrder({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: manager.address,
+					price: inputPrice,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep,
+					expireTimestamp
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.canPlaceMarketOrder = (params) => (tx) => {
 			const { poolKey, balanceManagerKey, quantity, isBid, payWithDeep } = params;
@@ -966,29 +990,31 @@ var DeepBookContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
-			return tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::can_place_market_order`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(manager.address),
-					tx.pure.u64(inputQuantity),
-					tx.pure.bool(isBid),
-					tx.pure.bool(payWithDeep),
-					tx.object.clock()
-				],
+			return tx.add(canPlaceMarketOrder({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: manager.address,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.checkMarketOrderParams = (poolKey, quantity) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
-			return tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::check_market_order_params`,
-				arguments: [tx.object(pool.address), tx.pure.u64(inputQuantity)],
+			return tx.add(checkMarketOrderParams({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					quantity: inputQuantity
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.checkLimitOrderParams = (poolKey, price, quantity, expireTimestamp) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -996,17 +1022,16 @@ var DeepBookContract = class {
 			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.DEEPBOOK_PACKAGE_ID}::pool::check_limit_order_params`,
-				arguments: [
-					tx.object(pool.address),
-					tx.pure.u64(inputPrice),
-					tx.pure.u64(inputQuantity),
-					tx.pure.u64(expireTimestamp),
-					tx.object.clock()
-				],
+			return tx.add(checkLimitOrderParams({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					price: inputPrice,
+					quantity: inputQuantity,
+					expireTimestamp
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.#config = config;
 	}