@mysten/deepbook-v3 1.5.8 → 1.6.2

package/dist/transactions/poolProxy.mjs

@@ -1,6 +1,7 @@
 import { convertPrice, convertQuantity, convertRate } from "../utils/conversion.mjs";
 import { FLOAT_SCALAR, MAX_TIMESTAMP } from "../utils/config.mjs";
 import { OrderType, SelfMatchingOptions } from "../types/index.mjs";
+import { cancelAllOrders, cancelOrder, cancelOrders, claimRebates, modifyOrder, placeLimitOrderV2, placeMarketOrderAndRepayLoan, placeMarketOrderV2, placeReduceOnlyLimitOrderAndRepayLoan, placeReduceOnlyLimitOrderV2, placeReduceOnlyMarketOrderAndRepayLoan, placeReduceOnlyMarketOrderV2, stake, submitProposal, unstake, updateCurrentPrice, vote, withdrawSettledAmounts, withdrawSettledAmountsPermissionless } from "../contracts/deepbook_margin/pool_proxy.mjs";
 
 //#region src/transactions/poolProxy.ts
 /**
@@ -22,28 +23,27 @@ var PoolProxyContract = class {
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 			const inputPrice = convertPrice(price, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::place_limit_order_v2`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(manager.address),
-					tx.object(pool.address),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					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()
-				],
+			return tx.add(placeLimitOrderV2({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: manager.address,
+					pool: pool.address,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					clientOrderId: BigInt(clientOrderId),
+					orderType,
+					selfMatchingOption,
+					price: inputPrice,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep,
+					expireTimestamp: expiration
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.placeMarketOrder = (params) => (tx) => {
 			const { poolKey, marginManagerKey, clientOrderId, quantity, isBid, selfMatchingOption = SelfMatchingOptions.SELF_MATCHING_ALLOWED, payWithDeep = true } = params;
@@ -54,25 +54,24 @@ var PoolProxyContract = class {
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::place_market_order_v2`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(manager.address),
-					tx.object(pool.address),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.pure.u64(clientOrderId),
-					tx.pure.u8(selfMatchingOption),
-					tx.pure.u64(inputQuantity),
-					tx.pure.bool(isBid),
-					tx.pure.bool(payWithDeep),
-					tx.object.clock()
-				],
+			return tx.add(placeMarketOrderV2({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: manager.address,
+					pool: pool.address,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					clientOrderId: BigInt(clientOrderId),
+					selfMatchingOption,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.placeReduceOnlyLimitOrder = (params) => (tx) => {
 			const { poolKey, marginManagerKey, clientOrderId, price, quantity, isBid, expiration = MAX_TIMESTAMP, orderType = OrderType.NO_RESTRICTION, selfMatchingOption = SelfMatchingOptions.SELF_MATCHING_ALLOWED, payWithDeep = true } = params;
@@ -84,28 +83,27 @@ var PoolProxyContract = class {
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 			const inputPrice = convertPrice(price, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::place_reduce_only_limit_order_v2`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(manager.address),
-					tx.object(pool.address),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					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()
-				],
+			return tx.add(placeReduceOnlyLimitOrderV2({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: manager.address,
+					pool: pool.address,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					clientOrderId: BigInt(clientOrderId),
+					orderType,
+					selfMatchingOption,
+					price: inputPrice,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep,
+					expireTimestamp: expiration
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.placeReduceOnlyMarketOrder = (params) => (tx) => {
 			const { poolKey, marginManagerKey, clientOrderId, quantity, isBid, selfMatchingOption = SelfMatchingOptions.SELF_MATCHING_ALLOWED, payWithDeep = true } = params;
@@ -116,25 +114,112 @@ var PoolProxyContract = class {
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::place_reduce_only_market_order_v2`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(manager.address),
-					tx.object(pool.address),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.pure.u64(clientOrderId),
-					tx.pure.u8(selfMatchingOption),
-					tx.pure.u64(inputQuantity),
-					tx.pure.bool(isBid),
-					tx.pure.bool(payWithDeep),
-					tx.object.clock()
-				],
+			return tx.add(placeReduceOnlyMarketOrderV2({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: manager.address,
+					pool: pool.address,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					clientOrderId: BigInt(clientOrderId),
+					selfMatchingOption,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
+		};
+		this.placeMarketOrderAndRepayLoan = (params) => (tx) => {
+			const { poolKey, marginManagerKey, clientOrderId, quantity, isBid, selfMatchingOption = SelfMatchingOptions.SELF_MATCHING_ALLOWED, payWithDeep = true } = params;
+			const pool = this.#config.getPool(poolKey);
+			const manager = this.#config.getMarginManager(marginManagerKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
+			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
+			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
+			return tx.add(placeMarketOrderAndRepayLoan({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: manager.address,
+					pool: pool.address,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					clientOrderId: BigInt(clientOrderId),
+					selfMatchingOption,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
+		};
+		this.placeReduceOnlyLimitOrderAndRepayLoan = (params) => (tx) => {
+			const { poolKey, marginManagerKey, clientOrderId, price, quantity, isBid, expiration = MAX_TIMESTAMP, orderType = OrderType.NO_RESTRICTION, selfMatchingOption = SelfMatchingOptions.SELF_MATCHING_ALLOWED, payWithDeep = true } = params;
+			const pool = this.#config.getPool(poolKey);
+			const manager = this.#config.getMarginManager(marginManagerKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
+			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
+			const inputPrice = convertPrice(price, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar);
+			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
+			return tx.add(placeReduceOnlyLimitOrderAndRepayLoan({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: manager.address,
+					pool: pool.address,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					clientOrderId: BigInt(clientOrderId),
+					orderType,
+					selfMatchingOption,
+					price: inputPrice,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep,
+					expireTimestamp: expiration
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
+		};
+		this.placeReduceOnlyMarketOrderAndRepayLoan = (params) => (tx) => {
+			const { poolKey, marginManagerKey, clientOrderId, quantity, isBid, selfMatchingOption = SelfMatchingOptions.SELF_MATCHING_ALLOWED, payWithDeep = true } = params;
+			const pool = this.#config.getPool(poolKey);
+			const manager = this.#config.getMarginManager(marginManagerKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
+			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
+			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
+			return tx.add(placeReduceOnlyMarketOrderAndRepayLoan({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: manager.address,
+					pool: pool.address,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					clientOrderId: BigInt(clientOrderId),
+					selfMatchingOption,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
 		};
 		this.modifyOrder = (marginManagerKey, orderId, newQuantity) => (tx) => {
 			const marginManager = this.#config.getMarginManager(marginManagerKey);
@@ -142,83 +227,79 @@ var PoolProxyContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const inputQuantity = convertQuantity(newQuantity, baseCoin.scalar);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::modify_order`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address),
-					tx.pure.u128(orderId),
-					tx.pure.u64(inputQuantity),
-					tx.object.clock()
-				],
+			tx.add(modifyOrder({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address,
+					orderId: BigInt(orderId),
+					newQuantity: inputQuantity
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.cancelOrder = (marginManagerKey, orderId) => (tx) => {
 			const marginManager = this.#config.getMarginManager(marginManagerKey);
 			const pool = this.#config.getPool(marginManager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::cancel_order`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address),
-					tx.pure.u128(orderId),
-					tx.object.clock()
-				],
+			tx.add(cancelOrder({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address,
+					orderId: BigInt(orderId)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.cancelOrders = (marginManagerKey, orderIds) => (tx) => {
 			const marginManager = this.#config.getMarginManager(marginManagerKey);
 			const pool = this.#config.getPool(marginManager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::cancel_orders`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address),
-					tx.pure.vector("u128", orderIds),
-					tx.object.clock()
-				],
+			tx.add(cancelOrders({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address,
+					orderIds: orderIds.map(BigInt)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.cancelAllOrders = (marginManagerKey) => (tx) => {
 			const marginManager = this.#config.getMarginManager(marginManagerKey);
 			const pool = this.#config.getPool(marginManager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::cancel_all_orders`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address),
-					tx.object.clock()
-				],
+			tx.add(cancelAllOrders({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.withdrawSettledAmounts = (marginManagerKey) => (tx) => {
 			const marginManager = this.#config.getMarginManager(marginManagerKey);
 			const pool = this.#config.getPool(marginManager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::withdraw_settled_amounts`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address)
-				],
+			tx.add(withdrawSettledAmounts({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.stake = (marginManagerKey, stakeAmount) => (tx) => {
 			const marginManager = this.#config.getMarginManager(marginManagerKey);
@@ -226,31 +307,31 @@ var PoolProxyContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const stakeInput = convertQuantity(stakeAmount, this.#config.getCoin("DEEP").scalar);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::stake`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address),
-					tx.pure.u64(stakeInput)
-				],
+			tx.add(stake({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address,
+					amount: stakeInput
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.unstake = (marginManagerKey) => (tx) => {
 			const marginManager = this.#config.getMarginManager(marginManagerKey);
 			const pool = this.#config.getPool(marginManager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::unstake`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address)
-				],
+			tx.add(unstake({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.submitProposal = (marginManagerKey, params) => (tx) => {
 			const { takerFee, makerFee, stakeRequired } = params;
@@ -261,63 +342,63 @@ var PoolProxyContract = class {
 			const stakeInput = convertRate(stakeRequired, FLOAT_SCALAR);
 			const takerFeeInput = convertRate(takerFee, FLOAT_SCALAR);
 			const makerFeeInput = convertRate(makerFee, FLOAT_SCALAR);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::submit_proposal`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address),
-					tx.pure.u64(takerFeeInput),
-					tx.pure.u64(makerFeeInput),
-					tx.pure.u64(stakeInput)
-				],
+			tx.add(submitProposal({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address,
+					takerFee: takerFeeInput,
+					makerFee: makerFeeInput,
+					stakeRequired: stakeInput
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.vote = (marginManagerKey, proposalId) => (tx) => {
 			const marginManager = this.#config.getMarginManager(marginManagerKey);
 			const pool = this.#config.getPool(marginManager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::vote`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address),
-					tx.pure.id(proposalId)
-				],
+			tx.add(vote({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address,
+					proposalId
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.claimRebate = (marginManagerKey) => (tx) => {
 			const marginManager = this.#config.getMarginManager(marginManagerKey);
 			const pool = this.#config.getPool(marginManager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::claim_rebates`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManager.address),
-					tx.object(pool.address)
-				],
+			tx.add(claimRebates({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManager.address,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.withdrawMarginSettledAmounts = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::pool_proxy::withdraw_settled_amounts_permissionless`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(marginManagerId),
-					tx.object(pool.address)
-				],
+			tx.add(withdrawSettledAmountsPermissionless({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginManager: marginManagerId,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.updateCurrentPrice = (poolKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -325,17 +406,16 @@ var PoolProxyContract = class {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			if (!baseCoin.priceInfoObjectId) throw new Error(`Missing priceInfoObjectId for ${pool.baseCoin}`);
 			if (!quoteCoin.priceInfoObjectId) throw new Error(`Missing priceInfoObjectId for ${pool.quoteCoin}`);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::pool_proxy::update_current_price`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(pool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.object.clock()
-				],
+			tx.add(updateCurrentPrice({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					pool: pool.address,
+					basePriceInfoObject: baseCoin.priceInfoObjectId,
+					quotePriceInfoObject: quoteCoin.priceInfoObjectId
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.#config = config;
 	}