@triadxyz/triad-protocol 3.1.2-beta → 3.1.3-beta

package/dist/types/triad_protocol.d.ts

@@ -288,6 +288,7 @@ export type TriadProtocol = {
                 {
                     name: 'mint';
                     writable: true;
+                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
                 },
                 {
                     name: 'userAta';
@@ -405,6 +406,7 @@ export type TriadProtocol = {
                 },
                 {
                     name: 'tokenProgram';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
                 },
                 {
                     name: 'associatedTokenProgram';
@@ -1000,6 +1002,36 @@ export type TriadProtocol = {
                     name: 'market';
                     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: 'customerFeeRecipient';
                     writable: true;
@@ -1197,157 +1229,6 @@ export type TriadProtocol = {
             ];
             args: [];
         },
-        {
-            name: 'collectRemainingLiquidity';
-            discriminator: [153, 107, 201, 83, 183, 195, 59, 186];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'squads';
-                    writable: true;
-                    address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
-                },
-                {
-                    name: 'market';
-                    writable: true;
-                },
-                {
-                    name: 'mint';
-                    writable: true;
-                },
-                {
-                    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: 'collectRoyalty';
             discriminator: [189, 235, 7, 168, 255, 50, 30, 75];
@@ -2014,6 +1895,125 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'marketAskOrderV1';
+            discriminator: [232, 254, 180, 215, 149, 178, 211, 216];
+            accounts: [
+                {
+                    name: 'signer';
+                    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;
+                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+                },
+                {
+                    name: 'sellerAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                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;
+                },
+                {
+                    name: 'tokenProgram';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+                },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'marketAskOrderArgs';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'marketBidOrder';
             discriminator: [145, 89, 7, 166, 85, 59, 48, 149];
@@ -2118,11 +2118,130 @@ export type TriadProtocol = {
                     writable: true;
                 },
                 {
-                    name: 'squadsAta';
+                    name: 'tokenProgram';
+                },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'marketBidOrderArgs';
+                        };
+                    };
+                }
+            ];
+        },
+        {
+            name: 'marketBidOrderV1';
+            discriminator: [217, 128, 204, 203, 203, 240, 236, 136];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'market';
+                    writable: true;
+                },
+                {
+                    name: 'orderBook';
+                    writable: true;
+                },
+                {
+                    name: 'sellerAuthority';
+                    writable: true;
+                },
+                {
+                    name: 'buyerTrade';
+                    writable: true;
+                },
+                {
+                    name: 'sellerTrade';
+                    writable: true;
+                },
+                {
+                    name: 'mint';
+                    writable: true;
+                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+                },
+                {
+                    name: 'buyerAta';
+                    writable: true;
+                },
+                {
+                    name: 'sellerAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'sellerAuthority';
+                            },
+                            {
+                                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;
                 },
                 {
                     name: 'tokenProgram';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
                 },
                 {
                     name: 'associatedTokenProgram';
@@ -2528,6 +2647,7 @@ export type TriadProtocol = {
                 {
                     name: 'mint';
                     writable: true;
+                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
                 },
                 {
                     name: 'userAta';
@@ -2645,6 +2765,7 @@ export type TriadProtocol = {
                 },
                 {
                     name: 'tokenProgram';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
                 },
                 {
                     name: 'associatedTokenProgram';
@@ -3224,8 +3345,8 @@ export type TriadProtocol = {
             args: [];
         },
         {
-            name: 'updateIsActiveClaimVault';
-            discriminator: [19, 59, 238, 222, 216, 2, 60, 71];
+            name: 'updateClaimVaultIsActive';
+            discriminator: [122, 240, 207, 89, 71, 29, 176, 103];
             accounts: [
                 {
                     name: 'signer';
@@ -3244,6 +3365,29 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'updateClaimVaultMerkleRoot';
+            discriminator: [83, 209, 102, 81, 118, 44, 157, 23];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'claimVault';
+                    writable: true;
+                }
+            ];
+            args: [
+                {
+                    name: 'merkleRoot';
+                    type: {
+                        array: ['u8', 32];
+                    };
+                }
+            ];
+        },
         {
             name: 'updateMarketEnd';
             discriminator: [10, 188, 22, 219, 206, 83, 67, 31];
@@ -3662,11 +3806,16 @@ export type TriadProtocol = {
         },
         {
             code: 6024;
+            name: 'invalidMerkleRoot';
+            msg: 'Invalid Merkle Root';
+        },
+        {
+            code: 6025;
             name: 'claimVaultInactive';
             msg: 'Claim Vault Inactive';
         },
         {
-            code: 6025;
+            code: 6026;
             name: 'userAlreadyClaimed';
             msg: 'User Already Claimed';
         }
@@ -4077,6 +4226,10 @@ export type TriadProtocol = {
                         name: 'triadFee';
                         type: 'u64';
                     },
+                    {
+                        name: 'revShareFee';
+                        type: 'u64';
+                    },
                     {
                         name: 'customerId';
                         type: 'u16';
@@ -4143,10 +4296,6 @@ export type TriadProtocol = {
                         name: 'totalUsers';
                         type: 'u64';
                     },
-                    {
-                        name: 'mint';
-                        type: 'pubkey';
-                    },
                     {
                         name: 'name';
                         type: 'string';
@@ -4622,10 +4771,18 @@ export type TriadProtocol = {
                         name: 'poolId';
                         type: 'u64';
                     },
+                    {
+                        name: 'marketOrderFeeAvailable';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'marketOrderFeeClaimed';
+                        type: 'u64';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 48];
+                            array: ['u8', 32];
                         };
                     }
                 ];
@@ -5197,10 +5354,22 @@ export type TriadProtocol = {
                         name: 'amount';
                         type: 'u64';
                     },
+                    {
+                        name: 'revShareCheckedTs';
+                        type: 'i64';
+                    },
+                    {
+                        name: 'revShareClaimed';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'revShareAvailable';
+                        type: 'u64';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 32];
+                            array: ['u8', 8];
                         };
                     }
                 ];
@@ -5240,11 +5409,11 @@ export type TriadProtocol = {
                         type: 'u8';
                     },
                     {
-                        name: 'nftStaked';
+                        name: 'revShareClaimed';
                         type: 'u64';
                     },
                     {
-                        name: 'slots';
+                        name: 'revShareAvailable';
                         type: 'u64';
                     },
                     {
@@ -5341,15 +5510,19 @@ export type TriadProtocol = {
                         type: 'pubkey';
                     },
                     {
-                        name: 'totalDeposits';
-                        type: 'u64';
+                        name: 'padding1';
+                        type: {
+                            array: ['u8', 8];
+                        };
                     },
                     {
-                        name: 'totalWithdraws';
-                        type: 'u64';
+                        name: 'padding2';
+                        type: {
+                            array: ['u8', 8];
+                        };
                     },
                     {
-                        name: 'padding1';
+                        name: 'padding3';
                         type: {
                             array: ['u8', 8];
                         };

package/dist/utils/helpers.d.ts

@@ -1,7 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import { IdlAccounts } from '@coral-xyz/anchor';
-import { OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Stake, StakeVault, Unstake } from './../types';
-import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade, Pool, BookOrder, Customer } from '../types';
+import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Stake, StakeVault, Unstake, Pool, BookOrder, Customer, ClaimVault, ClaimedUser } from '../types';
 import { TriadProtocol } from '../types/triad_protocol';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
@@ -10,10 +9,12 @@ export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV3'])
 export declare const formatUnstake: (unstake: IdlAccounts<TriadProtocol>['unstake'], address: PublicKey) => Unstake;
 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 formatUserTrade: (account: IdlAccounts<TriadProtocol>['userTrade'], address: PublicKey) => UserTrade;
 export declare const formatOrder: (order: IdlAccounts<TriadProtocol>['userTrade']['orders'][number], authority?: string) => Order;
 export declare const formatBookOrder: (order: IdlAccounts<TriadProtocol>['orderBook']['hypeOrders'][number] | IdlAccounts<TriadProtocol>['orderBook']['flopOrders'][number]) => BookOrder;
 export declare const formatCustomer: (account: IdlAccounts<TriadProtocol>['customer'], publicKey: PublicKey) => Customer;
+export declare const formatClaimVault: (account: IdlAccounts<TriadProtocol>['claimVault'], address: PublicKey) => ClaimVault;
+export declare const formatClaimedUser: (account: IdlAccounts<TriadProtocol>['claimedUser'], address: PublicKey) => ClaimedUser;
 export declare const calculateStakeRewards: (stake: Stake) => number;
 export declare const getTokenProgram: (mint: PublicKey) => PublicKey;
 export declare const getOrderDirection: (orderDirection: OrderDirectionEncoded) => OrderDirection;