@triadxyz/triad-protocol 2.2.8-beta → 2.3.0-beta

package/dist/trade.d.ts

@@ -8,6 +8,11 @@ export default class Trade {
     private program;
     decimals: number;
     constructor(program: Program<TriadProtocol>);
+    /**
+     * Get All Pools
+     *
+     */
+    getAllPools(): Promise<import("./types/trade").Pool[]>;
     /**
      * Get All Markets
      *
@@ -25,6 +30,12 @@ export default class Trade {
      *
      */
     getUserOrders(user: PublicKey): Promise<Order[]>;
+    /**
+     * Get Pool By ID
+     * @param poolId - The ID of the pool
+     *
+     */
+    getPoolById(poolId: number): Promise<import("./types/trade").Pool>;
     /**
      * Get Market By ID
      * @param marketId - The ID of the market
@@ -152,6 +163,7 @@ export default class Trade {
      * @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
      *
@@ -165,7 +177,7 @@ export default class Trade {
      *
      * @param options - RPC options
      */
-    createPool({ poolId, question, markets, mint, customer, startTime, endTime, feeBps, payoutFee }: CreatePoolArgs, 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
@@ -200,8 +212,9 @@ export default class Trade {
      * @param options - RPC options
      *
      */
-    resolveMarket({ marketId, winningDirection }: {
+    resolveMarket({ marketId, poolId, winningDirection }: {
         marketId: number;
+        poolId?: number;
         winningDirection: {
             hype: {};
         } | {

package/dist/trade.js

@@ -27,6 +27,16 @@ class Trade {
         this.program = program;
         this.decimals = constants_1.TRD_DECIMALS; // We're using only TRD or USDC so we can use the same decimals 6
     }
+    /**
+     * Get All Pools
+     *
+     */
+    getAllPools() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const poolV2 = yield this.program.account.pool.all();
+            return poolV2.map(({ account, publicKey }) => (0, helpers_1.formatPool)(account, publicKey));
+        });
+    }
     /**
      * Get All Markets
      *
@@ -66,6 +76,18 @@ class Trade {
             return myUserTrades.flatMap((userTrade) => userTrade.orders);
         });
     }
+    /**
+     * 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
@@ -113,6 +135,7 @@ class Trade {
      * @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
      *
@@ -162,7 +185,7 @@ class Trade {
      *
      * @param options - RPC options
      */
-    createPool({ poolId, question, markets, mint, customer, startTime, endTime, feeBps, payoutFee }, 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');
@@ -172,12 +195,19 @@ class Trade {
             ixs.push(yield this.program.methods
                 .createPool({
                 poolId: new bn_js_1.default(poolId),
-                question: (0, helpers_1.encodeString)(question, 80)
+                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 (_a) { }
             for (const market of markets) {
                 if (market.question.length > 80) {
                     throw new Error('Market question must be less than 80 characters');
@@ -196,7 +226,8 @@ class Trade {
                     mint,
                     tokenProgram: (0, helpers_1.getTokenProgram)(mint),
                     pool: poolPDA,
-                    customer
+                    customer,
+                    userTrade
                 })
                     .instruction());
             }
@@ -290,9 +321,13 @@ class Trade {
      * @param options - RPC options
      *
      */
-    resolveMarket({ marketId, winningDirection }, options) {
+    resolveMarket({ marketId, poolId, winningDirection }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
+            let poolPDA = null;
+            if (poolId) {
+                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
+            }
             ixs.push(yield this.program.methods
                 .updateMarket({
                 winningDirection,
@@ -301,7 +336,8 @@ class Trade {
             })
                 .accounts({
                 signer: this.program.provider.publicKey,
-                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
+                pool: poolPDA
             })
                 .instruction());
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);

package/dist/types/idl_triad_protocol.json

@@ -1299,21 +1299,25 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "market",
+                    "writable": true
+                },
                 {
                     "name": "squads",
                     "writable": true,
                     "address": "6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq"
                 },
                 {
-                    "name": "seller_trade",
+                    "name": "buyer_authority",
                     "writable": true
                 },
                 {
-                    "name": "buyer_trade",
+                    "name": "seller_trade",
                     "writable": true
                 },
                 {
-                    "name": "market",
+                    "name": "buyer_trade",
                     "writable": true
                 },
                 {
@@ -1348,6 +1352,34 @@
                         }
                     }
                 },
+                {
+                    "name": "buyer_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "buyer_authority"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
                 {
                     "name": "market_ata",
                     "writable": true
@@ -1364,7 +1396,16 @@
                     "address": "11111111111111111111111111111111"
                 }
             ],
-            "args": []
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "MarketAskOrderArgs"
+                        }
+                    }
+                }
+            ]
         },
         {
             "name": "market_bid_order",
@@ -1404,10 +1445,6 @@
                     "name": "buyer_ata",
                     "writable": true
                 },
-                {
-                    "name": "market_ata",
-                    "writable": true
-                },
                 {
                     "name": "seller_ata",
                     "writable": true,
@@ -1436,6 +1473,10 @@
                         }
                     }
                 },
+                {
+                    "name": "market_ata",
+                    "writable": true
+                },
                 {
                     "name": "token_program"
                 },
@@ -2052,6 +2093,11 @@
                     "name": "market",
                     "writable": true
                 },
+                {
+                    "name": "pool",
+                    "writable": true,
+                    "optional": true
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -2555,11 +2601,16 @@
         },
         {
             "code": 6030,
+            "name": "CurrentFastPoolMarketStillActive",
+            "msg": "Current fast pool market still active"
+        },
+        {
+            "code": 6031,
             "name": "MarketAlreadyAggregated",
             "msg": "Market already aggregated"
         },
         {
-            "code": 6031,
+            "code": 6032,
             "name": "MarketAlreadyPaidOut",
             "msg": "Market already paid out"
         }
@@ -2895,6 +2946,10 @@
                                 "array": ["u8", 80]
                             }
                         }
+                    },
+                    {
+                        "name": "is_fast",
+                        "type": "bool"
                     }
                 ]
             }
@@ -2959,6 +3014,22 @@
                 ]
             }
         },
+        {
+            "name": "MarketAskOrderArgs",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "shares",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "bid_order_id",
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
         {
             "name": "MarketBidOrderArgs",
             "type": {
@@ -3585,10 +3656,18 @@
                         "name": "authority",
                         "type": "pubkey"
                     },
+                    {
+                        "name": "is_fast",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "is_fast_market_active",
+                        "type": "bool"
+                    },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 64]
+                            "array": ["u8", 62]
                         }
                     }
                 ]
@@ -3600,7 +3679,7 @@
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "pool_id",
+                        "name": "id",
                         "type": "u64"
                     },
                     {
@@ -3614,10 +3693,12 @@
                         "type": "pubkey"
                     },
                     {
-                        "name": "markets",
-                        "type": {
-                            "array": ["u64", 60]
-                        }
+                        "name": "is_fast",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "is_fast_market_active",
+                        "type": "bool"
                     }
                 ]
             }

package/dist/types/trade.d.ts

@@ -1,4 +1,12 @@
 import { PublicKey } from '@solana/web3.js';
+export type Pool = {
+    address: string;
+    id: number;
+    question: string;
+    authority: string;
+    isFast: boolean;
+    isFastMarketActive: boolean;
+};
 export type Market = {
     address: string;
     bump: number;
@@ -148,6 +156,7 @@ export type CreateMarketArgs = {
     payoutFee: number;
     mint: PublicKey;
     poolId?: number;
+    currentMarketId?: number;
 };
 export type CreatePoolArgs = {
     poolId: number;
@@ -162,6 +171,7 @@ export type CreatePoolArgs = {
         marketId: number;
         question: string;
     }[];
+    isFast?: boolean;
 };
 export type CancelBidOrderArgs = {
     marketId: number;

package/dist/types/triad_protocol.d.ts

@@ -1897,21 +1897,25 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
+                {
+                    name: 'market';
+                    writable: true;
+                },
                 {
                     name: 'squads';
                     writable: true;
                     address: '6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq';
                 },
                 {
-                    name: 'sellerTrade';
+                    name: 'buyerAuthority';
                     writable: true;
                 },
                 {
-                    name: 'buyerTrade';
+                    name: 'sellerTrade';
                     writable: true;
                 },
                 {
-                    name: 'market';
+                    name: 'buyerTrade';
                     writable: true;
                 },
                 {
@@ -1975,6 +1979,63 @@ export type TriadProtocol = {
                         };
                     };
                 },
+                {
+                    name: 'buyerAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'buyerAuthority';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
                 {
                     name: 'marketAta';
                     writable: true;
@@ -1991,7 +2052,16 @@ export type TriadProtocol = {
                     address: '11111111111111111111111111111111';
                 }
             ];
-            args: [];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'marketAskOrderArgs';
+                        };
+                    };
+                }
+            ];
         },
         {
             name: 'marketBidOrder';
@@ -2031,10 +2101,6 @@ export type TriadProtocol = {
                     name: 'buyerAta';
                     writable: true;
                 },
-                {
-                    name: 'marketAta';
-                    writable: true;
-                },
                 {
                     name: 'sellerAta';
                     writable: true;
@@ -2092,6 +2158,10 @@ export type TriadProtocol = {
                         };
                     };
                 },
+                {
+                    name: 'marketAta';
+                    writable: true;
+                },
                 {
                     name: 'tokenProgram';
                 },
@@ -2952,6 +3022,11 @@ export type TriadProtocol = {
                     name: 'market';
                     writable: true;
                 },
+                {
+                    name: 'pool';
+                    writable: true;
+                    optional: true;
+                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -3595,11 +3670,16 @@ export type TriadProtocol = {
         },
         {
             code: 6030;
+            name: 'currentFastPoolMarketStillActive';
+            msg: 'Current fast pool market still active';
+        },
+        {
+            code: 6031;
             name: 'marketAlreadyAggregated';
             msg: 'Market already aggregated';
         },
         {
-            code: 6031;
+            code: 6032;
             name: 'marketAlreadyPaidOut';
             msg: 'Market already paid out';
         }
@@ -3935,6 +4015,10 @@ export type TriadProtocol = {
                                 array: ['u8', 80];
                             };
                         };
+                    },
+                    {
+                        name: 'isFast';
+                        type: 'bool';
                     }
                 ];
             };
@@ -3999,6 +4083,22 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'marketAskOrderArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'shares';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'bidOrderId';
+                        type: 'u64';
+                    }
+                ];
+            };
+        },
         {
             name: 'marketBidOrderArgs';
             type: {
@@ -4625,10 +4725,18 @@ export type TriadProtocol = {
                         name: 'authority';
                         type: 'pubkey';
                     },
+                    {
+                        name: 'isFast';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'isFastMarketActive';
+                        type: 'bool';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 64];
+                            array: ['u8', 62];
                         };
                     }
                 ];
@@ -4640,7 +4748,7 @@ export type TriadProtocol = {
                 kind: 'struct';
                 fields: [
                     {
-                        name: 'poolId';
+                        name: 'id';
                         type: 'u64';
                     },
                     {
@@ -4654,10 +4762,12 @@ export type TriadProtocol = {
                         type: 'pubkey';
                     },
                     {
-                        name: 'markets';
-                        type: {
-                            array: ['u64', 60];
-                        };
+                        name: 'isFast';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'isFastMarketActive';
+                        type: 'bool';
                     }
                 ];
             };

package/dist/utils/helpers.d.ts

@@ -1,5 +1,5 @@
 import { Stake, StakeVault } from './../types/stake';
-import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade, Chest } from '../types/trade';
+import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade, Chest, Pool } from '../types/trade';
 import { PublicKey } from '@solana/web3.js';
 import { IdlAccounts } from '@coral-xyz/anchor';
 import { TriadProtocol } from '../types/triad_protocol';
@@ -7,6 +7,7 @@ export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: IdlAccounts<TriadProtocol>['stakeVault']) => StakeVault;
 export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV2']) => Stake;
+export declare const formatPool: (account: IdlAccounts<TriadProtocol>['pool'], address: PublicKey) => Pool;
 export declare const formatMarket: (account: IdlAccounts<TriadProtocol>['marketV2'], address: PublicKey) => Market;
 export declare const formatUserTrade: (account: IdlAccounts<TriadProtocol>['userTrade'], publicKey: PublicKey) => UserTrade;
 export declare const formatOrder: (order: IdlAccounts<TriadProtocol>['userTrade']['orders'][number], authority?: string) => Order;

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatChest = exports.formatOrder = exports.formatUserTrade = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatChest = exports.formatOrder = exports.formatUserTrade = exports.formatMarket = exports.formatPool = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const trade_1 = require("../types/trade");
 const constants_1 = require("./constants");
 const spl_token_1 = require("@solana/spl-token");
@@ -52,6 +52,17 @@ const formatStake = (stake) => {
     };
 };
 exports.formatStake = formatStake;
+const formatPool = (account, address) => {
+    return {
+        address: address.toString(),
+        id: account.id.toNumber(),
+        question: Buffer.from(account.question).toString().replace(/\0+$/, ''),
+        authority: account.authority.toString(),
+        isFast: account.isFast,
+        isFastMarketActive: account.isFastMarketActive
+    };
+};
+exports.formatPool = formatPool;
 const formatMarket = (account, address) => {
     return {
         bump: account.bump,
@@ -137,7 +148,7 @@ const calculateStakeRewards = (stake) => {
     if (stake.withdrawTs !== 0)
         return 0;
     const maxRank = 1633;
-    const rank = 639;
+    const rank = 369;
     const rankWeight = (maxRank - rank + 1) / maxRank;
     const userStakedAmount = stake.mint === constants_1.TRD_MINT.toBase58()
         ? stake.amount

package/package.json

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