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

package/dist/index.js

@@ -19,7 +19,6 @@ const poseidon_1 = require("./utils/pda/poseidon");
 const stake_1 = __importDefault(require("./stake"));
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const constants_1 = require("./utils/constants");
-const sendMethod_1 = __importDefault(require("./utils/sendMethod"));
 const pda_1 = require("./utils/pda");
 class TriadProtocolClient {
     constructor(connection, wallet) {
@@ -68,13 +67,20 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     withdrawPoseidon({ poseidonAsset, nft }, options) {
-        return (0, sendMethod_1.default)(this.program.methods.withdrawPoseidon().accounts({
-            signer: this.provider.wallet.publicKey,
-            nft: (0, poseidon_1.getPoseidonPDA)(this.program.programId, nft),
-            poseidonAsset,
-            poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
-            corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .withdrawPoseidon()
+                .accounts({
+                signer: this.provider.wallet.publicKey,
+                nft: (0, poseidon_1.getPoseidonPDA)(this.program.programId, nft),
+                poseidonAsset,
+                poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
+                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Collect Royalty
@@ -83,10 +89,17 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     collectRoyalty(collection, options) {
-        return (0, sendMethod_1.default)(this.program.methods.collectRoyalty().accounts({
-            signer: this.provider.wallet.publicKey,
-            collection: (0, poseidon_1.getCollectionPDA)(this.program.programId, collection)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .collectRoyalty()
+                .accounts({
+                signer: this.provider.wallet.publicKey,
+                collection: (0, poseidon_1.getCollectionPDA)(this.program.programId, collection)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Add Trader Poseidon
@@ -96,12 +109,19 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     addTraderPoseidon({ user, poseidonAsset }, options) {
-        return (0, sendMethod_1.default)(this.program.methods.addTraderPoseidon().accounts({
-            poseidonAsset,
-            userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
-            corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
-            poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .addTraderPoseidon()
+                .accounts({
+                poseidonAsset,
+                userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
+                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
+                poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Remove Trader Poseidon
@@ -110,12 +130,19 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     removeTraderPoseidon({ user, poseidonAsset }, options) {
-        return (0, sendMethod_1.default)(this.program.methods.removeTraderPoseidon().accounts({
-            userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
-            poseidonAsset,
-            corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
-            poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .removeTraderPoseidon()
+                .accounts({
+                userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
+                poseidonAsset,
+                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
+                poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
 }
 exports.default = TriadProtocolClient;

package/dist/stake.js

@@ -17,7 +17,6 @@ const helpers_1 = require("./utils/helpers");
 const stake_1 = require("./utils/pda/stake");
 const constants_1 = require("./utils/constants");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const sendMethod_1 = __importDefault(require("./utils/sendMethod"));
 class Stake {
     constructor(program) {
         this.program = program;
@@ -80,15 +79,20 @@ class Stake {
      *
      */
     stakeToken({ name, wallet, amount }, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .stakeToken({
-            name,
-            amount: new anchor_1.BN(amount * Math.pow(10, 6))
-        })
-            .accounts({
-            signer: wallet,
-            mint: constants_1.TRD_MINT
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .stakeToken({
+                name,
+                amount: new anchor_1.BN(amount * Math.pow(10, 6))
+            })
+                .accounts({
+                signer: wallet,
+                mint: constants_1.TRD_MINT
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      *  Update Stake Vault
@@ -99,15 +103,20 @@ class Stake {
      *
      */
     updateStakeVault({ amount, isLocked }, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .updateStakeVault({
-            amount,
-            isLocked
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            mint: constants_1.TRD_MINT
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updateStakeVault({
+                amount,
+                isLocked
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                mint: constants_1.TRD_MINT
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      *  Request Withdraw
@@ -142,12 +151,19 @@ class Stake {
      *
      */
     withdrawStake({ wallet, name, mint }, options) {
-        return (0, sendMethod_1.default)(this.program.methods.withdrawStake().accounts({
-            signer: wallet,
-            stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, name),
-            admin: constants_1.TRIAD_ADMIN,
-            mint: mint
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .withdrawStake()
+                .accounts({
+                signer: wallet,
+                stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, name),
+                admin: constants_1.TRIAD_ADMIN,
+                mint: mint
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      *  Claim Stake Rewards

package/dist/trade.d.ts

@@ -1,7 +1,7 @@
 import { Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
-import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, Order, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs } from './types/trade';
+import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, Order, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreatePoolArgs } from './types/trade';
 import { RpcOptions } from './types';
 import BN from 'bn.js';
 export default class Trade {
@@ -48,7 +48,7 @@ export default class Trade {
         authority: PublicKey;
         totalDeposits: BN;
         totalWithdraws: BN;
-        padding2: number[];
+        version: BN;
         orders: {
             ts: BN;
             orderId: BN;
@@ -157,6 +157,15 @@ export default class Trade {
      *
      */
     createMarket({ marketId, startTime, endTime, question, feeBps, customer, payoutFee, mint }: CreateMarketArgs, options?: RpcOptions): Promise<string>;
+    /**
+     * Create Pool
+     * @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 }: CreatePoolArgs, options?: RpcOptions): Promise<string>;
     /**
      * Open Order
      * @param args.marketId - The ID of the Market

package/dist/trade.js

@@ -19,7 +19,6 @@ const constants_1 = require("./utils/constants");
 const helpers_1 = require("./utils/helpers");
 const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const sendMethod_1 = __importDefault(require("./utils/sendMethod"));
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
 const pda_2 = require("./utils/pda");
 class Trade {
@@ -118,24 +117,79 @@ class Trade {
      *
      */
     createMarket({ marketId, startTime, endTime, question, feeBps, customer, payoutFee, mint }, options) {
-        if (question.length > 80) {
-            throw new Error('Question must be less than 80 characters');
-        }
-        return (0, sendMethod_1.default)(this.program.methods
-            .createMarket({
-            marketId: new bn_js_1.default(marketId),
-            question: (0, helpers_1.encodeString)(question, 80),
-            marketStart: new bn_js_1.default(startTime),
-            marketEnd: new bn_js_1.default(endTime),
-            feeBps,
-            payoutFee
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            mint,
-            tokenProgram: (0, helpers_1.getTokenProgram)(mint),
-            customer
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (question.length > 80) {
+                throw new Error('Question must be less than 80 characters');
+            }
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .createMarket({
+                marketId: new bn_js_1.default(marketId),
+                question: (0, helpers_1.encodeString)(question, 80),
+                marketStart: new bn_js_1.default(startTime),
+                marketEnd: new bn_js_1.default(endTime),
+                feeBps,
+                payoutFee
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                mint,
+                tokenProgram: (0, helpers_1.getTokenProgram)(mint),
+                customer,
+                pool: null
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
+    }
+    /**
+     * Create Pool
+     * @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 }, options) {
+        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)
+            })
+                .accounts({
+                signer: this.program.provider.publicKey
+            })
+                .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,
+                    mint,
+                    tokenProgram: (0, helpers_1.getTokenProgram)(mint),
+                    pool: poolPDA,
+                    customer
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Open Order
@@ -181,17 +235,22 @@ class Trade {
      */
     closeOrder({ marketId, orderId, userNonce }, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonce !== 0) {
                 const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonce);
                 userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            return (0, sendMethod_1.default)(this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
+            ixs.push(yield this.program.methods
+                .closeOrder(new bn_js_1.default(orderId))
+                .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 mint: constants_1.TRD_MINT,
                 userTrade: userTradePDA
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -203,16 +262,21 @@ class Trade {
      *
      */
     resolveMarket({ marketId, winningDirection }, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .updateMarket({
-            winningDirection,
-            allowPayout: null,
-            marketEnd: null
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updateMarket({
+                winningDirection,
+                allowPayout: null,
+                marketEnd: null
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Collect Remaining Liquidity
@@ -223,13 +287,18 @@ class Trade {
      */
     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);
-            return (0, sendMethod_1.default)(this.program.methods.collectRemainingLiquidity().accounts({
+            ixs.push(yield this.program.methods
+                .collectRemainingLiquidity()
+                .accounts({
                 signer: this.program.provider.publicKey,
                 market: marketPDA,
                 mint: market.mint
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -275,16 +344,21 @@ class Trade {
      *
      */
     allowMarketToPayout(marketId, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .updateMarket({
-            winningDirection: null,
-            allowPayout: true,
-            marketEnd: null
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updateMarket({
+                winningDirection: null,
+                allowPayout: true,
+                marketEnd: null
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Create Sub User Trade
@@ -295,11 +369,16 @@ class Trade {
      */
     createSubUserTrade(user, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             const userTrade = yield this.getUserTrade(user);
             const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, user, userTrade.nonce + 1);
-            return (0, sendMethod_1.default)(this.program.methods.createSubUserTrade(subUserTradePDA).accounts({
+            ixs.push(yield this.program.methods
+                .createSubUserTrade(subUserTradePDA)
+                .accounts({
                 signer: this.program.provider.publicKey
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -311,16 +390,21 @@ class Trade {
      *
      */
     updateMarket(marketId, marketEnd, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .updateMarket({
-            marketEnd: new bn_js_1.default(marketEnd),
-            winningDirection: null,
-            allowPayout: null
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updateMarket({
+                marketEnd: new bn_js_1.default(marketEnd),
+                winningDirection: null,
+                allowPayout: null
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Create Customer
@@ -332,11 +416,16 @@ class Trade {
      *
      */
     createCustomer({ id, name, authority, feeRecipient }, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .createCustomer({ id, name, authority, feeRecipient })
-            .accounts({
-            signer: this.program.provider.publicKey
-        }), options);
+        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);
+        });
     }
     /**
      * Get User Trade Nonce With Slots
@@ -499,18 +588,23 @@ class Trade {
      */
     cancelBidOrder({ marketId, orderId, userNonce, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonce !== 0) {
                 const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonce);
                 userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            return (0, sendMethod_1.default)(this.program.methods.cancelBidOrder(new bn_js_1.default(orderId)).accounts({
+            ixs.push(yield this.program.methods
+                .cancelBidOrder(new bn_js_1.default(orderId))
+                .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                userTrade: userTradePDA,
+                bidUserTrade: userTradePDA,
                 mint,
                 tokenProgram: (0, helpers_1.getTokenProgram)(mint)
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -524,6 +618,7 @@ class Trade {
      */
     cancelAskOrder({ marketId, orderId, userNonce, userNonceBidOrder }, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             let askUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonce !== 0) {
                 const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonce);
@@ -534,12 +629,16 @@ class Trade {
                 const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonceBidOrder);
                 bidUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            return (0, sendMethod_1.default)(this.program.methods.cancelAskOrder(new bn_js_1.default(orderId)).accounts({
+            ixs.push(yield this.program.methods
+                .cancelAskOrder(new bn_js_1.default(orderId))
+                .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 askUserTrade: askUserTradePDA,
                 bidUserTrade: bidUserTradePDA
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**

package/dist/types/idl_triad_protocol.json

@@ -54,11 +54,11 @@
                     "signer": true
                 },
                 {
-                    "name": "ask_user_trade",
+                    "name": "bid_user_trade",
                     "writable": true
                 },
                 {
-                    "name": "bid_user_trade",
+                    "name": "ask_user_trade",
                     "writable": true
                 },
                 {
@@ -87,11 +87,11 @@
                     "signer": true
                 },
                 {
-                    "name": "user_trade",
+                    "name": "market",
                     "writable": true
                 },
                 {
-                    "name": "market",
+                    "name": "bid_user_trade",
                     "writable": true
                 },
                 {
@@ -127,7 +127,7 @@
                     }
                 },
                 {
-                    "name": "market_vault",
+                    "name": "market_ata",
                     "writable": true,
                     "pda": {
                         "seeds": [
@@ -560,6 +560,11 @@
                     "writable": true,
                     "optional": true
                 },
+                {
+                    "name": "pool",
+                    "writable": true,
+                    "optional": true
+                },
                 {
                     "name": "market",
                     "writable": true,
@@ -631,6 +636,47 @@
                 }
             ]
         },
+        {
+            "name": "create_pool",
+            "discriminator": [233, 146, 209, 142, 207, 104, 64, 188],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "pool",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [112, 111, 111, 108]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "args.pool_id"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "CreatePoolArgs"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "create_sub_user_trade",
             "discriminator": [77, 201, 111, 73, 47, 229, 244, 161],
@@ -1120,11 +1166,11 @@
                     "writable": true
                 },
                 {
-                    "name": "ask_user_trade",
+                    "name": "bid_user_trade",
                     "writable": true
                 },
                 {
-                    "name": "bid_user_trade",
+                    "name": "ask_user_trade",
                     "writable": true
                 },
                 {
@@ -1796,6 +1842,10 @@
             "name": "Nft",
             "discriminator": [88, 10, 146, 176, 101, 11, 40, 217]
         },
+        {
+            "name": "Pool",
+            "discriminator": [241, 154, 109, 4, 17, 177, 109, 188]
+        },
         {
             "name": "StakeV2",
             "discriminator": [207, 98, 130, 13, 118, 181, 238, 47]
@@ -1818,6 +1868,10 @@
             "name": "OrderEvent",
             "discriminator": [209, 51, 146, 206, 88, 127, 112, 69]
         },
+        {
+            "name": "PoolEvent",
+            "discriminator": [76, 227, 205, 183, 1, 218, 164, 244]
+        },
         {
             "name": "PriceEvent",
             "discriminator": [31, 40, 141, 125, 132, 253, 225, 229]
@@ -1967,6 +2021,11 @@
             "code": 6027,
             "name": "LinkedBidOrderNotFound",
             "msg": "Linked bid order not found"
+        },
+        {
+            "code": 6028,
+            "name": "MarketAlreadyAggregated",
+            "msg": "Market already aggregated"
         }
     ],
     "types": [
@@ -2140,6 +2199,26 @@
                 ]
             }
         },
+        {
+            "name": "CreatePoolArgs",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "pool_id",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "question",
+                        "type": {
+                            "option": {
+                                "array": ["u8", 80]
+                            }
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "Customer",
             "type": {
@@ -2293,10 +2372,6 @@
                         "name": "update_ts",
                         "type": "i64"
                     },
-                    {
-                        "name": "opened_orders",
-                        "type": "u64"
-                    },
                     {
                         "name": "next_order_id",
                         "type": "u64"
@@ -2358,6 +2433,10 @@
                     {
                         "name": "payout_fee",
                         "type": "u16"
+                    },
+                    {
+                        "name": "pool_id",
+                        "type": "u64"
                     }
                 ]
             }
@@ -2416,8 +2495,10 @@
                         "type": "i64"
                     },
                     {
-                        "name": "opened_orders",
-                        "type": "u64"
+                        "name": "padding_1",
+                        "type": {
+                            "array": ["u8", 8]
+                        }
                     },
                     {
                         "name": "next_order_id",
@@ -2485,10 +2566,14 @@
                         "name": "version",
                         "type": "u64"
                     },
+                    {
+                        "name": "pool_id",
+                        "type": "u64"
+                    },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 80]
+                            "array": ["u8", 72]
                         }
                     }
                 ]
@@ -2815,6 +2900,66 @@
                 ]
             }
         },
+        {
+            "name": "Pool",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "bump",
+                        "type": "u8"
+                    },
+                    {
+                        "name": "id",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "question",
+                        "type": {
+                            "array": ["u8", 80]
+                        }
+                    },
+                    {
+                        "name": "authority",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": ["u8", 64]
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "PoolEvent",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "pool_id",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "question",
+                        "type": {
+                            "array": ["u8", 80]
+                        }
+                    },
+                    {
+                        "name": "authority",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "markets",
+                        "type": {
+                            "array": ["u64", 60]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "PriceEvent",
             "type": {
@@ -3108,10 +3253,8 @@
                         "type": "u64"
                     },
                     {
-                        "name": "padding_2",
-                        "type": {
-                            "array": ["u8", 8]
-                        }
+                        "name": "version",
+                        "type": "u64"
                     },
                     {
                         "name": "orders",

package/dist/types/trade.d.ts

@@ -13,7 +13,6 @@ export type Market = {
     volume: string;
     mint: string;
     updateTs: string;
-    openedOrders: string;
     nextOrderId: string;
     feeBps: number;
     isAllowedToPayout: boolean;
@@ -139,6 +138,20 @@ export type CreateMarketArgs = {
     payoutFee: number;
     mint: PublicKey;
 };
+export type CreatePoolArgs = {
+    poolId: number;
+    question: string;
+    startTime: number;
+    endTime: number;
+    feeBps: number;
+    payoutFee: number;
+    mint: PublicKey;
+    customer: PublicKey | null;
+    markets: {
+        marketId: number;
+        question: string;
+    }[];
+};
 export type CancelBidOrderArgs = {
     marketId: number;
     orderId: number;

package/dist/types/triad_protocol.d.ts

@@ -60,11 +60,11 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'askUserTrade';
+                    name: 'bidUserTrade';
                     writable: true;
                 },
                 {
-                    name: 'bidUserTrade';
+                    name: 'askUserTrade';
                     writable: true;
                 },
                 {
@@ -93,11 +93,11 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'userTrade';
+                    name: 'market';
                     writable: true;
                 },
                 {
-                    name: 'market';
+                    name: 'bidUserTrade';
                     writable: true;
                 },
                 {
@@ -162,7 +162,7 @@ export type TriadProtocol = {
                     };
                 },
                 {
-                    name: 'marketVault';
+                    name: 'marketAta';
                     writable: true;
                     pda: {
                         seeds: [
@@ -810,6 +810,11 @@ export type TriadProtocol = {
                     writable: true;
                     optional: true;
                 },
+                {
+                    name: 'pool';
+                    writable: true;
+                    optional: true;
+                },
                 {
                     name: 'market';
                     writable: true;
@@ -910,6 +915,47 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'createPool';
+            discriminator: [233, 146, 209, 142, 207, 104, 64, 188];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'pool';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [112, 111, 111, 108];
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.pool_id';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'createPoolArgs';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'createSubUserTrade';
             discriminator: [77, 201, 111, 73, 47, 229, 244, 161];
@@ -1573,11 +1619,11 @@ export type TriadProtocol = {
                     writable: true;
                 },
                 {
-                    name: 'askUserTrade';
+                    name: 'bidUserTrade';
                     writable: true;
                 },
                 {
-                    name: 'bidUserTrade';
+                    name: 'askUserTrade';
                     writable: true;
                 },
                 {
@@ -2517,6 +2563,10 @@ export type TriadProtocol = {
             name: 'nft';
             discriminator: [88, 10, 146, 176, 101, 11, 40, 217];
         },
+        {
+            name: 'pool';
+            discriminator: [241, 154, 109, 4, 17, 177, 109, 188];
+        },
         {
             name: 'stakeV2';
             discriminator: [207, 98, 130, 13, 118, 181, 238, 47];
@@ -2539,6 +2589,10 @@ export type TriadProtocol = {
             name: 'orderEvent';
             discriminator: [209, 51, 146, 206, 88, 127, 112, 69];
         },
+        {
+            name: 'poolEvent';
+            discriminator: [76, 227, 205, 183, 1, 218, 164, 244];
+        },
         {
             name: 'priceEvent';
             discriminator: [31, 40, 141, 125, 132, 253, 225, 229];
@@ -2688,6 +2742,11 @@ export type TriadProtocol = {
             code: 6027;
             name: 'linkedBidOrderNotFound';
             msg: 'Linked bid order not found';
+        },
+        {
+            code: 6028;
+            name: 'marketAlreadyAggregated';
+            msg: 'Market already aggregated';
         }
     ];
     types: [
@@ -2861,6 +2920,26 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'createPoolArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'poolId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'question';
+                        type: {
+                            option: {
+                                array: ['u8', 80];
+                            };
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'customer';
             type: {
@@ -3014,10 +3093,6 @@ export type TriadProtocol = {
                         name: 'updateTs';
                         type: 'i64';
                     },
-                    {
-                        name: 'openedOrders';
-                        type: 'u64';
-                    },
                     {
                         name: 'nextOrderId';
                         type: 'u64';
@@ -3079,6 +3154,10 @@ export type TriadProtocol = {
                     {
                         name: 'payoutFee';
                         type: 'u16';
+                    },
+                    {
+                        name: 'poolId';
+                        type: 'u64';
                     }
                 ];
             };
@@ -3137,8 +3216,10 @@ export type TriadProtocol = {
                         type: 'i64';
                     },
                     {
-                        name: 'openedOrders';
-                        type: 'u64';
+                        name: 'padding1';
+                        type: {
+                            array: ['u8', 8];
+                        };
                     },
                     {
                         name: 'nextOrderId';
@@ -3206,10 +3287,14 @@ export type TriadProtocol = {
                         name: 'version';
                         type: 'u64';
                     },
+                    {
+                        name: 'poolId';
+                        type: 'u64';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 80];
+                            array: ['u8', 72];
                         };
                     }
                 ];
@@ -3536,6 +3621,66 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'pool';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'bump';
+                        type: 'u8';
+                    },
+                    {
+                        name: 'id';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'question';
+                        type: {
+                            array: ['u8', 80];
+                        };
+                    },
+                    {
+                        name: 'authority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'padding';
+                        type: {
+                            array: ['u8', 64];
+                        };
+                    }
+                ];
+            };
+        },
+        {
+            name: 'poolEvent';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'poolId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'question';
+                        type: {
+                            array: ['u8', 80];
+                        };
+                    },
+                    {
+                        name: 'authority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'markets';
+                        type: {
+                            array: ['u64', 60];
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'priceEvent';
             type: {
@@ -3829,10 +3974,8 @@ export type TriadProtocol = {
                         type: 'u64';
                     },
                     {
-                        name: 'padding2';
-                        type: {
-                            array: ['u8', 8];
-                        };
+                        name: 'version';
+                        type: 'u64';
                     },
                     {
                         name: 'orders';

package/dist/utils/helpers.js

@@ -67,7 +67,6 @@ const formatMarket = (account, address) => {
         volume: account.volume.toString(),
         mint: account.mint.toString(),
         updateTs: account.updateTs.toString(),
-        openedOrders: account.openedOrders.toString(),
         nextOrderId: account.nextOrderId.toString(),
         feeBps: account.feeBps,
         isAllowedToPayout: account.isAllowedToPayout,

package/dist/utils/pda/index.d.ts

@@ -4,3 +4,4 @@ export declare const getMarketPDA: (programId: PublicKey, marketId: number) => P
 export declare const getCustomerPDA: (programId: PublicKey, customerId: number) => PublicKey;
 export declare const getUserTradePDA: (programId: PublicKey, wallet: PublicKey) => PublicKey;
 export declare const getSubUserTradePDA: (programId: PublicKey, wallet: PublicKey, nonce: number) => PublicKey;
+export declare const getPoolPDA: (programId: PublicKey, poolId: number) => PublicKey;

package/dist/utils/pda/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSubUserTradePDA = exports.getUserTradePDA = exports.getCustomerPDA = exports.getMarketPDA = exports.getTokenATA = void 0;
+exports.getPoolPDA = exports.getSubUserTradePDA = exports.getUserTradePDA = exports.getCustomerPDA = exports.getMarketPDA = exports.getTokenATA = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const spl_token_1 = require("@solana/spl-token");
@@ -31,3 +31,7 @@ const getSubUserTradePDA = (programId, wallet, nonce) => {
     ], programId)[0];
 };
 exports.getSubUserTradePDA = getSubUserTradePDA;
+const getPoolPDA = (programId, poolId) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('pool'), new bn_js_1.default(poolId).toArrayLike(Buffer, 'le', 8)], programId)[0];
+};
+exports.getPoolPDA = getPoolPDA;

package/package.json

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

package/dist/utils/sendMethod.d.ts

@@ -1,5 +0,0 @@
-import { RpcOptions } from '../types';
-import { MethodsBuilder } from '@coral-xyz/anchor/dist/cjs/program/namespace/methods';
-import { TriadProtocol } from '../types/triad_protocol';
-declare const sendMethod: (method: MethodsBuilder<TriadProtocol, any, any>, options?: RpcOptions) => Promise<string>;
-export default sendMethod;

package/dist/utils/sendMethod.js

@@ -1,35 +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 web3_js_1 = require("@solana/web3.js");
-const getPriorityFee_1 = __importDefault(require("./getPriorityFee"));
-const sendMethod = (method, options) => __awaiter(void 0, void 0, void 0, function* () {
-    if (options === null || options === void 0 ? void 0 : options.microLamports) {
-        method.postInstructions([
-            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: options.microLamports
-            })
-        ]);
-    }
-    if (!(options === null || options === void 0 ? void 0 : options.microLamports)) {
-        const priorityFee = yield (0, getPriorityFee_1.default)();
-        method.postInstructions([
-            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: priorityFee
-            })
-        ]);
-    }
-    return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
-});
-exports.default = sendMethod;