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

package/dist/index.d.ts

@@ -330,7 +330,7 @@ export default class TriadProtocol {
     /**
      * Get User Trade Ixs
      */
-    getUserTradeIxs(): Promise<{
+    getUserTradeIxs(wallet: PublicKey): Promise<{
         userTradePDA: PublicKey;
         ixs: TransactionInstruction[];
         nonce: number;
@@ -344,7 +344,7 @@ export default class TriadProtocol {
      * @param marketId - The ID of the Market
      * @param orderDirection - The direction of the Order
      */
-    getUserTradeNonce(marketId: number, orderDirection: OrderDirection): Promise<{
+    getUserTradeNonce(wallet: PublicKey, marketId: number, orderDirection: OrderDirection): Promise<{
         userTradePDA: PublicKey;
         userTradeIxs: TransactionInstruction[];
     }>;

package/dist/index.js

@@ -527,7 +527,7 @@ class TriadProtocol {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const addressLookupTableAccounts = [];
-            const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
+            const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs(this.program.provider.publicKey);
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
@@ -660,21 +660,21 @@ class TriadProtocol {
     /**
      * Get User Trade Ixs
      */
-    getUserTradeIxs() {
+    getUserTradeIxs(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             let myUserTrades = [];
-            myUserTrades = yield this.getMyUserTrades(this.program.provider.publicKey);
+            myUserTrades = yield this.getMyUserTrades(wallet);
             if (myUserTrades.length === 0) {
                 ixs.push(yield this.program.methods
                     .createUserTrade()
                     .accounts({
-                    signer: this.program.provider.publicKey,
+                    signer: wallet,
                     payer: this.rpcOptions.payer
                 })
                     .instruction());
                 return {
-                    userTradePDA: this.getUserPDA(this.program.provider.publicKey),
+                    userTradePDA: this.getUserPDA(wallet),
                     ixs,
                     nonce: 0
                 };
@@ -695,17 +695,17 @@ class TriadProtocol {
                     throw new Error('No open orders found');
                 }
                 return {
-                    userTradePDA: this.getUserPDA(this.program.provider.publicKey, nonce),
+                    userTradePDA: this.getUserPDA(wallet, nonce),
                     ixs
                 };
             }
             catch (_a) {
                 const mainUserTrade = myUserTrades.find((trade) => !trade.isSubUser);
-                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, Number(mainUserTrade.nonce) + 1);
+                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, wallet, Number(mainUserTrade.nonce) + 1);
                 ixs.push(yield this.program.methods
                     .createSubUserTrade(subUserTradePDA)
                     .accounts({
-                    signer: this.program.provider.publicKey,
+                    signer: wallet,
                     payer: this.rpcOptions.payer
                 })
                     .instruction());
@@ -721,20 +721,20 @@ class TriadProtocol {
      * @param marketId - The ID of the Market
      * @param orderDirection - The direction of the Order
      */
-    getUserTradeNonce(marketId, orderDirection) {
+    getUserTradeNonce(wallet, marketId, orderDirection) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const userOrders = yield this.getUserOrdersByMarketId(this.program.provider.publicKey, marketId);
+            const userOrders = yield this.getUserOrdersByMarketId(wallet, marketId);
             const userNonce = (_a = userOrders.find((order) => order.orderDirection === orderDirection &&
                 order.orderStatus === types_1.OrderStatus.OPEN &&
                 Number(order.marketId) === marketId)) === null || _a === void 0 ? void 0 : _a.userNonce;
             let userTradePDA = null;
             let userTradeIxs = [];
             if (userNonce) {
-                userTradePDA = this.getUserPDA(this.program.provider.publicKey, Number(userNonce));
+                userTradePDA = this.getUserPDA(wallet, Number(userNonce));
             }
             if (!userNonce) {
-                const { userTradePDA: user, ixs: ixsUser } = yield this.getUserTradeIxs();
+                const { userTradePDA: user, ixs: ixsUser } = yield this.getUserTradeIxs(wallet);
                 userTradePDA = user;
                 userTradeIxs = ixsUser;
             }
@@ -908,7 +908,8 @@ class TriadProtocol {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const addressLookupTableAccounts = [];
-            const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(orderDirection)[0]);
+            const sellerTradeIxs = [];
+            const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(this.program.provider.publicKey, marketId, Object.keys(orderDirection)[0]);
             const orderBook = yield this.getOrderBook(marketId);
             let remainingUSDC = new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_DECIMALS));
             if (isTrdPayout) {
@@ -986,6 +987,10 @@ class TriadProtocol {
                     .div(new bn_js_1.default(Math.pow(10, constants_1.BASE_DECIMALS)));
                 if (usdcAmount.lte(new bn_js_1.default(0)))
                     continue;
+                const { userTradePDA: sellerTradePDA, userTradeIxs: innerSellerTradeIxs } = yield this.getUserTradeNonce(new web3_js_1.PublicKey(order.authority), marketId, Object.keys(orderDirection)[0]);
+                if (innerSellerTradeIxs.length > 0 && sellerTradeIxs.length === 0) {
+                    sellerTradeIxs.push(...innerSellerTradeIxs);
+                }
                 ixs.push(yield this.program.methods
                     .marketBidOrder({
                     amount: new bn_js_1.default(usdcAmount),
@@ -999,13 +1004,16 @@ class TriadProtocol {
                     buyerTrade: userTradePDA,
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
                     sellerAuthority: new web3_js_1.PublicKey(order.authority),
-                    sellerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
+                    sellerTrade: sellerTradePDA,
                     marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
                     buyerAta: (0, pda_1.getTokenATA)(this.program.provider.publicKey, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID)
                 })
                     .instruction());
                 remainingUSDC = remainingUSDC.sub(usdcAmount);
             }
+            if (sellerTradeIxs.length > 0) {
+                ixs.unshift(...sellerTradeIxs);
+            }
             if (userTradeIxs.length > 0) {
                 ixs.unshift(...userTradeIxs);
             }

package/package.json

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