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

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="bn.js" />
-import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
+import { AnchorProvider, BN, Program, Wallet } from '@coral-xyz/anchor';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import Trade from './trade';
 import Stake from './stake';
-import { CreateUserArgs, RpcOptions } from './types';
+import { CreateUserArgs, MintTicketArgs, RpcOptions } from './types';
 export default class TriadProtocolClient {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -51,21 +51,21 @@ export default class TriadProtocolClient {
      *
      */
     getUserPositionsWithAmount(wallet: PublicKey): Promise<{
-        ts: import("bn.js");
+        ts: BN;
         bump: number;
-        totalDeposited: import("bn.js");
-        totalWithdrawn: import("bn.js");
-        lpShare: import("bn.js");
+        totalDeposited: BN;
+        totalWithdrawn: BN;
+        lpShare: BN;
         totalPositions: number;
         ticker: PublicKey;
         authority: PublicKey;
         positions: {
-            amount: import("bn.js");
-            entryPrice: import("bn.js");
-            ts: import("bn.js");
+            amount: BN;
+            entryPrice: BN;
+            ts: BN;
             isLong: boolean;
             isOpen: boolean;
-            pnl: import("bn.js");
+            pnl: BN;
         }[];
     }[]>;
     withdrawV1({ wallet, ticker, positionIndex }: {
@@ -73,4 +73,10 @@ export default class TriadProtocolClient {
         ticker: PublicKey;
         positionIndex: number;
     }, options?: RpcOptions): Promise<any>;
+    createCollection(args: {
+        collectionName: string;
+        collectionSymbol: string;
+        supply: number;
+    }, options?: RpcOptions): Promise<string>;
+    mintTicket({ collectionSymbol, number, discount, isBoosted, rarity, verifier, nftMint }: MintTicketArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/index.js

@@ -22,6 +22,9 @@ const pda_1 = require("./utils/pda");
 const stake_1 = __importDefault(require("./stake"));
 const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
+const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
+const constants_1 = require("./utils/constants");
+const convertSecretKeyToKeypair_1 = require("./utils/convertSecretKeyToKeypair");
 class TriadProtocolClient {
     constructor(connection, wallet) {
         this.provider = new anchor_1.AnchorProvider(connection, wallet, {
@@ -150,5 +153,47 @@ class TriadProtocolClient {
             }), options);
         });
     }
+    createCollection(args, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const keyPair = web3_js_1.Keypair.generate();
+            const ix = yield this.program.methods
+                .createCollection({
+                supply: new anchor_1.BN(args.supply),
+                name: args.collectionName,
+                symbol: args.collectionSymbol
+            })
+                .accounts({
+                signer: this.provider.wallet.publicKey,
+                coreCollection: keyPair.publicKey
+            })
+                .instruction();
+            return (0, sendVersionedTransaction_1.default)(this.provider, [ix], options, keyPair);
+        });
+    }
+    mintTicket({ collectionSymbol, number, discount, isBoosted, rarity, verifier, nftMint }, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const asset = web3_js_1.Keypair.generate();
+            const userNftAta = (0, pda_1.getTokenATA)(this.provider.wallet.publicKey, nftMint);
+            const ix = yield this.program.methods
+                .mintTicket({
+                number: new anchor_1.BN(number),
+                collectionSymbol,
+                discount: new anchor_1.BN(discount),
+                isBoosted,
+                rarity
+            })
+                .accounts({
+                signer: this.provider.wallet.publicKey,
+                asset: asset.publicKey,
+                nftMint,
+                userNftAta,
+                trdMint: constants_1.TRD_MINT,
+                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));
+        });
+    }
 }
 exports.default = TriadProtocolClient;

package/dist/local-test.js

@@ -25,7 +25,15 @@ const connection = new web3_js_1.Connection('https://triad-solanam-a5ee.mainnet.
 const wallet = new anchor_1.Wallet(keypair);
 const triadProtocol = new _1.default(connection, wallet);
 const mint = new web3_js_1.PublicKey('X41iRJUPkKaEvhqWdxqrS5P7M5d8A9oathki5sT47KR');
-const markets = [];
+const markets = [
+    {
+        marketId: 16,
+        name: 'MIKExJAKE',
+        question: 'Jake Paul vs. Mike Tyson: Who wins today?',
+        startTime: 1731682800,
+        endTime: 1731715200
+    }
+];
 const ordersHypeAndFloopBot = [
     {
         marketId: 7,
@@ -38,7 +46,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(10000 * Math.pow(10, 6)),
+        amount: new anchor_1.BN(8000 * Math.pow(10, 6)),
         isLocked: false
     });
     console.log(response);
@@ -96,7 +104,7 @@ const getOrders = (walletAddress) => __awaiter(void 0, void 0, void 0, function*
             continue;
         }
         orders.push({
-            marketId: order.marketId,
+            marketId: order.marketId.toNumber(),
             orderId: order.orderId.toNumber(),
             totalShares: order.totalShares.toString(),
             amount: order.totalAmount.toString(),
@@ -109,7 +117,6 @@ const getOrders = (walletAddress) => __awaiter(void 0, void 0, void 0, function*
     console.log(orders);
     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();
@@ -217,6 +224,9 @@ const getLiquidityToRecovery = () => __awaiter(void 0, void 0, void 0, function*
     };
     for (const market of allMarkets) {
         let currentMarket = liquidityToRecovery[market.marketId];
+        if (!currentMarket) {
+            continue;
+        }
         if ('flop' in currentMarket.direction) {
             let shares = parseFloat(market.flopShares.toString()) / Math.pow(10, 6);
             currentMarket.medPrice =
@@ -237,6 +247,9 @@ const getLiquidityToRecovery = () => __awaiter(void 0, void 0, void 0, function*
     for (const userTrade of response) {
         for (const order of userTrade.account.orders) {
             const market = liquidityToRecovery[order.marketId.toNumber()];
+            if (!market) {
+                continue;
+            }
             if (Object.keys(order.direction)[0] === Object.keys(market.direction)[0]) {
                 market.openOrders += 1;
             }
@@ -299,10 +312,7 @@ const mintTokens = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(mintTx);
 });
 const resolveMarket = () => __awaiter(void 0, void 0, void 0, function* () {
-    const marketsToResolve = [
-        { marketId: 8, winningDirection: { flop: {} } },
-        { marketId: 9, winningDirection: { flop: {} } }
-    ];
+    const marketsToResolve = [{ marketId: 16, winningDirection: { flop: {} } }];
     for (const market of marketsToResolve) {
         const response = yield triadProtocol.trade.resolveMarket({
             marketId: market.marketId,
@@ -334,7 +344,8 @@ const collectFees = () => __awaiter(void 0, void 0, void 0, function* () {
                 marketId: Number(market.marketId),
                 vault: new web3_js_1.PublicKey('6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq')
             }, {
-                microLamports: 70000
+                microLamports: 90000,
+                skipPreflight: true
             });
             console.log(response);
         }
@@ -344,3 +355,19 @@ const collectFees = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     fs_1.default.writeFileSync(`fees-collected.json`, JSON.stringify(currentFees, null, 2));
 });
+const mintTicket = () => __awaiter(void 0, void 0, void 0, function* () {
+    console.log(wallet.publicKey.toBase58());
+    const response = yield triadProtocol.mintTicket({
+        number: 0,
+        collectionSymbol: 'PTCKT',
+        discount: 0,
+        isBoosted: false,
+        rarity: { uncommon: {} },
+        verifier: '43bkRb3xj4Vv77Y76TjQuNiPGUsnun4tFSMYXY2Y2K5LfRT79YDpHhc7jruWmDGdygUBPXYQQZntCQz6V6cRGz8F',
+        nftMint: new web3_js_1.PublicKey('A5dk1WqN9qcq1ZaWEh1UaMJR3SQeAsMirEEnLWbpp6fu')
+    }, {
+        skipPreflight: true
+    });
+    console.log(response);
+});
+mintTicket();

package/dist/trade.d.ts

@@ -193,4 +193,16 @@ export default class Trade {
         feeToSwap: number;
         lamport: number;
     }>;
+    /**
+     * Payout an order
+     * @param marketId - The ID of the market
+     * @param orderId - The ID of the order to payout
+     *
+     * @param options - RPC options
+     *
+     */
+    payoutOrder({ marketId, orderId }: {
+        marketId: number;
+        orderId: number;
+    }, options?: RpcOptions): Promise<string>;
 }

package/dist/trade.js

@@ -298,5 +298,25 @@ class Trade {
             };
         });
     }
+    /**
+     * Payout an order
+     * @param marketId - The ID of the market
+     * @param orderId - The ID of the order to payout
+     *
+     * @param options - RPC options
+     *
+     */
+    payoutOrder({ marketId, orderId }, 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);
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.payoutOrder(new bn_js_1.default(orderId)).accounts({
+                signer: this.provider.publicKey,
+                userTrade: userTradePDA,
+                market: marketPDA,
+                mint: this.mint
+            }), options);
+        });
+    }
 }
 exports.default = Trade;