zo-sdk 0.1.61 → 0.1.63

package/dist/implementations/USDZAPI.mjs

@@ -129,6 +129,34 @@ export class USDZAPI extends BaseAPI {
             arguments: [tx.object(this.consts.zoCore.market), tx.object(orderCapId)],
         });
     }
+    clearOpenMarketOrder(orderCapId, collateralToken, indexToken, long, tx, _isV11Order) {
+        const funcName = 'clear_open_market_order';
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::${funcName}`,
+            typeArguments: [
+                `${this.consts.zoCore.package}::usdz::USDZ`,
+                this.consts.coins[collateralToken].module,
+                this.consts.coins[indexToken].module,
+                `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                this.consts.coins[collateralToken].module,
+            ],
+            arguments: [tx.object(this.consts.zoCore.market), tx.object(orderCapId)],
+        });
+    }
+    clearDecreaseMarketOrder(orderCapId, collateralToken, indexToken, long, tx, _isV11Order) {
+        const funcName = 'clear_decrease_market_order';
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::${funcName}`,
+            typeArguments: [
+                `${this.consts.zoCore.package}::usdz::USDZ`,
+                this.consts.coins[collateralToken].module,
+                this.consts.coins[indexToken].module,
+                `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                this.consts.coins[collateralToken].module,
+            ],
+            arguments: [tx.object(this.consts.zoCore.market), tx.object(orderCapId)],
+        });
+    }
     async openPositionWithSCard(collateralToken, indexToken, size, collateralAmount, coinObjects, long, reserveAmount, indexPrice, collateralPrice, kioskClient, kioskCap, scard, isLimitOrder, isIocOrder, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), referralAddress, sender, sponsoredTx, suiCoinObjectsForPythUpdate) {
         let tx = new Transaction();
         if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
@@ -410,6 +438,286 @@ export class USDZAPI extends BaseAPI {
             .finalize();
         return tx;
     }
+    async openPositionWithSCardV2(collateralToken, indexToken, size, collateralAmount, coinObjects, long, reserveAmount, indexPrice, collateralPrice, kioskClient, kioskCap, scard, isLimitOrder, isIocOrder, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), referralAddress, sender, sponsoredTx, suiCoinObjectsForPythUpdate) {
+        let tx = new Transaction();
+        if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
+            tx = await this.addReferral(referralAddress, tx);
+        }
+        const symbol = joinSymbol(long ? 'long' : 'short', indexToken);
+        const adjustPrice = this.processSlippage(indexPrice, long, isLimitOrder ? 0 : pricesSlippage);
+        const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage);
+        const indexPriceThreshold = this.processPriceThreshold(indexPrice, pricesSlippage);
+        let allowTrade = ALLOW_TRADE_MUST_TRADE;
+        if (isLimitOrder) {
+            allowTrade = isIocOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE;
+        }
+        const kioskTx = new KioskTransaction({
+            transaction: tx,
+            kioskClient,
+            cap: kioskCap,
+        });
+        const [sudoCard, promise] = kioskTx.borrow({
+            itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
+            itemId: scard,
+        });
+        // Handle oracle initialization and coin processing
+        let suiCoinObject;
+        if (sponsoredTx) {
+            suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true);
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject);
+        }
+        else {
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx);
+        }
+        // Process coin splitting
+        const [depositObject, feeObject] = this.processCoinSplitting(tx, collateralToken, coinObjects, [tx.pure.u64(collateralAmount), tx.pure.u64(relayerFee)], sponsoredTx, suiCoinObject);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::open_position_with_scard_v2`,
+            typeArguments: [
+                `${this.consts.zoCore.package}::usdz::USDZ`,
+                this.consts.coins[collateralToken].module,
+                this.consts.coins[indexToken].module,
+                `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                this.consts.coins[collateralToken].module,
+            ],
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(this.consts.zoCore.symbols[symbol].positionConfig),
+                tx.object(this.consts.pythFeeder.feeder[collateralToken]),
+                tx.object(this.consts.pythFeeder.feeder[indexToken]),
+                depositObject,
+                feeObject,
+                tx.pure.u8(allowTrade),
+                tx.pure.u64(size),
+                tx.pure.u64(reserveAmount),
+                tx.pure.u256(adjustCollateralPrice),
+                tx.pure.u256(adjustPrice),
+                tx.pure.u256(indexPriceThreshold),
+                sudoCard,
+            ],
+        });
+        kioskTx
+            .return({
+            itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
+            item: sudoCard,
+            promise,
+        })
+            .finalize();
+        return tx;
+    }
+    // S Card operations
+    async openPositionWithCoinAndSCardV2(collateralToken, indexToken, size, coinObj, long, reserveAmount, indexPrice, collateralPrice, kioskClient, kioskCap, scard, isLimitOrder, isIocOrder, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), referralAddress, sender, tx, sponsoredTx, suiCoinObjectsForPythUpdate) {
+        if (!tx) {
+            tx = new Transaction();
+        }
+        if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
+            tx = await this.addReferral(referralAddress, tx);
+        }
+        const symbol = joinSymbol(long ? 'long' : 'short', indexToken);
+        const adjustPrice = this.processSlippage(indexPrice, long, isLimitOrder ? 0 : pricesSlippage);
+        const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage);
+        const indexPriceThreshold = this.processPriceThreshold(indexPrice, pricesSlippage);
+        let allowTrade = ALLOW_TRADE_MUST_TRADE;
+        if (isLimitOrder) {
+            allowTrade = isIocOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE;
+        }
+        const kioskTx = new KioskTransaction({
+            transaction: tx,
+            kioskClient,
+            cap: kioskCap,
+        });
+        const [sudoCard, promise] = kioskTx.borrow({
+            itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
+            itemId: scard,
+        });
+        // Handle oracle initialization and coin processing
+        let suiCoinObject;
+        if (sponsoredTx) {
+            suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true);
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject);
+        }
+        else {
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx);
+        }
+        // Process coin splitting
+        const [feeObject] = tx.splitCoins(coinObj, [tx.pure.u64(relayerFee)]);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::open_position_with_scard_v2`,
+            typeArguments: [
+                `${this.consts.zoCore.package}::usdz::USDZ`,
+                this.consts.coins[collateralToken].module,
+                this.consts.coins[indexToken].module,
+                `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                this.consts.coins[collateralToken].module,
+            ],
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(this.consts.zoCore.symbols[symbol].positionConfig),
+                tx.object(this.consts.pythFeeder.feeder[collateralToken]),
+                tx.object(this.consts.pythFeeder.feeder[indexToken]),
+                coinObj,
+                feeObject,
+                tx.pure.u8(allowTrade),
+                tx.pure.u64(size),
+                tx.pure.u64(reserveAmount),
+                tx.pure.u256(adjustCollateralPrice),
+                tx.pure.u256(adjustPrice),
+                tx.pure.u256(indexPriceThreshold),
+                sudoCard,
+            ],
+        });
+        kioskTx
+            .return({
+            itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
+            item: sudoCard,
+            promise,
+        })
+            .finalize();
+        return tx;
+    }
+    async decreasePositionWithSCardV2(pcpId, collateralToken, indexToken, amount, long, indexPrice, collateralPrice, kioskClient, kioskCap, scard, isTriggerOrder = false, isTakeProfitOrder = true, isIocOrder = false, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), coinObjects, sponsoredTx, suiCoinObjectsForPythUpdate) {
+        if (!coinObjects) {
+            throw new Error(`${this.constructor.name}: coinObjects is required`);
+        }
+        let tx = new Transaction();
+        const kioskTx = new KioskTransaction({
+            transaction: tx,
+            kioskClient,
+            cap: kioskCap,
+        });
+        const [sudoCard, promise] = kioskTx.borrow({
+            itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
+            itemId: scard,
+        });
+        const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage);
+        const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage);
+        const indexPriceThreshold = this.processPriceThreshold(indexPrice, pricesSlippage);
+        let allowTrade = ALLOW_TRADE_MUST_TRADE;
+        if (isTriggerOrder) {
+            allowTrade = isIocOrder || !isTakeProfitOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE;
+        }
+        else {
+            isTakeProfitOrder = true;
+        }
+        // Handle oracle initialization and coin processing
+        let suiCoinObject;
+        if (sponsoredTx) {
+            suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true);
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject);
+        }
+        else {
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx);
+        }
+        // Process coin splitting
+        const [feeObject] = this.processCoinSplitting(tx, collateralToken, coinObjects, [tx.pure.u64(relayerFee)], sponsoredTx, suiCoinObject);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard_v2`,
+            typeArguments: [
+                `${this.consts.zoCore.package}::usdz::USDZ`,
+                this.consts.coins[collateralToken].module,
+                this.consts.coins[indexToken].module,
+                `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                this.consts.coins[collateralToken].module,
+            ],
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(pcpId),
+                tx.object(this.consts.pythFeeder.feeder[collateralToken]),
+                tx.object(this.consts.pythFeeder.feeder[indexToken]),
+                feeObject,
+                tx.pure.u8(allowTrade),
+                tx.pure.bool(isTakeProfitOrder),
+                tx.pure.u64(amount),
+                tx.pure.u256(adjustCollateralPrice),
+                tx.pure.u256(adjustPrice),
+                tx.pure.u256(indexPriceThreshold),
+                sudoCard,
+            ],
+        });
+        kioskTx
+            .return({
+            itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
+            item: sudoCard,
+            promise,
+        })
+            .finalize();
+        return tx;
+    }
+    async decreaseMultiPositionsWithSCardV2(positions, kioskClient, kioskCap, scard, tx, sponsoredTx, suiCoinObjectsForPythUpdate) {
+        if (!tx) {
+            tx = new Transaction();
+        }
+        // Handle oracle initialization and coin processing
+        let suiCoinObject;
+        if (sponsoredTx) {
+            suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true);
+            tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx, true, suiCoinObject);
+        }
+        else {
+            tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx);
+        }
+        const kioskTx = new KioskTransaction({
+            transaction: tx,
+            kioskClient,
+            cap: kioskCap,
+        });
+        const [sudoCard, promise] = kioskTx.borrow({
+            itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
+            itemId: scard,
+        });
+        for (const position of positions) {
+            const { pcpId, collateralToken, indexToken, amount, long, indexPrice, collateralPrice, isTriggerOrder = false, isTakeProfitOrder = true, isIocOrder = false, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), coinObjects = [], } = position;
+            let innerIsTakeProfitOrder = isTakeProfitOrder;
+            const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage);
+            const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage);
+            const indexPriceThreshold = this.processPriceThreshold(indexPrice, pricesSlippage);
+            let allowTrade = ALLOW_TRADE_MUST_TRADE;
+            if (isTriggerOrder) {
+                allowTrade = isIocOrder || !innerIsTakeProfitOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE;
+            }
+            else {
+                innerIsTakeProfitOrder = true;
+            }
+            // Process coin splitting
+            const [feeObject] = this.processCoinSplitting(tx, collateralToken, coinObjects, [tx.pure.u64(relayerFee)], sponsoredTx, suiCoinObject);
+            tx.moveCall({
+                target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard_v2`,
+                typeArguments: [
+                    `${this.consts.zoCore.package}::usdz::USDZ`,
+                    this.consts.coins[collateralToken].module,
+                    this.consts.coins[indexToken].module,
+                    `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                    this.consts.coins[collateralToken].module,
+                ],
+                arguments: [
+                    tx.object(SUI_CLOCK_OBJECT_ID),
+                    tx.object(this.consts.zoCore.market),
+                    tx.object(pcpId),
+                    tx.object(this.consts.pythFeeder.feeder[collateralToken]),
+                    tx.object(this.consts.pythFeeder.feeder[indexToken]),
+                    feeObject,
+                    tx.pure.u8(allowTrade),
+                    tx.pure.bool(innerIsTakeProfitOrder),
+                    tx.pure.u64(amount),
+                    tx.pure.u256(adjustCollateralPrice),
+                    tx.pure.u256(adjustPrice),
+                    tx.pure.u256(indexPriceThreshold),
+                    sudoCard,
+                ],
+            });
+        }
+        kioskTx
+            .return({
+            itemType: `0xe7e651e4974fe367aa2837712d68081efb299c470242a15e2b9c26ea326159ec::card::SudoCard`,
+            item: sudoCard,
+            promise,
+        })
+            .finalize();
+        return tx;
+    }
     /**
      * Deposits collateral into USDZ vault
      */
@@ -822,6 +1130,60 @@ export class USDZAPI extends BaseAPI {
         });
         return tx;
     }
+    /**
+     * Opens a new position in USDZ (V2)
+     */
+    async openPositionV2(collateralToken, indexToken, size, collateralAmount, coinObjects, long, reserveAmount, indexPrice, collateralPrice, isLimitOrder, isIocOrder, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), referralAddress, sender, sponsoredTx, suiCoinObjectsForPythUpdate) {
+        let tx = new Transaction();
+        if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
+            tx = await this.addReferral(referralAddress, tx);
+        }
+        const symbol = joinSymbol(long ? 'long' : 'short', indexToken);
+        const adjustPrice = this.processSlippage(indexPrice, long, isLimitOrder ? 0 : pricesSlippage);
+        const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage);
+        const indexPriceThreshold = this.processPriceThreshold(indexPrice, pricesSlippage);
+        let allowTrade = ALLOW_TRADE_MUST_TRADE;
+        if (isLimitOrder) {
+            allowTrade = isIocOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE;
+        }
+        // Handle oracle initialization and coin processing
+        let suiCoinObject;
+        if (sponsoredTx) {
+            suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true);
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject);
+        }
+        else {
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx);
+        }
+        // Process coin splitting
+        const [depositObject, feeObject] = this.processCoinSplitting(tx, collateralToken, coinObjects, [tx.pure.u64(collateralAmount), tx.pure.u64(relayerFee)], sponsoredTx, suiCoinObject);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::open_position_v2`,
+            typeArguments: [
+                `${this.consts.zoCore.package}::usdz::USDZ`,
+                this.consts.coins[collateralToken].module,
+                this.consts.coins[indexToken].module,
+                `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                this.consts.coins[collateralToken].module,
+            ],
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(this.consts.zoCore.symbols[symbol].positionConfig),
+                tx.object(this.consts.pythFeeder.feeder[collateralToken]),
+                tx.object(this.consts.pythFeeder.feeder[indexToken]),
+                depositObject,
+                feeObject,
+                tx.pure.u8(allowTrade),
+                tx.pure.u64(size),
+                tx.pure.u64(reserveAmount),
+                tx.pure.u256(adjustCollateralPrice),
+                tx.pure.u256(adjustPrice),
+                tx.pure.u256(indexPriceThreshold),
+            ],
+        });
+        return tx;
+    }
     /**
      * Opens a new position in USDZ
      */
@@ -878,6 +1240,62 @@ export class USDZAPI extends BaseAPI {
         });
         return tx;
     }
+    /**
+     * Opens a new position with Coin in USDZ (V2)
+     */
+    async openPositionWithCoinV2(collateralToken, indexToken, size, coinObj, long, reserveAmount, indexPrice, collateralPrice, isLimitOrder, isIocOrder, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), referralAddress, sender, tx, sponsoredTx, suiCoinObjectsForPythUpdate) {
+        if (!tx) {
+            tx = new Transaction();
+        }
+        if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
+            tx = await this.addReferral(referralAddress, tx);
+        }
+        const symbol = joinSymbol(long ? 'long' : 'short', indexToken);
+        const adjustPrice = this.processSlippage(indexPrice, long, isLimitOrder ? 0 : pricesSlippage);
+        const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage);
+        const indexPriceThreshold = this.processPriceThreshold(indexPrice, pricesSlippage);
+        let allowTrade = ALLOW_TRADE_MUST_TRADE;
+        if (isLimitOrder) {
+            allowTrade = isIocOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE;
+        }
+        // Handle oracle initialization and coin processing
+        let suiCoinObject;
+        if (sponsoredTx) {
+            suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true);
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject);
+        }
+        else {
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx);
+        }
+        // Process coin splitting
+        const [feeObject] = tx.splitCoins(coinObj, [tx.pure.u64(relayerFee)]);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::open_position_v2`,
+            typeArguments: [
+                `${this.consts.zoCore.package}::usdz::USDZ`,
+                this.consts.coins[collateralToken].module,
+                this.consts.coins[indexToken].module,
+                `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                this.consts.coins[collateralToken].module,
+            ],
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(this.consts.zoCore.symbols[symbol].positionConfig),
+                tx.object(this.consts.pythFeeder.feeder[collateralToken]),
+                tx.object(this.consts.pythFeeder.feeder[indexToken]),
+                coinObj,
+                feeObject,
+                tx.pure.u8(allowTrade),
+                tx.pure.u64(size),
+                tx.pure.u64(reserveAmount),
+                tx.pure.u256(adjustCollateralPrice),
+                tx.pure.u256(adjustPrice),
+                tx.pure.u256(indexPriceThreshold),
+            ],
+        });
+        return tx;
+    }
     /**
      * Decreases an existing position in USDZ
      */
@@ -934,6 +1352,61 @@ export class USDZAPI extends BaseAPI {
         });
         return tx;
     }
+    /**
+     * Decreases an existing position in USDZ (V2)
+     */
+    async decreasePositionV2(pcpId, collateralToken, indexToken, amount, long, indexPrice, collateralPrice, isTriggerOrder = false, isTakeProfitOrder = true, isIocOrder = false, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), coinObjects, sponsoredTx, suiCoinObjectsForPythUpdate) {
+        if (!coinObjects) {
+            throw new Error(`${this.constructor.name}: coinObjects is required`);
+        }
+        let tx = new Transaction();
+        const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage);
+        const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage);
+        const indexPriceThreshold = this.processPriceThreshold(indexPrice, pricesSlippage);
+        let allowTrade = ALLOW_TRADE_MUST_TRADE;
+        if (isTriggerOrder) {
+            allowTrade = isIocOrder || !isTakeProfitOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE;
+        }
+        else {
+            isTakeProfitOrder = true;
+        }
+        // Handle oracle initialization and coin processing
+        let suiCoinObject;
+        if (sponsoredTx) {
+            suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true);
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx, true, suiCoinObject);
+        }
+        else {
+            tx = await this.initOracleTxb([collateralToken, indexToken], tx);
+        }
+        // Process coin splitting
+        const [feeObject] = this.processCoinSplitting(tx, collateralToken, coinObjects, [tx.pure.u64(relayerFee)], sponsoredTx, suiCoinObject);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_v2`,
+            typeArguments: [
+                `${this.consts.zoCore.package}::usdz::USDZ`,
+                this.consts.coins[collateralToken].module,
+                this.consts.coins[indexToken].module,
+                `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                this.consts.coins[collateralToken].module,
+            ],
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(pcpId),
+                tx.object(this.consts.pythFeeder.feeder[collateralToken]),
+                tx.object(this.consts.pythFeeder.feeder[indexToken]),
+                feeObject,
+                tx.pure.u8(allowTrade),
+                tx.pure.bool(isTakeProfitOrder),
+                tx.pure.u64(amount),
+                tx.pure.u256(adjustCollateralPrice),
+                tx.pure.u256(adjustPrice),
+                tx.pure.u256(indexPriceThreshold),
+            ],
+        });
+        return tx;
+    }
     async decreaseMultiPositions(positions, tx, sponsoredTx, suiCoinObjectsForPythUpdate) {
         if (!tx) {
             tx = new Transaction();
@@ -990,6 +1463,61 @@ export class USDZAPI extends BaseAPI {
         }
         return tx;
     }
+    async decreaseMultiPositionsV2(positions, tx, sponsoredTx, suiCoinObjectsForPythUpdate) {
+        if (!tx) {
+            tx = new Transaction();
+        }
+        // Handle oracle initialization and coin processing
+        let suiCoinObject;
+        if (sponsoredTx) {
+            suiCoinObject = this.processCoins(tx, 'sui', suiCoinObjectsForPythUpdate || [], true);
+            tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx, true, suiCoinObject);
+        }
+        else {
+            tx = await this.initOracleTxb(positions.flatMap(position => [position.collateralToken, position.indexToken]), tx);
+        }
+        for (const position of positions) {
+            const { pcpId, collateralToken, coinObjects = [], indexToken, amount, long, indexPrice, collateralPrice, isTriggerOrder = false, isTakeProfitOrder = true, isIocOrder = false, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), } = position;
+            let innerIsTakeProfitOrder = isTakeProfitOrder;
+            const adjustPrice = this.processSlippage(indexPrice, !long, isTriggerOrder ? 0 : pricesSlippage);
+            const adjustCollateralPrice = this.processSlippage(collateralPrice, false, collateralSlippage);
+            const indexPriceThreshold = this.processPriceThreshold(indexPrice, pricesSlippage);
+            let allowTrade = ALLOW_TRADE_MUST_TRADE;
+            if (isTriggerOrder) {
+                allowTrade = isIocOrder || !innerIsTakeProfitOrder ? ALLOW_TRADE_NO_TRADE : ALLOW_TRADE_CAN_TRADE;
+            }
+            else {
+                innerIsTakeProfitOrder = true;
+            }
+            // Process coin splitting
+            const [feeObject] = this.processCoinSplitting(tx, collateralToken, coinObjects, [tx.pure.u64(relayerFee)], sponsoredTx, suiCoinObject);
+            tx.moveCall({
+                target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_v2`,
+                typeArguments: [
+                    `${this.consts.zoCore.package}::usdz::USDZ`,
+                    this.consts.coins[collateralToken].module,
+                    this.consts.coins[indexToken].module,
+                    `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+                    this.consts.coins[collateralToken].module,
+                ],
+                arguments: [
+                    tx.object(SUI_CLOCK_OBJECT_ID),
+                    tx.object(this.consts.zoCore.market),
+                    tx.object(pcpId),
+                    tx.object(this.consts.pythFeeder.feeder[collateralToken]),
+                    tx.object(this.consts.pythFeeder.feeder[indexToken]),
+                    feeObject,
+                    tx.pure.u8(allowTrade),
+                    tx.pure.bool(innerIsTakeProfitOrder),
+                    tx.pure.u64(amount),
+                    tx.pure.u256(adjustCollateralPrice),
+                    tx.pure.u256(adjustPrice),
+                    tx.pure.u256(indexPriceThreshold),
+                ],
+            });
+        }
+        return tx;
+    }
     /**
      * Pledges in position (USDZ-specific functionality)
      */
@@ -1059,12 +1587,20 @@ export class USDZAPI extends BaseAPI {
                 functionName = isV11Order ? 'clear_open_position_order' : 'clear_open_position_order';
                 break;
             }
+            case 'OPEN_MARKET': {
+                functionName = 'clear_open_market_order';
+                break;
+            }
             case 'DECREASE_POSITION': {
                 functionName = isV11Order
                     ? 'clear_decrease_position_order'
                     : 'clear_decrease_position_order';
                 break;
             }
+            case 'DECREASE_MARKET': {
+                functionName = 'clear_decrease_market_order';
+                break;
+            }
             default: {
                 throw new Error('invalid order type');
             }
@@ -1094,12 +1630,20 @@ export class USDZAPI extends BaseAPI {
                     functionName = isV11Order ? 'clear_open_position_order' : 'clear_open_position_order';
                     break;
                 }
+                case 'OPEN_MARKET': {
+                    functionName = 'clear_open_market_order';
+                    break;
+                }
                 case 'DECREASE_POSITION': {
                     functionName = isV11Order
                         ? 'clear_decrease_position_order'
                         : 'clear_decrease_position_order';
                     break;
                 }
+                case 'DECREASE_MARKET': {
+                    functionName = 'clear_decrease_market_order';
+                    break;
+                }
                 default: {
                     throw new Error('invalid order type');
                 }