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

package/dist/index.d.ts

@@ -13,21 +13,25 @@ export default class TriadProtocolClient {
     /**
      * Get User by wallet
      * @param wallet - User wallet
+     *
      */
     getUser(wallet: PublicKey): Promise<import("./types").User>;
     /**
      * Get User by wallet
      * @param wallet - User wallet
+     *
      */
     getUsers(): Promise<import("./types").User[]>;
     /**
      * Check if user exists
      * @param username - User name
+     *
      */
     hasUser(wallet: PublicKey): Promise<boolean>;
     /**
      * Get Refferal
      * @param name - User name
+     *
      */
     getReferral(name: string): Promise<string>;
     /**
@@ -36,6 +40,8 @@ export default class TriadProtocolClient {
      *  @param name - user name
      *  @param referral - user referral
      *
+     *  @param options - RPC options
+     *
      */
-    createUser({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions): Promise<string>;
+    createUser({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions): Promise<any>;
 }

package/dist/index.js

@@ -13,12 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
 const trade_1 = __importDefault(require("./trade"));
 const helpers_1 = require("./utils/helpers");
 const pda_1 = require("./utils/pda");
 const stake_1 = __importDefault(require("./stake"));
+const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
 class TriadProtocolClient {
     constructor(connection, wallet) {
         this.provider = new anchor_1.AnchorProvider(connection, wallet, anchor_1.AnchorProvider.defaultOptions());
@@ -29,6 +29,7 @@ class TriadProtocolClient {
     /**
      * Get User by wallet
      * @param wallet - User wallet
+     *
      */
     getUser(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -39,6 +40,7 @@ class TriadProtocolClient {
     /**
      * Get User by wallet
      * @param wallet - User wallet
+     *
      */
     getUsers() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -51,6 +53,7 @@ class TriadProtocolClient {
     /**
      * Check if user exists
      * @param username - User name
+     *
      */
     hasUser(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -66,6 +69,7 @@ class TriadProtocolClient {
     /**
      * Get Refferal
      * @param name - User name
+     *
      */
     getReferral(name) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -95,25 +99,19 @@ class TriadProtocolClient {
      *  @param name - user name
      *  @param referral - user referral
      *
+     *  @param options - RPC options
+     *
      */
     createUser({ wallet, name, referral }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const method = this.program.methods
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods
                 .createUser({
                 name
             })
                 .accounts({
                 signer: wallet,
                 referral
-            });
-            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 });
+            }), options);
         });
     }
 }

package/dist/local-test.js

@@ -36,103 +36,13 @@ const markets = [
 const ordersHypeAndFloopBot = [
     {
         marketId: 0,
-        amount: 1000,
-        direction: {
-            hype: {}
-        },
-        orderType: {
-            market: {}
-        }
-    },
-    {
-        marketId: 0,
-        amount: 10000,
-        direction: {
-            flop: {}
-        },
-        orderType: {
-            market: {}
-        }
-    },
-    {
-        marketId: 0,
-        amount: 429,
-        direction: {
-            hype: {}
-        },
-        orderType: {
-            limit: {}
-        }
-    },
-    {
-        marketId: 0,
-        amount: 249,
-        direction: {
-            flop: {}
-        },
-        orderType: {
-            limit: {}
-        }
-    },
-    {
-        marketId: 0,
-        amount: 369,
-        direction: {
-            hype: {}
-        },
-        orderType: {
-            market: {}
-        }
-    },
-    {
-        marketId: 0,
-        amount: 369,
+        amount: 100000,
         direction: {
             flop: {}
         },
         orderType: {
             market: {}
         }
-    },
-    {
-        marketId: 0,
-        amount: 369,
-        direction: {
-            flop: {}
-        },
-        orderType: {
-            market: {}
-        }
-    },
-    {
-        marketId: 0,
-        amount: 369,
-        direction: {
-            hype: {}
-        },
-        orderType: {
-            market: {}
-        }
-    },
-    {
-        marketId: 0,
-        amount: 369,
-        direction: {
-            hype: {}
-        },
-        orderType: {
-            market: {}
-        }
-    },
-    {
-        marketId: 0,
-        amount: 369,
-        direction: {
-            hype: {}
-        },
-        orderType: {
-            market: {}
-        }
     }
 ];
 const updateStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -160,10 +70,15 @@ const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     console.log(updateBoostResponse);
 });
-const getMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
-    const markets = yield triadProtocol.trade.getMarkets();
+const getAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
+    const markets = yield triadProtocol.trade.getAllMarkets();
     console.log(markets);
 });
+const getMarket = () => __awaiter(void 0, void 0, void 0, function* () {
+    const market = yield triadProtocol.trade.getMarketById(1);
+    console.log(market);
+});
+getMarket();
 const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const market of markets) {
         try {
@@ -183,10 +98,10 @@ const getOrders = () => __awaiter(void 0, void 0, void 0, function* () {
 });
 const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const order of ordersHypeAndFloopBot) {
-        const response = yield triadProtocol.trade.openOrder(0, {
+        const response = yield triadProtocol.trade.openOrder({
+            marketId: 1,
             amount: order.amount,
             direction: order.direction,
-            orderType: order.orderType,
             comment: `hype/flop bot ${order.amount} - ${order.direction}`
         }, {
             skipPreflight: true
@@ -198,13 +113,13 @@ const closeOrder = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const order of yield getOrders()) {
         try {
             const response = yield triadProtocol.trade.closeOrder({
-                marketId: 0,
+                marketId: 1,
                 orderId: order
             });
             console.log(response);
         }
         catch (e) {
-            console.log(e);
+            console.log('Error closing order');
         }
     }
 });
@@ -218,4 +133,17 @@ const runBot = () => __awaiter(void 0, void 0, void 0, function* () {
         yield new Promise((resolve) => setTimeout(resolve, 40000));
     }
 });
-runBot();
+const initializeQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
+    const currentTime = Math.floor(Date.now() / 1000) + 10; // Current time in seconds
+    const response = yield triadProtocol.trade.initializeQuestion({
+        marketId: 1,
+        question: 'FUCK OFF?',
+        startTime: currentTime,
+        endTime: currentTime + 24 * 60 * 60
+    });
+    console.log(response);
+});
+const resolveQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.trade.resolveQuestion(0);
+    console.log(response);
+});

package/dist/stake.d.ts

@@ -50,7 +50,7 @@ export default class Stake {
      *  @param amount - Amount to stake
      *
      */
-    stakeToken({ name, wallet, amount }: StakeTokenArgs, options?: RpcOptions): Promise<string>;
+    stakeToken({ name, wallet, amount }: StakeTokenArgs, options?: RpcOptions): Promise<any>;
     /**
      *  Update Stake Vault
      *  @param wallet - User wallet
@@ -58,14 +58,14 @@ export default class Stake {
      *  @param status - Status of the stake vault (optional)
      *
      */
-    updateStakeVault({ wallet, amount, status }: UpdateStakeVaultArgs, options?: RpcOptions): Promise<string>;
+    updateStakeVault({ wallet, amount, status }: UpdateStakeVaultArgs, options?: RpcOptions): Promise<any>;
     /**
      *  Request Withdraw
      *  @param wallet - User wallet
      *  @param name - Stake name
      *
      */
-    requestWithdraw({ wallet, name, mint }: RequestWithdrawArgs, options?: RpcOptions): Promise<string>;
+    requestWithdraw({ wallet, name, mint }: RequestWithdrawArgs, options?: RpcOptions): Promise<any>;
     /**
      *  Withdraw Stake
      *  @param wallet - User wallet
@@ -73,7 +73,7 @@ export default class Stake {
      *  @param mint - NFT mint
      *
      */
-    withdrawStake({ wallet, name, mint }: WithdrawArgs, options?: RpcOptions): Promise<string>;
+    withdrawStake({ wallet, name, mint }: WithdrawArgs, options?: RpcOptions): Promise<any>;
     /**
      *  Claim Stake Rewards
      *  @param wallet - User wallet

package/dist/stake.js

@@ -20,6 +20,8 @@ const pda_1 = require("./utils/pda");
 const constants_1 = require("./utils/constants");
 const base64_js_1 = require("base64-js");
 const getRarityRank_1 = __importDefault(require("./utils/getRarityRank"));
+const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
+const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
 class Stake {
     constructor(program, provider) {
         this.stakeVaultName = constants_1.STAKE_VAULT_NAME;
@@ -134,20 +136,7 @@ class Stake {
                 })
                     .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: wallet
-            }).compileToV0Message()), [], {
-                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
-                commitment: 'confirmed'
-            });
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }
     /**
@@ -160,7 +149,7 @@ class Stake {
     stakeToken({ name, wallet, amount }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
-            const method = this.program.methods
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods
                 .stakeToken({
                 name,
                 amount: new anchor_1.BN(amount * Math.pow(10, 6)),
@@ -170,15 +159,7 @@ class Stake {
                 signer: wallet,
                 mint: constants_1.TRD_MINT,
                 user: userPDA
-            });
-            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 });
+            }), options);
         });
     }
     /**
@@ -190,7 +171,7 @@ class Stake {
      */
     updateStakeVault({ wallet, amount, status }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const method = this.program.methods
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods
                 .updateStakeVault({
                 amount,
                 status,
@@ -199,15 +180,7 @@ class Stake {
                 .accounts({
                 signer: wallet,
                 mint: constants_1.TRD_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 });
+            }), options);
         });
     }
     /**
@@ -221,21 +194,13 @@ class Stake {
             const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
             const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, name);
             const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
-            const method = this.program.methods.requestWithdrawStake().accounts({
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.requestWithdrawStake().accounts({
                 signer: wallet,
                 mint: mint,
                 user: userPDA,
                 stake: stakePDA,
                 stakeVault: stakeVaultPDA
-            });
-            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 });
+            }), options);
         });
     }
     /**
@@ -250,22 +215,14 @@ class Stake {
             const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
             const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
             const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, name);
-            const method = this.program.methods.withdrawStake().accounts({
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawStake().accounts({
                 signer: wallet,
                 stake: stakePDA,
                 stakeVault: stakeVaultPDA,
                 admin: constants_1.TRIAD_ADMIN,
                 mint: mint,
                 user: userPDA
-            });
-            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 });
+            }), options);
         });
     }
     /**
@@ -320,20 +277,7 @@ class Stake {
                 })
                     .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: wallet
-            }).compileToV0Message()), [], {
-                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
-                commitment: 'confirmed'
-            });
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }
 }

package/dist/trade.d.ts

@@ -1,7 +1,7 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { PublicKey } from '@solana/web3.js';
-import { Market, OrderDirection, OrderType } from './types/trade';
+import { InitializeQuestionArgs, Market, OpenOrderArgs } from './types/trade';
 import { RpcOptions } from './types';
 import BN from 'bn.js';
 export default class Trade {
@@ -12,19 +12,25 @@ export default class Trade {
     /**
      * Get all Markets
      */
-    getMarkets(): Promise<Market[]>;
+    getAllMarkets(): Promise<Market[]>;
+    /**
+     * Get Market by ID
+     * @param marketId - The ID of the market
+     *
+     */
+    getMarketById(marketId: number): Promise<Market>;
+    /**
+     * Get Market by Address
+     * @param address - The address of the market
+     *
+     */
     getMarketByAddress(address: PublicKey): Promise<Market>;
     /**
-     * Initialize Market
-     * @param market id - new markert id - length + 1
-     * @param name - PYTH/TRD JUP/TRD DRIFT/TRD
+     * Get User Trade
+     * @param user - The user's public key
      *
      */
-    initializeMarket({ marketId, name }: {
-        marketId: number;
-        name: string;
-    }, options?: RpcOptions): Promise<string>;
-    getUserTrade(): Promise<{
+    getUserTrade(user: PublicKey): Promise<{
         bump: number;
         authority: PublicKey;
         totalDeposits: BN;
@@ -77,14 +83,58 @@ export default class Trade {
         }[];
         padding: number[];
     }>;
-    openOrder(marketId: number, args: {
-        amount: number;
-        direction: OrderDirection;
-        orderType: OrderType;
-        comment?: string;
-    }, options?: RpcOptions): Promise<string>;
+    /**
+     * 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 }: {
+        marketId: number;
+        name: string;
+    }, options?: RpcOptions): Promise<any>;
+    /**
+     * 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 }: OpenOrderArgs, options?: RpcOptions): Promise<string>;
+    /**
+     * Close Order
+     * @param marketId - The ID of the market
+     * @param orderId - The ID of the order
+     *
+     * @param options - RPC options
+     *
+     */
     closeOrder({ marketId, orderId }: {
         marketId: number;
         orderId: number;
     }, options?: RpcOptions): Promise<string>;
+    /**
+     * 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 }: InitializeQuestionArgs, options?: RpcOptions): Promise<string>;
+    /**
+     * Resolve the current question for a market
+     * @param marketId - The ID of the market
+     *
+     * @param options - RPC options
+     *
+     */
+    resolveQuestion(marketId: number, options?: RpcOptions): Promise<string>;
 }