@triadxyz/triad-protocol 3.4.1-beta → 3.4.2-beta

package/dist/types/triad_protocol.d.ts

@@ -200,10 +200,6 @@ export type TriadProtocol = {
                     signer: true;
                     relations: ['poseidonAsset'];
                 },
-                {
-                    name: 'userTrade';
-                    writable: true;
-                },
                 {
                     name: 'poseidonAsset';
                     writable: true;
@@ -234,7 +230,6 @@ export type TriadProtocol = {
                 {
                     name: 'signer';
                     writable: true;
-                    signer: true;
                 },
                 {
                     name: 'market';
@@ -245,8 +240,29 @@ export type TriadProtocol = {
                     writable: true;
                 },
                 {
-                    name: 'userTrade';
+                    name: 'order';
                     writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'market.market_id';
+                                account: 'marketV2';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.order_direction';
+                            }
+                        ];
+                    };
                 },
                 {
                     name: 'systemProgram';
@@ -271,7 +287,6 @@ export type TriadProtocol = {
                 {
                     name: 'signer';
                     writable: true;
-                    signer: true;
                 },
                 {
                     name: 'payer';
@@ -286,10 +301,6 @@ export type TriadProtocol = {
                     name: 'orderBook';
                     writable: true;
                 },
-                {
-                    name: 'userTrade';
-                    writable: true;
-                },
                 {
                     name: 'mint';
                     writable: true;
@@ -820,12 +831,33 @@ export type TriadProtocol = {
                     address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
                 },
                 {
-                    name: 'userTrade';
+                    name: 'market';
                     writable: true;
                 },
                 {
-                    name: 'market';
+                    name: 'order';
                     writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'market.market_id';
+                                account: 'marketV2';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'orderDirection';
+                            }
+                        ];
+                    };
                 },
                 {
                     name: 'mint';
@@ -960,8 +992,12 @@ export type TriadProtocol = {
             ];
             args: [
                 {
-                    name: 'orderId';
-                    type: 'u64';
+                    name: 'orderDirection';
+                    type: {
+                        defined: {
+                            name: 'orderDirection';
+                        };
+                    };
                 }
             ];
         },
@@ -994,6 +1030,26 @@ export type TriadProtocol = {
             ];
             args: [];
         },
+        {
+            name: 'closeUser';
+            discriminator: [86, 219, 138, 140, 236, 24, 118, 200];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'userTrade';
+                    writable: true;
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [];
+        },
         {
             name: 'collectMarketFee';
             discriminator: [139, 4, 96, 182, 216, 250, 122, 79];
@@ -1904,8 +1960,8 @@ export type TriadProtocol = {
             ];
         },
         {
-            name: 'createSubUserTrade';
-            discriminator: [77, 201, 111, 73, 47, 229, 244, 161];
+            name: 'marketAskOrder';
+            discriminator: [189, 66, 162, 254, 3, 85, 152, 54];
             accounts: [
                 {
                     name: 'signer';
@@ -1918,120 +1974,67 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'userTrade';
+                    name: 'market';
+                    writable: true;
+                },
+                {
+                    name: 'orderBook';
+                    writable: true;
+                },
+                {
+                    name: 'askOrder';
                     writable: true;
                     pda: {
                         seeds: [
                             {
                                 kind: 'const';
-                                value: [117, 115, 101, 114, 95, 116, 114, 97, 100, 101];
+                                value: [111, 114, 100, 101, 114];
                             },
                             {
                                 kind: 'account';
                                 path: 'signer';
-                            }
-                        ];
-                    };
-                },
-                {
-                    name: 'subUserTrade';
-                    writable: true;
-                    pda: {
-                        seeds: [
+                            },
                             {
-                                kind: 'const';
-                                value: [117, 115, 101, 114, 95, 116, 114, 97, 100, 101];
+                                kind: 'account';
+                                path: 'market.market_id';
+                                account: 'marketV2';
                             },
                             {
                                 kind: 'arg';
-                                path: 'subUserKey';
+                                path: 'args.order_direction';
                             }
                         ];
                     };
                 },
                 {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [
-                {
-                    name: 'subUserKey';
-                    type: 'pubkey';
-                }
-            ];
-        },
-        {
-            name: 'createUserTrade';
-            discriminator: [232, 235, 58, 194, 135, 248, 153, 1];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'payer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'userTrade';
+                    name: 'bidOrder';
                     writable: true;
                     pda: {
                         seeds: [
                             {
                                 kind: 'const';
-                                value: [117, 115, 101, 114, 95, 116, 114, 97, 100, 101];
+                                value: [111, 114, 100, 101, 114];
                             },
                             {
                                 kind: 'account';
-                                path: 'signer';
+                                path: 'buyerAuthority';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'market.market_id';
+                                account: 'marketV2';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.order_direction';
                             }
                         ];
                     };
                 },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [];
-        },
-        {
-            name: 'marketAskOrder';
-            discriminator: [189, 66, 162, 254, 3, 85, 152, 54];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'payer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'market';
-                    writable: true;
-                },
-                {
-                    name: 'orderBook';
-                    writable: true;
-                },
                 {
                     name: 'buyerAuthority';
                     writable: true;
                 },
-                {
-                    name: 'sellerTrade';
-                    writable: true;
-                },
-                {
-                    name: 'buyerTrade';
-                    writable: true;
-                },
                 {
                     name: 'mint';
                     writable: true;
@@ -2145,15 +2148,36 @@ export type TriadProtocol = {
                     writable: true;
                 },
                 {
-                    name: 'sellerAuthority';
+                    name: 'order';
                     writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'market.market_id';
+                                account: 'marketV2';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.order_direction';
+                            }
+                        ];
+                    };
                 },
                 {
-                    name: 'buyerTrade';
+                    name: 'oppositeOrder';
                     writable: true;
                 },
                 {
-                    name: 'sellerTrade';
+                    name: 'bookOrderAskAuthority';
                     writable: true;
                 },
                 {
@@ -2164,15 +2188,11 @@ export type TriadProtocol = {
                 {
                     name: 'buyerAta';
                     writable: true;
-                },
-                {
-                    name: 'sellerAta';
-                    writable: true;
                     pda: {
                         seeds: [
                             {
                                 kind: 'account';
-                                path: 'sellerAuthority';
+                                path: 'signer';
                             },
                             {
                                 kind: 'account';
@@ -2223,104 +2243,13 @@ export type TriadProtocol = {
                     };
                 },
                 {
-                    name: 'marketAta';
-                    writable: true;
-                },
-                {
-                    name: 'tokenProgram';
-                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
-                },
-                {
-                    name: 'associatedTokenProgram';
-                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
-                },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [
-                {
-                    name: 'args';
-                    type: {
-                        defined: {
-                            name: 'marketBidOrderArgs';
-                        };
-                    };
-                }
-            ];
-        },
-        {
-            name: 'migrateStake';
-            discriminator: [178, 5, 26, 85, 56, 20, 153, 160];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'user';
-                    writable: true;
-                },
-                {
-                    name: 'stakeVault';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [115, 116, 97, 107, 101, 95, 118, 97, 117, 108, 116];
-                            },
-                            {
-                                kind: 'const';
-                                value: [
-                                    84,
-                                    114,
-                                    105,
-                                    97,
-                                    100,
-                                    32,
-                                    83,
-                                    104,
-                                    97,
-                                    114,
-                                    101,
-                                    32,
-                                    49
-                                ];
-                            }
-                        ];
-                    };
-                },
-                {
-                    name: 'stake';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [115, 116, 97, 107, 101, 95, 118, 51];
-                            },
-                            {
-                                kind: 'account';
-                                path: 'user';
-                            }
-                        ];
-                    };
-                },
-                {
-                    name: 'mint';
-                    writable: true;
-                },
-                {
-                    name: 'stakeVaultAta';
+                    name: 'sellerAta';
                     writable: true;
                     pda: {
                         seeds: [
                             {
                                 kind: 'account';
-                                path: 'stakeVault';
+                                path: 'bookOrderAskAuthority';
                             },
                             {
                                 kind: 'account';
@@ -2371,13 +2300,13 @@ export type TriadProtocol = {
                     };
                 },
                 {
-                    name: 'stakeAta';
+                    name: 'marketAta';
                     writable: true;
                     pda: {
                         seeds: [
                             {
                                 kind: 'account';
-                                path: 'stake';
+                                path: 'market';
                             },
                             {
                                 kind: 'account';
@@ -2429,7 +2358,7 @@ export type TriadProtocol = {
                 },
                 {
                     name: 'tokenProgram';
-                    address: 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
                 },
                 {
                     name: 'associatedTokenProgram';
@@ -2440,7 +2369,69 @@ export type TriadProtocol = {
                     address: '11111111111111111111111111111111';
                 }
             ];
-            args: [];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'marketBidOrderArgs';
+                        };
+                    };
+                }
+            ];
+        },
+        {
+            name: 'migrateUserTradeToOrder';
+            discriminator: [33, 123, 184, 50, 31, 199, 7, 73];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'userTrade';
+                    writable: true;
+                },
+                {
+                    name: 'order';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.market_id';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.order_direction';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'migrateUserTradeToOrderArgs';
+                        };
+                    };
+                }
+            ];
         },
         {
             name: 'openOrder';
@@ -2462,12 +2453,33 @@ export type TriadProtocol = {
                     address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
                 },
                 {
-                    name: 'userTrade';
+                    name: 'market';
                     writable: true;
                 },
                 {
-                    name: 'market';
+                    name: 'order';
                     writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'market.market_id';
+                                account: 'marketV2';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.order_direction';
+                            }
+                        ];
+                    };
                 },
                 {
                     name: 'mint';
@@ -2618,7 +2630,6 @@ export type TriadProtocol = {
                 {
                     name: 'signer';
                     writable: true;
-                    signer: true;
                 },
                 {
                     name: 'payer';
@@ -2626,12 +2637,33 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'userTrade';
+                    name: 'market';
                     writable: true;
                 },
                 {
-                    name: 'market';
+                    name: 'order';
                     writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'market.market_id';
+                                account: 'marketV2';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'orderDirection';
+                            }
+                        ];
+                    };
                 },
                 {
                     name: 'mint';
@@ -2765,8 +2797,12 @@ export type TriadProtocol = {
             ];
             args: [
                 {
-                    name: 'orderId';
-                    type: 'u64';
+                    name: 'orderDirection';
+                    type: {
+                        defined: {
+                            name: 'orderDirection';
+                        };
+                    };
                 }
             ];
         },
@@ -2788,8 +2824,29 @@ export type TriadProtocol = {
                     writable: true;
                 },
                 {
-                    name: 'userTrade';
+                    name: 'order';
                     writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'market.market_id';
+                                account: 'marketV2';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.order_direction';
+                            }
+                        ];
+                    };
                 },
                 {
                     name: 'systemProgram';
@@ -2816,6 +2873,11 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
+                {
+                    name: 'payer';
+                    writable: true;
+                    signer: true;
+                },
                 {
                     name: 'market';
                     writable: true;
@@ -2825,8 +2887,29 @@ export type TriadProtocol = {
                     writable: true;
                 },
                 {
-                    name: 'userTrade';
+                    name: 'order';
                     writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'market.market_id';
+                                account: 'marketV2';
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.order_direction';
+                            }
+                        ];
+                    };
                 },
                 {
                     name: 'mint';
@@ -2981,10 +3064,6 @@ export type TriadProtocol = {
                     signer: true;
                     relations: ['poseidonAsset'];
                 },
-                {
-                    name: 'userTrade';
-                    writable: true;
-                },
                 {
                     name: 'poseidonAsset';
                     writable: true;
@@ -4051,6 +4130,10 @@ export type TriadProtocol = {
             name: 'orderBook';
             discriminator: [55, 230, 125, 218, 149, 39, 65, 248];
         },
+        {
+            name: 'orderV2';
+            discriminator: [150, 42, 80, 18, 62, 128, 236, 76];
+        },
         {
             name: 'pool';
             discriminator: [241, 154, 109, 4, 17, 177, 109, 188];
@@ -4182,73 +4265,73 @@ export type TriadProtocol = {
         },
         {
             code: 6013;
-            name: 'userTradeIsSubUser';
-            msg: 'User trade is sub user';
-        },
-        {
-            code: 6014;
             name: 'alreadyLinked';
             msg: 'Already linked';
         },
         {
-            code: 6015;
+            code: 6014;
             name: 'notLinked';
             msg: 'Not linked';
         },
         {
-            code: 6016;
+            code: 6015;
             name: 'invalidShares';
             msg: 'Invalid shares';
         },
         {
-            code: 6017;
+            code: 6016;
             name: 'unauthorizedToOrderBook';
             msg: 'Unauthorized to order book';
         },
         {
-            code: 6018;
+            code: 6017;
             name: 'fastMarketStillActive';
             msg: 'Fast Market is still active';
         },
         {
-            code: 6019;
+            code: 6018;
             name: 'invalidNonce';
             msg: 'Invalid Nonce';
         },
         {
-            code: 6020;
+            code: 6019;
             name: 'invalidMainOrder';
             msg: 'Invalid Main Order';
         },
         {
-            code: 6021;
+            code: 6020;
             name: 'invalidMarketEnd';
             msg: 'Invalid Market End';
         },
         {
-            code: 6022;
+            code: 6021;
             name: 'invalidPool';
             msg: 'Invalid Pool';
         },
         {
-            code: 6023;
+            code: 6022;
             name: 'invalidMerkleProof';
             msg: 'Invalid Merkle Proof';
         },
         {
-            code: 6024;
+            code: 6023;
             name: 'invalidMerkleRoot';
             msg: 'Invalid Merkle Root';
         },
         {
-            code: 6025;
+            code: 6024;
             name: 'claimVaultInactive';
             msg: 'Claim Vault Inactive';
         },
         {
-            code: 6026;
+            code: 6025;
             name: 'userAlreadyClaimed';
             msg: 'User Already Claimed';
+        },
+        {
+            code: 6026;
+            name: 'invalidOrderDirection';
+            msg: 'Invalid Order Direction';
         }
     ];
     types: [
@@ -4446,7 +4529,7 @@ export type TriadProtocol = {
                 kind: 'struct';
                 fields: [
                     {
-                        name: 'orderId';
+                        name: 'bookOrderId';
                         type: 'u64';
                     },
                     {
@@ -4940,10 +5023,6 @@ export type TriadProtocol = {
                         name: 'shares';
                         type: 'u64';
                     },
-                    {
-                        name: 'bidOrderId';
-                        type: 'u64';
-                    },
                     {
                         name: 'bookOrderBidId';
                         type: 'u64';
@@ -4969,15 +5048,19 @@ export type TriadProtocol = {
                         type: 'u64';
                     },
                     {
-                        name: 'askOrderId';
+                        name: 'bookOrderAskId';
                         type: 'u64';
                     },
                     {
-                        name: 'isTrdPayout';
-                        type: 'bool';
+                        name: 'orderDirection';
+                        type: {
+                            defined: {
+                                name: 'orderDirection';
+                            };
+                        };
                     },
                     {
-                        name: 'orderDirection';
+                        name: 'oppositeOrderDirection';
                         type: {
                             defined: {
                                 name: 'orderDirection';
@@ -5281,6 +5364,30 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'migrateUserTradeToOrderArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'marketId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'orderId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'orderDirection';
+                        type: {
+                            defined: {
+                                name: 'orderDirection';
+                            };
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'nft';
             type: {
@@ -5298,7 +5405,7 @@ export type TriadProtocol = {
                         type: 'u64';
                     },
                     {
-                        name: 'direction';
+                        name: 'orderDirection';
                         type: {
                             defined: {
                                 name: 'orderDirection';
@@ -5495,10 +5602,6 @@ export type TriadProtocol = {
                         name: 'marketId';
                         type: 'u64';
                     },
-                    {
-                        name: 'orderId';
-                        type: 'u64';
-                    },
                     {
                         name: 'orderDirection';
                         type: {
@@ -5539,29 +5642,9 @@ export type TriadProtocol = {
                         name: 'totalShares';
                         type: 'u64';
                     },
-                    {
-                        name: 'userNonce';
-                        type: 'u32';
-                    },
                     {
                         name: 'timestamp';
                         type: 'i64';
-                    },
-                    {
-                        name: 'filledShares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'createdAt';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'fee';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'isTrdPayout';
-                        type: 'bool';
                     }
                 ];
             };
@@ -5620,6 +5703,62 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'orderV2';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'authority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'marketId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'totalShares';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'price';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'orderStatus';
+                        type: {
+                            defined: {
+                                name: 'orderStatus';
+                            };
+                        };
+                    },
+                    {
+                        name: 'orderType';
+                        type: {
+                            defined: {
+                                name: 'orderType';
+                            };
+                        };
+                    },
+                    {
+                        name: 'orderDirection';
+                        type: {
+                            defined: {
+                                name: 'orderDirection';
+                            };
+                        };
+                    },
+                    {
+                        name: 'orderSide';
+                        type: {
+                            defined: {
+                                name: 'orderSide';
+                            };
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'placeAskOrderArgs';
             type: {
@@ -5634,8 +5773,12 @@ export type TriadProtocol = {
                         type: 'u64';
                     },
                     {
-                        name: 'bidOrderId';
-                        type: 'u64';
+                        name: 'orderDirection';
+                        type: {
+                            defined: {
+                                name: 'orderDirection';
+                            };
+                        };
                     }
                 ];
             };