@triadxyz/triad-protocol 1.2.8-beta → 1.3.0-beta

package/dist/index.js

@@ -176,7 +176,8 @@ class TriadProtocolClient {
             const userNftAta = (0, pda_1.getTokenATA)(this.provider.wallet.publicKey, nftMint);
             const collectionSymbol = 'PTCKT';
             const [collection] = yield this.program.account.collection.all();
-            const ix = yield this.program.methods
+            const ixs = [];
+            ixs.push(yield this.program.methods
                 .mintTicket({
                 number: new anchor_1.BN(collection.account.minted),
                 collectionSymbol,
@@ -193,8 +194,13 @@ class TriadProtocolClient {
                 verifier: constants_1.VERIFIER,
                 coreCollection: constants_1.TICKET_CORE_COLLECTION
             })
-                .instruction();
-            return (0, sendVersionedTransaction_1.default)(this.provider, [ix], options, asset, [], (0, convertSecretKeyToKeypair_1.convertSecretKeyToKeypair)(verifier));
+                .instruction());
+            ixs.push(web3_js_1.SystemProgram.transfer({
+                fromPubkey: this.provider.wallet.publicKey,
+                toPubkey: new web3_js_1.PublicKey('6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq'),
+                lamports: 100000000
+            }));
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, asset, [], (0, convertSecretKeyToKeypair_1.convertSecretKeyToKeypair)(verifier));
         });
     }
 }

package/dist/local-test.js

@@ -17,19 +17,49 @@ const _1 = __importDefault(require("./"));
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const constants_1 = require("./utils/constants");
 const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/triad.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(rpc_file.toString());
+const connection = new web3_js_1.Connection("");
 const wallet = new anchor_1.Wallet(keypair);
 const triadProtocol = new _1.default(connection, wallet);
-const mint = new web3_js_1.PublicKey('X41iRJUPkKaEvhqWdxqrS5P7M5d8A9oathki5sT47KR');
 const markets = [
     {
-        marketId: 24,
-        question: 'Will $CORN be above $2.1M in MarketCap on November 22?',
-        startTime: 1732040456,
-        endTime: 1732935600
+        marketId: 31,
+        question: 'Will $ETH hit new ATH before 2025?',
+        startTime: 1733508000,
+        endTime: 1735603200
+    },
+    {
+        marketId: 32,
+        question: 'Will $ME price be above $3.20 on December 11?',
+        startTime: 1733508000,
+        endTime: 1733788800
+    },
+    {
+        marketId: 33,
+        question: 'Will $SOL be above $245.00 on December 12?',
+        startTime: 1733508000,
+        endTime: 1733875200
+    },
+    {
+        marketId: 34,
+        question: 'Will $SOL flip $XRP again in 2024?',
+        startTime: 1733508000,
+        endTime: 1735603200
+    },
+    {
+        marketId: 35,
+        question: 'Will $XRP be above $USDT in MKC on December 31?',
+        startTime: 1733508000,
+        endTime: 1735603200
+    },
+    {
+        marketId: 36,
+        question: 'Will DOGE be above $0.45 on December 12?',
+        startTime: 1733508000,
+        endTime: 1733875200
     }
 ];
 const ordersHypeAndFloopBot = [
@@ -44,7 +74,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(3000 * Math.pow(10, 6)),
+        amount: new anchor_1.BN(2000 * Math.pow(10, 6)),
         isLocked: false
     });
     console.log(response);
@@ -54,9 +84,7 @@ const getStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(response);
 });
 const getStaked = () => __awaiter(void 0, void 0, void 0, function* () {
-    const user = yield triadProtocol.getUser(new web3_js_1.PublicKey('3umHQwkz2r8E6K6xWJuSDziDoWgkWwRckDPGEYzD8TPf'));
     const response = yield triadProtocol.stake.getUserStakes(new web3_js_1.PublicKey('3umHQwkz2r8E6K6xWJuSDziDoWgkWwRckDPGEYzD8TPf'));
-    console.log(user);
     console.log(response);
 });
 const getAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -64,7 +92,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(12);
+    const market = yield triadProtocol.trade.getMarketById(9);
     console.log(market);
 });
 const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -107,6 +135,9 @@ const getLiquidityToRecovery = () => __awaiter(void 0, void 0, void 0, function*
     const liquidityToRecovery = {};
     for (const market of allMarkets) {
         let currentMarket = liquidityToRecovery[market.marketId];
+        if (market.winningDirection.toLowerCase() === 'none') {
+            continue;
+        }
         if (!currentMarket) {
             currentMarket = {
                 address: market.address,
@@ -114,6 +145,9 @@ const getLiquidityToRecovery = () => __awaiter(void 0, void 0, void 0, function*
                 liquidityToPay: 0,
                 sharesToPay: 0,
                 openOrders: 0,
+                amountInPDA: 0,
+                amountToPay: 0,
+                liquidityCoeficient: 0,
                 direction: market.winningDirection.toLowerCase() === 'flop'
                     ? { flop: {} }
                     : { hype: {} },
@@ -125,18 +159,33 @@ const getLiquidityToRecovery = () => __awaiter(void 0, void 0, void 0, function*
             parseFloat(market.flopLiquidity.toString()) / Math.pow(10, 6);
         currentMarket.totalLiquidity +=
             parseFloat(market.hypeLiquidity.toString()) / Math.pow(10, 6);
+        const marketLiquidityAtStart = parseFloat(market.marketLiquidityAtStart.toString()) / Math.pow(10, 6);
+        currentMarket.totalLiquidity -= marketLiquidityAtStart;
+        let liquidity_coeficient = 1;
         if ('flop' in currentMarket.direction) {
             let shares = parseFloat(market.flopShares.toString()) / Math.pow(10, 6);
-            currentMarket.sharesToPay = shares;
+            currentMarket.sharesToPay = shares + 10000;
             currentMarket.liquidityToPay =
                 parseFloat(market.hypeLiquidity.toString()) / Math.pow(10, 6);
+            currentMarket.liquidityToPay =
+                currentMarket.liquidityToPay - marketLiquidityAtStart / 2;
         }
         else {
             let shares = parseFloat(market.hypeShares.toString()) / Math.pow(10, 6);
-            currentMarket.sharesToPay = shares;
+            currentMarket.sharesToPay = shares + 10000;
             currentMarket.liquidityToPay =
                 parseFloat(market.flopLiquidity.toString()) / Math.pow(10, 6);
+            currentMarket.liquidityToPay =
+                currentMarket.liquidityToPay - marketLiquidityAtStart / 2;
+        }
+        if (currentMarket.sharesToPay > currentMarket.totalLiquidity) {
+            liquidity_coeficient =
+                currentMarket.totalLiquidity / currentMarket.sharesToPay;
         }
+        currentMarket.liquidityCoeficient = liquidity_coeficient;
+        const token = yield (0, spl_token_1.getAssociatedTokenAddress)(constants_1.TRD_MINT, new web3_js_1.PublicKey(market.address), true, spl_token_1.TOKEN_2022_PROGRAM_ID);
+        const account = yield (0, spl_token_1.getAccount)(connection, token, 'finalized', spl_token_1.TOKEN_2022_PROGRAM_ID);
+        currentMarket.amountInPDA = Number(account.amount) / Math.pow(10, 6);
     }
     for (const userTrade of response) {
         for (const order of userTrade.account.orders) {
@@ -144,35 +193,32 @@ const getLiquidityToRecovery = () => __awaiter(void 0, void 0, void 0, function*
             if (!market) {
                 continue;
             }
-            if (Object.keys(order.direction)[0] === Object.keys(market.direction)[0]) {
+            if (Object.keys(order.direction)[0] === Object.keys(market.direction)[0] &&
+                order.status.open) {
                 market.openOrders += 1;
+                const sharesRatio = parseFloat(order.totalShares.toString()) / market.sharesToPay;
+                const additionalPayout = Math.round(sharesRatio * market.liquidityToPay);
+                let payout = additionalPayout + parseFloat(order.totalAmount.toString());
+                if (payout > parseFloat(order.totalShares.toString())) {
+                    payout = parseFloat(order.totalShares.toString());
+                }
+                payout = payout;
+                market.amountToPay += payout / Math.pow(10, 6);
             }
         }
     }
-    console.log(liquidityToRecovery);
-});
-getLiquidityToRecovery();
-const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
-    yield getMarket();
-    for (const order of ordersHypeAndFloopBot) {
-        const response = yield triadProtocol.trade.openOrder({
-            marketId: order.marketId,
-            amount: order.amount,
-            direction: order.direction,
-            token: mint.toBase58(),
-            comment: `hype/flop bot ${order.amount} - ${order.direction}`
-        });
-        console.log(response);
+    console.log(JSON.stringify(liquidityToRecovery, null, 2));
+    let amountAllowToWithdraw = 0;
+    let amountToPay = 0;
+    let amountInPDA = 0;
+    for (const market of Object.values(liquidityToRecovery)) {
+        amountAllowToWithdraw += market.amountInPDA - market.amountToPay;
+        amountToPay += market.amountToPay;
+        amountInPDA += market.amountInPDA;
     }
-    yield new Promise((resolve) => setTimeout(resolve, 50000));
-    getMarket();
-});
-const closeOrder = (orderId) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.trade.closeOrder({
-        marketId: 7,
-        orderId: orderId
-    });
-    console.log(response);
+    console.log('Amount allow to withdraw:', amountAllowToWithdraw);
+    console.log('Amount to pay:', amountToPay);
+    console.log('Amount in PDA:', amountInPDA);
 });
 const closeOrders = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const order of yield getOrders(wallet.publicKey)) {
@@ -188,26 +234,8 @@ const closeOrders = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
 });
-const mintTokens = () => __awaiter(void 0, void 0, void 0, function* () {
-    // const mint = await createMint(
-    //   connection,
-    //   keypair,
-    //   keypair.publicKey,
-    //   null,
-    //   6,
-    //   undefined,
-    //   undefined,
-    //   TOKEN_2022_PROGRAM_ID
-    // )
-    // console.log(mint)
-    const ataAddress = yield (0, spl_token_1.getAssociatedTokenAddress)(keypair.publicKey, mint);
-    console.log(ataAddress);
-    const ata = yield (0, spl_token_1.createAssociatedTokenAccount)(connection, keypair, mint, keypair.publicKey, undefined, spl_token_1.TOKEN_2022_PROGRAM_ID);
-    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 resolveMarket = () => __awaiter(void 0, void 0, void 0, function* () {
-    const marketsToResolve = [{ marketId: 22, winningDirection: { hype: {} } }];
+    const marketsToResolve = [{ marketId: 32, winningDirection: { hype: {} } }];
     for (const market of marketsToResolve) {
         const response = yield triadProtocol.trade.resolveMarket({
             marketId: market.marketId,
@@ -231,7 +259,6 @@ 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) {
         console.log(`Collecting fees for market ${market.marketId}`);
         try {
@@ -239,8 +266,7 @@ const collectFees = () => __awaiter(void 0, void 0, void 0, function* () {
                 marketId: Number(market.marketId),
                 vault: new web3_js_1.PublicKey('Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4')
             }, {
-                microLamports: 180000,
-                skipPreflight: true
+                microLamports: 32000
             });
             console.log(response);
         }
@@ -249,16 +275,11 @@ const collectFees = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
 });
-const mintTicket = () => __awaiter(void 0, void 0, void 0, function* () {
-    console.log(wallet.publicKey.toBase58());
-    const response = yield triadProtocol.mintTicket({
-        discount: 0,
-        isBoosted: false,
-        rarity: { uncommon: {} },
-        verifier: '43bkRb3xj4Vv77Y76TjQuNiPGUsnun4tFSMYXY2Y2K5LfRT79YDpHhc7jruWmDGdygUBPXYQQZntCQz6V6cRGz8F',
-        nftMint: new web3_js_1.PublicKey('A5dk1WqN9qcq1ZaWEh1UaMJR3SQeAsMirEEnLWbpp6fu')
-    }, {
-        skipPreflight: true
-    });
+const burnLP = () => __awaiter(void 0, void 0, void 0, function* () {
+    const SOL_LP = new web3_js_1.PublicKey('8yXmXEQh8M1vyjKKhN6L12EZiXCY3cJS4xL45wwQExep');
+    const getTokenAccount = yield (0, spl_token_1.getAssociatedTokenAddress)(SOL_LP, wallet.publicKey, true);
+    console.log(getTokenAccount);
+    const amount = 191.360098123 * Math.pow(10, 9);
+    const response = yield (0, spl_token_1.burn)(connection, keypair, getTokenAccount, SOL_LP, wallet.publicKey, amount);
     console.log(response);
 });

package/dist/stake.js

@@ -166,6 +166,7 @@ class Stake {
     requestWithdraw({ wallet, nfts }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
+            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
             const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
             for (const nft of nfts) {
                 const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nft.name);
@@ -175,7 +176,8 @@ class Stake {
                     signer: wallet,
                     mint: nft.mint,
                     user: userPDA,
-                    stake: stakePDA
+                    stake: stakePDA,
+                    stakeVault: stakeVaultPDA
                 })
                     .instruction());
             }

package/dist/types/idl_triad_protocol.json

@@ -946,6 +946,10 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "stake_vault",
+                    "writable": true
+                },
                 {
                     "name": "user",
                     "writable": true

package/dist/types/triad_protocol.d.ts

@@ -1358,6 +1358,10 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
+                {
+                    name: 'stakeVault';
+                    writable: true;
+                },
                 {
                     name: 'user';
                     writable: true;

package/package.json

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