@triadxyz/triad-protocol 3.5.0-beta → 3.5.2-beta

package/dist/index.d.ts

@@ -10,6 +10,7 @@ export * from './types';
 export * from './utils/helpers';
 export * from './utils/merkle';
 export * from './utils/feeCalculator';
+export * from './utils/constants';
 export default class TriadProtocol {
     private connection;
     private wallet;
@@ -25,6 +26,11 @@ export default class TriadProtocol {
      * @param wallet - User wallet PublicKey
      */
     getUserOrders(wallet: PublicKey): Promise<import("./types").Order[]>;
+    /**
+     * Get Orders By Market ID
+     * @param marketId - The ID of the market
+     */
+    getOrdersByMarketId(marketId: number): Promise<import("./types").Order[]>;
     /**
      * Get User Orders By Market ID
      * @param wallet - User wallet PublicKey
@@ -189,6 +195,7 @@ export default class TriadProtocol {
         marketId: number;
         orderDirection: OrderDirectionEncoded;
         mint: PublicKey;
+        authority: PublicKey;
     }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Create Customer
@@ -210,12 +217,11 @@ export default class TriadProtocol {
     placeBidOrder({ orders, isTrdPayout }: PlaceBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Place Ask Order
-     * @param args.marketId - The ID of the Market
      * @param args.orders - Array of orders to execute
      * @param args.orders.amount - The amount of the Order
      * @param args.orders.price - The price of the Order
-     * @param args.orders.bidOrderId - The ID of the Bid Order
-     * @param args.orders.bidNonce - The nonce of the Bid Order
+     * @param args.orders.marketId - The Id from the market
+     * @param args.orders.orderDirection - The direction of the Order
      */
     placeAskOrder({ orders }: PlaceAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
@@ -228,6 +234,7 @@ export default class TriadProtocol {
     /**
      * Cancel Ask Order
      * @param args.orders.marketId - The ID of the Market
+     * @param args.orders.authority - The authority of the order
      * @param args.orders.bookOrderId - The ID of the Book Order
      * @param args.orders.orderDirection - The direction of the Order
      */
@@ -275,6 +282,4 @@ export default class TriadProtocol {
         customerId: number;
         feeBps: number;
     }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    closeUser(userTrade: PublicKey): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    migrateUserTradeToOrder(userTrade: PublicKey, marketId: number, orderId: number, orderDirection: OrderDirectionEncoded): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/index.js

@@ -30,6 +30,7 @@ const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const bn_js_1 = __importDefault(require("bn.js"));
+const bs58_1 = __importDefault(require("bs58"));
 const helpers_1 = require("./utils/helpers");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
 const types_1 = require("./types");
@@ -46,6 +47,7 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./utils/helpers"), exports);
 __exportStar(require("./utils/merkle"), exports);
 __exportStar(require("./utils/feeCalculator"), exports);
+__exportStar(require("./utils/constants"), exports);
 class TriadProtocol {
     constructor(connection, wallet, rpcOptions) {
         this.connection = connection;
@@ -76,7 +78,25 @@ class TriadProtocol {
                     }
                 }
             ]);
-            return orders.map(({ account }) => (0, helpers_1.formatOrder)(account));
+            return orders.map(({ account, publicKey }) => (0, helpers_1.formatOrder)(account, publicKey));
+        });
+    }
+    /**
+     * Get Orders By Market ID
+     * @param marketId - The ID of the market
+     */
+    getOrdersByMarketId(marketId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const marketIdBytes = new bn_js_1.default(marketId).toArray('le', 8);
+            const orders = yield this.program.account.orderV2.all([
+                {
+                    memcmp: {
+                        offset: 8 + 32,
+                        bytes: bs58_1.default.encode(marketIdBytes)
+                    }
+                }
+            ]);
+            return orders.map(({ account, publicKey }) => (0, helpers_1.formatOrder)(account, publicKey));
         });
     }
     /**
@@ -557,19 +577,19 @@ class TriadProtocol {
     payoutOrder(orders) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            if (orders.length > 6) {
-                throw new Error('Max 6 orders per transaction');
+            if (orders.length > 4) {
+                throw new Error('Max 4 orders per transaction');
             }
             for (const order of orders) {
                 ixs.push(yield this.program.methods
-                    .payoutOrder(order.orderDirection)
+                    .payoutOrder()
                     .accounts({
-                    signer: this.program.provider.publicKey,
+                    signer: order.authority,
                     payer: this.rpcOptions.payer,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     mint: order.mint,
                     tokenProgram: (0, helpers_2.getTokenProgram)(order.mint),
-                    order: (0, pda_1.getOrderPDA)(this.program.programId, this.program.provider.publicKey, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
+                    order: (0, pda_1.getOrderPDA)(this.program.programId, order.authority, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
                 })
                     .instruction());
             }
@@ -661,12 +681,11 @@ class TriadProtocol {
     }
     /**
      * Place Ask Order
-     * @param args.marketId - The ID of the Market
      * @param args.orders - Array of orders to execute
      * @param args.orders.amount - The amount of the Order
      * @param args.orders.price - The price of the Order
-     * @param args.orders.bidOrderId - The ID of the Bid Order
-     * @param args.orders.bidNonce - The nonce of the Bid Order
+     * @param args.orders.marketId - The Id from the market
+     * @param args.orders.orderDirection - The direction of the Order
      */
     placeAskOrder({ orders }) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -707,11 +726,12 @@ class TriadProtocol {
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .cancelBidOrder({
+                    marketId: new bn_js_1.default(order.marketId),
                     bookOrderId: new bn_js_1.default(order.bookOrderId),
                     orderDirection: order.orderDirection
                 })
                     .accounts({
-                    signer: this.program.provider.publicKey,
+                    signer: new web3_js_1.PublicKey(order.authority),
                     payer: this.rpcOptions.payer,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId)
@@ -724,6 +744,7 @@ class TriadProtocol {
     /**
      * Cancel Ask Order
      * @param args.orders.marketId - The ID of the Market
+     * @param args.orders.authority - The authority of the order
      * @param args.orders.bookOrderId - The ID of the Book Order
      * @param args.orders.orderDirection - The direction of the Order
      */
@@ -736,14 +757,16 @@ class TriadProtocol {
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .cancelAskOrder({
+                    marketId: new bn_js_1.default(order.marketId),
                     bookOrderId: new bn_js_1.default(order.bookOrderId),
                     orderDirection: order.orderDirection
                 })
                     .accounts({
-                    signer: this.program.provider.publicKey,
+                    signer: order.authority,
+                    payer: this.rpcOptions.payer,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId),
-                    order: (0, pda_1.getOrderPDA)(this.program.programId, this.program.provider.publicKey, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
+                    order: (0, pda_1.getOrderPDA)(this.program.programId, order.authority, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
                 })
                     .instruction());
             }
@@ -979,31 +1002,5 @@ class TriadProtocol {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
-    closeUser(userTrade) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .closeUser()
-                    .accounts({ userTrade })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    migrateUserTradeToOrder(userTrade, marketId, orderId, orderDirection) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .migrateUserTradeToOrder({
-                    marketId: new bn_js_1.default(marketId),
-                    orderId: new bn_js_1.default(orderId),
-                    orderDirection
-                })
-                    .accounts({ userTrade })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
 }
 exports.default = TriadProtocol;

package/dist/types/idl_triad_protocol.json

@@ -155,6 +155,11 @@
                     "name": "signer",
                     "writable": true
                 },
+                {
+                    "name": "payer",
+                    "writable": true,
+                    "signer": true
+                },
                 {
                     "name": "market",
                     "writable": true
@@ -670,26 +675,6 @@
             ],
             "args": []
         },
-        {
-            "name": "close_user",
-            "discriminator": [86, 219, 138, 140, 236, 24, 118, 200],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "user_trade",
-                    "writable": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": []
-        },
         {
             "name": "collect_market_fee",
             "discriminator": [139, 4, 96, 182, 216, 250, 122, 79],
@@ -1568,39 +1553,6 @@
                 }
             ]
         },
-        {
-            "name": "migrate_user_trade_to_order",
-            "discriminator": [33, 123, 184, 50, 31, 199, 7, 73],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "user_trade",
-                    "writable": true
-                },
-                {
-                    "name": "order",
-                    "writable": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "args",
-                    "type": {
-                        "defined": {
-                            "name": "MigrateUserTradeToOrderArgs"
-                        }
-                    }
-                }
-            ]
-        },
         {
             "name": "open_order",
             "discriminator": [206, 88, 88, 143, 38, 136, 50, 224],
@@ -1810,16 +1762,7 @@
                     "address": "11111111111111111111111111111111"
                 }
             ],
-            "args": [
-                {
-                    "name": "order_direction",
-                    "type": {
-                        "defined": {
-                            "name": "OrderDirection"
-                        }
-                    }
-                }
-            ]
+            "args": []
         },
         {
             "name": "place_ask_order",
@@ -2089,6 +2032,38 @@
                 }
             ]
         },
+        {
+            "name": "stake_authority",
+            "discriminator": [246, 215, 84, 204, 198, 135, 235, 247],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "stake",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [115, 116, 97, 107, 101, 95, 118, 51]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "stake_token",
             "discriminator": [191, 127, 193, 101, 37, 96, 87, 211],
@@ -2854,10 +2829,6 @@
         {
             "name": "Unstake",
             "discriminator": [154, 148, 131, 67, 52, 244, 244, 19]
-        },
-        {
-            "name": "UserTrade",
-            "discriminator": [149, 190, 47, 218, 136, 9, 222, 222]
         }
     ],
     "events": [
@@ -3233,6 +3204,10 @@
             "type": {
                 "kind": "struct",
                 "fields": [
+                    {
+                        "name": "market_id",
+                        "type": "u64"
+                    },
                     {
                         "name": "book_order_id",
                         "type": "u64"
@@ -4073,30 +4048,6 @@
                 ]
             }
         },
-        {
-            "name": "MigrateUserTradeToOrderArgs",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "market_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "order_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "order_direction",
-                        "type": {
-                            "defined": {
-                                "name": "OrderDirection"
-                            }
-                        }
-                    }
-                ]
-            }
-        },
         {
             "name": "Nft",
             "type": {
@@ -4128,106 +4079,6 @@
                 ]
             }
         },
-        {
-            "name": "Order",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "ts",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "order_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "filled_shares",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "market_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "order_status",
-                        "type": {
-                            "defined": {
-                                "name": "OrderStatus"
-                            }
-                        }
-                    },
-                    {
-                        "name": "price",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "padding_1",
-                        "type": {
-                            "array": ["u8", 8]
-                        }
-                    },
-                    {
-                        "name": "total_shares",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "order_type",
-                        "type": {
-                            "defined": {
-                                "name": "OrderType"
-                            }
-                        }
-                    },
-                    {
-                        "name": "order_direction",
-                        "type": {
-                            "defined": {
-                                "name": "OrderDirection"
-                            }
-                        }
-                    },
-                    {
-                        "name": "user_nonce",
-                        "type": "u32"
-                    },
-                    {
-                        "name": "order_side",
-                        "type": {
-                            "defined": {
-                                "name": "OrderSide"
-                            }
-                        }
-                    },
-                    {
-                        "name": "padding_2",
-                        "type": {
-                            "array": ["u8", 8]
-                        }
-                    },
-                    {
-                        "name": "created_at",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "padding_3",
-                        "type": {
-                            "array": ["u8", 8]
-                        }
-                    },
-                    {
-                        "name": "is_trd_payout",
-                        "type": "bool"
-                    },
-                    {
-                        "name": "padding",
-                        "type": {
-                            "array": ["u8", 2]
-                        }
-                    }
-                ]
-            }
-        },
         {
             "name": "OrderBook",
             "serialization": "bytemuck",
@@ -4887,71 +4738,6 @@
                 ]
             }
         },
-        {
-            "name": "UserTrade",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "bump",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "authority",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "padding_1",
-                        "type": {
-                            "array": ["u8", 8]
-                        }
-                    },
-                    {
-                        "name": "padding_2",
-                        "type": {
-                            "array": ["u8", 8]
-                        }
-                    },
-                    {
-                        "name": "padding_3",
-                        "type": {
-                            "array": ["u8", 8]
-                        }
-                    },
-                    {
-                        "name": "orders",
-                        "type": {
-                            "array": [
-                                {
-                                    "defined": {
-                                        "name": "Order"
-                                    }
-                                },
-                                10
-                            ]
-                        }
-                    },
-                    {
-                        "name": "nonce",
-                        "type": "u32"
-                    },
-                    {
-                        "name": "is_sub_user",
-                        "type": "bool"
-                    },
-                    {
-                        "name": "poseidon",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "padding",
-                        "type": {
-                            "array": ["u8", 25]
-                        }
-                    }
-                ]
-            }
-        },
         {
             "name": "WinningDirection",
             "type": {

package/dist/types/index.d.ts

@@ -47,6 +47,7 @@ export type Market = {
     feeRecipient: string;
 };
 export type Order = {
+    address: string;
     marketId: string;
     orderStatus: OrderStatus;
     price: string;
@@ -272,6 +273,7 @@ export type CreatePoolArgs = {
 };
 export type CancelBidOrderArgs = {
     orders: {
+        authority: PublicKey;
         marketId: number;
         bookOrderId: number;
         orderDirection: OrderDirectionEncoded;
@@ -279,6 +281,7 @@ export type CancelBidOrderArgs = {
 };
 export type CancelAskOrderArgs = {
     orders: {
+        authority: PublicKey;
         marketId: number;
         bookOrderId: number;
         orderDirection: OrderDirectionEncoded;

package/dist/types/triad_protocol.d.ts

@@ -231,6 +231,11 @@ export type TriadProtocol = {
                     name: 'signer';
                     writable: true;
                 },
+                {
+                    name: 'payer';
+                    writable: true;
+                    signer: true;
+                },
                 {
                     name: 'market';
                     writable: true;
@@ -988,26 +993,6 @@ export type TriadProtocol = {
             ];
             args: [];
         },
-        {
-            name: 'closeUser';
-            discriminator: [86, 219, 138, 140, 236, 24, 118, 200];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'userTrade';
-                    writable: true;
-                },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [];
-        },
         {
             name: 'collectMarketFee';
             discriminator: [139, 4, 96, 182, 216, 250, 122, 79];
@@ -2275,39 +2260,6 @@ export type TriadProtocol = {
                 }
             ];
         },
-        {
-            name: 'migrateUserTradeToOrder';
-            discriminator: [33, 123, 184, 50, 31, 199, 7, 73];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'userTrade';
-                    writable: true;
-                },
-                {
-                    name: 'order';
-                    writable: true;
-                },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [
-                {
-                    name: 'args';
-                    type: {
-                        defined: {
-                            name: 'migrateUserTradeToOrderArgs';
-                        };
-                    };
-                }
-            ];
-        },
         {
             name: 'openOrder';
             discriminator: [206, 88, 88, 143, 38, 136, 50, 224];
@@ -2633,16 +2585,7 @@ export type TriadProtocol = {
                     address: '11111111111111111111111111111111';
                 }
             ];
-            args: [
-                {
-                    name: 'orderDirection';
-                    type: {
-                        defined: {
-                            name: 'orderDirection';
-                        };
-                    };
-                }
-            ];
+            args: [];
         },
         {
             name: 'placeAskOrder';
@@ -2982,6 +2925,38 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'stakeAuthority';
+            discriminator: [246, 215, 84, 204, 198, 135, 235, 247];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'stake';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [115, 116, 97, 107, 101, 95, 118, 51];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [];
+        },
         {
             name: 'stakeToken';
             discriminator: [191, 127, 193, 101, 37, 96, 87, 211];
@@ -3945,10 +3920,6 @@ export type TriadProtocol = {
         {
             name: 'unstake';
             discriminator: [154, 148, 131, 67, 52, 244, 244, 19];
-        },
-        {
-            name: 'userTrade';
-            discriminator: [149, 190, 47, 218, 136, 9, 222, 222];
         }
     ];
     events: [
@@ -4324,6 +4295,10 @@ export type TriadProtocol = {
             type: {
                 kind: 'struct';
                 fields: [
+                    {
+                        name: 'marketId';
+                        type: 'u64';
+                    },
                     {
                         name: 'bookOrderId';
                         type: 'u64';
@@ -5164,30 +5139,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'migrateUserTradeToOrderArgs';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'marketId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'orderId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'orderDirection';
-                        type: {
-                            defined: {
-                                name: 'orderDirection';
-                            };
-                        };
-                    }
-                ];
-            };
-        },
         {
             name: 'nft';
             type: {
@@ -5219,106 +5170,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'order';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'ts';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'orderId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'filledShares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'marketId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'orderStatus';
-                        type: {
-                            defined: {
-                                name: 'orderStatus';
-                            };
-                        };
-                    },
-                    {
-                        name: 'price';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'padding1';
-                        type: {
-                            array: ['u8', 8];
-                        };
-                    },
-                    {
-                        name: 'totalShares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'orderType';
-                        type: {
-                            defined: {
-                                name: 'orderType';
-                            };
-                        };
-                    },
-                    {
-                        name: 'orderDirection';
-                        type: {
-                            defined: {
-                                name: 'orderDirection';
-                            };
-                        };
-                    },
-                    {
-                        name: 'userNonce';
-                        type: 'u32';
-                    },
-                    {
-                        name: 'orderSide';
-                        type: {
-                            defined: {
-                                name: 'orderSide';
-                            };
-                        };
-                    },
-                    {
-                        name: 'padding2';
-                        type: {
-                            array: ['u8', 8];
-                        };
-                    },
-                    {
-                        name: 'createdAt';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'padding3';
-                        type: {
-                            array: ['u8', 8];
-                        };
-                    },
-                    {
-                        name: 'isTrdPayout';
-                        type: 'bool';
-                    },
-                    {
-                        name: 'padding';
-                        type: {
-                            array: ['u8', 2];
-                        };
-                    }
-                ];
-            };
-        },
         {
             name: 'orderBook';
             serialization: 'bytemuck';
@@ -5978,71 +5829,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'userTrade';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'bump';
-                        type: 'u8';
-                    },
-                    {
-                        name: 'authority';
-                        type: 'pubkey';
-                    },
-                    {
-                        name: 'padding1';
-                        type: {
-                            array: ['u8', 8];
-                        };
-                    },
-                    {
-                        name: 'padding2';
-                        type: {
-                            array: ['u8', 8];
-                        };
-                    },
-                    {
-                        name: 'padding3';
-                        type: {
-                            array: ['u8', 8];
-                        };
-                    },
-                    {
-                        name: 'orders';
-                        type: {
-                            array: [
-                                {
-                                    defined: {
-                                        name: 'order';
-                                    };
-                                },
-                                10
-                            ];
-                        };
-                    },
-                    {
-                        name: 'nonce';
-                        type: 'u32';
-                    },
-                    {
-                        name: 'isSubUser';
-                        type: 'bool';
-                    },
-                    {
-                        name: 'poseidon';
-                        type: 'u16';
-                    },
-                    {
-                        name: 'padding';
-                        type: {
-                            array: ['u8', 25];
-                        };
-                    }
-                ];
-            };
-        },
         {
             name: 'winningDirection';
             type: {

package/dist/utils/feeCalculator.js

@@ -6,17 +6,11 @@ exports.generateFeeCurve = exports.simulateSellOrder = exports.simulateBuyOrder
  * Returns fee in basis points (bps)
  */
 function calculateDynamicFeeBps(price) {
-    const internalPrice = Math.floor(price * 1000000);
+    const internalPrice = price * Math.pow(10, 6);
     if (internalPrice <= 900000) {
         return 380;
     }
-    const priceAbove90 = internalPrice - 900000;
-    const feeReduction = Math.floor((priceAbove90 * 100) / 80000);
-    const calculatedFee = Math.max(0, 190 - feeReduction);
-    const maxPossibleFee = internalPrice < 999999
-        ? Math.floor(((999999 - internalPrice) * 10000) / internalPrice)
-        : 0;
-    return Math.max(90, Math.min(calculatedFee, maxPossibleFee));
+    return Math.floor(((990000 - internalPrice) * 1900) / price);
 }
 exports.calculateDynamicFeeBps = calculateDynamicFeeBps;
 /**

package/dist/utils/helpers.d.ts

@@ -9,7 +9,7 @@ export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV3'])
 export declare const formatUnstake: (unstake: IdlAccounts<TriadProtocol>['unstake'], address: PublicKey) => Unstake;
 export declare const formatPool: (account: IdlAccounts<TriadProtocol>['pool'], address: PublicKey) => Pool;
 export declare const formatMarket: (account: IdlAccounts<TriadProtocol>['marketV2'], address: PublicKey) => Market;
-export declare const formatOrder: (order: IdlAccounts<TriadProtocol>['orderV2']) => Order;
+export declare const formatOrder: (order: IdlAccounts<TriadProtocol>['orderV2'], address: PublicKey) => Order;
 export declare const formatBookOrder: (order: IdlAccounts<TriadProtocol>['orderBook']['hypeOrders'][number] | IdlAccounts<TriadProtocol>['orderBook']['flopOrders'][number], marketId: number) => BookOrder;
 export declare const formatCustomer: (account: IdlAccounts<TriadProtocol>['customer'], publicKey: PublicKey) => Customer;
 export declare const formatClaimVault: (account: IdlAccounts<TriadProtocol>['claimVault'], address: PublicKey) => ClaimVault;
@@ -22,5 +22,6 @@ export declare const getOrderSideFromNumber: (orderSide: number) => OrderSide;
 export declare const getOrderType: (orderType: OrderTypeEncoded) => OrderType;
 export declare const getOrderSide: (orderSide: OrderSideEncoded) => OrderSide;
 export declare const getOrderStatus: (status: OrderStatusEncoded) => OrderStatus;
+export declare const getOrderDirectionEncoded: (orderDirection: OrderDirection) => OrderDirectionEncoded;
 export declare const getOppositeOrderDirection: (orderDirection: OrderDirection) => OrderDirection;
 export declare const getOppositeOrderDirectionEncoded: (orderDirection: OrderDirectionEncoded) => OrderDirectionEncoded;

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatClaimedUser = exports.formatClaimVault = exports.formatCustomer = exports.formatBookOrder = exports.formatOrder = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderDirectionEncoded = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatClaimedUser = exports.formatClaimVault = exports.formatCustomer = exports.formatBookOrder = exports.formatOrder = 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");
@@ -105,8 +105,9 @@ const formatMarket = (account, address) => {
     };
 };
 exports.formatMarket = formatMarket;
-const formatOrder = (order) => {
+const formatOrder = (order, address) => {
     return {
+        address: address.toString(),
         authority: order.authority.toString(),
         marketId: order.marketId.toString(),
         orderStatus: (0, exports.getOrderStatus)(order.orderStatus),
@@ -254,6 +255,13 @@ const getOrderStatus = (status) => {
     }
 };
 exports.getOrderStatus = getOrderStatus;
+const getOrderDirectionEncoded = (orderDirection) => {
+    if (orderDirection === types_1.OrderDirection.HYPE) {
+        return { hype: {} };
+    }
+    return { flop: {} };
+};
+exports.getOrderDirectionEncoded = getOrderDirectionEncoded;
 const getOppositeOrderDirection = (orderDirection) => {
     if (orderDirection === types_1.OrderDirection.HYPE) {
         return types_1.OrderDirection.FLOP;

package/package.json

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