@triadxyz/triad-protocol 2.3.8-beta → 2.4.0-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

@@ -871,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));
                     }
@@ -890,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
@@ -898,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",

package/dist/types/index.d.ts

@@ -77,6 +77,7 @@ export type BookOrder = {
     orderDirection: OrderDirection;
     orderSide: OrderSide;
     userNonce: string;
+    linkedBookOrderId: string;
 };
 export declare enum WinningDirection {
     HYPE = "Hype",
@@ -228,3 +229,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';

package/dist/utils/helpers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatBookOrder = exports.formatOrder = exports.formatUserTrade = exports.formatMarket = exports.formatPool = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("../types");
 const constants_1 = require("./constants");
@@ -134,11 +135,12 @@ const formatBookOrder = (order) => {
         id: order.id.toString(),
         price: order.price.toString(),
         totalShares: order.totalShares.toString(),
-        authority: order.authority.toString(),
+        authority: new web3_js_1.PublicKey(order.authority).toString(),
         filledShares: order.filledShares.toString(),
         orderDirection: (0, exports.getOrderDirectionFromNumber)(order.orderDirection),
         orderSide: (0, exports.getOrderSideFromNumber)(order.orderSide),
-        userNonce: order.userNonce.toString()
+        userNonce: order.userNonce.toString(),
+        linkedBookOrderId: order.linkedBookOrderId.toString()
     };
 };
 exports.formatBookOrder = formatBookOrder;

package/package.json

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