@triadxyz/triad-protocol 0.7.5-beta.devnet → 0.7.6-beta.devnet

package/dist/trade.js

@@ -12,12 +12,13 @@ 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"));
 class Trade {
     constructor(program, provider) {
         this.mint = constants_1.TRD_MINT_DEVNET;
@@ -27,30 +28,58 @@ class Trade {
     /**
      * Get all Markets
      */
-    getMarkets() {
+    getAllMarkets() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.program.account.market
                 .all()
                 .then((markets) => markets.map(({ account, publicKey }) => (0, helpers_1.accountToMarket)(account, publicKey)));
         });
     }
+    /**
+     * Get Market by ID
+     * @param marketId - The ID of the market
+     *
+     */
+    getMarketById(marketId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
+            const response = yield this.program.account.market.fetch(marketPDA);
+            return (0, helpers_1.accountToMarket)(response, marketPDA);
+        });
+    }
+    /**
+     * Get Market by Address
+     * @param address - The address of the market
+     *
+     */
     getMarketByAddress(address) {
         return __awaiter(this, void 0, void 0, function* () {
             const account = yield this.program.account.market.fetch(address);
             return (0, helpers_1.accountToMarket)(account, address);
         });
     }
+    /**
+     * Get User Trade
+     * @param user - The user's public key
+     *
+     */
+    getUserTrade(user) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, user);
+            return this.program.account.userTrade.fetch(userTradePDA);
+        });
+    }
     /**
      * Initialize Market
      * @param market id - new markert id - length + 1
      * @param name - PYTH/TRD JUP/TRD DRIFT/TRD
      *
+     * @param options - RPC options
+     *
      */
     initializeMarket({ marketId, name }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
-            const feeVaultPDA = (0, trade_1.getFeeVaultPDA)(this.program.programId, marketId);
-            const method = this.program.methods
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods
                 .initializeMarket({
                 marketId: new bn_js_1.default(marketId),
                 name: name
@@ -58,24 +87,20 @@ class Trade {
                 .accounts({
                 signer: this.provider.publicKey,
                 mint: this.mint
-            });
-            if (options === null || options === void 0 ? void 0 : options.microLamports) {
-                method.postInstructions([
-                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: options.microLamports
-                    })
-                ]);
-            }
-            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
-        });
-    }
-    getUserTrade() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
-            return this.program.account.userTrade.fetch(userTradePDA);
+            }), options);
         });
     }
-    openOrder(marketId, args, 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 comment - The comment of the order
+     *
+     * @param options - RPC options
+     *
+     */
+    openOrder({ marketId, amount, direction, comment }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
             const feeVualtPDA = (0, trade_1.getFeeVaultPDA)(this.program.programId, marketId);
@@ -97,9 +122,9 @@ class Trade {
             }
             ixs.push(yield this.program.methods
                 .openOrder({
-                amount: new bn_js_1.default(args.amount * Math.pow(10, constants_1.TRD_DECIMALS)),
-                direction: args.direction,
-                comment: (0, helpers_1.encodeString)(args.comment, 64)
+                amount: new bn_js_1.default(amount * Math.pow(10, constants_1.TRD_DECIMALS)),
+                direction: direction,
+                comment: (0, helpers_1.encodeString)(comment, 64)
             })
                 .accounts({
                 signer: this.provider.publicKey,
@@ -110,40 +135,69 @@ class Trade {
                 userFromAta: userFromATA
             })
                 .instruction());
-            if (options === null || options === void 0 ? void 0 : options.microLamports) {
-                ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                    microLamports: options.microLamports
-                }));
-            }
-            const { blockhash } = yield this.provider.connection.getLatestBlockhash();
-            return this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
-                instructions: ixs,
-                recentBlockhash: blockhash,
-                payerKey: this.provider.publicKey
-            }).compileToV0Message()), [], {
-                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
-                commitment: 'confirmed'
-            });
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }
+    /**
+     * Close Order
+     * @param marketId - The ID of the market
+     * @param orderId - The ID of the order
+     *
+     * @param options - RPC options
+     *
+     */
     closeOrder({ marketId, orderId }, 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 method = this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
+            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,
                 userTrade: userTradePDA
+            }), options);
+        });
+    }
+    /**
+     * Initialize a new question for a market
+     * @param marketId - The ID of the market
+     * @param question - The question to initialize
+     * @param startTime - The start time of the question
+     * @param endTime - The end time of the question
+     *
+     * @param options - RPC options
+     *
+     */
+    initializeQuestion({ marketId, question, startTime, endTime }, 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
+                .initializeQuestion({
+                question: (0, helpers_1.encodeString)(question, 80),
+                startTime: new bn_js_1.default(startTime),
+                endTime: new bn_js_1.default(endTime)
+            })
+                .accounts({
+                signer: this.provider.publicKey,
+                market: marketPDA
+            }), options);
+        });
+    }
+    /**
+     * Resolve the current question for a market
+     * @param marketId - The ID of the market
+     *
+     * @param options - RPC options
+     *
+     */
+    resolveQuestion(marketId, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
+            const method = this.program.methods.resolveQuestion().accounts({
+                signer: this.provider.publicKey,
+                market: marketPDA
             });
-            if (options === null || options === void 0 ? void 0 : options.microLamports) {
-                method.postInstructions([
-                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: options.microLamports
-                    })
-                ]);
-            }
-            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
+            return (0, sendTransactionWithOptions_1.default)(method, options);
         });
     }
 }

package/dist/types/idl_triad_protocol.json

@@ -418,46 +418,6 @@
                     "name": "market",
                     "writable": true
                 },
-                {
-                    "name": "mint",
-                    "writable": true
-                },
-                {
-                    "name": "market_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "account",
-                                "path": "market"
-                            },
-                            {
-                                "kind": "account",
-                                "path": "token_program"
-                            },
-                            {
-                                "kind": "account",
-                                "path": "mint"
-                            }
-                        ],
-                        "program": {
-                            "kind": "const",
-                            "value": [
-                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
-                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
-                                219, 233, 248, 89
-                            ]
-                        }
-                    }
-                },
-                {
-                    "name": "token_program",
-                    "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-                },
-                {
-                    "name": "associated_token_program",
-                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
-                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -1169,6 +1129,10 @@
         {
             "name": "QuestionUpdate",
             "discriminator": [110, 108, 240, 86, 176, 226, 54, 113]
+        },
+        {
+            "name": "StakeRewards",
+            "discriminator": [236, 217, 227, 239, 6, 129, 188, 218]
         }
     ],
     "errors": [
@@ -1244,133 +1208,133 @@
         },
         {
             "code": 6014,
-            "name": "StakeVaultLocked",
-            "msg": "Stake vault locked"
-        },
-        {
-            "code": 6015,
             "name": "StakeLocked",
             "msg": "Stake is locked"
         },
         {
-            "code": 6016,
+            "code": 6015,
             "name": "StakeVaultFull",
             "msg": "Stake vault full"
         },
         {
-            "code": 6017,
+            "code": 6016,
             "name": "InvalidMint",
             "msg": "Invalid mint"
         },
         {
-            "code": 6018,
+            "code": 6017,
             "name": "InvalidStakeVaultWeek",
             "msg": "Invalid stake vault week"
         },
         {
-            "code": 6019,
+            "code": 6018,
             "name": "RewardsAlreadyClaimed",
             "msg": "Rewards already claimed"
         },
         {
-            "code": 6020,
+            "code": 6019,
             "name": "StakeOverflow",
             "msg": "Stake overflow"
         },
         {
-            "code": 6021,
+            "code": 6020,
             "name": "SwapsReachedLimit",
             "msg": "Swaps reached limit"
         },
         {
-            "code": 6022,
+            "code": 6021,
             "name": "InsufficientFunds",
             "msg": "Insufficient funds"
         },
         {
-            "code": 6023,
+            "code": 6022,
             "name": "NoRewardsAvailable",
             "msg": "No rewards available"
         },
         {
-            "code": 6024,
+            "code": 6023,
             "name": "InvalidPrice",
             "msg": "Invalid price"
         },
         {
-            "code": 6025,
+            "code": 6024,
             "name": "InvalidOrderSize",
             "msg": "Invalid order size"
         },
         {
-            "code": 6026,
+            "code": 6025,
             "name": "MaxOpenOrdersReached",
             "msg": "Maximum number of open orders reached"
         },
         {
-            "code": 6027,
+            "code": 6026,
             "name": "NoAvailableOrderSlot",
             "msg": "No available order slot"
         },
         {
-            "code": 6028,
+            "code": 6027,
             "name": "MarketInactive",
             "msg": "Market is inactive"
         },
         {
-            "code": 6029,
+            "code": 6028,
             "name": "InvalidOrderType",
             "msg": "Invalid order type"
         },
         {
-            "code": 6030,
+            "code": 6029,
             "name": "InvalidOrderDirection",
             "msg": "Invalid order direction"
         },
         {
-            "code": 6031,
+            "code": 6030,
             "name": "OrderNotFound",
             "msg": "Order not found"
         },
         {
-            "code": 6032,
+            "code": 6031,
             "name": "InvalidOrderStatus",
             "msg": "Invalid order status"
         },
         {
-            "code": 6033,
+            "code": 6032,
             "name": "ArithmeticOverflow",
             "msg": "Arithmetic overflow"
         },
         {
-            "code": 6034,
+            "code": 6033,
             "name": "OrderSizeTooLarge",
             "msg": "Order size too large"
         },
         {
-            "code": 6035,
+            "code": 6034,
             "name": "QuestionPeriodNotEnded",
             "msg": "Question period not ended"
         },
         {
-            "code": 6036,
+            "code": 6035,
             "name": "InvalidStartTime",
             "msg": "Invalid start time"
         },
         {
-            "code": 6037,
+            "code": 6036,
             "name": "InvalidEndTime",
             "msg": "Invalid end time"
         },
         {
-            "code": 6038,
+            "code": 6037,
             "name": "QuestionPeriodNotStarted",
             "msg": "Question period not started"
         },
         {
-            "code": 6039,
+            "code": 6038,
             "name": "QuestionPeriodEnded",
             "msg": "Question period ended"
+        },
+        {
+            "code": 6039,
+            "name": "StakeVaultLocked",
+            "msg": "Stake vault is locked"
         }
     ],
     "types": [
@@ -1627,9 +1591,6 @@
                     },
                     {
                         "name": "current_question_start",
-                        "docs": [
-                            "Start timestamp of the current week if 7 days have passed since the start of the week"
-                        ],
                         "type": "i64"
                     },
                     {
@@ -2120,6 +2081,34 @@
                 ]
             }
         },
+        {
+            "name": "StakeRewards",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "user",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "mint",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "amount",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "timestamp",
+                        "type": "i64"
+                    },
+                    {
+                        "name": "rank",
+                        "type": "u16"
+                    }
+                ]
+            }
+        },
         {
             "name": "StakeTokenArgs",
             "type": {

package/dist/types/trade.d.ts

@@ -64,3 +64,15 @@ export type OrderType = {
 } | {
     market: {};
 };
+export type InitializeQuestionArgs = {
+    marketId: number;
+    question: string;
+    startTime: number;
+    endTime: number;
+};
+export type OpenOrderArgs = {
+    marketId: number;
+    amount: number;
+    direction: OrderDirection;
+    comment?: string;
+};