@triadxyz/triad-protocol 0.0.4-beta → 0.0.6-beta

package/dist/stake.d.ts

@@ -118,5 +118,5 @@ export default class Stake {
      *  @param nftName - Name of the nft
      *
      */
-    claimStakeRewards({ wallet, mint, week, stakeVault, nftName }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<any>;
+    claimStakeRewards({ wallet, mint, week, stakeVault, nftName }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/stake.js

@@ -72,13 +72,29 @@ class Stake {
                     let rewards = stake.dailyRewards
                         .slice(start, end)
                         .reduce((a, b) => a + b, 0);
+                    let allRewards = stake.dailyRewards.reduce((a, b) => a + b);
+                    stake.rewardsToClaim = 0;
+                    stake.dailyRewards.forEach((item, index) => {
+                        let week = 0;
+                        let limit = 6;
+                        if (!stake.weeklyRewardsPaid[week]) {
+                            stake.rewardsToClaim += item;
+                        }
+                        if (index === limit) {
+                            limit += 6;
+                            week + 1;
+                        }
+                    });
                     stake.weeklyRewards = rewards;
+                    stake.allRewards = allRewards;
                 }
                 catch (error) {
                     stake.apr = 0;
                     stake.dailyRewards = [];
                     stake.weeklyRewardsPaid = [];
                     stake.weeklyRewards = 0;
+                    stake.rewardsToClaim = 0;
+                    stake.allRewards = 0;
                 }
             }
             return myStakes;
@@ -392,9 +408,9 @@ class Stake {
             const NFTRewards = (0, helpers_1.getNFTRewardsAddressSync)(this.program.programId, Stake);
             const FromAta = (0, helpers_1.getATASync)(StakeVault, mint);
             const ToAta = (0, helpers_1.getATASync)(wallet, mint);
-            let method;
+            let ixs = [];
             for (let w of week) {
-                method = this.program.methods
+                ixs.push(yield this.program.methods
                     .claimStakeRewards({
                     week: w
                 })
@@ -406,16 +422,25 @@ class Stake {
                     nftRewards: NFTRewards,
                     stake: Stake,
                     stakeVault: StakeVault
-                });
+                })
+                    .instruction());
             }
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
-                method.postInstructions([
-                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: options.microLamports
-                    })
-                ]);
+                ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                    microLamports: options.microLamports
+                }));
             }
-            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
+            const { blockhash } = yield this.provider.connection.getLatestBlockhash();
+            const messageV0 = new web3_js_1.TransactionMessage({
+                payerKey: wallet,
+                recentBlockhash: blockhash,
+                instructions: ixs
+            }).compileToV0Message();
+            const tx = new web3_js_1.VersionedTransaction(messageV0);
+            return this.provider.sendAndConfirm(tx, [], {
+                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
+                commitment: 'confirmed'
+            });
         });
     }
 }

package/dist/test.js

@@ -204,3 +204,6 @@ const updateStakeRewards = () => __awaiter(void 0, void 0, void 0, function* ()
         console.log(`Failed chunks saved to ./src/utils/stake-season-1/stakes/2/failedChunks_${ts}.json`);
     }
 });
+triadProtocol.stake
+    .getStakeByWallet(new web3_js_1.PublicKey('E48CKgbZVpDzerQ7DdommgqNobRHLqHy8RUVi8HXkSHE'), constants_1.STAKE_SEASON_1)
+    .then(console.log);

package/dist/types/stake.d.ts

@@ -111,4 +111,6 @@ export type StakeResponse = {
     dailyRewards?: number[];
     weeklyRewardsPaid?: boolean[];
     weeklyRewards?: number;
+    rewardsToClaim?: number;
+    allRewards?: number;
 };

package/package.json

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