@triadxyz/triad-protocol 1.5.4-beta → 1.5.6-beta

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';
@@ -689,6 +689,59 @@ export type TriadProtocol = {
             ];
             args: [];
         },
+        {
+            name: 'createSubUserTrade';
+            discriminator: [77, 201, 111, 73, 47, 229, 244, 161];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'userTrade';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [117, 115, 101, 114, 95, 116, 114, 97, 100, 101];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'subUserTrade';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [117, 115, 101, 114, 95, 116, 114, 97, 100, 101];
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'subUserKey';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'subUserKey';
+                    type: 'pubkey';
+                }
+            ];
+        },
         {
             name: 'createUserTrade';
             discriminator: [232, 235, 58, 194, 135, 248, 153, 1];
@@ -1232,227 +1285,6 @@ export type TriadProtocol = {
                 }
             ];
         },
-        {
-            name: 'settleOrder';
-            discriminator: [80, 74, 204, 34, 12, 183, 66, 66];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'squads';
-                    writable: true;
-                    address: '6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq';
-                },
-                {
-                    name: 'user';
-                    writable: true;
-                },
-                {
-                    name: 'userTrade';
-                    writable: true;
-                },
-                {
-                    name: 'market';
-                    writable: true;
-                },
-                {
-                    name: 'mint';
-                    writable: true;
-                },
-                {
-                    name: 'userAta';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'account';
-                                path: 'user';
-                            },
-                            {
-                                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;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'account';
-                                path: 'market';
-                            },
-                            {
-                                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: 'squadsAta';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'account';
-                                path: 'squads';
-                            },
-                            {
-                                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: 'tokenProgram';
-                    address: 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
-                },
-                {
-                    name: 'associatedTokenProgram';
-                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
-                },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [
-                {
-                    name: 'orderId';
-                    type: 'u64';
-                }
-            ];
-        },
         {
             name: 'stakeToken';
             discriminator: [191, 127, 193, 101, 37, 96, 87, 211];
@@ -2069,10 +1901,6 @@ export type TriadProtocol = {
             name: 'collection';
             discriminator: [48, 160, 232, 205, 191, 207, 26, 141];
         },
-        {
-            name: 'market';
-            discriminator: [219, 190, 213, 55, 0, 227, 198, 154];
-        },
         {
             name: 'marketV2';
             discriminator: [27, 60, 50, 75, 191, 193, 86, 227];
@@ -2099,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];
@@ -2200,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: [
@@ -2403,183 +2232,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'market';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'bump';
-                        type: 'u8';
-                    },
-                    {
-                        name: 'authority';
-                        type: 'pubkey';
-                    },
-                    {
-                        name: 'marketId';
-                        docs: ['Unique identifier for the market'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'name';
-                        docs: ['The event being predicted (e.g., "tJUP/TRD")'];
-                        type: 'string';
-                    },
-                    {
-                        name: 'hypePrice';
-                        docs: [
-                            'Current price for Hype outcome (0-1000000, representing 0 to 1 TRD)',
-                            '1000000 = 1 TRD, 500000 = 0.5 TRD, etc.'
-                        ];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'flopPrice';
-                        docs: [
-                            'Current price for Flop outcome (0-1000000, representing 0 to 1 TRD)'
-                        ];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'hypeLiquidity';
-                        docs: ['Total liquidity for Hype (in TRD)'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'flopLiquidity';
-                        docs: ['Total liquidity for Flop (in TRD)'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'totalHypeShares';
-                        docs: ['Total number of Hype shares issued'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'totalFlopShares';
-                        docs: ['Total number of Flop shares issued'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'totalVolume';
-                        docs: ['Total trading volume (in TRD) for all resolutions'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'mint';
-                        docs: ['Mint $TRD token'];
-                        type: 'pubkey';
-                    },
-                    {
-                        name: 'ts';
-                        docs: ['Timestamp of the init'];
-                        type: 'i64';
-                    },
-                    {
-                        name: 'updateTs';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'openOrdersCount';
-                        docs: ['Total number of open orders in this market'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'nextOrderId';
-                        docs: ['Next available order ID'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'feeBps';
-                        docs: ['Fees applied to trades (in basis points, e.g., 2.131% fee)'];
-                        type: 'u16';
-                    },
-                    {
-                        name: 'feeVault';
-                        docs: ['Vault to Receive fees'];
-                        type: 'pubkey';
-                    },
-                    {
-                        name: 'isActive';
-                        docs: ['Whether the market is currently active for trading'];
-                        type: 'bool';
-                    },
-                    {
-                        name: 'marketPrice';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'previousResolvedQuestion';
-                        type: {
-                            defined: {
-                                name: 'resolvedQuestion';
-                            };
-                        };
-                    },
-                    {
-                        name: 'currentQuestionId';
-                        docs: [
-                            'Index of the current week in the weekly_results array initialized with default values'
-                        ];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'currentQuestionStart';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'currentQuestionEnd';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'currentQuestion';
-                        docs: ['The question or prediction topic for the current week'];
-                        type: {
-                            array: ['u8', 80];
-                        };
-                    },
-                    {
-                        name: 'liquidity';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'padding';
-                        type: {
-                            array: ['u8', 200];
-                        };
-                    }
-                ];
-            };
-        },
-        {
-            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: {
@@ -2644,6 +2296,14 @@ export type TriadProtocol = {
                     {
                         name: 'marketEnd';
                         type: 'i64';
+                    },
+                    {
+                        name: 'isAllowedToPayout';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'marketLiquidityAtStart';
+                        type: 'u64';
                     }
                 ];
             };
@@ -2855,10 +2515,14 @@ export type TriadProtocol = {
                             };
                         };
                     },
+                    {
+                        name: 'userNonce';
+                        type: 'u32';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 32];
+                            array: ['u8', 28];
                         };
                     }
                 ];
@@ -2954,6 +2618,10 @@ export type TriadProtocol = {
                         type: {
                             option: 'bool';
                         };
+                    },
+                    {
+                        name: 'userNonce';
+                        type: 'u32';
                     }
                 ];
             };
@@ -2971,12 +2639,6 @@ export type TriadProtocol = {
                     },
                     {
                         name: 'closed';
-                    },
-                    {
-                        name: 'claimed';
-                    },
-                    {
-                        name: 'liquidated';
                     }
                 ];
             };
@@ -3027,84 +2689,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'resolvedQuestion';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'questionId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'question';
-                        docs: ['The question or prediction topic for this week'];
-                        type: {
-                            array: ['u8', 80];
-                        };
-                    },
-                    {
-                        name: 'startTime';
-                        docs: ['Start timestamp of the week'];
-                        type: 'i64';
-                    },
-                    {
-                        name: 'endTime';
-                        docs: ['End timestamp of the week'];
-                        type: 'i64';
-                    },
-                    {
-                        name: 'hypeLiquidity';
-                        docs: ['Total liquidity for Hype (in TRD)'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'flopLiquidity';
-                        docs: ['Total liquidity for Flop (in TRD)'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'winningDirection';
-                        docs: ['The winning direction (Hype, Flop or None)'];
-                        type: {
-                            defined: {
-                                name: 'winningDirection';
-                            };
-                        };
-                    },
-                    {
-                        name: 'marketPrice';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'finalHypePrice';
-                        docs: ['Final price for Hype outcome at the end of the week'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'finalFlopPrice';
-                        docs: ['Final price for Flop outcome at the end of the week'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'totalHypeShares';
-                        docs: ['Total number of Hype shares issued'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'totalFlopShares';
-                        docs: ['Total number of Flop shares issued'];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'padding';
-                        type: {
-                            array: ['u8', 40];
-                        };
-                    }
-                ];
-            };
-        },
         {
             name: 'stakeRewardsEvent';
             type: {
@@ -3415,10 +2999,18 @@ export type TriadProtocol = {
                             ];
                         };
                     },
+                    {
+                        name: 'nonce';
+                        type: 'u32';
+                    },
+                    {
+                        name: 'isSubUser';
+                        type: 'bool';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 32];
+                            array: ['u8', 27];
                         };
                     }
                 ];

package/dist/utils/helpers.d.ts

@@ -1,6 +1,6 @@
 import { Stake, StakeVault } from './../types/stake';
 import { User } from './../types';
-import { Market } from '../types/trade';
+import { Market, Order, UserTrade } from '../types/trade';
 import { PublicKey } from '@solana/web3.js';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
@@ -8,5 +8,6 @@ export declare const formatStakeVault: (stakeVault: any) => StakeVault;
 export declare const formatStake: (stake: any) => Stake;
 export declare const formatUser: (user: any) => User;
 export declare const formatMarket: (account: any, address: PublicKey) => Market;
-export declare const accountToMarketV1: (account: any, address: PublicKey) => Market;
+export declare const formatOrder: (order: any) => Order;
+export declare const formatUserTrade: (account: any, publicKey: PublicKey) => UserTrade;
 export declare const calculateStakeRewards: (stake: Stake, multiplier: number) => number;