@triadxyz/triad-protocol 1.1.6-beta → 1.1.8-beta

package/dist/local-test.js

@@ -27,7 +27,7 @@ const markets = [{ name: 'Triad', marketId: 0 }];
 const ordersHypeAndFloopBot = [
     {
         marketId: 0,
-        amount: 0,
+        amount: 0.001,
         direction: {
             flop: {}
         },
@@ -54,7 +54,6 @@ const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function*
     });
     console.log(response);
 });
-updateStakeVaultStatus();
 const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = (yield axios_1.default.get('https://api.triadfi.co/boost'))
         .data;
@@ -80,7 +79,7 @@ const getAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(markets);
 });
 const getMarket = () => __awaiter(void 0, void 0, void 0, function* () {
-    const market = yield triadProtocol.trade.getMarketById(1);
+    const market = yield triadProtocol.trade.getMarketById(0);
     console.log(market);
 });
 const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -103,9 +102,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({
-            marketId: 1,
+            marketId: 0,
             amount: order.amount,
             direction: order.direction,
+            token: 'So11111111111111111111111111111111111111112',
             comment: `hype/flop bot ${order.amount} - ${order.direction}`
         }, {
             skipPreflight: true
@@ -113,6 +113,7 @@ const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
         console.log(response);
     }
 });
+openOrder();
 const closeOrder = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const order of yield getOrders()) {
         try {
@@ -156,24 +157,7 @@ const resolveQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.trade.resolveQuestion(0);
     console.log(response);
 });
-const claimAllRewards = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.claimStakeRewards({
-        wallet: wallet.publicKey,
-        ranks: [],
-        collections: 1,
-        verifier: '43bkRb3xj4Vv77Y76TjQuNiPGUsnun4tFSMYXY2Y2K5LfRT79YDpHhc7jruWmDGdygUBPXYQQZntCQz6V6cRGz8F'
-    });
-    console.log(response);
-});
 const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.getReferral('dannpl');
     console.log(response);
 });
-const getUserPositions = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.getUserPositionsWithAmount(new web3_js_1.PublicKey('5U4TmSUBqDaefmamimoSGak8GK5xwXoM5nAaCZJpynpL'));
-    console.log(response);
-});
-const getTickers = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.getTickers();
-    console.log(response);
-});

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 { InitializeQuestionArgs, Market, OpenOrderArgs } from './types/trade';
+import { FeeVault, InitializeQuestionArgs, Market, OpenOrderArgs } from './types/trade';
 import { RpcOptions } from './types';
 import BN from 'bn.js';
 export default class Trade {
@@ -13,6 +13,7 @@ export default class Trade {
      * Get all Markets
      */
     getAllMarkets(): Promise<Market[]>;
+    getFeeVault(marketId: number): Promise<FeeVault>;
     /**
      * Get Market by ID
      * @param marketId - The ID of the market
@@ -119,12 +120,13 @@ export default class Trade {
      * @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 options - RPC options
      *
      */
-    openOrder({ marketId, amount, direction, comment }: OpenOrderArgs, options?: RpcOptions): Promise<string>;
+    openOrder({ marketId, amount, direction, token, comment }: OpenOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Close Order
      * @param marketId - The ID of the market

package/dist/trade.js

@@ -19,6 +19,7 @@ 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");
 class Trade {
     constructor(program, provider) {
         this.mint = constants_1.TRD_MINT;
@@ -35,6 +36,26 @@ class Trade {
                 .then((markets) => markets.map(({ account, publicKey }) => (0, helpers_1.accountToMarket)(account, publicKey)));
         });
     }
+    getFeeVault(marketId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const feeVaultPDA = (0, trade_1.getFeeVaultPDA)(this.program.programId, marketId);
+            const response = yield this.program.account.feeVault.fetch(feeVaultPDA);
+            return {
+                bump: response.bump,
+                authority: response.authority,
+                market: response.market,
+                deposited: response.deposited.toString(),
+                withdrawn: response.withdrawn.toString(),
+                netBalance: response.netBalance.toString(),
+                projectAvailable: response.projectAvailable.toString(),
+                projectClaimed: response.projectClaimed.toString(),
+                nftHoldersAvailable: response.nftHoldersAvailable.toString(),
+                nftHoldersClaimed: response.nftHoldersClaimed.toString(),
+                marketAvailable: response.marketAvailable.toString(),
+                marketClaimed: response.marketClaimed.toString()
+            };
+        });
+    }
     /**
      * Get Market by ID
      * @param marketId - The ID of the market
@@ -95,19 +116,21 @@ class Trade {
      * @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 options - RPC options
      *
      */
-    openOrder({ marketId, amount, direction, comment }, options) {
+    openOrder({ marketId, amount, direction, token, 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);
             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 userFromATA = (0, pda_1.getTokenATA)(this.provider.publicKey, this.mint);
             const ixs = [];
+            const addressLookupTableAccounts = [];
+            let amountInTRD = amount * Math.pow(10, constants_1.TRD_DECIMALS);
             try {
                 yield this.program.account.userTrade.fetch(userTradePDA);
             }
@@ -120,9 +143,24 @@ class Trade {
                 })
                     .instruction());
             }
+            if (token !== constants_1.TRD_MINT.toBase58()) {
+                const { setupInstructions, swapIxs, addressLookupTableAccounts, trdAmount } = yield (0, swap_1.swap)({
+                    connection: this.provider.connection,
+                    wallet: this.provider.publicKey.toBase58(),
+                    inToken: token,
+                    amount
+                });
+                amountInTRD = trdAmount;
+                if (swapIxs.length === 0) {
+                    return;
+                }
+                ixs.push(...setupInstructions);
+                ixs.push(...swapIxs);
+                addressLookupTableAccounts.push(...addressLookupTableAccounts);
+            }
             ixs.push(yield this.program.methods
                 .openOrder({
-                amount: new bn_js_1.default(amount * Math.pow(10, constants_1.TRD_DECIMALS)),
+                amount: new bn_js_1.default(amountInTRD),
                 direction: direction,
                 comment: (0, helpers_1.encodeString)(comment, 64)
             })
@@ -131,11 +169,10 @@ class Trade {
                 market: marketPDA,
                 feeVault: feeVualtPDA,
                 userTrade: userTradePDA,
-                mint: this.mint,
-                userFromAta: userFromATA
+                mint: this.mint
             })
                 .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, addressLookupTableAccounts);
         });
     }
     /**

package/dist/types/idl_triad_protocol.json

@@ -461,7 +461,31 @@
                 },
                 {
                     "name": "user_from_ata",
-                    "writable": true
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            },
+                            {
+                                "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": "market_to_ata",

package/dist/types/trade.d.ts

@@ -1,3 +1,4 @@
+import { PublicKey } from '@solana/web3.js';
 export type Market = {
     address: string;
     bump: number;
@@ -73,5 +74,20 @@ export type OpenOrderArgs = {
     marketId: number;
     amount: number;
     direction: OrderDirection;
+    token: string;
     comment?: string;
 };
+export type FeeVault = {
+    bump: number;
+    authority: PublicKey;
+    market: PublicKey;
+    deposited: string;
+    withdrawn: string;
+    netBalance: string;
+    projectAvailable: string;
+    projectClaimed: string;
+    nftHoldersAvailable: string;
+    nftHoldersClaimed: string;
+    marketAvailable: string;
+    marketClaimed: string;
+};

package/dist/types/triad_protocol.d.ts

@@ -613,6 +613,59 @@ export type TriadProtocol = {
                 {
                     name: 'userFromAta';
                     writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                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: 'marketToAta';

package/dist/utils/priorityFee.d.ts

@@ -1 +1,2 @@
-export declare function getPriorityFeeEstimate(priorityLevel: any, transaction: any, RPC_URL: string): Promise<any>;
+declare const getPriorityFee: () => Promise<number>;
+export default getPriorityFee;

package/dist/utils/priorityFee.js

@@ -8,29 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPriorityFeeEstimate = void 0;
-const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
-function getPriorityFeeEstimate(priorityLevel, transaction, RPC_URL) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield fetch(RPC_URL, {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({
-                jsonrpc: "2.0",
-                id: "1",
-                method: "getPriorityFeeEstimate",
-                params: [
-                    {
-                        transaction: bytes_1.bs58.encode(transaction.serialize()),
-                        options: { priorityLevel: priorityLevel },
-                    },
-                ],
-            }),
-        });
-        const data = yield response.json();
-        console.log("Fee in function for", priorityLevel, " :", data.result.priorityFeeEstimate);
-        return data.result;
-    });
-}
-exports.getPriorityFeeEstimate = getPriorityFeeEstimate;
+const axios_1 = __importDefault(require("axios"));
+const getPriorityFee = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield axios_1.default.get('https://solanacompass.com/api/fees');
+    return response.data[5].priorityTx || 1000;
+});
+exports.default = getPriorityFee;

package/dist/utils/sendVersionedTransaction.d.ts

@@ -1,6 +1,7 @@
 import { TransactionInstruction } from '@solana/web3.js';
 import { RpcOptions } from '../types';
+import { AddressLookupTableAccount } from '@solana/web3.js';
 import { AnchorProvider } from '@coral-xyz/anchor';
 import { Keypair } from '@solana/web3.js';
-declare const sendVersionedTransaction: (provider: AnchorProvider, ixs: TransactionInstruction[], options?: RpcOptions, payer?: Keypair) => Promise<string>;
+declare const sendVersionedTransaction: (provider: AnchorProvider, ixs: TransactionInstruction[], options?: RpcOptions, payer?: Keypair, addressLookupTableAccounts?: AddressLookupTableAccount[]) => Promise<string>;
 export default sendVersionedTransaction;

package/dist/utils/sendVersionedTransaction.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
-const sendVersionedTransaction = (provider, ixs, options, payer) => __awaiter(void 0, void 0, void 0, function* () {
+const sendVersionedTransaction = (provider, ixs, options, payer, addressLookupTableAccounts) => __awaiter(void 0, void 0, void 0, function* () {
     if (options === null || options === void 0 ? void 0 : options.microLamports) {
         ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: options.microLamports
@@ -21,7 +21,7 @@ const sendVersionedTransaction = (provider, ixs, options, payer) => __awaiter(vo
         instructions: ixs,
         recentBlockhash: blockhash,
         payerKey: provider.publicKey
-    }).compileToV0Message());
+    }).compileToV0Message(addressLookupTableAccounts || []));
     if (payer) {
         tx.sign([payer]);
     }

package/dist/utils/swap.d.ts

@@ -0,0 +1,14 @@
+import { AddressLookupTableAccount, Connection, TransactionInstruction } from '@solana/web3.js';
+export declare const swap: ({ connection, wallet, inToken, amount }: {
+    connection: Connection;
+    wallet: string;
+    inToken: string;
+    amount: number;
+}) => Promise<{
+    swapIxs: TransactionInstruction[];
+    addressLookupTableAccounts: AddressLookupTableAccount[];
+    setupInstructions: any;
+    cleanupInstruction: TransactionInstruction;
+    trdAmount: any;
+}>;
+export declare const getAddressLookupTableAccounts: (connection: Connection, keys: string[]) => Promise<AddressLookupTableAccount[]>;

package/dist/utils/swap.js

@@ -0,0 +1,93 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAddressLookupTableAccounts = exports.swap = void 0;
+const axios_1 = __importDefault(require("axios"));
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("./constants");
+const swap = ({ connection, wallet, inToken, amount }) => __awaiter(void 0, void 0, void 0, function* () {
+    const token = TOKENS[inToken];
+    if (!token) {
+        throw new Error('Token not found');
+    }
+    const formattedAmountIn = amount * Math.pow(10, token.decimals);
+    const quoteResponse = yield axios_1.default.get(`https://quote-api.jup.ag/v6/quote?inputMint=${inToken}&outputMint=${constants_1.TRD_MINT.toBase58()}&amount=${formattedAmountIn}&slippageBps=10`);
+    const { data: quoteData } = quoteResponse;
+    const swapResponse = yield axios_1.default.post('https://quote-api.jup.ag/v6/swap-instructions', {
+        userPublicKey: wallet,
+        wrapAndUnwrapSol: true,
+        quoteResponse: quoteData
+    });
+    const { setupInstructions, swapInstruction, addressLookupTableAddresses, cleanupInstruction } = swapResponse.data;
+    return {
+        swapIxs: [
+            deserializeInstruction(swapInstruction),
+            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+                units: 500000
+            }),
+            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                microLamports: yield getPriorityFee()
+            })
+        ],
+        addressLookupTableAccounts: yield (0, exports.getAddressLookupTableAccounts)(connection, addressLookupTableAddresses),
+        setupInstructions: setupInstructions.map(deserializeInstruction),
+        cleanupInstruction: deserializeInstruction(cleanupInstruction),
+        trdAmount: quoteData.outAmount
+    };
+});
+exports.swap = swap;
+const deserializeInstruction = (instruction) => {
+    return new web3_js_1.TransactionInstruction({
+        programId: new web3_js_1.PublicKey(instruction.programId),
+        keys: instruction.accounts.map((key) => ({
+            pubkey: new web3_js_1.PublicKey(key.pubkey),
+            isSigner: key.isSigner,
+            isWritable: key.isWritable
+        })),
+        data: Buffer.from(instruction.data, 'base64')
+    });
+};
+const getAddressLookupTableAccounts = (connection, keys) => __awaiter(void 0, void 0, void 0, function* () {
+    const addressLookupTableAccountInfos = yield connection.getMultipleAccountsInfo(keys.map((key) => new web3_js_1.PublicKey(key)));
+    return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
+        const addressLookupTableAddress = keys[index];
+        if (accountInfo) {
+            const addressLookupTableAccount = new web3_js_1.AddressLookupTableAccount({
+                key: new web3_js_1.PublicKey(addressLookupTableAddress),
+                state: web3_js_1.AddressLookupTableAccount.deserialize(accountInfo.data)
+            });
+            acc.push(addressLookupTableAccount);
+        }
+        return acc;
+    }, new Array());
+});
+exports.getAddressLookupTableAccounts = getAddressLookupTableAccounts;
+const getPriorityFee = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield axios_1.default.get('https://solanacompass.com/api/fees');
+    return response.data[15].priorityTx || 1000;
+});
+const TOKENS = {
+    oreoU2P8bN6jkk3jbaiVxYnG1dCXcYxwhwyK9jSybcp: {
+        mint: 'oreoU2P8bN6jkk3jbaiVxYnG1dCXcYxwhwyK9jSybcp',
+        decimals: 11
+    },
+    So11111111111111111111111111111111111111112: {
+        mint: 'So11111111111111111111111111111111111111112',
+        decimals: 9
+    },
+    EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: {
+        mint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+        decimals: 6
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "1.1.6-beta",
+  "version": "1.1.8-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",