@triadxyz/triad-protocol 2.9.9-beta → 3.0.1-beta

package/dist/index.d.ts

@@ -387,10 +387,11 @@ export default class TriadProtocolClient {
      * @param args.direction - The direction of the Order
      * @param args.mint - The mint of the Order
      * @param args.price - The price of the Order
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
-    placeBidOrder({ marketId, amount, direction, mint, price }: PlaceBidOrderArgs, options?: RpcOptions): Promise<string>;
+    placeBidOrder({ marketId, amount, direction, mint, price, isTrdPayout }: PlaceBidOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Place Ask Order
      * @param args.marketId - The ID of the Market
@@ -410,10 +411,11 @@ export default class TriadProtocolClient {
      * @param args.orderId - The ID of the Order
      * @param args.userNonce - The nonce of the user
      * @param args.direction - The direction of the Order
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
-    cancelBidOrder({ marketId, orderId, userNonce, mint, direction }: CancelBidOrderArgs, options?: RpcOptions): Promise<string>;
+    cancelBidOrder({ marketId, orderId, userNonce, mint, direction, isTrdPayout, remainingShares, price }: CancelBidOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Cancel Ask Order
      * @param args.marketId - The ID of the Market

package/dist/index.js

@@ -735,21 +735,41 @@ class TriadProtocolClient {
      * @param args.direction - The direction of the Order
      * @param args.mint - The mint of the Order
      * @param args.price - The price of the Order
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
-    placeBidOrder({ marketId, amount, direction, mint, price }, options) {
+    placeBidOrder({ marketId, amount, direction, mint, price, isTrdPayout }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
+            const addressLookupTableAccounts = [];
+            let amountInUSDC = new bn_js_1.default(amount * Math.pow(10, this.decimals));
+            if (isTrdPayout) {
+                const { swapIxs, addressLookupTableAccounts: swapAddressLookupTableAccounts, outAmount, setupInstructions } = yield (0, swap_1.swap)({
+                    connection: this.program.provider.connection,
+                    wallet: this.program.provider.publicKey.toBase58(),
+                    inToken: constants_1.TRD_MINT.toString(),
+                    outToken: constants_1.USDC_MINT.toString(),
+                    amount: Math.floor(amount)
+                });
+                if (swapIxs.length === 0) {
+                    return;
+                }
+                amountInUSDC = new bn_js_1.default(outAmount);
+                ixs.push(...setupInstructions);
+                ixs.push(...swapIxs);
+                addressLookupTableAccounts.push(...swapAddressLookupTableAccounts);
+            }
             const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(direction)[0]);
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
             ixs.push(yield this.program.methods
                 .placeBidOrder({
-                amount: new bn_js_1.default(amount * Math.pow(10, this.decimals)),
+                amount: amountInUSDC,
                 price: new bn_js_1.default(price * Math.pow(10, this.decimals)),
-                orderDirection: direction
+                orderDirection: direction,
+                isTrdPayout
             })
                 .accounts({
                 signer: this.program.provider.publicKey,
@@ -802,12 +822,14 @@ class TriadProtocolClient {
      * @param args.orderId - The ID of the Order
      * @param args.userNonce - The nonce of the user
      * @param args.direction - The direction of the Order
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
-    cancelBidOrder({ marketId, orderId, userNonce, mint, direction }, options) {
+    cancelBidOrder({ marketId, orderId, userNonce, mint, direction, isTrdPayout, remainingShares, price }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
+            const addressLookupTableAccounts = [];
             ixs.push(yield this.program.methods
                 .cancelBidOrder({
                 orderId: new bn_js_1.default(orderId),
@@ -822,6 +844,21 @@ class TriadProtocolClient {
                 tokenProgram: (0, helpers_1.getTokenProgram)(mint)
             })
                 .instruction());
+            if (isTrdPayout) {
+                const { swapIxs, addressLookupTableAccounts: swapAddressLookupTableAccounts, setupInstructions } = yield (0, swap_1.swap)({
+                    connection: this.program.provider.connection,
+                    wallet: this.program.provider.publicKey.toBase58(),
+                    inToken: constants_1.USDC_MINT.toString(),
+                    outToken: constants_1.TRD_MINT.toString(),
+                    amount: Math.floor((remainingShares * price) / Math.pow(10, this.decimals))
+                });
+                if (swapIxs.length === 0) {
+                    return;
+                }
+                ixs.push(...setupInstructions);
+                ixs.push(...swapIxs);
+                addressLookupTableAccounts.push(...swapAddressLookupTableAccounts);
+            }
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }

package/dist/types/idl_triad_protocol.json

@@ -3646,6 +3646,10 @@
                                 "name": "OrderDirection"
                             }
                         }
+                    },
+                    {
+                        "name": "is_trd_payout",
+                        "type": "bool"
                     }
                 ]
             }

package/dist/types/index.d.ts

@@ -116,6 +116,7 @@ export type PlaceBidOrderArgs = {
         flop: {};
     };
     mint: PublicKey;
+    isTrdPayout: boolean;
 };
 export type PlaceAskOrderArgs = {
     marketId: number;
@@ -195,6 +196,9 @@ export type CancelBidOrderArgs = {
     } | {
         flop: {};
     };
+    isTrdPayout: boolean;
+    remainingShares: number;
+    price: number;
 };
 export type CancelAskOrderArgs = {
     marketId: number;

package/dist/types/triad_protocol.d.ts

@@ -4466,6 +4466,10 @@ export type TriadProtocol = {
                                 name: 'orderDirection';
                             };
                         };
+                    },
+                    {
+                        name: 'isTrdPayout';
+                        type: 'bool';
                     }
                 ];
             };

package/package.json

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