@triadxyz/triad-protocol 1.9.8-beta → 2.0.0-beta

package/dist/trade.js

@@ -17,15 +17,14 @@ const trade_1 = require("./types/trade");
 const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("./utils/constants");
 const helpers_1 = require("./utils/helpers");
-const trade_2 = require("./utils/pda/trade");
+const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
+const sendMethod_1 = __importDefault(require("./utils/sendMethod"));
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
-const pda_1 = require("./utils/pda");
+const pda_2 = require("./utils/pda");
 class Trade {
-    constructor(program, provider) {
+    constructor(program) {
         this.program = program;
-        this.provider = provider;
         this.decimals = constants_1.TRD_DECIMALS; // We're using only TRD or USDC so we can use the same decimals 6
     }
     /**
@@ -64,8 +63,7 @@ class Trade {
     getUserOrders(user) {
         return __awaiter(this, void 0, void 0, function* () {
             const myUserTrades = yield this.getMyUserTrades(user);
-            const orders = myUserTrades.flatMap((userTrade) => userTrade.orders);
-            return orders;
+            return myUserTrades.flatMap((userTrade) => userTrade.orders);
         });
     }
     /**
@@ -75,7 +73,7 @@ class Trade {
      */
     getMarketById(marketId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
+            const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const response = yield this.program.account.marketV2.fetch(marketPDA);
             return (0, helpers_1.formatMarket)(response, marketPDA);
         });
@@ -99,10 +97,10 @@ class Trade {
      */
     getUserTrade(user, userNonce = 0) {
         return __awaiter(this, void 0, void 0, function* () {
-            let userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, user);
+            let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, user);
             if (userNonce !== 0) {
-                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, user, userNonce);
-                userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, user, userNonce);
+                userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
             return this.program.account.userTrade.fetch(userTradePDA);
         });
@@ -120,26 +118,24 @@ class Trade {
      *
      */
     createMarket({ marketId, startTime, endTime, question, feeBps, customer, payoutFee, mint }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (question.length > 80) {
-                throw new Error('Question must be less than 80 characters');
-            }
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods
-                .createMarket({
-                marketId: new bn_js_1.default(marketId),
-                question: (0, helpers_1.encodeString)(question, 80),
-                marketStart: new bn_js_1.default(startTime),
-                marketEnd: new bn_js_1.default(endTime),
-                feeBps,
-                payoutFee
-            })
-                .accounts({
-                signer: this.provider.publicKey,
-                mint,
-                tokenProgram: (0, helpers_1.getTokenProgram)(mint),
-                customer
-            }), options);
-        });
+        if (question.length > 80) {
+            throw new Error('Question must be less than 80 characters');
+        }
+        return (0, sendMethod_1.default)(this.program.methods
+            .createMarket({
+            marketId: new bn_js_1.default(marketId),
+            question: (0, helpers_1.encodeString)(question, 80),
+            marketStart: new bn_js_1.default(startTime),
+            marketEnd: new bn_js_1.default(endTime),
+            feeBps,
+            payoutFee
+        })
+            .accounts({
+            signer: this.program.provider.publicKey,
+            mint,
+            tokenProgram: (0, helpers_1.getTokenProgram)(mint),
+            customer
+        }), options);
     }
     /**
      * Open Order
@@ -153,27 +149,25 @@ class Trade {
      */
     openOrder({ marketId, amount, direction, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const addressLookupTableAccounts = [];
-            let amountInTRD = amount * Math.pow(10, constants_1.TRD_DECIMALS);
             const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
             ixs.push(yield this.program.methods
                 .openOrder({
-                amount: new bn_js_1.default(amountInTRD),
+                amount: new bn_js_1.default(amount * Math.pow(10, constants_1.TRD_DECIMALS)),
                 direction: direction
             })
                 .accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA,
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 userTrade: userTradePDA,
                 mint
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, addressLookupTableAccounts);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options, addressLookupTableAccounts);
         });
     }
     /**
@@ -187,15 +181,14 @@ class Trade {
      */
     closeOrder({ marketId, orderId, userNonce }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
-            let userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonce !== 0) {
-                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonce);
-                userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonce);
+                userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA,
+            return (0, sendMethod_1.default)(this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 mint: constants_1.TRD_MINT,
                 userTrade: userTradePDA
             }), options);
@@ -210,16 +203,16 @@ class Trade {
      *
      */
     resolveMarket({ marketId, winningDirection }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
-            const method = this.program.methods
-                .resolveMarket(winningDirection)
-                .accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA
-            });
-            return (0, sendTransactionWithOptions_1.default)(method, options);
-        });
+        return (0, sendMethod_1.default)(this.program.methods
+            .updateMarket({
+            winningDirection,
+            allowPayout: null,
+            marketEnd: null
+        })
+            .accounts({
+            signer: this.program.provider.publicKey,
+            market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+        }), options);
     }
     /**
      * Collect Remaining Liquidity
@@ -230,10 +223,10 @@ class Trade {
      */
     collectRemainingLiquidity(marketId, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
+            const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const market = yield this.getMarketByAddress(marketPDA);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.collectRemainingLiquidity().accounts({
-                signer: this.provider.publicKey,
+            return (0, sendMethod_1.default)(this.program.methods.collectRemainingLiquidity().accounts({
+                signer: this.program.provider.publicKey,
                 market: marketPDA,
                 mint: market.mint
             }), options);
@@ -255,24 +248,23 @@ class Trade {
                 throw new Error('Max 10 orders per transaction');
             }
             for (const order of orders) {
-                const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, order.marketId);
-                let userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+                let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
                 if (order.userNonce !== 0) {
-                    const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, order.userNonce);
-                    userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                    const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, order.userNonce);
+                    userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
                 }
                 ixs.push(yield this.program.methods
                     .payoutOrder(new bn_js_1.default(order.orderId))
                     .accounts({
-                    signer: this.provider.publicKey,
+                    signer: this.program.provider.publicKey,
                     userTrade: userTradePDA,
-                    market: marketPDA,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     mint: order.mint,
                     tokenProgram: (0, helpers_1.getTokenProgram)(order.mint)
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -283,13 +275,16 @@ class Trade {
      *
      */
     allowMarketToPayout(marketId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.allowMarketToPayout().accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA
-            }), options);
-        });
+        return (0, sendMethod_1.default)(this.program.methods
+            .updateMarket({
+            winningDirection: null,
+            allowPayout: true,
+            marketEnd: null
+        })
+            .accounts({
+            signer: this.program.provider.publicKey,
+            market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+        }), options);
     }
     /**
      * Create Sub User Trade
@@ -301,9 +296,9 @@ class Trade {
     createSubUserTrade(user, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const userTrade = yield this.getUserTrade(user);
-            const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, user, userTrade.nonce + 1);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.createSubUserTrade(subUserTradePDA).accounts({
-                signer: this.provider.publicKey
+            const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, user, userTrade.nonce + 1);
+            return (0, sendMethod_1.default)(this.program.methods.createSubUserTrade(subUserTradePDA).accounts({
+                signer: this.program.provider.publicKey
             }), options);
         });
     }
@@ -316,13 +311,16 @@ class Trade {
      *
      */
     updateMarket(marketId, marketEnd, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.updateMarket(new bn_js_1.default(marketEnd)).accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA
-            }), options);
-        });
+        return (0, sendMethod_1.default)(this.program.methods
+            .updateMarket({
+            marketEnd: new bn_js_1.default(marketEnd),
+            winningDirection: null,
+            allowPayout: null
+        })
+            .accounts({
+            signer: this.program.provider.publicKey,
+            market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+        }), options);
     }
     /**
      * Create Customer
@@ -334,13 +332,11 @@ class Trade {
      *
      */
     createCustomer({ id, name, authority, feeRecipient }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods
-                .createCustomer({ id, name, authority, feeRecipient })
-                .accounts({
-                signer: this.provider.publicKey
-            }), options);
-        });
+        return (0, sendMethod_1.default)(this.program.methods
+            .createCustomer({ id, name, authority, feeRecipient })
+            .accounts({
+            signer: this.program.provider.publicKey
+        }), options);
     }
     /**
      * Get User Trade Nonce With Slots
@@ -348,50 +344,48 @@ class Trade {
      *
      */
     getUserTradeNonceWithSlots(userTrades) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let nonce = null;
-            for (const userTrade of userTrades.reverse()) {
+        let nonce = null;
+        for (const userTrade of userTrades.reverse()) {
+            if (nonce !== null) {
+                break;
+            }
+            let freeSlots = 0;
+            userTrade.orders.forEach((order) => {
                 if (nonce !== null) {
-                    break;
+                    return;
                 }
-                let freeSlots = 0;
-                userTrade.orders.forEach((order) => {
-                    if (nonce !== null) {
-                        return;
-                    }
-                    if (order.orderStatus !== trade_1.OrderStatus.OPEN &&
-                        order.orderStatus !== trade_1.OrderStatus.WAITING &&
-                        freeSlots >= 2) {
-                        nonce = userTrade.isSubUser ? Number(userTrade.nonce) : 0;
-                    }
-                    if (order.orderStatus !== trade_1.OrderStatus.OPEN &&
-                        order.orderStatus !== trade_1.OrderStatus.WAITING) {
-                        freeSlots += 1;
-                    }
-                });
-            }
-            if (nonce === null) {
-                throw new Error('No open orders found');
-            }
-            if (nonce === 0) {
-                return (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
-            }
-            const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, nonce);
-            const userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
-            return userTradePDA;
-        });
+                if (order.orderStatus !== trade_1.OrderStatus.OPEN &&
+                    order.orderStatus !== trade_1.OrderStatus.WAITING &&
+                    freeSlots >= 2) {
+                    nonce = userTrade.isSubUser ? Number(userTrade.nonce) : 0;
+                }
+                if (order.orderStatus !== trade_1.OrderStatus.OPEN &&
+                    order.orderStatus !== trade_1.OrderStatus.WAITING) {
+                    freeSlots += 1;
+                }
+            });
+        }
+        if (nonce === null) {
+            throw new Error('No open orders found');
+        }
+        if (nonce === 0) {
+            return (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
+        }
+        const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, nonce);
+        const userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
+        return userTradePDA;
     }
     getUserTradeIxs() {
         return __awaiter(this, void 0, void 0, function* () {
-            let userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             const ixs = [];
             let myUserTrades = [];
-            myUserTrades = yield this.getMyUserTrades(this.provider.publicKey);
+            myUserTrades = yield this.getMyUserTrades(this.program.provider.publicKey);
             if (myUserTrades.length === 0) {
                 ixs.push(yield this.program.methods
                     .createUserTrade()
                     .accounts({
-                    signer: this.provider.publicKey
+                    signer: this.program.provider.publicKey
                 })
                     .instruction());
                 return {
@@ -401,20 +395,20 @@ class Trade {
                 };
             }
             try {
-                const userTradePDA = yield this.getUserTradeNonceWithSlots(myUserTrades);
+                const userTradePDA = 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);
+                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, Number(mainUserTrade.nonce) + 1);
                 ixs.push(yield this.program.methods
                     .createSubUserTrade(subUserTradePDA)
                     .accounts({
-                    signer: this.provider.publicKey
+                    signer: this.program.provider.publicKey
                 })
                     .instruction());
                 return {
-                    userTradePDA: (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA),
+                    userTradePDA: (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA),
                     ixs
                 };
             }
@@ -432,7 +426,6 @@ class Trade {
      */
     placeBidOrder({ marketId, amount, direction, mint, price }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const { userTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
             if (userTradeIxs.length > 0) {
@@ -445,14 +438,14 @@ class Trade {
                 orderDirection: direction
             })
                 .accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA,
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 userTrade: userTradePDA,
                 mint,
                 tokenProgram: (0, helpers_1.getTokenProgram)(mint)
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -469,16 +462,15 @@ class Trade {
      */
     placeAskOrder({ marketId, amount, direction, price, bidOrderId, bidNonce }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const { userTradePDA: askUserTradePDA, ixs: userTradeIxs } = yield this.getUserTradeIxs();
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
-            let bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            let bidUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (bidNonce !== 0) {
-                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, bidNonce);
-                bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, bidNonce);
+                bidUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
             ixs.push(yield this.program.methods
                 .placeAskOrder({
@@ -488,13 +480,13 @@ class Trade {
                 orderDirection: direction
             })
                 .accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA,
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 askUserTrade: askUserTradePDA,
                 bidUserTrade: bidUserTradePDA
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -507,15 +499,14 @@ class Trade {
      */
     cancelBidOrder({ marketId, orderId, userNonce, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
-            let userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonce !== 0) {
-                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonce);
-                userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonce);
+                userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.cancelBidOrder(new bn_js_1.default(orderId)).accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA,
+            return (0, sendMethod_1.default)(this.program.methods.cancelBidOrder(new bn_js_1.default(orderId)).accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 userTrade: userTradePDA,
                 mint,
                 tokenProgram: (0, helpers_1.getTokenProgram)(mint)
@@ -533,20 +524,19 @@ class Trade {
      */
     cancelAskOrder({ marketId, orderId, userNonce, userNonceBidOrder }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
-            let askUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            let askUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonce !== 0) {
-                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonce);
-                askUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonce);
+                askUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            let bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            let bidUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonceBidOrder !== 0) {
-                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonceBidOrder);
-                bidUserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonceBidOrder);
+                bidUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.cancelAskOrder(new bn_js_1.default(orderId)).accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA,
+            return (0, sendMethod_1.default)(this.program.methods.cancelAskOrder(new bn_js_1.default(orderId)).accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 askUserTrade: askUserTradePDA,
                 bidUserTrade: bidUserTradePDA
             }), options);
@@ -563,7 +553,7 @@ class Trade {
      */
     marketBidOrder({ marketId, amount, direction, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
+            const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const { userTradePDA: buyerTrade, ixs: userTradeIxs } = yield this.getUserTradeIxs();
             const orderBook = yield this.getOrderBook(marketId);
@@ -575,7 +565,7 @@ class Trade {
             for (const order of sortedOrders) {
                 if (remainingUSDC <= 0)
                     break;
-                if (order.authority === this.provider.publicKey.toBase58()) {
+                if (order.authority === this.program.provider.publicKey.toBase58()) {
                     continue;
                 }
                 const orderPrice = Number(order.price);
@@ -583,10 +573,10 @@ class Trade {
                 const availableShares = Number(order.totalShares);
                 const sharesToBuy = Math.min(maxSharesForPrice, availableShares);
                 const usdcAmount = sharesToBuy * orderPrice;
-                let sellerTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority));
+                let sellerTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority));
                 if (order.userNonce !== '0') {
-                    const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), Number(order.userNonce));
-                    sellerTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                    const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), Number(order.userNonce));
+                    sellerTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
                 }
                 const tokenProgram = (0, helpers_1.getTokenProgram)(mint);
                 ixs.push(yield this.program.methods
@@ -596,15 +586,15 @@ class Trade {
                     askOrderId: new bn_js_1.default(order.orderId)
                 })
                     .accounts({
-                    signer: this.provider.publicKey,
+                    signer: this.program.provider.publicKey,
                     market: marketPDA,
                     buyerTrade,
                     sellerTrade: sellerTradePDA,
                     mint,
                     tokenProgram,
                     sellerAuthority: new web3_js_1.PublicKey(order.authority),
-                    marketToAta: (0, pda_1.getTokenATA)(marketPDA, mint, tokenProgram),
-                    userFromAta: (0, pda_1.getTokenATA)(this.provider.publicKey, mint, tokenProgram)
+                    marketAta: (0, pda_2.getTokenATA)(marketPDA, mint, tokenProgram),
+                    buyerAta: (0, pda_2.getTokenATA)(this.program.provider.publicKey, mint, tokenProgram)
                 })
                     .instruction());
                 remainingUSDC -= usdcAmount;
@@ -615,7 +605,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.provider, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**