@triadxyz/triad-protocol 1.4.7-beta → 1.4.9-beta

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import Trade from './trade';
 import Stake from './stake';
-import { CreateUserArgs, MintTicketArgs, PrizeType, RpcOptions, TransferPoseidonArgs } from './types';
+import { RpcOptions, TransferPoseidonArgs } from './types';
 export default class TriadProtocolClient {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -11,325 +11,50 @@ export default class TriadProtocolClient {
     stake: Stake;
     constructor(connection: Connection, wallet: Wallet);
     /**
-     * Get User by wallet
+     * Get User by wallet address
      * @param wallet - User wallet
      *
      */
     getUser(wallet: PublicKey): Promise<import("./types").User>;
     /**
-     * Get User by wallet
-     * @param wallet - User wallet
+     * Get Users
      *
      */
     getUsers(): Promise<import("./types").User[]>;
     /**
-     * Check if user exists
-     * @param username - User name
-     *
-     */
-    hasUser(wallet: PublicKey): Promise<boolean>;
-    /**
-     * Get Refferal
-     * @param name - User name
+     * Get Refferal By Name
+     * @param name - Username
      *
      */
     getReferral(name: string): Promise<string>;
     /**
-     *  Create User
-     *  @param wallet - User wallet
-     *  @param name - user name
-     *  @param referral - user referral
-     *
-     *  @param options - RPC options
+     * Transfer Poseidon
+     * @param args.poseidonAsset - Poseidon Asset
+     * @param args.ticketAsset - Ticket Asset
+     * @param args.ticketNumber - Ticket Number
+     * @param verifier - Verifier
      *
-     */
-    createUser({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions): Promise<string>;
-    /**
-     * Create Collection
-     * @param args - Collection args
      * @param options - RPC options
      *
      */
-    createCollection(args: {
-        collectionName: string;
-        collectionSymbol: string;
-        supply: number;
-    }, options?: RpcOptions): Promise<string>;
-    mintTicket({ discount, isBoosted, rarity, verifier, nftMint }: MintTicketArgs, options?: RpcOptions): Promise<string>;
+    transferPoseidon(args: TransferPoseidonArgs[], verifier: Keypair, options?: RpcOptions): Promise<string>;
     /**
-     * Add Spin Prize
-     * @param args - Spin prize args
-     * @param options - RPC options
+     * Migrate Users
+     * @param users - Users public keys
      *
-     */
-    addSpinPrize(args: {
-        rangeMin: number;
-        rangeMax: number;
-        prizeType: PrizeType;
-        availableQuantity: number;
-    }, options?: RpcOptions): Promise<string>;
-    /**
-     * Claim Spin Token
-     * @param amount - Amount of tokens to claim
-     * @param verifier - Verifier keypair
      * @param options - RPC options
      *
      */
-    claimSpinToken(amount: number, verifier: Keypair, options?: RpcOptions): Promise<string>;
+    migrateUsers(users: PublicKey[], options?: RpcOptions): Promise<string>;
     /**
-     * Spin Wheel
-     * @param isSol - Whether to pay with SOL or token
-     * @param verifier - Verifier keypair
-     * @param prizeType - Prize type
-     * @param options - RPC options
+     * Withdraw Poseidon
+     * @param args.poseidonAsset - Poseidon Asset - CORE PublicKey
+     * @param args.nft - NFT Poseidon Number
      *
-     */
-    spinWheel(args: {
-        isSol: boolean;
-        prizeType: PrizeType;
-        verifier: Keypair;
-    }, options?: RpcOptions): Promise<string>;
-    /**
-     * Get Spin Wheel
-     *
-     */
-    getSpinWheel(): Promise<({
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        none: Record<string, never>;
-    }) | ({
-        none?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        undead: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        ticket: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        honeyland: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        trd100: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        trd50: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        flip: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        pengu: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        ore: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        lucksea: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trident2000?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        trd5: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident500?: never;
-        trd10000?: never;
-    } & {
-        trident2000: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trd10000?: never;
-    } & {
-        trident500: Record<string, never>;
-    }) | ({
-        none?: never;
-        undead?: never;
-        ticket?: never;
-        honeyland?: never;
-        trd100?: never;
-        trd50?: never;
-        flip?: never;
-        pengu?: never;
-        ore?: never;
-        lucksea?: never;
-        trd5?: never;
-        trident2000?: never;
-        trident500?: never;
-    } & {
-        trd10000: Record<string, never>;
-    })>;
-    /**
-     * Buy Token
-     * @param amount - Amount of tokens to buy
      * @param options - RPC options
-     *
      */
-    buyToken(amount: number, options?: RpcOptions): Promise<string>;
-    /**
-     * Transfer Poseidon
-     * @param args - Transfer Poseidon args
-     * @param options - RPC options
-     *
-     */
-    transferPoseidon({ poseidonAsset, ticketAsset, verifier, ticketNumber }: TransferPoseidonArgs, options?: RpcOptions): Promise<string>;
+    withdrawPoseidon({ poseidonAsset, nft }: {
+        poseidonAsset: PublicKey;
+        nft: number;
+    }, options?: RpcOptions): Promise<string>;
 }

package/dist/index.js

@@ -13,28 +13,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
 const trade_1 = __importDefault(require("./trade"));
 const helpers_1 = require("./utils/helpers");
 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");
+const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
 class TriadProtocolClient {
     constructor(connection, wallet) {
-        this.provider = new anchor_1.AnchorProvider(connection, wallet, {
-            commitment: 'confirmed'
-        });
+        this.provider = new anchor_1.AnchorProvider(connection, wallet);
         this.program = new anchor_1.Program(idl_triad_protocol_json_1.default, this.provider);
         this.trade = new trade_1.default(this.program, this.provider);
         this.stake = new stake_1.default(this.program, this.provider);
     }
     /**
-     * Get User by wallet
+     * Get User by wallet address
      * @param wallet - User wallet
      *
      */
@@ -45,8 +41,7 @@ class TriadProtocolClient {
         });
     }
     /**
-     * Get User by wallet
-     * @param wallet - User wallet
+     * Get Users
      *
      */
     getUsers() {
@@ -58,24 +53,8 @@ class TriadProtocolClient {
         });
     }
     /**
-     * Check if user exists
-     * @param username - User name
-     *
-     */
-    hasUser(wallet) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.program.account.user.fetch((0, pda_1.getUserPDA)(this.program.programId, wallet));
-                return true;
-            }
-            catch (_a) {
-                return false;
-            }
-        });
-    }
-    /**
-     * Get Refferal
-     * @param name - User name
+     * Get Refferal By Name
+     * @param name - Username
      *
      */
     getReferral(name) {
@@ -94,224 +73,83 @@ class TriadProtocolClient {
                 }
                 return '';
             }
-            catch (error) {
-                console.error('Error fetching referral:', error);
+            catch (_a) {
                 return '';
             }
         });
     }
     /**
-     *  Create User
-     *  @param wallet - User wallet
-     *  @param name - user name
-     *  @param referral - user referral
-     *
-     *  @param options - RPC options
+     * Transfer Poseidon
+     * @param args.poseidonAsset - Poseidon Asset
+     * @param args.ticketAsset - Ticket Asset
+     * @param args.ticketNumber - Ticket Number
+     * @param verifier - Verifier
      *
-     */
-    createUser({ wallet, name, referral }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods
-                .createUser({
-                name
-            })
-                .accounts({
-                signer: wallet,
-                referral
-            }), options);
-        });
-    }
-    /**
-     * Create Collection
-     * @param args - Collection args
      * @param options - RPC options
      *
      */
-    createCollection(args, options) {
+    transferPoseidon(args, verifier, 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({ 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 CollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL);
-            const collection = yield this.program.account.collection.fetch(CollectionPDA);
             const ixs = [];
-            ixs.push(yield this.program.methods
-                .mintTicket({
-                number: new anchor_1.BN(collection.minted),
-                collectionSymbol: constants_1.TICKET_COLLECTION_SYMBOL,
-                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());
-            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));
-        });
-    }
-    /**
-     * Add Spin Prize
-     * @param args - Spin prize args
-     * @param options - RPC options
-     *
-     */
-    addSpinPrize(args, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const method = this.program.methods
-                .addSpinPrize({
-                name: 'christmas',
-                rangeMin: new anchor_1.BN(args.rangeMin),
-                rangeMax: new anchor_1.BN(args.rangeMax),
-                prizeType: args.prizeType,
-                availableQuantity: new anchor_1.BN(args.availableQuantity)
-            })
-                .accounts({
-                signer: this.provider.wallet.publicKey
-            });
-            return (0, sendTransactionWithOptions_1.default)(method, options);
+            const PoseidonCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL);
+            const TicketCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL);
+            for (const arg of args) {
+                const NftPDA = (0, pda_1.getNftPDA)(this.program.programId, arg.ticketNumber);
+                ixs.push(yield this.program.methods
+                    .transferPoseidon()
+                    .accounts({
+                    signer: this.provider.wallet.publicKey,
+                    nft: NftPDA,
+                    poseidonAsset: arg.poseidonAsset,
+                    ticketAsset: arg.ticketAsset,
+                    verifier: constants_1.VERIFIER,
+                    poseidonCollection: PoseidonCollectionPDA,
+                    ticketCollection: TicketCollectionPDA,
+                    coreTicketCollection: constants_1.TICKET_CORE_COLLECTION,
+                    corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, [], verifier);
         });
     }
     /**
-     * Claim Spin Token
-     * @param amount - Amount of tokens to claim
-     * @param verifier - Verifier keypair
-     * @param options - RPC options
+     * Migrate Users
+     * @param users - Users public keys
      *
-     */
-    claimSpinToken(amount, verifier, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ix = yield this.program.methods
-                .claimSpinToken({
-                name: constants_1.SPIN_NAME,
-                amount: new anchor_1.BN(amount * Math.pow(10, 6))
-            })
-                .accounts({
-                signer: this.provider.wallet.publicKey,
-                verifier: verifier.publicKey,
-                mint: constants_1.TCMAS_MINT
-            })
-                .instruction();
-            return (0, sendVersionedTransaction_1.default)(this.provider, [ix], options, undefined, [], verifier);
-        });
-    }
-    /**
-     * Spin Wheel
-     * @param isSol - Whether to pay with SOL or token
-     * @param verifier - Verifier keypair
-     * @param prizeType - Prize type
      * @param options - RPC options
      *
      */
-    spinWheel(args, options) {
+    migrateUsers(users, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const spinPDA = (0, pda_1.getSpinPDA)(this.program.programId, constants_1.SPIN_NAME);
-            const ix = yield this.program.methods
-                .spinWheel({
-                isSol: args.isSol,
-                prizeType: args.prizeType
-            })
-                .accounts({
-                signer: this.provider.wallet.publicKey,
-                verifier: constants_1.VERIFIER,
-                spin: spinPDA,
-                mint: constants_1.TCMAS_MINT
-            })
-                .instruction();
-            return (0, sendVersionedTransaction_1.default)(this.provider, [ix], options, undefined, [], args.verifier);
-        });
-    }
-    /**
-     * Get Spin Wheel
-     *
-     */
-    getSpinWheel() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [spin] = yield this.program.account.spin.all();
-            const randomNumber = Math.floor(Math.random() * 1000000) + 1;
-            const prize = spin.account.prizes.find((p) => randomNumber >= p.rangeMin.toNumber() &&
-                randomNumber <= p.rangeMax.toNumber() &&
-                p.status.claimed);
-            if (!prize) {
-                return { none: {} };
+            const ixs = [];
+            for (const user of users) {
+                ixs.push(yield this.program.methods
+                    .migrateUser()
+                    .accounts({ user })
+                    .instruction());
             }
-            return prize.prizeType;
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, []);
         });
     }
     /**
-     * Buy Token
-     * @param amount - Amount of tokens to buy
-     * @param options - RPC options
+     * Withdraw Poseidon
+     * @param args.poseidonAsset - Poseidon Asset - CORE PublicKey
+     * @param args.nft - NFT Poseidon Number
      *
-     */
-    buyToken(amount, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const method = this.program.methods
-                .buyToken({
-                name: constants_1.SPIN_NAME,
-                amount: new anchor_1.BN(amount)
-            })
-                .accounts({
-                signer: this.provider.wallet.publicKey,
-                mint: constants_1.TCMAS_MINT
-            });
-            return (0, sendTransactionWithOptions_1.default)(method, options);
-        });
-    }
-    /**
-     * Transfer Poseidon
-     * @param args - Transfer Poseidon args
      * @param options - RPC options
-     *
      */
-    transferPoseidon({ poseidonAsset, ticketAsset, verifier, ticketNumber }, options) {
+    withdrawPoseidon({ poseidonAsset, nft }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
             const PoseidonCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL);
-            const TicketCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL);
-            const NftPDA = (0, pda_1.getNftPDA)(this.program.programId, ticketNumber);
-            ixs.push(yield this.program.methods
-                .transferPoseidon()
-                .accounts({
+            const NftPDA = (0, pda_1.getPoseidonPDA)(this.program.programId, nft);
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawPoseidon().accounts({
                 signer: this.provider.wallet.publicKey,
                 nft: NftPDA,
                 poseidonAsset,
-                ticketAsset,
-                verifier: constants_1.VERIFIER,
                 poseidonCollection: PoseidonCollectionPDA,
-                ticketCollection: TicketCollectionPDA,
-                coreTicketCollection: constants_1.TICKET_CORE_COLLECTION,
                 corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, [], verifier);
+            }), options);
         });
     }
 }