@triadxyz/triad-protocol 1.2.2-beta → 1.2.3-beta

package/dist/index.d.ts

@@ -23,16 +23,6 @@ export default class TriadProtocolClient {
      *
      */
     getUsers(): Promise<import("./types").User[]>;
-    getTickers(): Promise<import("@coral-xyz/anchor").ProgramAccount<{
-        initTs: import("bn.js");
-        updatedTs: import("bn.js");
-        bump: number;
-        authority: PublicKey;
-        name: string;
-        protocolProgramId: PublicKey;
-        price: import("bn.js");
-        vault: PublicKey;
-    }>[]>;
     /**
      * Check if user exists
      * @param username - User name

package/dist/index.js

@@ -55,11 +55,6 @@ class TriadProtocolClient {
                 .sort((a, b) => b.referred - a.referred);
         });
     }
-    getTickers() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.program.account.ticker.all();
-        });
-    }
     /**
      * Check if user exists
      * @param username - User name
@@ -131,12 +126,9 @@ class TriadProtocolClient {
      */
     getUserPositionsWithAmount(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
-            const tickers = yield this.program.account.ticker.all();
             const userPositions = [];
-            for (const ticker of tickers) {
-                const userPositionPDA = (0, pda_1.getUserPositionPDA)(this.program.programId, wallet, ticker.publicKey);
-                userPositions.push(userPositionPDA);
-            }
+            const userPositionPDA = (0, pda_1.getUserPositionPDA)(this.program.programId, wallet, new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'));
+            userPositions.push(userPositionPDA);
             const userPositionsWithAmount = yield this.program.account.userPosition.fetchMultiple(userPositions);
             return userPositionsWithAmount.filter((item) => item &&
                 parseFloat(item.totalDeposited.toString()) >
@@ -154,7 +146,6 @@ class TriadProtocolClient {
                 userPosition: userPositionPDA,
                 userTokenAccount,
                 vault: vaultPDA,
-                ticker,
                 vaultTokenAccount: VaultTokenAccountPDA
             }), options);
         });

package/dist/local-test.js

@@ -21,79 +21,11 @@ const spl_token_1 = require("@solana/spl-token");
 const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/id.json');
 const rpc_file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/rpc.txt');
 const keypair = web3_js_1.Keypair.fromSecretKey(new Uint8Array(JSON.parse(file.toString())));
-const connection = new web3_js_1.Connection('https://mainnet.helius-rpc.com/?api-key=428d811e-ba57-4def-8876-de95d53b7c9d');
+const connection = new web3_js_1.Connection('https://triad-solanam-a5ee.mainnet.rpcpool.com/34797434-86a9-4a15-abb1-6b5f6cb7a8ff');
 const wallet = new anchor_1.Wallet(keypair);
 const triadProtocol = new _1.default(connection, wallet);
 const mint = new web3_js_1.PublicKey('X41iRJUPkKaEvhqWdxqrS5P7M5d8A9oathki5sT47KR');
-const markets = [
-    // { name: 'Triad', marketId: 0 },
-    // { name: 'PYTH', marketId: 1 }
-    // { name: 'DRIFT', marketId: 2 }
-    // { name: 'SYMMETRY', marketId: 3 }
-    // { name: 'ORE', marketId: 4 }
-    // { name: 'COLETA', marketId: 5 }
-    // { name: 'UNDEADS', marketId: 6 },
-    // { name: 'SOL x ETH', marketId: 7 }
-    // { name: 'SOL vs ETH', marketId: 8 }
-    { name: 'SOL vs ETH 2', marketId: 9 }
-    // { name: 'PYTH x LINK', marketId: 8 },
-    // { name: 'SOL PRICE', marketId: 9 }
-];
-const questions = [
-    {
-        name: 'Pyth',
-        marketId: 1,
-        question: 'test 2',
-        startTime: 1719513866,
-        endTime: 1730394000
-    }
-    // },
-    // {
-    //   name: 'Pyth',
-    //   marketId: 1,
-    //   question: "$PYTH's market cap exceed $1.5B by the end of October?",
-    //   startTime: 1728415578,
-    //   endTime: 1730394000
-    // },
-    // {
-    //   name: 'Drift',
-    //   marketId: 2,
-    //   question:
-    //     'Drift surpass $33M in volume on prediction markets by the end of October?',
-    //   startTime: 1728415578,
-    //   endTime: 1730394000
-    // },
-    // {
-    //   name: 'Symmetry',
-    //   marketId: 3,
-    //   question: "Symmetry's TVL exceed $5.5M by the end of October?",
-    //   startTime: 1728415578,
-    //   endTime: 1730394000
-    // },
-    // {
-    //   name: 'Ore',
-    //   marketId: 4,
-    //   question: 'ORE surpass 20k on-chain miners by the end of October?',
-    //   startTime: 1728415578,
-    //   endTime: 1730394000
-    // },
-    // {
-    //   name: 'Coleta',
-    //   marketId: 5,
-    //   question:
-    //     'COLETA PFP reach 500 SOL in total volume by the end of October (based on Tensor)?',
-    //   startTime: 1728415578,
-    //   endTime: 1730394000
-    // },
-    // {
-    //   name: 'Undeads',
-    //   marketId: 6,
-    //   question:
-    //     'The Undeads reach more than 1,600 holders by the end of October?',
-    //   startTime: 1728415578,
-    //   endTime: 1730394000
-    // }
-];
+const markets = [];
 const ordersHypeAndFloopBot = [
     {
         marketId: 7,
@@ -106,7 +38,7 @@ const ordersHypeAndFloopBot = [
 const updateStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.updateStakeVault({
         wallet: wallet.publicKey,
-        amount: new anchor_1.BN(5000 * Math.pow(10, 6)),
+        amount: new anchor_1.BN(10000 * Math.pow(10, 6)),
         isLocked: false
     });
     console.log(response);
@@ -140,22 +72,22 @@ 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(9);
+    const market = yield triadProtocol.trade.getMarketById(12);
     console.log(market);
 });
-// const initializeAllMarkets = async () => {
-//   for (const market of markets) {
-//     try {
-//       const response = await triadProtocol.trade.initializeMarket(market, {
-//         skipPreflight: false,
-//         microLamports: 5000
-//       })
-//       console.log(`Initialized market ${market.name}:`, response)
-//     } catch (error) {
-//       console.error(`Error initializing market ${market.name}:`, error)
-//     }
-//   }
-// }
+const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
+    for (const market of markets) {
+        try {
+            const response = yield triadProtocol.trade.initializeMarket(market, {
+                microLamports: 5000
+            });
+            console.log(`Initialized market ${market.name}:`, response);
+        }
+        catch (error) {
+            console.error(`Error initializing market ${market.name}:`, error);
+        }
+    }
+});
 const getOrders = (walletAddress) => __awaiter(void 0, void 0, void 0, function* () {
     const response = (yield triadProtocol.program.account.userTrade.all()).find((userTrade) => userTrade.account.authority.toBase58() === walletAddress.toBase58());
     let orders = [];
@@ -312,7 +244,6 @@ const getLiquidityToRecovery = () => __awaiter(void 0, void 0, void 0, function*
     }
     console.log(liquidityToRecovery);
 });
-getLiquidityToRecovery();
 const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
     yield getMarket();
     for (const order of ordersHypeAndFloopBot) {
@@ -395,14 +326,15 @@ const addLiquidity = () => __awaiter(void 0, void 0, void 0, function* () {
 const collectFees = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log('Collecting fees');
     const allMarkets = yield triadProtocol.trade.getAllMarkets();
+    let currentFees = {};
     for (const market of allMarkets) {
-        if (Number(market.marketId) === 0 || Number(market.marketId) === 7) {
-            continue;
-        }
         console.log(`Collecting fees for market ${market.marketId}`);
         try {
             const response = yield triadProtocol.trade.collectFee({
-                marketId: Number(market.marketId)
+                marketId: Number(market.marketId),
+                vault: new web3_js_1.PublicKey('6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq')
+            }, {
+                microLamports: 70000
             });
             console.log(response);
         }
@@ -410,4 +342,5 @@ const collectFees = () => __awaiter(void 0, void 0, void 0, function* () {
             console.log(e);
         }
     }
+    fs_1.default.writeFileSync(`fees-collected.json`, JSON.stringify(currentFees, null, 2));
 });

package/dist/stake.d.ts

@@ -2,7 +2,7 @@ import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { UpdateStakeVaultArgs, StakeNftArgs, RequestWithdrawArgs, WithdrawArgs, Stake as StakeResponse, ClaimStakeRewardsArgs, StakeTokenArgs, UpdateBoostArgs } from './types/stake';
+import { UpdateStakeVaultArgs, RequestWithdrawArgs, WithdrawArgs, Stake as StakeResponse, ClaimStakeRewardsArgs, StakeTokenArgs, UpdateBoostArgs } from './types/stake';
 export default class Stake {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -35,13 +35,6 @@ export default class Stake {
         name: string;
         rarityRankHrtt: number;
     }[]): Promise<StakeResponse[]>;
-    /**
-     *  Stake NFT
-     *  @param mint - NFT mint
-     *  @param items - NFT items
-     *
-     */
-    stakeNft({ wallet, items }: StakeNftArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Stake Token
      *  @param name - Index

package/dist/stake.js

@@ -114,31 +114,6 @@ class Stake {
             return data;
         });
     }
-    /**
-     *  Stake NFT
-     *  @param mint - NFT mint
-     *  @param items - NFT items
-     *
-     */
-    stakeNft({ wallet, items }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let ixs = [];
-            for (let i = 0; i < items.length; i++) {
-                let item = items[i];
-                ixs.push(yield this.program.methods
-                    .stakeNft({
-                    name: item.name,
-                    stakeVault: this.stakeVaultName
-                })
-                    .accounts({
-                    signer: wallet,
-                    mint: item.mint
-                })
-                    .instruction());
-            }
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
-        });
-    }
     /**
      *  Stake Token
      *  @param name - Index

package/dist/trade.d.ts

@@ -122,7 +122,7 @@ export default class Trade {
      * @param options - RPC options
      *
      */
-    openOrder({ marketId, amount, direction, token, comment }: OpenOrderArgs, options?: RpcOptions): Promise<string>;
+    openOrder({ marketId, amount, direction, token }: OpenOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Close Order
      * @param marketId - The ID of the market
@@ -186,7 +186,11 @@ export default class Trade {
      * @param options - RPC options
      *
      */
-    collectFee({ marketId }: {
+    collectFee({ marketId, vault }: {
         marketId: number;
-    }, options?: RpcOptions): Promise<string>;
+        vault: PublicKey;
+    }, options?: RpcOptions): Promise<{
+        feeToSwap: number;
+        lamport: number;
+    }>;
 }

package/dist/trade.js

@@ -12,6 +12,7 @@ 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");
@@ -20,6 +21,7 @@ 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;
@@ -109,7 +111,7 @@ class Trade {
      * @param options - RPC options
      *
      */
-    openOrder({ marketId, amount, direction, token, comment }, options) {
+    openOrder({ marketId, amount, direction, token }, 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);
@@ -147,8 +149,7 @@ class Trade {
             ixs.push(yield this.program.methods
                 .openOrder({
                 amount: new bn_js_1.default(amountInTRD),
-                direction: direction,
-                comment: (0, helpers_1.encodeString)(comment, 64)
+                direction: direction
             })
                 .accounts({
                 signer: this.provider.publicKey,
@@ -251,14 +252,50 @@ class Trade {
      * @param options - RPC options
      *
      */
-    collectFee({ marketId }, options) {
+    collectFee({ marketId, vault }, 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.collectFee().accounts({
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .collectFee()
+                .accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
                 mint: this.mint
-            }), options);
+            })
+                .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
+            };
         });
     }
 }