@triadxyz/triad-protocol 3.1.8-beta → 3.2.0-beta

package/dist/claim.d.ts

@@ -2,7 +2,7 @@
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
-import { RpcOptions, CreateClaimVaultArgs, ClaimTokenArgs, UpdateClaimVaultMerkleRootArgs, UpdateClaimVaultIsActiveArgs, UpdateClaimVaultAmountArgs } from './types';
+import { RpcOptions, CreateClaimVaultArgs, ClaimTokenArgs, UpdateClaimVaultIsActiveArgs, UpdateClaimVaultAmountArgs } from './types';
 export default class Claim {
     private program;
     private rpcOptions;
@@ -42,12 +42,6 @@ export default class Claim {
      * @param claimVault - Claim vault
      */
     updateClaimVaultIsActive({ isActive, claimVaultName }: UpdateClaimVaultIsActiveArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Claim Vault Merkle Root
-     * @param merkleRoot - Merkle root
-     * @param claimVault - Claim vault
-     */
-    updateClaimVaultMerkleRoot({ merkleRoot, claimVaultName }: UpdateClaimVaultMerkleRootArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Update Claim Vault Amount
      * @param amount - Amount to add
@@ -55,5 +49,5 @@ export default class Claim {
      * @param claimVaultName - Claim vault name
      * @param mint - Mint
      */
-    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint }: UpdateClaimVaultAmountArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, merkleRoot }: UpdateClaimVaultAmountArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/claim.js

@@ -134,25 +134,6 @@ class Claim {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
-    /**
-     * Update Claim Vault Merkle Root
-     * @param merkleRoot - Merkle root
-     * @param claimVault - Claim vault
-     */
-    updateClaimVaultMerkleRoot({ merkleRoot, claimVaultName }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .updateClaimVaultMerkleRoot(merkleRoot)
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName)
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
     /**
      * Update Claim Vault Amount
      * @param amount - Amount to add
@@ -160,13 +141,14 @@ class Claim {
      * @param claimVaultName - Claim vault name
      * @param mint - Mint
      */
-    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint }) {
+    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, merkleRoot }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [
                 yield this.program.methods
                     .updateClaimVaultAmount({
                     amount: new anchor_1.BN(amount * Math.pow(10, 6)),
-                    newUsers: new anchor_1.BN(newUsers)
+                    newUsers: new anchor_1.BN(newUsers),
+                    merkleRoot
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,

package/dist/index.d.ts

@@ -3,11 +3,10 @@ import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import { TriadProtocol } from './types/triad_protocol';
-import { OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, BookOrder, MarketAskOrderArgs, RpcOptions, OrderDirection, CloseOrderArgs } from './types';
+import { OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, BookOrder, MarketAskOrderArgs, RpcOptions, OrderDirection, CloseOrderArgs, CreateMarketArgs, CreatePoolArgs, UpdateMarketWinningDirectionArgs } from './types';
 import Stake from './stake';
 import Poseidon from './poseidon';
 import Claim from './claim';
-import Market from './market';
 export * from './types';
 export * from './utils/helpers';
 export * from './utils/merkle';
@@ -20,7 +19,6 @@ export default class TriadProtocolClient {
     stake: Stake;
     poseidon: Poseidon;
     claim: Claim;
-    market: Market;
     constructor(connection: Connection, wallet: Wallet, rpcOptions: RpcOptions);
     /**
      * Get My User Trades from a user authority
@@ -165,6 +163,125 @@ export default class TriadProtocolClient {
         poseidon: number;
         padding: number[];
     }>;
+    /**
+     * Get All Pools
+     */
+    getAllPools(): Promise<import("./types").Pool[]>;
+    /**
+     * Get All Markets
+     */
+    getAllMarkets(): Promise<import("./types").Market[]>;
+    /**
+     * Get Pool By ID
+     * @param poolId - The ID of the pool
+     */
+    getPoolById(poolId: number): Promise<import("./types").Pool>;
+    /**
+     * Get Market By ID
+     * @param marketId - The ID of the market
+     */
+    getMarketById(marketId: number): Promise<import("./types").Market>;
+    /**
+     * Get Market By Address
+     * @param marketAddress - The address of the market
+     */
+    getMarketByAddress(marketAddress: PublicKey): Promise<import("./types").Market>;
+    /**
+     * Get Current Market ID
+     */
+    nextMarketId(): Promise<number>;
+    /**
+     * Get Next Customer ID
+     */
+    nextCustomerId(): Promise<number>;
+    /**
+     * Get Next Pool ID
+     */
+    nextPoolId(): Promise<number>;
+    /**
+     * Create Market
+     * @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, poolId }: CreateMarketArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Create Pool
+     * @param poolId - The ID of the pool
+     * @param question - The question of the pool
+     * @param markets - The markets of the pool
+     */
+    createPool({ poolId, question, markets, customer, startTime, endTime, feeBps, payoutFee, isFast }: CreatePoolArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * 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
+     */
+    updateMarketWinningDirection({ marketId, poolId, winningDirection }: UpdateMarketWinningDirectionArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Update Market Payout
+     * @param marketId - The ID of the market
+     * @param poolId - The ID of the pool
+     * @param allowPayout - Whether to allow the market to payout
+     */
+    updateMarketPayout({ marketId, poolId, allowPayout }: {
+        marketId: number;
+        poolId?: number;
+        allowPayout: boolean;
+    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Update Market End
+     * @param marketId - The ID of the market
+     * @param marketEnd - The end time of the market
+     */
+    updateMarketEnd({ marketId, marketEnd }: {
+        marketId: number;
+        marketEnd: number;
+    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Update Market Question
+     * @param marketId - The ID of the market
+     * @param question - The question of the market
+     */
+    updateMarketQuestion({ marketId, question }: {
+        marketId: number;
+        question: string;
+    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Collect Market Fee
+     * @param args.markets - The markets to collect the fee from
+     * @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
+     */
+    collectMarketFee(markets: {
+        marketAddress: PublicKey;
+        customerId: number;
+        customerFeeRecipient: PublicKey;
+    }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Collect Market Order Fee
+     * @param marketAddress - The address of the market
+     */
+    collectMarketOrderFee(marketAddress: PublicKey[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Close Order Book
+     * @param marketIds - Market IDs
+     */
+    closeOrderBook(marketIds: number[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Update Pool Question
+     * @param poolId - Pool ID
+     * @param question - Question
+     */
+    updatePoolQuestion(poolId: number, question: string): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Open Order
      * @param args.marketId - The ID of the Market

package/dist/index.js

@@ -30,17 +30,17 @@ const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const bn_js_1 = __importDefault(require("bn.js"));
+const helpers_1 = require("./utils/helpers");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
 const types_1 = require("./types");
 const constants_1 = require("./utils/constants");
-const helpers_1 = require("./utils/helpers");
+const helpers_2 = require("./utils/helpers");
 const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const swap_1 = require("./utils/swap");
 const stake_1 = __importDefault(require("./stake"));
 const poseidon_1 = __importDefault(require("./poseidon"));
 const claim_1 = __importDefault(require("./claim"));
-const market_1 = __importDefault(require("./market"));
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils/helpers"), exports);
 __exportStar(require("./utils/merkle"), exports);
@@ -59,7 +59,6 @@ class TriadProtocolClient {
         this.stake = new stake_1.default(this.program, this.rpcOptions);
         this.poseidon = new poseidon_1.default(this.program, this.rpcOptions);
         this.claim = new claim_1.default(this.program, this.rpcOptions);
-        this.market = new market_1.default(this.program, this.rpcOptions);
     }
     /**
      * Get My User Trades from a user authority
@@ -75,7 +74,7 @@ class TriadProtocolClient {
                     }
                 }
             ]);
-            return response.map(({ account, publicKey }) => (0, helpers_1.formatUserTrade)(account, publicKey));
+            return response.map(({ account, publicKey }) => (0, helpers_2.formatUserTrade)(account, publicKey));
         });
     }
     /**
@@ -107,7 +106,7 @@ class TriadProtocolClient {
             const orderBook = yield this.program.account.orderBook.fetch((0, pda_1.getOrderBookPDA)(this.program.programId, marketId));
             const orders = [...orderBook.hypeOrders, ...orderBook.flopOrders];
             return orders
-                .map((order) => (0, helpers_1.formatBookOrder)(order))
+                .map((order) => (0, helpers_2.formatBookOrder)(order))
                 .filter((order) => order.authority === wallet.toBase58() &&
                 order.linkedBookOrderId === constants_1.BOOK_ORDER_NULL.toString());
         });
@@ -126,7 +125,7 @@ class TriadProtocolClient {
                     }
                 }
             ]);
-            return (0, helpers_1.formatCustomer)(customer.account, customer.publicKey);
+            return (0, helpers_2.formatCustomer)(customer.account, customer.publicKey);
         });
     }
     /**
@@ -137,7 +136,7 @@ class TriadProtocolClient {
         return __awaiter(this, void 0, void 0, function* () {
             const customerPDA = (0, pda_1.getCustomerPDA)(this.program.programId, customerId);
             const customer = yield this.program.account.customer.fetch(customerPDA);
-            return (0, helpers_1.formatCustomer)(customer, customerPDA);
+            return (0, helpers_2.formatCustomer)(customer, customerPDA);
         });
     }
     /**
@@ -164,6 +163,357 @@ class TriadProtocolClient {
             return this.program.account.userTrade.fetch(userTradePDA);
         });
     }
+    /**
+     * Get All Pools
+     */
+    getAllPools() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const pool = yield this.program.account.pool.all();
+            return pool.map(({ account, publicKey }) => (0, helpers_1.formatPool)(account, publicKey));
+        });
+    }
+    /**
+     * Get All Markets
+     */
+    getAllMarkets() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const marketV2 = yield this.program.account.marketV2.all();
+            return marketV2.map(({ account, publicKey }) => (0, helpers_1.formatMarket)(account, publicKey));
+        });
+    }
+    /**
+     * Get Pool By ID
+     * @param poolId - The ID of the pool
+     */
+    getPoolById(poolId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
+            const response = yield this.program.account.pool.fetch(poolPDA);
+            return (0, helpers_1.formatPool)(response, poolPDA);
+        });
+    }
+    /**
+     * Get Market By ID
+     * @param marketId - The ID of the market
+     */
+    getMarketById(marketId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
+            const response = yield this.program.account.marketV2.fetch(marketPDA);
+            return (0, helpers_1.formatMarket)(response, marketPDA);
+        });
+    }
+    /**
+     * Get Market By Address
+     * @param marketAddress - The address of the market
+     */
+    getMarketByAddress(marketAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const account = yield this.program.account.marketV2.fetch(marketAddress);
+            return (0, helpers_1.formatMarket)(account, marketAddress);
+        });
+    }
+    /**
+     * Get Current Market ID
+     */
+    nextMarketId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const markets = yield this.program.account.marketV2.all();
+            return markets.length + 10;
+        });
+    }
+    /**
+     * Get Next Customer ID
+     */
+    nextCustomerId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const customers = yield this.program.account.customer.all();
+            return customers.length + 1;
+        });
+    }
+    /**
+     * Get Next Pool ID
+     */
+    nextPoolId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const pools = yield this.program.account.pool.all();
+            return pools.length + 1;
+        });
+    }
+    /**
+     * Create Market
+     * @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, poolId }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            let poolPDA = null;
+            if (poolId) {
+                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
+            }
+            for (const market of markets) {
+                if (market.question.length > 80) {
+                    throw new Error('Question must be less than 80 characters');
+                }
+                ixs.push(yield this.program.methods
+                    .createMarket({
+                    marketId: new bn_js_1.default(market.marketId),
+                    question: (0, helpers_1.encodeString)(market.question, 80),
+                    marketStart: new bn_js_1.default(market.startTime),
+                    marketEnd: new bn_js_1.default(market.endTime),
+                    feeBps: market.feeBps,
+                    payoutFee: market.payoutFee
+                })
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                    pool: poolPDA,
+                    customer
+                })
+                    .instruction());
+                ixs.push(yield this.program.methods
+                    .createOrderBook(new bn_js_1.default(market.marketId))
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, market.marketId)
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Create Pool
+     * @param poolId - The ID of the pool
+     * @param question - The question of the pool
+     * @param markets - The markets of the pool
+     */
+    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');
+            }
+            const ixs = [];
+            const poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
+            ixs.push(yield this.program.methods
+                .createPool({
+                poolId: new bn_js_1.default(poolId),
+                question: (0, helpers_1.encodeString)(question, 80),
+                isFast
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                customer
+            })
+                .instruction());
+            for (const market of markets) {
+                if (market.question.length > 80) {
+                    throw new Error('Market question must be less than 80 characters');
+                }
+                ixs.push(yield this.program.methods
+                    .createMarket({
+                    marketId: new bn_js_1.default(market.marketId),
+                    question: (0, helpers_1.encodeString)(market.question, 80),
+                    marketStart: new bn_js_1.default(startTime),
+                    marketEnd: new bn_js_1.default(endTime),
+                    feeBps,
+                    payoutFee
+                })
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                    pool: poolPDA,
+                    customer
+                })
+                    .instruction());
+                ixs.push(yield this.program.methods
+                    .createOrderBook(new bn_js_1.default(market.marketId))
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, market.marketId)
+                })
+                    .instruction());
+            }
+            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
+     */
+    updateMarketWinningDirection({ marketId, poolId, winningDirection }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let poolPDA = null;
+            if (poolId) {
+                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
+            }
+            const ixs = [
+                yield this.program.methods
+                    .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, this.rpcOptions);
+        });
+    }
+    /**
+     * Update Market Payout
+     * @param marketId - The ID of the market
+     * @param poolId - The ID of the pool
+     * @param allowPayout - Whether to allow the market to payout
+     */
+    updateMarketPayout({ marketId, poolId, allowPayout }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let poolPDA = null;
+            if (poolId) {
+                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
+            }
+            const ixs = [
+                yield this.program.methods
+                    .updateMarketPayout(allowPayout)
+                    .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 End
+     * @param marketId - The ID of the market
+     * @param marketEnd - The end time of the market
+     */
+    updateMarketEnd({ marketId, marketEnd }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [
+                yield this.program.methods
+                    .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 = [
+                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)
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Collect Market Fee
+     * @param args.markets - The markets to collect the fee from
+     * @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
+     */
+    collectMarketFee(markets) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            for (const market of markets) {
+                ixs.push(yield this.program.methods
+                    .collectMarketFee()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: market.marketAddress,
+                    customer: (0, pda_1.getCustomerPDA)(this.program.programId, market.customerId),
+                    customerFeeRecipient: market.customerFeeRecipient
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Collect Market Order Fee
+     * @param marketAddress - The address of the market
+     */
+    collectMarketOrderFee(marketAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            for (const market of marketAddress) {
+                ixs.push(yield this.program.methods
+                    .collectMarketOrderFee()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: market
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Close Order Book
+     * @param marketIds - Market IDs
+     */
+    closeOrderBook(marketIds) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            for (const marketId of marketIds) {
+                ixs.push(yield this.program.methods
+                    .closeOrderBook()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
+                    orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId)
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Update Pool Question
+     * @param poolId - Pool ID
+     * @param question - Question
+     */
+    updatePoolQuestion(poolId, question) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [
+                yield this.program.methods
+                    .updatePoolQuestion((0, helpers_1.encodeString)(question, 80))
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    pool: (0, pda_1.getPoolPDA)(this.program.programId, poolId)
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
     /**
      * Open Order
      * @param args.marketId - The ID of the Market
@@ -259,7 +609,7 @@ class TriadProtocolClient {
                     userTrade: this.getUserPDA(this.program.provider.publicKey, order.userNonce),
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     mint: order.mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(order.mint)
+                    tokenProgram: (0, helpers_2.getTokenProgram)(order.mint)
                 })
                     .instruction());
             }
@@ -334,12 +684,12 @@ class TriadProtocolClient {
                         break;
                     }
                     userTrade.orders.forEach((order) => {
-                        if (order.orderStatus === types_1.OrderStatus.INIT ||
-                            order.orderStatus === types_1.OrderStatus.CLOSED) {
+                        if (order.orderStatus !== types_1.OrderStatus.OPEN) {
                             nonce = userTrade.isSubUser ? Number(userTrade.nonce) : 0;
                         }
                     });
                 }
+                console.log('nonce', nonce);
                 if (nonce === null) {
                     throw new Error('No open orders found');
                 }
@@ -433,11 +783,11 @@ class TriadProtocolClient {
                     return;
                 }
             }
+            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) {
-                const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(order.orderDirection)[0]);
-                if (userTradeIxs.length > 0) {
-                    ixs.push(...userTradeIxs);
-                }
                 ixs.push(yield this.program.methods
                     .placeBidOrder({
                     amount: new bn_js_1.default(order.amount * Math.pow(10, constants_1.BASE_DECIMALS)),
@@ -793,11 +1143,11 @@ class TriadProtocolClient {
                 for (const order of orders) {
                     if (order.price.eq(new bn_js_1.default(0)))
                         continue;
-                    if ((0, helpers_1.getOrderSideFromNumber)(order.orderSide) === types_1.OrderSide.BID) {
-                        data[side].bid.push((0, helpers_1.formatBookOrder)(order));
+                    if ((0, helpers_2.getOrderSideFromNumber)(order.orderSide) === types_1.OrderSide.BID) {
+                        data[side].bid.push((0, helpers_2.formatBookOrder)(order));
                     }
-                    if ((0, helpers_1.getOrderSideFromNumber)(order.orderSide) === types_1.OrderSide.ASK) {
-                        data[side].ask.push((0, helpers_1.formatBookOrder)(order));
+                    if ((0, helpers_2.getOrderSideFromNumber)(order.orderSide) === types_1.OrderSide.ASK) {
+                        data[side].ask.push((0, helpers_2.formatBookOrder)(order));
                     }
                 }
             };

package/dist/types/idl_triad_protocol.json

@@ -2679,29 +2679,6 @@
                 }
             ]
         },
-        {
-            "name": "update_claim_vault_merkle_root",
-            "discriminator": [83, 209, 102, 81, 118, 44, 157, 23],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "claim_vault",
-                    "writable": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "merkle_root",
-                    "type": {
-                        "array": ["u8", 32]
-                    }
-                }
-            ]
-        },
         {
             "name": "update_customer_fee",
             "discriminator": [218, 240, 1, 38, 34, 166, 40, 25],
@@ -4100,6 +4077,22 @@
                     {
                         "name": "pool_id",
                         "type": "u64"
+                    },
+                    {
+                        "name": "market_order_fee_available",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "market_order_fee_claimed",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "fee_recipient",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "resolved_ts",
+                        "type": "i64"
                     }
                 ]
             }
@@ -4968,6 +4961,12 @@
                     {
                         "name": "new_users",
                         "type": "u64"
+                    },
+                    {
+                        "name": "merkle_root",
+                        "type": {
+                            "array": ["u8", 32]
+                        }
                     }
                 ]
             }

package/dist/types/index.d.ts

@@ -337,10 +337,6 @@ export type UpdateClaimVaultIsActiveArgs = {
     isActive: boolean;
     claimVaultName: string;
 };
-export type UpdateClaimVaultMerkleRootArgs = {
-    merkleRoot: number[];
-    claimVaultName: string;
-};
 export type UpdateMarketWinningDirectionArgs = {
     marketId: number;
     poolId?: number;
@@ -356,4 +352,5 @@ export type UpdateClaimVaultAmountArgs = {
     newUsers: number;
     claimVaultName: string;
     mint: PublicKey;
+    merkleRoot: number[];
 };

package/dist/types/triad_protocol.d.ts

@@ -3770,29 +3770,6 @@ export type TriadProtocol = {
                 }
             ];
         },
-        {
-            name: 'updateClaimVaultMerkleRoot';
-            discriminator: [83, 209, 102, 81, 118, 44, 157, 23];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'claimVault';
-                    writable: true;
-                }
-            ];
-            args: [
-                {
-                    name: 'merkleRoot';
-                    type: {
-                        array: ['u8', 32];
-                    };
-                }
-            ];
-        },
         {
             name: 'updateCustomerFee';
             discriminator: [218, 240, 1, 38, 34, 166, 40, 25];
@@ -5203,6 +5180,22 @@ export type TriadProtocol = {
                     {
                         name: 'poolId';
                         type: 'u64';
+                    },
+                    {
+                        name: 'marketOrderFeeAvailable';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'marketOrderFeeClaimed';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'feeRecipient';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'resolvedTs';
+                        type: 'i64';
                     }
                 ];
             };
@@ -6071,6 +6064,12 @@ export type TriadProtocol = {
                     {
                         name: 'newUsers';
                         type: 'u64';
+                    },
+                    {
+                        name: 'merkleRoot';
+                        type: {
+                            array: ['u8', 32];
+                        };
                     }
                 ];
             };

package/package.json

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

package/dist/market.d.ts

@@ -1,129 +0,0 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
-import { Program } from '@coral-xyz/anchor';
-import { PublicKey } from '@solana/web3.js';
-import { TriadProtocol } from './types/triad_protocol';
-import { RpcOptions, CreateMarketArgs, CreatePoolArgs, UpdateMarketWinningDirectionArgs } from './types';
-export default class Market {
-    private program;
-    private rpcOptions;
-    constructor(program: Program<TriadProtocol>, rpcOptions: RpcOptions);
-    /**
-     * Get All Pools
-     */
-    getAllPools(): Promise<import("./types").Pool[]>;
-    /**
-     * Get All Markets
-     */
-    getAllMarkets(): Promise<import("./types").Market[]>;
-    /**
-     * Get Pool By ID
-     * @param poolId - The ID of the pool
-     */
-    getPoolById(poolId: number): Promise<import("./types").Pool>;
-    /**
-     * Get Market By ID
-     * @param marketId - The ID of the market
-     */
-    getMarketById(marketId: number): Promise<import("./types").Market>;
-    /**
-     * Get Market By Address
-     * @param marketAddress - The address of the market
-     */
-    getMarketByAddress(marketAddress: PublicKey): Promise<import("./types").Market>;
-    /**
-     * Get Current Market ID
-     */
-    nextMarketId(): Promise<number>;
-    /**
-     * Get Next Customer ID
-     */
-    nextCustomerId(): Promise<number>;
-    /**
-     * Get Next Pool ID
-     */
-    nextPoolId(): Promise<number>;
-    /**
-     * Create Market
-     * @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, poolId }: CreateMarketArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Create Pool
-     * @param poolId - The ID of the pool
-     * @param question - The question of the pool
-     * @param markets - The markets of the pool
-     */
-    createPool({ poolId, question, markets, customer, startTime, endTime, feeBps, payoutFee, isFast }: CreatePoolArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * 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
-     */
-    updateMarketWinningDirection({ marketId, poolId, winningDirection }: UpdateMarketWinningDirectionArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Market Payout
-     * @param marketId - The ID of the market
-     * @param poolId - The ID of the pool
-     * @param allowPayout - Whether to allow the market to payout
-     */
-    updateMarketPayout({ marketId, poolId, allowPayout }: {
-        marketId: number;
-        poolId?: number;
-        allowPayout: boolean;
-    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Market End
-     * @param marketId - The ID of the market
-     * @param marketEnd - The end time of the market
-     */
-    updateMarketEnd({ marketId, marketEnd }: {
-        marketId: number;
-        marketEnd: number;
-    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Market Question
-     * @param marketId - The ID of the market
-     * @param question - The question of the market
-     */
-    updateMarketQuestion({ marketId, question }: {
-        marketId: number;
-        question: string;
-    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Collect Market Fee
-     * @param args.markets - The markets to collect the fee from
-     * @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
-     */
-    collectMarketFee(markets: {
-        marketAddress: PublicKey;
-        customerId: number;
-        customerFeeRecipient: PublicKey;
-    }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Collect Market Order Fee
-     * @param marketAddress - The address of the market
-     */
-    collectMarketOrderFee(marketAddress: PublicKey[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Close Order Book
-     * @param marketIds - Market IDs
-     */
-    closeOrderBook(marketIds: number[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Pool Question
-     * @param poolId - Pool ID
-     * @param question - Question
-     */
-    updatePoolQuestion(poolId: number, question: string): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-}

package/dist/market.js

@@ -1,377 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const anchor_1 = require("@coral-xyz/anchor");
-const spl_token_1 = require("@solana/spl-token");
-const helpers_1 = require("./utils/helpers");
-const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const pda_1 = require("./utils/pda");
-class Market {
-    constructor(program, rpcOptions) {
-        this.program = program;
-        this.rpcOptions = rpcOptions;
-    }
-    /**
-     * Get All Pools
-     */
-    getAllPools() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const pool = yield this.program.account.pool.all();
-            return pool.map(({ account, publicKey }) => (0, helpers_1.formatPool)(account, publicKey));
-        });
-    }
-    /**
-     * Get All Markets
-     */
-    getAllMarkets() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const marketV2 = yield this.program.account.marketV2.all();
-            return marketV2.map(({ account, publicKey }) => (0, helpers_1.formatMarket)(account, publicKey));
-        });
-    }
-    /**
-     * Get Pool By ID
-     * @param poolId - The ID of the pool
-     */
-    getPoolById(poolId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
-            const response = yield this.program.account.pool.fetch(poolPDA);
-            return (0, helpers_1.formatPool)(response, poolPDA);
-        });
-    }
-    /**
-     * Get Market By ID
-     * @param marketId - The ID of the market
-     */
-    getMarketById(marketId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
-            const response = yield this.program.account.marketV2.fetch(marketPDA);
-            return (0, helpers_1.formatMarket)(response, marketPDA);
-        });
-    }
-    /**
-     * Get Market By Address
-     * @param marketAddress - The address of the market
-     */
-    getMarketByAddress(marketAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const account = yield this.program.account.marketV2.fetch(marketAddress);
-            return (0, helpers_1.formatMarket)(account, marketAddress);
-        });
-    }
-    /**
-     * Get Current Market ID
-     */
-    nextMarketId() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const markets = yield this.program.account.marketV2.all();
-            return markets.length + 10;
-        });
-    }
-    /**
-     * Get Next Customer ID
-     */
-    nextCustomerId() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const customers = yield this.program.account.customer.all();
-            return customers.length + 1;
-        });
-    }
-    /**
-     * Get Next Pool ID
-     */
-    nextPoolId() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const pools = yield this.program.account.pool.all();
-            return pools.length + 1;
-        });
-    }
-    /**
-     * Create Market
-     * @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, poolId }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            let poolPDA = null;
-            if (poolId) {
-                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
-            }
-            for (const market of markets) {
-                if (market.question.length > 80) {
-                    throw new Error('Question must be less than 80 characters');
-                }
-                ixs.push(yield this.program.methods
-                    .createMarket({
-                    marketId: new anchor_1.BN(market.marketId),
-                    question: (0, helpers_1.encodeString)(market.question, 80),
-                    marketStart: new anchor_1.BN(market.startTime),
-                    marketEnd: new anchor_1.BN(market.endTime),
-                    feeBps: market.feeBps,
-                    payoutFee: market.payoutFee
-                })
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                    pool: poolPDA,
-                    customer
-                })
-                    .instruction());
-                ixs.push(yield this.program.methods
-                    .createOrderBook(new anchor_1.BN(market.marketId))
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    market: (0, pda_1.getMarketPDA)(this.program.programId, market.marketId)
-                })
-                    .instruction());
-            }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Create Pool
-     * @param poolId - The ID of the pool
-     * @param question - The question of the pool
-     * @param markets - The markets of the pool
-     */
-    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');
-            }
-            const ixs = [];
-            const poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
-            ixs.push(yield this.program.methods
-                .createPool({
-                poolId: new anchor_1.BN(poolId),
-                question: (0, helpers_1.encodeString)(question, 80),
-                isFast
-            })
-                .accounts({
-                signer: this.program.provider.publicKey,
-                customer
-            })
-                .instruction());
-            for (const market of markets) {
-                if (market.question.length > 80) {
-                    throw new Error('Market question must be less than 80 characters');
-                }
-                ixs.push(yield this.program.methods
-                    .createMarket({
-                    marketId: new anchor_1.BN(market.marketId),
-                    question: (0, helpers_1.encodeString)(market.question, 80),
-                    marketStart: new anchor_1.BN(startTime),
-                    marketEnd: new anchor_1.BN(endTime),
-                    feeBps,
-                    payoutFee
-                })
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                    pool: poolPDA,
-                    customer
-                })
-                    .instruction());
-                ixs.push(yield this.program.methods
-                    .createOrderBook(new anchor_1.BN(market.marketId))
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    market: (0, pda_1.getMarketPDA)(this.program.programId, market.marketId)
-                })
-                    .instruction());
-            }
-            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
-     */
-    updateMarketWinningDirection({ marketId, poolId, winningDirection }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let poolPDA = null;
-            if (poolId) {
-                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
-            }
-            const ixs = [
-                yield this.program.methods
-                    .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, this.rpcOptions);
-        });
-    }
-    /**
-     * Update Market Payout
-     * @param marketId - The ID of the market
-     * @param poolId - The ID of the pool
-     * @param allowPayout - Whether to allow the market to payout
-     */
-    updateMarketPayout({ marketId, poolId, allowPayout }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let poolPDA = null;
-            if (poolId) {
-                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
-            }
-            const ixs = [
-                yield this.program.methods
-                    .updateMarketPayout(allowPayout)
-                    .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 End
-     * @param marketId - The ID of the market
-     * @param marketEnd - The end time of the market
-     */
-    updateMarketEnd({ marketId, marketEnd }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .updateMarketEnd(new anchor_1.BN(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 = [
-                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)
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Collect Market Fee
-     * @param args.markets - The markets to collect the fee from
-     * @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
-     */
-    collectMarketFee(markets) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            for (const market of markets) {
-                ixs.push(yield this.program.methods
-                    .collectMarketFee()
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    market: market.marketAddress,
-                    customer: (0, pda_1.getCustomerPDA)(this.program.programId, market.customerId),
-                    customerFeeRecipient: market.customerFeeRecipient
-                })
-                    .instruction());
-            }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Collect Market Order Fee
-     * @param marketAddress - The address of the market
-     */
-    collectMarketOrderFee(marketAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            for (const market of marketAddress) {
-                ixs.push(yield this.program.methods
-                    .collectMarketOrderFee()
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    market: market
-                })
-                    .instruction());
-            }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Close Order Book
-     * @param marketIds - Market IDs
-     */
-    closeOrderBook(marketIds) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            for (const marketId of marketIds) {
-                ixs.push(yield this.program.methods
-                    .closeOrderBook()
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                    orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId)
-                })
-                    .instruction());
-            }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Update Pool Question
-     * @param poolId - Pool ID
-     * @param question - Question
-     */
-    updatePoolQuestion(poolId, question) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .updatePoolQuestion((0, helpers_1.encodeString)(question, 80))
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    pool: (0, pda_1.getPoolPDA)(this.program.programId, poolId)
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-}
-exports.default = Market;