@triadxyz/triad-protocol 1.2.1-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,77 +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: '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,
@@ -104,7 +38,8 @@ 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);
 });
@@ -136,16 +71,15 @@ const getAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
     const markets = yield triadProtocol.trade.getAllMarkets();
     console.log(markets);
 });
-getAllMarkets();
 const getMarket = () => __awaiter(void 0, void 0, void 0, function* () {
-    const market = yield triadProtocol.trade.getMarketById(7);
+    const market = yield triadProtocol.trade.getMarketById(12);
     console.log(market);
 });
 const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const market of markets) {
         try {
             const response = yield triadProtocol.trade.initializeMarket(market, {
-                skipPreflight: true
+                microLamports: 5000
             });
             console.log(`Initialized market ${market.name}:`, response);
         }
@@ -176,6 +110,140 @@ const getOrders = (walletAddress) => __awaiter(void 0, void 0, void 0, function*
     return orders;
 });
 // getOrders(new PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'))
+const getLiquidityToRecovery = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.program.account.userTrade.all();
+    const allMarkets = yield triadProtocol.trade.getAllMarkets();
+    const liquidityToRecovery = {
+        0: {
+            name: 'triad',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                flop: {}
+            }
+        },
+        1: {
+            name: 'pyth',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                flop: {}
+            }
+        },
+        2: {
+            name: 'drift',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                flop: {}
+            }
+        },
+        3: {
+            name: 'symmetry',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                flop: {}
+            }
+        },
+        4: {
+            name: 'ore',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                hype: {}
+            }
+        },
+        5: {
+            name: 'coleta',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                flop: {}
+            }
+        },
+        6: {
+            name: 'undead',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                hype: {}
+            }
+        },
+        7: {
+            name: 'solxeth',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                flop: {}
+            }
+        },
+        8: {
+            name: 'solxeth2',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                flop: {}
+            }
+        },
+        9: {
+            name: 'solxeth3',
+            liquidityToPay: 0,
+            sharesToPay: 0,
+            openOrders: 0,
+            medPrice: 0,
+            direction: {
+                flop: {}
+            }
+        }
+    };
+    for (const market of allMarkets) {
+        let currentMarket = liquidityToRecovery[market.marketId];
+        if ('flop' in currentMarket.direction) {
+            let shares = parseFloat(market.flopShares.toString()) / Math.pow(10, 6);
+            currentMarket.medPrice =
+                parseFloat(market.hypeLiquidity.toString()) / Math.pow(10, 6) / shares;
+            currentMarket.sharesToPay = shares;
+            currentMarket.liquidityToPay =
+                parseFloat(market.hypeLiquidity.toString()) / Math.pow(10, 6);
+        }
+        else {
+            let shares = parseFloat(market.hypeShares.toString()) / Math.pow(10, 6);
+            currentMarket.medPrice =
+                parseFloat(market.flopLiquidity.toString()) / Math.pow(10, 6) / shares;
+            currentMarket.sharesToPay = shares;
+            currentMarket.liquidityToPay =
+                parseFloat(market.flopLiquidity.toString()) / Math.pow(10, 6);
+        }
+    }
+    for (const userTrade of response) {
+        for (const order of userTrade.account.orders) {
+            const market = liquidityToRecovery[order.marketId.toNumber()];
+            if (Object.keys(order.direction)[0] === Object.keys(market.direction)[0]) {
+                market.openOrders += 1;
+            }
+        }
+    }
+    console.log(liquidityToRecovery);
+});
 const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
     yield getMarket();
     for (const order of ordersHypeAndFloopBot) {
@@ -230,15 +298,13 @@ const mintTokens = () => __awaiter(void 0, void 0, void 0, function* () {
     const mintTx = yield (0, spl_token_1.mintTo)(connection, keypair, mint, ata, keypair, 1000000 * Math.pow(10, 6), [keypair], undefined, spl_token_1.TOKEN_2022_PROGRAM_ID);
     console.log(mintTx);
 });
-const resolveQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
+const resolveMarket = () => __awaiter(void 0, void 0, void 0, function* () {
     const marketsToResolve = [
-        { marketId: 1, winningDirection: { flop: {} } },
-        { marketId: 2, winningDirection: { flop: {} } },
-        { marketId: 3, winningDirection: { flop: {} } },
-        { marketId: 5, winningDirection: { flop: {} } }
+        { marketId: 8, winningDirection: { flop: {} } },
+        { marketId: 9, winningDirection: { flop: {} } }
     ];
     for (const market of marketsToResolve) {
-        const response = yield triadProtocol.trade.resolveQuestion({
+        const response = yield triadProtocol.trade.resolveMarket({
             marketId: market.marketId,
             winningDirection: market.winningDirection
         }, {
@@ -247,3 +313,34 @@ const resolveQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
         console.log(response);
     }
 });
+const addLiquidity = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.trade.addLiquidity({
+        marketId: 5,
+        amount: 4729,
+        direction: {
+            hype: {}
+        }
+    });
+    console.log(response);
+});
+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) {
+        console.log(`Collecting fees for market ${market.marketId}`);
+        try {
+            const response = yield triadProtocol.trade.collectFee({
+                marketId: Number(market.marketId),
+                vault: new web3_js_1.PublicKey('6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq')
+            }, {
+                microLamports: 70000
+            });
+            console.log(response);
+        }
+        catch (e) {
+            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

@@ -1,7 +1,7 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { PublicKey } from '@solana/web3.js';
-import { FeeVault, InitializeQuestionArgs, Market, OpenOrderArgs, OrderDirection } from './types/trade';
+import { InitializeMarketArgs, Market, OpenOrderArgs, OrderDirection } from './types/trade';
 import { RpcOptions } from './types';
 import BN from 'bn.js';
 export default class Trade {
@@ -13,7 +13,6 @@ 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
@@ -111,10 +110,7 @@ export default class Trade {
      * @param options - RPC options
      *
      */
-    initializeMarket({ marketId, name }: {
-        marketId: number;
-        name: string;
-    }, options?: RpcOptions): Promise<any>;
+    initializeMarket({ marketId, name, startTime, endTime, question }: InitializeMarketArgs, options?: RpcOptions): Promise<any>;
     /**
      * Open Order
      * @param marketId - The ID of the market
@@ -126,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
@@ -140,24 +136,14 @@ export default class Trade {
         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
+     * Resolve Market
      * @param marketId - The ID of the market
+     * @param winningDirection - The winning direction of the market
      *
      * @param options - RPC options
      *
      */
-    resolveQuestion({ marketId, winningDirection }: {
+    resolveMarket({ marketId, winningDirection }: {
         marketId: number;
         winningDirection: {
             hype: {};
@@ -193,4 +179,18 @@ export default class Trade {
         amount: number;
         direction: OrderDirection;
     }, options?: RpcOptions): Promise<string>;
+    /**
+     * Collect Fee
+     * @param marketId - The ID of the market
+     *
+     * @param options - RPC options
+     *
+     */
+    collectFee({ marketId, vault }: {
+        marketId: number;
+        vault: PublicKey;
+    }, options?: RpcOptions): Promise<{
+        feeToSwap: number;
+        lamport: number;
+    }>;
 }