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

package/dist/index.d.ts

@@ -411,11 +411,10 @@ 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, isTrdPayout, remainingShares, price }: CancelBidOrderArgs, options?: RpcOptions): Promise<string>;
+    cancelBidOrder({ marketId, orderId, userNonce, mint, direction }: CancelBidOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Cancel Ask Order
      * @param args.marketId - The ID of the Market

package/dist/index.js

@@ -745,12 +745,14 @@ class TriadProtocolClient {
             const addressLookupTableAccounts = [];
             let amountInUSDC = new bn_js_1.default(amount * Math.pow(10, this.decimals));
             if (isTrdPayout) {
+                const trdPrice = yield (0, swap_1.getPrice)(constants_1.TRD_MINT.toString());
+                const amountInTRD = amount / trdPrice;
                 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)
+                    amount: Math.floor(amountInTRD)
                 });
                 if (swapIxs.length === 0) {
                     return;
@@ -768,8 +770,7 @@ class TriadProtocolClient {
                 .placeBidOrder({
                 amount: amountInUSDC,
                 price: new bn_js_1.default(price * Math.pow(10, this.decimals)),
-                orderDirection: direction,
-                isTrdPayout
+                orderDirection: direction
             })
                 .accounts({
                 signer: this.program.provider.publicKey,
@@ -822,14 +823,12 @@ 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, isTrdPayout, remainingShares, price }, options) {
+    cancelBidOrder({ marketId, orderId, userNonce, mint, direction }, 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),
@@ -844,21 +843,6 @@ 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,10 +3646,6 @@
                                 "name": "OrderDirection"
                             }
                         }
-                    },
-                    {
-                        "name": "is_trd_payout",
-                        "type": "bool"
                     }
                 ]
             }

package/dist/types/index.d.ts

@@ -196,9 +196,6 @@ export type CancelBidOrderArgs = {
     } | {
         flop: {};
     };
-    isTrdPayout: boolean;
-    remainingShares: number;
-    price: number;
 };
 export type CancelAskOrderArgs = {
     marketId: number;

package/dist/types/triad_protocol.d.ts

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

package/package.json

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