@triadxyz/triad-protocol 2.7.3-beta → 2.7.6-beta

package/dist/index.d.ts

@@ -280,6 +280,7 @@ export default class TriadProtocolClient {
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order to Payout
      * @param args.userNonce - The nonce of the user
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      *
@@ -289,6 +290,8 @@ export default class TriadProtocolClient {
         orderId: number;
         userNonce: number;
         mint: PublicKey;
+        shares: number;
+        isTrdPayout: boolean;
     }[], options?: RpcOptions): Promise<string>;
     /**
      * Allow Market to Payout
@@ -318,7 +321,11 @@ export default class TriadProtocolClient {
      * @param options - RPC options
      *
      */
-    updateMarket(marketId: number, marketEnd: number, options?: RpcOptions): Promise<string>;
+    updateMarket({ marketId, marketEnd, poolId }: {
+        marketId: number;
+        marketEnd: number;
+        poolId?: number;
+    }, options?: RpcOptions): Promise<string>;
     /**
      * Create Customer
      * @param args.id - The ID of the customer
@@ -412,10 +419,11 @@ export default class TriadProtocolClient {
      * @param args.bidOrderId - The ID of the Bid Order
      * @param args.direction - The direction of the Order
      * @param args.mint - The mint of the Order
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
-    marketAskOrder({ marketId, shares, bidOrderId, direction, mint }: MarketAskOrderArgs, options?: RpcOptions): Promise<string>;
+    marketAskOrder({ marketId, shares, bidOrderId, direction, mint, isTrdPayout }: MarketAskOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Get Orders By Market ID
      * @param marketId - The ID of the market
@@ -438,12 +446,18 @@ export default class TriadProtocolClient {
     /**
      * Collect Market Fee
      * @param args.markets - The markets to collect the fee from
+     * @param args.markets.mint - The mint of the market
+     * @param args.markets.marketAddress - The address of the market
+     * @param args.markets.customerId - The ID of the customer
+     * @param args.markets.customerFeeRecipient - The address of the customer fee recipient
      *
      * @param options - RPC options
      */
     collectMarketFee(markets: {
         mint: PublicKey;
         marketAddress: PublicKey;
+        customerId: number;
+        customerFeeRecipient: PublicKey;
     }[], options?: RpcOptions): Promise<string>;
     /**
      * Close Order Book

package/dist/index.js

@@ -463,6 +463,7 @@ class TriadProtocolClient {
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order to Payout
      * @param args.userNonce - The nonce of the user
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      *
@@ -484,6 +485,20 @@ class TriadProtocolClient {
                     tokenProgram: (0, helpers_1.getTokenProgram)(order.mint)
                 })
                     .instruction());
+                if (order.isTrdPayout) {
+                    const { setupInstructions, swapIxs, addressLookupTableAccounts } = yield (0, swap_1.swap)({
+                        connection: this.program.provider.connection,
+                        wallet: this.program.provider.publicKey.toBase58(),
+                        inToken: constants_1.USDC_MINT.toBase58(),
+                        amount: order.shares * Math.pow(10, constants_1.TRD_DECIMALS)
+                    });
+                    if (swapIxs.length === 0) {
+                        return;
+                    }
+                    ixs.push(...setupInstructions);
+                    ixs.push(...swapIxs);
+                    addressLookupTableAccounts.push(...addressLookupTableAccounts);
+                }
             }
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
@@ -547,9 +562,13 @@ class TriadProtocolClient {
      * @param options - RPC options
      *
      */
-    updateMarket(marketId, marketEnd, options) {
+    updateMarket({ marketId, marketEnd, 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({
                 marketEnd: new bn_js_1.default(marketEnd),
@@ -559,7 +578,7 @@ class TriadProtocolClient {
                 .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                pool: null
+                pool: poolPDA
             })
                 .instruction());
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
@@ -826,7 +845,7 @@ class TriadProtocolClient {
                     .mul(new bn_js_1.default(Math.pow(10, this.decimals)))
                     .div(adjustedPrice);
                 const sharesToBuy = bn_js_1.default.min(maxSharesForPrice, availableShares);
-                if (sharesToBuy.lt(new bn_js_1.default(1000000)))
+                if (sharesToBuy.lte(new bn_js_1.default(0)))
                     continue;
                 const usdcAmount = sharesToBuy
                     .mul(adjustedPrice)
@@ -869,10 +888,11 @@ class TriadProtocolClient {
      * @param args.bidOrderId - The ID of the Bid Order
      * @param args.direction - The direction of the Order
      * @param args.mint - The mint of the Order
+     * @param args.isTrdPayout - Whether to payout in TRD or not
      *
      * @param options - RPC options
      */
-    marketAskOrder({ marketId, shares, bidOrderId, direction, mint }, options) {
+    marketAskOrder({ marketId, shares, bidOrderId, direction, mint, isTrdPayout }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
@@ -887,7 +907,8 @@ class TriadProtocolClient {
             for (const order of sortedOrders) {
                 if (remainingShares.lte(new bn_js_1.default(0)))
                     break;
-                if (order.authority === this.program.provider.publicKey.toBase58()) {
+                if (order.authority === this.program.provider.publicKey.toBase58() ||
+                    order.linkedBookOrderId !== constants_1.BOOK_ORDER_NULL.toString()) {
                     continue;
                 }
                 const availableShares = new bn_js_1.default(order.totalShares).sub(new bn_js_1.default(order.filledShares));
@@ -964,6 +985,10 @@ class TriadProtocolClient {
     /**
      * Collect Market Fee
      * @param args.markets - The markets to collect the fee from
+     * @param args.markets.mint - The mint of the market
+     * @param args.markets.marketAddress - The address of the market
+     * @param args.markets.customerId - The ID of the customer
+     * @param args.markets.customerFeeRecipient - The address of the customer fee recipient
      *
      * @param options - RPC options
      */
@@ -977,6 +1002,8 @@ class TriadProtocolClient {
                     signer: this.program.provider.publicKey,
                     market: market.marketAddress,
                     mint: market.mint,
+                    customer: (0, pda_1.getCustomerPDA)(this.program.programId, market.customerId),
+                    customerFeeRecipient: market.customerFeeRecipient,
                     tokenProgram: (0, helpers_1.getTokenProgram)(market.mint)
                 })
                     .instruction());

package/dist/types/idl_triad_protocol.json

@@ -452,6 +452,14 @@
                     "name": "market",
                     "writable": true
                 },
+                {
+                    "name": "customer_fee_recipient",
+                    "writable": true
+                },
+                {
+                    "name": "customer",
+                    "writable": true
+                },
                 {
                     "name": "mint",
                     "writable": true
@@ -512,6 +520,34 @@
                         }
                     }
                 },
+                {
+                    "name": "customer_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "customer_fee_recipient"
+                            },
+                            {
+                                "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"
                 },
@@ -2238,6 +2274,10 @@
             "name": "MarketEvent",
             "discriminator": [212, 67, 145, 23, 58, 104, 52, 83]
         },
+        {
+            "name": "MarketFeeCollectedEvent",
+            "discriminator": [248, 190, 87, 22, 89, 145, 188, 207]
+        },
         {
             "name": "OrderEvent",
             "discriminator": [209, 51, 146, 206, 88, 127, 112, 69]
@@ -3041,6 +3081,46 @@
                 ]
             }
         },
+        {
+            "name": "MarketFeeCollectedEvent",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "market_id",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "triad_fee",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "customer_fee",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "triad_fee_recipient",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "customer_fee_recipient",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "customer_id",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "customer_fee_bps",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "timestamp",
+                        "type": "i64"
+                    }
+                ]
+            }
+        },
         {
             "name": "MarketV2",
             "type": {
@@ -3454,6 +3534,10 @@
                     {
                         "name": "fee",
                         "type": "u64"
+                    },
+                    {
+                        "name": "is_trd_payout",
+                        "type": "bool"
                     }
                 ]
             }

package/dist/types/index.d.ts

@@ -227,6 +227,7 @@ export type MarketAskOrderArgs = {
         flop: {};
     };
     mint: PublicKey;
+    isTrdPayout: boolean;
 };
 export type Refer = {
     id: number;

package/dist/types/triad_protocol.d.ts

@@ -644,6 +644,14 @@ export type TriadProtocol = {
                     name: 'market';
                     writable: true;
                 },
+                {
+                    name: 'customerFeeRecipient';
+                    writable: true;
+                },
+                {
+                    name: 'customer';
+                    writable: true;
+                },
                 {
                     name: 'mint';
                     writable: true;
@@ -762,6 +770,63 @@ export type TriadProtocol = {
                         };
                     };
                 },
+                {
+                    name: 'customerAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'customerFeeRecipient';
+                            },
+                            {
+                                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';
                 },
@@ -3029,6 +3094,10 @@ export type TriadProtocol = {
             name: 'marketEvent';
             discriminator: [212, 67, 145, 23, 58, 104, 52, 83];
         },
+        {
+            name: 'marketFeeCollectedEvent';
+            discriminator: [248, 190, 87, 22, 89, 145, 188, 207];
+        },
         {
             name: 'orderEvent';
             discriminator: [209, 51, 146, 206, 88, 127, 112, 69];
@@ -3832,6 +3901,46 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'marketFeeCollectedEvent';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'marketId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'triadFee';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'customerFee';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'triadFeeRecipient';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'customerFeeRecipient';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'customerId';
+                        type: 'u16';
+                    },
+                    {
+                        name: 'customerFeeBps';
+                        type: 'u16';
+                    },
+                    {
+                        name: 'timestamp';
+                        type: 'i64';
+                    }
+                ];
+            };
+        },
         {
             name: 'marketV2';
             type: {
@@ -4245,6 +4354,10 @@ export type TriadProtocol = {
                     {
                         name: 'fee';
                         type: 'u64';
+                    },
+                    {
+                        name: 'isTrdPayout';
+                        type: 'bool';
                     }
                 ];
             };

package/dist/utils/constants.d.ts

@@ -8,3 +8,4 @@ export declare const TICKET_CORE_COLLECTION: PublicKey;
 export declare const POSEIDON_COLLECTION_SYMBOL = "$PSN";
 export declare const POSEIDON_CORE_COLLECTION: PublicKey;
 export declare const TICKET_COLLECTION_SYMBOL = "PTCKT";
+export declare const BOOK_ORDER_NULL = 61;

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.USDC_MINT = exports.TRD_DECIMALS = void 0;
+exports.BOOK_ORDER_NULL = exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.USDC_MINT = exports.TRD_DECIMALS = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.TRD_DECIMALS = 6;
 exports.USDC_MINT = new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
@@ -11,3 +11,4 @@ exports.TICKET_CORE_COLLECTION = new web3_js_1.PublicKey('BaqopH1VXYUCT6VsojbTib
 exports.POSEIDON_COLLECTION_SYMBOL = '$PSN';
 exports.POSEIDON_CORE_COLLECTION = new web3_js_1.PublicKey('69CLccefLRmvDSAJP7Er632dvn878qkpdcnvq5ZUspSm');
 exports.TICKET_COLLECTION_SYMBOL = 'PTCKT';
+exports.BOOK_ORDER_NULL = 61;

package/package.json

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