@triadxyz/triad-protocol 2.0.9-beta → 2.1.0-beta

package/dist/trade.js

@@ -557,16 +557,16 @@ class Trade {
             const ixs = [];
             const { userTradePDA: buyerTrade, ixs: userTradeIxs } = yield this.getUserTradeIxs();
             const orderBook = yield this.getOrderBook(marketId);
-            let remainingUSDC = amount * Math.pow(10, this.decimals);
+            let remainingUSDC = new bn_js_1.default(amount * Math.pow(10, this.decimals));
             const orders = Object.keys(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)
+                if (remainingUSDC.div(new bn_js_1.default(Math.pow(10, this.decimals))).toString() === '0')
                     break;
                 if (order.authority === this.program.provider.publicKey.toBase58()) {
-                    continue;
+                    return;
                 }
                 let linkedSellerBidTradePDA = null;
                 if (order.linkedBidOrderId !== '0') {
@@ -582,11 +582,17 @@ class Trade {
                         linkedSellerBidTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
                     }
                 }
-                const orderPrice = Number(order.price);
-                const maxSharesForPrice = remainingUSDC / orderPrice;
-                const availableShares = Number(order.totalShares);
-                const sharesToBuy = Math.min(maxSharesForPrice, availableShares);
-                const usdcAmount = sharesToBuy * orderPrice;
+                const orderPrice = new bn_js_1.default(order.price);
+                const availableShares = new bn_js_1.default(order.totalShares);
+                const maxSharesForPrice = remainingUSDC
+                    .mul(new bn_js_1.default(Math.pow(10, this.decimals)))
+                    .div(orderPrice);
+                const sharesToBuy = bn_js_1.default.min(maxSharesForPrice, availableShares);
+                if (sharesToBuy.lten(0))
+                    continue;
+                const usdcAmount = sharesToBuy
+                    .mul(orderPrice)
+                    .div(new bn_js_1.default(Math.pow(10, this.decimals)));
                 let sellerTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority));
                 if (order.userNonce !== '0') {
                     const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), Number(order.userNonce));
@@ -612,7 +618,7 @@ class Trade {
                     linkedSellerBidTrade: linkedSellerBidTradePDA
                 })
                     .instruction());
-                remainingUSDC -= usdcAmount;
+                remainingUSDC = remainingUSDC.sub(usdcAmount);
             }
             if (userTradeIxs.length > 0) {
                 ixs.unshift(...userTradeIxs);

package/package.json

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