@triadxyz/triad-protocol 1.0.4-beta → 1.0.6-beta

package/dist/local-test.js

@@ -151,3 +151,13 @@ const resolveQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.trade.resolveQuestion(0);
     console.log(response);
 });
+const claimAllRewards = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.claimStakeRewards({
+        wallet: wallet.publicKey,
+        ranks: [],
+        collections: 1,
+        verifier: ''
+    });
+    console.log(response);
+});
+claimAllRewards();

package/dist/stake.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
@@ -74,14 +73,6 @@ export default class Stake {
      *
      */
     withdrawStake({ wallet, name, mint }: WithdrawArgs, options?: RpcOptions): Promise<any>;
-    /**
-     *  Claim Stake Rewards
-     *  @param wallet - User wallet
-     *  @param mint - NFT mint
-     *  @param nftName - Name of the nft
-     *
-     */
-    claimStakeRewards({ wallet, nftName, collections, rank }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<import("@solana/web3.js").Transaction>;
     /**
      *  Claim All Stake Rewards
      *  @param wallet - User wallet
@@ -89,7 +80,7 @@ export default class Stake {
      *  @param ranks - Tensor ranks
      *
      */
-    claimAllStakeRewards({ wallet, collections, ranks }: {
+    claimStakeRewards({ wallet, collections, ranks, verifier }: {
         wallet: PublicKey;
         collections: number;
         ranks: {
@@ -97,6 +88,7 @@ export default class Stake {
             name: string;
             rarityRankHrtt: number;
         }[];
+        verifier: string;
     }, options?: RpcOptions): Promise<string>;
     /**
      *  Update Boost

package/dist/stake.js

@@ -22,6 +22,7 @@ const base64_js_1 = require("base64-js");
 const getRarityRank_1 = __importDefault(require("./utils/getRarityRank"));
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
+const convertSecretKeyToKeypair_1 = require("./utils/convertSecretKeyToKeypair");
 class Stake {
     constructor(program, provider) {
         this.stakeVaultName = constants_1.STAKE_VAULT_NAME;
@@ -224,39 +225,6 @@ class Stake {
             }), options);
         });
     }
-    /**
-     *  Claim Stake Rewards
-     *  @param wallet - User wallet
-     *  @param mint - NFT mint
-     *  @param nftName - Name of the nft
-     *
-     */
-    claimStakeRewards({ wallet, nftName, collections, rank }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
-            const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nftName);
-            const method = this.program.methods
-                .claimStakeRewards({
-                collections,
-                rank
-            })
-                .accounts({
-                signer: wallet,
-                mint: constants_1.TRD_MINT,
-                stake: stakePDA,
-                stakeVault: stakeVaultPDA,
-                verifier: constants_1.VERIFIER
-            });
-            if (options === null || options === void 0 ? void 0 : options.microLamports) {
-                method.postInstructions([
-                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: options.microLamports
-                    })
-                ]);
-            }
-            return method.transaction();
-        });
-    }
     /**
      *  Claim All Stake Rewards
      *  @param wallet - User wallet
@@ -264,24 +232,29 @@ class Stake {
      *  @param ranks - Tensor ranks
      *
      */
-    claimAllStakeRewards({ wallet, collections, ranks }, options) {
+    claimStakeRewards({ wallet, collections, ranks, verifier }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const stakes = yield this.getStakes();
+            const stakes = yield this.getUserStakes(wallet);
             const ixs = [];
             for (const stake of stakes) {
                 const rank = (0, getRarityRank_1.default)(ranks, stake.mint, stake.name);
-                if (ixs.length >= 10) {
-                    break;
-                }
-                const tx = yield this.claimStakeRewards({
-                    wallet,
-                    nftName: stake.name,
+                const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
+                const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, stake.name);
+                ixs.push(yield this.program.methods
+                    .claimStakeRewards({
                     collections,
                     rank
-                });
-                ixs.push(...tx.instructions);
+                })
+                    .accounts({
+                    signer: wallet,
+                    mint: constants_1.TRD_MINT,
+                    stake: stakePDA,
+                    stakeVault: stakeVaultPDA,
+                    verifier: constants_1.VERIFIER
+                })
+                    .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, (0, convertSecretKeyToKeypair_1.convertSecretKeyToKeypair)(verifier));
         });
     }
     /**

package/dist/utils/sendVersionedTransaction.d.ts

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

package/dist/utils/sendVersionedTransaction.js

@@ -10,18 +10,22 @@ 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) => __awaiter(void 0, void 0, void 0, function* () {
+const sendVersionedTransaction = (provider, ixs, options, payer) => __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
         }));
     }
     const { blockhash } = yield provider.connection.getLatestBlockhash();
-    return provider.sendAndConfirm(new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
+    const tx = new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
         instructions: ixs,
         recentBlockhash: blockhash,
         payerKey: provider.publicKey
-    }).compileToV0Message()), [], {
+    }).compileToV0Message());
+    if (payer) {
+        tx.sign([payer]);
+    }
+    return provider.sendAndConfirm(tx, payer ? [payer] : [], {
         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.0.4-beta",
+  "version": "1.0.6-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",