@triadxyz/triad-protocol 3.1.1-beta → 3.1.2-beta

package/dist/poseidon.d.ts

@@ -1,49 +1,43 @@
 import { Program } from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { AddTraderPoseidonArgs, RemoveTraderPoseidonArgs, TransferPoseidonArgs, WithdrawPoseidonArgs } from './types/poseidon';
 export default class Poseidon {
     private program;
-    constructor(program: Program<TriadProtocol>);
+    private rpcOptions;
+    constructor(program: Program<TriadProtocol>, rpcOptions: RpcOptions);
     /**
      * Transfer Poseidon
      * @param args.poseidonAsset - Poseidon Asset
      * @param args.ticketAsset - Ticket Asset
      * @param args.ticketNumber - Ticket Number
-     *
-     * @param options - RPC options
-     *
      */
-    transferPoseidon(args: TransferPoseidonArgs[], options?: RpcOptions): Promise<string>;
+    transferPoseidon(poseidons: {
+        poseidonAsset: PublicKey;
+        ticketAsset: PublicKey;
+        ticketNumber: number;
+    }[]): Promise<string>;
     /**
      * Withdraw Poseidon
-     * @param args.poseidonAsset - Poseidon Asset - CORE PublicKey
-     * @param args.nft - NFT Poseidon Number
-     *
-     * @param options - RPC options
+     * @param poseidonAsset - Poseidon Asset - CORE PublicKey
+     * @param nft - NFT Poseidon Number
      */
-    withdrawPoseidon({ poseidonAsset, nft }: WithdrawPoseidonArgs, options?: RpcOptions): Promise<string>;
+    withdrawPoseidon(poseidonAsset: PublicKey, nft: number): Promise<string>;
     /**
      * Collect Royalty
-     * @param collection - Collection Symbol
-     *
-     * @param options - RPC options
+     * @param collectionSymbol - Collection Symbol
      */
-    collectRoyalty(collection: string, options?: RpcOptions): Promise<string>;
+    collectRoyalty(collectionSymbol: string): Promise<string>;
     /**
      * Add Trader Poseidon
-     * @param args.user - User
-     * @param args.poseidonAsset - Poseidon Asset
-     *
-     * @param options - RPC options
+     * @param user - User Public Key
+     * @param poseidonAsset - Poseidon Asset
      */
-    addTraderPoseidon({ user, poseidonAsset }: AddTraderPoseidonArgs, options?: RpcOptions): Promise<string>;
+    addTraderPoseidon(user: PublicKey, poseidonAsset: PublicKey): Promise<string>;
     /**
      * Remove Trader Poseidon
-     * @param args.user - User
-     * @param args.poseidonAsset - Poseidon Asset
-     *
-     * @param options - RPC options
+     * @param user - User Public Key
+     * @param poseidonAsset - Poseidon Asset
      */
-    removeTraderPoseidon({ user, poseidonAsset }: RemoveTraderPoseidonArgs, options?: RpcOptions): Promise<string>;
+    removeTraderPoseidon(user: PublicKey, poseidonAsset: PublicKey): Promise<string>;
 }

package/dist/poseidon.js

@@ -14,126 +14,120 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const constants_1 = require("./utils/constants");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const poseidon_1 = require("./utils/pda/poseidon");
 const pda_1 = require("./utils/pda");
+const pda_2 = require("./utils/pda");
 class Poseidon {
-    constructor(program) {
+    constructor(program, rpcOptions) {
         this.program = program;
+        this.rpcOptions = rpcOptions;
     }
     /**
      * Transfer Poseidon
      * @param args.poseidonAsset - Poseidon Asset
      * @param args.ticketAsset - Ticket Asset
      * @param args.ticketNumber - Ticket Number
-     *
-     * @param options - RPC options
-     *
      */
-    transferPoseidon(args, options) {
+    transferPoseidon(poseidons) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            for (const arg of args) {
+            for (const poseidon of poseidons) {
                 ixs.push(yield this.program.methods
                     .transferPoseidon()
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    nft: (0, poseidon_1.getNftPDA)(this.program.programId, arg.ticketNumber),
-                    poseidonAsset: arg.poseidonAsset,
-                    ticketAsset: arg.ticketAsset,
-                    poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
-                    ticketCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL),
+                    nft: (0, pda_1.getNftPDA)(this.program.programId, poseidon.ticketNumber),
+                    poseidonAsset: poseidon.poseidonAsset,
+                    ticketAsset: poseidon.ticketAsset,
+                    poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
+                    ticketCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL),
                     coreTicketCollection: constants_1.TICKET_CORE_COLLECTION,
                     corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Withdraw Poseidon
-     * @param args.poseidonAsset - Poseidon Asset - CORE PublicKey
-     * @param args.nft - NFT Poseidon Number
-     *
-     * @param options - RPC options
+     * @param poseidonAsset - Poseidon Asset - CORE PublicKey
+     * @param nft - NFT Poseidon Number
      */
-    withdrawPoseidon({ poseidonAsset, nft }, options) {
+    withdrawPoseidon(poseidonAsset, nft) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .withdrawPoseidon()
-                .accounts({
-                signer: this.program.provider.publicKey,
-                nft: (0, poseidon_1.getPoseidonPDA)(this.program.programId, nft),
-                poseidonAsset,
-                poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
-                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .withdrawPoseidon()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    nft: (0, pda_1.getPoseidonPDA)(this.program.programId, nft),
+                    poseidonAsset,
+                    poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
+                    corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Collect Royalty
-     * @param collection - Collection Symbol
-     *
-     * @param options - RPC options
+     * @param collectionSymbol - Collection Symbol
      */
-    collectRoyalty(collection, options) {
+    collectRoyalty(collectionSymbol) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .collectRoyalty()
-                .accounts({
-                signer: this.program.provider.publicKey,
-                collection: (0, poseidon_1.getCollectionPDA)(this.program.programId, collection)
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .collectRoyalty()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    collection: (0, pda_1.getCollectionPDA)(this.program.programId, collectionSymbol)
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Add Trader Poseidon
-     * @param args.user - User
-     * @param args.poseidonAsset - Poseidon Asset
-     *
-     * @param options - RPC options
+     * @param user - User Public Key
+     * @param poseidonAsset - Poseidon Asset
      */
-    addTraderPoseidon({ user, poseidonAsset }, options) {
+    addTraderPoseidon(user, poseidonAsset) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .addTraderPoseidon()
-                .accounts({
-                poseidonAsset,
-                userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
-                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
-                poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .addTraderPoseidon()
+                    .accounts({
+                    poseidonAsset,
+                    userTrade: (0, pda_2.getUserTradePDA)(this.program.programId, user),
+                    corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
+                    poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
      * Remove Trader Poseidon
-     * @param args.user - User
-     * @param args.poseidonAsset - Poseidon Asset
-     *
-     * @param options - RPC options
+     * @param user - User Public Key
+     * @param poseidonAsset - Poseidon Asset
      */
-    removeTraderPoseidon({ user, poseidonAsset }, options) {
+    removeTraderPoseidon(user, poseidonAsset) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .removeTraderPoseidon()
-                .accounts({
-                userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
-                poseidonAsset,
-                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
-                poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .removeTraderPoseidon()
+                    .accounts({
+                    userTrade: (0, pda_2.getUserTradePDA)(this.program.programId, user),
+                    poseidonAsset,
+                    corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
+                    poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
 }

package/dist/stake.d.ts

@@ -2,24 +2,21 @@ import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { UpdateStakeVaultArgs } from './types/stake';
 export default class Stake {
     private program;
-    constructor(program: Program<TriadProtocol>);
+    private rpcOptions;
+    constructor(program: Program<TriadProtocol>, rpcOptions: RpcOptions);
     /**
      * Get all Stake Vaults
-     *
      */
-    getStakeVaults(): Promise<import("./types/stake").StakeVault[]>;
+    getStakeVaults(): Promise<import("./types").StakeVault[]>;
     /**
      * Get all Stakes
-     *
      */
-    getStakes(): Promise<import("./types/stake").Stake[]>;
+    getStakes(): Promise<import("./types").Stake[]>;
     /**
      * Get Stake By Wallet
      * @param wallet - User wallet
-     *
      */
     getStakeByWallet(wallet: PublicKey): Promise<{
         available: number;
@@ -32,44 +29,35 @@ export default class Stake {
     /**
      * Get Unstake By Wallet
      * @param wallet - User wallet
-     *
      */
-    getUnstakeByWallet(wallet: PublicKey): Promise<import("./types/stake").Unstake[]>;
+    getUnstakeByWallet(wallet: PublicKey): Promise<import("./types").Unstake[]>;
     /**
-     *  Stake Token
-     *  @param amount - Amount to stake
-     *
-     *  @param options - RPC options
-     *
+     * Stake Token
+     * @param amount - Amount to stake
      */
-    stakeToken(amount: number, options?: RpcOptions): Promise<string>;
+    stakeToken(amount: number): Promise<string>;
     /**
-     *  Update Stake Vault
-     *  @param args.amount - Reward amount to deposit (optional)
-     *  @param args.isLocked - is locked stake vault (optional)
-     *
-     *  @param options - RPC options
-     *
+     * Update Stake Vault
+     * @param amount - Reward amount to deposit
      */
-    updateStakeVault({ amount, isLocked }: UpdateStakeVaultArgs, options?: RpcOptions): Promise<string>;
+    addStakeVaultRewards(amount: number): Promise<string>;
     /**
-     *  Request Unstake
-     *  @param amount - Amount to unstake
-     *
-     *  @param options - RPC options
-     *
+     * Update Stake Vault Is Locked
+     * @param isLocked - Whether the stake vault is locked
      */
-    requestUnstake(amount: number, options?: RpcOptions): Promise<string>;
+    updateStakeVaultIsLocked(isLocked: boolean): Promise<string>;
     /**
-     *  Unstake Token
-     *  @param options - RPC options
-     *
+     * Request Unstake
+     * @param amount - Amount to unstake
      */
-    unstakeToken(unstakePDA: PublicKey, options?: RpcOptions): Promise<string>;
+    requestUnstake(amount: number): Promise<string>;
     /**
-     *  Claim Stake Rewards
-     *  @param options - RPC options
-     *
+     * Unstake Token
+     * @param unstakePDA - Unstake Public Key
      */
-    claimStakeRewards(options?: RpcOptions): Promise<string>;
+    unstakeToken(unstakePDA: PublicKey): Promise<string>;
+    /**
+     * Claim Stake Rewards
+     */
+    claimStakeRewards(): Promise<string>;
 }

package/dist/stake.js

@@ -14,16 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
 const helpers_1 = require("./utils/helpers");
-const stake_1 = require("./utils/pda/stake");
+const pda_1 = require("./utils/pda");
 const constants_1 = require("./utils/constants");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 class Stake {
-    constructor(program) {
+    constructor(program, rpcOptions) {
         this.program = program;
+        this.rpcOptions = rpcOptions;
     }
     /**
      * Get all Stake Vaults
-     *
      */
     getStakeVaults() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -33,7 +33,6 @@ class Stake {
     }
     /**
      * Get all Stakes
-     *
      */
     getStakes() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -44,12 +43,11 @@ class Stake {
     /**
      * Get Stake By Wallet
      * @param wallet - User wallet
-     *
      */
     getStakeByWallet(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
             const stake = yield this.program.account.stakeV3
-                .fetch((0, stake_1.getStakePDA)(this.program.programId, wallet))
+                .fetch((0, pda_1.getStakePDA)(this.program.programId, wallet))
                 .then((stake) => (0, helpers_1.formatStake)(stake));
             return Object.assign(Object.assign({}, stake), { available: (0, helpers_1.calculateStakeRewards)(stake) });
         });
@@ -57,7 +55,6 @@ class Stake {
     /**
      * Get Unstake By Wallet
      * @param wallet - User wallet
-     *
      */
     getUnstakeByWallet(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -73,107 +70,110 @@ class Stake {
         });
     }
     /**
-     *  Stake Token
-     *  @param amount - Amount to stake
-     *
-     *  @param options - RPC options
-     *
+     * Stake Token
+     * @param amount - Amount to stake
      */
-    stakeToken(amount, options) {
+    stakeToken(amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .stakeToken({
-                amount: new anchor_1.BN(amount * Math.pow(10, 6))
-            })
-                .accounts({
-                mint: constants_1.TRD_MINT
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .stakeToken({
+                    amount: new anchor_1.BN(amount * Math.pow(10, 6))
+                })
+                    .accounts({
+                    mint: constants_1.TRD_MINT
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
-     *  Update Stake Vault
-     *  @param args.amount - Reward amount to deposit (optional)
-     *  @param args.isLocked - is locked stake vault (optional)
-     *
-     *  @param options - RPC options
-     *
+     * Update Stake Vault
+     * @param amount - Reward amount to deposit
      */
-    updateStakeVault({ amount, isLocked }, options) {
+    addStakeVaultRewards(amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .updateStakeVault({
-                amount,
-                isLocked
-            })
-                .accounts({
-                mint: constants_1.TRD_MINT
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .addStakeVaultRewards(new anchor_1.BN(amount * Math.pow(10, 6)))
+                    .accounts({
+                    mint: constants_1.TRD_MINT
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
-     *  Request Unstake
-     *  @param amount - Amount to unstake
-     *
-     *  @param options - RPC options
-     *
+     * Update Stake Vault Is Locked
+     * @param isLocked - Whether the stake vault is locked
      */
-    requestUnstake(amount, options) {
+    updateStakeVaultIsLocked(isLocked) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .requestUnstake({
-                amount: new anchor_1.BN(amount * Math.pow(10, 6)),
-                ts: new anchor_1.BN(Date.now())
-            })
-                .accounts({
-                signer: this.program.provider.publicKey,
-                mint: constants_1.TRD_MINT
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .updateStakeVaultIsLocked(isLocked)
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
-     *  Unstake Token
-     *  @param options - RPC options
-     *
+     * Request Unstake
+     * @param amount - Amount to unstake
      */
-    unstakeToken(unstakePDA, options) {
+    requestUnstake(amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .unstakeToken()
-                .accounts({
-                signer: this.program.provider.publicKey,
-                unstake: unstakePDA,
-                mint: constants_1.TRD_MINT
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .requestUnstake({
+                    amount: new anchor_1.BN(amount * Math.pow(10, 6)),
+                    ts: new anchor_1.BN(Date.now())
+                })
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    mint: constants_1.TRD_MINT
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
     /**
-     *  Claim Stake Rewards
-     *  @param options - RPC options
-     *
+     * Unstake Token
+     * @param unstakePDA - Unstake Public Key
      */
-    claimStakeRewards(options) {
+    unstakeToken(unstakePDA) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            ixs.push(yield this.program.methods
-                .claimStakeRewards()
-                .accounts({
-                signer: this.program.provider.publicKey,
-                mint: constants_1.TRD_MINT
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+            const ixs = [
+                yield this.program.methods
+                    .unstakeToken()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    unstake: unstakePDA,
+                    mint: constants_1.TRD_MINT
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Claim Stake Rewards
+     */
+    claimStakeRewards() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [
+                yield this.program.methods
+                    .claimStakeRewards()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    mint: constants_1.TRD_MINT
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
 }