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

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { Connection, PublicKey, TransactionInstruction, Commitment } from '@solana/web3.js';
 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 } from './types';
+import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions, UpdateCustomerFeeArgs, Order, OrderDirection } from './types';
 import Stake from './stake';
 import Poseidon from './poseidon';
 export * from './types';
@@ -15,7 +15,7 @@ export default class TriadProtocolClient {
     stake: Stake;
     poseidon: Poseidon;
     decimals: number;
-    constructor(connection: Connection, wallet: Wallet);
+    constructor(connection: Connection, wallet: Wallet, commitment?: Commitment);
     /**
      * Get All Pools
      *
@@ -37,7 +37,14 @@ export default class TriadProtocolClient {
      * @param wallet - User wallet PublicKey
      *
      */
-    getUserOrders(wallet: PublicKey): Promise<import("./types").Order[]>;
+    getUserOrders(wallet: PublicKey): Promise<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[]>;
     /**
      * Get Pool By ID
      * @param poolId - The ID of the pool
@@ -357,6 +364,16 @@ export default class TriadProtocolClient {
         ixs: TransactionInstruction[];
         nonce?: undefined;
     }>;
+    /**
+     * Get User Trade Nonce
+     * @param marketId - The ID of the Market
+     * @param direction - The direction of the Order
+     *
+     */
+    getUserTradeNonce(marketId: number, direction: OrderDirection): Promise<{
+        userTradePDA: PublicKey;
+        userTradeIxs: TransactionInstruction[];
+    }>;
     /**
      * Place Bid Order
      * @param args.marketId - The ID of the Market
@@ -408,6 +425,8 @@ export default class TriadProtocolClient {
      * @param args.amount - The amount of the Order
      * @param args.direction - The direction of the Order
      * @param args.mint - The mint of the Order
+     * @param args.feeBps - The fee in basis points
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
@@ -415,15 +434,13 @@ export default class TriadProtocolClient {
     /**
      * Market Ask Order
      * @param args.marketId - The ID of the Market
-     * @param args.shares - The amount of the Order
-     * @param args.bidOrderId - The ID of the Bid Order
+     * @param args.orders - Array of orders to execute
      * @param args.direction - The direction of the Order
-     * @param args.mint - The mint of the Order
      * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
-    marketAskOrder({ marketId, shares, bidOrderId, direction, mint, isTrdPayout }: MarketAskOrderArgs, options?: RpcOptions): Promise<string>;
+    marketAskOrder({ marketId, orders, direction, isTrdPayout }: MarketAskOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Get Orders By Market ID
      * @param marketId - The ID of the market

package/dist/index.js

@@ -43,10 +43,10 @@ __exportStar(require("./types/stake"), exports);
 __exportStar(require("./types/poseidon"), exports);
 __exportStar(require("./utils/helpers"), exports);
 class TriadProtocolClient {
-    constructor(connection, wallet) {
+    constructor(connection, wallet, commitment = 'confirmed') {
         this.decimals = constants_1.TRD_DECIMALS; // We're using only TRD or USDC so we can use the same decimals 6
         this.provider = new anchor_1.AnchorProvider(connection, wallet, {
-            commitment: 'confirmed'
+            commitment
         });
         this.program = new anchor_1.Program(idl_triad_protocol_json_1.default, this.provider);
         this.stake = new stake_1.default(this.program);
@@ -101,6 +101,18 @@ class TriadProtocolClient {
             return myUserTrades.flatMap((userTrade) => userTrade.orders);
         });
     }
+    /**
+     * Get User Orders By Market ID
+     * @param wallet - User wallet PublicKey
+     * @param marketId - The ID of the market
+     *
+     */
+    getUserOrdersByMarketId(wallet, marketId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userTrades = yield this.getMyUserTrades(wallet);
+            return userTrades.flatMap((userTrade) => userTrade.orders.filter((order) => order.marketId === marketId.toString()));
+        });
+    }
     /**
      * Get Pool By ID
      * @param poolId - The ID of the pool
@@ -351,13 +363,14 @@ class TriadProtocolClient {
             }
             let amountInTRD = amount * Math.pow(10, constants_1.TRD_DECIMALS);
             if (token !== constants_1.TRD_MINT.toBase58()) {
-                const { setupInstructions, swapIxs, addressLookupTableAccounts, trdAmount } = yield (0, swap_1.swap)({
+                const { setupInstructions, swapIxs, addressLookupTableAccounts, outAmount } = yield (0, swap_1.swap)({
                     connection: this.program.provider.connection,
                     wallet: this.program.provider.publicKey.toBase58(),
                     inToken: token,
+                    outToken: constants_1.TRD_MINT.toString(),
                     amount
                 });
-                amountInTRD = trdAmount;
+                amountInTRD = outAmount;
                 if (swapIxs.length === 0) {
                     return;
                 }
@@ -490,7 +503,8 @@ class TriadProtocolClient {
                         connection: this.program.provider.connection,
                         wallet: this.program.provider.publicKey.toBase58(),
                         inToken: constants_1.USDC_MINT.toBase58(),
-                        amount: order.shares * Math.pow(10, constants_1.TRD_DECIMALS)
+                        outToken: constants_1.TRD_MINT.toString(),
+                        amount: order.shares / Math.pow(10, this.decimals)
                     });
                     if (swapIxs.length === 0) {
                         return;
@@ -677,6 +691,31 @@ class TriadProtocolClient {
             }
         });
     }
+    /**
+     * Get User Trade Nonce
+     * @param marketId - The ID of the Market
+     * @param direction - The direction of the Order
+     *
+     */
+    getUserTradeNonce(marketId, direction) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const userOrders = yield this.getUserOrdersByMarketId(this.program.provider.publicKey, marketId);
+            const userNonce = (_a = userOrders.find((order) => order.orderDirection === Object.keys(direction)[0] &&
+                order.orderStatus === types_1.OrderStatus.OPEN)) === null || _a === void 0 ? void 0 : _a.userNonce;
+            let userTradePDA = null;
+            let userTradeIxs = [];
+            if (userNonce) {
+                userTradePDA = this.getUserPDA(this.program.provider.publicKey, Number(userNonce));
+            }
+            if (!userNonce) {
+                const { userTradePDA: user, ixs: ixsUser } = yield this.getUserTradeIxs();
+                userTradePDA = user;
+                userTradeIxs = ixsUser;
+            }
+            return { userTradePDA, userTradeIxs };
+        });
+    }
     /**
      * Place Bid Order
      * @param args.marketId - The ID of the Market
@@ -690,7 +729,7 @@ class TriadProtocolClient {
     placeBidOrder({ marketId, amount, direction, mint, price }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
+            const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(direction)[0]);
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
@@ -808,6 +847,8 @@ class TriadProtocolClient {
      * @param args.amount - The amount of the Order
      * @param args.direction - The direction of the Order
      * @param args.mint - The mint of the Order
+     * @param args.feeBps - The fee in basis points
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
@@ -815,9 +856,25 @@ class TriadProtocolClient {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
-            const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
+            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)({
+                    connection: this.program.provider.connection,
+                    wallet: this.program.provider.publicKey.toBase58(),
+                    inToken: constants_1.TRD_MINT.toString(),
+                    outToken: constants_1.USDC_MINT.toString(),
+                    amount
+                });
+                if (swapIxs.length === 0) {
+                    return;
+                }
+                remainingUSDC = new bn_js_1.default(outAmount);
+                ixs.push(...setupInstructions);
+                ixs.push(...swapIxs);
+                addressLookupTableAccounts.push(...addressLookupTableAccounts);
+            }
             const orders = Object.keys(direction)[0] === 'hype'
                 ? orderBook.hype.ask
                 : orderBook.flop.ask;
@@ -884,65 +941,78 @@ class TriadProtocolClient {
     /**
      * Market Ask Order
      * @param args.marketId - The ID of the Market
-     * @param args.shares - The amount of the Order
-     * @param args.bidOrderId - The ID of the Bid Order
+     * @param args.orders - Array of orders to execute
      * @param args.direction - The direction of the Order
-     * @param args.mint - The mint of the Order
      * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
-    marketAskOrder({ marketId, shares, bidOrderId, direction, mint, isTrdPayout }, options) {
+    marketAskOrder({ marketId, orders, direction, isTrdPayout }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
-            const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
+            const addressLookupTableAccounts = [];
             const orderBook = yield this.getOrderBook(marketId);
-            let remainingShares = new bn_js_1.default(shares * Math.pow(10, this.decimals));
-            const orders = Object.keys(direction)[0] === 'hype'
+            const bidOrders = Object.keys(direction)[0] === 'hype'
                 ? orderBook.hype.bid
                 : orderBook.flop.bid;
-            const sortedOrders = orders.sort((a, b) => Number(b.price) - Number(a.price));
-            const tokenProgram = (0, helpers_1.getTokenProgram)(mint);
-            for (const order of sortedOrders) {
-                if (remainingShares.lte(new bn_js_1.default(0)))
-                    break;
-                if (order.authority === this.program.provider.publicKey.toBase58() ||
-                    order.linkedBookOrderId !== constants_1.BOOK_ORDER_NULL.toString()) {
-                    continue;
+            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;
+            for (const inputOrder of orders) {
+                let remainingShares = new bn_js_1.default(inputOrder.shares * Math.pow(10, this.decimals));
+                for (const order of sortedOrders) {
+                    if (remainingShares.lte(new bn_js_1.default(0)))
+                        break;
+                    if (order.authority === this.program.provider.publicKey.toBase58() ||
+                        order.linkedBookOrderId !== constants_1.BOOK_ORDER_NULL.toString()) {
+                        continue;
+                    }
+                    const availableShares = new bn_js_1.default(order.totalShares).sub(new bn_js_1.default(order.filledShares));
+                    const sharesToSell = bn_js_1.default.min(remainingShares, availableShares);
+                    if (sharesToSell.lt(new bn_js_1.default(0)))
+                        continue;
+                    remainingShares = remainingShares.sub(sharesToSell);
+                    amountOfShares += sharesToSell.toNumber();
+                    ixs.push(yield this.program.methods
+                        .marketAskOrder({
+                        shares: new bn_js_1.default(sharesToSell),
+                        orderDirection: direction,
+                        bidOrderId: new bn_js_1.default(inputOrder.bidOrderId),
+                        bookOrderBidId: new bn_js_1.default(order.id)
+                    })
+                        .accounts({
+                        signer: this.program.provider.publicKey,
+                        market: marketPDA,
+                        buyerAuthority: new web3_js_1.PublicKey(order.authority),
+                        buyerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
+                        orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
+                        mint: constants_1.USDC_MINT,
+                        tokenProgram,
+                        marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, tokenProgram),
+                        sellerTrade: this.getUserPDA(this.program.provider.publicKey, inputOrder.userNonce)
+                    })
+                        .instruction());
                 }
-                const availableShares = new bn_js_1.default(order.totalShares).sub(new bn_js_1.default(order.filledShares));
-                const sharesToSell = bn_js_1.default.min(remainingShares, availableShares);
-                if (sharesToSell.lt(new bn_js_1.default(0)))
-                    continue;
-                remainingShares = remainingShares.sub(sharesToSell);
-                ixs.push(yield this.program.methods
-                    .marketAskOrder({
-                    shares: new bn_js_1.default(sharesToSell),
-                    orderDirection: direction,
-                    bidOrderId: new bn_js_1.default(bidOrderId),
-                    bookOrderBidId: new bn_js_1.default(order.id)
-                })
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    market: marketPDA,
-                    buyerAuthority: new web3_js_1.PublicKey(order.authority),
-                    buyerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
-                    orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                    mint,
-                    tokenProgram,
-                    marketAta: (0, pda_1.getTokenATA)(marketPDA, mint, tokenProgram),
-                    sellerTrade: userTradePDA
-                })
-                    .instruction());
             }
-            if (userTradeIxs.length > 0) {
-                ixs.unshift(...userTradeIxs);
+            if (isTrdPayout) {
+                const { setupInstructions, swapIxs, addressLookupTableAccounts: swapAddressLookupTableAccounts } = yield (0, swap_1.swap)({
+                    connection: this.program.provider.connection,
+                    wallet: this.program.provider.publicKey.toBase58(),
+                    inToken: constants_1.USDC_MINT.toBase58(),
+                    outToken: constants_1.TRD_MINT.toString(),
+                    amount: amountOfShares
+                });
+                if (swapIxs.length > 0) {
+                    ixs.push(...setupInstructions);
+                    ixs.push(...swapIxs);
+                    addressLookupTableAccounts.push(...swapAddressLookupTableAccounts);
+                }
             }
             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);
         });
     }
     /**

package/dist/types/idl_triad_protocol.json

@@ -2435,6 +2435,16 @@
             "code": 6027,
             "name": "MarketAlreadyPaidOut",
             "msg": "Market already paid out"
+        },
+        {
+            "code": 6028,
+            "name": "InvalidNonce",
+            "msg": "Invalid Nonce"
+        },
+        {
+            "code": 6029,
+            "name": "InvalidMainOrder",
+            "msg": "Invalid Main Order"
         }
     ],
     "types": [

package/dist/types/index.d.ts

@@ -219,14 +219,16 @@ export type MarketBidOrderArgs = {
 };
 export type MarketAskOrderArgs = {
     marketId: number;
-    shares: number;
-    bidOrderId: number;
+    orders: {
+        shares: number;
+        bidOrderId: number;
+        userNonce: number;
+    }[];
     direction: {
         hype: {};
     } | {
         flop: {};
     };
-    mint: PublicKey;
     isTrdPayout: boolean;
 };
 export type Refer = {

package/dist/types/triad_protocol.d.ts

@@ -3255,6 +3255,16 @@ export type TriadProtocol = {
             code: 6027;
             name: 'marketAlreadyPaidOut';
             msg: 'Market already paid out';
+        },
+        {
+            code: 6028;
+            name: 'invalidNonce';
+            msg: 'Invalid Nonce';
+        },
+        {
+            code: 6029;
+            name: 'invalidMainOrder';
+            msg: 'Invalid Main Order';
         }
     ];
     types: [

package/dist/utils/swap.d.ts

@@ -1,14 +1,13 @@
 import { AddressLookupTableAccount, Connection, TransactionInstruction } from '@solana/web3.js';
-export declare const swap: ({ connection, wallet, inToken, amount }: {
+export declare const swap: ({ connection, wallet, inToken, outToken, amount }: {
     connection: Connection;
     wallet: string;
     inToken: string;
+    outToken: string;
     amount: number;
 }) => Promise<{
     swapIxs: TransactionInstruction[];
     addressLookupTableAccounts: AddressLookupTableAccount[];
-    setupInstructions: any;
-    cleanupInstruction: TransactionInstruction;
-    trdAmount: any;
+    setupInstructions: TransactionInstruction[];
+    outAmount: any;
 }>;
-export declare const getAddressLookupTableAccounts: (connection: Connection, keys: string[]) => Promise<AddressLookupTableAccount[]>;

package/dist/utils/swap.js

@@ -12,35 +12,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAddressLookupTableAccounts = exports.swap = void 0;
+exports.swap = void 0;
+const index_1 = require("./pda/index");
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
-const swap = ({ connection, wallet, inToken, amount }) => __awaiter(void 0, void 0, void 0, function* () {
+const spl_token_1 = require("@solana/spl-token");
+const swap = ({ connection, wallet, inToken, outToken, amount }) => __awaiter(void 0, void 0, void 0, function* () {
     const token = TOKENS[inToken];
     if (!token) {
         throw new Error('Token not found');
     }
     const formattedAmountIn = amount * Math.pow(10, token.decimals);
-    const quoteResponse = yield axios_1.default.get(`https://quote-api.jup.ag/v6/quote?inputMint=${inToken}&outputMint=${constants_1.TRD_MINT.toBase58()}&amount=${formattedAmountIn}&slippageBps=1000`);
+    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 { data: quoteData } = quoteResponse;
-    const swapResponse = yield axios_1.default.post('https://quote-api.jup.ag/v6/swap-instructions', {
+    const swapResponse = yield axios_1.default.post('https://lite-api.jup.ag/swap/v1/swap-instructions', {
+        quoteResponse: quoteData,
         userPublicKey: wallet,
-        wrapAndUnwrapSol: true,
-        quoteResponse: quoteData
+        feeAccount: getFeeAccount()
     });
-    const { setupInstructions, swapInstruction, addressLookupTableAddresses, cleanupInstruction } = swapResponse.data;
+    const { setupInstructions, swapInstruction, addressLookupTableAddresses } = swapResponse.data;
     return {
-        swapIxs: [
-            deserializeInstruction(swapInstruction),
-            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-                units: 500000
-            })
-        ],
-        addressLookupTableAccounts: yield (0, exports.getAddressLookupTableAccounts)(connection, addressLookupTableAddresses),
-        setupInstructions: setupInstructions.map(deserializeInstruction),
-        cleanupInstruction: deserializeInstruction(cleanupInstruction),
-        trdAmount: quoteData.outAmount
+        swapIxs: [deserializeInstruction(swapInstruction)],
+        addressLookupTableAccounts: yield getAddressLookupTableAccounts(connection, addressLookupTableAddresses),
+        setupInstructions: setupInstructions.length > 0
+            ? [deserializeInstruction(setupInstructions)]
+            : [],
+        outAmount: quoteData.otherAmountThreshold
     };
 });
 exports.swap = swap;
@@ -69,7 +67,6 @@ const getAddressLookupTableAccounts = (connection, keys) => __awaiter(void 0, vo
         return acc;
     }, new Array());
 });
-exports.getAddressLookupTableAccounts = getAddressLookupTableAccounts;
 const TOKENS = {
     So11111111111111111111111111111111111111112: {
         mint: 'So11111111111111111111111111111111111111112',
@@ -78,5 +75,12 @@ const TOKENS = {
     EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: {
         mint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
         decimals: 6
+    },
+    t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV: {
+        mint: 't3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV',
+        decimals: 6
     }
 };
+const getFeeAccount = () => {
+    return (0, index_1.getTokenATA)(new web3_js_1.PublicKey('Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4'), constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID);
+};

package/package.json

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