@mysten/deepbook-v3 1.5.9 → 1.6.2

package/dist/transactions/marginManager.mjs

@@ -1,5 +1,6 @@
 import { convertPrice, convertQuantity } from "../utils/conversion.mjs";
 import { FLOAT_SCALAR } from "../utils/config.mjs";
+import { _new, account, accountExists, accountOpenOrders, balanceManager, balanceManagerId, baseBalance, borrowBase, borrowQuote, borrowedBaseShares, borrowedQuoteShares, borrowedShares, calculateAssets, calculateDebts, canPlaceLimitOrder, canPlaceMarketOrder, deepBalance, deepbookPool, deposit, getAccountOrderDetails, getBalanceManagerReferralId, hasBaseDebt, liquidate, lockedBalance, managerState, marginPoolId, newWithInitializer, owner, quoteBalance, registerMarginManager, repayBase, repayQuote, setMarginManagerReferral, share, unregisterMarginManager, unsetMarginManagerReferral, withdraw } from "../contracts/deepbook_margin/margin_manager.mjs";
 import { coinWithBalance } from "@mysten/sui/transactions";
 
 //#region src/transactions/marginManager.ts
@@ -16,31 +17,29 @@ var MarginManagerContract = 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.MARGIN_PACKAGE_ID}::margin_manager::new`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(this.#config.REGISTRY_ID),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object.clock()
-				],
+			tx.add(_new({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					pool: pool.address,
+					deepbookRegistry: this.#config.REGISTRY_ID,
+					marginRegistry: this.#config.MARGIN_REGISTRY_ID
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.newMarginManagerWithInitializer = (poolKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			const [manager, initializer] = tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::new_with_initializer`,
-				arguments: [
-					tx.object(pool.address),
-					tx.object(this.#config.REGISTRY_ID),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object.clock()
-				],
+			const [manager, initializer] = tx.add(newWithInitializer({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					pool: pool.address,
+					deepbookRegistry: this.#config.REGISTRY_ID,
+					marginRegistry: this.#config.MARGIN_REGISTRY_ID
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 			return {
 				manager,
 				initializer
@@ -50,33 +49,42 @@ var MarginManagerContract = 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.MARGIN_PACKAGE_ID}::margin_manager::share`,
-				arguments: [manager, initializer],
+			tx.add(share({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					manager,
+					initializer
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.registerMarginManager = (managerKey) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
 			const pool = this.#config.getPool(manager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::register_margin_manager`,
-				arguments: [tx.object(manager.address), tx.object(this.#config.MARGIN_REGISTRY_ID)],
+			tx.add(registerMarginManager({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					marginRegistry: this.#config.MARGIN_REGISTRY_ID
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.unregisterMarginManager = (managerKey) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
 			const pool = this.#config.getPool(manager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::unregister_margin_manager`,
-				arguments: [tx.object(manager.address), tx.object(this.#config.MARGIN_REGISTRY_ID)],
+			tx.add(unregisterMarginManager({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					marginRegistry: this.#config.MARGIN_REGISTRY_ID
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.depositDuringInitialization = (params) => (tx) => {
 			const { manager, poolKey, coinType } = params;
@@ -88,22 +96,21 @@ var MarginManagerContract = class {
 				type: depositCoin.type,
 				balance: convertQuantity(params.amount, depositCoin.scalar)
 			}) : params.coin;
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::deposit`,
-				arguments: [
-					manager,
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					coin,
-					tx.object.clock()
-				],
+			tx.add(deposit({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					coin
+				},
 				typeArguments: [
 					baseCoin.type,
 					quoteCoin.type,
 					depositCoin.type
 				]
-			});
+			}));
 		};
 		this.depositBase = (params) => (tx) => {
 			const { managerKey } = params;
@@ -115,22 +122,21 @@ var MarginManagerContract = class {
 				type: baseCoin.type,
 				balance: convertQuantity(params.amount, baseCoin.scalar)
 			}) : params.coin;
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::deposit`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					coin,
-					tx.object.clock()
-				],
+			tx.add(deposit({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					coin
+				},
 				typeArguments: [
 					baseCoin.type,
 					quoteCoin.type,
 					baseCoin.type
 				]
-			});
+			}));
 		};
 		this.depositQuote = (params) => (tx) => {
 			const { managerKey } = params;
@@ -142,22 +148,21 @@ var MarginManagerContract = class {
 				type: quoteCoin.type,
 				balance: convertQuantity(params.amount, quoteCoin.scalar)
 			}) : params.coin;
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::deposit`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					coin,
-					tx.object.clock()
-				],
+			tx.add(deposit({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					coin
+				},
 				typeArguments: [
 					baseCoin.type,
 					quoteCoin.type,
 					quoteCoin.type
 				]
-			});
+			}));
 		};
 		this.depositDeep = (params) => (tx) => {
 			const { managerKey } = params;
@@ -170,22 +175,21 @@ var MarginManagerContract = class {
 				type: deepCoin.type,
 				balance: convertQuantity(params.amount, deepCoin.scalar)
 			}) : params.coin;
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::deposit`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					coin,
-					tx.object.clock()
-				],
+			tx.add(deposit({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					coin
+				},
 				typeArguments: [
 					baseCoin.type,
 					quoteCoin.type,
 					deepCoin.type
 				]
-			});
+			}));
 		};
 		this.withdrawBase = (managerKey, amount) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
@@ -194,25 +198,24 @@ var MarginManagerContract = class {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::withdraw`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(amount, baseCoin.scalar)),
-					tx.object.clock()
-				],
+			return tx.add(withdraw({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					pool: pool.address,
+					withdrawAmount: convertQuantity(amount, baseCoin.scalar)
+				},
 				typeArguments: [
 					baseCoin.type,
 					quoteCoin.type,
 					baseCoin.type
 				]
-			});
+			}));
 		};
 		this.withdrawQuote = (managerKey, amount) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
@@ -221,25 +224,24 @@ var MarginManagerContract = class {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::withdraw`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(amount, quoteCoin.scalar)),
-					tx.object.clock()
-				],
+			return tx.add(withdraw({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					pool: pool.address,
+					withdrawAmount: convertQuantity(amount, quoteCoin.scalar)
+				},
 				typeArguments: [
 					baseCoin.type,
 					quoteCoin.type,
 					quoteCoin.type
 				]
-			});
+			}));
 		};
 		this.withdrawDeep = (managerKey, amount) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
@@ -249,25 +251,24 @@ var MarginManagerContract = class {
 			const deepCoin = this.#config.getCoin("DEEP");
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::withdraw`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(amount, deepCoin.scalar)),
-					tx.object.clock()
-				],
+			return tx.add(withdraw({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					pool: pool.address,
+					withdrawAmount: convertQuantity(amount, deepCoin.scalar)
+				},
 				typeArguments: [
 					baseCoin.type,
 					quoteCoin.type,
 					deepCoin.type
 				]
-			});
+			}));
 		};
 		this.borrowBase = (managerKey, amount) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
@@ -275,20 +276,19 @@ var MarginManagerContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::borrow_base`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(amount, baseCoin.scalar)),
-					tx.object.clock()
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			return tx.add(borrowBase({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseMarginPool: baseMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					pool: pool.address,
+					loanAmount: convertQuantity(amount, baseCoin.scalar)
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
 		};
 		this.borrowQuote = (managerKey, amount) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
@@ -296,20 +296,19 @@ var MarginManagerContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::borrow_quote`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(quoteMarginPool.address),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.object(pool.address),
-					tx.pure.u64(convertQuantity(amount, quoteCoin.scalar)),
-					tx.object.clock()
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			return tx.add(borrowQuote({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					quoteMarginPool: quoteMarginPool.address,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					pool: pool.address,
+					loanAmount: convertQuantity(amount, quoteCoin.scalar)
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
 		};
 		this.repayBase = (managerKey, amount) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
@@ -317,17 +316,16 @@ var MarginManagerContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::repay_base`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseMarginPool.address),
-					tx.pure.option("u64", amount !== void 0 ? convertQuantity(amount, baseCoin.scalar) : null),
-					tx.object.clock()
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			return tx.add(repayBase({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginPool: baseMarginPool.address,
+					amount: amount !== void 0 ? convertQuantity(amount, baseCoin.scalar) : null
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
 		};
 		this.repayQuote = (managerKey, amount) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
@@ -335,17 +333,16 @@ var MarginManagerContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::repay_quote`,
-				arguments: [
-					tx.object(manager.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(quoteMarginPool.address),
-					tx.pure.option("u64", amount !== void 0 ? convertQuantity(amount, quoteCoin.scalar) : null),
-					tx.object.clock()
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			return tx.add(repayQuote({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					marginPool: quoteMarginPool.address,
+					amount: amount !== void 0 ? convertQuantity(amount, quoteCoin.scalar) : null
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
 		};
 		this.liquidate = (managerAddress, poolKey, debtIsBase, repayCoin) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -354,136 +351,144 @@ var MarginManagerContract = class {
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 			const marginPool = debtIsBase ? baseMarginPool : quoteMarginPool;
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::liquidate`,
-				arguments: [
-					tx.object(managerAddress),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.object(marginPool.address),
-					tx.object(pool.address),
-					repayCoin,
-					tx.object.clock()
-				],
+			return tx.add(liquidate({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: managerAddress,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					marginPool: marginPool.address,
+					pool: pool.address,
+					repayCoin
+				},
 				typeArguments: [
 					baseCoin.type,
 					quoteCoin.type,
 					debtIsBase ? baseCoin.type : quoteCoin.type
 				]
-			});
+			}));
 		};
 		this.setMarginManagerReferral = (managerKey, referral) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
 			const pool = this.#config.getPool(manager.poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::set_margin_manager_referral`,
-				arguments: [tx.object(manager.address), tx.object(referral)],
+			tx.add(setMarginManagerReferral({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					referralCap: referral
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.unsetMarginManagerReferral = (managerKey, poolKey) => (tx) => {
 			const manager = this.#config.getMarginManager(managerKey);
 			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}::margin_manager::unset_margin_manager_referral`,
-				arguments: [tx.object(manager.address), tx.pure.id(pool.address)],
+			tx.add(unsetMarginManagerReferral({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: manager.address,
+					poolId: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.ownerByPoolKey = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::owner`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(owner({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.deepbookPool = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::deepbook_pool`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(deepbookPool({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.marginPoolId = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::margin_pool_id`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(marginPoolId({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.borrowedShares = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::borrowed_shares`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(borrowedShares({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.borrowedBaseShares = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::borrowed_base_shares`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(borrowedBaseShares({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.borrowedQuoteShares = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::borrowed_quote_shares`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(borrowedQuoteShares({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.hasBaseDebt = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::has_base_debt`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(hasBaseDebt({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.balanceManager = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::balance_manager`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(balanceManager({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.calculateAssets = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::calculate_assets`,
-				arguments: [tx.object(marginManagerId), tx.object(pool.address)],
+			return tx.add(calculateAssets({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.calculateDebts = (poolKey, coinKey, marginManagerId) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -491,19 +496,18 @@ var MarginManagerContract = class {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const debtCoin = this.#config.getCoin(coinKey);
 			const marginPool = this.#config.getMarginPool(coinKey);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::calculate_debts`,
-				arguments: [
-					tx.object(marginManagerId),
-					tx.object(marginPool.address),
-					tx.object.clock()
-				],
+			return tx.add(calculateDebts({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					marginPool: marginPool.address
+				},
 				typeArguments: [
 					baseCoin.type,
 					quoteCoin.type,
 					debtCoin.type
 				]
-			});
+			}));
 		};
 		this.managerState = (poolKey, marginManagerId) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -511,120 +515,137 @@ var MarginManagerContract = class {
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_manager::manager_state`,
-				arguments: [
-					tx.object(marginManagerId),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(baseCoin.priceInfoObjectId),
-					tx.object(quoteCoin.priceInfoObjectId),
-					tx.object(pool.address),
-					tx.object(baseMarginPool.address),
-					tx.object(quoteMarginPool.address),
-					tx.object.clock()
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			return tx.add(managerState({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					baseOracle: baseCoin.priceInfoObjectId,
+					quoteOracle: quoteCoin.priceInfoObjectId,
+					pool: pool.address,
+					baseMarginPool: baseMarginPool.address,
+					quoteMarginPool: quoteMarginPool.address
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
 		};
 		this.baseBalance = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::base_balance`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(baseBalance({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.quoteBalance = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::quote_balance`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(quoteBalance({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.deepBalance = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::deep_balance`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(deepBalance({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.balanceManagerId = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::balance_manager_id`,
-				arguments: [tx.object(marginManagerId)],
+			return tx.add(balanceManagerId({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: { self: marginManagerId },
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getBalanceManagerReferralId = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::get_balance_manager_referral_id`,
-				arguments: [tx.object(marginManagerId), tx.pure.id(pool.address)],
+			return tx.add(getBalanceManagerReferralId({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					poolId: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.accountExists = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::account_exists`,
-				arguments: [tx.object(marginManagerId), tx.object(pool.address)],
+			return tx.add(accountExists({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.account = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::account`,
-				arguments: [tx.object(marginManagerId), tx.object(pool.address)],
+			return tx.add(account({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.accountOpenOrders = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::account_open_orders`,
-				arguments: [tx.object(marginManagerId), tx.object(pool.address)],
+			return tx.add(accountOpenOrders({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.getAccountOrderDetails = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::get_account_order_details`,
-				arguments: [tx.object(marginManagerId), tx.object(pool.address)],
+			return tx.add(getAccountOrderDetails({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.lockedBalance = (poolKey, marginManagerId) => (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.MARGIN_PACKAGE_ID}::margin_manager::locked_balance`,
-				arguments: [tx.object(marginManagerId), tx.object(pool.address)],
+			return tx.add(lockedBalance({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.canPlaceLimitOrder = (poolKey, marginManagerId, price, quantity, isBid, payWithDeep, expireTimestamp) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -632,38 +653,36 @@ var MarginManagerContract = 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.MARGIN_PACKAGE_ID}::margin_manager::can_place_limit_order`,
-				arguments: [
-					tx.object(marginManagerId),
-					tx.object(pool.address),
-					tx.pure.u64(inputPrice),
-					tx.pure.u64(inputQuantity),
-					tx.pure.bool(isBid),
-					tx.pure.bool(payWithDeep),
-					tx.pure.u64(expireTimestamp),
-					tx.object.clock()
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			return tx.add(canPlaceLimitOrder({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					pool: pool.address,
+					price: inputPrice,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep,
+					expireTimestamp
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
 		};
 		this.canPlaceMarketOrder = (poolKey, marginManagerId, quantity, isBid, payWithDeep) => (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.MARGIN_PACKAGE_ID}::margin_manager::can_place_market_order`,
-				arguments: [
-					tx.object(marginManagerId),
-					tx.object(pool.address),
-					tx.pure.u64(inputQuantity),
-					tx.pure.bool(isBid),
-					tx.pure.bool(payWithDeep),
-					tx.object.clock()
-				],
-				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			return tx.add(canPlaceMarketOrder({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginManagerId,
+					pool: pool.address,
+					quantity: inputQuantity,
+					isBid,
+					payWithDeep
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
 		};
 		this.#config = config;
 	}