@triadxyz/triad-protocol 1.9.7-beta → 1.9.9-beta

package/dist/index.js

@@ -15,20 +15,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
 const trade_1 = __importDefault(require("./trade"));
-const pda_1 = require("./utils/pda");
+const poseidon_1 = require("./utils/pda/poseidon");
 const stake_1 = __importDefault(require("./stake"));
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const constants_1 = require("./utils/constants");
-const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
-const trade_2 = require("./utils/pda/trade");
+const sendMethod_1 = __importDefault(require("./utils/sendMethod"));
+const pda_1 = require("./utils/pda");
 class TriadProtocolClient {
     constructor(connection, wallet) {
         this.provider = new anchor_1.AnchorProvider(connection, wallet, {
             commitment: 'confirmed'
         });
         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);
+        this.trade = new trade_1.default(this.program);
+        this.stake = new stake_1.default(this.program);
     }
     /**
      * Transfer Poseidon
@@ -48,18 +48,18 @@ class TriadProtocolClient {
                     .transferPoseidon()
                     .accounts({
                     signer: this.provider.wallet.publicKey,
-                    nft: (0, pda_1.getNftPDA)(this.program.programId, arg.ticketNumber),
+                    nft: (0, poseidon_1.getNftPDA)(this.program.programId, arg.ticketNumber),
                     poseidonAsset: arg.poseidonAsset,
                     ticketAsset: arg.ticketAsset,
                     verifier: constants_1.VERIFIER,
-                    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),
+                    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),
                     coreTicketCollection: constants_1.TICKET_CORE_COLLECTION,
                     corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, [], verifier);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options, [], verifier);
         });
     }
     /**
@@ -70,11 +70,11 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     withdrawPoseidon({ poseidonAsset, nft }, options) {
-        return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawPoseidon().accounts({
+        return (0, sendMethod_1.default)(this.program.methods.withdrawPoseidon().accounts({
             signer: this.provider.wallet.publicKey,
-            nft: (0, pda_1.getPoseidonPDA)(this.program.programId, nft),
+            nft: (0, poseidon_1.getPoseidonPDA)(this.program.programId, nft),
             poseidonAsset,
-            poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
+            poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
             corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
         }), options);
     }
@@ -85,9 +85,9 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     collectRoyalty(collection, options) {
-        return (0, sendTransactionWithOptions_1.default)(this.program.methods.collectRoyalty().accounts({
+        return (0, sendMethod_1.default)(this.program.methods.collectRoyalty().accounts({
             signer: this.provider.wallet.publicKey,
-            collection: (0, pda_1.getCollectionPDA)(this.program.programId, collection)
+            collection: (0, poseidon_1.getCollectionPDA)(this.program.programId, collection)
         }), options);
     }
     /**
@@ -98,11 +98,11 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     addTraderPoseidon({ user, poseidonAsset }, options) {
-        return (0, sendTransactionWithOptions_1.default)(this.program.methods.addTraderPoseidon().accounts({
+        return (0, sendMethod_1.default)(this.program.methods.addTraderPoseidon().accounts({
             poseidonAsset,
-            userTrade: (0, trade_2.getUserTradePDA)(this.program.programId, user),
+            userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
             corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
-            poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
+            poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
         }), options);
     }
     /**
@@ -112,11 +112,11 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     removeTraderPoseidon({ user, poseidonAsset }, options) {
-        return (0, sendTransactionWithOptions_1.default)(this.program.methods.removeTraderPoseidon().accounts({
-            userTrade: (0, trade_2.getUserTradePDA)(this.program.programId, user),
+        return (0, sendMethod_1.default)(this.program.methods.removeTraderPoseidon().accounts({
+            userTrade: (0, pda_1.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)
+            poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
         }), options);
     }
 }

package/dist/stake.d.ts

@@ -1,12 +1,11 @@
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
 import { UpdateStakeVaultArgs, RequestWithdrawArgs, WithdrawArgs, Stake as StakeResponse, StakeTokenArgs } from './types/stake';
 export default class Stake {
     private program;
-    private provider;
-    constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
+    constructor(program: Program<TriadProtocol>);
     /**
      * Get all Stake Vaults
      *

package/dist/stake.js

@@ -17,11 +17,10 @@ const helpers_1 = require("./utils/helpers");
 const stake_1 = require("./utils/pda/stake");
 const constants_1 = require("./utils/constants");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
+const sendMethod_1 = __importDefault(require("./utils/sendMethod"));
 class Stake {
-    constructor(program, provider) {
+    constructor(program) {
         this.program = program;
-        this.provider = provider;
     }
     /**
      * Get all Stake Vaults
@@ -81,18 +80,15 @@ class Stake {
      *
      */
     stakeToken({ name, wallet, amount }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods
-                .stakeToken({
-                name,
-                amount: new anchor_1.BN(amount * Math.pow(10, 6)),
-                stakeVault: constants_1.STAKE_VAULT_NAME
-            })
-                .accounts({
-                signer: wallet,
-                mint: constants_1.TRD_MINT
-            }), options);
-        });
+        return (0, sendMethod_1.default)(this.program.methods
+            .stakeToken({
+            name,
+            amount: new anchor_1.BN(amount * Math.pow(10, 6))
+        })
+            .accounts({
+            signer: wallet,
+            mint: constants_1.TRD_MINT
+        }), options);
     }
     /**
      *  Update Stake Vault
@@ -103,18 +99,15 @@ class Stake {
      *
      */
     updateStakeVault({ amount, isLocked }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods
-                .updateStakeVault({
-                amount,
-                isLocked,
-                stakeVault: constants_1.STAKE_VAULT_NAME
-            })
-                .accounts({
-                signer: this.provider.publicKey,
-                mint: constants_1.TRD_MINT
-            }), options);
-        });
+        return (0, sendMethod_1.default)(this.program.methods
+            .updateStakeVault({
+            amount,
+            isLocked
+        })
+            .accounts({
+            signer: this.program.provider.publicKey,
+            mint: constants_1.TRD_MINT
+        }), options);
     }
     /**
      *  Request Withdraw
@@ -128,16 +121,15 @@ class Stake {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             for (const nft of nfts) {
-                const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nft.name);
                 ixs.push(yield this.program.methods
                     .requestWithdrawStake()
                     .accounts({
                     signer: wallet,
-                    stake: stakePDA
+                    stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, nft.name)
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -150,17 +142,12 @@ class Stake {
      *
      */
     withdrawStake({ wallet, name, mint }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, constants_1.STAKE_VAULT_NAME);
-            const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, name);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawStake().accounts({
-                signer: wallet,
-                stake: stakePDA,
-                stakeVault: stakeVaultPDA,
-                admin: constants_1.TRIAD_ADMIN,
-                mint: mint
-            }), options);
-        });
+        return (0, sendMethod_1.default)(this.program.methods.withdrawStake().accounts({
+            signer: wallet,
+            stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, name),
+            admin: constants_1.TRIAD_ADMIN,
+            mint: mint
+        }), options);
     }
     /**
      *  Claim Stake Rewards
@@ -187,19 +174,16 @@ class Stake {
                 if (ixs.length >= 10) {
                     break;
                 }
-                const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, constants_1.STAKE_VAULT_NAME);
-                const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, stake.name);
                 ixs.push(yield this.program.methods
                     .claimStakeRewards()
                     .accounts({
                     signer: wallet,
                     mint: constants_1.TRD_MINT,
-                    stake: stakePDA,
-                    stakeVault: stakeVaultPDA
+                    stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, stake.name)
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
 }

package/dist/trade.d.ts

@@ -1,4 +1,4 @@
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, Order, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs } from './types/trade';
@@ -6,9 +6,8 @@ import { RpcOptions } from './types';
 import BN from 'bn.js';
 export default class Trade {
     private program;
-    private provider;
     decimals: number;
-    constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
+    constructor(program: Program<TriadProtocol>);
     /**
      * Get All Markets
      *
@@ -266,7 +265,7 @@ export default class Trade {
      * @param userTrades - User Trades
      *
      */
-    getUserTradeNonceWithSlots(userTrades: UserTrade[]): Promise<PublicKey>;
+    getUserTradeNonceWithSlots(userTrades: UserTrade[]): PublicKey;
     getUserTradeIxs(): Promise<{
         userTradePDA: PublicKey;
         ixs: TransactionInstruction[];