@mysten/deepbook-v3 1.5.9 → 1.6.2

package/src/transactions/deepbookAdmin.ts

@@ -7,6 +7,8 @@ import type { CreatePoolAdminParams, SetEwmaParams } from '../types/index.js';
 import type { DeepBookConfig } from '../utils/config.js';
 import { FLOAT_SCALAR } from '../utils/config.js';
 import { convertQuantity, convertPrice, convertRate } from '../utils/conversion.js';
+import * as poolMoveCalls from '../contracts/deepbook/pool.js';
+import * as registryMoveCalls from '../contracts/deepbook/registry.js';
 
 /**
  * DeepBookAdminContract class for managing admin actions.
@@ -52,19 +54,21 @@ export class DeepBookAdminContract {
 		const adjustedLotSize = convertQuantity(lotSize, baseScalar);
 		const adjustedMinSize = convertQuantity(minSize, baseScalar);
 
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::create_pool_admin`,
-			arguments: [
-				tx.object(this.#config.REGISTRY_ID), // registry_id
-				tx.pure.u64(adjustedTickSize), // adjusted tick_size
-				tx.pure.u64(adjustedLotSize), // adjusted lot_size
-				tx.pure.u64(adjustedMinSize), // adjusted min_size
-				tx.pure.bool(whitelisted),
-				tx.pure.bool(stablePool),
-				tx.object(this.#adminCap()),
-			],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			poolMoveCalls.createPoolAdmin({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.REGISTRY_ID,
+					tickSize: adjustedTickSize,
+					lotSize: adjustedLotSize,
+					minSize: adjustedMinSize,
+					whitelistedPool: whitelisted,
+					stablePool,
+					Cap: this.#adminCap(),
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -76,15 +80,17 @@ export class DeepBookAdminContract {
 		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::unregister_pool_admin`,
-			arguments: [
-				tx.object(pool.address),
-				tx.object(this.#config.REGISTRY_ID),
-				tx.object(this.#adminCap()),
-			],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			poolMoveCalls.unregisterPoolAdmin({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					registry: this.#config.REGISTRY_ID,
+					Cap: this.#adminCap(),
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -96,15 +102,17 @@ export class DeepBookAdminContract {
 		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_allowed_versions`,
-			arguments: [
-				tx.object(pool.address),
-				tx.object(this.#config.REGISTRY_ID),
-				tx.object(this.#adminCap()),
-			],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			poolMoveCalls.updateAllowedVersions({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					registry: this.#config.REGISTRY_ID,
+					Cap: this.#adminCap(),
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -113,14 +121,12 @@ export class DeepBookAdminContract {
 	 * @returns A function that takes a Transaction object
 	 */
 	enableVersion = (version: number) => (tx: Transaction) => {
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::enable_version`,
-			arguments: [
-				tx.object(this.#config.REGISTRY_ID),
-				tx.pure.u64(version),
-				tx.object(this.#adminCap()),
-			],
-		});
+		tx.add(
+			registryMoveCalls.enableVersion({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, version, Cap: this.#adminCap() },
+			}),
+		);
 	};
 
 	/**
@@ -129,14 +135,12 @@ export class DeepBookAdminContract {
 	 * @returns A function that takes a Transaction object
 	 */
 	disableVersion = (version: number) => (tx: Transaction) => {
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::disable_version`,
-			arguments: [
-				tx.object(this.#config.REGISTRY_ID),
-				tx.pure.u64(version),
-				tx.object(this.#adminCap()),
-			],
-		});
+		tx.add(
+			registryMoveCalls.disableVersion({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, version, Cap: this.#adminCap() },
+			}),
+		);
 	};
 
 	/**
@@ -145,14 +149,12 @@ export class DeepBookAdminContract {
 	 * @returns A function that takes a Transaction object
 	 */
 	setTreasuryAddress = (treasuryAddress: string) => (tx: Transaction) => {
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::set_treasury_address`,
-			arguments: [
-				tx.object(this.#config.REGISTRY_ID),
-				tx.pure.address(treasuryAddress),
-				tx.object(this.#adminCap()),
-			],
-		});
+		tx.add(
+			registryMoveCalls.setTreasuryAddress({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, treasuryAddress, Cap: this.#adminCap() },
+			}),
+		);
 	};
 
 	/**
@@ -162,11 +164,13 @@ export class DeepBookAdminContract {
 	 */
 	addStableCoin = (stableCoinKey: string) => (tx: Transaction) => {
 		const stableCoinType = this.#config.getCoin(stableCoinKey).type;
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::add_stablecoin`,
-			arguments: [tx.object(this.#config.REGISTRY_ID), tx.object(this.#adminCap())],
-			typeArguments: [stableCoinType],
-		});
+		tx.add(
+			registryMoveCalls.addStablecoin({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, Cap: this.#adminCap() },
+				typeArguments: [stableCoinType],
+			}),
+		);
 	};
 
 	/**
@@ -176,11 +180,13 @@ export class DeepBookAdminContract {
 	 */
 	removeStableCoin = (stableCoinKey: string) => (tx: Transaction) => {
 		const stableCoinType = this.#config.getCoin(stableCoinKey).type;
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::remove_stablecoin`,
-			arguments: [tx.object(this.#config.REGISTRY_ID), tx.object(this.#adminCap())],
-			typeArguments: [stableCoinType],
-		});
+		tx.add(
+			registryMoveCalls.removeStablecoin({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, Cap: this.#adminCap() },
+				typeArguments: [stableCoinType],
+			}),
+		);
 	};
 
 	/**
@@ -200,16 +206,13 @@ export class DeepBookAdminContract {
 
 		const adjustedTickSize = convertPrice(newTickSize, FLOAT_SCALAR, quoteScalar, baseScalar);
 
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::adjust_tick_size_admin`,
-			arguments: [
-				tx.object(pool.address), // pool address
-				tx.pure.u64(adjustedTickSize), // adjusted tick_size
-				tx.object(this.#adminCap()),
-				tx.object.clock(),
-			],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			poolMoveCalls.adjustTickSizeAdmin({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address, newTickSize: adjustedTickSize, Cap: this.#adminCap() },
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -231,17 +234,18 @@ export class DeepBookAdminContract {
 			const adjustedLotSize = convertQuantity(newLotSize, baseScalar);
 			const adjustedMinSize = convertQuantity(newMinSize, baseScalar);
 
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::adjust_min_lot_size_admin`,
-				arguments: [
-					tx.object(pool.address), // pool address
-					tx.pure.u64(adjustedLotSize),
-					tx.pure.u64(adjustedMinSize),
-					tx.object(this.#adminCap()),
-					tx.object.clock(),
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type],
-			});
+			tx.add(
+				poolMoveCalls.adjustMinLotSizeAdmin({
+					package: this.#config.DEEPBOOK_PACKAGE_ID,
+					arguments: {
+						self: pool.address,
+						newLotSize: adjustedLotSize,
+						newMinSize: adjustedMinSize,
+						Cap: this.#adminCap(),
+					},
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
 		};
 
 	/**
@@ -249,10 +253,12 @@ export class DeepBookAdminContract {
 	 * @returns A function that takes a Transaction object
 	 */
 	initBalanceManagerMap = () => (tx: Transaction) => {
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::init_balance_manager_map`,
-			arguments: [tx.object(this.#config.REGISTRY_ID), tx.object(this.#adminCap())],
-		});
+		tx.add(
+			registryMoveCalls.initBalanceManagerMap({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, Cap: this.#adminCap() },
+			}),
+		);
 	};
 
 	/**
@@ -270,18 +276,19 @@ export class DeepBookAdminContract {
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::set_ewma_params`,
-			arguments: [
-				tx.object(pool.address),
-				tx.object(this.#adminCap()),
-				tx.pure.u64(adjustedAlpha),
-				tx.pure.u64(adjustedZScoreThreshold),
-				tx.pure.u64(adjustedAdditionalTakerFee),
-				tx.object.clock(),
-			],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			poolMoveCalls.setEwmaParams({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					Cap: this.#adminCap(),
+					alpha: adjustedAlpha,
+					zScoreThreshold: adjustedZScoreThreshold,
+					additionalTakerFee: adjustedAdditionalTakerFee,
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -295,16 +302,13 @@ export class DeepBookAdminContract {
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::enable_ewma_state`,
-			arguments: [
-				tx.object(pool.address),
-				tx.object(this.#adminCap()),
-				tx.pure.bool(enable),
-				tx.object.clock(),
-			],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			poolMoveCalls.enableEwmaState({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address, Cap: this.#adminCap(), enable },
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -312,11 +316,13 @@ export class DeepBookAdminContract {
 	 * @returns A function that takes a Transaction object
 	 */
 	authorizeMarginApp = () => (tx: Transaction) => {
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::authorize_app`,
-			arguments: [tx.object(this.#config.REGISTRY_ID), tx.object(this.#adminCap())],
-			typeArguments: [`${this.#config.MARGIN_V1}::margin_manager::MarginApp`],
-		});
+		tx.add(
+			registryMoveCalls.authorizeApp({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, AdminCap: this.#adminCap() },
+				typeArguments: [`${this.#config.MARGIN_V1}::margin_manager::MarginApp`],
+			}),
+		);
 	};
 
 	/**
@@ -324,11 +330,13 @@ export class DeepBookAdminContract {
 	 * @returns A function that takes a Transaction object and returns a bool
 	 */
 	deauthorizeMarginApp = () => (tx: Transaction) => {
-		return tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::deauthorize_app`,
-			arguments: [tx.object(this.#config.REGISTRY_ID), tx.object(this.#adminCap())],
-			typeArguments: [`${this.#config.MARGIN_V1}::margin_manager::MarginApp`],
-		});
+		return tx.add(
+			registryMoveCalls.deauthorizeApp({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, AdminCap: this.#adminCap() },
+				typeArguments: [`${this.#config.MARGIN_V1}::margin_manager::MarginApp`],
+			}),
+		);
 	};
 
 	/**
@@ -339,10 +347,12 @@ export class DeepBookAdminContract {
 	 * @returns A function that takes a Transaction object and returns the new pause cap
 	 */
 	mintCorePauseCap = () => (tx: Transaction) => {
-		return tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::mint_pause_cap`,
-			arguments: [tx.object(this.#config.REGISTRY_ID), tx.object(this.#adminCap())],
-		});
+		return tx.add(
+			registryMoveCalls.mintPauseCap({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, Cap: this.#adminCap() },
+			}),
+		);
 	};
 
 	/**
@@ -351,14 +361,12 @@ export class DeepBookAdminContract {
 	 * @returns A function that takes a Transaction object
 	 */
 	revokeCorePauseCap = (pauseCapId: string) => (tx: Transaction) => {
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::revoke_pause_cap`,
-			arguments: [
-				tx.object(this.#config.REGISTRY_ID),
-				tx.object(this.#adminCap()),
-				tx.pure.id(pauseCapId),
-			],
-		});
+		tx.add(
+			registryMoveCalls.revokePauseCap({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID, Cap: this.#adminCap(), pauseCapId },
+			}),
+		);
 	};
 
 	/**
@@ -371,14 +379,12 @@ export class DeepBookAdminContract {
 	 */
 	disableVersionWithCorePauseCap =
 		(version: number | bigint, pauseCapId: string) => (tx: Transaction) => {
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::disable_version_pause_cap`,
-				arguments: [
-					tx.object(this.#config.REGISTRY_ID),
-					tx.pure.u64(version),
-					tx.object(pauseCapId),
-				],
-			});
+			tx.add(
+				registryMoveCalls.disableVersionPauseCap({
+					package: this.#config.DEEPBOOK_PACKAGE_ID,
+					arguments: { self: this.#config.REGISTRY_ID, version, pauseCap: pauseCapId },
+				}),
+			);
 		};
 
 	/**
@@ -387,9 +393,11 @@ export class DeepBookAdminContract {
 	 * @returns A function that takes a Transaction object and returns a `VecSet<ID>`
 	 */
 	corePauseCaps = () => (tx: Transaction) => {
-		return tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::allowed_pause_caps`,
-			arguments: [tx.object(this.#config.REGISTRY_ID)],
-		});
+		return tx.add(
+			registryMoveCalls.allowedPauseCaps({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: this.#config.REGISTRY_ID },
+			}),
+		);
 	};
 }

package/src/transactions/flashLoans.ts

@@ -4,6 +4,7 @@ import type { Transaction, TransactionObjectArgument } from '@mysten/sui/transac
 
 import type { DeepBookConfig } from '../utils/config.js';
 import { convertQuantity } from '../utils/conversion.js';
+import * as poolMoveCalls from '../contracts/deepbook/pool.js';
 
 /**
  * FlashLoanContract class for managing flash loans.
@@ -29,11 +30,13 @@ export class FlashLoanContract {
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 		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)],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		const [baseCoinResult, flashLoan] = tx.add(
+			poolMoveCalls.borrowFlashloanBase({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address, baseAmount: inputQuantity },
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 		return [baseCoinResult, flashLoan] as const;
 	};
 
@@ -61,11 +64,13 @@ export class FlashLoanContract {
 			const [baseCoinReturn] = tx.splitCoins(baseCoinInput, [
 				tx.pure.u64(convertQuantity(borrowAmount, borrowScalar)),
 			]);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::return_flashloan_base`,
-				arguments: [tx.object(pool.address), baseCoinReturn, flashLoan],
-				typeArguments: [baseCoin.type, quoteCoin.type],
-			});
+			tx.add(
+				poolMoveCalls.returnFlashloanBase({
+					package: this.#config.DEEPBOOK_PACKAGE_ID,
+					arguments: { self: pool.address, coin: baseCoinReturn, flashLoan },
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
 
 			return baseCoinInput;
 		};
@@ -81,11 +86,13 @@ export class FlashLoanContract {
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 		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)],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		const [quoteCoinResult, flashLoan] = tx.add(
+			poolMoveCalls.borrowFlashloanQuote({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: { self: pool.address, quoteAmount: inputQuantity },
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 		return [quoteCoinResult, flashLoan] as const;
 	};
 
@@ -113,11 +120,13 @@ export class FlashLoanContract {
 			const [quoteCoinReturn] = tx.splitCoins(quoteCoinInput, [
 				tx.pure.u64(convertQuantity(borrowAmount, borrowScalar)),
 			]);
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::return_flashloan_quote`,
-				arguments: [tx.object(pool.address), quoteCoinReturn, flashLoan],
-				typeArguments: [baseCoin.type, quoteCoin.type],
-			});
+			tx.add(
+				poolMoveCalls.returnFlashloanQuote({
+					package: this.#config.DEEPBOOK_PACKAGE_ID,
+					arguments: { self: pool.address, coin: quoteCoinReturn, flashLoan },
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
 
 			return quoteCoinInput;
 		};

package/src/transactions/governance.ts

@@ -6,6 +6,7 @@ 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';
+import * as poolMoveCalls from '../contracts/deepbook/pool.js';
 
 /**
  * GovernanceContract class for managing governance operations in DeepBook.
@@ -36,16 +37,18 @@ export class GovernanceContract {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const stakeInput = convertQuantity(stakeAmount, DEEP_SCALAR);
 
-			tx.moveCall({
-				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::stake`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(balanceManager.address),
-					tradeProof,
-					tx.pure.u64(stakeInput),
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type],
-			});
+			tx.add(
+				poolMoveCalls.stake({
+					package: this.#config.DEEPBOOK_PACKAGE_ID,
+					arguments: {
+						self: pool.address,
+						balanceManager: balanceManager.address,
+						tradeProof,
+						amount: stakeInput,
+					},
+					typeArguments: [baseCoin.type, quoteCoin.type],
+				}),
+			);
 		};
 
 	/**
@@ -61,11 +64,17 @@ export class GovernanceContract {
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::unstake`,
-			arguments: [tx.object(pool.address), tx.object(balanceManager.address), tradeProof],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			poolMoveCalls.unstake({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
+					tradeProof,
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -82,18 +91,20 @@ export class GovernanceContract {
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::submit_proposal`,
-			arguments: [
-				tx.object(pool.address),
-				tx.object(balanceManager.address),
-				tradeProof,
-				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],
-		});
+		tx.add(
+			poolMoveCalls.submitProposal({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
+					tradeProof,
+					takerFee: convertRate(takerFee, FLOAT_SCALAR),
+					makerFee: convertRate(makerFee, FLOAT_SCALAR),
+					stakeRequired: convertQuantity(stakeRequired, DEEP_SCALAR),
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 
 	/**
@@ -110,15 +121,17 @@ export class GovernanceContract {
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 
-		tx.moveCall({
-			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::vote`,
-			arguments: [
-				tx.object(pool.address),
-				tx.object(balanceManager.address),
-				tradeProof,
-				tx.pure.id(proposal_id),
-			],
-			typeArguments: [baseCoin.type, quoteCoin.type],
-		});
+		tx.add(
+			poolMoveCalls.vote({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
+					tradeProof,
+					proposalId: proposal_id,
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			}),
+		);
 	};
 }