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

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

@@ -134,9 +134,59 @@ class Trade {
             signer: this.program.provider.publicKey,
             mint,
             tokenProgram: (0, helpers_1.getTokenProgram)(mint),
-            customer
+            customer,
+            pool: null
         }), 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
      * @param args.marketId - The ID of the Market
@@ -507,7 +557,7 @@ class Trade {
             return (0, sendMethod_1.default)(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);

package/dist/types/idl_triad_protocol.json

@@ -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

@@ -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.2-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",