@typus/typus-perp-sdk 1.2.2 → 1.3.1

package/dist/src/generated/utils/index.d.ts

@@ -1,30 +1,11 @@
-import { BcsType, TypeTag, BcsStruct, BcsEnum, BcsTuple } from "@mysten/sui/bcs";
-import { TransactionArgument } from "@mysten/sui/transactions";
-import { ClientWithCoreApi, SuiClientTypes } from "@mysten/sui/client";
+import { BcsType, TypeTag, BcsStruct, BcsEnum, BcsTuple } from '@mysten/sui/bcs';
+import { TransactionArgument } from '@mysten/sui/transactions';
 export type RawTransactionArgument<T> = T | TransactionArgument;
-export interface GetOptions<Include extends Omit<SuiClientTypes.ObjectInclude, "content"> = {}> extends SuiClientTypes.GetObjectOptions<Include> {
-    client: ClientWithCoreApi;
-}
-export interface GetManyOptions<Include extends Omit<SuiClientTypes.ObjectInclude, "content"> = {}> extends SuiClientTypes.GetObjectsOptions<Include> {
-    client: ClientWithCoreApi;
-}
 export declare function getPureBcsSchema(typeTag: string | TypeTag): BcsType<any> | null;
-export declare function normalizeMoveArguments(args: unknown[] | object, argTypes: readonly (string | null)[], parameterNames?: string[]): TransactionArgument[];
+export declare function normalizeMoveArguments(args: unknown[] | object, argTypes: (string | null)[], parameterNames?: string[]): TransactionArgument[];
 export declare class MoveStruct<T extends Record<string, BcsType<any>>, const Name extends string = string> extends BcsStruct<T, Name> {
-    get<Include extends Omit<SuiClientTypes.ObjectInclude, "content" | "json"> = {}>({ objectId, ...options }: GetOptions<Include>): Promise<SuiClientTypes.Object<Include & {
-        content: true;
-        json: true;
-    }> & {
-        json: BcsStruct<T>["$inferType"];
-    }>;
-    getMany<Include extends Omit<SuiClientTypes.ObjectInclude, "content" | "json"> = {}>({ client, ...options }: GetManyOptions<Include>): Promise<Array<SuiClientTypes.Object<Include & {
-        content: true;
-        json: true;
-    }> & {
-        json: BcsStruct<T>["$inferType"];
-    }>>;
 }
 export declare class MoveEnum<T extends Record<string, BcsType<any> | null>, const Name extends string> extends BcsEnum<T, Name> {
 }
-export declare class MoveTuple<const T extends readonly BcsType<any>[], const Name extends string> extends BcsTuple<T, Name> {
+export declare class MoveTuple<T extends readonly BcsType<any>[], const Name extends string> extends BcsTuple<T, Name> {
 }

package/dist/src/generated/utils/index.js

@@ -6,56 +6,61 @@ exports.normalizeMoveArguments = normalizeMoveArguments;
 const bcs_1 = require("@mysten/sui/bcs");
 const utils_1 = require("@mysten/sui/utils");
 const transactions_1 = require("@mysten/sui/transactions");
-const MOVE_STDLIB_ADDRESS = (0, utils_1.normalizeSuiAddress)("0x1");
-const SUI_FRAMEWORK_ADDRESS = (0, utils_1.normalizeSuiAddress)("0x2");
+const MOVE_STDLIB_ADDRESS = (0, utils_1.normalizeSuiAddress)('0x1');
+const SUI_FRAMEWORK_ADDRESS = (0, utils_1.normalizeSuiAddress)('0x2');
+const SUI_SYSTEM_ADDRESS = (0, utils_1.normalizeSuiAddress)('0x3');
 function getPureBcsSchema(typeTag) {
-    const parsedTag = typeof typeTag === "string" ? bcs_1.TypeTagSerializer.parseFromStr(typeTag) : typeTag;
-    if ("u8" in parsedTag) {
+    const parsedTag = typeof typeTag === 'string' ? bcs_1.TypeTagSerializer.parseFromStr(typeTag) : typeTag;
+    if ('u8' in parsedTag) {
         return bcs_1.bcs.U8;
     }
-    else if ("u16" in parsedTag) {
+    else if ('u16' in parsedTag) {
         return bcs_1.bcs.U16;
     }
-    else if ("u32" in parsedTag) {
+    else if ('u32' in parsedTag) {
         return bcs_1.bcs.U32;
     }
-    else if ("u64" in parsedTag) {
+    else if ('u64' in parsedTag) {
         return bcs_1.bcs.U64;
     }
-    else if ("u128" in parsedTag) {
+    else if ('u128' in parsedTag) {
         return bcs_1.bcs.U128;
     }
-    else if ("u256" in parsedTag) {
+    else if ('u256' in parsedTag) {
         return bcs_1.bcs.U256;
     }
-    else if ("address" in parsedTag) {
+    else if ('address' in parsedTag) {
         return bcs_1.bcs.Address;
     }
-    else if ("bool" in parsedTag) {
+    else if ('bool' in parsedTag) {
         return bcs_1.bcs.Bool;
     }
-    else if ("vector" in parsedTag) {
+    else if ('vector' in parsedTag) {
         const type = getPureBcsSchema(parsedTag.vector);
         return type ? bcs_1.bcs.vector(type) : null;
     }
-    else if ("struct" in parsedTag) {
+    else if ('struct' in parsedTag) {
         const structTag = parsedTag.struct;
-        const pkg = (0, utils_1.normalizeSuiAddress)(structTag.address);
+        const pkg = (0, utils_1.normalizeSuiAddress)(parsedTag.struct.address);
         if (pkg === MOVE_STDLIB_ADDRESS) {
-            if ((structTag.module === "ascii" || structTag.module === "string") && structTag.name === "String") {
+            if ((structTag.module === 'ascii' || structTag.module === 'string') &&
+                structTag.name === 'String') {
                 return bcs_1.bcs.String;
             }
-            if (structTag.module === "option" && structTag.name === "Option") {
+            if (structTag.module === 'option' && structTag.name === 'Option') {
                 const type = getPureBcsSchema(structTag.typeParams[0]);
                 return type ? bcs_1.bcs.option(type) : null;
             }
         }
-        if (pkg === SUI_FRAMEWORK_ADDRESS && structTag.module === "object" && (structTag.name === "ID" || structTag.name === "UID")) {
+        if (pkg === SUI_FRAMEWORK_ADDRESS && structTag.module === 'Object' && structTag.name === 'ID') {
             return bcs_1.bcs.Address;
         }
     }
     return null;
 }
+// argTypes carries `null` for parameters whose type the codegen could not
+// resolve (external packages, e.g. Scallop in lending.ts). Only string equality
+// is ever tested below, so a null just falls through to the default branch.
 function normalizeMoveArguments(args, argTypes, parameterNames) {
     const argLen = Array.isArray(args) ? args.length : Object.keys(args).length;
     if (parameterNames && argLen !== parameterNames.length) {
@@ -64,19 +69,19 @@ function normalizeMoveArguments(args, argTypes, parameterNames) {
     const normalizedArgs = [];
     let index = 0;
     for (const [i, argType] of argTypes.entries()) {
-        if (argType === "0x2::clock::Clock") {
-            normalizedArgs.push((tx) => tx.object.clock());
+        if (argType === `${SUI_FRAMEWORK_ADDRESS}::deny_list::DenyList`) {
+            normalizedArgs.push((tx) => tx.object.denyList());
             continue;
         }
-        if (argType === "0x2::random::Random") {
+        if (argType === `${SUI_FRAMEWORK_ADDRESS}::random::Random`) {
             normalizedArgs.push((tx) => tx.object.random());
             continue;
         }
-        if (argType === "0x2::deny_list::DenyList") {
-            normalizedArgs.push((tx) => tx.object.denyList());
+        if (argType === `${SUI_FRAMEWORK_ADDRESS}::clock::Clock`) {
+            normalizedArgs.push((tx) => tx.object.clock());
             continue;
         }
-        if (argType === "0x3::sui_system::SuiSystemState") {
+        if (argType === `${SUI_SYSTEM_ADDRESS}::sui_system::SuiSystemState`) {
             normalizedArgs.push((tx) => tx.object.system());
             continue;
         }
@@ -93,23 +98,23 @@ function normalizeMoveArguments(args, argTypes, parameterNames) {
             }
             const name = parameterNames[index];
             arg = args[name];
-            if (arg === undefined) {
+            if (arg == null) {
                 throw new Error(`Parameter ${name} is required`);
             }
         }
         index += 1;
-        if (typeof arg === "function" || (0, transactions_1.isArgument)(arg)) {
+        if (typeof arg === 'function' || (0, transactions_1.isArgument)(arg)) {
             normalizedArgs.push(arg);
             continue;
         }
         const type = argTypes[i];
-        const bcsType = type === null ? null : getPureBcsSchema(type);
+        const bcsType = getPureBcsSchema(type);
         if (bcsType) {
             const bytes = bcsType.serialize(arg);
             normalizedArgs.push((tx) => tx.pure(bytes));
             continue;
         }
-        else if (typeof arg === "string") {
+        else if (typeof arg === 'string') {
             normalizedArgs.push((tx) => tx.object(arg));
             continue;
         }
@@ -118,31 +123,6 @@ function normalizeMoveArguments(args, argTypes, parameterNames) {
     return normalizedArgs;
 }
 class MoveStruct extends bcs_1.BcsStruct {
-    async get({ objectId, ...options }) {
-        const [res] = await this.getMany({
-            ...options,
-            objectIds: [objectId],
-        });
-        return res;
-    }
-    async getMany({ client, ...options }) {
-        const response = (await client.core.getObjects({
-            ...options,
-            include: {
-                ...options.include,
-                content: true,
-            },
-        }));
-        return response.objects.map((obj) => {
-            if (obj instanceof Error) {
-                throw obj;
-            }
-            return {
-                ...obj,
-                json: this.parse(obj.content),
-            };
-        });
-    }
 }
 exports.MoveStruct = MoveStruct;
 class MoveEnum extends bcs_1.BcsEnum {
@@ -152,10 +132,10 @@ class MoveTuple extends bcs_1.BcsTuple {
 }
 exports.MoveTuple = MoveTuple;
 function stringify(val) {
-    if (typeof val === "object") {
+    if (typeof val === 'object') {
         return JSON.stringify(val, (val) => val);
     }
-    if (typeof val === "bigint") {
+    if (typeof val === 'bigint') {
         return val.toString();
     }
     return val;

package/dist/src/index.d.ts

@@ -13,3 +13,8 @@ export declare const STAKE_POOL_VERSION: string;
 export declare const COMPETITION_CONFIG: string;
 export declare const PROFIT_VAULT: string;
 export declare const LOCK_VAULT: string;
+export declare const ORACLE_PACKAGE_ID: string;
+export declare const ORACLE_V2_ID: string;
+export declare const PYTH_LAZER_PACKAGE_ID: string;
+export declare const PYTH_LAZER_STATE_ID: string;
+export declare const DOV_SINGLE_REGISTRY: string;

package/dist/src/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOCK_VAULT = exports.PROFIT_VAULT = exports.COMPETITION_CONFIG = exports.STAKE_POOL_VERSION = exports.STAKE_POOL = exports.TLP_TREASURY_CAP = exports.PERP_VERSION = exports.MARKET = exports.LIQUIDITY_POOL = exports.LP_POOL = exports.STAKE_PACKAGE_ID = exports.PERP_PACKAGE_ID = exports.NETWORK = void 0;
+exports.DOV_SINGLE_REGISTRY = exports.PYTH_LAZER_STATE_ID = exports.PYTH_LAZER_PACKAGE_ID = exports.ORACLE_V2_ID = exports.ORACLE_PACKAGE_ID = exports.LOCK_VAULT = exports.PROFIT_VAULT = exports.COMPETITION_CONFIG = exports.STAKE_POOL_VERSION = exports.STAKE_POOL = exports.TLP_TREASURY_CAP = exports.PERP_VERSION = exports.MARKET = exports.LIQUIDITY_POOL = exports.LP_POOL = exports.STAKE_PACKAGE_ID = exports.PERP_PACKAGE_ID = exports.NETWORK = void 0;
 __exportStar(require("./fetch"), exports);
 __exportStar(require("./user"), exports);
 const dotenv_1 = __importDefault(require("dotenv"));
@@ -25,30 +25,34 @@ const dotenv_1 = __importDefault(require("dotenv"));
 dotenv_1.default.config();
 // default MAINNET
 exports.NETWORK = process.env.NEXT_PUBLIC_CLUSTER == "testnet" ? "TESTNET" : "MAINNET";
+// Mainnet is the CVersion-7 package: the only one carrying `create_trading_order_v2`
+// / `match_trading_order_v2` (the OracleV2 readers). Verified on-chain — the
+// previously pinned 0xf60e3542 exposes no `_v2` order entries at all, and
+// typus-config@main still advertises the older 0x8e4743f2.
 exports.PERP_PACKAGE_ID = exports.NETWORK == "MAINNET"
-    ? "0xf60e3542f1c65a77d9bcdffd5d8a712a46b935ec51b9052e5ad98888e0392d09"
-    : "0x94cd358f552e9dd5df837de85939a9d1d682e97480740a203121e6f4c0078853";
+    ? "0xb78db3bf6aff87ae8aa6b1b5d4718d475d46b74734727889f2b4c300d79e8970"
+    : "0x228f1823a2daf15cf2d5031e47bd7c26ae1d19ea89160df29d351c6e56134c61";
 exports.STAKE_PACKAGE_ID = exports.NETWORK == "MAINNET"
     ? "0xd280f3a072bca4b7b5b450f40c82a30b3935cd1d12d927eb9d1f790520a83d3b"
-    : "0x02b94b340a8810f6c451bc244dc2dd8d9d50cf86d727798969ca2c287c3186aa";
+    : "0x11ca35c03a2f3ba157a8f605613bcb70eb22da5fcb9dbb00966db745ed6427e6";
 // lp_pool::Registry
 exports.LP_POOL = exports.NETWORK == "MAINNET"
     ? "0x46ef530d3ad13037ac54b77be324e5ab063124af8a119e86f1f59be8a16a22a2"
-    : "0x85fa3cc6dc0fa8b47dda95ba0335fe1cec61dde4a2a8486ccd040f94d399b4c3";
-// liquidity_pool_registry
+    : "0x7870f1a8f1a4750f2b8b2c9e62b2770eb717aec185b85156d8a3ac503920de57";
+// inner liquidity_pool_registry (Registry.liquidity_pool_registry, parent of pool dynamic fields)
 exports.LIQUIDITY_POOL = exports.NETWORK == "MAINNET"
     ? "0x9090a55fea75d0b135dfa53e6bbe234c0b0e9d0e0b21c615f32f0048bc35aca4"
-    : "0xe034d157764f273df5a1e264a3c0f78d8f922c37f942c340dabb1d66244c72ba";
+    : "0x4ef2f9562737beaba55fe03fd0d9da21af0d2277e0e802d3660afbc7ca4c073f";
 // MarketRegistry
 exports.MARKET = exports.NETWORK == "MAINNET"
     ? "0x327c8a176055400e9aacde8553a897898b5da969d6dcdb55eee268bb501a2c3a"
-    : "0xd0685e3eca9530f0618625d4a617a80db09f000609285b32a85f863da6baf811";
+    : "0x56e899ecc6a8b801b027a096a59aeef65be9a57a8c5380f0b93631c42e346706";
 exports.PERP_VERSION = exports.NETWORK == "MAINNET"
     ? "0x7c30204bd3f4dc37918281907308e0d7d09a75a6826473aec0caa1712ee149e5"
-    : "0xbb0615832168e64e301db2ebd6ad71b3fe170d7e217ccd0c08714de56b41676b";
+    : "0xe456c2b305e64a7add716dec6fa0c2ea459cf5148313c01fb98468707dae06b3";
 exports.TLP_TREASURY_CAP = exports.NETWORK == "MAINNET"
     ? "0x99071a9fb7e40546d3279dffac2ff15a278ab90229c3fe06610e1540dcafa7af"
-    : "0x1b39c2a5bc109ac520787c62f924da9244343e869bad755157e6e3e22bd7b7ae";
+    : "0x63afeecd08a372b623d2b0170303dcad285f3485833fac6218ea770cd032e762";
 // StakePoolRegistry
 exports.STAKE_POOL = exports.NETWORK == "MAINNET"
     ? "0xdbd23ed1bfe214a61bce1ba711b86e62048913f2069e845c9ff69119628f41a3"
@@ -58,10 +62,28 @@ exports.STAKE_POOL_VERSION = exports.NETWORK == "MAINNET"
     : "0x02b94b340a8810f6c451bc244dc2dd8d9d50cf86d727798969ca2c287c3186aa";
 exports.COMPETITION_CONFIG = exports.NETWORK == "MAINNET"
     ? "0xe896530a778adedc1b38e4fc31059a6557146caa7b1da56950b671a433de5f08"
-    : "0x2b811b120177839555aabdc2c28b28078170e663e855d29aa9072013d4fc918d";
+    : "0x05c3fd5ed8d9b8ca62b370e375dd555c174cfe6c573ba06ec22eb22f31c79ba3";
 exports.PROFIT_VAULT = exports.NETWORK == "MAINNET"
     ? "0xd24222307ba17ee1a08fe46ac587b1106e585e53f314ffffb525a4d4158b64c3"
-    : "0xb1d603139b24db2c46f6a423c8613ce677f329a0b159ff6e57672f3b663aec47";
+    : "0xdf6973935e107c091d8bb5aaef2d2bdf4987e496a880ae7e664d6ceb062f43a7";
 exports.LOCK_VAULT = exports.NETWORK == "MAINNET"
     ? "0x585355900351dd1915b77f31c06ae9e6d58b187de848d4e6e6a55d3789e281d6"
-    : "0x25dd9540f031b9a62b83784a727e1ef410f9aa91ecf7e3bb27a0c61f8ceecbfb";
+    : "0x8d3c497b2b0e7b8a7633422e8da780ba83ea6709d81ba7b0ca6935d58692cc96";
+// Pyth Lazer + OracleV2. Mainnet values mirror typus-rust
+// src/config/mainnet/pyth.json (oracle v16 / Lazer state), which the crankers
+// already run against — the OracleV2 object below holds 24 registered tokens.
+exports.ORACLE_PACKAGE_ID = exports.NETWORK == "MAINNET"
+    ? "0xb52c1b617cf5c9a6f911907be7d4b7bc12c618050b6421ee9801a4011617dcbe"
+    : "0xd2e030ab7f0fc956c7e683cf3c6faf3d22868dee81a4aae9f4a10a6d998a8a02";
+exports.ORACLE_V2_ID = exports.NETWORK == "MAINNET"
+    ? "0xcd03806a638885c18d9866b9704cb53487c51df8642e95059a6984673b9fa211"
+    : "0x6378d4a139475984613344077a862972756e2bd0cb2aab7018e7f48eeee0742d";
+exports.PYTH_LAZER_PACKAGE_ID = exports.NETWORK == "MAINNET"
+    ? "0xefbfd064480777699fd9c557a5804d72ace7bc82661fdc8d1f1a44ea6d92ee10"
+    : "0xacb76cbd636b83839153feff75b83157c400075717ce8c979fbbe88cf3564901";
+exports.PYTH_LAZER_STATE_ID = exports.NETWORK == "MAINNET"
+    ? "0xd0db9c1e9212a98120384bf78d8b8c985d87b9ee6921dffcf9d1394062911573"
+    : "0x7b570126bfdcc7f7b2b4028445d4ac1d35c41da498606a2b097c3973425698d3";
+// DOV single-collateral Registry that the new typus_perp pkg links against
+// (origin 0x02821e55). typus-config@main still advertises the old 0x6c9a394a DOV.
+exports.DOV_SINGLE_REGISTRY = exports.NETWORK == "MAINNET" ? "" : "0x43db5b91c8af6cf7a2a3b624e97aa35eef40adff4a22e2b59571b9eb89ded084";

package/dist/src/user/order.d.ts

@@ -20,7 +20,6 @@ export declare function createTradingOrder(client: TypusClient, tx: Transaction,
     isStopOrder: boolean;
     reduceOnly: boolean;
     linkedPositionId: string | null;
-    suiCoins?: string[];
 }): Promise<Transaction>;
 export declare function zeroCoin(tx: Transaction, typeArgs: [string]): import("@mysten/sui/transactions", { with: { "resolution-mode": "import" } }).TransactionResult;
 export declare function cancelTradingOrder(client: TypusClient, tx: Transaction, input: {
@@ -32,16 +31,13 @@ export declare function increaseCollateral(client: TypusClient, tx: Transaction,
     coins: string[];
     amount: string;
     position: typeof Position.$inferType;
-    suiCoins?: string[];
 }): Promise<Transaction>;
 export declare function releaseCollateral(client: TypusClient, tx: Transaction, input: {
     oracleContract?: string;
     position: typeof Position.$inferType;
     amount: string;
-    suiCoins?: string[];
 }): Promise<Transaction>;
 export declare function collectPositionFundingFee(client: TypusClient, tx: Transaction, input: {
     oracleContract?: string;
     position: typeof Position.$inferType;
-    suiCoins?: string[];
 }): Promise<Transaction>;

package/dist/src/user/order.js

@@ -10,14 +10,13 @@ exports.collectPositionFundingFee = collectPositionFundingFee;
 const trading_1 = require("../../src/generated/typus_perp/trading");
 const __1 = require("..");
 const utils_1 = require("@typus/typus-sdk/dist/src/utils");
-const utils_2 = require("@typus/typus-sdk/dist/src/utils");
 const constants_1 = require("@typus/typus-sdk/dist/src/constants");
-const utils_3 = require("@mysten/sui/utils");
+const utils_2 = require("@mysten/sui/utils");
 function findMarketIndex(client, input) {
     let target = constants_1.tokenType[client.config.network][input.tradingToken];
     for (let i = 0; i < input.markets.length; i++) {
         for (let symbol of input.markets[i].symbols) {
-            if ((0, utils_3.normalizeStructTag)(symbol.name) == target) {
+            if ((0, utils_2.normalizeStructTag)(symbol.name) == target) {
                 return i;
             }
         }
@@ -30,44 +29,29 @@ async function createTradingOrder(client, tx, input) {
     let tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
     let cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
     let baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
-    let coin;
-    let suiCoin;
-    if (TOKEN == "SUI" && client.config.sponsored) {
-        // split together
-        [coin, suiCoin] = (0, utils_2.splitCoins)(tx, constants_1.tokenType.MAINNET.SUI, input.coins, [input.amount, tokens.length.toString()], client.config.sponsored);
-    }
-    else if (client.config.sponsored) {
-        coin = (0, utils_2.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
-        suiCoin = (0, utils_2.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), client.config.sponsored);
-    }
-    else {
-        coin = (0, utils_2.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
-        // no suiCoin
-    }
-    const tokensWithoutTypus = Array.from(new Set([TOKEN, BASE_TOKEN])).filter((token) => token !== "TYPUS");
-    await (0, utils_2.updatePyth)(client.pythClient, tx, tokensWithoutTypus, suiCoin);
-    for (let token of tokensWithoutTypus) {
-        (0, utils_2.updateOracleWithPythUsd)(client.pythClient, tx, client.config.package.oracle, token);
+    let coin = (0, utils_1.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
+    const tokensWithoutTypus = tokens.filter((token) => token !== "TYPUS");
+    if (tokensWithoutTypus.length > 0) {
+        await client.pythClient.updateOracleV2WithPythLazer(tx, tokensWithoutTypus);
     }
     if (tokens.includes("TYPUS")) {
         tx = await (0, utils_1.updateOracleWithSignatureTx)(__1.NETWORK, tx, client.config.package.oracle, constants_1.tokenType[__1.NETWORK]["TYPUS"]);
     }
-    tx.add((0, trading_1.createTradingOrder)({
+    tx.add((0, trading_1.createTradingOrderV2)({
         arguments: {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
+            oracleV2: __1.ORACLE_V2_ID,
             marketIndex: BigInt(input.perpIndex),
             poolIndex: BigInt(input.poolIndex),
-            typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
-            typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
+            linkedPositionId: tx.pure.option("u64", input.linkedPositionId ? BigInt(input.linkedPositionId) : null),
             collateral: coin,
-            size: BigInt(input.size),
-            triggerPrice: BigInt(input.triggerPrice),
+            reduceOnly: input.reduceOnly,
             isLong: input.isLong,
             isStopOrder: input.isStopOrder,
-            reduceOnly: input.reduceOnly,
-            linkedPositionId: input.linkedPositionId ? BigInt(input.linkedPositionId) : null,
+            size: BigInt(input.size),
+            triggerPrice: BigInt(input.triggerPrice),
         },
         typeArguments: [cToken, baseToken],
     }));
@@ -81,8 +65,8 @@ function zeroCoin(tx, typeArgs) {
     });
 }
 async function cancelTradingOrder(client, tx, input) {
-    let cToken = (0, utils_3.normalizeStructTag)(input.order.collateral_token.name);
-    let BASE_TOKEN = (0, utils_3.normalizeStructTag)(input.order.symbol.base_token.name);
+    let cToken = (0, utils_2.normalizeStructTag)(input.order.collateral_token.name);
+    let BASE_TOKEN = (0, utils_2.normalizeStructTag)(input.order.symbol.base_token.name);
     let coin = tx.add((0, trading_1.cancelTradingOrder)({
         arguments: {
             version: __1.PERP_VERSION,
@@ -91,7 +75,7 @@ async function cancelTradingOrder(client, tx, input) {
             marketIndex: BigInt(input.order.marketIndex),
             orderId: BigInt(input.order.order_id),
             triggerPrice: BigInt(input.order.trigger_price),
-            orderUser: null,
+            orderUser: tx.pure.option("address", null),
         },
         typeArguments: [cToken, BASE_TOKEN],
     }));
@@ -105,24 +89,10 @@ async function increaseCollateral(client, tx, input) {
     let tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
     let cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
     let baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
-    let coin;
-    let suiCoin;
-    if (TOKEN == "SUI" && client.config.sponsored) {
-        // split together
-        [coin, suiCoin] = (0, utils_2.splitCoins)(tx, constants_1.tokenType.MAINNET.SUI, input.coins, [input.amount, tokens.length.toString()], client.config.sponsored);
-    }
-    else if (client.config.sponsored) {
-        coin = (0, utils_2.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
-        suiCoin = (0, utils_2.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), client.config.sponsored);
-    }
-    else {
-        coin = (0, utils_2.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
-        // no suiCoin
-    }
-    const tokensWithoutTypus = Array.from(new Set([TOKEN, BASE_TOKEN])).filter((token) => token !== "TYPUS");
-    await (0, utils_2.updatePyth)(client.pythClient, tx, tokensWithoutTypus, suiCoin);
-    for (let token of tokensWithoutTypus) {
-        (0, utils_2.updateOracleWithPythUsd)(client.pythClient, tx, client.config.package.oracle, token);
+    let coin = (0, utils_1.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
+    const tokensWithoutTypus = tokens.filter((token) => token !== "TYPUS");
+    if (tokensWithoutTypus.length > 0) {
+        await client.pythClient.updateOracleV2WithPythLazer(tx, tokensWithoutTypus);
     }
     if (tokens.includes("TYPUS")) {
         const oracleContract = input.oracleContract ?? client.config.package.oracle;
@@ -130,15 +100,14 @@ async function increaseCollateral(client, tx, input) {
     }
     // @ts-ignore
     let marketIndex = BigInt(input.position.marketIndex);
-    tx.add((0, trading_1.increaseCollateral)({
+    tx.add((0, trading_1.increaseCollateralV2)({
         arguments: {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
+            oracleV2: __1.ORACLE_V2_ID,
             marketIndex: marketIndex,
             poolIndex: marketIndex,
-            typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
-            typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
             positionId: BigInt(input.position.position_id),
             collateral: coin,
         },
@@ -151,14 +120,9 @@ async function releaseCollateral(client, tx, input) {
     let TOKEN = (0, constants_1.typeArgToAsset)(input.position.collateral_token.name);
     let BASE_TOKEN = (0, constants_1.typeArgToAsset)(input.position.symbol.base_token.name);
     let tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
-    let suiCoin;
-    if (client.config.sponsored) {
-        suiCoin = (0, utils_2.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), client.config.sponsored);
-    }
-    const tokensWithoutTypus = Array.from(new Set([TOKEN, BASE_TOKEN])).filter((token) => token !== "TYPUS");
-    await (0, utils_2.updatePyth)(client.pythClient, tx, tokensWithoutTypus, suiCoin);
-    for (let token of tokensWithoutTypus) {
-        (0, utils_2.updateOracleWithPythUsd)(client.pythClient, tx, client.config.package.oracle, token);
+    const tokensWithoutTypus = tokens.filter((token) => token !== "TYPUS");
+    if (tokensWithoutTypus.length > 0) {
+        await client.pythClient.updateOracleV2WithPythLazer(tx, tokensWithoutTypus);
     }
     if (tokens.includes("TYPUS")) {
         const oracleContract = input.oracleContract ?? client.config.package.oracle;
@@ -168,15 +132,14 @@ async function releaseCollateral(client, tx, input) {
     let baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
     // @ts-ignore
     let marketIndex = BigInt(input.position.marketIndex);
-    let coin = tx.add((0, trading_1.releaseCollateral)({
+    let coin = tx.add((0, trading_1.releaseCollateralV2)({
         arguments: {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
+            oracleV2: __1.ORACLE_V2_ID,
             marketIndex: marketIndex,
             poolIndex: marketIndex,
-            typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
-            typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
             positionId: BigInt(input.position.position_id),
             releaseAmount: BigInt(input.amount),
         },
@@ -190,14 +153,9 @@ async function collectPositionFundingFee(client, tx, input) {
     let TOKEN = (0, constants_1.typeArgToAsset)(input.position.collateral_token.name);
     let BASE_TOKEN = (0, constants_1.typeArgToAsset)(input.position.symbol.base_token.name);
     let tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
-    let suiCoin;
-    if (client.config.sponsored) {
-        suiCoin = (0, utils_2.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), client.config.sponsored);
-    }
-    const tokensWithoutTypus = Array.from(new Set([TOKEN, BASE_TOKEN])).filter((token) => token !== "TYPUS");
-    await (0, utils_2.updatePyth)(client.pythClient, tx, tokensWithoutTypus, suiCoin);
-    for (let token of tokensWithoutTypus) {
-        (0, utils_2.updateOracleWithPythUsd)(client.pythClient, tx, client.config.package.oracle, token);
+    const tokensWithoutTypus = tokens.filter((token) => token !== "TYPUS");
+    if (tokensWithoutTypus.length > 0) {
+        await client.pythClient.updateOracleV2WithPythLazer(tx, tokensWithoutTypus);
     }
     if (tokens.includes("TYPUS")) {
         const oracleContract = input.oracleContract ?? client.config.package.oracle;
@@ -207,15 +165,14 @@ async function collectPositionFundingFee(client, tx, input) {
     let baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
     // @ts-ignore
     let marketIndex = BigInt(input.position.marketIndex);
-    tx.add((0, trading_1.collectPositionFundingFee)({
+    tx.add((0, trading_1.collectPositionFundingFeeV2)({
         arguments: {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
+            oracleV2: __1.ORACLE_V2_ID,
             marketIndex: marketIndex,
             poolIndex: marketIndex,
-            typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
-            typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
             positionId: BigInt(input.position.position_id),
         },
         typeArguments: [cToken, baseToken],

package/dist/src/user/orderWithBidReceipt.d.ts

@@ -19,7 +19,6 @@ export declare function createTradingOrderWithBidReceiptByAutoBid(client: TypusC
     signalIndex: string;
     strategyIndex: string;
     share?: string;
-    suiCoins?: string[];
 }): Promise<Transaction>;
 export declare function createTradingOrderWithBidReceipt(client: TypusClient, tx: Transaction, input: {
     perpIndex: string;
@@ -32,7 +31,6 @@ export declare function createTradingOrderWithBidReceipt(client: TypusClient, tx
     bToken: TOKEN;
     bidReceipts: string[];
     share?: string;
-    suiCoins?: string[];
 }): Promise<Transaction>;
 export declare function reduceOptionCollateralPositionSize(client: TypusClient, tx: Transaction, input: {
     perpIndex: string;
@@ -41,5 +39,4 @@ export declare function reduceOptionCollateralPositionSize(client: TypusClient,
     bToken: string;
     positionId: string;
     orderSize: string | null;
-    suiCoins?: string[];
 }): Promise<Transaction>;