@triadxyz/triad-protocol 1.2.5-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

@@ -27,11 +27,11 @@ const triadProtocol = new _1.default(connection, wallet);
 const mint = new web3_js_1.PublicKey('X41iRJUPkKaEvhqWdxqrS5P7M5d8A9oathki5sT47KR');
 const markets = [
     {
-        marketId: 14,
-        name: 'BTC',
-        question: 'Will $BTC be above $85k on November 18th?',
-        startTime: 1731429209,
-        endTime: 1731812400
+        marketId: 16,
+        name: 'MIKExJAKE',
+        question: 'Jake Paul vs. Mike Tyson: Who wins today?',
+        startTime: 1731682800,
+        endTime: 1731715200
     }
 ];
 const ordersHypeAndFloopBot = [
@@ -46,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);
@@ -79,7 +79,6 @@ 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(12);
     console.log(market);
@@ -105,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(),
@@ -118,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();
@@ -226,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 =
@@ -246,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;
             }
@@ -308,12 +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: 10, winningDirection: { hype: {} } },
-        { marketId: 11, winningDirection: { flop: {} } },
-        { marketId: 12, winningDirection: { hype: {} } },
-        { marketId: 13, winningDirection: { hype: {} } }
-    ];
+    const marketsToResolve = [{ marketId: 16, winningDirection: { flop: {} } }];
     for (const market of marketsToResolve) {
         const response = yield triadProtocol.trade.resolveMarket({
             marketId: market.marketId,
@@ -345,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);
         }
@@ -355,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/types/idl_triad_protocol.json

@@ -396,6 +396,64 @@
             ],
             "args": []
         },
+        {
+            "name": "create_collection",
+            "discriminator": [156, 251, 92, 54, 233, 2, 16, 82],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "core_collection",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "collection",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [99, 111, 108, 108, 101, 99, 116, 105, 111, 110]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "args.symbol"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "metaplex_program",
+                    "address": "CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d"
+                },
+                {
+                    "name": "token_program",
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "CreateCollectionArgs"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "create_user",
             "discriminator": [108, 227, 130, 130, 252, 109, 75, 218],
@@ -558,6 +616,129 @@
                 }
             ]
         },
+        {
+            "name": "mint_ticket",
+            "discriminator": [159, 167, 223, 60, 138, 6, 23, 29],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "nft",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [110, 102, 116]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "args.number"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "verifier",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "asset",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "nft_mint",
+                    "writable": true
+                },
+                {
+                    "name": "collection",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [99, 111, 108, 108, 101, 99, 116, 105, 111, 110]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "args.collection_symbol"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "core_collection",
+                    "writable": true
+                },
+                {
+                    "name": "trd_mint",
+                    "writable": true
+                },
+                {
+                    "name": "user_trd_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "trd_mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "user_nft_ata",
+                    "writable": true
+                },
+                {
+                    "name": "metaplex_program",
+                    "address": "CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d"
+                },
+                {
+                    "name": "token_program",
+                    "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+                },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "MintTicketArgs"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "open_order",
             "discriminator": [206, 88, 88, 143, 38, 136, 50, 224],
@@ -821,6 +1002,35 @@
                 }
             ]
         },
+        {
+            "name": "resolve_market_v1",
+            "discriminator": [67, 202, 40, 49, 111, 136, 234, 183],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "market",
+                    "writable": true
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "winning_direction",
+                    "type": {
+                        "defined": {
+                            "name": "WinningDirection"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "settle_order",
             "discriminator": [80, 74, 204, 34, 12, 183, 66, 66],
@@ -1327,6 +1537,14 @@
         }
     ],
     "accounts": [
+        {
+            "name": "BaseCollectionV1",
+            "discriminator": [0, 0, 0, 0, 0, 0, 0, 0]
+        },
+        {
+            "name": "Collection",
+            "discriminator": [48, 160, 232, 205, 191, 207, 26, 141]
+        },
         {
             "name": "Market",
             "discriminator": [219, 190, 213, 55, 0, 227, 198, 154]
@@ -1335,6 +1553,10 @@
             "name": "MarketV2",
             "discriminator": [27, 60, 50, 75, 191, 193, 86, 227]
         },
+        {
+            "name": "Nft",
+            "discriminator": [88, 10, 146, 176, 101, 11, 40, 217]
+        },
         {
             "name": "StakeV2",
             "discriminator": [207, 98, 130, 13, 118, 181, 238, 47]
@@ -1478,6 +1700,11 @@
             "code": 6019,
             "name": "ConcurrentTransaction",
             "msg": "Concurrent transaction"
+        },
+        {
+            "code": 6020,
+            "name": "CollectionFull",
+            "msg": "Collection is full"
         }
     ],
     "types": [
@@ -1501,6 +1728,42 @@
                 ]
             }
         },
+        {
+            "name": "BaseCollectionV1",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "key",
+                        "type": {
+                            "defined": {
+                                "name": "Key"
+                            }
+                        }
+                    },
+                    {
+                        "name": "update_authority",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "name": "uri",
+                        "type": "string"
+                    },
+                    {
+                        "name": "num_minted",
+                        "type": "u32"
+                    },
+                    {
+                        "name": "current_size",
+                        "type": "u32"
+                    }
+                ]
+            }
+        },
         {
             "name": "ClaimStakeRewardsArgs",
             "type": {
@@ -1517,6 +1780,60 @@
                 ]
             }
         },
+        {
+            "name": "Collection",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "authority",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "bump",
+                        "type": "u8"
+                    },
+                    {
+                        "name": "symbol",
+                        "type": "string"
+                    },
+                    {
+                        "name": "minted",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "supply",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": ["u8", 64]
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "CreateCollectionArgs",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "name": "symbol",
+                        "type": "string"
+                    },
+                    {
+                        "name": "supply",
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
         {
             "name": "CreateUserArgs",
             "type": {
@@ -1559,6 +1876,32 @@
                 ]
             }
         },
+        {
+            "name": "Key",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "Uninitialized"
+                    },
+                    {
+                        "name": "AssetV1"
+                    },
+                    {
+                        "name": "HashedAssetV1"
+                    },
+                    {
+                        "name": "PluginHeaderV1"
+                    },
+                    {
+                        "name": "PluginRegistryV1"
+                    },
+                    {
+                        "name": "CollectionV1"
+                    }
+                ]
+            }
+        },
         {
             "name": "Market",
             "type": {
@@ -1907,6 +2250,45 @@
                 ]
             }
         },
+        {
+            "name": "MintTicketArgs",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "collection_symbol",
+                        "type": "string"
+                    },
+                    {
+                        "name": "discount",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "is_boosted",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "number",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "rarity",
+                        "type": {
+                            "defined": {
+                                "name": "Rarity"
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "Nft",
+            "type": {
+                "kind": "struct",
+                "fields": []
+            }
+        },
         {
             "name": "OpenOrderArgs",
             "type": {
@@ -2191,6 +2573,32 @@
                 ]
             }
         },
+        {
+            "name": "Rarity",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "Common"
+                    },
+                    {
+                        "name": "Uncommon"
+                    },
+                    {
+                        "name": "Rare"
+                    },
+                    {
+                        "name": "Epic"
+                    },
+                    {
+                        "name": "Legendary"
+                    },
+                    {
+                        "name": "Mythic"
+                    }
+                ]
+            }
+        },
         {
             "name": "ResolvedQuestion",
             "type": {

package/dist/types/index.d.ts

@@ -8,6 +8,21 @@ export type CreateUserArgs = {
     name: string;
     referral?: PublicKey;
 };
+export type MintTicketArgs = {
+    collectionSymbol: string;
+    number: number;
+    discount: number;
+    isBoosted: boolean;
+    rarity: {
+        common: {};
+    } | {
+        uncommon: {};
+    } | {
+        rare: {};
+    };
+    verifier: string;
+    nftMint: PublicKey;
+};
 export type User = {
     ts: number;
     authority: string;

package/dist/types/triad_protocol.d.ts

@@ -634,6 +634,64 @@ export type TriadProtocol = {
             ];
             args: [];
         },
+        {
+            name: 'createCollection';
+            discriminator: [156, 251, 92, 54, 233, 2, 16, 82];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'coreCollection';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'collection';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [99, 111, 108, 108, 101, 99, 116, 105, 111, 110];
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.symbol';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'metaplexProgram';
+                    address: 'CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d';
+                },
+                {
+                    name: 'tokenProgram';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+                },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'createCollectionArgs';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'createUser';
             discriminator: [108, 227, 130, 130, 252, 109, 75, 218];
@@ -825,6 +883,158 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'mintTicket';
+            discriminator: [159, 167, 223, 60, 138, 6, 23, 29];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'nft';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [110, 102, 116];
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.number';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'verifier';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'asset';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'nftMint';
+                    writable: true;
+                },
+                {
+                    name: 'collection';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [99, 111, 108, 108, 101, 99, 116, 105, 111, 110];
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.collection_symbol';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'coreCollection';
+                    writable: true;
+                },
+                {
+                    name: 'trdMint';
+                    writable: true;
+                },
+                {
+                    name: 'userTrdAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'trdMint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    name: 'userNftAta';
+                    writable: true;
+                },
+                {
+                    name: 'metaplexProgram';
+                    address: 'CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d';
+                },
+                {
+                    name: 'tokenProgram';
+                    address: 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
+                },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'mintTicketArgs';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'openOrder';
             discriminator: [206, 88, 88, 143, 38, 136, 50, 224];
@@ -1204,6 +1414,35 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'resolveMarketV1';
+            discriminator: [67, 202, 40, 49, 111, 136, 234, 183];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'market';
+                    writable: true;
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'winningDirection';
+                    type: {
+                        defined: {
+                            name: 'winningDirection';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'settleOrder';
             discriminator: [80, 74, 204, 34, 12, 183, 66, 66];
@@ -1942,6 +2181,14 @@ export type TriadProtocol = {
         }
     ];
     accounts: [
+        {
+            name: 'baseCollectionV1';
+            discriminator: [0, 0, 0, 0, 0, 0, 0, 0];
+        },
+        {
+            name: 'collection';
+            discriminator: [48, 160, 232, 205, 191, 207, 26, 141];
+        },
         {
             name: 'market';
             discriminator: [219, 190, 213, 55, 0, 227, 198, 154];
@@ -1950,6 +2197,10 @@ export type TriadProtocol = {
             name: 'marketV2';
             discriminator: [27, 60, 50, 75, 191, 193, 86, 227];
         },
+        {
+            name: 'nft';
+            discriminator: [88, 10, 146, 176, 101, 11, 40, 217];
+        },
         {
             name: 'stakeV2';
             discriminator: [207, 98, 130, 13, 118, 181, 238, 47];
@@ -2093,6 +2344,11 @@ export type TriadProtocol = {
             code: 6019;
             name: 'concurrentTransaction';
             msg: 'Concurrent transaction';
+        },
+        {
+            code: 6020;
+            name: 'collectionFull';
+            msg: 'Collection is full';
         }
     ];
     types: [
@@ -2116,6 +2372,42 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'baseCollectionV1';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'key';
+                        type: {
+                            defined: {
+                                name: 'key';
+                            };
+                        };
+                    },
+                    {
+                        name: 'updateAuthority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'name';
+                        type: 'string';
+                    },
+                    {
+                        name: 'uri';
+                        type: 'string';
+                    },
+                    {
+                        name: 'numMinted';
+                        type: 'u32';
+                    },
+                    {
+                        name: 'currentSize';
+                        type: 'u32';
+                    }
+                ];
+            };
+        },
         {
             name: 'claimStakeRewardsArgs';
             type: {
@@ -2132,6 +2424,60 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'collection';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'authority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'bump';
+                        type: 'u8';
+                    },
+                    {
+                        name: 'symbol';
+                        type: 'string';
+                    },
+                    {
+                        name: 'minted';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'supply';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'padding';
+                        type: {
+                            array: ['u8', 64];
+                        };
+                    }
+                ];
+            };
+        },
+        {
+            name: 'createCollectionArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'name';
+                        type: 'string';
+                    },
+                    {
+                        name: 'symbol';
+                        type: 'string';
+                    },
+                    {
+                        name: 'supply';
+                        type: 'u64';
+                    }
+                ];
+            };
+        },
         {
             name: 'createUserArgs';
             type: {
@@ -2174,6 +2520,32 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'key';
+            type: {
+                kind: 'enum';
+                variants: [
+                    {
+                        name: 'uninitialized';
+                    },
+                    {
+                        name: 'assetV1';
+                    },
+                    {
+                        name: 'hashedAssetV1';
+                    },
+                    {
+                        name: 'pluginHeaderV1';
+                    },
+                    {
+                        name: 'pluginRegistryV1';
+                    },
+                    {
+                        name: 'collectionV1';
+                    }
+                ];
+            };
+        },
         {
             name: 'market';
             type: {
@@ -2518,6 +2890,45 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'mintTicketArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'collectionSymbol';
+                        type: 'string';
+                    },
+                    {
+                        name: 'discount';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'isBoosted';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'number';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'rarity';
+                        type: {
+                            defined: {
+                                name: 'rarity';
+                            };
+                        };
+                    }
+                ];
+            };
+        },
+        {
+            name: 'nft';
+            type: {
+                kind: 'struct';
+                fields: [];
+            };
+        },
         {
             name: 'openOrderArgs';
             type: {
@@ -2802,6 +3213,32 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'rarity';
+            type: {
+                kind: 'enum';
+                variants: [
+                    {
+                        name: 'common';
+                    },
+                    {
+                        name: 'uncommon';
+                    },
+                    {
+                        name: 'rare';
+                    },
+                    {
+                        name: 'epic';
+                    },
+                    {
+                        name: 'legendary';
+                    },
+                    {
+                        name: 'mythic';
+                    }
+                ];
+            };
+        },
         {
             name: 'resolvedQuestion';
             type: {

package/dist/utils/constants.d.ts

@@ -5,3 +5,4 @@ export declare const VERIFIER: PublicKey;
 export declare const TRD_MINT: PublicKey;
 export declare const TRIAD_ADMIN: PublicKey;
 export declare const SOL_MINT: PublicKey;
+export declare const TICKET_CORE_COLLECTION: PublicKey;

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
+exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.STAKE_VAULT_NAME = 'Triad Share 1';
 exports.TRD_DECIMALS = 6;
@@ -8,3 +8,4 @@ exports.VERIFIER = new web3_js_1.PublicKey('42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1R
 exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV');
 exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR');
 exports.SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
+exports.TICKET_CORE_COLLECTION = new web3_js_1.PublicKey('BaqopH1VXYUCT6VsojbTibVcd3k5jpGGT6296HFb6fVa');

package/dist/utils/jup-swap.js

@@ -18,7 +18,7 @@ const web3_js_1 = require("@solana/web3.js");
 const jupSwap = ({ connection, wallet, inToken, outToken, amount }) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     try {
-        const quoteResponse = yield axios_1.default.get(`https://quote-api.jup.ag/v6/quote?inputMint=${inToken}&outputMint=${outToken}&amount=${amount}&slippageBps=10`);
+        const quoteResponse = yield axios_1.default.get(`https://quote-api.jup.ag/v6/quote?inputMint=${inToken}&outputMint=${outToken}&amount=${amount}&slippageBps=100`);
         const { data: quoteData } = quoteResponse;
         const swapResponse = yield axios_1.default.post('https://quote-api.jup.ag/v6/swap-instructions', {
             userPublicKey: wallet,

package/dist/utils/sendVersionedTransaction.d.ts

@@ -3,5 +3,5 @@ import { RpcOptions } from '../types';
 import { AddressLookupTableAccount } from '@solana/web3.js';
 import { AnchorProvider } from '@coral-xyz/anchor';
 import { Keypair } from '@solana/web3.js';
-declare const sendVersionedTransaction: (provider: AnchorProvider, ixs: TransactionInstruction[], options?: RpcOptions, payer?: Keypair, addressLookupTableAccounts?: AddressLookupTableAccount[]) => Promise<string>;
+declare const sendVersionedTransaction: (provider: AnchorProvider, ixs: TransactionInstruction[], options?: RpcOptions, payer?: Keypair, addressLookupTableAccounts?: AddressLookupTableAccount[], verifier?: Keypair) => Promise<string>;
 export default sendVersionedTransaction;

package/dist/utils/sendVersionedTransaction.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
-const sendVersionedTransaction = (provider, ixs, options, payer, addressLookupTableAccounts) => __awaiter(void 0, void 0, void 0, function* () {
+const sendVersionedTransaction = (provider, ixs, options, payer, addressLookupTableAccounts, verifier) => __awaiter(void 0, void 0, void 0, function* () {
     if (options === null || options === void 0 ? void 0 : options.microLamports) {
         ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: options.microLamports
@@ -22,10 +22,16 @@ const sendVersionedTransaction = (provider, ixs, options, payer, addressLookupTa
         recentBlockhash: blockhash,
         payerKey: provider.publicKey
     }).compileToV0Message(addressLookupTableAccounts));
+    let signers = [];
     if (payer) {
         tx.sign([payer]);
+        signers.push(payer);
     }
-    return provider.sendAndConfirm(tx, payer ? [payer] : [], {
+    if (verifier) {
+        tx.sign([verifier]);
+        signers.push(verifier);
+    }
+    return provider.sendAndConfirm(tx, signers, {
         skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
         commitment: 'confirmed'
     });

package/package.json

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