@triadxyz/triad-protocol 2.1.3-beta → 2.1.4-beta

package/dist/trade.d.ts

@@ -336,7 +336,7 @@ export default class Trade {
      *
      * @param options - RPC options
      */
-    marketBidOrder({ marketId, amount, direction, mint }: MarketBidOrderArgs, options?: RpcOptions): Promise<string>;
+    marketBidOrder({ marketId, amount, direction, mint, feeBps }: MarketBidOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Get Orders By Market ID
      * @param marketId - The ID of the market

package/dist/trade.js

@@ -650,7 +650,7 @@ class Trade {
      *
      * @param options - RPC options
      */
-    marketBidOrder({ marketId, amount, direction, mint }, options) {
+    marketBidOrder({ marketId, amount, direction, mint, feeBps = 0 }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
@@ -662,7 +662,7 @@ class Trade {
                 : orderBook.flop.ask;
             const sortedOrders = orders.sort((a, b) => Number(a.price) - Number(b.price));
             for (const order of sortedOrders) {
-                if (remainingUSDC.div(new bn_js_1.default(Math.pow(10, this.decimals))).toString() === '0')
+                if (remainingUSDC.div(new bn_js_1.default(Math.pow(10, this.decimals))).toNumber() === 0)
                     break;
                 if (order.authority === this.program.provider.publicKey.toBase58()) {
                     return;
@@ -683,14 +683,20 @@ class Trade {
                 }
                 const orderPrice = new bn_js_1.default(order.price);
                 const availableShares = new bn_js_1.default(order.totalShares);
+                let adjustedPrice = orderPrice;
+                if (feeBps > 0) {
+                    const priceSpread = new bn_js_1.default(1000000).sub(orderPrice);
+                    const fee = priceSpread.mul(new bn_js_1.default(feeBps)).div(new bn_js_1.default(10000));
+                    adjustedPrice = orderPrice.add(fee);
+                }
                 const maxSharesForPrice = remainingUSDC
                     .mul(new bn_js_1.default(Math.pow(10, this.decimals)))
-                    .div(orderPrice);
+                    .div(adjustedPrice);
                 const sharesToBuy = bn_js_1.default.min(maxSharesForPrice, availableShares);
                 if (sharesToBuy.lten(0))
                     continue;
                 const usdcAmount = sharesToBuy
-                    .mul(orderPrice)
+                    .mul(adjustedPrice)
                     .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') {

package/dist/types/trade.d.ts

@@ -173,4 +173,5 @@ export type MarketBidOrderArgs = {
         flop: {};
     };
     mint: PublicKey;
+    feeBps: number;
 };

package/package.json

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