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

package/dist/local-test.js

@@ -33,9 +33,11 @@ const markets = [
     // { 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 }
+    // { 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 = [
     {
@@ -104,7 +106,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(5000 * Math.pow(10, 6)),
+        isLocked: false
     });
     console.log(response);
 });
@@ -136,24 +139,23 @@ 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(9);
     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
-            });
-            console.log(`Initialized market ${market.name}:`, response);
-        }
-        catch (error) {
-            console.error(`Error initializing market ${market.name}:`, error);
-        }
-    }
-});
+// 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 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 = [];
@@ -176,6 +178,141 @@ 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);
+});
+getLiquidityToRecovery();
 const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
     yield getMarket();
     for (const order of ordersHypeAndFloopBot) {
@@ -230,15 +367,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 +382,32 @@ 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();
+    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)
+            });
+            console.log(response);
+        }
+        catch (e) {
+            console.log(e);
+        }
+    }
+});

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
@@ -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,14 @@ 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 }: {
+        marketId: number;
+    }, options?: RpcOptions): Promise<string>;
 }

package/dist/trade.js

@@ -31,29 +31,13 @@ class Trade {
      */
     getAllMarkets() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.program.account.market
+            const marketV1 = yield this.program.account.market
                 .all()
-                .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()
-            };
+                .then((markets) => markets.map(({ account, publicKey }) => (0, helpers_1.accountToMarketV1)(account, publicKey)));
+            const marketV2 = yield this.program.account.marketV2
+                .all()
+                .then((markets) => markets.map(({ account, publicKey }) => (0, helpers_1.formatMarket)(account, publicKey)));
+            return [...marketV1, ...marketV2];
         });
     }
     /**
@@ -64,8 +48,8 @@ class Trade {
     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);
+            const response = yield this.program.account.marketV2.fetch(marketPDA);
+            return (0, helpers_1.formatMarket)(response, marketPDA);
         });
     }
     /**
@@ -75,8 +59,8 @@ class Trade {
      */
     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);
+            const account = yield this.program.account.marketV2.fetch(address);
+            return (0, helpers_1.formatMarket)(account, address);
         });
     }
     /**
@@ -98,12 +82,15 @@ class Trade {
      * @param options - RPC options
      *
      */
-    initializeMarket({ marketId, name }, options) {
+    initializeMarket({ marketId, name, startTime, endTime, question }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             return (0, sendTransactionWithOptions_1.default)(this.program.methods
                 .initializeMarket({
                 marketId: new bn_js_1.default(marketId),
-                name: name
+                name: name,
+                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,
@@ -125,7 +112,6 @@ class Trade {
     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 ixs = [];
@@ -167,7 +153,6 @@ class Trade {
                 .accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                feeVault: feeVualtPDA,
                 userTrade: userTradePDA,
                 mint: this.mint
             })
@@ -196,42 +181,18 @@ class Trade {
         });
     }
     /**
-     * Initialize a new question for a market
+     * Resolve 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 winningDirection - The winning direction of the market
      *
      * @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, winningDirection }, options) {
+    resolveMarket({ marketId, winningDirection }, 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(winningDirection)
+                .resolveMarket(winningDirection)
                 .accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA
@@ -271,7 +232,7 @@ class Trade {
     addLiquidity({ marketId, amount, direction }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
-            const method = this.program.methods
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods
                 .addLiquidity({
                 amount: new bn_js_1.default(amount * Math.pow(10, constants_1.TRD_DECIMALS)),
                 direction: direction
@@ -280,8 +241,24 @@ class Trade {
                 signer: this.provider.publicKey,
                 market: marketPDA,
                 mint: this.mint
-            });
-            return (0, sendTransactionWithOptions_1.default)(method, options);
+            }), options);
+        });
+    }
+    /**
+     * Collect Fee
+     * @param marketId - The ID of the market
+     *
+     * @param options - RPC options
+     *
+     */
+    collectFee({ marketId }, 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({
+                signer: this.provider.publicKey,
+                market: marketPDA,
+                mint: this.mint
+            }), options);
         });
     }
 }