@typus/typus-perp-sdk 1.1.32-codegen-exp3 → 1.1.32-codegen-exp4

package/dist/src/client.d.ts

@@ -10,7 +10,7 @@ export declare class TypusClient {
     graphQLClient: SuiGraphQLClient;
     pythClient: PythClient;
     config: TypusConfig;
-    constructor(config: TypusConfig, mvr?: Experimental_SuiClientTypes.MvrOptions);
+    constructor(config: TypusConfig);
     getCoins(params: GetCoinsParams): Promise<import("@mysten/sui/client").PaginatedCoins>;
     getObject(params: GetObjectParams): Promise<import("@mysten/sui/client").SuiObjectResponse>;
     getOwnedObjects(params: GetOwnedObjectsParams): Promise<import("@mysten/sui/client").PaginatedObjectsResponse>;
@@ -24,4 +24,5 @@ export declare class TypusClient {
     batchGetObjectsBcs(objectIds: string[]): Promise<(Uint8Array<ArrayBufferLike> | undefined)[]>;
     getDynamicFieldsBcs(parent: string): Promise<Uint8Array<ArrayBufferLike>[]>;
     getDynamicObjectFieldsBcs(parent: string): Promise<Uint8Array<ArrayBufferLike>[]>;
+    simulateTransaction(transactionBcs: Uint8Array<ArrayBufferLike>): Promise<Experimental_SuiClientTypes.DryRunTransactionResponse>;
 }

package/dist/src/client.js

@@ -8,31 +8,35 @@ const utils_1 = require("@typus/typus-sdk/dist/src/utils");
 const src_1 = require("../src");
 class TypusClient {
     // user: string;
-    constructor(config, mvr) {
+    // mvr?: Experimental_SuiClientTypes.MvrOptions
+    constructor(config) {
         this.config = config;
         const network = config.network.toLowerCase();
+        const mvr = {
+            overrides: {
+                packages: {
+                    "@typus/perp": src_1.PERP_PUBLISHED_AT,
+                    "@typus/stake-pool": src_1.STAKE_PUBLISHED_AT,
+                },
+                // types: {
+                //     "@typus/perp": PERP_PACKAGE_ID,
+                //     "@typus/stake-pool": STAKE_PACKAGE_ID,
+                // },
+            },
+        };
         this.jsonRpcClient = new client_1.SuiClient({
             network: network,
             url: config.rpcEndpoint,
-            mvr: {
-                overrides: {
-                    packages: {
-                        "@typus/perp": src_1.PERP_PUBLISHED_AT,
-                        "@typus/stake-pool": src_1.STAKE_PUBLISHED_AT,
-                    },
-                    // types: {
-                    //     "@typus/perp": PERP_PACKAGE_ID,
-                    //     "@typus/stake-pool": STAKE_PACKAGE_ID,
-                    // },
-                },
-            },
+            mvr,
         });
         this.gRpcClient = new grpc_1.SuiGrpcClient({
             network: network,
             baseUrl: `https://fullnode.${network}.sui.io:443`,
         });
         this.graphQLClient = new graphql_1.SuiGraphQLClient({
+            network: network,
             url: `https://graphql.${network}.sui.io/graphql`,
+            mvr,
         });
         this.pythClient = (0, utils_1.createPythClient)(this.jsonRpcClient, this.config.network);
     }
@@ -52,9 +56,25 @@ class TypusClient {
         return this.jsonRpcClient.multiGetObjects(params);
     }
     devInspectTransactionBlock(params) {
+        // this.gRpcClient.transactionExecutionService.simulateTransaction({ transaction: { bcs: { value: params.transactionBlock } } });
         return this.jsonRpcClient.devInspectTransactionBlock(params);
     }
     executeTransactionBlock(params) {
+        // this.gRpcClient.transactionExecutionService.executeTransaction({
+        //     transaction: { bcs: { value: params.transactionBlock } },
+        //     signatures,
+        // });
+        // this.gRpcClient.transactionExecutionService.executeTransaction({
+        //     transaction: {
+        //         bcs: {
+        //             value: transactionBytes,
+        //         },
+        //     },
+        //     signatures: signatures.map((sig) => ({
+        //         bcs: { value: fromBase64(sig) },
+        //         signature: { oneofKind: undefined },
+        //     })),
+        // });
         return this.jsonRpcClient.executeTransactionBlock(params);
     }
     signAndExecuteTransaction(params) {
@@ -104,5 +124,12 @@ class TypusClient {
             return x_1.childObject?.contents?.value;
         });
     }
+    simulateTransaction(transactionBcs) {
+        return this.gRpcClient.core.dryRunTransaction({ transaction: transactionBcs });
+        // return this.gRpcClient.transactionExecutionService.simulateTransaction({
+        //     transaction: { bcs: { value: transactionBcs } },
+        //     // checks: 1,
+        // });
+    }
 }
 exports.TypusClient = TypusClient;

package/dist/src/fetch.d.ts

@@ -1,5 +1,5 @@
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
-import { Position } from "./generated/typus_perp/position";
+import { TradingOrder, Position } from "./generated/typus_perp/position";
 import { TypusClient } from "../src/client";
 export declare function getLpPools(client: TypusClient): Promise<{
     id: {
@@ -341,39 +341,14 @@ export declare function getMarkets(client: TypusClient, input: {
         u64_padding: string[];
     };
 }[]][]>;
+export type TradingOrder = (typeof TradingOrder.$inferType);
+export type TradingOrderWithMarketIndex = TradingOrder & {
+    marketIndex: number;
+};
 export declare function getUserOrders(client: TypusClient, input: {
     user: string;
     indexes: string[];
-}): Promise<{
-    id: {
-        id: string;
-    };
-    create_ts_ms: string;
-    order_id: string;
-    linked_position_id: string | null;
-    user: string;
-    collateral_token: {
-        name: string;
-    };
-    collateral_token_decimal: string;
-    symbol: {
-        base_token: {
-            name: string;
-        };
-        quote_token: {
-            name: string;
-        };
-    };
-    leverage_mbp: string;
-    reduce_only: boolean;
-    is_long: boolean;
-    is_stop_order: boolean;
-    size: string;
-    size_decimal: string;
-    trigger_price: string;
-    oracle_price_when_placing: string;
-    u64_padding: string[];
-}[]>;
+}): Promise<TradingOrderWithMarketIndex[]>;
 export declare function getUserPositions(client: TypusClient, input: {
     user: string;
     indexes: string[];

package/dist/src/fetch.js

@@ -90,6 +90,10 @@ async function getStakePool(client, objectId) {
 async function getMarkets(client, input) {
     let tx = new transactions_1.Transaction();
     tx.add((0, trading_1.getMarketsBcs)({ arguments: { registry: _1.MARKET, indexes: input.indexes.map((x) => BigInt(x)) } }));
+    // tx.setSender(SENDER);
+    // let bcs = await tx.build({ client: client.jsonRpcClient, onlyTransactionKind: true });
+    // // console.log("bcs", bcs);
+    // let res = await client.simulateTransaction(bcs);
     let devInspectTransactionBlockResult = await client.devInspectTransactionBlock({ sender: constants_1.SENDER, transactionBlock: tx });
     // @ts-ignore
     let bytes = devInspectTransactionBlockResult.results[0].returnValues[0][0];
@@ -137,7 +141,7 @@ async function getUserOrders(client, input) {
             let length = reader.readULEB();
             let bytes = reader.readBytes(length);
             let order = position_1.TradingOrder.parse(bytes);
-            orders.push(order);
+            orders.push({ ...order, marketIndex: x });
         });
     }
     return orders;
@@ -193,13 +197,15 @@ function parseOptionBidReceipts(positions) {
 async function getUserStake(client, input) {
     let tx = new transactions_1.Transaction();
     for (let i of input.indexes) {
-        tx.add((0, stake_pool_1.allocateIncentive)({
-            arguments: {
-                version: _1.STAKE_POOL_VERSION,
-                registry: _1.STAKE_POOL,
-                index: BigInt(i),
-            },
-        }));
+        // tx.add(
+        //     allocateIncentive({
+        //         arguments: {
+        //             version: STAKE_POOL_VERSION,
+        //             registry: STAKE_POOL,
+        //             index: BigInt(i),
+        //         },
+        //     })
+        // );
         tx.add((0, stake_pool_1.getUserShares)({
             arguments: {
                 registry: _1.STAKE_POOL,
@@ -214,7 +220,7 @@ async function getUserStake(client, input) {
         let results = [];
         for (var x = 0; x < input.indexes.length; x++) {
             // @ts-ignore
-            var returnValues = res.results[1].returnValues[0][0];
+            var returnValues = res.results[x].returnValues[0][0];
             // console.log(returnValues);
             var reader = new bcs_1.BcsReader(new Uint8Array(returnValues));
             let length = reader.readULEB();

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

@@ -1,7 +1,12 @@
+import { Markets } from "../../src/generated/typus_perp/trading";
 import { Position, TradingOrder } from "../../src/generated/typus_perp/position";
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
 import { Transaction } from "@mysten/sui/transactions";
 import { TypusClient } from "../../src/client";
+export declare function findMarketIndex(client: TypusClient, input: {
+    markets: (typeof Markets.$inferType)[];
+    tradingToken: TOKEN;
+}): number | undefined;
 export declare function createTradingOrder(client: TypusClient, tx: Transaction, input: {
     perpIndex: string;
     coins: string[];
@@ -18,25 +23,21 @@ export declare function createTradingOrder(client: TypusClient, tx: Transaction,
 }): Promise<Transaction>;
 export declare function zeroCoin(tx: Transaction, typeArgs: [string]): import("@mysten/sui/transactions").TransactionResult;
 export declare function cancelTradingOrder(client: TypusClient, tx: Transaction, input: {
-    perpIndex: string;
     order: typeof TradingOrder.$inferType;
     user: string;
 }): Promise<Transaction>;
 export declare function increaseCollateral(client: TypusClient, tx: Transaction, input: {
-    perpIndex: string;
     coins: string[];
     amount: string;
     position: typeof Position.$inferType;
     suiCoins?: string[];
 }): Promise<Transaction>;
 export declare function releaseCollateral(client: TypusClient, tx: Transaction, input: {
-    perpIndex: string;
     position: typeof Position.$inferType;
     amount: string;
     suiCoins?: string[];
 }): Promise<Transaction>;
 export declare function collectPositionFundingFee(client: TypusClient, tx: Transaction, input: {
-    perpIndex: string;
     position: typeof Position.$inferType;
     suiCoins?: string[];
 }): Promise<Transaction>;

package/dist/src/user/order.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.findMarketIndex = findMarketIndex;
 exports.createTradingOrder = createTradingOrder;
 exports.zeroCoin = zeroCoin;
 exports.cancelTradingOrder = cancelTradingOrder;
@@ -10,6 +11,17 @@ const trading_1 = require("../../src/generated/typus_perp/trading");
 const __1 = require("..");
 const utils_1 = require("@typus/typus-sdk/dist/src/utils");
 const constants_1 = require("@typus/typus-sdk/dist/src/constants");
+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_2.normalizeStructTag)(symbol.name) == target) {
+                return i;
+            }
+        }
+    }
+}
 async function createTradingOrder(client, tx, input) {
     // INPUTS
     let TOKEN = input.cToken;
@@ -75,7 +87,8 @@ async function cancelTradingOrder(client, tx, input) {
         arguments: {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
-            marketIndex: BigInt(input.perpIndex),
+            // @ts-ignore
+            marketIndex: BigInt(input.order.marketIndex),
             orderId: BigInt(input.order.order_id),
             triggerPrice: BigInt(input.order.trigger_price),
             orderUser: null,
@@ -110,13 +123,15 @@ async function increaseCollateral(client, tx, input) {
     for (let token of tokens) {
         (0, utils_1.updateOracleWithPythUsd)(client.pythClient, tx, client.config.package.oracle, token);
     }
+    // @ts-ignore
+    let marketIndex = BigInt(input.position.marketIndex);
     tx.add((0, trading_1.increaseCollateral)({
         arguments: {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
-            marketIndex: BigInt(input.perpIndex),
-            poolIndex: BigInt(input.perpIndex),
+            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),
@@ -141,13 +156,15 @@ async function releaseCollateral(client, tx, input) {
     }
     let cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
     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)({
         arguments: {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
-            marketIndex: BigInt(input.perpIndex),
-            poolIndex: BigInt(input.perpIndex),
+            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),
@@ -173,13 +190,15 @@ async function collectPositionFundingFee(client, tx, input) {
     }
     let cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
     let baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
+    // @ts-ignore
+    let marketIndex = BigInt(input.position.marketIndex);
     tx.add((0, trading_1.collectPositionFundingFee)({
         arguments: {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
-            marketIndex: BigInt(input.perpIndex),
-            poolIndex: BigInt(input.perpIndex),
+            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),

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

@@ -2,6 +2,7 @@ import { Transaction } from "@mysten/sui/transactions";
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
 import { TypusClient } from "../../src/client";
 export declare function createTradingOrderWithBidReceiptByAutoBid(client: TypusClient, tx: Transaction, input: {
+    perpIndex: string;
     cToken: TOKEN;
     tradingToken: TOKEN;
     isLong: boolean;
@@ -11,9 +12,9 @@ export declare function createTradingOrderWithBidReceiptByAutoBid(client: TypusC
     signalIndex: string;
     strategyIndex: string;
     suiCoins?: string[];
-    perpIndex?: number;
 }): Promise<Transaction>;
 export declare function createTradingOrderWithBidReceipt(client: TypusClient, tx: Transaction, input: {
+    perpIndex: string;
     cToken: TOKEN;
     tradingToken: TOKEN;
     isLong: boolean;
@@ -23,14 +24,13 @@ export declare function createTradingOrderWithBidReceipt(client: TypusClient, tx
     bidReceipts: string[];
     share?: string;
     suiCoins?: string[];
-    perpIndex?: number;
 }): Promise<Transaction>;
 export declare function reduceOptionCollateralPositionSize(client: TypusClient, tx: Transaction, input: {
+    perpIndex: string;
     cToken: TOKEN;
     tradingToken: TOKEN;
     bToken: string;
     positionId: string;
     orderSize: string | null;
     suiCoins?: string[];
-    perpIndex?: number;
 }): Promise<Transaction>;

package/dist/src/user/orderWithBidReceipt.js

@@ -36,8 +36,8 @@ async function createTradingOrderWithBidReceiptByAutoBid(client, tx, input) {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
-            marketIndex: BigInt(input.perpIndex ?? 0),
-            poolIndex: BigInt(input.perpIndex ?? 0),
+            marketIndex: BigInt(input.perpIndex),
+            poolIndex: BigInt(input.perpIndex),
             typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
             typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
             typusEcosystemVersion: client.config.version.typus,
@@ -81,8 +81,8 @@ async function createTradingOrderWithBidReceipt(client, tx, input) {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
-            marketIndex: BigInt(input.perpIndex ?? 0),
-            poolIndex: BigInt(input.perpIndex ?? 0),
+            marketIndex: BigInt(input.perpIndex),
+            poolIndex: BigInt(input.perpIndex),
             typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
             typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
             typusEcosystemVersion: client.config.version.typus,
@@ -118,8 +118,8 @@ async function reduceOptionCollateralPositionSize(client, tx, input) {
             version: __1.PERP_VERSION,
             registry: __1.MARKET,
             poolRegistry: __1.LP_POOL,
-            marketIndex: BigInt(input.perpIndex ?? 0),
-            poolIndex: BigInt(input.perpIndex ?? 0),
+            marketIndex: BigInt(input.perpIndex),
+            poolIndex: BigInt(input.perpIndex),
             typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
             typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
             typusEcosystemVersion: client.config.version.typus,

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

@@ -65,6 +65,5 @@ export declare function swap(client: TypusClient, tx: Transaction, input: {
 }): Promise<Transaction>;
 export declare function harvestStakeReward(client: TypusClient, tx: Transaction, input: {
     stakePool: typeof StakePool.$inferType;
-    userShareId: string;
     user: string;
 }): Promise<Transaction>;

package/dist/src/user/tlp.js

@@ -61,7 +61,7 @@ async function mintStakeLp(client, tx, input) {
     }
     // console.log(iToken);
     if (input.userShareId) {
-        harvestStakeReward(client, tx, { stakePool: input.stakePool, userShareId: input.userShareId, user: input.user });
+        harvestStakeReward(client, tx, { stakePool: input.stakePool, user: input.user });
     }
     let lpToken = (0, utils_1.normalizeStructTag)(input.lpPool.lp_token_type.name);
     let lpCoin = tx.add((0, lp_pool_1.mintLp)({
@@ -100,7 +100,7 @@ async function stakeLp(client, tx, input) {
     [lpCoin] = tx.splitCoins(destination, [input.amount]);
     // console.log(iToken);
     if (input.userShareId) {
-        harvestStakeReward(client, tx, { stakePool: input.stakePool, userShareId: input.userShareId, user: input.user });
+        harvestStakeReward(client, tx, { stakePool: input.stakePool, user: input.user });
     }
     tx.add((0, stake_pool_1.stake)({
         arguments: {
@@ -114,7 +114,7 @@ async function stakeLp(client, tx, input) {
     return tx;
 }
 async function unstake(client, tx, input) {
-    harvestStakeReward(client, tx, { stakePool: input.stakePool, userShareId: input.userShareId, user: input.user });
+    harvestStakeReward(client, tx, { stakePool: input.stakePool, user: input.user });
     let lpToken = (0, utils_1.normalizeStructTag)(input.lpPool.lp_token_type.name);
     tx.add((0, stake_pool_1.unsubscribe)({
         arguments: {
@@ -156,7 +156,7 @@ async function unstakeRedeem(client, tx, input) {
             typeArguments: [constants_1.tokenType[__1.NETWORK][token]],
         })(tx);
     }
-    harvestStakeReward(client, tx, { stakePool: input.stakePool, userShareId: input.userShareId, user: input.user });
+    harvestStakeReward(client, tx, { stakePool: input.stakePool, user: input.user });
     let lpToken = (0, utils_1.normalizeStructTag)(input.lpPool.lp_token_type.name);
     tx.add((0, stake_pool_1.unsubscribe)({
         arguments: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typus/typus-perp-sdk",
-    "version": "1.1.32-codegen-exp3",
+    "version": "1.1.32-codegen-exp4",
     "repository": "https://github.com/Typus-Lab/typus-perp-sdk.git",
     "author": "Typus",
     "description": "typus perp sdk",
@@ -8,11 +8,12 @@
     "dependencies": {
         "@mysten/bcs": "1.9.2",
         "@mysten/sui": "1.44.0",
-        "@typus/typus-sdk": "1.8.25"
+        "@typus/typus-sdk": "1.8.30"
     },
     "resolutions": {
         "@mysten/bcs": "1.9.2",
-        "@mysten/sui": "1.44.0"
+        "@mysten/sui": "1.44.0",
+        "@pythnetwork/pyth-sui-js": "2.3.0"
     },
     "devDependencies": {
         "@types/bs58": "^4.0.1",
@@ -43,4 +44,4 @@
     },
     "homepage": "https://github.com/Typus-Lab/typus-perp-sdk#readme",
     "packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f"
-}
+}