@zofai/zo-sdk 0.2.14 → 0.2.16

package/dist/implementations/USDZAPI.mjs

@@ -6,14 +6,69 @@ import { KioskTransaction } from "@mysten/kiosk";
 import { Transaction } from "@mysten/sui/transactions";
 import { SUI_CLOCK_OBJECT_ID } from "@mysten/sui/utils";
 import { BaseAPI } from "../abstract/index.mjs";
+import { resolveSpendableSuiCoin } from "../coins.mjs";
 import { ALLOW_TRADE_CAN_TRADE, ALLOW_TRADE_MUST_TRADE, ALLOW_TRADE_NO_TRADE, LPToken } from "../consts/index.mjs";
-import { joinSymbol } from "../utils.mjs";
+import { buildOracleInputsAlt, oracleArgsAlt, oracleArgsStandard } from "../oraclePro.mjs";
+import { joinSymbol, parseSymbolKey } from "../utils.mjs";
 import { USDZDataAPI } from "./USDZDataAPI.mjs";
 export class USDZAPI extends BaseAPI {
     constructor(network, provider, apiEndpoint, connectionURL) {
         super(network, provider, apiEndpoint, connectionURL, LPToken.USDZ);
         this.dataAPI = new USDZDataAPI(network, provider, apiEndpoint, connectionURL);
     }
+    usdzLpType() {
+        return `${this.consts.zoCore.package}::usdz::USDZ`;
+    }
+    positionTypeArgs(collateralToken, indexToken, long) {
+        return [
+            this.usdzLpType(),
+            this.consts.coins[collateralToken].module,
+            this.consts.coins[indexToken].module,
+            `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+            this.consts.coins[collateralToken].module,
+        ];
+    }
+    redeemTypeArgs(collateralToken, indexToken, long) {
+        return [
+            this.usdzLpType(),
+            this.consts.coins[collateralToken].module,
+            this.consts.coins[indexToken].module,
+            `${this.consts.zoCore.package}::market::${long ? 'LONG' : 'SHORT'}`,
+        ];
+    }
+    async initV3OracleForTokens(tokens, tx, pythProUpdateBytes, includeEmaPrice, options) {
+        const result = await this.initV3OracleTxb(tokens, tx, {
+            rawUpdateBytes: pythProUpdateBytes,
+            includeEmaPrice,
+            ...options,
+        });
+        return { tx: result.tx, oracle: result.oracle };
+    }
+    /** Vault + symbol index tokens required for valuate_vault_v2 / valuate_symbol_v2. */
+    getValuationOracleTokens() {
+        const tokens = new Set(Object.keys(this.consts.zoCore.vaults));
+        for (const key of Object.keys(this.consts.zoCore.symbols)) {
+            const [, token] = parseSymbolKey(key);
+            tokens.add(token);
+        }
+        return [...tokens];
+    }
+    /** Pyth Pro oracle init for deposit / withdraw market valuation. */
+    async initValuationOracle(tx) {
+        const tokens = this.getValuationOracleTokens();
+        const pythProUpdateBytes = await this.fetchPythProUpdateBytesForTokens(tokens);
+        return this.initV3OracleForTokens(tokens, tx, pythProUpdateBytes);
+    }
+    async resolveSponsoredSui(tx, collateralToken, relayerFee, sponsoredTx, sender) {
+        if (!sponsoredTx) {
+            return undefined;
+        }
+        const additional = collateralToken === 'sui' ? relayerFee : 0n;
+        if (additional === 0n) {
+            return undefined;
+        }
+        return resolveSpendableSuiCoin(tx, this.provider, this.requireSenderForSponsored(sender), additional);
+    }
     calcPositionReserveFeeAmount(_position) {
         throw new Error(`Method not implemented in ${this.constructor.name}.`);
     }
@@ -686,35 +741,10 @@ export class USDZAPI extends BaseAPI {
         if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
             tx = await this.addReferral(referralAddress, tx);
         }
-        // Initialize oracle transaction
-        const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder);
-        // Handle sponsored transaction case
-        if (sponsoredTx) {
-            const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
-                sender: this.requireSenderForSponsored(sender),
-                additionalSuiAmount: coin === 'sui' ? BigInt(amount) : 0n,
-            });
-            tx = oracle.tx;
-            const depositObject = await this.resolveSplitCoinObject(tx, coin, BigInt(amount), coinObjects, { sponsoredTx: true, suiCoinObject: oracle.suiCoinObject, sender });
-            const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx);
-            tx.moveCall({
-                target: `${this.consts.zoCore.upgradedPackage}::market::deposit`,
-                typeArguments: [`${this.consts.zoCore.package}::usdz::USDZ`, this.consts.coins[coin].module],
-                arguments: [
-                    tx.object(this.consts.zoCore.market),
-                    tx.object(this.consts.zoCore.rebaseFeeModel),
-                    depositObject,
-                    tx.pure.u64(minAmountOut),
-                    vaultsValuation,
-                    symbolsValuation,
-                ],
-            });
-            return tx;
-        }
-        // Handle non-sponsored transaction case
-        tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx;
-        const depositObject = await this.resolveSplitCoinObject(tx, coin, BigInt(amount), coinObjects, { sender });
-        const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx);
+        const { tx: txWithOracle, oracle: oracleBundle } = await this.initValuationOracle(tx);
+        tx = txWithOracle;
+        const depositObject = await this.resolveSplitCoinObject(tx, coin, BigInt(amount), coinObjects, { sponsoredTx, sender });
+        const { vaultsValuation, symbolsValuation } = this.dataAPI.valuateV2(tx, oracleBundle);
         tx.moveCall({
             target: `${this.consts.zoCore.upgradedPackage}::market::deposit`,
             typeArguments: [
@@ -743,35 +773,10 @@ export class USDZAPI extends BaseAPI {
         if (referralAddress && !(await this.dataAPI.hasReferral(sender || ''))) {
             tx = await this.addReferral(referralAddress, tx);
         }
-        // Initialize oracle transaction
-        const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder);
-        // Handle sponsored transaction case
-        if (sponsoredTx) {
-            const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
-                sender: this.requireSenderForSponsored(sender),
-                additionalSuiAmount: coin === 'sui' ? BigInt(amount) : 0n,
-            });
-            tx = oracle.tx;
-            const depositObject = await this.resolveSplitCoinObject(tx, coin, BigInt(amount), coinObjects, { sponsoredTx: true, suiCoinObject: oracle.suiCoinObject, sender });
-            const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx);
-            const [mintedCoin] = tx.moveCall({
-                target: `${this.consts.zoCore.upgradedPackage}::market::deposit_ptb`,
-                typeArguments: [`${this.consts.zoCore.package}::usdz::USDZ`, this.consts.coins[coin].module],
-                arguments: [
-                    tx.object(this.consts.zoCore.market),
-                    tx.object(this.consts.zoCore.rebaseFeeModel),
-                    depositObject,
-                    tx.pure.u64(minAmountOut),
-                    vaultsValuation,
-                    symbolsValuation,
-                ],
-            });
-            return mintedCoin;
-        }
-        // Handle non-sponsored transaction case
-        tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx;
-        const depositObject = await this.resolveSplitCoinObject(tx, coin, BigInt(amount), coinObjects, { sender });
-        const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx);
+        const { tx: txWithOracle, oracle: oracleBundle } = await this.initValuationOracle(tx);
+        tx = txWithOracle;
+        const depositObject = await this.resolveSplitCoinObject(tx, coin, BigInt(amount), coinObjects, { sponsoredTx, sender });
+        const { vaultsValuation, symbolsValuation } = this.dataAPI.valuateV2(tx, oracleBundle);
         const [mintedCoin] = tx.moveCall({
             target: `${this.consts.zoCore.upgradedPackage}::market::deposit_ptb`,
             typeArguments: [
@@ -797,22 +802,10 @@ export class USDZAPI extends BaseAPI {
             throw new Error(`${this.constructor.name}: lpCoinObjects or sender is required`);
         }
         let tx = new Transaction();
-        // Initialize oracle transaction
-        const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder);
-        let suiCoinObject;
-        if (sponsoredTx) {
-            const oracle = await this.initOracleTxb(pythFeederKeys, tx, true, {
-                sender: this.requireSenderForSponsored(sender),
-                additionalSuiAmount: 0n,
-            });
-            tx = oracle.tx;
-            suiCoinObject = oracle.suiCoinObject;
-        }
-        else {
-            tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx;
-        }
-        const withdrawObject = await this.resolveSplitCoinObject(tx, 'usdz', BigInt(amount), lpCoinObjects, { sponsoredTx, suiCoinObject, sender });
-        const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx);
+        const { tx: txWithOracle, oracle: oracleBundle } = await this.initValuationOracle(tx);
+        tx = txWithOracle;
+        const withdrawObject = await this.resolveSplitCoinObject(tx, 'usdz', BigInt(amount), lpCoinObjects, { sponsoredTx, sender });
+        const { vaultsValuation, symbolsValuation } = this.dataAPI.valuateV2(tx, oracleBundle);
         tx.moveCall({
             target: `${this.consts.zoCore.upgradedPackage}::market::withdraw`,
             typeArguments: [
@@ -837,10 +830,9 @@ export class USDZAPI extends BaseAPI {
         if (!tx) {
             tx = new Transaction();
         }
-        // Initialize oracle transaction
-        const pythFeederKeys = Object.keys(this.consts.pythFeeder.feeder);
-        tx = (await this.initOracleTxb(pythFeederKeys, tx)).tx;
-        const { vaultsValuation, symbolsValuation } = this.dataAPI.valuate(tx);
+        const { tx: txWithOracle, oracle: oracleBundle } = await this.initValuationOracle(tx);
+        tx = txWithOracle;
+        const { vaultsValuation, symbolsValuation } = this.dataAPI.valuateV2(tx, oracleBundle);
         tx.moveCall({
             target: `${this.consts.zoCore.upgradedPackage}::market::withdraw`,
             typeArguments: [
@@ -1551,7 +1543,6 @@ export class USDZAPI extends BaseAPI {
      */
     async pledgeInPosition(pcpId, collateralToken, indexToken, amount, coinObjects, long, sponsoredTx, sender) {
         let tx = new Transaction();
-        // Handle oracle initialization and coin processing
         let suiCoinObject;
         if (sponsoredTx) {
             const oracle = await this.initOracleTxb([collateralToken, indexToken], tx, true, {
@@ -1564,8 +1555,7 @@ export class USDZAPI extends BaseAPI {
         else {
             tx = (await this.initOracleTxb([collateralToken, indexToken], tx)).tx;
         }
-        // Process coin splitting
-        const [depositObject] = this.processCoinSplitting(tx, collateralToken, coinObjects, [tx.pure.u64(amount)], sponsoredTx, suiCoinObject);
+        const depositObject = await this.resolveSplitCoinObject(tx, collateralToken, BigInt(amount), coinObjects, { sponsoredTx, suiCoinObject, sender });
         tx.moveCall({
             target: `${this.consts.zoCore.upgradedPackage}::market::pledge_in_position`,
             typeArguments: [
@@ -1576,6 +1566,7 @@ export class USDZAPI extends BaseAPI {
             ],
             arguments: [tx.object(this.consts.zoCore.market), tx.object(pcpId), depositObject],
         });
+        this.returnUnusedSuiCoin(tx, suiCoinObject, sender);
         return tx;
     }
     async redeemFromPosition(pcpId, collateralToken, indexToken, amount, long, sponsoredTx, sender) {
@@ -1613,6 +1604,7 @@ export class USDZAPI extends BaseAPI {
                 tx.pure.u64(amount),
             ],
         });
+        this.returnUnusedSuiCoin(tx, suiCoinObject, sender);
         return tx;
     }
     cancelOrder(orderCapId, collateralToken, indexToken, long, type, isV11Order) {
@@ -1779,5 +1771,463 @@ export class USDZAPI extends BaseAPI {
             ],
         });
     }
+    // --- Pyth Pro + Stork (v3) ---
+    /**
+     * Swaps tokens using swap_v3 (Pyth Pro + Stork). Transfers output to sender.
+     */
+    async swapV3(fromToken, toToken, fromAmount, fromCoinObjects, pythProUpdateBytes, minAmountOut, tx) {
+        if (!tx) {
+            tx = new Transaction();
+        }
+        const { tx: tx_, oracle } = await this.initV3OracleForTokens(Object.keys(this.consts.zoCore.vaults), tx, pythProUpdateBytes, true);
+        const fromCoinObject = this.processCoins(tx_, fromToken, fromCoinObjects);
+        const [fromDepositObject] = tx_.splitCoins(fromCoinObject, [tx_.pure.u64(fromAmount)]);
+        const vaultsValuation = this.dataAPI.valuateVaultsV2(tx_, oracle);
+        tx_.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::swap_v3`,
+            typeArguments: [
+                this.usdzLpType(),
+                this.consts.coins[fromToken].module,
+                this.consts.coins[toToken].module,
+            ],
+            arguments: [
+                tx_.object(this.consts.zoCore.market),
+                tx_.object(this.consts.zoCore.rebaseFeeModel),
+                fromDepositObject,
+                tx_.pure.u64(minAmountOut || 0),
+                vaultsValuation,
+                ...oracleArgsStandard(oracle),
+            ],
+        });
+        return tx_;
+    }
+    /**
+     * Swaps tokens and returns the output coin (swap_v3_ptb).
+     */
+    async swapV3Ptb(fromToken, toToken, fromAmount, fromCoinObjects, pythProUpdateBytes, minAmountOut, tx) {
+        if (!tx) {
+            tx = new Transaction();
+        }
+        const { tx: tx_, oracle } = await this.initV3OracleForTokens(Object.keys(this.consts.zoCore.vaults), tx, pythProUpdateBytes, true);
+        const fromCoinObject = this.processCoins(tx_, fromToken, fromCoinObjects);
+        const [fromDepositObject] = tx_.splitCoins(fromCoinObject, [tx_.pure.u64(fromAmount)]);
+        const vaultsValuation = this.dataAPI.valuateVaultsV2(tx_, oracle);
+        const [outputCoin] = tx_.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::swap_v3_ptb`,
+            typeArguments: [
+                this.usdzLpType(),
+                this.consts.coins[fromToken].module,
+                this.consts.coins[toToken].module,
+            ],
+            arguments: [
+                tx_.object(this.consts.zoCore.market),
+                tx_.object(this.consts.zoCore.rebaseFeeModel),
+                fromDepositObject,
+                tx_.pure.u64(minAmountOut || 0),
+                vaultsValuation,
+                ...oracleArgsStandard(oracle),
+            ],
+        });
+        return outputCoin;
+    }
+    /**
+     * Opens a position using open_position_v3 (Pyth Pro + Stork).
+     */
+    async openPositionV3(collateralToken, indexToken, size, collateralAmount, coinObjects, long, reserveAmount, indexPrice, collateralPrice, pythProUpdateBytes, isLimitOrder, isIocOrder, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), referralAddress, sender, sponsoredTx) {
+        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 { tx: tx_, oracle } = await this.initV3OracleForTokens([collateralToken, indexToken], tx, pythProUpdateBytes);
+        tx = tx_;
+        const suiCoinObject = await this.resolveSponsoredSui(tx, collateralToken, relayerFee, sponsoredTx, sender);
+        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_v3`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(this.consts.zoCore.symbols[symbol].positionConfig),
+                ...oracleArgsStandard(oracle),
+                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 position with S Card using open_position_with_scard_v3.
+     */
+    async openPositionWithSCardV3(collateralToken, indexToken, size, collateralAmount, coinObjects, long, reserveAmount, indexPrice, collateralPrice, kioskClient, kioskCap, scard, pythProUpdateBytes, isLimitOrder, isIocOrder, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), referralAddress, sender, sponsoredTx) {
+        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,
+        });
+        const { tx: tx_, oracle } = await this.initV3OracleForTokens([collateralToken, indexToken], tx, pythProUpdateBytes);
+        tx = tx_;
+        const suiCoinObject = await this.resolveSponsoredSui(tx, collateralToken, relayerFee, sponsoredTx, sender);
+        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_v3`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(this.consts.zoCore.symbols[symbol].positionConfig),
+                ...oracleArgsStandard(oracle),
+                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;
+    }
+    /**
+     * Opens a position with a pre-composed collateral coin using open_position_v3 (Pyth Pro + Stork).
+     */
+    async openPositionWithCoinV3(collateralToken, indexToken, size, coinObj, long, reserveAmount, indexPrice, collateralPrice, pythProUpdateBytes, isLimitOrder, isIocOrder, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), referralAddress, sender, tx, sponsoredTx) {
+        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 { tx: tx_, oracle } = await this.initV3OracleForTokens([collateralToken, indexToken], tx, pythProUpdateBytes);
+        tx = tx_;
+        const [feeObject] = tx.splitCoins(coinObj, [tx.pure.u64(relayerFee)]);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::open_position_v3`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(this.consts.zoCore.symbols[symbol].positionConfig),
+                ...oracleArgsStandard(oracle),
+                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;
+    }
+    /**
+     * Opens a position with a pre-composed collateral coin and S Card using open_position_with_scard_v3.
+     */
+    async openPositionWithCoinAndSCardV3(collateralToken, indexToken, size, coinObj, long, reserveAmount, indexPrice, collateralPrice, kioskClient, kioskCap, scard, pythProUpdateBytes, isLimitOrder, isIocOrder, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), referralAddress, sender, tx, sponsoredTx) {
+        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,
+        });
+        const { tx: tx_, oracle } = await this.initV3OracleForTokens([collateralToken, indexToken], tx, pythProUpdateBytes);
+        tx = tx_;
+        const [feeObject] = tx.splitCoins(coinObj, [tx.pure.u64(relayerFee)]);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::open_position_with_scard_v3`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(this.consts.zoCore.symbols[symbol].positionConfig),
+                ...oracleArgsStandard(oracle),
+                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;
+    }
+    /**
+     * Decreases a position using decrease_position_v3.
+     */
+    async decreasePositionV3(pcpId, collateralToken, indexToken, amount, long, indexPrice, collateralPrice, pythProUpdateBytes, isTriggerOrder = false, isTakeProfitOrder = true, isIocOrder = false, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), coinObjects, sponsoredTx, sender) {
+        if (!coinObjects?.length && !sender) {
+            throw new Error(`${this.constructor.name}: coinObjects or sender 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;
+        }
+        const { tx: tx_, oracle } = await this.initV3OracleForTokens([collateralToken, indexToken], tx, pythProUpdateBytes);
+        tx = tx_;
+        const suiCoinObject = await this.resolveSponsoredSui(tx, collateralToken, relayerFee, sponsoredTx, sender);
+        const feeObject = await this.resolveRelayerFeeObject(tx, collateralToken, coinObjects ?? [], relayerFee, sponsoredTx, suiCoinObject, sender);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_v3`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(pcpId),
+                ...oracleArgsStandard(oracle),
+                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;
+    }
+    /**
+     * Decreases a position with S Card using decrease_position_with_scard_v3.
+     */
+    async decreasePositionWithSCardV3(pcpId, collateralToken, indexToken, amount, long, indexPrice, collateralPrice, kioskClient, kioskCap, scard, pythProUpdateBytes, isTriggerOrder = false, isTakeProfitOrder = true, isIocOrder = false, pricesSlippage = 0.003, collateralSlippage = 0.5, relayerFee = BigInt(0.5), coinObjects, sponsoredTx, sender) {
+        if (!coinObjects?.length && !sender) {
+            throw new Error(`${this.constructor.name}: coinObjects or sender 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;
+        }
+        const { tx: tx_, oracle } = await this.initV3OracleForTokens([collateralToken, indexToken], tx, pythProUpdateBytes);
+        tx = tx_;
+        const suiCoinObject = await this.resolveSponsoredSui(tx, collateralToken, relayerFee, sponsoredTx, sender);
+        const feeObject = await this.resolveRelayerFeeObject(tx, collateralToken, coinObjects ?? [], relayerFee, sponsoredTx, suiCoinObject, sender);
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::decrease_position_with_scard_v3`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(SUI_CLOCK_OBJECT_ID),
+                tx.object(this.consts.zoCore.market),
+                tx.object(pcpId),
+                ...oracleArgsStandard(oracle),
+                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;
+    }
+    /**
+     * Redeems collateral from a position via redeem_from_position_v2 (Pyth Pro path).
+     */
+    async redeemFromPositionV2(pcpId, collateralToken, indexToken, amount, long, pythProUpdateBytes, tx) {
+        if (!tx) {
+            tx = new Transaction();
+        }
+        const { tx: tx_, oracle } = await this.initV3OracleForTokens([collateralToken, indexToken], tx, pythProUpdateBytes);
+        const symbol = joinSymbol(long ? 'long' : 'short', indexToken);
+        tx_.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::redeem_from_position_v2`,
+            typeArguments: this.redeemTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx_.object(SUI_CLOCK_OBJECT_ID),
+                tx_.object(this.consts.zoCore.market),
+                tx_.object(pcpId),
+                tx_.object(this.consts.zoCore.vaults[collateralToken].reservingFeeModel),
+                tx_.object(this.consts.zoCore.symbols[symbol].fundingFeeModel),
+                ...oracleArgsStandard(oracle),
+                tx_.pure.u64(amount),
+            ],
+        });
+        return tx_;
+    }
+    /**
+     * Liquidates a position (PTB-only public fun). Use liquidate_position_v3_1, not v3.
+     */
+    liquidatePositionV3_1(tx, owner, positionId, collateralToken, indexToken, long, oracle) {
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::liquidate_position_v3_1`,
+            typeArguments: this.redeemTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(this.consts.zoCore.market),
+                ...oracleArgsAlt(oracle),
+                tx.object(owner),
+                tx.object(positionId),
+            ],
+        });
+    }
+    /**
+     * Builds a full liquidate PTB including Pyth Pro verification.
+     */
+    async liquidatePositionV3_1Tx(owner, positionId, collateralToken, indexToken, long, pythProUpdateBytes, tx) {
+        if (!tx) {
+            tx = new Transaction();
+        }
+        const { tx: tx_, oracle } = await this.initV3OracleForTokens([collateralToken, indexToken], tx, pythProUpdateBytes);
+        this.liquidatePositionV3_1(tx_, owner, positionId, collateralToken, indexToken, long, buildOracleInputsAlt(oracle));
+        return tx_;
+    }
+    /** Keeper/bot: execute_open_position_order_v3_1 (compose in PTB). */
+    executeOpenPositionOrderV3_1(tx, owner, orderId, collateralToken, indexToken, long, oracle) {
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::execute_open_position_order_v3_1`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(this.consts.zoCore.market),
+                ...oracleArgsAlt(oracle),
+                tx.object(owner),
+                tx.object(orderId),
+            ],
+        });
+    }
+    /** Keeper/bot: execute_open_market_order_v3_1. */
+    executeOpenMarketOrderV3_1(tx, owner, orderId, collateralToken, indexToken, long, oracle) {
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::execute_open_market_order_v3_1`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(this.consts.zoCore.market),
+                ...oracleArgsAlt(oracle),
+                tx.object(owner),
+                tx.object(orderId),
+            ],
+        });
+    }
+    /** Keeper/bot: execute_decrease_market_order_v3_1. */
+    executeDecreaseMarketOrderV3_1(tx, owner, orderId, positionId, collateralToken, indexToken, long, oracle) {
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::execute_decrease_market_order_v3_1`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(this.consts.zoCore.market),
+                ...oracleArgsAlt(oracle),
+                tx.object(owner),
+                tx.object(orderId),
+                tx.object(positionId),
+            ],
+        });
+    }
+    /** Keeper/bot: execute_decrease_position_order_v3_1. */
+    executeDecreasePositionOrderV3_1(tx, owner, orderId, positionId, collateralToken, indexToken, long, oracle) {
+        tx.moveCall({
+            target: `${this.consts.zoCore.upgradedPackage}::market::execute_decrease_position_order_v3_1`,
+            typeArguments: this.positionTypeArgs(collateralToken, indexToken, long),
+            arguments: [
+                tx.object(this.consts.zoCore.market),
+                ...oracleArgsAlt(oracle),
+                tx.object(owner),
+                tx.object(orderId),
+                tx.object(positionId),
+            ],
+        });
+    }
 }
 //# sourceMappingURL=USDZAPI.mjs.map