@triadxyz/triad-protocol 2.4.5-beta → 2.4.7-beta

package/dist/index.d.ts

@@ -2,7 +2,7 @@ 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 { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreateOrUpdatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions, CollectMarketFeeArgs } from './types';
+import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions, CollectMarketFeeArgs } from './types';
 import Stake from './stake';
 import Poseidon from './poseidon';
 export default class TriadProtocolClient {
@@ -174,12 +174,11 @@ export default class TriadProtocolClient {
      * @param args.question - question (max 80 characters)
      * @param args.liquidityAtStart - liquidity at start
      * @param args.payoutFee - payout fee (to add affiliate system)
-     * @param args.currentMarketId - if fast market, we need check the pool parameters
      *
      * @param options - RPC options
      *
      */
-    createMarket({ marketId, startTime, endTime, question, feeBps, customer, payoutFee, mint, poolId }: CreateMarketArgs, options?: RpcOptions): Promise<string>;
+    createMarket({ markets, customer, mint, poolId }: CreateMarketArgs, options?: RpcOptions): Promise<string>;
     /**
      * Create Pool
      * @param poolId - The ID of the pool
@@ -188,7 +187,7 @@ export default class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    createOrUpdatePool({ poolId, question, markets, mint, customer, startTime, endTime, feeBps, payoutFee, isFast }: CreateOrUpdatePoolArgs, options?: RpcOptions): Promise<string>;
+    createPool({ poolId, question, markets, mint, customer, startTime, endTime, feeBps, payoutFee, isFast }: CreatePoolArgs, options?: RpcOptions): Promise<string>;
     /**
      * Open Order
      * @param args.marketId - The ID of the Market

package/dist/index.js

@@ -152,52 +152,53 @@ class TriadProtocolClient {
      * @param args.question - question (max 80 characters)
      * @param args.liquidityAtStart - liquidity at start
      * @param args.payoutFee - payout fee (to add affiliate system)
-     * @param args.currentMarketId - if fast market, we need check the pool parameters
      *
      * @param options - RPC options
      *
      */
-    createMarket({ marketId, startTime, endTime, question, feeBps, customer, payoutFee, mint, poolId }, options) {
+    createMarket({ markets, customer, mint, poolId }, 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 = [];
-            let poolPDA = null;
-            if (poolId) {
-                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
-            }
             let userTrade = null;
             try {
                 yield this.getUserTrade(this.program.provider.publicKey);
                 userTrade = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             }
             catch (_a) { }
-            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: poolPDA,
-                userTrade
-            })
-                .instruction());
-            ixs.push(yield this.program.methods
-                .createOrderBook(new bn_js_1.default(marketId))
-                .accounts({
-                signer: this.program.provider.publicKey,
-                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
-            })
-                .instruction());
+            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,
+                    mint,
+                    tokenProgram: (0, helpers_1.getTokenProgram)(mint),
+                    customer,
+                    pool: poolPDA,
+                    userTrade
+                })
+                    .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, options);
         });
     }
@@ -209,34 +210,29 @@ class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    createOrUpdatePool({ poolId, question, markets, mint, customer, startTime, endTime, feeBps, payoutFee, isFast }, options) {
+    createPool({ poolId, question, markets, mint, customer, startTime, endTime, feeBps, payoutFee, isFast }, 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);
-            try {
-                yield this.getPoolById(poolId);
-            }
-            catch (_a) {
-                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
-                })
-                    .instruction());
-            }
+            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
+            })
+                .instruction());
             let userTrade = null;
             try {
                 yield this.getUserTrade(this.program.provider.publicKey);
                 userTrade = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             }
-            catch (_b) { }
+            catch (_a) { }
             for (const market of markets) {
                 if (market.question.length > 80) {
                     throw new Error('Market question must be less than 80 characters');

package/dist/types/index.d.ts

@@ -156,18 +156,19 @@ export type OpenOrderArgs = {
     mint: PublicKey;
 };
 export type CreateMarketArgs = {
-    marketId: number;
-    startTime: number;
-    endTime: number;
-    question: string;
-    feeBps: number;
+    markets: {
+        marketId: number;
+        startTime: number;
+        endTime: number;
+        question: string;
+        feeBps: number;
+        payoutFee: number;
+    }[];
     customer: PublicKey | null;
-    payoutFee: number;
     mint: PublicKey;
     poolId?: number;
-    currentMarketId?: number;
 };
-export type CreateOrUpdatePoolArgs = {
+export type CreatePoolArgs = {
     poolId: number;
     question?: string;
     startTime: number;

package/package.json

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