@triadxyz/triad-protocol 1.7.9-beta → 1.8.1-beta

package/dist/trade.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const web3_js_1 = require("@solana/web3.js");
 const trade_1 = require("./types/trade");
 const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("./utils/constants");
@@ -153,35 +154,12 @@ class Trade {
     openOrder({ marketId, amount, direction, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
-            let userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
             const ixs = [];
             const addressLookupTableAccounts = [];
             let amountInTRD = amount * Math.pow(10, constants_1.TRD_DECIMALS);
-            let myUserTrades = [];
-            myUserTrades = yield this.getMyUserTrades(this.provider.publicKey);
-            if (myUserTrades.length === 0) {
-                ixs.push(yield this.program.methods
-                    .createUserTrade()
-                    .accounts({
-                    signer: this.provider.publicKey
-                })
-                    .instruction());
-            }
-            if (myUserTrades.length > 0) {
-                try {
-                    userTradePDA = yield this.getUserTradeNonceWithSlots(myUserTrades);
-                }
-                catch (_a) {
-                    const mainUserTrade = myUserTrades.find((userTrade) => !userTrade.isSubUser);
-                    const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, Number(mainUserTrade.nonce) + 1);
-                    userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
-                    ixs.push(yield this.program.methods
-                        .createSubUserTrade(subUserTradePDA)
-                        .accounts({
-                        signer: this.provider.publicKey
-                    })
-                        .instruction());
-                }
+            const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
+            if (userTradeIxs.length > 0) {
+                ixs.push(...userTradeIxs);
             }
             ixs.push(yield this.program.methods
                 .openOrder({
@@ -516,7 +494,8 @@ class Trade {
                     signer: this.provider.publicKey,
                     market: marketPDA,
                     userTrade: userTradePDA,
-                    mint
+                    mint,
+                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
                 }), options);
             }
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.cancelAskOrder(new bn_js_1.default(orderId)).accounts({
@@ -541,22 +520,45 @@ class Trade {
             const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const { userTradePDA: buyerTrade, ixs: userTradeIxs } = yield this.getUserTradeIxs();
-            // TODO: Get dynamic until fill all order
-            const sellerTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
-            ixs.push(...userTradeIxs);
-            ixs.push(yield this.program.methods
-                .marketBidOrder({
-                amount: new bn_js_1.default(amount * Math.pow(10, this.decimals)),
-                orderDirection: direction
-            })
-                .accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA,
-                buyerTrade,
-                sellerTrade: sellerTradePDA,
-                mint
-            })
-                .instruction());
+            const orderBook = yield this.getOrderBook(marketId);
+            let remainingUSDC = amount * Math.pow(10, this.decimals);
+            const orders = direction[0].hype ? orderBook.hype.ask : orderBook.flop.ask;
+            const sortedOrders = orders.sort((a, b) => Number(a.price) - Number(b.price));
+            for (const order of sortedOrders) {
+                if (remainingUSDC <= 0)
+                    break;
+                const orderPrice = Number(order.price);
+                const maxSharesForPrice = remainingUSDC / orderPrice;
+                const availableShares = Number(order.totalShares);
+                const sharesToBuy = Math.min(maxSharesForPrice, availableShares);
+                const usdcAmount = sharesToBuy * orderPrice;
+                let sellerTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority));
+                if (order.userNonce !== '0') {
+                    const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), Number(order.userNonce));
+                    sellerTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                }
+                ixs.push(yield this.program.methods
+                    .marketBidOrder({
+                    amount: new bn_js_1.default(usdcAmount),
+                    orderDirection: direction
+                })
+                    .accounts({
+                    signer: this.provider.publicKey,
+                    market: marketPDA,
+                    buyerTrade,
+                    sellerTrade: sellerTradePDA,
+                    mint,
+                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
+                })
+                    .instruction());
+                remainingUSDC -= usdcAmount;
+            }
+            if (userTradeIxs.length > 0) {
+                ixs.unshift(...userTradeIxs);
+            }
+            if (ixs.length === 0) {
+                throw new Error('No matching orders found to fill the requested amount');
+            }
             return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }

package/package.json

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