@triadxyz/triad-protocol 1.4.8-beta → 1.5.0-beta

package/dist/trade.js

@@ -12,24 +12,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 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 helpers_1 = require("./utils/helpers");
 const trade_1 = 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 swap_1 = require("./utils/swap");
-const jup_swap_1 = require("./utils/jup-swap");
 class Trade {
     constructor(program, provider) {
-        this.mint = constants_1.TRD_MINT;
-        this.provider = provider;
         this.program = program;
+        this.provider = provider;
     }
     /**
-     * Get all Markets
+     * Get All Markets
+     *
      */
     getAllMarkets() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43,7 +40,7 @@ class Trade {
         });
     }
     /**
-     * Get Market by ID
+     * Get Market By ID
      * @param marketId - The ID of the market
      *
      */
@@ -55,7 +52,7 @@ class Trade {
         });
     }
     /**
-     * Get Market by Address
+     * Get Market By Address
      * @param address - The address of the market
      *
      */
@@ -67,7 +64,7 @@ class Trade {
     }
     /**
      * Get User Trade
-     * @param user - The user's public key
+     * @param user - User PublicKey
      *
      */
     getUserTrade(user) {
@@ -78,8 +75,10 @@ class Trade {
     }
     /**
      * Initialize Market
-     * @param market id - new markert id - length + 1
-     * @param name - PYTH/TRD JUP/TRD DRIFT/TRD
+     * @param args.marketId - new markert id - length + 1
+     * @param args.startTime - start time
+     * @param args.endTime - end time
+     * @param args.question - question (max 80 characters)
      *
      * @param options - RPC options
      *
@@ -93,22 +92,21 @@ class Trade {
                 .initializeMarket({
                 marketId: new bn_js_1.default(marketId),
                 question: (0, helpers_1.encodeString)(question, 80),
-                startTime: new bn_js_1.default(startTime),
-                endTime: new bn_js_1.default(endTime)
+                marketStart: new bn_js_1.default(startTime),
+                marketEnd: new bn_js_1.default(endTime)
             })
                 .accounts({
                 signer: this.provider.publicKey,
-                mint: this.mint
+                mint: constants_1.TRD_MINT
             }), options);
         });
     }
     /**
      * Open Order
-     * @param marketId - The ID of the market
-     * @param amount - The amount of the order
-     * @param direction - The direction of the order
-     * @param token - The token to use for the order
-     * @param comment - The comment of the 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.token - The token to use for the Order
      *
      * @param options - RPC options
      *
@@ -117,7 +115,6 @@ class Trade {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
             const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
-            const userPDA = (0, pda_1.getUserPDA)(this.program.programId, this.provider.publicKey);
             const ixs = [];
             const addressLookupTableAccounts = [];
             let amountInTRD = amount * Math.pow(10, constants_1.TRD_DECIMALS);
@@ -156,7 +153,7 @@ class Trade {
                 signer: this.provider.publicKey,
                 market: marketPDA,
                 userTrade: userTradePDA,
-                mint: this.mint
+                mint: constants_1.TRD_MINT
             })
                 .instruction());
             return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, addressLookupTableAccounts);
@@ -164,8 +161,8 @@ class Trade {
     }
     /**
      * Close Order
-     * @param marketId - The ID of the market
-     * @param orderId - The ID of the order
+     * @param args.marketId - The ID of the Market
+     * @param args.orderId - The ID of the Order
      *
      * @param options - RPC options
      *
@@ -177,15 +174,15 @@ class Trade {
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                mint: this.mint,
+                mint: constants_1.TRD_MINT,
                 userTrade: userTradePDA
             }), options);
         });
     }
     /**
      * Resolve Market
-     * @param marketId - The ID of the market
-     * @param winningDirection - The winning direction of the market
+     * @param args.marketId - The ID of the Market
+     * @param args.winningDirection - The Winning Direction of the Market
      *
      * @param options - RPC options
      *
@@ -204,10 +201,10 @@ class Trade {
     }
     /**
      * Resolve Market With Liquidity
-     * @param marketId - The ID of the market
-     * @param winningDirection - The winning direction of the market
-     * @param marketToAddLiquidity - The market to add liquidity
-     * @param amount - The amount of the order
+     * @param args.marketId - The ID of the Market
+     * @param args.winningDirection - The Winning Direction of the Market
+     * @param args.marketToAddLiquidity - The Market to Add Liquidity
+     * @param args.amount - The amount of the Order
      *
      * @param options - RPC options
      *
@@ -231,29 +228,31 @@ class Trade {
                 .accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                mint: this.mint
+                mint: constants_1.TRD_MINT
             })
                 .instruction());
             return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }
     /**
-     * Settle an order
-     * @param marketId - The ID of the market
-     * @param orderId - The ID of the order to settle
+     * Settle an Order for a V1 Market
+     * @param args.marketId - The ID of the Market
+     * @param args.orderId - The ID of the Order to Settle
+     * @param args.user - The user to settle the order for
      *
      * @param options - RPC options
      *
      */
-    settleOrder({ marketId, orderId }, options) {
+    settleOrder({ marketId, orderId, user }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
-            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, user);
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.settleOrder(new bn_js_1.default(orderId)).accounts({
                 signer: this.provider.publicKey,
+                user: user,
                 userTrade: userTradePDA,
                 market: marketPDA,
-                mint: this.mint
+                mint: constants_1.TRD_MINT
             }), options);
         });
     }
@@ -277,67 +276,31 @@ class Trade {
                 .accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                mint: this.mint
+                mint: constants_1.TRD_MINT
             }), options);
         });
     }
     /**
-     * Collect Fee
+     * Collect Remaining Liquidity
      * @param marketId - The ID of the market
      *
      * @param options - RPC options
      *
      */
-    collectFee({ marketId, vault }, options) {
+    collectRemainingLiquidity(marketId, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .collectFee()
-                .accounts({
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.collectRemainingLiquidity().accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                mint: this.mint
-            })
-                .instruction());
-            const market = yield this.getMarketById(marketId);
-            const marketFee = parseFloat(market.marketFeeAvailable) -
-                parseFloat(market.marketFeeClaimed);
-            const nftFee = parseFloat(market.nftHoldersFeeAvailable) -
-                parseFloat(market.nftHoldersFeeClaimed);
-            const totalFee = marketFee + nftFee;
-            if (totalFee / Math.pow(10, constants_1.TRD_DECIMALS) < 100) {
-                return;
-            }
-            const { setupInstructions, swapIxs, addressLookupTableAccounts, cleanupInstruction, otherAmountThreshold } = yield (0, jup_swap_1.jupSwap)({
-                connection: this.provider.connection,
-                wallet: this.provider.publicKey.toBase58(),
-                inToken: constants_1.TRD_MINT.toBase58(),
-                outToken: constants_1.SOL_MINT.toBase58(),
-                amount: parseInt(totalFee.toFixed())
-            });
-            ixs.push(...setupInstructions);
-            ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-                units: 500000
-            }));
-            ixs.push(...swapIxs);
-            ixs.push(cleanupInstruction);
-            ixs.push(web3_js_1.SystemProgram.transfer({
-                fromPubkey: this.provider.publicKey,
-                toPubkey: vault,
-                lamports: otherAmountThreshold
-            }));
-            yield (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, addressLookupTableAccounts);
-            return {
-                feeToSwap: totalFee,
-                lamport: otherAmountThreshold
-            };
+                mint: constants_1.TRD_MINT
+            }), options);
         });
     }
     /**
-     * Payout an order
-     * @param marketId - The ID of the market
-     * @param orderId - The ID of the order to payout
+     * Payout Order
+     * @param args.marketId - The ID of the Market
+     * @param args.orderId - The ID of the Order to Payout
      *
      * @param options - RPC options
      *
@@ -350,7 +313,16 @@ class Trade {
                 signer: this.provider.publicKey,
                 userTrade: userTradePDA,
                 market: marketPDA,
-                mint: this.mint
+                mint: constants_1.TRD_MINT
+            }), options);
+        });
+    }
+    allowMarketPayout(marketId, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.allowMarketPayout().accounts({
+                signer: this.provider.publicKey,
+                market: marketPDA
             }), options);
         });
     }