@mysten/deepbook-v3 1.5.9 → 1.6.2

package/dist/transactions/governance.mjs

@@ -1,5 +1,6 @@
 import { convertQuantity, convertRate } from "../utils/conversion.mjs";
 import { DEEP_SCALAR, FLOAT_SCALAR } from "../utils/config.mjs";
+import { stake, submitProposal, unstake, vote } from "../contracts/deepbook/pool.mjs";
 
 //#region src/transactions/governance.ts
 /**
@@ -18,16 +19,16 @@ var GovernanceContract = class {
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			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),
+			tx.add(stake({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					tx.pure.u64(stakeInput)
-				],
+					amount: stakeInput
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.unstake = (poolKey, balanceManagerKey) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -35,15 +36,15 @@ var GovernanceContract = class {
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
 			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),
+			tx.add(unstake({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof
-				],
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.submitProposal = (params) => (tx) => {
 			const { poolKey, balanceManagerKey, takerFee, makerFee, stakeRequired } = params;
@@ -52,18 +53,18 @@ var GovernanceContract = class {
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
 			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),
+			tx.add(submitProposal({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					tx.pure.u64(convertRate(takerFee, FLOAT_SCALAR)),
-					tx.pure.u64(convertRate(makerFee, FLOAT_SCALAR)),
-					tx.pure.u64(convertQuantity(stakeRequired, DEEP_SCALAR))
-				],
+					takerFee: convertRate(takerFee, FLOAT_SCALAR),
+					makerFee: convertRate(makerFee, FLOAT_SCALAR),
+					stakeRequired: convertQuantity(stakeRequired, DEEP_SCALAR)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.vote = (poolKey, balanceManagerKey, proposal_id) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
@@ -71,16 +72,16 @@ var GovernanceContract = class {
 			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
 			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),
+			tx.add(vote({
+				package: this.#config.DEEPBOOK_PACKAGE_ID,
+				arguments: {
+					self: pool.address,
+					balanceManager: balanceManager.address,
 					tradeProof,
-					tx.pure.id(proposal_id)
-				],
+					proposalId: proposal_id
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.#config = config;
 	}

package/dist/transactions/governance.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"governance.mjs","names":["#config"],"sources":["../../src/transactions/governance.ts"],"sourcesContent":["// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\nimport type { Transaction } from '@mysten/sui/transactions';\n\nimport type { ProposalParams } from '../types/index.js';\nimport type { DeepBookConfig } from '../utils/config.js';\nimport { DEEP_SCALAR, FLOAT_SCALAR } from '../utils/config.js';\nimport { convertQuantity, convertRate } from '../utils/conversion.js';\n\n/**\n * GovernanceContract class for managing governance operations in DeepBook.\n */\nexport class GovernanceContract {\n\t#config: DeepBookConfig;\n\n\t/**\n\t * @param {DeepBookConfig} config Configuration for GovernanceContract\n\t */\n\tconstructor(config: DeepBookConfig) {\n\t\tthis.#config = config;\n\t}\n\n\t/**\n\t * @description Stake a specified amount in the pool\n\t * @param {string} poolKey The key to identify the pool\n\t * @param {string} balanceManagerKey The key to identify the BalanceManager\n\t * @param {number} stakeAmount The amount to stake\n\t * @returns A function that takes a Transaction object\n\t */\n\tstake =\n\t\t(poolKey: string, balanceManagerKey: string, stakeAmount: number) => (tx: Transaction) => {\n\t\t\tconst pool = this.#config.getPool(poolKey);\n\t\t\tconst balanceManager = this.#config.getBalanceManager(balanceManagerKey);\n\t\t\tconst tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));\n\t\t\tconst baseCoin = this.#config.getCoin(pool.baseCoin);\n\t\t\tconst quoteCoin = this.#config.getCoin(pool.quoteCoin);\n\t\t\tconst stakeInput = convertQuantity(stakeAmount, DEEP_SCALAR);\n\n\t\t\ttx.moveCall({\n\t\t\t\ttarget: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::stake`,\n\t\t\t\targuments: [\n\t\t\t\t\ttx.object(pool.address),\n\t\t\t\t\ttx.object(balanceManager.address),\n\t\t\t\t\ttradeProof,\n\t\t\t\t\ttx.pure.u64(stakeInput),\n\t\t\t\t],\n\t\t\t\ttypeArguments: [baseCoin.type, quoteCoin.type],\n\t\t\t});\n\t\t};\n\n\t/**\n\t * @description Unstake from the pool\n\t * @param {string} poolKey The key to identify the pool\n\t * @param {string} balanceManagerKey The key to identify the BalanceManager\n\t * @returns A function that takes a Transaction object\n\t */\n\tunstake = (poolKey: string, balanceManagerKey: string) => (tx: Transaction) => {\n\t\tconst pool = this.#config.getPool(poolKey);\n\t\tconst balanceManager = this.#config.getBalanceManager(balanceManagerKey);\n\t\tconst tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));\n\t\tconst baseCoin = this.#config.getCoin(pool.baseCoin);\n\t\tconst quoteCoin = this.#config.getCoin(pool.quoteCoin);\n\n\t\ttx.moveCall({\n\t\t\ttarget: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::unstake`,\n\t\t\targuments: [tx.object(pool.address), tx.object(balanceManager.address), tradeProof],\n\t\t\ttypeArguments: [baseCoin.type, quoteCoin.type],\n\t\t});\n\t};\n\n\t/**\n\t * @description Submit a governance proposal\n\t * @param {ProposalParams} params Parameters for the proposal\n\t * @returns A function that takes a Transaction object\n\t */\n\tsubmitProposal = (params: ProposalParams) => (tx: Transaction) => {\n\t\tconst { poolKey, balanceManagerKey, takerFee, makerFee, stakeRequired } = params;\n\n\t\tconst pool = this.#config.getPool(poolKey);\n\t\tconst balanceManager = this.#config.getBalanceManager(balanceManagerKey);\n\t\tconst tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));\n\t\tconst baseCoin = this.#config.getCoin(pool.baseCoin);\n\t\tconst quoteCoin = this.#config.getCoin(pool.quoteCoin);\n\n\t\ttx.moveCall({\n\t\t\ttarget: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::submit_proposal`,\n\t\t\targuments: [\n\t\t\t\ttx.object(pool.address),\n\t\t\t\ttx.object(balanceManager.address),\n\t\t\t\ttradeProof,\n\t\t\t\ttx.pure.u64(convertRate(takerFee, FLOAT_SCALAR)),\n\t\t\t\ttx.pure.u64(convertRate(makerFee, FLOAT_SCALAR)),\n\t\t\t\ttx.pure.u64(convertQuantity(stakeRequired, DEEP_SCALAR)),\n\t\t\t],\n\t\t\ttypeArguments: [baseCoin.type, quoteCoin.type],\n\t\t});\n\t};\n\n\t/**\n\t * @description Vote on a proposal\n\t * @param {string} poolKey The key to identify the pool\n\t * @param {string} balanceManagerKey The key to identify the BalanceManager\n\t * @param {string} proposal_id The ID of the proposal to vote on\n\t * @returns A function that takes a Transaction object\n\t */\n\tvote = (poolKey: string, balanceManagerKey: string, proposal_id: string) => (tx: Transaction) => {\n\t\tconst pool = this.#config.getPool(poolKey);\n\t\tconst balanceManager = this.#config.getBalanceManager(balanceManagerKey);\n\t\tconst tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));\n\t\tconst baseCoin = this.#config.getCoin(pool.baseCoin);\n\t\tconst quoteCoin = this.#config.getCoin(pool.quoteCoin);\n\n\t\ttx.moveCall({\n\t\t\ttarget: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::vote`,\n\t\t\targuments: [\n\t\t\t\ttx.object(pool.address),\n\t\t\t\ttx.object(balanceManager.address),\n\t\t\t\ttradeProof,\n\t\t\t\ttx.pure.id(proposal_id),\n\t\t\t],\n\t\t\ttypeArguments: [baseCoin.type, quoteCoin.type],\n\t\t});\n\t};\n}\n"],"mappings":";;;;;;;AAYA,IAAa,qBAAb,MAAgC;CAC/B;;;;CAKA,YAAY,QAAwB;gBAYlC,SAAiB,mBAA2B,iBAAyB,OAAoB;GACzF,MAAM,OAAO,MAAKA,OAAQ,QAAQ,QAAQ;GAC1C,MAAM,iBAAiB,MAAKA,OAAQ,kBAAkB,kBAAkB;GACxE,MAAM,aAAa,GAAG,IAAI,MAAKA,OAAQ,eAAe,cAAc,kBAAkB,CAAC;GACvF,MAAM,WAAW,MAAKA,OAAQ,QAAQ,KAAK,SAAS;GACpD,MAAM,YAAY,MAAKA,OAAQ,QAAQ,KAAK,UAAU;GACtD,MAAM,aAAa,gBAAgB,aAAa,YAAY;AAE5D,MAAG,SAAS;IACX,QAAQ,GAAG,MAAKA,OAAQ,oBAAoB;IAC5C,WAAW;KACV,GAAG,OAAO,KAAK,QAAQ;KACvB,GAAG,OAAO,eAAe,QAAQ;KACjC;KACA,GAAG,KAAK,IAAI,WAAW;KACvB;IACD,eAAe,CAAC,SAAS,MAAM,UAAU,KAAK;IAC9C,CAAC;;kBASO,SAAiB,uBAA+B,OAAoB;GAC9E,MAAM,OAAO,MAAKA,OAAQ,QAAQ,QAAQ;GAC1C,MAAM,iBAAiB,MAAKA,OAAQ,kBAAkB,kBAAkB;GACxE,MAAM,aAAa,GAAG,IAAI,MAAKA,OAAQ,eAAe,cAAc,kBAAkB,CAAC;GACvF,MAAM,WAAW,MAAKA,OAAQ,QAAQ,KAAK,SAAS;GACpD,MAAM,YAAY,MAAKA,OAAQ,QAAQ,KAAK,UAAU;AAEtD,MAAG,SAAS;IACX,QAAQ,GAAG,MAAKA,OAAQ,oBAAoB;IAC5C,WAAW;KAAC,GAAG,OAAO,KAAK,QAAQ;KAAE,GAAG,OAAO,eAAe,QAAQ;KAAE;KAAW;IACnF,eAAe,CAAC,SAAS,MAAM,UAAU,KAAK;IAC9C,CAAC;;yBAQe,YAA4B,OAAoB;GACjE,MAAM,EAAE,SAAS,mBAAmB,UAAU,UAAU,kBAAkB;GAE1E,MAAM,OAAO,MAAKA,OAAQ,QAAQ,QAAQ;GAC1C,MAAM,iBAAiB,MAAKA,OAAQ,kBAAkB,kBAAkB;GACxE,MAAM,aAAa,GAAG,IAAI,MAAKA,OAAQ,eAAe,cAAc,kBAAkB,CAAC;GACvF,MAAM,WAAW,MAAKA,OAAQ,QAAQ,KAAK,SAAS;GACpD,MAAM,YAAY,MAAKA,OAAQ,QAAQ,KAAK,UAAU;AAEtD,MAAG,SAAS;IACX,QAAQ,GAAG,MAAKA,OAAQ,oBAAoB;IAC5C,WAAW;KACV,GAAG,OAAO,KAAK,QAAQ;KACvB,GAAG,OAAO,eAAe,QAAQ;KACjC;KACA,GAAG,KAAK,IAAI,YAAY,UAAU,aAAa,CAAC;KAChD,GAAG,KAAK,IAAI,YAAY,UAAU,aAAa,CAAC;KAChD,GAAG,KAAK,IAAI,gBAAgB,eAAe,YAAY,CAAC;KACxD;IACD,eAAe,CAAC,SAAS,MAAM,UAAU,KAAK;IAC9C,CAAC;;eAUK,SAAiB,mBAA2B,iBAAyB,OAAoB;GAChG,MAAM,OAAO,MAAKA,OAAQ,QAAQ,QAAQ;GAC1C,MAAM,iBAAiB,MAAKA,OAAQ,kBAAkB,kBAAkB;GACxE,MAAM,aAAa,GAAG,IAAI,MAAKA,OAAQ,eAAe,cAAc,kBAAkB,CAAC;GACvF,MAAM,WAAW,MAAKA,OAAQ,QAAQ,KAAK,SAAS;GACpD,MAAM,YAAY,MAAKA,OAAQ,QAAQ,KAAK,UAAU;AAEtD,MAAG,SAAS;IACX,QAAQ,GAAG,MAAKA,OAAQ,oBAAoB;IAC5C,WAAW;KACV,GAAG,OAAO,KAAK,QAAQ;KACvB,GAAG,OAAO,eAAe,QAAQ;KACjC;KACA,GAAG,KAAK,GAAG,YAAY;KACvB;IACD,eAAe,CAAC,SAAS,MAAM,UAAU,KAAK;IAC9C,CAAC;;AAtGF,QAAKA,SAAU"}
+{"version":3,"file":"governance.mjs","names":["#config","poolMoveCalls.stake","poolMoveCalls.unstake","poolMoveCalls.submitProposal","poolMoveCalls.vote"],"sources":["../../src/transactions/governance.ts"],"sourcesContent":["// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\nimport type { Transaction } from '@mysten/sui/transactions';\n\nimport type { ProposalParams } from '../types/index.js';\nimport type { DeepBookConfig } from '../utils/config.js';\nimport { DEEP_SCALAR, FLOAT_SCALAR } from '../utils/config.js';\nimport { convertQuantity, convertRate } from '../utils/conversion.js';\nimport * as poolMoveCalls from '../contracts/deepbook/pool.js';\n\n/**\n * GovernanceContract class for managing governance operations in DeepBook.\n */\nexport class GovernanceContract {\n\t#config: DeepBookConfig;\n\n\t/**\n\t * @param {DeepBookConfig} config Configuration for GovernanceContract\n\t */\n\tconstructor(config: DeepBookConfig) {\n\t\tthis.#config = config;\n\t}\n\n\t/**\n\t * @description Stake a specified amount in the pool\n\t * @param {string} poolKey The key to identify the pool\n\t * @param {string} balanceManagerKey The key to identify the BalanceManager\n\t * @param {number} stakeAmount The amount to stake\n\t * @returns A function that takes a Transaction object\n\t */\n\tstake =\n\t\t(poolKey: string, balanceManagerKey: string, stakeAmount: number) => (tx: Transaction) => {\n\t\t\tconst pool = this.#config.getPool(poolKey);\n\t\t\tconst balanceManager = this.#config.getBalanceManager(balanceManagerKey);\n\t\t\tconst tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));\n\t\t\tconst baseCoin = this.#config.getCoin(pool.baseCoin);\n\t\t\tconst quoteCoin = this.#config.getCoin(pool.quoteCoin);\n\t\t\tconst stakeInput = convertQuantity(stakeAmount, DEEP_SCALAR);\n\n\t\t\ttx.add(\n\t\t\t\tpoolMoveCalls.stake({\n\t\t\t\t\tpackage: this.#config.DEEPBOOK_PACKAGE_ID,\n\t\t\t\t\targuments: {\n\t\t\t\t\t\tself: pool.address,\n\t\t\t\t\t\tbalanceManager: balanceManager.address,\n\t\t\t\t\t\ttradeProof,\n\t\t\t\t\t\tamount: stakeInput,\n\t\t\t\t\t},\n\t\t\t\t\ttypeArguments: [baseCoin.type, quoteCoin.type],\n\t\t\t\t}),\n\t\t\t);\n\t\t};\n\n\t/**\n\t * @description Unstake from the pool\n\t * @param {string} poolKey The key to identify the pool\n\t * @param {string} balanceManagerKey The key to identify the BalanceManager\n\t * @returns A function that takes a Transaction object\n\t */\n\tunstake = (poolKey: string, balanceManagerKey: string) => (tx: Transaction) => {\n\t\tconst pool = this.#config.getPool(poolKey);\n\t\tconst balanceManager = this.#config.getBalanceManager(balanceManagerKey);\n\t\tconst tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));\n\t\tconst baseCoin = this.#config.getCoin(pool.baseCoin);\n\t\tconst quoteCoin = this.#config.getCoin(pool.quoteCoin);\n\n\t\ttx.add(\n\t\t\tpoolMoveCalls.unstake({\n\t\t\t\tpackage: this.#config.DEEPBOOK_PACKAGE_ID,\n\t\t\t\targuments: {\n\t\t\t\t\tself: pool.address,\n\t\t\t\t\tbalanceManager: balanceManager.address,\n\t\t\t\t\ttradeProof,\n\t\t\t\t},\n\t\t\t\ttypeArguments: [baseCoin.type, quoteCoin.type],\n\t\t\t}),\n\t\t);\n\t};\n\n\t/**\n\t * @description Submit a governance proposal\n\t * @param {ProposalParams} params Parameters for the proposal\n\t * @returns A function that takes a Transaction object\n\t */\n\tsubmitProposal = (params: ProposalParams) => (tx: Transaction) => {\n\t\tconst { poolKey, balanceManagerKey, takerFee, makerFee, stakeRequired } = params;\n\n\t\tconst pool = this.#config.getPool(poolKey);\n\t\tconst balanceManager = this.#config.getBalanceManager(balanceManagerKey);\n\t\tconst tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));\n\t\tconst baseCoin = this.#config.getCoin(pool.baseCoin);\n\t\tconst quoteCoin = this.#config.getCoin(pool.quoteCoin);\n\n\t\ttx.add(\n\t\t\tpoolMoveCalls.submitProposal({\n\t\t\t\tpackage: this.#config.DEEPBOOK_PACKAGE_ID,\n\t\t\t\targuments: {\n\t\t\t\t\tself: pool.address,\n\t\t\t\t\tbalanceManager: balanceManager.address,\n\t\t\t\t\ttradeProof,\n\t\t\t\t\ttakerFee: convertRate(takerFee, FLOAT_SCALAR),\n\t\t\t\t\tmakerFee: convertRate(makerFee, FLOAT_SCALAR),\n\t\t\t\t\tstakeRequired: convertQuantity(stakeRequired, DEEP_SCALAR),\n\t\t\t\t},\n\t\t\t\ttypeArguments: [baseCoin.type, quoteCoin.type],\n\t\t\t}),\n\t\t);\n\t};\n\n\t/**\n\t * @description Vote on a proposal\n\t * @param {string} poolKey The key to identify the pool\n\t * @param {string} balanceManagerKey The key to identify the BalanceManager\n\t * @param {string} proposal_id The ID of the proposal to vote on\n\t * @returns A function that takes a Transaction object\n\t */\n\tvote = (poolKey: string, balanceManagerKey: string, proposal_id: string) => (tx: Transaction) => {\n\t\tconst pool = this.#config.getPool(poolKey);\n\t\tconst balanceManager = this.#config.getBalanceManager(balanceManagerKey);\n\t\tconst tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));\n\t\tconst baseCoin = this.#config.getCoin(pool.baseCoin);\n\t\tconst quoteCoin = this.#config.getCoin(pool.quoteCoin);\n\n\t\ttx.add(\n\t\t\tpoolMoveCalls.vote({\n\t\t\t\tpackage: this.#config.DEEPBOOK_PACKAGE_ID,\n\t\t\t\targuments: {\n\t\t\t\t\tself: pool.address,\n\t\t\t\t\tbalanceManager: balanceManager.address,\n\t\t\t\t\ttradeProof,\n\t\t\t\t\tproposalId: proposal_id,\n\t\t\t\t},\n\t\t\t\ttypeArguments: [baseCoin.type, quoteCoin.type],\n\t\t\t}),\n\t\t);\n\t};\n}\n"],"mappings":";;;;;;;;AAaA,IAAa,qBAAb,MAAgC;CAC/B;;;;CAKA,YAAY,QAAwB;gBAYlC,SAAiB,mBAA2B,iBAAyB,OAAoB;GACzF,MAAM,OAAO,MAAKA,OAAQ,QAAQ,QAAQ;GAC1C,MAAM,iBAAiB,MAAKA,OAAQ,kBAAkB,kBAAkB;GACxE,MAAM,aAAa,GAAG,IAAI,MAAKA,OAAQ,eAAe,cAAc,kBAAkB,CAAC;GACvF,MAAM,WAAW,MAAKA,OAAQ,QAAQ,KAAK,SAAS;GACpD,MAAM,YAAY,MAAKA,OAAQ,QAAQ,KAAK,UAAU;GACtD,MAAM,aAAa,gBAAgB,aAAa,YAAY;AAE5D,MAAG,IACFC,MAAoB;IACnB,SAAS,MAAKD,OAAQ;IACtB,WAAW;KACV,MAAM,KAAK;KACX,gBAAgB,eAAe;KAC/B;KACA,QAAQ;KACR;IACD,eAAe,CAAC,SAAS,MAAM,UAAU,KAAK;IAC9C,CAAC,CACF;;kBASQ,SAAiB,uBAA+B,OAAoB;GAC9E,MAAM,OAAO,MAAKA,OAAQ,QAAQ,QAAQ;GAC1C,MAAM,iBAAiB,MAAKA,OAAQ,kBAAkB,kBAAkB;GACxE,MAAM,aAAa,GAAG,IAAI,MAAKA,OAAQ,eAAe,cAAc,kBAAkB,CAAC;GACvF,MAAM,WAAW,MAAKA,OAAQ,QAAQ,KAAK,SAAS;GACpD,MAAM,YAAY,MAAKA,OAAQ,QAAQ,KAAK,UAAU;AAEtD,MAAG,IACFE,QAAsB;IACrB,SAAS,MAAKF,OAAQ;IACtB,WAAW;KACV,MAAM,KAAK;KACX,gBAAgB,eAAe;KAC/B;KACA;IACD,eAAe,CAAC,SAAS,MAAM,UAAU,KAAK;IAC9C,CAAC,CACF;;yBAQgB,YAA4B,OAAoB;GACjE,MAAM,EAAE,SAAS,mBAAmB,UAAU,UAAU,kBAAkB;GAE1E,MAAM,OAAO,MAAKA,OAAQ,QAAQ,QAAQ;GAC1C,MAAM,iBAAiB,MAAKA,OAAQ,kBAAkB,kBAAkB;GACxE,MAAM,aAAa,GAAG,IAAI,MAAKA,OAAQ,eAAe,cAAc,kBAAkB,CAAC;GACvF,MAAM,WAAW,MAAKA,OAAQ,QAAQ,KAAK,SAAS;GACpD,MAAM,YAAY,MAAKA,OAAQ,QAAQ,KAAK,UAAU;AAEtD,MAAG,IACFG,eAA6B;IAC5B,SAAS,MAAKH,OAAQ;IACtB,WAAW;KACV,MAAM,KAAK;KACX,gBAAgB,eAAe;KAC/B;KACA,UAAU,YAAY,UAAU,aAAa;KAC7C,UAAU,YAAY,UAAU,aAAa;KAC7C,eAAe,gBAAgB,eAAe,YAAY;KAC1D;IACD,eAAe,CAAC,SAAS,MAAM,UAAU,KAAK;IAC9C,CAAC,CACF;;eAUM,SAAiB,mBAA2B,iBAAyB,OAAoB;GAChG,MAAM,OAAO,MAAKA,OAAQ,QAAQ,QAAQ;GAC1C,MAAM,iBAAiB,MAAKA,OAAQ,kBAAkB,kBAAkB;GACxE,MAAM,aAAa,GAAG,IAAI,MAAKA,OAAQ,eAAe,cAAc,kBAAkB,CAAC;GACvF,MAAM,WAAW,MAAKA,OAAQ,QAAQ,KAAK,SAAS;GACpD,MAAM,YAAY,MAAKA,OAAQ,QAAQ,KAAK,UAAU;AAEtD,MAAG,IACFI,KAAmB;IAClB,SAAS,MAAKJ,OAAQ;IACtB,WAAW;KACV,MAAM,KAAK;KACX,gBAAgB,eAAe;KAC/B;KACA,YAAY;KACZ;IACD,eAAe,CAAC,SAAS,MAAM,UAAU,KAAK;IAC9C,CAAC,CACF;;AAlHD,QAAKA,SAAU"}

package/dist/transactions/marginAdmin.d.mts

@@ -80,6 +80,16 @@ declare class MarginAdminContract {
    * @returns A function that takes a Transaction object
    */
   setMaxOrderTtl: (poolKey: string, maxOrderTtlMs: number | bigint) => (tx: Transaction) => void;
+  /**
+   * @description Set the minimum risk ratio required to open a new position on
+   * a pool. Distinct from the borrow floor: this gates position opening, not
+   * borrowing. Stored in 9-decimal float scaling (1.0 = `FLOAT_SCALAR`); the SDK
+   * applies the scaling, so callers pass a human-readable ratio (e.g. `1.25`).
+   * @param {string} poolKey The key of the pool to update
+   * @param {number | bigint} minOpenRiskRatio Minimum open risk ratio (e.g. 1.25)
+   * @returns A function that takes a Transaction object
+   */
+  setMinOpenRiskRatio: (poolKey: string, minOpenRiskRatio: number | bigint) => (tx: Transaction) => void;
   /**
    * @description Add the PythConfig to the margin registry
    * @param {Transaction} tx The transaction object

package/dist/transactions/marginAdmin.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"marginAdmin.d.mts","names":[],"sources":["../../src/transactions/marginAdmin.ts"],"mappings":";;;;;;;;AAeA;cAAa,mBAAA;EAAA;EAMQ;;;cAAR,MAAA,EAAQ,cAAA;EAsDW;;;;EAlC/B,iBAAA,SAA2B,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EAmGoC;;;;EApF9E,mBAAA,GAAuB,eAAA,cAA6B,EAAA,EAAI,WAAA;EA0LN;;;;;;EAxKlD,oBAAA,GACE,OAAA,UAAiB,UAAA,EAAY,mBAAA,MAAyB,EAAA,EAAI,WAAA;EAuQY;;;;;EAjPxE,kBAAA,GAAsB,OAAA,cAAqB,EAAA,EAAI,WAAA;EA6TrB;;;;;EAxS1B,mBAAA,GAAuB,OAAA,cAAqB,EAAA,EAAI,WAAA;EA2VwB;;;;;;EArUxE,gBAAA,GAAoB,OAAA,UAAiB,UAAA,EAAY,mBAAA,MAAyB,EAAA,EAAI,WAAA;EAnG/C;;;;;;;;;;EA8H/B,iBAAA,GAAqB,OAAA,UAAiB,SAAA,uBAAgC,EAAA,EAAI,WAAA;EA5Fd;;;;;;;;EAqH5D,cAAA,GAAkB,OAAA,UAAiB,QAAA,uBAA+B,EAAA,EAAI,WAAA;EA1E1B;;;;;;;;;;EAqG5C,cAAA,GAAkB,OAAA,UAAiB,aAAA,uBAAoC,EAAA,EAAI,WAAA;EApDL;;;;;;EA2EtE,SAAA,GAAa,MAAA,EAAQ,mBAAA,MAAyB,EAAA,EAAI,WAAA;EAvBhC;;;;;EAwClB,YAAA,SAAsB,EAAA,EAAI,WAAA;EAjBb;;;;;EA8Bb,aAAA,GAAiB,OAAA,cAAqB,EAAA,EAAI,WAAA;EAA1C;;;;;EAgBA,cAAA,GAAkB,OAAA,cAAqB,EAAA,EAAI,WAAA;EAAA;;;;;;EAiB3C,aAAA,GAAiB,OAAA,UAAiB,gBAAA,EAAkB,gBAAA,MAAsB,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EAAf;;;;;;EAiC1E,yBAAA,GAA6B,OAAA,UAAiB,QAAA,cAAsB,EAAA,EAAI,WAAA;EAqBxE;;;;;;;EAAA,eAAA,GACE,OAAA,UAAiB,UAAA,UAAoB,oBAAA,cAAkC,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EA4B1E;;;;;;EAFd,aAAA,GAEE,UAAA,EAAY,KAAA;IAAQ,OAAA;IAAiB,UAAA;IAAoB,oBAAA;EAAA,IACzD,aAAA,cAEA,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EAuBK;;;;EAAtB,YAAA,SAAsB,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EAgBK;;;;;EAA1C,cAAA,GAAkB,UAAA,cAAwB,EAAA,EAAI,WAAA;EAmC9C;;;;;;EAjBA,sBAAA,GAA0B,OAAA,UAAiB,UAAA,cAAwB,EAAA,EAAI,WAAA;;;;;;;EAiBvE,gCAAA,GAAoC,OAAA,cAAqB,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;AAAA"}
+{"version":3,"file":"marginAdmin.d.mts","names":[],"sources":["../../src/transactions/marginAdmin.ts"],"mappings":";;;;;;;;AAkBA;cAAa,mBAAA;EAAA;EAMQ;;;cAAR,MAAA,EAAQ,cAAA;EAwDW;;;;EApC/B,iBAAA,SAA2B,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EAwGoC;;;;EA3F9E,mBAAA,GAAuB,eAAA,cAA6B,EAAA,EAAI,WAAA;EAiOnC;;;;;;EA3MrB,oBAAA,GACE,OAAA,UAAiB,UAAA,EAAY,mBAAA,MAAyB,EAAA,EAAI,WAAA;EAiR6B;;;;;EA1PzF,kBAAA,GAAsB,OAAA,cAAqB,EAAA,EAAI,WAAA;EAsV9B;;;;;EAhUjB,mBAAA,GAAuB,OAAA,cAAqB,EAAA,EAAI,WAAA;EA6YwB;;;;;;EAtXxE,gBAAA,GAAoB,OAAA,UAAiB,UAAA,EAAY,mBAAA,MAAyB,EAAA,EAAI,WAAA;EAxG9E;;;;;;;;;;EAoIA,iBAAA,GAAqB,OAAA,UAAiB,SAAA,uBAAgC,EAAA,EAAI,WAAA;EAhGvD;;;;;;;;EA0HnB,cAAA,GAAkB,OAAA,UAAiB,QAAA,uBAA+B,EAAA,EAAI,WAAA;EA7EtB;;;;;;;;;;EAyGhD,cAAA,GAAkB,OAAA,UAAiB,aAAA,uBAAoC,EAAA,EAAI,WAAA;EAtDD;;;;;;;;;EAiF1E,mBAAA,GACE,OAAA,UAAiB,gBAAA,uBAAuC,EAAA,EAAI,WAAA;EA5Ba;;;;;;EAoD3E,SAAA,GAAa,MAAA,EAAQ,mBAAA,MAAyB,EAAA,EAAI,WAAA;EAAlD;;;;;EAmBA,YAAA,SAAsB,EAAA,EAAI,WAAA;EAAA;;;;;EAe1B,aAAA,GAAiB,OAAA,cAAqB,EAAA,EAAI,WAAA;EAkB1C;;;;;EAAA,cAAA,GAAkB,OAAA,cAAqB,EAAA,EAAI,WAAA;EAmBS;;;;;;EAApD,aAAA,GAAiB,OAAA,UAAiB,gBAAA,EAAkB,gBAAA,MAAsB,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EAmC3C;;;;;;EAA9C,yBAAA,GAA6B,OAAA,UAAiB,QAAA,cAAsB,EAAA,EAAI,WAAA;EAwBK;;;;;;;EAD7E,eAAA,GACE,OAAA,UAAiB,UAAA,UAAoB,oBAAA,cAAkC,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EA8BtF;;;;;;EAFF,aAAA,GAEE,UAAA,EAAY,KAAA;IAAQ,OAAA;IAAiB,UAAA;IAAoB,oBAAA;EAAA,IACzD,aAAA,cAEA,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EAuC6B;;;;EAd9C,YAAA,SAAsB,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;EAiCkC;;;;;EAnBvE,cAAA,GAAkB,UAAA,cAAwB,EAAA,EAAI,WAAA;EAsC0B;;;;;;EAnBxE,sBAAA,GAA0B,OAAA,UAAiB,UAAA,cAAwB,EAAA,EAAI,WAAA;;;;;;;EAmBvE,gCAAA,GAAoC,OAAA,cAAqB,EAAA,EAAI,WAAA,KAAW,0BAAA,CAAA,iBAAA;AAAA"}

package/dist/transactions/marginAdmin.mjs

@@ -1,5 +1,8 @@
 import { convertRate } from "../utils/conversion.mjs";
 import { FLOAT_SCALAR } from "../utils/config.mjs";
+import { addConfig, disableDeepbookPool, disableVersion, disableVersionPauseCap, enableDeepbookPool, enableVersion, mintMaintainerCap, mintPauseCap, newPoolConfig, newPoolConfigWithLeverage, registerDeepbookPool, removeConfig, revokePauseCap, setMaxOrderTtl, setMaxPriceAge, setMinOpenRiskRatio, setPriceTolerance, updateRiskParams } from "../contracts/deepbook_margin/margin_registry.mjs";
+import { adminWithdrawDefaultReferralFees } from "../contracts/deepbook_margin/margin_pool.mjs";
+import { newCoinTypeDataFromCurrency, newPythConfig } from "../contracts/deepbook_margin/oracle.mjs";
 import { hexToBytes } from "@noble/hashes/utils.js";
 
 //#region src/transactions/marginAdmin.ts
@@ -13,14 +16,13 @@ var MarginAdminContract = class {
 	*/
 	constructor(config) {
 		this.mintMaintainerCap = () => (tx) => {
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::mint_maintainer_cap`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object.clock()
-				]
-			});
+			return tx.add(mintMaintainerCap({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap()
+				}
+			}));
 		};
 		this.revokeMaintainerCap = (maintainerCapId) => (tx) => {
 			tx.moveCall({
@@ -37,248 +39,263 @@ var MarginAdminContract = 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_registry::register_deepbook_pool`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object(pool.address),
-					poolConfig,
-					tx.object.clock()
-				],
+			tx.add(registerDeepbookPool({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					pool: pool.address,
+					poolConfig
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.enableDeepbookPool = (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.MARGIN_PACKAGE_ID}::margin_registry::enable_deepbook_pool`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object(pool.address),
-					tx.object.clock()
-				],
+			tx.add(enableDeepbookPool({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.disableDeepbookPool = (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.MARGIN_PACKAGE_ID}::margin_registry::disable_deepbook_pool`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object(pool.address),
-					tx.object.clock()
-				],
+			tx.add(disableDeepbookPool({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					pool: pool.address
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.updateRiskParams = (poolKey, poolConfig) => (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}::margin_registry::update_risk_params`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object(pool.address),
-					poolConfig,
-					tx.object.clock()
-				],
+			tx.add(updateRiskParams({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					pool: pool.address,
+					poolConfig
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.setPriceTolerance = (poolKey, tolerance) => (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}::margin_registry::set_price_tolerance`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object(pool.address),
-					tx.pure.u64(convertRate(tolerance, FLOAT_SCALAR)),
-					tx.object.clock()
-				],
+			tx.add(setPriceTolerance({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					pool: pool.address,
+					tolerance: convertRate(tolerance, FLOAT_SCALAR)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.setMaxPriceAge = (poolKey, maxAgeMs) => (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}::margin_registry::set_max_price_age`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object(pool.address),
-					tx.pure.u64(maxAgeMs),
-					tx.object.clock()
-				],
+			tx.add(setMaxPriceAge({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					pool: pool.address,
+					maxAgeMs
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.setMaxOrderTtl = (poolKey, maxOrderTtlMs) => (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}::margin_registry::set_max_order_ttl`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object(pool.address),
-					tx.pure.u64(maxOrderTtlMs),
-					tx.object.clock()
-				],
+			tx.add(setMaxOrderTtl({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					pool: pool.address,
+					maxOrderTtlMs
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
+		};
+		this.setMinOpenRiskRatio = (poolKey, minOpenRiskRatio) => (tx) => {
+			const pool = this.#config.getPool(poolKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			tx.add(setMinOpenRiskRatio({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					pool: pool.address,
+					minOpenRiskRatio: convertRate(minOpenRiskRatio, FLOAT_SCALAR)
+				},
+				typeArguments: [baseCoin.type, quoteCoin.type]
+			}));
 		};
 		this.addConfig = (config$1) => (tx) => {
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::add_config`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					config$1
-				],
+			tx.add(addConfig({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					config: config$1
+				},
 				typeArguments: [`${this.#config.MARGIN_PACKAGE_ID}::oracle::PythConfig`]
-			});
+			}));
 		};
 		this.removeConfig = () => (tx) => {
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::remove_config`,
-				arguments: [tx.object(this.#config.MARGIN_REGISTRY_ID), tx.object(this.#marginAdminCap())],
+			tx.add(removeConfig({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap()
+				},
 				typeArguments: [`${this.#config.MARGIN_PACKAGE_ID}::oracle::PythConfig`]
-			});
+			}));
 		};
 		this.enableVersion = (version) => (tx) => {
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::enable_version`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.pure.u64(version),
-					tx.object(this.#marginAdminCap())
-				]
-			});
+			tx.add(enableVersion({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					version,
+					AdminCap: this.#marginAdminCap()
+				}
+			}));
 		};
 		this.disableVersion = (version) => (tx) => {
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::disable_version`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.pure.u64(version),
-					tx.object(this.#marginAdminCap())
-				]
-			});
+			tx.add(disableVersion({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					version,
+					AdminCap: this.#marginAdminCap()
+				}
+			}));
 		};
 		this.newPoolConfig = (poolKey, poolConfigParams) => (tx) => {
 			const pool = this.#config.getPool(poolKey);
 			const baseCoin = this.#config.getCoin(pool.baseCoin);
 			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 			const { minWithdrawRiskRatio, minBorrowRiskRatio, liquidationRiskRatio, targetLiquidationRiskRatio, userLiquidationReward, poolLiquidationReward } = poolConfigParams;
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::new_pool_config`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.pure.u64(convertRate(minWithdrawRiskRatio, FLOAT_SCALAR)),
-					tx.pure.u64(convertRate(minBorrowRiskRatio, FLOAT_SCALAR)),
-					tx.pure.u64(convertRate(liquidationRiskRatio, FLOAT_SCALAR)),
-					tx.pure.u64(convertRate(targetLiquidationRiskRatio, FLOAT_SCALAR)),
-					tx.pure.u64(convertRate(userLiquidationReward, FLOAT_SCALAR)),
-					tx.pure.u64(convertRate(poolLiquidationReward, FLOAT_SCALAR))
-				],
+			return tx.add(newPoolConfig({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					minWithdrawRiskRatio: convertRate(minWithdrawRiskRatio, FLOAT_SCALAR),
+					minBorrowRiskRatio: convertRate(minBorrowRiskRatio, FLOAT_SCALAR),
+					liquidationRiskRatio: convertRate(liquidationRiskRatio, FLOAT_SCALAR),
+					targetLiquidationRiskRatio: convertRate(targetLiquidationRiskRatio, FLOAT_SCALAR),
+					userLiquidationReward: convertRate(userLiquidationReward, FLOAT_SCALAR),
+					poolLiquidationReward: convertRate(poolLiquidationReward, FLOAT_SCALAR)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.newPoolConfigWithLeverage = (poolKey, leverage) => (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}::margin_registry::new_pool_config_with_leverage`,
-				arguments: [tx.object(this.#config.MARGIN_REGISTRY_ID), tx.pure.u64(convertRate(leverage, FLOAT_SCALAR))],
+			tx.add(newPoolConfigWithLeverage({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					leverage: convertRate(leverage, FLOAT_SCALAR)
+				},
 				typeArguments: [baseCoin.type, quoteCoin.type]
-			});
+			}));
 		};
 		this.newCoinTypeData = (coinKey, maxConfBps, maxEwmaDifferenceBps) => (tx) => {
 			const coin = this.#config.getCoin(coinKey);
 			if (!coin.feed) throw new Error("Coin feed not found");
 			const priceFeedInput = new Uint8Array(hexToBytes(coin["feed"].startsWith("0x") ? coin.feed.slice(2) : coin["feed"]));
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::oracle::new_coin_type_data_from_currency`,
-				arguments: [
-					tx.object(coin.currencyId),
-					tx.pure.vector("u8", priceFeedInput),
-					tx.pure.u64(maxConfBps),
-					tx.pure.u64(maxEwmaDifferenceBps)
-				],
+			return tx.add(newCoinTypeDataFromCurrency({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					currency: coin.currencyId,
+					priceFeedId: Array.from(priceFeedInput),
+					maxConfBps,
+					maxEwmaDifferenceBps
+				},
 				typeArguments: [coin.type]
-			});
+			}));
 		};
 		this.newPythConfig = (coinSetups, maxAgeSeconds) => (tx) => {
 			const coinTypeDataList = [];
 			for (const setup of coinSetups) coinTypeDataList.push(this.newCoinTypeData(setup.coinKey, setup.maxConfBps, setup.maxEwmaDifferenceBps)(tx));
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::oracle::new_pyth_config`,
-				arguments: [tx.makeMoveVec({
-					elements: coinTypeDataList,
-					type: `${this.#config.MARGIN_PACKAGE_ID}::oracle::CoinTypeData`
-				}), tx.pure.u64(maxAgeSeconds)]
-			});
+			return tx.add(newPythConfig({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					setups: tx.makeMoveVec({
+						elements: coinTypeDataList,
+						type: `${this.#config.MARGIN_PACKAGE_ID}::oracle::CoinTypeData`
+					}),
+					maxAgeSecs: maxAgeSeconds
+				}
+			}));
 		};
 		this.mintPauseCap = () => (tx) => {
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::mint_pause_cap`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object.clock()
-				]
-			});
+			return tx.add(mintPauseCap({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap()
+				}
+			}));
 		};
 		this.revokePauseCap = (pauseCapId) => (tx) => {
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::revoke_pause_cap`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap()),
-					tx.object.clock(),
-					tx.pure.id(pauseCapId)
-				]
-			});
+			tx.add(revokePauseCap({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap(),
+					pauseCapId
+				}
+			}));
 		};
 		this.disableVersionPauseCap = (version, pauseCapId) => (tx) => {
-			tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_registry::disable_version_pause_cap`,
-				arguments: [
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.pure.u64(version),
-					tx.object(pauseCapId)
-				]
-			});
+			tx.add(disableVersionPauseCap({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: this.#config.MARGIN_REGISTRY_ID,
+					version,
+					pauseCap: pauseCapId
+				}
+			}));
 		};
 		this.adminWithdrawDefaultReferralFees = (coinKey) => (tx) => {
 			const coin = this.#config.getCoin(coinKey);
 			const marginPool = this.#config.getMarginPool(coinKey);
-			return tx.moveCall({
-				target: `${this.#config.MARGIN_PACKAGE_ID}::margin_pool::admin_withdraw_default_referral_fees`,
-				arguments: [
-					tx.object(marginPool.address),
-					tx.object(this.#config.MARGIN_REGISTRY_ID),
-					tx.object(this.#marginAdminCap())
-				],
+			return tx.add(adminWithdrawDefaultReferralFees({
+				package: this.#config.MARGIN_PACKAGE_ID,
+				arguments: {
+					self: marginPool.address,
+					registry: this.#config.MARGIN_REGISTRY_ID,
+					AdminCap: this.#marginAdminCap()
+				},
 				typeArguments: [coin.type]
-			});
+			}));
 		};
 		this.#config = config;
 	}