@triadxyz/triad-protocol 1.7.5-beta → 1.7.7-beta

package/dist/trade.d.ts

@@ -270,6 +270,11 @@ export default class Trade {
     getUserTradeIxs(): Promise<{
         userTradePDA: PublicKey;
         ixs: TransactionInstruction[];
+        nonce: number;
+    } | {
+        userTradePDA: PublicKey;
+        ixs: TransactionInstruction[];
+        nonce?: undefined;
     }>;
     /**
      * Place Order
@@ -294,17 +299,6 @@ export default class Trade {
      * @param options - RPC options
      */
     cancelOrder({ marketId, orderId, userNonce, orderSide, mint, userNonceBidOrder }: CancelOrderArgs, options?: RpcOptions): Promise<string>;
-    /**
-     * Update Customer Fee
-     * @param args.id - The ID of the Customer
-     * @param args.feeRecipient - The fee account
-     *
-     * @param options - RPC options
-     */
-    updateCustomerFee({ id, feeRecipient }: {
-        id: number;
-        feeRecipient: PublicKey;
-    }, options?: RpcOptions): Promise<string>;
     /**
      * Market Bid Order
      * @param args.marketId - The ID of the Market

package/dist/trade.js

@@ -408,45 +408,30 @@ class Trade {
                     signer: this.provider.publicKey
                 })
                     .instruction());
+                return {
+                    userTradePDA,
+                    ixs,
+                    nonce: 0
+                };
             }
-            if (myUserTrades.length > 0) {
-                try {
-                    userTradePDA = yield this.getUserTradeNonceWithSlots(myUserTrades);
-                    // Check if we need to create a new sub user trade
-                    // This happens when all existing slots have open orders
-                    const allSlotsHaveOpenOrders = myUserTrades.every((trade) => trade.orders.some((order) => order.orderStatus === trade_1.OrderStatus.OPEN ||
-                        order.orderStatus === trade_1.OrderStatus.WAITING));
-                    if (allSlotsHaveOpenOrders) {
-                        // Find the main user trade to get the current nonce
-                        const mainUserTrade = myUserTrades.find((userTrade) => !userTrade.isSubUser);
-                        if (!mainUserTrade) {
-                            throw new Error('No main user trade found');
-                        }
-                        const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, Number(mainUserTrade.nonce) + 1);
-                        ixs.push(yield this.program.methods
-                            .createSubUserTrade(subUserTradePDA)
-                            .accounts({
-                            signer: this.provider.publicKey
-                        })
-                            .instruction());
-                    }
-                }
-                catch (error) {
-                    const mainUserTrade = myUserTrades.find((userTrade) => !userTrade.isSubUser);
-                    const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, Number(mainUserTrade.nonce) + 1);
-                    userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
-                    ixs.push(yield this.program.methods
-                        .createSubUserTrade(subUserTradePDA)
-                        .accounts({
-                        signer: this.provider.publicKey
-                    })
-                        .instruction());
-                }
+            try {
+                const userTradePDA = yield this.getUserTradeNonceWithSlots(myUserTrades);
+                return { userTradePDA, ixs };
+            }
+            catch (_a) {
+                const mainUserTrade = myUserTrades.find((trade) => !trade.isSubUser);
+                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, Number(mainUserTrade.nonce) + 1);
+                ixs.push(yield this.program.methods
+                    .createSubUserTrade(subUserTradePDA)
+                    .accounts({
+                    signer: this.provider.publicKey
+                })
+                    .instruction());
+                return {
+                    userTradePDA: (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA),
+                    ixs
+                };
             }
-            return {
-                userTradePDA,
-                ixs
-            };
         });
     }
     /**
@@ -466,7 +451,10 @@ class Trade {
             const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
-            ixs.push(...userTradeIxs);
+            console.log(userTradePDA);
+            if (userTradeIxs.length > 0) {
+                ixs.push(...userTradeIxs);
+            }
             if (Object.keys(orderSide)[0] === 'bid') {
                 ixs.push(yield this.program.methods
                     .placeBidOrder({
@@ -539,20 +527,6 @@ class Trade {
             }), options);
         });
     }
-    /**
-     * Update Customer Fee
-     * @param args.id - The ID of the Customer
-     * @param args.feeRecipient - The fee account
-     *
-     * @param options - RPC options
-     */
-    updateCustomerFee({ id, feeRecipient }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.updateCustomerFee({ id, feeRecipient }).accounts({
-                signer: this.provider.publicKey
-            }), options);
-        });
-    }
     /**
      * Market Bid Order
      * @param args.marketId - The ID of the Market
@@ -573,7 +547,7 @@ class Trade {
             ixs.push(yield this.program.methods
                 .marketBidOrder({
                 amount: new bn_js_1.default(amount * Math.pow(10, this.decimals)),
-                direction
+                orderDirection: direction
             })
                 .accounts({
                 signer: this.provider.publicKey,
@@ -602,10 +576,8 @@ class Trade {
                         8 + // total_deposits
                         8 + // total_withdraws
                         8 + // opened_orders
-                        // Per order: index * (8 + 8 + 8 + 8 + 1 + 8 + 8 + 8 + 1 + 1 + 4 + 28)
-                        index * (8 + 8 + 8 + 8 + 1 + 8 + 8 + 8 + 1 + 1 + 4 + 1 + 27) +
-                        // Then offset to market_id: 8 + 8 + 8
-                        (8 + 8 + 8),
+                        index * 91 + // total size of each order
+                        24,
                     bytes: marketIdBytes
                 }
             }));

package/dist/types/idl_triad_protocol.json

@@ -1476,47 +1476,6 @@
             ],
             "args": []
         },
-        {
-            "name": "update_customer_fee",
-            "discriminator": [218, 240, 1, 38, 34, 166, 40, 25],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "customer",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [99, 117, 115, 116, 111, 109, 101, 114]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "args.id"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "args",
-                    "type": {
-                        "defined": {
-                            "name": "UpdateCustomerFeeArgs"
-                        }
-                    }
-                }
-            ]
-        },
         {
             "name": "update_market",
             "discriminator": [153, 39, 2, 197, 179, 50, 199, 217],
@@ -2229,7 +2188,7 @@
                         "type": "u64"
                     },
                     {
-                        "name": "direction",
+                        "name": "order_direction",
                         "type": {
                             "defined": {
                                 "name": "OrderDirection"
@@ -3039,22 +2998,6 @@
                 ]
             }
         },
-        {
-            "name": "UpdateCustomerFeeArgs",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "id",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "fee_recipient",
-                        "type": "pubkey"
-                    }
-                ]
-            }
-        },
         {
             "name": "UpdateStakeVaultArgs",
             "type": {

package/dist/types/trade.d.ts

@@ -53,7 +53,7 @@ export type Order = {
     orderSide: OrderSide;
     userNonce: string;
     linkedOrderId: string;
-    account: string;
+    authority: string;
     createdAt: string;
 };
 export declare enum WinningDirection {

package/dist/types/triad_protocol.d.ts

@@ -2033,47 +2033,6 @@ export type TriadProtocol = {
             ];
             args: [];
         },
-        {
-            name: 'updateCustomerFee';
-            discriminator: [218, 240, 1, 38, 34, 166, 40, 25];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'customer';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [99, 117, 115, 116, 111, 109, 101, 114];
-                            },
-                            {
-                                kind: 'arg';
-                                path: 'args.id';
-                            }
-                        ];
-                    };
-                },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [
-                {
-                    name: 'args';
-                    type: {
-                        defined: {
-                            name: 'updateCustomerFeeArgs';
-                        };
-                    };
-                }
-            ];
-        },
         {
             name: 'updateMarket';
             discriminator: [153, 39, 2, 197, 179, 50, 199, 217];
@@ -2902,7 +2861,7 @@ export type TriadProtocol = {
                         type: 'u64';
                     },
                     {
-                        name: 'direction';
+                        name: 'orderDirection';
                         type: {
                             defined: {
                                 name: 'orderDirection';
@@ -3712,22 +3671,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'updateCustomerFeeArgs';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'id';
-                        type: 'u16';
-                    },
-                    {
-                        name: 'feeRecipient';
-                        type: 'pubkey';
-                    }
-                ];
-            };
-        },
         {
             name: 'updateStakeVaultArgs';
             type: {

package/dist/utils/helpers.d.ts

@@ -1,12 +1,40 @@
 import { Stake, StakeVault } from './../types/stake';
-import { Market, Order, UserTrade } from '../types/trade';
+import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade } from '../types/trade';
 import { PublicKey } from '@solana/web3.js';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: any) => StakeVault;
 export declare const formatStake: (stake: any) => Stake;
 export declare const formatMarket: (account: any, address: PublicKey) => Market;
-export declare const formatOrder: (order: any) => Order;
+export declare const formatOrder: (order: any, authority?: string) => Order;
 export declare const formatUserTrade: (account: any, publicKey: PublicKey) => UserTrade;
 export declare const calculateStakeRewards: (stake: Stake, multiplier: number) => number;
 export declare const getTokenProgram: (mint: PublicKey) => PublicKey;
+export declare const getOrderDirection: (direction: {
+    hype: {};
+} | {
+    flop: {};
+}) => OrderDirection;
+export declare const getOrderType: (type: {
+    limit: {};
+} | {
+    market: {};
+}) => OrderType;
+export declare const getOrderSide: (side: {
+    bid: {};
+} | {
+    ask: {};
+}) => OrderSide;
+export declare const getOrderStatus: (status: {
+    init: {};
+} | {
+    open: {};
+} | {
+    closed: {};
+} | {
+    claimed: {};
+} | {
+    liquidated: {};
+} | {
+    waiting: {};
+}) => OrderStatus;

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenProgram = exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const trade_1 = require("../types/trade");
 const constants_1 = require("./constants");
 const spl_token_1 = require("@solana/spl-token");
@@ -87,22 +87,22 @@ const formatMarket = (account, address) => {
     };
 };
 exports.formatMarket = formatMarket;
-const formatOrder = (order) => {
+const formatOrder = (order, authority) => {
     return {
         ts: order.ts.toString(),
         orderId: order.orderId.toString(),
         marketId: order.marketId.toString(),
-        orderStatus: order.orderStatus,
+        orderStatus: (0, exports.getOrderStatus)(order.orderStatus),
         price: order.price.toString(),
         totalAmount: order.totalAmount.toString(),
         totalShares: order.totalShares.toString(),
-        orderType: order.orderType,
-        orderDirection: order.orderDirection,
-        orderSide: order.orderSide,
+        orderType: (0, exports.getOrderType)(order.orderType),
+        orderDirection: (0, exports.getOrderDirection)(order.orderDirection),
+        orderSide: (0, exports.getOrderSide)(order.orderSide),
         userNonce: order.userNonce.toString(),
         linkedOrderId: order.linkedOrderId,
         filledShares: order.filledShares ? order.filledShares.toString() : '',
-        account: order.account,
+        authority: authority ? authority : '',
         createdAt: order.createdAt ? order.createdAt.toString() : ''
     };
 };
@@ -149,3 +149,44 @@ const getTokenProgram = (mint) => {
     return spl_token_2.TOKEN_PROGRAM_ID;
 };
 exports.getTokenProgram = getTokenProgram;
+const getOrderDirection = (direction) => {
+    if (Object.keys(direction)[0] === 'hype') {
+        return trade_1.OrderDirection.HYPE;
+    }
+    return trade_1.OrderDirection.FLOP;
+};
+exports.getOrderDirection = getOrderDirection;
+const getOrderType = (type) => {
+    if (Object.keys(type)[0] === 'limit') {
+        return trade_1.OrderType.LIMIT;
+    }
+    return trade_1.OrderType.MARKET;
+};
+exports.getOrderType = getOrderType;
+const getOrderSide = (side) => {
+    if (Object.keys(side)[0] === 'bid') {
+        return trade_1.OrderSide.BID;
+    }
+    return trade_1.OrderSide.ASK;
+};
+exports.getOrderSide = getOrderSide;
+const getOrderStatus = (status) => {
+    let currentStatus = Object.keys(status)[0];
+    switch (currentStatus) {
+        case 'init':
+            return trade_1.OrderStatus.INIT;
+        case 'open':
+            return trade_1.OrderStatus.OPEN;
+        case 'closed':
+            return trade_1.OrderStatus.CLOSED;
+        case 'claimed':
+            return trade_1.OrderStatus.CLAIMED;
+        case 'liquidated':
+            return trade_1.OrderStatus.LIQUIDATED;
+        case 'waiting':
+            return trade_1.OrderStatus.WAITING;
+        default:
+            throw new Error('Invalid order status');
+    }
+};
+exports.getOrderStatus = getOrderStatus;

package/package.json

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