@triadxyz/triad-protocol 2.8.7-beta → 2.8.8-beta

package/dist/index.d.ts

@@ -430,7 +430,7 @@ export default class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    marketBidOrder({ marketId, amount, direction, mint, feeBps, isTrdPayout }: MarketBidOrderArgs, options?: RpcOptions): Promise<string>;
+    marketBidOrder({ marketId, amount, direction, mint, feeBps, isTrdPayout }: MarketBidOrderArgs, options?: RpcOptions): Promise<void>;
     /**
      * Market Ask Order
      * @param args.marketId - The ID of the Market

package/dist/index.js

@@ -860,6 +860,11 @@ class TriadProtocolClient {
             const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(direction)[0]);
             const orderBook = yield this.getOrderBook(marketId);
             let remainingUSDC = new bn_js_1.default(amount * Math.pow(10, this.decimals));
+            if (isTrdPayout) {
+                const price = yield (0, swap_1.getPrice)(constants_1.TRD_MINT.toString());
+                const trdToUsdc = amount * price;
+                remainingUSDC = new bn_js_1.default(trdToUsdc * Math.pow(10, this.decimals));
+            }
             const orders = Object.keys(direction)[0] === 'hype'
                 ? orderBook.hype.ask
                 : orderBook.flop.ask;
@@ -867,37 +872,37 @@ class TriadProtocolClient {
             const tokenProgram = (0, helpers_1.getTokenProgram)(mint);
             let totalUSDCNeeded = new bn_js_1.default(0);
             let tempRemainingUSDC = remainingUSDC.clone();
-            for (const order of sortedOrders) {
-                if (tempRemainingUSDC.lt(new bn_js_1.default(1000000)))
-                    break;
-                if (order.authority === this.program.provider.publicKey.toBase58()) {
-                    continue;
-                }
-                const orderPrice = new bn_js_1.default(order.price);
-                const availableShares = new bn_js_1.default(order.totalShares).sub(new bn_js_1.default(order.filledShares));
-                let adjustedPrice = orderPrice;
-                if (feeBps > 0) {
-                    const priceSpread = new bn_js_1.default(1000000).sub(orderPrice);
-                    const fee = priceSpread
-                        .mul(orderPrice)
-                        .mul(new bn_js_1.default(feeBps))
-                        .div(new bn_js_1.default(10000))
-                        .div(new bn_js_1.default(1000000));
-                    adjustedPrice = orderPrice.add(fee);
+            if (isTrdPayout) {
+                for (const order of sortedOrders) {
+                    if (tempRemainingUSDC.lt(new bn_js_1.default(1000000)))
+                        break;
+                    if (order.authority === this.program.provider.publicKey.toBase58()) {
+                        continue;
+                    }
+                    const orderPrice = new bn_js_1.default(order.price);
+                    const availableShares = new bn_js_1.default(order.totalShares).sub(new bn_js_1.default(order.filledShares));
+                    let adjustedPrice = orderPrice;
+                    if (feeBps > 0) {
+                        const priceSpread = new bn_js_1.default(1000000).sub(orderPrice);
+                        const fee = priceSpread
+                            .mul(orderPrice)
+                            .mul(new bn_js_1.default(feeBps))
+                            .div(new bn_js_1.default(10000))
+                            .div(new bn_js_1.default(1000000));
+                        adjustedPrice = orderPrice.add(fee);
+                    }
+                    const maxSharesForPrice = tempRemainingUSDC
+                        .mul(new bn_js_1.default(Math.pow(10, this.decimals)))
+                        .div(adjustedPrice);
+                    const sharesToBuy = bn_js_1.default.min(maxSharesForPrice, availableShares);
+                    if (sharesToBuy.lte(new bn_js_1.default(0)))
+                        continue;
+                    const usdcAmount = sharesToBuy
+                        .mul(adjustedPrice)
+                        .div(new bn_js_1.default(Math.pow(10, this.decimals)));
+                    totalUSDCNeeded = totalUSDCNeeded.add(usdcAmount);
+                    tempRemainingUSDC = tempRemainingUSDC.sub(usdcAmount);
                 }
-                const maxSharesForPrice = tempRemainingUSDC
-                    .mul(new bn_js_1.default(Math.pow(10, this.decimals)))
-                    .div(adjustedPrice);
-                const sharesToBuy = bn_js_1.default.min(maxSharesForPrice, availableShares);
-                if (sharesToBuy.lte(new bn_js_1.default(0)))
-                    continue;
-                const usdcAmount = sharesToBuy
-                    .mul(adjustedPrice)
-                    .div(new bn_js_1.default(Math.pow(10, this.decimals)));
-                totalUSDCNeeded = totalUSDCNeeded.add(usdcAmount);
-                tempRemainingUSDC = tempRemainingUSDC.sub(usdcAmount);
-            }
-            if (isTrdPayout && totalUSDCNeeded.gt(new bn_js_1.default(0))) {
                 const price = yield (0, swap_1.getPrice)(constants_1.TRD_MINT.toString());
                 const amountInTRD = totalUSDCNeeded.toNumber() / (price * Math.pow(10, this.decimals));
                 const { swapIxs, addressLookupTableAccounts: swapAddressLookupTableAccounts, outAmount, setupInstructions } = yield (0, swap_1.swap)({
@@ -970,7 +975,12 @@ class TriadProtocolClient {
             if (ixs.length === 0) {
                 throw new Error('No matching orders found to fill the requested amount');
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options, addressLookupTableAccounts);
+            // return sendVersionedTransaction(
+            //   this.program,
+            //   ixs,
+            //   options,
+            //   addressLookupTableAccounts
+            // )
         });
     }
     /**

package/package.json

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