@triadxyz/triad-protocol 2.3.7-beta → 2.3.9-beta

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import { TriadProtocol } from './types/triad_protocol';
-import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions } from './types';
+import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions, CollectMarketFeeArgs } from './types';
 import Stake from './stake';
 import Poseidon from './poseidon';
 export default class TriadProtocolClient {
@@ -409,5 +409,5 @@ export default class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    collectMarketFee(marketId: number, options?: RpcOptions): Promise<string>;
+    collectMarketFee({ marketId, feeRecipient }: CollectMarketFeeArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/index.js

@@ -188,10 +188,16 @@ class TriadProtocolClient {
                 tokenProgram: (0, helpers_1.getTokenProgram)(mint),
                 customer,
                 pool: poolPDA,
-                orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
                 userTrade
             })
                 .instruction());
+            ixs.push(yield this.program.methods
+                .createOrderBook(new bn_js_1.default(marketId))
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+            })
+                .instruction());
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
@@ -244,11 +250,17 @@ class TriadProtocolClient {
                     mint,
                     tokenProgram: (0, helpers_1.getTokenProgram)(mint),
                     pool: poolPDA,
-                    orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, market.marketId),
                     customer,
                     userTrade
                 })
                     .instruction());
+                ixs.push(yield this.program.methods
+                    .createOrderBook(new bn_js_1.default(market.marketId))
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, market.marketId)
+                })
+                    .instruction());
             }
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
@@ -859,6 +871,8 @@ class TriadProtocolClient {
             data.spreadToReward = orderBook.spreadToReward.toString();
             const processOrders = (orders, side) => {
                 for (const order of orders) {
+                    if (order.price.eq(new bn_js_1.default(0)))
+                        continue;
                     if ((0, helpers_1.getOrderSideFromNumber)(order.orderSide) === types_1.OrderSide.BID) {
                         data[side].bid.push((0, helpers_1.formatBookOrder)(order));
                     }
@@ -878,7 +892,7 @@ class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    collectMarketFee(marketId, options) {
+    collectMarketFee({ marketId, feeRecipient }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             ixs.push(yield this.program.methods
@@ -886,6 +900,7 @@ class TriadProtocolClient {
                 .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
+                feeRecipient,
                 mint: constants_1.TRD_MINT
             })
                 .instruction());

package/dist/types/idl_triad_protocol.json

@@ -404,9 +404,8 @@
                     "signer": true
                 },
                 {
-                    "name": "squads",
-                    "writable": true,
-                    "address": "6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq"
+                    "name": "fee_recipient",
+                    "writable": true
                 },
                 {
                     "name": "market",
@@ -451,7 +450,7 @@
                         "seeds": [
                             {
                                 "kind": "account",
-                                "path": "squads"
+                                "path": "fee_recipient"
                             },
                             {
                                 "kind": "account",
@@ -691,11 +690,6 @@
                         ]
                     }
                 },
-                {
-                    "name": "order_book",
-                    "writable": true,
-                    "signer": true
-                },
                 {
                     "name": "mint",
                     "writable": true
@@ -751,6 +745,47 @@
                 }
             ]
         },
+        {
+            "name": "create_order_book",
+            "discriminator": [153, 114, 9, 51, 100, 68, 240, 197],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "market",
+                    "writable": true
+                },
+                {
+                    "name": "order_book",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [111, 114, 100, 101, 114, 95, 98, 111, 111, 107]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "market_id"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "market_id",
+                    "type": "u64"
+                }
+            ]
+        },
         {
             "name": "create_pool",
             "discriminator": [233, 146, 209, 142, 207, 104, 64, 188],

package/dist/types/index.d.ts

@@ -228,3 +228,7 @@ export type MarketAskOrderArgs = {
     };
     mint: PublicKey;
 };
+export type CollectMarketFeeArgs = {
+    marketId: number;
+    feeRecipient: PublicKey;
+};

package/dist/types/triad_protocol.d.ts

@@ -596,9 +596,8 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'squads';
+                    name: 'feeRecipient';
                     writable: true;
-                    address: '6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq';
                 },
                 {
                     name: 'market';
@@ -672,7 +671,7 @@ export type TriadProtocol = {
                         seeds: [
                             {
                                 kind: 'account';
-                                path: 'squads';
+                                path: 'feeRecipient';
                             },
                             {
                                 kind: 'account';
@@ -999,11 +998,6 @@ export type TriadProtocol = {
                         ];
                     };
                 },
-                {
-                    name: 'orderBook';
-                    writable: true;
-                    signer: true;
-                },
                 {
                     name: 'mint';
                     writable: true;
@@ -1088,6 +1082,47 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'createOrderBook';
+            discriminator: [153, 114, 9, 51, 100, 68, 240, 197];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'market';
+                    writable: true;
+                },
+                {
+                    name: 'orderBook';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114, 95, 98, 111, 111, 107];
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'marketId';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'marketId';
+                    type: 'u64';
+                }
+            ];
+        },
         {
             name: 'createPool';
             discriminator: [233, 146, 209, 142, 207, 104, 64, 188];

package/package.json

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