@triadxyz/triad-protocol 1.9.2-beta → 1.9.4-beta

package/dist/trade.d.ts

@@ -1,7 +1,7 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
-import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, PlaceOrderArgs, CancelOrderArgs, Order, MarketBidOrderArgs, UpdateMarketAdminArgs } from './types/trade';
+import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, Order, MarketBidOrderArgs, UpdateMarketAdminArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs } from './types/trade';
 import { RpcOptions } from './types';
 import BN from 'bn.js';
 export default class Trade {
@@ -136,8 +136,8 @@ export default class Trade {
                 ask: Record<string, never>;
             });
             linkedOrderId: BN;
-            linkedAskOrderId: BN;
             createdAt: BN;
+            linkedBidOrderId: BN;
             padding: number[];
         }[];
         nonce: number;
@@ -277,28 +277,48 @@ export default class Trade {
         nonce?: undefined;
     }>;
     /**
-     * Place Order
+     * Place Bid Order
      * @param args.marketId - The ID of the Market
      * @param args.amount - The amount of the Order
      * @param args.direction - The direction of the Order
-     * @param args.orderSide - The side of the Order
      * @param args.mint - The mint of the Order
      * @param args.price - The price of the Order
      *
      * @param options - RPC options
+     */
+    placeBidOrder({ marketId, amount, direction, mint, price }: PlaceBidOrderArgs, options?: RpcOptions): Promise<string>;
+    /**
+     * Place Ask Order
+     * @param args.marketId - The ID of the Market
+     * @param args.amount - The amount of the Order
+     * @param args.direction - The direction of the Order
+     * @param args.price - The price of the Order
+     * @param args.bidOrderId - The ID of the Bid Order
+     * @param args.bidNonce - The nonce of the Bid Order
+     *
+     * @param options - RPC options
      *
      */
-    placeOrder({ marketId, amount, direction, orderSide, mint, price, bidOrderId, bidNonce }: PlaceOrderArgs, options?: RpcOptions): Promise<string>;
+    placeAskOrder({ marketId, amount, direction, price, bidOrderId, bidNonce }: PlaceAskOrderArgs, options?: RpcOptions): Promise<string>;
+    /**
+     * Cancel Bid Order
+     * @param args.marketId - The ID of the Market
+     * @param args.orderId - The ID of the Order
+     * @param args.userNonce - The nonce of the user
+     *
+     * @param options - RPC options
+     */
+    cancelBidOrder({ marketId, orderId, userNonce, mint }: CancelBidOrderArgs, options?: RpcOptions): Promise<string>;
     /**
-     * Cancel Order
+     * Cancel Ask Order
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order
      * @param args.userNonce - The nonce of the user
-     * @param args.orderSide - The side of the Order
+     * @param args.userNonceBidOrder - The nonce of the bid user
      *
      * @param options - RPC options
      */
-    cancelOrder({ marketId, orderId, userNonce, orderSide, mint, userNonceBidOrder }: CancelOrderArgs, options?: RpcOptions): Promise<string>;
+    cancelAskOrder({ marketId, orderId, userNonce, userNonceBidOrder }: CancelAskOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Market Bid Order
      * @param args.marketId - The ID of the Market

package/dist/trade.js

@@ -413,18 +413,16 @@ class Trade {
         });
     }
     /**
-     * Place Order
+     * Place Bid Order
      * @param args.marketId - The ID of the Market
      * @param args.amount - The amount of the Order
      * @param args.direction - The direction of the Order
-     * @param args.orderSide - The side of the Order
      * @param args.mint - The mint of the Order
      * @param args.price - The price of the Order
      *
      * @param options - RPC options
-     *
      */
-    placeOrder({ marketId, amount, direction, orderSide, mint, price, bidOrderId, bidNonce }, options) {
+    placeBidOrder({ marketId, amount, direction, mint, price }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
@@ -432,81 +430,116 @@ class Trade {
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
-            if (Object.keys(orderSide)[0] === 'bid') {
-                ixs.push(yield this.program.methods
-                    .placeBidOrder({
-                    amount: new bn_js_1.default(amount * Math.pow(10, this.decimals)),
-                    price: new bn_js_1.default(price * Math.pow(10, this.decimals)),
-                    orderDirection: direction
-                })
-                    .accounts({
-                    signer: this.provider.publicKey,
-                    market: marketPDA,
-                    userTrade: userTradePDA,
-                    mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
-                })
-                    .instruction());
+            ixs.push(yield this.program.methods
+                .placeBidOrder({
+                amount: new bn_js_1.default(amount * Math.pow(10, this.decimals)),
+                price: new bn_js_1.default(price * Math.pow(10, this.decimals)),
+                orderDirection: direction
+            })
+                .accounts({
+                signer: this.provider.publicKey,
+                market: marketPDA,
+                userTrade: userTradePDA,
+                mint,
+                tokenProgram: (0, helpers_1.getTokenProgram)(mint)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
+        });
+    }
+    /**
+     * Place Ask Order
+     * @param args.marketId - The ID of the Market
+     * @param args.amount - The amount of the Order
+     * @param args.direction - The direction of the Order
+     * @param args.price - The price of the Order
+     * @param args.bidOrderId - The ID of the Bid Order
+     * @param args.bidNonce - The nonce of the Bid Order
+     *
+     * @param options - RPC options
+     *
+     */
+    placeAskOrder({ marketId, amount, direction, price, bidOrderId, bidNonce }, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
+            const ixs = [];
+            const { userTradePDA: askUserTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
+            if (userTradeIxs.length > 0) {
+                ixs.push(...userTradeIxs);
             }
-            if (Object.keys(orderSide)[0] === 'ask' && bidOrderId) {
-                let bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
-                if (bidNonce !== 0) {
-                    const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, bidNonce);
-                    bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
-                }
-                ixs.push(yield this.program.methods
-                    .placeAskOrder({
-                    shares: new bn_js_1.default(amount * Math.pow(10, this.decimals)),
-                    price: new bn_js_1.default(price * Math.pow(10, this.decimals)),
-                    bidOrderId: new bn_js_1.default(bidOrderId),
-                    orderDirection: direction
-                })
-                    .accounts({
-                    signer: this.provider.publicKey,
-                    market: marketPDA,
-                    askUserTrade: userTradePDA,
-                    bidUserTrade: bidUserTradePDA
-                })
-                    .instruction());
+            let bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            if (bidNonce !== 0) {
+                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, bidNonce);
+                bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
+            ixs.push(yield this.program.methods
+                .placeAskOrder({
+                shares: new bn_js_1.default(amount * Math.pow(10, this.decimals)),
+                price: new bn_js_1.default(price * Math.pow(10, this.decimals)),
+                bidOrderId: new bn_js_1.default(bidOrderId),
+                orderDirection: direction
+            })
+                .accounts({
+                signer: this.provider.publicKey,
+                market: marketPDA,
+                askUserTrade: askUserTradePDA,
+                bidUserTrade: bidUserTradePDA
+            })
+                .instruction());
             return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }
     /**
-     * Cancel Order
+     * Cancel Bid Order
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order
      * @param args.userNonce - The nonce of the user
-     * @param args.orderSide - The side of the Order
      *
      * @param options - RPC options
      */
-    cancelOrder({ marketId, orderId, userNonce, orderSide, mint, userNonceBidOrder }, options) {
+    cancelBidOrder({ marketId, orderId, userNonce, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
             let userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
-            let bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
             if (userNonce !== 0) {
                 const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonce);
                 userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            if (userNonceBidOrder !== null && userNonceBidOrder !== 0) {
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.cancelBidOrder(new bn_js_1.default(orderId)).accounts({
+                signer: this.provider.publicKey,
+                market: marketPDA,
+                userTrade: userTradePDA,
+                mint,
+                tokenProgram: (0, helpers_1.getTokenProgram)(mint)
+            }), options);
+        });
+    }
+    /**
+     * Cancel Ask Order
+     * @param args.marketId - The ID of the Market
+     * @param args.orderId - The ID of the Order
+     * @param args.userNonce - The nonce of the user
+     * @param args.userNonceBidOrder - The nonce of the bid user
+     *
+     * @param options - RPC options
+     */
+    cancelAskOrder({ marketId, orderId, userNonce, userNonceBidOrder }, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
+            let askUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            if (userNonce !== 0) {
+                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonce);
+                askUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+            }
+            let bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            if (userNonceBidOrder !== 0) {
                 const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonceBidOrder);
                 bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            if (orderSide === trade_1.OrderSide.BID) {
-                return (0, sendTransactionWithOptions_1.default)(this.program.methods.cancelBidOrder(new bn_js_1.default(orderId)).accounts({
-                    signer: this.provider.publicKey,
-                    market: marketPDA,
-                    userTrade: userTradePDA,
-                    mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
-                }), options);
-            }
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.cancelAskOrder(new bn_js_1.default(orderId)).accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                askUserTrade: userTradePDA,
+                askUserTrade: askUserTradePDA,
                 bidUserTrade: bidUserTradePDA
             }), options);
         });

package/dist/types/idl_triad_protocol.json

@@ -2686,14 +2686,14 @@
                         "name": "linked_order_id",
                         "type": "u64"
                     },
-                    {
-                        "name": "linked_ask_order_id",
-                        "type": "u64"
-                    },
                     {
                         "name": "created_at",
                         "type": "i64"
                     },
+                    {
+                        "name": "linked_bid_order_id",
+                        "type": "u64"
+                    },
                     {
                         "name": "padding",
                         "type": {
@@ -2802,13 +2802,13 @@
                         "name": "linked_order_id",
                         "type": "u64"
                     },
-                    {
-                        "name": "linked_ask_order_id",
-                        "type": "u64"
-                    },
                     {
                         "name": "created_at",
                         "type": "i64"
+                    },
+                    {
+                        "name": "linked_bid_order_id",
+                        "type": "u64"
                     }
                 ]
             }

package/dist/types/trade.d.ts

@@ -52,7 +52,7 @@ export type Order = {
     orderSide: OrderSide;
     userNonce: string;
     linkedOrderId: string;
-    linkedAskOrderId: string;
+    linkedBidOrderId: string;
     authority: string;
     createdAt: string;
 };
@@ -82,7 +82,7 @@ export declare enum OrderSide {
     BID = "bid",
     ASK = "ask"
 }
-export type PlaceOrderArgs = {
+export type PlaceBidOrderArgs = {
     marketId: number;
     amount: number;
     price: number;
@@ -91,15 +91,22 @@ export type PlaceOrderArgs = {
     } | {
         flop: {};
     };
-    orderSide: {
-        bid: {};
-    } | {
-        ask: {};
-    };
     mint: PublicKey;
     bidOrderId: number | null;
     bidNonce: number | null;
 };
+export type PlaceAskOrderArgs = {
+    marketId: number;
+    amount: number;
+    price: number;
+    direction: {
+        hype: {};
+    } | {
+        flop: {};
+    };
+    bidOrderId: number;
+    bidNonce: number;
+};
 export type InitializeMarketArgs = {
     marketId: number;
     startTime: number;
@@ -147,13 +154,17 @@ export type CreateMarketArgs = {
     payoutFee: number;
     mint: PublicKey;
 };
-export type CancelOrderArgs = {
+export type CancelBidOrderArgs = {
     marketId: number;
     orderId: number;
     userNonce: number;
-    orderSide: OrderSide;
     mint: PublicKey;
-    userNonceBidOrder: number | null;
+};
+export type CancelAskOrderArgs = {
+    marketId: number;
+    orderId: number;
+    userNonce: number;
+    userNonceBidOrder: number;
 };
 export type MarketBidOrderArgs = {
     marketId: number;

package/dist/types/triad_protocol.d.ts

@@ -3388,14 +3388,14 @@ export type TriadProtocol = {
                         name: 'linkedOrderId';
                         type: 'u64';
                     },
-                    {
-                        name: 'linkedAskOrderId';
-                        type: 'u64';
-                    },
                     {
                         name: 'createdAt';
                         type: 'i64';
                     },
+                    {
+                        name: 'linkedBidOrderId';
+                        type: 'u64';
+                    },
                     {
                         name: 'padding';
                         type: {
@@ -3504,13 +3504,13 @@ export type TriadProtocol = {
                         name: 'linkedOrderId';
                         type: 'u64';
                     },
-                    {
-                        name: 'linkedAskOrderId';
-                        type: 'u64';
-                    },
                     {
                         name: 'createdAt';
                         type: 'i64';
+                    },
+                    {
+                        name: 'linkedBidOrderId';
+                        type: 'u64';
                     }
                 ];
             };

package/dist/utils/helpers.js

@@ -102,8 +102,8 @@ const formatOrder = (order, authority) => {
         orderSide: (0, exports.getOrderSide)(order.orderSide),
         userNonce: order.userNonce.toString(),
         linkedOrderId: order.linkedOrderId ? order.linkedOrderId.toString() : '',
-        linkedAskOrderId: order.linkedAskOrderId
-            ? order.linkedAskOrderId.toString()
+        linkedBidOrderId: order.linkedBidOrderId
+            ? order.linkedBidOrderId.toString()
             : '',
         filledShares: order.filledShares ? order.filledShares.toString() : '',
         authority: authority ? authority : '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "1.9.2-beta",
+  "version": "1.9.4-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",