@triadxyz/triad-protocol 3.3.8-beta → 3.4.0-beta

package/dist/index.d.ts

@@ -11,8 +11,6 @@ export * from './types';
 export * from './utils/helpers';
 export * from './utils/merkle';
 export * from './utils/feeCalculator';
-export * from './utils/constants';
-export * from './utils/pda';
 export default class TriadProtocol {
     private connection;
     private wallet;
@@ -330,7 +328,7 @@ export default class TriadProtocol {
     /**
      * Get User Trade Ixs
      */
-    getUserTradeIxs(wallet: PublicKey): Promise<{
+    getUserTradeIxs(): Promise<{
         userTradePDA: PublicKey;
         ixs: TransactionInstruction[];
         nonce: number;
@@ -344,7 +342,7 @@ export default class TriadProtocol {
      * @param marketId - The ID of the Market
      * @param orderDirection - The direction of the Order
      */
-    getUserTradeNonce(wallet: PublicKey, marketId: number, orderDirection: OrderDirection): Promise<{
+    getUserTradeNonce(marketId: number, orderDirection: OrderDirection): Promise<{
         userTradePDA: PublicKey;
         userTradeIxs: TransactionInstruction[];
     }>;
@@ -361,8 +359,8 @@ export default class TriadProtocol {
     placeBidOrder({ orders, isTrdPayout }: PlaceBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Place Ask Order
+     * @param args.marketId - The ID of the Market
      * @param args.orders - Array of orders to execute
-     * @param args.orders.marketId - The ID of the Market
      * @param args.orders.amount - The amount of the Order
      * @param args.orders.price - The price of the Order
      * @param args.orders.bidOrderId - The ID of the Bid Order
@@ -400,9 +398,8 @@ export default class TriadProtocol {
      * @param args.orders.bidOrderId - The ID of the Bid Order
      * @param args.orders.userNonce - The nonce of the user
      * @param args.orderDirection - The direction of the Order
-     * @param args.isTrdPayout - Whether to payout in TRD or not
      */
-    marketAskOrder({ marketId, orders, orderDirection, isTrdPayout }: MarketAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    marketAskOrder({ marketId, orders, orderDirection }: MarketAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Get Orders By Market ID
      * @param marketId - Market ID

package/dist/index.js

@@ -46,8 +46,6 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./utils/helpers"), exports);
 __exportStar(require("./utils/merkle"), exports);
 __exportStar(require("./utils/feeCalculator"), exports);
-__exportStar(require("./utils/constants"), exports);
-__exportStar(require("./utils/pda"), exports);
 class TriadProtocol {
     constructor(connection, wallet, rpcOptions) {
         this.connection = connection;
@@ -527,7 +525,7 @@ class TriadProtocol {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const addressLookupTableAccounts = [];
-            const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs(this.program.provider.publicKey);
+            const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
@@ -660,21 +658,21 @@ class TriadProtocol {
     /**
      * Get User Trade Ixs
      */
-    getUserTradeIxs(wallet) {
+    getUserTradeIxs() {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             let myUserTrades = [];
-            myUserTrades = yield this.getMyUserTrades(wallet);
+            myUserTrades = yield this.getMyUserTrades(this.program.provider.publicKey);
             if (myUserTrades.length === 0) {
                 ixs.push(yield this.program.methods
                     .createUserTrade()
                     .accounts({
-                    signer: wallet,
+                    signer: this.program.provider.publicKey,
                     payer: this.rpcOptions.payer
                 })
                     .instruction());
                 return {
-                    userTradePDA: this.getUserPDA(wallet),
+                    userTradePDA: this.getUserPDA(this.program.provider.publicKey),
                     ixs,
                     nonce: 0
                 };
@@ -695,17 +693,17 @@ class TriadProtocol {
                     throw new Error('No open orders found');
                 }
                 return {
-                    userTradePDA: this.getUserPDA(wallet, nonce),
+                    userTradePDA: this.getUserPDA(this.program.provider.publicKey, nonce),
                     ixs
                 };
             }
             catch (_a) {
                 const mainUserTrade = myUserTrades.find((trade) => !trade.isSubUser);
-                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, wallet, Number(mainUserTrade.nonce) + 1);
+                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, Number(mainUserTrade.nonce) + 1);
                 ixs.push(yield this.program.methods
                     .createSubUserTrade(subUserTradePDA)
                     .accounts({
-                    signer: wallet,
+                    signer: this.program.provider.publicKey,
                     payer: this.rpcOptions.payer
                 })
                     .instruction());
@@ -721,20 +719,20 @@ class TriadProtocol {
      * @param marketId - The ID of the Market
      * @param orderDirection - The direction of the Order
      */
-    getUserTradeNonce(wallet, marketId, orderDirection) {
+    getUserTradeNonce(marketId, orderDirection) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const userOrders = yield this.getUserOrdersByMarketId(wallet, marketId);
+            const userOrders = yield this.getUserOrdersByMarketId(this.program.provider.publicKey, 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(wallet, Number(userNonce));
+                userTradePDA = this.getUserPDA(this.program.provider.publicKey, Number(userNonce));
             }
             if (!userNonce) {
-                const { userTradePDA: user, ixs: ixsUser } = yield this.getUserTradeIxs(wallet);
+                const { userTradePDA: user, ixs: ixsUser } = yield this.getUserTradeIxs();
                 userTradePDA = user;
                 userTradeIxs = ixsUser;
             }
@@ -755,8 +753,8 @@ class TriadProtocol {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const addressLookupTableAccounts = [];
-            if (orders.length > 5) {
-                throw new Error('You can only place up to 5 orders at a time');
+            if (orders.length > 4) {
+                throw new Error('You can only place up to 4 orders at a time');
             }
             let amountInUSDC = new bn_js_1.default(0);
             let totalAmount = 0;
@@ -785,6 +783,10 @@ class TriadProtocol {
                     return;
                 }
             }
+            const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(orders[0].marketId, Object.keys(orders[0].orderDirection)[0]);
+            if (userTradeIxs.length > 0) {
+                ixs.push(...userTradeIxs);
+            }
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .placeBidOrder({
@@ -796,7 +798,7 @@ class TriadProtocol {
                     signer: this.program.provider.publicKey,
                     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)
+                    userTrade: userTradePDA
                 })
                     .instruction());
             }
@@ -805,8 +807,8 @@ class TriadProtocol {
     }
     /**
      * Place Ask Order
+     * @param args.marketId - The ID of the Market
      * @param args.orders - Array of orders to execute
-     * @param args.orders.marketId - The ID of the Market
      * @param args.orders.amount - The amount of the Order
      * @param args.orders.price - The price of the Order
      * @param args.orders.bidOrderId - The ID of the Bid Order
@@ -845,8 +847,8 @@ class TriadProtocol {
     cancelBidOrder({ orders }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            if (orders.length > 4) {
-                throw new Error('You can only cancel up to 4 orders at a time');
+            if (orders.length > 5) {
+                throw new Error('You can only cancel up to 5 orders at a time');
             }
             for (const order of orders) {
                 ixs.push(yield this.program.methods
@@ -858,7 +860,8 @@ 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)
+                    orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId),
+                    userTrade: this.getUserPDA(this.program.provider.publicKey, order.userNonce)
                 })
                     .instruction());
             }
@@ -907,8 +910,7 @@ class TriadProtocol {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const addressLookupTableAccounts = [];
-            const sellerTradeIxs = [];
-            const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(this.program.provider.publicKey, marketId, Object.keys(orderDirection)[0]);
+            const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(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,10 +988,6 @@ 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),
@@ -1003,16 +1001,13 @@ class TriadProtocol {
                     buyerTrade: userTradePDA,
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
                     sellerAuthority: new web3_js_1.PublicKey(order.authority),
-                    sellerTrade: sellerTradePDA,
+                    sellerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
                     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);
             }
@@ -1030,14 +1025,12 @@ class TriadProtocol {
      * @param args.orders.bidOrderId - The ID of the Bid Order
      * @param args.orders.userNonce - The nonce of the user
      * @param args.orderDirection - The direction of the Order
-     * @param args.isTrdPayout - Whether to payout in TRD or not
      */
-    marketAskOrder({ marketId, orders, orderDirection, isTrdPayout }) {
+    marketAskOrder({ marketId, orders, orderDirection }) {
         return __awaiter(this, void 0, void 0, function* () {
             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,10 +1055,6 @@ 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),
@@ -1078,7 +1067,7 @@ class TriadProtocol {
                         payer: this.rpcOptions.payer,
                         market: marketPDA,
                         buyerAuthority: new web3_js_1.PublicKey(order.authority),
-                        buyerTrade: buyerTradePDA,
+                        buyerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
                         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)
@@ -1086,24 +1075,6 @@ class TriadProtocol {
                         .instruction());
                 }
             }
-            if (isTrdPayout) {
-                const { setupInstructions, swapIxs, addressLookupTableAccounts: swapAddressLookupTableAccounts } = yield (0, swap_1.swap)({
-                    connection: this.program.provider.connection,
-                    wallet: this.program.provider.publicKey.toBase58(),
-                    inToken: constants_1.USDC_MINT.toBase58(),
-                    outToken: constants_1.TRD_MINT.toString(),
-                    amount: amountOfUSDC.toNumber() / Math.pow(10, 6),
-                    payer: this.rpcOptions.payer.toBase58()
-                });
-                if (swapIxs.length > 0) {
-                    ixs.push(...setupInstructions);
-                    ixs.push(...swapIxs);
-                    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,6 +210,10 @@
                     "name": "order_book",
                     "writable": true
                 },
+                {
+                    "name": "user_trade",
+                    "writable": true
+                },
                 {
                     "name": "mint",
                     "writable": true,

package/dist/types/triad_protocol.d.ts

@@ -286,6 +286,10 @@ 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.8-beta",
+  "version": "3.4.0-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",