@triadxyz/triad-protocol 2.7.8-beta → 2.8.0-beta

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { Connection, PublicKey, TransactionInstruction, Commitment } from '@sola
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import { TriadProtocol } from './types/triad_protocol';
-import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions, UpdateCustomerFeeArgs, Order, OrderDirection } from './types';
+import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions, UpdateCustomerFeeArgs, OrderDirection } from './types';
 import Stake from './stake';
 import Poseidon from './poseidon';
 export * from './types';
@@ -37,14 +37,14 @@ export default class TriadProtocolClient {
      * @param wallet - User wallet PublicKey
      *
      */
-    getUserOrders(wallet: PublicKey): Promise<Order[]>;
+    getUserOrders(wallet: PublicKey): Promise<import("./types").Order[]>;
     /**
      * Get User Orders By Market ID
      * @param wallet - User wallet PublicKey
      * @param marketId - The ID of the market
      *
      */
-    getUserOrdersByMarketId(wallet: PublicKey, marketId: number): Promise<Order[]>;
+    getUserOrdersByMarketId(wallet: PublicKey, marketId: number): Promise<import("./types").Order[]>;
     /**
      * Get Pool By ID
      * @param poolId - The ID of the pool
@@ -440,7 +440,7 @@ export default class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    marketAskOrder({ marketId, orders, direction, isTrdPayout }: MarketAskOrderArgs, options?: RpcOptions): Promise<string>;
+    marketAskOrder({ marketId, orders, direction, isTrdPayout, feeBps }: MarketAskOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Get Orders By Market ID
      * @param marketId - The ID of the market

package/dist/index.js

@@ -856,16 +856,57 @@ class TriadProtocolClient {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
+            const addressLookupTableAccounts = [];
             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 { swapIxs, addressLookupTableAccounts, outAmount, setupInstructions } = yield (0, swap_1.swap)({
+            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));
+            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(0)))
+                    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);
+                console.log('sharesToBuy', sharesToBuy.toNumber());
+                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)));
+                console.log('usdcAmount', usdcAmount.toNumber());
+                console.log('--------------------------------');
+                totalUSDCNeeded = totalUSDCNeeded.add(usdcAmount);
+                tempRemainingUSDC = tempRemainingUSDC.sub(usdcAmount);
+            }
+            if (isTrdPayout && totalUSDCNeeded.gt(new bn_js_1.default(0))) {
+                const { swapIxs, addressLookupTableAccounts: swapAddressLookupTableAccounts, outAmount, setupInstructions } = yield (0, swap_1.swap)({
                     connection: this.program.provider.connection,
                     wallet: this.program.provider.publicKey.toBase58(),
                     inToken: constants_1.TRD_MINT.toString(),
                     outToken: constants_1.USDC_MINT.toString(),
-                    amount
+                    amount: totalUSDCNeeded.toNumber() / Math.pow(10, this.decimals)
                 });
                 if (swapIxs.length === 0) {
                     return;
@@ -873,15 +914,10 @@ class TriadProtocolClient {
                 remainingUSDC = new bn_js_1.default(outAmount);
                 ixs.push(...setupInstructions);
                 ixs.push(...swapIxs);
-                addressLookupTableAccounts.push(...addressLookupTableAccounts);
+                addressLookupTableAccounts.push(...swapAddressLookupTableAccounts);
             }
-            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));
-            const tokenProgram = (0, helpers_1.getTokenProgram)(mint);
             for (const order of sortedOrders) {
-                if (remainingUSDC.lt(new bn_js_1.default(1000000)))
+                if (remainingUSDC.lt(new bn_js_1.default(0)))
                     break;
                 if (order.authority === this.program.provider.publicKey.toBase58()) {
                     continue;
@@ -935,7 +971,7 @@ 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);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options, addressLookupTableAccounts);
         });
     }
     /**
@@ -947,7 +983,7 @@ class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    marketAskOrder({ marketId, orders, direction, isTrdPayout }, options) {
+    marketAskOrder({ marketId, orders, direction, isTrdPayout, feeBps }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
@@ -958,7 +994,7 @@ class TriadProtocolClient {
                 : orderBook.flop.bid;
             const sortedOrders = bidOrders.sort((a, b) => Number(b.price) - Number(a.price));
             const tokenProgram = (0, helpers_1.getTokenProgram)(constants_1.USDC_MINT);
-            let amountOfShares = 0;
+            let amountOfUSDC = new bn_js_1.default(0);
             for (const inputOrder of orders) {
                 let remainingShares = new bn_js_1.default(inputOrder.shares * Math.pow(10, this.decimals));
                 for (const order of sortedOrders) {
@@ -973,7 +1009,18 @@ class TriadProtocolClient {
                     if (sharesToSell.lt(new bn_js_1.default(0)))
                         continue;
                     remainingShares = remainingShares.sub(sharesToSell);
-                    amountOfShares += sharesToSell.toNumber();
+                    const orderPrice = new bn_js_1.default(order.price);
+                    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.sub(fee);
+                    }
+                    amountOfUSDC = amountOfUSDC.add(sharesToSell.mul(adjustedPrice).div(new bn_js_1.default(Math.pow(10, this.decimals))));
                     ixs.push(yield this.program.methods
                         .marketAskOrder({
                         shares: new bn_js_1.default(sharesToSell),
@@ -1001,7 +1048,7 @@ class TriadProtocolClient {
                     wallet: this.program.provider.publicKey.toBase58(),
                     inToken: constants_1.USDC_MINT.toBase58(),
                     outToken: constants_1.TRD_MINT.toString(),
-                    amount: amountOfShares
+                    amount: amountOfUSDC.toNumber()
                 });
                 if (swapIxs.length > 0) {
                     ixs.push(...setupInstructions);

package/dist/types/index.d.ts

@@ -230,6 +230,7 @@ export type MarketAskOrderArgs = {
         flop: {};
     };
     isTrdPayout: boolean;
+    feeBps: number;
 };
 export type Refer = {
     id: number;

package/dist/utils/swap.js

@@ -24,7 +24,7 @@ const swap = ({ connection, wallet, inToken, outToken, amount }) => __awaiter(vo
         throw new Error('Token not found');
     }
     const formattedAmountIn = amount * Math.pow(10, token.decimals);
-    const quoteResponse = yield axios_1.default.get(`https://lite-api.jup.ag/swap/v1/quote?inputMint=${inToken}&outputMint=${outToken}&amount=${formattedAmountIn}&slippageBps=50&onlyDirectRoutes=true&platformFeeBps=60`);
+    const quoteResponse = yield axios_1.default.get(`https://lite-api.jup.ag/swap/v1/quote?inputMint=${inToken}&outputMint=${outToken}&amount=${formattedAmountIn}&slippageBps=20&onlyDirectRoutes=true&platformFeeBps=60`);
     const { data: quoteData } = quoteResponse;
     const swapResponse = yield axios_1.default.post('https://lite-api.jup.ag/swap/v1/swap-instructions', {
         quoteResponse: quoteData,

package/package.json

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