@triadxyz/triad-protocol 4.2.0 → 4.2.2

package/dist/predictor.d.ts

@@ -2,7 +2,7 @@ import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { DepositArgs, WithdrawArgs, Predictor as PredictorType } from './types/predictor';
+import { DepositArgs, WithdrawArgs, CollectRewardsArgs, Predictor as PredictorType } from './types/predictor';
 export default class Predictor {
     private program;
     private rpcOptions;
@@ -13,6 +13,30 @@ export default class Predictor {
      * @param customerId - Customer ID (optional) defaults to 7 from Triadmarkets
      */
     getPredictor(authority: PublicKey, customerId?: number): Promise<PredictorType>;
+    /**
+     * Get User Orders
+     * @param wallet - User wallet PublicKey
+     */
+    getUserOrders(wallet: PublicKey, customerId?: number): Promise<import("./types").PredictorOrder[]>;
+    /**
+     * Get User Orders By Market ID
+     * @param wallet - User wallet PublicKey
+     * @param marketId - The ID of the market
+     */
+    getUserOrdersByMarketId(wallet: PublicKey, marketId: number, customerId?: number): Promise<import("./types").PredictorOrder[]>;
+    /**
+     * Get all User Book Orders
+     * @param wallet - User wallet PublicKey
+     * @param customerId - User Customer ID
+     */
+    getUserBookOrders(wallet: PublicKey, customerId?: number): Promise<import("./types").BookOrder[]>;
+    /**
+     * Get User Book Orders By Market ID
+     * @param wallet - User wallet PublicKey
+     * @param marketId - The ID of the market
+     * @param customerId - User Customer ID
+     */
+    getUserBookOrdersByMarketId(wallet: PublicKey, marketId: number, customerId?: number): Promise<import("./types").BookOrder[]>;
     /**
      * Deposit
      * @param args.authority - Authority of the deposit
@@ -28,4 +52,11 @@ export default class Predictor {
      * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
      */
     withdraw({ authority, amount, customerId }: WithdrawArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Collect Rewards
+     * Claims accumulated TRIAD token rewards for the predictor.
+     * @param args.authority - Authority of the predictor
+     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     */
+    collectRewards({ authority, customerId }: CollectRewardsArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/predictor.js

@@ -15,10 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("./utils/constants");
-const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const helpers_1 = require("./utils/helpers");
-const spl_token_1 = require("@solana/spl-token");
+const pda_1 = require("./utils/pda");
 class Predictor {
     constructor(program, rpcOptions) {
         this.program = program;
@@ -34,8 +33,7 @@ class Predictor {
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
             try {
                 const predictor = yield this.program.account.predictor.fetch(predictorPDA);
-                const balance = yield this.program.provider.connection.getTokenAccountBalance((0, pda_1.getTokenATA)(predictorPDA, constants_1.UNIT_MINT, spl_token_1.TOKEN_PROGRAM_ID));
-                return (0, helpers_1.formatPredictor)(predictor, predictorPDA, new bn_js_1.default(balance.value.amount));
+                return (0, helpers_1.formatPredictor)(predictor, predictorPDA);
             }
             catch (e) {
                 return {
@@ -43,11 +41,77 @@ class Predictor {
                     authority: authority.toBase58(),
                     balance: 0,
                     customerId,
-                    refer: '11111111111111111111111111111111'
+                    refer: '11111111111111111111111111111111',
+                    rewardsAvailable: 0,
+                    rewardsClaimed: 0
                 };
             }
         });
     }
+    /**
+     * Get User Orders
+     * @param wallet - User wallet PublicKey
+     */
+    getUserOrders(wallet, customerId = 7) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, wallet, customerId);
+            const orders = yield this.program.account.predictorOrder.all([
+                {
+                    memcmp: {
+                        offset: 8,
+                        bytes: predictorPDA.toBase58()
+                    }
+                }
+            ]);
+            return orders.map(({ account, publicKey }) => (0, helpers_1.formatPredictorOrder)(account, publicKey));
+        });
+    }
+    /**
+     * Get User Orders By Market ID
+     * @param wallet - User wallet PublicKey
+     * @param marketId - The ID of the market
+     */
+    getUserOrdersByMarketId(wallet, marketId, customerId = 7) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const orders = yield this.getUserOrders(wallet, customerId);
+            return orders.filter((order) => order.marketId === marketId.toString());
+        });
+    }
+    /**
+     * Get all User Book Orders
+     * @param wallet - User wallet PublicKey
+     * @param customerId - User Customer ID
+     */
+    getUserBookOrders(wallet, customerId = 7) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const orderbooks = yield this.program.account.orderBook.all();
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, wallet, customerId);
+            const bookOrders = orderbooks.map((orderbook) => {
+                return [...orderbook.account.hypeOrders, ...orderbook.account.flopOrders]
+                    .map((order) => (0, helpers_1.formatBookOrder)(order, orderbook.account.marketId.toNumber()))
+                    .filter((order) => order.authority === predictorPDA.toBase58() &&
+                    order.linkedBookOrderId === constants_1.BOOK_ORDER_NULL.toString());
+            });
+            return bookOrders.flat();
+        });
+    }
+    /**
+     * Get User Book Orders By Market ID
+     * @param wallet - User wallet PublicKey
+     * @param marketId - The ID of the market
+     * @param customerId - User Customer ID
+     */
+    getUserBookOrdersByMarketId(wallet, marketId, customerId = 7) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const orderBook = yield this.program.account.orderBook.fetch((0, pda_1.getOrderBookPDA)(this.program.programId, marketId), this.rpcOptions.commitment);
+            const orders = [...orderBook.hypeOrders, ...orderBook.flopOrders];
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, wallet, customerId);
+            return orders
+                .map((order) => (0, helpers_1.formatBookOrder)(order, marketId))
+                .filter((order) => order.authority === predictorPDA.toBase58() &&
+                order.linkedBookOrderId === constants_1.BOOK_ORDER_NULL.toString());
+        });
+    }
     /**
      * Deposit
      * @param args.authority - Authority of the deposit
@@ -78,7 +142,6 @@ class Predictor {
                 .deposit(new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_DECIMALS)))
                 .accounts({
                 signer: authority,
-                payer: this.rpcOptions.payer,
                 predictor: predictorPDA
             })
                 .instruction());
@@ -93,16 +156,37 @@ class Predictor {
      */
     withdraw({ authority, amount, customerId = 7 }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
-            ixs.push(yield this.program.methods
-                .withdraw(new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_DECIMALS)))
-                .accounts({
-                signer: authority,
-                payer: this.rpcOptions.payer,
-                predictor: predictorPDA
-            })
-                .instruction());
+            const ixs = [
+                yield this.program.methods
+                    .withdraw(new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_DECIMALS)))
+                    .accounts({
+                    signer: authority,
+                    predictor: predictorPDA
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Collect Rewards
+     * Claims accumulated TRIAD token rewards for the predictor.
+     * @param args.authority - Authority of the predictor
+     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     */
+    collectRewards({ authority, customerId = 7 }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
+            const ixs = [
+                yield this.program.methods
+                    .collectRewards()
+                    .accounts({
+                    signer: authority,
+                    predictor: predictorPDA
+                })
+                    .instruction()
+            ];
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }

package/dist/stake.d.ts

@@ -35,21 +35,6 @@ export default class Stake {
      * @param wallet - User wallet
      */
     getUnstakeByWallet(wallet: PublicKey): Promise<import(".").Unstake[]>;
-    /**
-     * Stake Token
-     * @param amount - Amount to stake
-     */
-    stakeToken(amount: number): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Stake Vault
-     * @param amount - Reward amount to deposit
-     */
-    addStakeVaultRewards(amount: number): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Request Unstake
-     * @param amount - Amount to unstake
-     */
-    requestUnstake(amount: number): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Unstake Token
      * @param unstakePDA - Unstake Public Key

package/dist/stake.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const anchor_1 = require("@coral-xyz/anchor");
 const helpers_1 = require("./utils/helpers");
 const pda_1 = require("./utils/pda");
 const constants_1 = require("./utils/constants");
@@ -69,65 +68,6 @@ class Stake {
             return stake.map((stake) => (0, helpers_1.formatUnstake)(stake.account, stake.publicKey));
         });
     }
-    /**
-     * Stake Token
-     * @param amount - Amount to stake
-     */
-    stakeToken(amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .stakeToken({
-                    amount: new anchor_1.BN(amount * Math.pow(10, 6))
-                })
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    mint: constants_1.TRD_MINT
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Update Stake Vault
-     * @param amount - Reward amount to deposit
-     */
-    addStakeVaultRewards(amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .addStakeVaultRewards(new anchor_1.BN(amount * Math.pow(10, 6)))
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    mint: constants_1.TRD_MINT
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Request Unstake
-     * @param amount - Amount to unstake
-     */
-    requestUnstake(amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .requestUnstake({
-                    amount: new anchor_1.BN(amount * Math.pow(10, 6)),
-                    ts: new anchor_1.BN(Date.now())
-                })
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    mint: constants_1.TRD_MINT
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
     /**
      * Unstake Token
      * @param unstakePDA - Unstake Public Key

package/dist/trade.d.ts

@@ -33,7 +33,7 @@ export default class Trade {
      * @param args.orders.price - The price of the Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    placeBidOrder({ orders }: PlaceBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    placeBidOrder({ orders, customerId }: PlaceBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Place Ask Order
      * @param args.orders - Array of orders to execute
@@ -42,14 +42,14 @@ export default class Trade {
      * @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>;
+    placeAskOrder({ orders, customerId }: PlaceAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Cancel Bid Order
      * @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>;
+    cancelBidOrder({ orders, customerId }: CancelBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Cancel Ask Order
      * @param args.orders.marketId - The ID of the Market
@@ -57,14 +57,14 @@ export default class Trade {
      * @param args.orders.bookOrderId - The ID of the Book Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelAskOrder({ orders }: CancelAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    cancelAskOrder({ orders, customerId }: CancelAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Market Bid Order
      * @param args.marketId - The ID of the Market
      * @param args.amount - The amount of the Order
      * @param args.orderDirection - The direction of the Order
      */
-    marketBidOrder({ marketId, amount, customerId, orderDirection }: MarketBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    marketBidOrder({ marketId, amount, orderDirection, customer }: MarketBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Market Ask Order
      * @param args.marketId - The ID of the Market
@@ -72,7 +72,7 @@ export default class Trade {
      * @param args.bookOrderBidId - The ID of the Bid Order
      * @param args.orderDirection - The direction of the Order
      */
-    marketAskOrder({ marketId, shares, orderDirection, customerId }: MarketAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    marketAskOrder({ marketId, shares, orderDirection, customer }: MarketAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Payout Order
      * @param args.marketId - The ID of the Market
@@ -83,5 +83,6 @@ export default class Trade {
         marketId: number;
         orderDirection: OrderDirectionEncoded;
         authority: PublicKey;
+        customerId: number;
     }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/trade.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
-const spl_token_1 = require("@solana/spl-token");
 const bn_js_1 = __importDefault(require("bn.js"));
 const helpers_1 = require("./utils/helpers");
 const types_1 = require("./types");
@@ -40,20 +39,18 @@ class Trade {
                 hype: { bid: [], ask: [] },
                 flop: { bid: [], ask: [] }
             };
-            const orderBookPDA = (0, pda_1.getOrderBookPDA)(this.program.programId, marketId);
-            const orderBook = yield this.program.account.orderBook.fetch(orderBookPDA);
-            data.rewardsAvailable = orderBook.rewardsAvailable.toString();
-            data.rewardsClaimed = orderBook.rewardsClaimed.toString();
-            data.spreadToReward = orderBook.spreadToReward.toString();
+            const orderBook = yield this.program.account.orderBook.fetch((0, pda_1.getOrderBookPDA)(this.program.programId, marketId), 'processed');
             const processOrders = (orders, side) => {
+                const { bid, ask } = data[side];
                 for (const order of orders) {
-                    if (order.price.eq(new bn_js_1.default(0)))
+                    if (order.price.isZero())
                         continue;
+                    const formatted = (0, helpers_1.formatBookOrder)(order, marketId);
                     if ((0, helpers_1.getOrderSideFromNumber)(order.orderSide) === types_1.OrderSide.BID) {
-                        data[side].bid.push((0, helpers_1.formatBookOrder)(order, marketId));
+                        bid.push(formatted);
                     }
-                    if ((0, helpers_1.getOrderSideFromNumber)(order.orderSide) === types_1.OrderSide.ASK) {
-                        data[side].ask.push((0, helpers_1.formatBookOrder)(order, marketId));
+                    else {
+                        ask.push(formatted);
                     }
                 }
             };
@@ -70,12 +67,10 @@ class Trade {
      * @param args.orders.price - The price of the Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    placeBidOrder({ orders }) {
+    placeBidOrder({ orders, customerId = 7 }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            if (orders.length > 6) {
-                throw new Error('Max 6 orders per transaction');
-            }
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .placeBidOrder({
@@ -87,9 +82,10 @@ class Trade {
                     .accounts({
                     signer: this.program.provider.publicKey,
                     payer: this.rpcOptions.payer,
+                    predictor: predictorPDA,
                     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))
+                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
                 })
                     .instruction());
             }
@@ -104,12 +100,10 @@ class Trade {
      * @param args.orders.marketId - The Id from the market
      * @param args.orders.orderDirection - The direction of the Order
      */
-    placeAskOrder({ orders }) {
+    placeAskOrder({ orders, customerId = 7 }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            if (orders.length > 6) {
-                throw new Error('Max 6 orders per transaction');
-            }
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .placeAskOrder({
@@ -120,7 +114,8 @@ class Trade {
                     .accounts({
                     signer: this.program.provider.publicKey,
                     market: (0, pda_1.getMarketPDA)(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)),
+                    predictor: predictorPDA,
+                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection)),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId)
                 })
                     .instruction());
@@ -134,12 +129,9 @@ class Trade {
      * @param args.orders.marketId - The ID of the Market
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelBidOrder({ orders }) {
+    cancelBidOrder({ orders, customerId = 7 }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            if (orders.length > 6) {
-                throw new Error('You can only cancel up to 6 orders at a time');
-            }
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .cancelBidOrder({
@@ -149,7 +141,7 @@ class Trade {
                 })
                     .accounts({
                     signer: new web3_js_1.PublicKey(order.authority),
-                    payer: this.rpcOptions.payer,
+                    predictor: (0, pda_1.getPredictorPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), customerId),
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId)
                 })
@@ -165,12 +157,10 @@ class Trade {
      * @param args.orders.bookOrderId - The ID of the Book Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelAskOrder({ orders }) {
+    cancelAskOrder({ orders, customerId = 7 }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            if (orders.length > 5) {
-                throw new Error('Max 5 orders per transaction');
-            }
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .cancelAskOrder({
@@ -181,9 +171,10 @@ class Trade {
                     .accounts({
                     signer: order.authority,
                     payer: this.rpcOptions.payer,
+                    predictor: predictorPDA,
                     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, order.authority, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
+                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
                 })
                     .instruction());
             }
@@ -196,12 +187,11 @@ class Trade {
      * @param args.amount - The amount of the Order
      * @param args.orderDirection - The direction of the Order
      */
-    marketBidOrder({ marketId, amount, customerId, orderDirection }) {
+    marketBidOrder({ marketId, amount, orderDirection, customer }) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
-            const addressLookupTableAccounts = [];
-            const customer = yield (0, helpers_1.getCustomerById)(this.program, customerId);
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customer.id);
             const orderBook = yield this.getOrderBook(marketId);
             let remainingUSDC = new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_DECIMALS));
             const orders = Object.keys(orderDirection)[0] === 'hype'
@@ -211,7 +201,7 @@ class Trade {
             for (const order of sortedOrders) {
                 if (remainingUSDC.lte(new bn_js_1.default(0)))
                     break;
-                if (order.authority === this.program.provider.publicKey.toBase58()) {
+                if (order.authority === predictorPDA.toBase58()) {
                     continue;
                 }
                 const orderPrice = new bn_js_1.default(order.price);
@@ -241,12 +231,14 @@ class Trade {
                     .accounts({
                     signer: this.program.provider.publicKey,
                     payer: this.rpcOptions.payer,
+                    predictor: predictorPDA,
+                    oppositePredictor: (0, pda_1.getPredictorPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), customer.id),
+                    central: (0, pda_1.getCentralPDA)(this.program.programId),
                     market: marketPDA,
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                    bookOrderAskAuthority: new web3_js_1.PublicKey(order.authority),
-                    order: (0, pda_1.getOrderPDA)(this.program.programId, this.program.provider.publicKey, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
-                    oppositeOrder: (0, pda_1.getOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(oppositeOrderDirection)),
-                    customer: (0, pda_1.getCustomerPDA)(this.program.programId, customerId)
+                    customer: customer.address,
+                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
+                    oppositePredictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(oppositeOrderDirection))
                 })
                     .instruction());
                 remainingUSDC = remainingUSDC.sub(usdcAmount);
@@ -254,7 +246,7 @@ class Trade {
             if (ixs.length === 0) {
                 throw new Error('No matching orders found to fill the requested amount');
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions, addressLookupTableAccounts);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
@@ -264,12 +256,12 @@ class Trade {
      * @param args.bookOrderBidId - The ID of the Bid Order
      * @param args.orderDirection - The direction of the Order
      */
-    marketAskOrder({ marketId, shares, orderDirection, customerId }) {
+    marketAskOrder({ marketId, shares, orderDirection, customer }) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const addressLookupTableAccounts = [];
-            const customer = yield (0, helpers_1.getCustomerById)(this.program, customerId);
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customer.id);
             const orderBook = yield this.getOrderBook(marketId);
             const bidOrders = Object.keys(orderDirection)[0] === 'hype'
                 ? orderBook.hype.bid
@@ -280,7 +272,7 @@ class Trade {
             for (const order of sortedOrders) {
                 if (remainingShares.lte(new bn_js_1.default(0)))
                     break;
-                if (order.authority === this.program.provider.publicKey.toBase58() ||
+                if (order.authority === predictorPDA.toBase58() ||
                     order.linkedBookOrderId !== constants_1.BOOK_ORDER_NULL.toString()) {
                     continue;
                 }
@@ -301,14 +293,13 @@ class Trade {
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    payer: this.rpcOptions.payer,
+                    predictor: predictorPDA,
                     market: marketPDA,
-                    buyerAuthority: new web3_js_1.PublicKey(order.authority),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                    marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
-                    bidOrder: (0, pda_1.getOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
-                    askOrder: (0, pda_1.getOrderPDA)(this.program.programId, this.program.provider.publicKey, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
-                    customer: customer.address
+                    customer: customer.address,
+                    central: (0, pda_1.getCentralPDA)(this.program.programId),
+                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
+                    oppositePredictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(orderDirection))
                 })
                     .instruction());
             }
@@ -327,18 +318,17 @@ class Trade {
     payoutOrder(orders) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            if (orders.length > 4) {
-                throw new Error('Max 4 orders per transaction');
-            }
             for (const order of orders) {
+                const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, order.customerId);
                 ixs.push(yield this.program.methods
                     .payoutOrder()
                     .accounts({
                     signer: order.authority,
-                    payer: this.rpcOptions.payer,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
-                    tokenProgram: (0, helpers_1.getTokenProgram)(constants_1.USDC_MINT),
-                    order: (0, pda_1.getOrderPDA)(this.program.programId, order.authority, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
+                    predictor: predictorPDA,
+                    customer: (0, pda_1.getCustomerPDA)(this.program.programId, order.customerId),
+                    central: (0, pda_1.getCentralPDA)(this.program.programId),
+                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
                 })
                     .instruction());
             }