@triadxyz/triad-protocol 2.2.9-beta → 2.3.1-beta

package/dist/trade.d.ts

@@ -255,7 +255,10 @@ export default class Trade {
      * @param options - RPC options
      *
      */
-    allowMarketToPayout(marketId: number, options?: RpcOptions): Promise<string>;
+    allowMarketToPayout({ marketId, poolId }: {
+        marketId: number;
+        poolId?: number;
+    }, options?: RpcOptions): Promise<string>;
     /**
      * Create Sub User Trade
      * @param user - User PublicKey the main user
@@ -366,4 +369,11 @@ export default class Trade {
             ask: Order[];
         };
     }>;
+    /**
+     * Collect Market Fee
+     * @param marketId - The ID of the market
+     *
+     * @param options - RPC options
+     */
+    collectMarketFee(marketId: number, options?: RpcOptions): Promise<string>;
 }

package/dist/trade.js

@@ -202,6 +202,12 @@ class Trade {
                 signer: this.program.provider.publicKey
             })
                 .instruction());
+            let userTrade = null;
+            try {
+                yield this.getUserTrade(this.program.provider.publicKey);
+                userTrade = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
+            }
+            catch (_a) { }
             for (const market of markets) {
                 if (market.question.length > 80) {
                     throw new Error('Market question must be less than 80 characters');
@@ -220,7 +226,8 @@ class Trade {
                     mint,
                     tokenProgram: (0, helpers_1.getTokenProgram)(mint),
                     pool: poolPDA,
-                    customer
+                    customer,
+                    userTrade
                 })
                     .instruction());
             }
@@ -401,9 +408,13 @@ class Trade {
      * @param options - RPC options
      *
      */
-    allowMarketToPayout(marketId, options) {
+    allowMarketToPayout({ marketId, poolId }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
+            let poolPDA = null;
+            if (poolId) {
+                poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
+            }
             ixs.push(yield this.program.methods
                 .updateMarket({
                 winningDirection: null,
@@ -412,7 +423,8 @@ class Trade {
             })
                 .accounts({
                 signer: this.program.provider.publicKey,
-                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
+                pool: poolPDA
             })
                 .instruction());
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
@@ -837,5 +849,25 @@ class Trade {
             return orderBook;
         });
     }
+    /**
+     * Collect Market Fee
+     * @param marketId - The ID of the market
+     *
+     * @param options - RPC options
+     */
+    collectMarketFee(marketId, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .collectMarketFee()
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
+                mint: constants_1.TRD_MINT
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
+    }
 }
 exports.default = Trade;

package/dist/types/idl_triad_protocol.json

@@ -762,6 +762,99 @@
             ],
             "args": []
         },
+        {
+            "name": "collect_market_fee",
+            "discriminator": [139, 4, 96, 182, 216, 250, 122, 79],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "squads",
+                    "writable": true,
+                    "address": "6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq"
+                },
+                {
+                    "name": "market",
+                    "writable": true
+                },
+                {
+                    "name": "mint",
+                    "writable": true
+                },
+                {
+                    "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": "receiver_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": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+                },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "collect_remaining_liquidity",
             "discriminator": [153, 107, 201, 83, 183, 195, 59, 186],
@@ -3292,10 +3385,8 @@
                         "type": "u16"
                     },
                     {
-                        "name": "padding_2",
-                        "type": {
-                            "array": ["u8", 8]
-                        }
+                        "name": "fee_recipient",
+                        "type": "pubkey"
                     },
                     {
                         "name": "pool_id",
@@ -3304,7 +3395,7 @@
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 72]
+                            "array": ["u8", 48]
                         }
                     }
                 ]

package/dist/types/trade.d.ts

@@ -37,6 +37,7 @@ export type Market = {
     payoutFee: number;
     customer: string;
     poolId: number;
+    feeRecipient: string;
 };
 export type UserTrade = {
     user: string;

package/dist/types/triad_protocol.d.ts

@@ -1186,6 +1186,157 @@ export type TriadProtocol = {
             ];
             args: [];
         },
+        {
+            name: 'collectMarketFee';
+            discriminator: [139, 4, 96, 182, 216, 250, 122, 79];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'squads';
+                    writable: true;
+                    address: '6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq';
+                },
+                {
+                    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: 'receiverAta';
+                    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: 'collectRemainingLiquidity';
             discriminator: [153, 107, 201, 83, 183, 195, 59, 186];
@@ -4361,10 +4512,8 @@ export type TriadProtocol = {
                         type: 'u16';
                     },
                     {
-                        name: 'padding2';
-                        type: {
-                            array: ['u8', 8];
-                        };
+                        name: 'feeRecipient';
+                        type: 'pubkey';
                     },
                     {
                         name: 'poolId';
@@ -4373,7 +4522,7 @@ export type TriadProtocol = {
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 72];
+                            array: ['u8', 48];
                         };
                     }
                 ];

package/dist/utils/helpers.js

@@ -95,7 +95,8 @@ const formatMarket = (account, address) => {
             : '0',
         payoutFee: account.payoutFee,
         customer: account.customerId === 0 ? 'Triad' : account.customerId.toString(),
-        poolId: account.poolId.toNumber()
+        poolId: account.poolId.toNumber(),
+        feeRecipient: account.feeRecipient.toString()
     };
 };
 exports.formatMarket = formatMarket;

package/package.json

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