@triadxyz/triad-protocol 3.4.0-beta → 3.4.2-beta

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
-import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { Connection, PublicKey } from '@solana/web3.js';
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
-import BN from 'bn.js';
 import { TriadProtocol as TriadProtocolIDL } from './types/triad_protocol';
-import { OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, BookOrder, MarketAskOrderArgs, RpcOptions, OrderDirection, CloseOrderArgs, CreateMarketArgs, CreatePoolArgs, UpdateMarketWinningDirectionArgs } from './types';
+import { OpenOrderArgs, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, BookOrder, MarketAskOrderArgs, RpcOptions, CloseOrderArgs, CreateMarketArgs, CreatePoolArgs, UpdateMarketWinningDirectionArgs, OrderDirectionEncoded } from './types';
 import Stake from './stake';
 import Poseidon from './poseidon';
 import Claim from './claim';
@@ -21,11 +20,6 @@ export default class TriadProtocol {
     poseidon: Poseidon;
     claim: Claim;
     constructor(connection: Connection, wallet: Wallet, rpcOptions: RpcOptions);
-    /**
-     * Get My User Trades from a user authority
-     * @param wallet - User wallet PublicKey
-     */
-    getMyUserTrades(wallet: PublicKey): Promise<UserTrade[]>;
     /**
      * Get User Orders
      * @param wallet - User wallet PublicKey
@@ -56,119 +50,6 @@ export default class TriadProtocol {
      * @param customerId - The ID of the customer
      */
     getCustomerById(customerId: number): Promise<import("./types").Customer>;
-    /**
-     * Get User Trade PDA
-     * @param wallet - User wallet PublicKey
-     * @param userNonce - The nonce of the user
-     */
-    getUserPDA(wallet: PublicKey, userNonce?: number): PublicKey;
-    /**
-     * Get User Trade
-     * @param wallet - User wallet PublicKey
-     * @param userNonce - The nonce of the user
-     */
-    getUserTradeByNonce(wallet: PublicKey, userNonce?: number): Promise<{
-        bump: number;
-        authority: PublicKey;
-        padding1: number[];
-        padding2: number[];
-        padding3: number[];
-        orders: {
-            ts: BN;
-            orderId: BN;
-            filledShares: BN;
-            marketId: BN;
-            orderStatus: ({
-                open?: never;
-                closed?: never;
-                claimed?: never;
-                liquidated?: never;
-                waiting?: never;
-            } & {
-                init: Record<string, never>;
-            }) | ({
-                init?: never;
-                closed?: never;
-                claimed?: never;
-                liquidated?: never;
-                waiting?: never;
-            } & {
-                open: Record<string, never>;
-            }) | ({
-                init?: never;
-                open?: never;
-                claimed?: never;
-                liquidated?: never;
-                waiting?: never;
-            } & {
-                closed: Record<string, never>;
-            }) | ({
-                init?: never;
-                open?: never;
-                closed?: never;
-                liquidated?: never;
-                waiting?: never;
-            } & {
-                claimed: Record<string, never>;
-            }) | ({
-                init?: never;
-                open?: never;
-                closed?: never;
-                claimed?: never;
-                waiting?: never;
-            } & {
-                liquidated: Record<string, never>;
-            }) | ({
-                init?: never;
-                open?: never;
-                closed?: never;
-                claimed?: never;
-                liquidated?: never;
-            } & {
-                waiting: Record<string, never>;
-            });
-            price: BN;
-            padding1: number[];
-            totalShares: BN;
-            orderType: ({
-                limit?: never;
-            } & {
-                market: Record<string, never>;
-            }) | ({
-                market?: never;
-            } & {
-                limit: Record<string, never>;
-            });
-            orderDirection: ({
-                flop?: never;
-            } & {
-                hype: Record<string, never>;
-            }) | ({
-                hype?: never;
-            } & {
-                flop: Record<string, never>;
-            });
-            userNonce: number;
-            orderSide: ({
-                ask?: never;
-            } & {
-                bid: Record<string, never>;
-            }) | ({
-                bid?: never;
-            } & {
-                ask: Record<string, never>;
-            });
-            padding2: number[];
-            createdAt: BN;
-            padding3: number[];
-            isTrdPayout: boolean;
-            padding: number[];
-        }[];
-        nonce: number;
-        isSubUser: boolean;
-        poseidon: number;
-        padding: number[];
-    }>;
     /**
      * Get All Pools
      */
@@ -287,36 +168,28 @@ export default class TriadProtocol {
      * Open Order
      * @param args.marketId - The ID of the Market
      * @param args.amount - The amount of the Order
-     * @param args.direction - The direction of the Order
+     * @param args.orderDirection - The direction of the Order
      * @param args.mint - The mint of the Order
      * @param args.token - The token to use for the Order
      */
-    openOrder({ marketId, amount, direction, mint, token }: OpenOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    openOrder({ marketId, amount, orderDirection, mint, token }: OpenOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Close Order
      * @param args.marketId - The ID of the Market
-     * @param args.orderId - The ID of the Order
-     * @param args.userNonce - The nonce of the user
+     * @param args.orderDirection - The direction of the Order
      */
-    closeOrder({ marketId, orderId, userNonce }: CloseOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    closeOrder({ marketId, orderDirection }: CloseOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Payout Order
      * @param args.marketId - The ID of the Market
-     * @param args.orderId - The ID of the Order to Payout
-     * @param args.userNonce - The nonce of the user
+     * @param args.orderDirection - The direction of the Order to Payout
      * @param args.mint - The mint of the market
      */
     payoutOrder(orders: {
         marketId: number;
-        orderId: number;
-        userNonce: number;
+        orderDirection: OrderDirectionEncoded;
         mint: PublicKey;
     }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Create Sub User Trade
-     * @param user - User PublicKey the main user
-     */
-    createSubUserTrade(user: PublicKey): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Create Customer
      * @param args.id - The ID of the customer
@@ -325,27 +198,6 @@ export default class TriadProtocol {
      * @param args.feeRecipient - The fee recipient of the customer
      */
     createCustomer({ id, name, authority, feeRecipient }: CreateCustomerArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Get User Trade Ixs
-     */
-    getUserTradeIxs(): Promise<{
-        userTradePDA: PublicKey;
-        ixs: TransactionInstruction[];
-        nonce: number;
-    } | {
-        userTradePDA: PublicKey;
-        ixs: TransactionInstruction[];
-        nonce?: undefined;
-    }>;
-    /**
-     * Get User Trade Nonce
-     * @param marketId - The ID of the Market
-     * @param orderDirection - The direction of the Order
-     */
-    getUserTradeNonce(marketId: number, orderDirection: OrderDirection): Promise<{
-        userTradePDA: PublicKey;
-        userTradeIxs: TransactionInstruction[];
-    }>;
     /**
      * Place Bid Order
      * @param args.orders - Array of orders to execute
@@ -353,7 +205,6 @@ export default class TriadProtocol {
      * @param args.orders.amount - The amount of the Order
      * @param args.orders.price - The price of the Order
      * @param args.orders.orderDirection - The direction of the Order
-     * @param args.mint - The mint of the Order
      * @param args.isTrdPayout - Whether to payout in TRD or not
      */
     placeBidOrder({ orders, isTrdPayout }: PlaceBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
@@ -369,19 +220,18 @@ export default class TriadProtocol {
     placeAskOrder({ orders }: PlaceAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Cancel Bid Order
-     * @param args.orders.orderId - The ID of the Order
-     * @param args.orders.userNonce - The nonce of the user
+     * @param args.orders.bookOrderId - The ID of the Book Order
+     * @param args.orders.marketId - The ID of the Market
      * @param args.orders.orderDirection - The direction of the Order
      */
     cancelBidOrder({ orders }: CancelBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Cancel Ask Order
-     * @param args.marketId - The ID of the Market
-     * @param args.orders.orderId - The ID of the Order
-     * @param args.orders.userNonce - The nonce of the user
+     * @param args.orders.marketId - The ID of the Market
+     * @param args.orders.bookOrderId - The ID of the Book Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelAskOrder({ marketId, orders }: CancelAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    cancelAskOrder({ orders }: CancelAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Market Bid Order
      * @param args.marketId - The ID of the Market
@@ -393,13 +243,11 @@ export default class TriadProtocol {
     /**
      * Market Ask Order
      * @param args.marketId - The ID of the Market
-     * @param args.orders - Array of orders to execute
-     * @param args.orders.shares - The amount of shares to sell
-     * @param args.orders.bidOrderId - The ID of the Bid Order
-     * @param args.orders.userNonce - The nonce of the user
+     * @param args.shares - The amount of shares to sell
+     * @param args.bookOrderBidId - The ID of the Bid Order
      * @param args.orderDirection - The direction of the Order
      */
-    marketAskOrder({ marketId, orders, orderDirection }: MarketAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    marketAskOrder({ marketId, shares, orderDirection }: MarketAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Get Orders By Market ID
      * @param marketId - Market ID
@@ -427,4 +275,6 @@ 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>;
 }