@triadxyz/triad-protocol 3.3.5-beta → 3.3.7-beta

package/dist/index.js

@@ -858,8 +858,7 @@ class TriadProtocol {
                     signer: this.program.provider.publicKey,
                     payer: this.rpcOptions.payer,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
-                    orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId),
-                    userTrade: this.getUserPDA(this.program.provider.publicKey, order.userNonce)
+                    orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId)
                 })
                     .instruction());
             }
@@ -1038,6 +1037,7 @@ class TriadProtocol {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const addressLookupTableAccounts = [];
+            const buyerTradeIxs = [];
             const orderBook = yield this.getOrderBook(marketId);
             const bidOrders = Object.keys(orderDirection)[0] === 'hype'
                 ? orderBook.hype.bid
@@ -1062,6 +1062,10 @@ class TriadProtocol {
                     const effectivePriceDecimal = (0, feeCalculator_1.applySellFee)(orderPrice.toNumber() / 1000000);
                     const adjustedPrice = new bn_js_1.default(Math.floor(effectivePriceDecimal * 1000000));
                     amountOfUSDC = amountOfUSDC.add(sharesToSell.mul(adjustedPrice).div(new bn_js_1.default(Math.pow(10, constants_1.BASE_DECIMALS))));
+                    const { userTradePDA: buyerTradePDA, userTradeIxs: innerBuyerTradeIxs } = yield this.getUserTradeNonce(new web3_js_1.PublicKey(order.authority), marketId, Object.keys(orderDirection)[0]);
+                    if (innerBuyerTradeIxs.length > 0 && buyerTradeIxs.length === 0) {
+                        buyerTradeIxs.push(...innerBuyerTradeIxs);
+                    }
                     ixs.push(yield this.program.methods
                         .marketAskOrder({
                         shares: new bn_js_1.default(sharesToSell),
@@ -1074,7 +1078,7 @@ class TriadProtocol {
                         payer: this.rpcOptions.payer,
                         market: marketPDA,
                         buyerAuthority: new web3_js_1.PublicKey(order.authority),
-                        buyerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
+                        buyerTrade: buyerTradePDA,
                         orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
                         marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
                         sellerTrade: this.getUserPDA(this.program.provider.publicKey, inputOrder.userNonce)
@@ -1097,6 +1101,9 @@ class TriadProtocol {
                     addressLookupTableAccounts.push(...swapAddressLookupTableAccounts);
                 }
             }
+            if (buyerTradeIxs.length > 0) {
+                ixs.unshift(...buyerTradeIxs);
+            }
             if (ixs.length === 0) {
                 throw new Error('No matching orders found to fill the requested amount');
             }

package/dist/types/idl_triad_protocol.json

@@ -210,10 +210,6 @@
                     "name": "order_book",
                     "writable": true
                 },
-                {
-                    "name": "user_trade",
-                    "writable": true
-                },
                 {
                     "name": "mint",
                     "writable": true,

package/dist/types/triad_protocol.d.ts

@@ -286,10 +286,6 @@ export type TriadProtocol = {
                     name: 'orderBook';
                     writable: true;
                 },
-                {
-                    name: 'userTrade';
-                    writable: true;
-                },
                 {
                     name: 'mint';
                     writable: true;

package/package.json

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