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

package/dist/index.d.ts

@@ -418,9 +418,20 @@ export default class TriadProtocolClient {
      * @param args.markets.customerFeeRecipient - The address of the customer fee recipient
      */
     collectMarketFee({ markets }: CollectMarketFeeArgs): Promise<string>;
+    /**
+     * Collect Market Order Fee
+     * @param marketAddress - The address of the market
+     */
+    collectMarketOrderFee(marketAddress: PublicKey[]): Promise<string>;
     /**
      * Close Order Book
      * @param marketIds - Market IDs
      */
     closeOrderBook(marketIds: number[]): Promise<string>;
+    /**
+     * Update Pool Question
+     * @param poolId - Pool ID
+     * @param question - Question
+     */
+    updatePoolQuestion(poolId: number, question: string): Promise<string>;
 }

package/dist/index.js

@@ -1080,10 +1080,27 @@ class TriadProtocolClient {
                     .accounts({
                     signer: this.program.provider.publicKey,
                     market: market.marketAddress,
-                    mint: constants_1.USDC_MINT,
                     customer: (0, pda_1.getCustomerPDA)(this.program.programId, market.customerId),
-                    customerFeeRecipient: market.customerFeeRecipient,
-                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
+                    customerFeeRecipient: market.customerFeeRecipient
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Collect Market Order Fee
+     * @param marketAddress - The address of the market
+     */
+    collectMarketOrderFee(marketAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            for (const market of marketAddress) {
+                ixs.push(yield this.program.methods
+                    .collectMarketOrderFee()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: market
                 })
                     .instruction());
             }
@@ -1110,5 +1127,23 @@ class TriadProtocolClient {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
+    /**
+     * Update Pool Question
+     * @param poolId - Pool ID
+     * @param question - Question
+     */
+    updatePoolQuestion(poolId, question) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updatePoolQuestion((0, helpers_1.encodeString)(question, 80))
+                .accounts({
+                signer: this.program.provider.publicKey,
+                pool: (0, pda_1.getPoolPDA)(this.program.programId, poolId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
 }
 exports.default = TriadProtocolClient;

package/dist/types/idl_triad_protocol.json

@@ -712,7 +712,8 @@
                 },
                 {
                     "name": "mint",
-                    "writable": true
+                    "writable": true,
+                    "address": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
                 },
                 {
                     "name": "market_ata",
@@ -799,7 +800,130 @@
                     }
                 },
                 {
-                    "name": "token_program"
+                    "name": "stake_vault_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "stake_vault"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "token_program",
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": []
+        },
+        {
+            "name": "collect_market_order_fee",
+            "discriminator": [127, 95, 245, 217, 143, 141, 206, 34],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "squads",
+                    "writable": true,
+                    "address": "Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4"
+                },
+                {
+                    "name": "market",
+                    "writable": true
+                },
+                {
+                    "name": "mint",
+                    "writable": true,
+                    "address": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+                },
+                {
+                    "name": "market_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "market"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "squads_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "squads"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "token_program",
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
                 },
                 {
                     "name": "associated_token_program",
@@ -2553,6 +2677,33 @@
                 }
             ]
         },
+        {
+            "name": "update_pool_question",
+            "discriminator": [248, 60, 128, 181, 157, 182, 51, 166],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "pool",
+                    "writable": true
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "question",
+                    "type": {
+                        "array": ["u8", 80]
+                    }
+                }
+            ]
+        },
         {
             "name": "update_stake_vault_is_locked",
             "discriminator": [239, 65, 219, 190, 157, 173, 139, 226],
@@ -2704,6 +2855,10 @@
             "name": "CollectMarketFeeEvent",
             "discriminator": [210, 147, 203, 216, 158, 111, 59, 143]
         },
+        {
+            "name": "CollectMarketOrderFeeEvent",
+            "discriminator": [161, 42, 44, 15, 110, 57, 203, 165]
+        },
         {
             "name": "MarketEvent",
             "discriminator": [212, 67, 145, 23, 58, 104, 52, 83]
@@ -3291,6 +3446,26 @@
                 ]
             }
         },
+        {
+            "name": "CollectMarketOrderFeeEvent",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "market_id",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "fee",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "timestamp",
+                        "type": "i64"
+                    }
+                ]
+            }
+        },
         {
             "name": "Collection",
             "type": {

package/dist/types/triad_protocol.d.ts

@@ -1043,6 +1043,7 @@ export type TriadProtocol = {
                 {
                     name: 'mint';
                     writable: true;
+                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
                 },
                 {
                     name: 'marketAta';
@@ -1215,8 +1216,218 @@ export type TriadProtocol = {
                         };
                     };
                 },
+                {
+                    name: 'stakeVaultAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'stakeVault';
+                            },
+                            {
+                                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: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+                },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [];
+        },
+        {
+            name: 'collectMarketOrderFee';
+            discriminator: [127, 95, 245, 217, 143, 141, 206, 34];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'squads';
+                    writable: true;
+                    address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
+                },
+                {
+                    name: 'market';
+                    writable: true;
+                },
+                {
+                    name: 'mint';
+                    writable: true;
+                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+                },
+                {
+                    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: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
                 },
                 {
                     name: 'associatedTokenProgram';
@@ -3499,6 +3710,33 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'updatePoolQuestion';
+            discriminator: [248, 60, 128, 181, 157, 182, 51, 166];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'pool';
+                    writable: true;
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'question';
+                    type: {
+                        array: ['u8', 80];
+                    };
+                }
+            ];
+        },
         {
             name: 'updateStakeVaultIsLocked';
             discriminator: [239, 65, 219, 190, 157, 173, 139, 226];
@@ -3662,6 +3900,10 @@ export type TriadProtocol = {
             name: 'collectMarketFeeEvent';
             discriminator: [210, 147, 203, 216, 158, 111, 59, 143];
         },
+        {
+            name: 'collectMarketOrderFeeEvent';
+            discriminator: [161, 42, 44, 15, 110, 57, 203, 165];
+        },
         {
             name: 'marketEvent';
             discriminator: [212, 67, 145, 23, 58, 104, 52, 83];
@@ -4249,6 +4491,26 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'collectMarketOrderFeeEvent';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'marketId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'fee';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'timestamp';
+                        type: 'i64';
+                    }
+                ];
+            };
+        },
         {
             name: 'collection';
             type: {

package/package.json

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