@triadxyz/triad-protocol 3.1.1-beta → 3.1.3-beta

package/dist/index.js

@@ -38,23 +38,23 @@ const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersione
 const swap_1 = require("./utils/swap");
 const stake_1 = __importDefault(require("./stake"));
 const poseidon_1 = __importDefault(require("./poseidon"));
+const spl_token_1 = require("@solana/spl-token");
 __exportStar(require("./types"), exports);
-__exportStar(require("./types/stake"), exports);
-__exportStar(require("./types/poseidon"), exports);
 __exportStar(require("./utils/helpers"), exports);
 class TriadProtocolClient {
-    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
+    constructor(connection, wallet, rpcOptions) {
+        this.connection = connection;
+        this.wallet = wallet;
+        this.rpcOptions = rpcOptions;
+        this.provider = new anchor_1.AnchorProvider(this.connection, this.wallet, {
+            commitment: this.rpcOptions.commitment || 'confirmed'
         });
         this.program = new anchor_1.Program(idl_triad_protocol_json_1.default, this.provider);
-        this.stake = new stake_1.default(this.program);
-        this.poseidon = new poseidon_1.default(this.program);
+        this.stake = new stake_1.default(this.program, this.rpcOptions);
+        this.poseidon = new poseidon_1.default(this.program, this.rpcOptions);
     }
     /**
      * Get All Pools
-     *
      */
     getAllPools() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -64,7 +64,6 @@ class TriadProtocolClient {
     }
     /**
      * Get All Markets
-     *
      */
     getAllMarkets() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -75,7 +74,6 @@ class TriadProtocolClient {
     /**
      * Get My User Trades from a user authority
      * @param wallet - User wallet PublicKey
-     *
      */
     getMyUserTrades(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -93,7 +91,6 @@ class TriadProtocolClient {
     /**
      * Get User Orders
      * @param wallet - User wallet PublicKey
-     *
      */
     getUserOrders(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -105,7 +102,6 @@ class TriadProtocolClient {
      * 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* () {
@@ -115,7 +111,6 @@ class TriadProtocolClient {
     }
     /**
      * Get User Book Orders
-     *
      */
     getUserBookOrders(wallet, marketId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -130,7 +125,6 @@ class TriadProtocolClient {
     /**
      * Get Pool By ID
      * @param poolId - The ID of the pool
-     *
      */
     getPoolById(poolId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -142,7 +136,6 @@ class TriadProtocolClient {
     /**
      * Get Market By ID
      * @param marketId - The ID of the market
-     *
      */
     getMarketById(marketId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -154,7 +147,6 @@ class TriadProtocolClient {
     /**
      * Get Market By Address
      * @param marketAddress - The address of the market
-     *
      */
     getMarketByAddress(marketAddress) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -165,7 +157,6 @@ class TriadProtocolClient {
     /**
      * Get Costumer By Wallet Address
      * @param wallet - The wallet address of the customer
-     *
      */
     getCustomerByWallet(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -183,7 +174,6 @@ class TriadProtocolClient {
     /**
      * Get Customer By ID
      * @param customerId - The ID of the customer
-     *
      */
     getCustomerById(customerId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -194,18 +184,15 @@ class TriadProtocolClient {
     }
     /**
      * Get Current Market ID
-     *
      */
     nextMarketId() {
         return __awaiter(this, void 0, void 0, function* () {
             const markets = yield this.program.account.marketV2.all();
-            // 10 is the initial market id
             return markets.length + 10;
         });
     }
     /**
      * Get Next Customer ID
-     *
      */
     nextCustomerId() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -215,7 +202,6 @@ class TriadProtocolClient {
     }
     /**
      * Get Next Pool ID
-     *
      */
     nextPoolId() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -227,7 +213,6 @@ class TriadProtocolClient {
      * Get User Trade PDA
      * @param wallet - User wallet PublicKey
      * @param userNonce - The nonce of the user
-     *
      */
     getUserPDA(wallet, userNonce = 0) {
         let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, wallet);
@@ -241,7 +226,6 @@ class TriadProtocolClient {
      * Get User Trade
      * @param wallet - User wallet PublicKey
      * @param userNonce - The nonce of the user
-     *
      */
     getUserTrade(wallet, userNonce = 0) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -251,17 +235,17 @@ class TriadProtocolClient {
     }
     /**
      * Create Market
-     * @param args.marketId - new markert id - length + 1
-     * @param args.startTime - start time
-     * @param args.endTime - end time
-     * @param args.question - question (max 80 characters)
-     * @param args.liquidityAtStart - liquidity at start
-     * @param args.payoutFee - payout fee (to add affiliate system)
-     *
-     * @param options - RPC options
-     *
+     * @param args.markets - Array of markets to create
+     * @param args.markets.marketId - Market ID
+     * @param args.markets.startTime - start time
+     * @param args.markets.endTime - end time
+     * @param args.markets.question - question (max 80 characters)
+     * @param args.markets.liquidityAtStart - liquidity at start
+     * @param args.markets.payoutFee - payout fee (to add affiliate system)
+     * @param args.customer - The customer of the market
+     * @param args.poolId - The ID of the pool
      */
-    createMarket({ markets, customer, mint, poolId }, options) {
+    createMarket({ markets, customer, poolId }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             let poolPDA = null;
@@ -283,7 +267,7 @@ class TriadProtocolClient {
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint),
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                     pool: poolPDA,
                     customer
                 })
@@ -296,7 +280,7 @@ class TriadProtocolClient {
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -304,10 +288,8 @@ class TriadProtocolClient {
      * @param poolId - The ID of the pool
      * @param question - The question of the pool
      * @param markets - The markets of the pool
-     *
-     * @param options - RPC options
      */
-    createPool({ poolId, question, markets, mint, customer, startTime, endTime, feeBps, payoutFee, isFast }, options) {
+    createPool({ poolId, question, markets, customer, startTime, endTime, feeBps, payoutFee, isFast }) {
         return __awaiter(this, void 0, void 0, function* () {
             if (question.length > 80) {
                 throw new Error('Pool question must be less than 80 characters');
@@ -340,7 +322,7 @@ class TriadProtocolClient {
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint),
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                     pool: poolPDA,
                     customer
                 })
@@ -353,7 +335,7 @@ class TriadProtocolClient {
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -363,11 +345,8 @@ class TriadProtocolClient {
      * @param args.direction - The direction of the Order
      * @param args.mint - The mint of the Order
      * @param args.token - The token to use for the Order
-     *
-     * @param options - RPC options
-     *
      */
-    openOrder({ marketId, amount, direction, mint, token }, options) {
+    openOrder({ marketId, amount, direction, mint, token }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const addressLookupTableAccounts = [];
@@ -375,7 +354,7 @@ class TriadProtocolClient {
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
-            let amountInTRD = amount * Math.pow(10, constants_1.TRD_DECIMALS);
+            let amountInTRD = amount * Math.pow(10, constants_1.BASE_DECIMALS);
             if (token !== constants_1.TRD_MINT.toBase58()) {
                 const { setupInstructions, swapIxs, addressLookupTableAccounts, outAmount } = yield (0, swap_1.swap)({
                     connection: this.program.provider.connection,
@@ -404,7 +383,7 @@ class TriadProtocolClient {
                 mint
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options, addressLookupTableAccounts);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions, addressLookupTableAccounts);
         });
     }
     /**
@@ -412,11 +391,8 @@ class TriadProtocolClient {
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order
      * @param args.userNonce - The nonce of the user
-     *
-     * @param options - RPC options
-     *
      */
-    closeOrder({ marketId, orderId, userNonce }, options) {
+    closeOrder({ marketId, orderId, userNonce }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const userTrade = this.getUserPDA(this.program.provider.publicKey, userNonce);
@@ -429,18 +405,16 @@ class TriadProtocolClient {
                 userTrade
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Resolve Market
      * @param args.marketId - The ID of the Market
+     * @param args.poolId - The ID of the Pool
      * @param args.winningDirection - The Winning Direction of the Market
-     *
-     * @param options - RPC options
-     *
      */
-    resolveMarket({ marketId, poolId, winningDirection }, options) {
+    updateMarketWinningDirection({ marketId, poolId, winningDirection }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             let poolPDA = null;
@@ -448,41 +422,14 @@ class TriadProtocolClient {
                 poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
             }
             ixs.push(yield this.program.methods
-                .updateMarket({
-                winningDirection,
-                allowPayout: null,
-                marketEnd: null
-            })
+                .updateMarketWinningDirection(winningDirection)
                 .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 pool: poolPDA
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
-        });
-    }
-    /**
-     * Collect Remaining Liquidity
-     * @param marketId - The ID of the market
-     *
-     * @param options - RPC options
-     *
-     */
-    collectRemainingLiquidity(marketId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
-            const market = yield this.getMarketByAddress(marketPDA);
-            ixs.push(yield this.program.methods
-                .collectRemainingLiquidity()
-                .accounts({
-                signer: this.program.provider.publicKey,
-                market: marketPDA,
-                mint: market.mint
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -491,12 +438,8 @@ class TriadProtocolClient {
      * @param args.orderId - The ID of the Order to Payout
      * @param args.userNonce - The nonce of the user
      * @param args.mint - The mint of the market
-     * @param args.shares - The shares of the order
-     *
-     * @param options - RPC options
-     *
      */
-    payoutOrder(orders, options) {
+    payoutOrder(orders) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             if (orders.length > 6) {
@@ -514,18 +457,16 @@ class TriadProtocolClient {
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
-     * Allow Market to Payout
+     * Update Market Payout
      * @param marketId - The ID of the market
      * @param poolId - The ID of the pool
-     *
-     * @param options - RPC options
-     *
+     * @param allowPayout - Whether to allow the market to payout
      */
-    allowMarketToPayout({ marketId, poolId }, options) {
+    updateMarketPayout({ marketId, poolId, allowPayout }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             let poolPDA = null;
@@ -533,28 +474,20 @@ class TriadProtocolClient {
                 poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
             }
             ixs.push(yield this.program.methods
-                .updateMarket({
-                winningDirection: null,
-                allowPayout: true,
-                marketEnd: null
-            })
+                .updateMarketPayout(allowPayout)
                 .accounts({
                 signer: this.program.provider.publicKey,
-                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                pool: poolPDA
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Create Sub User Trade
      * @param user - User PublicKey the main user
-     *
-     * @param options - RPC options
-     *
      */
-    createSubUserTrade(user, options) {
+    createSubUserTrade(user) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const userTrade = yield this.getUserTrade(user);
@@ -565,37 +498,43 @@ class TriadProtocolClient {
                 signer: this.program.provider.publicKey
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
-     * Update Market
+     * Update Market End
      * @param marketId - The ID of the market
      * @param marketEnd - The end time of the market
-     *
-     * @param options - RPC options
-     *
      */
-    updateMarket({ marketId, marketEnd, poolId }, options) {
+    updateMarketEnd({ marketId, marketEnd }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            let poolPDA = null;
-            if (poolId) {
-                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
-            }
             ixs.push(yield this.program.methods
-                .updateMarket({
-                marketEnd: new bn_js_1.default(marketEnd),
-                winningDirection: null,
-                allowPayout: null
+                .updateMarketEnd(new bn_js_1.default(marketEnd))
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
             })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Update Market Question
+     * @param marketId - The ID of the market
+     * @param question - The question of the market
+     */
+    updateMarketQuestion({ marketId, question }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updateMarketQuestion((0, helpers_1.encodeString)(question, 80))
                 .accounts({
                 signer: this.program.provider.publicKey,
-                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                pool: poolPDA
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -604,26 +543,23 @@ class TriadProtocolClient {
      * @param args.name - The name of the customer
      * @param args.authority - The authority of the customer
      * @param args.feeRecipient - The fee recipient of the customer
-     *
-     * @param options - RPC options
-     *
      */
-    createCustomer({ id, name, authority, feeRecipient }, options) {
+    createCustomer({ id, name, authority, feeRecipient }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .createCustomer({ id, name, authority, feeRecipient })
-                .accounts({
-                signer: this.program.provider.publicKey
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .createCustomer({ id, name, authority, feeRecipient })
+                    .accounts({
+                    signer: this.program.provider.publicKey
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Get User Trade Nonce With Slots
      * @param userTrades - User Trades
-     *
      */
     getUserTradeNonceWithSlots(userTrades) {
         let nonce = null;
@@ -645,7 +581,6 @@ class TriadProtocolClient {
     }
     /**
      * Get User Trade Ixs
-     *
      */
     getUserTradeIxs() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -688,14 +623,13 @@ class TriadProtocolClient {
     /**
      * Get User Trade Nonce
      * @param marketId - The ID of the Market
-     * @param direction - The direction of the Order
-     *
+     * @param orderDirection - The direction of the Order
      */
-    getUserTradeNonce(marketId, direction) {
+    getUserTradeNonce(marketId, orderDirection) {
         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 === direction &&
+            const userNonce = (_a = userOrders.find((order) => order.orderDirection === orderDirection &&
                 order.orderStatus === types_1.OrderStatus.OPEN)) === null || _a === void 0 ? void 0 : _a.userNonce;
             let userTradePDA = null;
             let userTradeIxs = [];
@@ -713,15 +647,14 @@ class TriadProtocolClient {
     /**
      * Place Bid Order
      * @param args.marketId - The ID of the Market
-     * @param args.amount - The amount of the Order
-     * @param args.direction - The direction of the Order
+     * @param args.orders - Array of orders to execute
+     * @param args.orders.amount - The amount of the Order
+     * @param args.orders.price - The price of the Order
+     * @param args.orders.orderDirection - The direction of the Order
      * @param args.mint - The mint of the Order
-     * @param args.price - The price of the Order
      * @param args.isTrdPayout - Whether to payout in TRD or not
-     *
-     * @param options - RPC options
      */
-    placeBidOrder({ marketId, orders, mint, isTrdPayout }, options) {
+    placeBidOrder({ marketId, orders, isTrdPayout }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const addressLookupTableAccounts = [];
@@ -750,47 +683,42 @@ class TriadProtocolClient {
                 ixs.push(...setupInstructions);
                 ixs.push(...swapIxs);
                 addressLookupTableAccounts.push(...swapAddressLookupTableAccounts);
-                if (amountInUSDC.lt(new bn_js_1.default(totalAmount * Math.pow(10, this.decimals)))) {
+                if (amountInUSDC.lt(new bn_js_1.default(totalAmount * Math.pow(10, constants_1.BASE_DECIMALS)))) {
                     return;
                 }
             }
-            const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(orders[0].direction)[0]);
+            const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(orders[0].orderDirection)[0]);
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .placeBidOrder({
-                    amount: new bn_js_1.default(order.amount * Math.pow(10, this.decimals)),
-                    price: new bn_js_1.default(order.price * Math.pow(10, this.decimals)),
-                    orderDirection: order.direction
+                    amount: new bn_js_1.default(order.amount * Math.pow(10, constants_1.BASE_DECIMALS)),
+                    price: new bn_js_1.default(order.price * Math.pow(10, constants_1.BASE_DECIMALS)),
+                    orderDirection: order.orderDirection
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                    userTrade: userTradePDA,
-                    mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
+                    userTrade: userTradePDA
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Place Ask Order
      * @param args.marketId - The ID of the Market
-     * @param args.amount - The amount of the Order
-     * @param args.direction - The direction of the Order
-     * @param args.price - The price of the Order
-     * @param args.bidOrderId - The ID of the Bid Order
-     * @param args.bidNonce - The nonce of the Bid Order
-     *
-     * @param options - RPC options
-     *
+     * @param args.orders - Array of orders to execute
+     * @param args.orders.amount - The amount of the Order
+     * @param args.orders.price - The price of the Order
+     * @param args.orders.bidOrderId - The ID of the Bid Order
+     * @param args.orders.bidNonce - The nonce of the Bid Order
      */
-    placeAskOrder({ marketId, orders }, options) {
+    placeAskOrder({ marketId, orders }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             if (orders.length > 4) {
@@ -799,8 +727,8 @@ class TriadProtocolClient {
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .placeAskOrder({
-                    shares: new bn_js_1.default(order.amount * Math.pow(10, this.decimals)),
-                    price: new bn_js_1.default(order.price * Math.pow(10, this.decimals)),
+                    shares: new bn_js_1.default(order.amount * Math.pow(10, constants_1.BASE_DECIMALS)),
+                    price: new bn_js_1.default(order.price * Math.pow(10, constants_1.BASE_DECIMALS)),
                     bidOrderId: new bn_js_1.default(order.bidOrderId)
                 })
                     .accounts({
@@ -811,19 +739,17 @@ class TriadProtocolClient {
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Cancel Bid Order
      * @param args.marketId - The ID of the Market
-     * @param args.orderId - The ID of the Order
-     * @param args.userNonce - The nonce of the user
-     * @param args.direction - The direction of the Order
-     *
-     * @param options - RPC options
+     * @param args.orders.orderId - The ID of the Order
+     * @param args.orders.userNonce - The nonce of the user
+     * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelBidOrder({ marketId, orders, mint }, options) {
+    cancelBidOrder({ marketId, orders }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             if (orders.length > 4) {
@@ -833,32 +759,27 @@ class TriadProtocolClient {
                 ixs.push(yield this.program.methods
                     .cancelBidOrder({
                     orderId: new bn_js_1.default(order.orderId),
-                    orderDirection: order.direction
+                    orderDirection: order.orderDirection
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                    userTrade: this.getUserPDA(this.program.provider.publicKey, order.userNonce),
-                    mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
+                    userTrade: this.getUserPDA(this.program.provider.publicKey, order.userNonce)
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Cancel Ask Order
      * @param args.marketId - The ID of the Market
-     * @param args.orderId - The ID of the Order
-     * @param args.userNonce - The nonce of the user
-     * @param args.userNonceBidOrder - The nonce of the bid user
-     * @param args.direction - The direction of the Order
-     *
-     * @param options - RPC options
+     * @param args.orders.orderId - The ID of the Order
+     * @param args.orders.userNonce - The nonce of the user
+     * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelAskOrder({ marketId, orders }, options) {
+    cancelAskOrder({ marketId, orders }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             if (orders.length > 4) {
@@ -868,7 +789,7 @@ class TriadProtocolClient {
                 ixs.push(yield this.program.methods
                     .cancelAskOrder({
                     orderId: new bn_js_1.default(order.orderId),
-                    orderDirection: order.direction
+                    orderDirection: order.orderDirection
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
@@ -878,38 +799,34 @@ class TriadProtocolClient {
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Market Bid Order
      * @param args.marketId - The ID of the Market
      * @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.orderDirection - The direction 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
      */
-    marketBidOrder({ marketId, amount, direction, mint, feeBps = 0, isTrdPayout }, options) {
+    marketBidOrder({ marketId, amount, orderDirection, feeBps = 0, isTrdPayout }) {
         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 { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(orderDirection)[0]);
             const orderBook = yield this.getOrderBook(marketId);
-            let remainingUSDC = new bn_js_1.default(amount * Math.pow(10, this.decimals));
+            let remainingUSDC = new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_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));
+                remainingUSDC = new bn_js_1.default(trdToUsdc * Math.pow(10, constants_1.BASE_DECIMALS));
             }
-            const orders = Object.keys(direction)[0] === 'hype'
+            const orders = Object.keys(orderDirection)[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();
             if (isTrdPayout) {
@@ -932,21 +849,21 @@ class TriadProtocolClient {
                         adjustedPrice = orderPrice.add(fee);
                     }
                     const maxSharesForPrice = tempRemainingUSDC
-                        .mul(new bn_js_1.default(Math.pow(10, this.decimals)))
+                        .mul(new bn_js_1.default(Math.pow(10, constants_1.BASE_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)));
+                        .div(new bn_js_1.default(Math.pow(10, constants_1.BASE_DECIMALS)));
                     if (usdcAmount.lte(new bn_js_1.default(0)))
                         continue;
                     totalUSDCNeeded = totalUSDCNeeded.add(usdcAmount);
                     tempRemainingUSDC = tempRemainingUSDC.sub(usdcAmount);
                 }
                 const price = yield (0, swap_1.getPrice)(constants_1.TRD_MINT.toString());
-                const amountInTRD = totalUSDCNeeded.toNumber() / (price * Math.pow(10, this.decimals));
+                const amountInTRD = totalUSDCNeeded.toNumber() / (price * Math.pow(10, constants_1.BASE_DECIMALS));
                 const { swapIxs, addressLookupTableAccounts: swapAddressLookupTableAccounts, outAmount, setupInstructions } = yield (0, swap_1.swap)({
                     connection: this.program.provider.connection,
                     wallet: this.program.provider.publicKey.toBase58(),
@@ -981,20 +898,20 @@ class TriadProtocolClient {
                     adjustedPrice = orderPrice.add(fee);
                 }
                 const maxSharesForPrice = remainingUSDC
-                    .mul(new bn_js_1.default(Math.pow(10, this.decimals)))
+                    .mul(new bn_js_1.default(Math.pow(10, constants_1.BASE_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)));
+                    .div(new bn_js_1.default(Math.pow(10, constants_1.BASE_DECIMALS)));
                 if (usdcAmount.lte(new bn_js_1.default(0)))
                     continue;
                 ixs.push(yield this.program.methods
                     .marketBidOrder({
                     amount: new bn_js_1.default(usdcAmount),
-                    orderDirection: direction,
+                    orderDirection,
                     askOrderId: new bn_js_1.default(order.id),
                     isTrdPayout
                 })
@@ -1003,12 +920,12 @@ class TriadProtocolClient {
                     market: marketPDA,
                     buyerTrade: userTradePDA,
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                    mint,
-                    tokenProgram,
                     sellerAuthority: new web3_js_1.PublicKey(order.authority),
                     sellerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
-                    marketAta: (0, pda_1.getTokenATA)(marketPDA, mint, tokenProgram),
-                    buyerAta: (0, pda_1.getTokenATA)(this.program.provider.publicKey, mint, tokenProgram)
+                    marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
+                    buyerAta: (0, pda_1.getTokenATA)(this.program.provider.publicKey, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
+                    mint: constants_1.USDC_MINT,
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
                 })
                     .instruction());
                 remainingUSDC = remainingUSDC.sub(usdcAmount);
@@ -1019,32 +936,33 @@ 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 (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions, addressLookupTableAccounts);
         });
     }
     /**
      * Market Ask Order
      * @param args.marketId - The ID of the Market
      * @param args.orders - Array of orders to execute
-     * @param args.direction - The direction of the Order
+     * @param args.orders.shares - The amount of shares to sell
+     * @param args.orders.bidOrderId - The ID of the Bid Order
+     * @param args.orders.userNonce - The nonce of the user
+     * @param args.orderDirection - The direction of the Order
      * @param args.isTrdPayout - Whether to payout in TRD or not
-     *
-     * @param options - RPC options
+     * @param args.feeBps - The fee in basis points
      */
-    marketAskOrder({ marketId, orders, direction, isTrdPayout, feeBps }, options) {
+    marketAskOrder({ marketId, orders, orderDirection, isTrdPayout, feeBps = 0 }) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const addressLookupTableAccounts = [];
             const orderBook = yield this.getOrderBook(marketId);
-            const bidOrders = Object.keys(direction)[0] === 'hype'
+            const bidOrders = Object.keys(orderDirection)[0] === 'hype'
                 ? orderBook.hype.bid
                 : 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 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));
+                let remainingShares = new bn_js_1.default(inputOrder.shares * Math.pow(10, constants_1.BASE_DECIMALS));
                 for (const order of sortedOrders) {
                     if (remainingShares.lte(new bn_js_1.default(0)))
                         break;
@@ -1068,11 +986,11 @@ class TriadProtocolClient {
                             .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))));
+                    amountOfUSDC = amountOfUSDC.add(sharesToSell.mul(adjustedPrice).div(new bn_js_1.default(Math.pow(10, constants_1.BASE_DECIMALS))));
                     ixs.push(yield this.program.methods
                         .marketAskOrder({
                         shares: new bn_js_1.default(sharesToSell),
-                        orderDirection: direction,
+                        orderDirection,
                         bidOrderId: new bn_js_1.default(inputOrder.bidOrderId),
                         bookOrderBidId: new bn_js_1.default(order.id)
                     })
@@ -1082,10 +1000,10 @@ class TriadProtocolClient {
                         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),
+                        marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
+                        sellerTrade: this.getUserPDA(this.program.provider.publicKey, inputOrder.userNonce),
                         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)
+                        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
                     })
                         .instruction());
                 }
@@ -1107,13 +1025,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 (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions, addressLookupTableAccounts);
         });
     }
     /**
      * Get Orders By Market ID
-     * @param marketId - The ID of the market
-     *
+     * @param marketId - Market ID
      */
     getOrderBook(marketId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1150,14 +1067,11 @@ class TriadProtocolClient {
     /**
      * Collect Market Fee
      * @param args.markets - The markets to collect the fee from
-     * @param args.markets.mint - The mint of the market
      * @param args.markets.marketAddress - The address of the market
      * @param args.markets.customerId - The ID of the customer
      * @param args.markets.customerFeeRecipient - The address of the customer fee recipient
-     *
-     * @param options - RPC options
      */
-    collectMarketFee(markets, options) {
+    collectMarketFee({ markets }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             for (const market of markets) {
@@ -1166,23 +1080,21 @@ class TriadProtocolClient {
                     .accounts({
                     signer: this.program.provider.publicKey,
                     market: market.marketAddress,
-                    mint: market.mint,
+                    mint: constants_1.USDC_MINT,
                     customer: (0, pda_1.getCustomerPDA)(this.program.programId, market.customerId),
                     customerFeeRecipient: market.customerFeeRecipient,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(market.mint)
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Close Order Book
-     * @param marketId - The ID of the market
-     *
-     * @param options - RPC options
+     * @param marketIds - Market IDs
      */
-    closeOrderBook(marketIds, options) {
+    closeOrderBook(marketIds) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             for (const marketId of marketIds) {
@@ -1195,28 +1107,7 @@ class TriadProtocolClient {
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
-        });
-    }
-    /**
-     * Update Customer Fee
-     * @param feeBps - The fee in basis points
-     * @param wallet - The wallet of the customer to update the fee for
-     *
-     * @param options - RPC options
-     */
-    updateCustomerFee({ feeBps, wallet }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            const customer = yield this.getCustomerByWallet(wallet);
-            ixs.push(yield this.program.methods
-                .updateCustomerFee(feeBps)
-                .accounts({
-                signer: this.program.provider.publicKey,
-                customer: customer.address
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
 }