@triadxyz/triad-protocol 2.9.8-beta → 3.0.0-beta

package/dist/index.d.ts

@@ -390,7 +390,7 @@ export default class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    placeBidOrder({ marketId, amount, direction, mint, price }: PlaceBidOrderArgs, options?: RpcOptions): Promise<string>;
+    placeBidOrder({ marketId, amount, direction, mint, price, isTrdPayout }: PlaceBidOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Place Ask Order
      * @param args.marketId - The ID of the Market

package/dist/index.js

@@ -738,7 +738,7 @@ class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    placeBidOrder({ marketId, amount, direction, mint, price }, options) {
+    placeBidOrder({ marketId, amount, direction, mint, price, isTrdPayout }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(direction)[0]);
@@ -749,7 +749,8 @@ class TriadProtocolClient {
                 .placeBidOrder({
                 amount: new bn_js_1.default(amount * Math.pow(10, this.decimals)),
                 price: new bn_js_1.default(price * Math.pow(10, this.decimals)),
-                orderDirection: direction
+                orderDirection: direction,
+                isTrdPayout
             })
                 .accounts({
                 signer: this.program.provider.publicKey,
@@ -896,11 +897,11 @@ class TriadProtocolClient {
                     let adjustedPrice = orderPrice;
                     if (feeBps > 0) {
                         const priceSpread = new bn_js_1.default(1000000).sub(orderPrice);
-                        const fee = (0, helpers_1.roundUp)(priceSpread
+                        const fee = priceSpread
                             .mul(orderPrice)
                             .mul(new bn_js_1.default(feeBps))
                             .div(new bn_js_1.default(10000))
-                            .div(new bn_js_1.default(1000000)));
+                            .div(new bn_js_1.default(1000000));
                         adjustedPrice = orderPrice.add(fee);
                     }
                     const maxSharesForPrice = tempRemainingUSDC
@@ -945,11 +946,11 @@ class TriadProtocolClient {
                 let adjustedPrice = orderPrice;
                 if (feeBps > 0) {
                     const priceSpread = new bn_js_1.default(1000000).sub(orderPrice);
-                    const fee = (0, helpers_1.roundUp)(priceSpread
+                    const fee = priceSpread
                         .mul(orderPrice)
                         .mul(new bn_js_1.default(feeBps))
                         .div(new bn_js_1.default(10000))
-                        .div(new bn_js_1.default(1000000)));
+                        .div(new bn_js_1.default(1000000));
                     adjustedPrice = orderPrice.add(fee);
                 }
                 const maxSharesForPrice = remainingUSDC
@@ -1033,11 +1034,11 @@ class TriadProtocolClient {
                     let adjustedPrice = orderPrice;
                     if (feeBps > 0) {
                         const priceSpread = new bn_js_1.default(1000000).sub(orderPrice);
-                        const fee = (0, helpers_1.roundUp)(priceSpread
+                        const fee = priceSpread
                             .mul(orderPrice)
                             .mul(new bn_js_1.default(feeBps))
                             .div(new bn_js_1.default(10000))
-                            .div(new bn_js_1.default(1000000)));
+                            .div(new bn_js_1.default(1000000));
                         adjustedPrice = orderPrice.sub(fee);
                     }
                     amountOfUSDC = amountOfUSDC.add(sharesToSell.mul(adjustedPrice).div(new bn_js_1.default(Math.pow(10, this.decimals))));

package/dist/types/idl_triad_protocol.json

@@ -3646,6 +3646,10 @@
                                 "name": "OrderDirection"
                             }
                         }
+                    },
+                    {
+                        "name": "is_trd_payout",
+                        "type": "bool"
                     }
                 ]
             }

package/dist/types/index.d.ts

@@ -67,6 +67,7 @@ export type Order = {
     userNonce: string;
     authority: string;
     createdAt: string;
+    isTrdPayout: boolean;
 };
 export type BookOrder = {
     id: string;
@@ -115,6 +116,7 @@ export type PlaceBidOrderArgs = {
         flop: {};
     };
     mint: PublicKey;
+    isTrdPayout: boolean;
 };
 export type PlaceAskOrderArgs = {
     marketId: number;

package/dist/types/triad_protocol.d.ts

@@ -4466,6 +4466,10 @@ export type TriadProtocol = {
                                 name: 'orderDirection';
                             };
                         };
+                    },
+                    {
+                        name: 'isTrdPayout';
+                        type: 'bool';
                     }
                 ];
             };

package/dist/utils/helpers.d.ts

@@ -3,7 +3,6 @@ import { IdlAccounts } from '@coral-xyz/anchor';
 import { Stake, StakeVault, Unstake } from './../types/stake';
 import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade, Pool, BookOrder, Refer, Customer } from '../types';
 import { TriadProtocol } from '../types/triad_protocol';
-import { BN } from '@coral-xyz/anchor';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: IdlAccounts<TriadProtocol>['stakeVault']) => StakeVault;
@@ -48,4 +47,3 @@ export declare const getOrderStatus: (status: {
 }) => OrderStatus;
 export declare const formatRefer: (account: IdlAccounts<TriadProtocol>['refer']) => Refer;
 export declare const formatCustomer: (account: IdlAccounts<TriadProtocol>['customer'], publicKey: PublicKey) => Customer;
-export declare const roundUp: (value: BN) => BN;

package/dist/utils/helpers.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.roundUp = exports.formatCustomer = exports.formatRefer = 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.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.formatCustomer = exports.formatRefer = 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.formatUnstake = 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");
-const anchor_1 = require("@coral-xyz/anchor");
 const encodeString = (value, alloc = 32) => {
     const buffer = Buffer.alloc(alloc, 32);
     buffer.write(value);
@@ -130,7 +129,8 @@ const formatOrder = (order, authority) => {
         orderSide: (0, exports.getOrderSide)(order.orderSide),
         price: order.price.toString(),
         totalShares: order.totalShares.toString(),
-        filledShares: order.filledShares ? order.filledShares.toString() : ''
+        filledShares: order.filledShares ? order.filledShares.toString() : '',
+        isTrdPayout: order.isTrdPayout
     };
 };
 exports.formatOrder = formatOrder;
@@ -249,9 +249,3 @@ const formatCustomer = (account, publicKey) => {
     };
 };
 exports.formatCustomer = formatCustomer;
-const roundUp = (value) => {
-    let decimal = value.toNumber() / 1000000;
-    let rounded = Math.ceil(decimal * 100) / 100;
-    return new anchor_1.BN(rounded * 1000000);
-};
-exports.roundUp = roundUp;

package/package.json

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