@triadxyz/triad-protocol 1.5.5-beta → 1.5.7-beta

package/dist/index.js

@@ -126,9 +126,10 @@ class TriadProtocolClient {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             for (const user of users) {
+                const userPDA = (0, pda_1.getUserPDA)(this.program.programId, user);
                 ixs.push(yield this.program.methods
                     .migrateUser()
-                    .accounts({ user })
+                    .accounts({ user: userPDA })
                     .instruction());
             }
             return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, []);

package/dist/trade.d.ts

@@ -1,7 +1,7 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { PublicKey } from '@solana/web3.js';
-import { InitializeMarketArgs, OpenOrderArgs, OrderDirection } from './types/trade';
+import { InitializeMarketArgs, OpenOrderArgs, OrderDirection, UserTrade } from './types/trade';
 import { RpcOptions } from './types';
 import BN from 'bn.js';
 export default class Trade {
@@ -14,11 +14,17 @@ export default class Trade {
      */
     getAllMarkets(): Promise<import("./types/trade").Market[]>;
     /**
-     * Get All User Trades
+     * Get My User Trades from a user authority
      * @param user - User PublicKey
      *
      */
-    getAllUserTrade(user: PublicKey): Promise<import("./types/trade").UserTrade[]>;
+    getMyUserTrades(user: PublicKey): Promise<UserTrade[]>;
+    /**
+     * Get User Orders
+     * @param user - User PublicKey
+     *
+     */
+    getUserOrders(user: PublicKey): Promise<import("./types/trade").Order[]>;
     /**
      * Get Market By ID
      * @param marketId - The ID of the market
@@ -34,9 +40,10 @@ export default class Trade {
     /**
      * Get User Trade
      * @param user - User PublicKey
+     * @param userNonce - The nonce of the user
      *
      */
-    getUserTrade(user: PublicKey): Promise<{
+    getUserTrade(user: PublicKey, userNonce?: number): Promise<{
         bump: number;
         authority: PublicKey;
         totalDeposits: BN;
@@ -50,38 +57,18 @@ export default class Trade {
             status: ({
                 open?: never;
                 closed?: never;
-                claimed?: never;
-                liquidated?: never;
             } & {
                 init: Record<string, never>;
             }) | ({
                 init?: never;
                 closed?: never;
-                claimed?: never;
-                liquidated?: never;
             } & {
                 open: Record<string, never>;
             }) | ({
                 init?: never;
                 open?: never;
-                claimed?: never;
-                liquidated?: never;
             } & {
                 closed: Record<string, never>;
-            }) | ({
-                init?: never;
-                open?: never;
-                closed?: never;
-                liquidated?: never;
-            } & {
-                claimed: Record<string, never>;
-            }) | ({
-                init?: never;
-                open?: never;
-                closed?: never;
-                claimed?: never;
-            } & {
-                liquidated: Record<string, never>;
             });
             price: BN;
             totalAmount: BN;
@@ -122,6 +109,12 @@ export default class Trade {
      *
      */
     initializeMarket({ marketId, startTime, endTime, question }: InitializeMarketArgs, options?: RpcOptions): Promise<string>;
+    /**
+     * Get User Trade Nonce With Slots
+     * @param userTrades - User Trades
+     *
+     */
+    getUserTradeNonceWithSlots(userTrades: UserTrade[]): Promise<PublicKey>;
     /**
      * Open Order
      * @param args.marketId - The ID of the Market
@@ -137,13 +130,15 @@ export default class Trade {
      * Close Order
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order
+     * @param args.userNonce - The nonce of the user
      *
      * @param options - RPC options
      *
      */
-    closeOrder({ marketId, orderId }: {
+    closeOrder({ marketId, orderId, userNonce }: {
         marketId: number;
         orderId: number;
+        userNonce: number;
     }, options?: RpcOptions): Promise<string>;
     /**
      * Resolve Market
@@ -207,13 +202,30 @@ export default class Trade {
      * Payout Order
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order to Payout
+     * @param args.userNonce - The nonce of the user
      *
      * @param options - RPC options
      *
      */
-    payoutOrder({ marketId, orderId }: {
+    payoutOrder({ marketId, orderId, userNonce }: {
         marketId: number;
         orderId: number;
+        userNonce: number;
     }, options?: RpcOptions): Promise<string>;
-    allowMarketPayout(marketId: number, options?: RpcOptions): Promise<string>;
+    /**
+     * Allow Market to Payout
+     * @param marketId - The ID of the market
+     *
+     * @param options - RPC options
+     *
+     */
+    allowMarketToPayout(marketId: number, options?: RpcOptions): Promise<string>;
+    /**
+     * Create Sub User Trade
+     * @param user - User PublicKey the main user
+     *
+     * @param options - RPC options
+     *
+     */
+    createSubUserTrade(user: PublicKey, options?: RpcOptions): Promise<string>;
 }

package/dist/trade.js

@@ -35,11 +35,11 @@ class Trade {
         });
     }
     /**
-     * Get All User Trades
+     * Get My User Trades from a user authority
      * @param user - User PublicKey
      *
      */
-    getAllUserTrade(user) {
+    getMyUserTrades(user) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.program.account.userTrade.all([
                 {
@@ -52,6 +52,18 @@ class Trade {
             return response.map(({ account, publicKey }) => (0, helpers_1.formatUserTrade)(account, publicKey));
         });
     }
+    /**
+     * Get User Orders
+     * @param user - User PublicKey
+     *
+     */
+    getUserOrders(user) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const myUserTrades = yield this.getMyUserTrades(user);
+            const orders = myUserTrades.flatMap((userTrade) => userTrade.orders);
+            return orders;
+        });
+    }
     /**
      * Get Market By ID
      * @param marketId - The ID of the market
@@ -78,11 +90,16 @@ class Trade {
     /**
      * Get User Trade
      * @param user - User PublicKey
+     * @param userNonce - The nonce of the user
      *
      */
-    getUserTrade(user) {
+    getUserTrade(user, userNonce = 0) {
         return __awaiter(this, void 0, void 0, function* () {
-            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, user);
+            let userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, user);
+            if (userNonce !== 0) {
+                const subUserTradePDA = (0, trade_1.getSubUserTradePDA)(this.program.programId, user, userNonce);
+                userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
+            }
             return this.program.account.userTrade.fetch(userTradePDA);
         });
     }
@@ -114,6 +131,39 @@ class Trade {
             }), options);
         });
     }
+    /**
+     * Get User Trade Nonce With Slots
+     * @param userTrades - User Trades
+     *
+     */
+    getUserTradeNonceWithSlots(userTrades) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let nonce = null;
+            for (const userTrade of userTrades) {
+                if (nonce !== null) {
+                    break;
+                }
+                userTrade.orders.forEach((order) => {
+                    if (nonce !== null) {
+                        return;
+                    }
+                    let status = Object.keys(order.status)[0];
+                    if (status !== 'open') {
+                        nonce = userTrade.nonce;
+                    }
+                });
+            }
+            if (nonce === null) {
+                throw new Error('No open orders found');
+            }
+            if (nonce === 0) {
+                return (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            }
+            const subUserTradePDA = (0, trade_1.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, nonce);
+            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
+            return userTradePDA;
+        });
+    }
     /**
      * Open Order
      * @param args.marketId - The ID of the Market
@@ -127,16 +177,30 @@ class Trade {
     openOrder({ marketId, amount, direction, token }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
-            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            let userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
             const ixs = [];
             const addressLookupTableAccounts = [];
             let amountInTRD = amount * Math.pow(10, constants_1.TRD_DECIMALS);
+            let myUserTrades = [];
+            myUserTrades = yield this.getMyUserTrades(this.provider.publicKey);
+            if (myUserTrades.length === 0) {
+                ixs.push(yield this.program.methods
+                    .createUserTrade()
+                    .accounts({
+                    signer: this.provider.publicKey
+                })
+                    .instruction());
+            }
             try {
-                yield this.program.account.userTrade.fetch(userTradePDA);
+                userTradePDA = yield this.getUserTradeNonceWithSlots(myUserTrades);
+                console.log(userTradePDA);
             }
             catch (_a) {
+                const mainUserTrade = myUserTrades.find((userTrade) => !userTrade.isSubUser);
+                const subUserTradePDA = (0, trade_1.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, Number(mainUserTrade.nonce) + 1);
+                userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
                 ixs.push(yield this.program.methods
-                    .createUserTrade()
+                    .createSubUserTrade(subUserTradePDA)
                     .accounts({
                     signer: this.provider.publicKey
                 })
@@ -176,14 +240,19 @@ class Trade {
      * Close Order
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order
+     * @param args.userNonce - The nonce of the user
      *
      * @param options - RPC options
      *
      */
-    closeOrder({ marketId, orderId }, options) {
+    closeOrder({ marketId, orderId, userNonce }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
-            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            let userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            if (userNonce !== 0) {
+                const subUserTradePDA = (0, trade_1.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonce);
+                userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
+            }
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
@@ -292,14 +361,19 @@ class Trade {
      * Payout Order
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order to Payout
+     * @param args.userNonce - The nonce of the user
      *
      * @param options - RPC options
      *
      */
-    payoutOrder({ marketId, orderId }, options) {
+    payoutOrder({ marketId, orderId, userNonce }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
-            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            let userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            if (userNonce !== 0) {
+                const subUserTradePDA = (0, trade_1.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonce);
+                userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
+            }
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.payoutOrder(new bn_js_1.default(orderId)).accounts({
                 signer: this.provider.publicKey,
                 userTrade: userTradePDA,
@@ -308,14 +382,37 @@ class Trade {
             }), options);
         });
     }
-    allowMarketPayout(marketId, options) {
+    /**
+     * Allow Market to Payout
+     * @param marketId - The ID of the market
+     *
+     * @param options - RPC options
+     *
+     */
+    allowMarketToPayout(marketId, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.allowMarketPayout().accounts({
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.allowMarketToPayout().accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA
             }), options);
         });
     }
+    /**
+     * Create Sub User Trade
+     * @param user - User PublicKey the main user
+     *
+     * @param options - RPC options
+     *
+     */
+    createSubUserTrade(user, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userTrade = yield this.getUserTrade(user);
+            const subUserTradePDA = (0, trade_1.getSubUserTradePDA)(this.program.programId, user, userTrade.nonce + 1);
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.createSubUserTrade(subUserTradePDA).accounts({
+                signer: this.provider.publicKey
+            }), options);
+        });
+    }
 }
 exports.default = Trade;

package/dist/types/idl_triad_protocol.json

@@ -105,8 +105,8 @@
             ]
         },
         {
-            "name": "allow_market_payout",
-            "discriminator": [95, 246, 155, 119, 253, 65, 95, 184],
+            "name": "allow_market_to_payout",
+            "discriminator": [193, 227, 109, 171, 110, 177, 47, 251],
             "accounts": [
                 {
                     "name": "signer",
@@ -497,7 +497,12 @@
                     "address": "11111111111111111111111111111111"
                 }
             ],
-            "args": []
+            "args": [
+                {
+                    "name": "sub_user_key",
+                    "type": "pubkey"
+                }
+            ]
         },
         {
             "name": "create_user_trade",
@@ -1365,10 +1370,6 @@
         }
     ],
     "events": [
-        {
-            "name": "MarketAllowedToPayoutEvent",
-            "discriminator": [72, 148, 96, 232, 248, 132, 92, 26]
-        },
         {
             "name": "MarketEvent",
             "discriminator": [212, 67, 145, 23, 58, 104, 52, 83]
@@ -1466,6 +1467,11 @@
             "code": 6015,
             "name": "MarketNotAllowedToPayout",
             "msg": "Market Not allowed to payout"
+        },
+        {
+            "code": 6016,
+            "name": "UserTradeIsSubUser",
+            "msg": "User trade is sub user"
         }
     ],
     "types": [
@@ -1669,34 +1675,6 @@
                 ]
             }
         },
-        {
-            "name": "MarketAllowedToPayoutEvent",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "market_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "winning_direction",
-                        "type": {
-                            "defined": {
-                                "name": "WinningDirection"
-                            }
-                        }
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "is_allowed_to_payout",
-                        "type": "bool"
-                    }
-                ]
-            }
-        },
         {
             "name": "MarketEvent",
             "type": {
@@ -1761,6 +1739,14 @@
                     {
                         "name": "market_end",
                         "type": "i64"
+                    },
+                    {
+                        "name": "is_allowed_to_payout",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "market_liquidity_at_start",
+                        "type": "u64"
                     }
                 ]
             }
@@ -2075,6 +2061,10 @@
                         "type": {
                             "option": "bool"
                         }
+                    },
+                    {
+                        "name": "user_nonce",
+                        "type": "u32"
                     }
                 ]
             }
@@ -2092,12 +2082,6 @@
                     },
                     {
                         "name": "Closed"
-                    },
-                    {
-                        "name": "Claimed"
-                    },
-                    {
-                        "name": "Liquidated"
                     }
                 ]
             }

package/dist/types/trade.d.ts

@@ -64,10 +64,6 @@ export type OrderStatus = {
     open: {};
 } | {
     closed: {};
-} | {
-    claimed: {};
-} | {
-    liquidated: {};
 };
 export type OrderType = {
     limit: {};

package/dist/types/triad_protocol.d.ts

@@ -169,8 +169,8 @@ export type TriadProtocol = {
             ];
         },
         {
-            name: 'allowMarketPayout';
-            discriminator: [95, 246, 155, 119, 253, 65, 95, 184];
+            name: 'allowMarketToPayout';
+            discriminator: [193, 227, 109, 171, 110, 177, 47, 251];
             accounts: [
                 {
                     name: 'signer';
@@ -735,7 +735,12 @@ export type TriadProtocol = {
                     address: '11111111111111111111111111111111';
                 }
             ];
-            args: [];
+            args: [
+                {
+                    name: 'subUserKey';
+                    type: 'pubkey';
+                }
+            ];
         },
         {
             name: 'createUserTrade';
@@ -1922,10 +1927,6 @@ export type TriadProtocol = {
         }
     ];
     events: [
-        {
-            name: 'marketAllowedToPayoutEvent';
-            discriminator: [72, 148, 96, 232, 248, 132, 92, 26];
-        },
         {
             name: 'marketEvent';
             discriminator: [212, 67, 145, 23, 58, 104, 52, 83];
@@ -2023,6 +2024,11 @@ export type TriadProtocol = {
             code: 6015;
             name: 'marketNotAllowedToPayout';
             msg: 'Market Not allowed to payout';
+        },
+        {
+            code: 6016;
+            name: 'userTradeIsSubUser';
+            msg: 'User trade is sub user';
         }
     ];
     types: [
@@ -2226,34 +2232,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'marketAllowedToPayoutEvent';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'marketId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'winningDirection';
-                        type: {
-                            defined: {
-                                name: 'winningDirection';
-                            };
-                        };
-                    },
-                    {
-                        name: 'timestamp';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'isAllowedToPayout';
-                        type: 'bool';
-                    }
-                ];
-            };
-        },
         {
             name: 'marketEvent';
             type: {
@@ -2318,6 +2296,14 @@ export type TriadProtocol = {
                     {
                         name: 'marketEnd';
                         type: 'i64';
+                    },
+                    {
+                        name: 'isAllowedToPayout';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'marketLiquidityAtStart';
+                        type: 'u64';
                     }
                 ];
             };
@@ -2632,6 +2618,10 @@ export type TriadProtocol = {
                         type: {
                             option: 'bool';
                         };
+                    },
+                    {
+                        name: 'userNonce';
+                        type: 'u32';
                     }
                 ];
             };
@@ -2649,12 +2639,6 @@ export type TriadProtocol = {
                     },
                     {
                         name: 'closed';
-                    },
-                    {
-                        name: 'claimed';
-                    },
-                    {
-                        name: 'liquidated';
                     }
                 ];
             };

package/dist/utils/swap.js

@@ -22,7 +22,7 @@ const swap = ({ connection, wallet, inToken, amount }) => __awaiter(void 0, void
         throw new Error('Token not found');
     }
     const formattedAmountIn = amount * Math.pow(10, token.decimals);
-    const quoteResponse = yield axios_1.default.get(`https://quote-api.jup.ag/v6/quote?inputMint=${inToken}&outputMint=${constants_1.TRD_MINT.toBase58()}&amount=${formattedAmountIn}&slippageBps=30`);
+    const quoteResponse = yield axios_1.default.get(`https://quote-api.jup.ag/v6/quote?inputMint=${inToken}&outputMint=${constants_1.TRD_MINT.toBase58()}&amount=${formattedAmountIn}&slippageBps=60`);
     const { data: quoteData } = quoteResponse;
     const swapResponse = yield axios_1.default.post('https://quote-api.jup.ag/v6/swap-instructions', {
         userPublicKey: wallet,
@@ -35,9 +35,6 @@ const swap = ({ connection, wallet, inToken, amount }) => __awaiter(void 0, void
             deserializeInstruction(swapInstruction),
             web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
                 units: 500000
-            }),
-            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: yield getPriorityFee()
             })
         ],
         addressLookupTableAccounts: yield (0, exports.getAddressLookupTableAccounts)(connection, addressLookupTableAddresses),
@@ -73,15 +70,7 @@ const getAddressLookupTableAccounts = (connection, keys) => __awaiter(void 0, vo
     }, new Array());
 });
 exports.getAddressLookupTableAccounts = getAddressLookupTableAccounts;
-const getPriorityFee = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield axios_1.default.get('https://solanacompass.com/api/fees');
-    return response.data[15].priorityTx || 1000;
-});
 const TOKENS = {
-    oreoU2P8bN6jkk3jbaiVxYnG1dCXcYxwhwyK9jSybcp: {
-        mint: 'oreoU2P8bN6jkk3jbaiVxYnG1dCXcYxwhwyK9jSybcp',
-        decimals: 11
-    },
     So11111111111111111111111111111111111111112: {
         mint: 'So11111111111111111111111111111111111111112',
         decimals: 9

package/package.json

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