@triadxyz/triad-protocol 0.3.4-beta → 0.3.6-beta

package/dist/stake.d.ts

@@ -14,7 +14,7 @@ export default class Stake {
     /**
      * Get Stake Rewards
      */
-    getStakeRewards({ wallet, mint, stakeVault, nftName, collections, rank }: ClaimStakeRewardsArgs): Promise<number>;
+    getStakeRewards({ wallet, stakeVault, nftName, collections, rank }: ClaimStakeRewardsArgs): Promise<number>;
     /**
      * Get Stake Vault by name
      * @param stakeVault - Stake Vault name
@@ -30,9 +30,26 @@ export default class Stake {
      * Get Stake by wallet
      * @param wallet - User wallet
      * @param stakeVault - Stake Vault name
+     * @param collections - NFT collections
      *
      */
-    getStakeByWallet(wallet: PublicKey, stakeVault: string): Promise<StakeResponse[]>;
+    getStakeByWallet(wallet: PublicKey, stakeVault: string, collections: number, ranks: {
+        onchainId: string;
+        name: string;
+        rarityRankHrtt: number;
+    }[]): Promise<{
+        available: number;
+        name: string;
+        stakeVault: string;
+        authority: string;
+        initTs: number;
+        withdrawTs: number;
+        mint: string;
+        claimedTs: number;
+        boost: boolean;
+        claimed: number;
+        amount: number;
+    }[]>;
     /**
      * Get Stakes by day
      * @param stakeVault - Stake Vault name
@@ -106,5 +123,5 @@ export default class Stake {
      *  @param nftName - Name of the nft
      *
      */
-    claimStakeRewards({ wallet, mint, stakeVault, nftName, collections, rank }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<string>;
+    claimStakeRewards({ wallet, stakeVault, nftName, collections, rank }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/stake.js

@@ -14,6 +14,7 @@ const web3_js_1 = require("@solana/web3.js");
 const helpers_1 = require("./utils/helpers");
 const constants_1 = require("./utils/constants");
 const base64_js_1 = require("base64-js");
+const getRarity_1 = require("./utils/getRarity");
 class Stake {
     constructor(program, provider) {
         this.provider = provider;
@@ -31,9 +32,10 @@ class Stake {
     /**
      * Get Stake Rewards
      */
-    getStakeRewards({ wallet, mint, stakeVault, nftName, collections, rank }) {
+    getStakeRewards({ wallet, stakeVault, nftName, collections, rank }) {
         return __awaiter(this, void 0, void 0, function* () {
             const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            const mint = new web3_js_1.PublicKey(constants_1.TTRIAD_MINT);
             const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
             const FromAta = (0, helpers_1.getATASync)(StakeVault, mint);
             const ToAta = (0, helpers_1.getATASync)(wallet, mint);
@@ -84,13 +86,26 @@ class Stake {
      * Get Stake by wallet
      * @param wallet - User wallet
      * @param stakeVault - Stake Vault name
+     * @param collections - NFT collections
      *
      */
-    getStakeByWallet(wallet, stakeVault) {
+    getStakeByWallet(wallet, stakeVault, collections, ranks) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.getStakes(stakeVault);
-            const myStakes = response.filter((item) => item.authority === wallet.toBase58());
-            return myStakes;
+            const stakePromises = response
+                .filter((item) => item.authority === wallet.toBase58())
+                .map((nft) => __awaiter(this, void 0, void 0, function* () {
+                const getRank = (0, getRarity_1.getRarityRank)(ranks, nft.mint, nft.name);
+                const available = yield this.getStakeRewards({
+                    wallet,
+                    nftName: nft.name,
+                    stakeVault,
+                    rank: getRank,
+                    collections
+                });
+                return Object.assign(Object.assign({}, nft), { available });
+            }));
+            return Promise.all(stakePromises);
         });
     }
     /**
@@ -359,9 +374,10 @@ class Stake {
      *  @param nftName - Name of the nft
      *
      */
-    claimStakeRewards({ wallet, mint, stakeVault, nftName, collections, rank }, options) {
+    claimStakeRewards({ wallet, stakeVault, nftName, collections, rank }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            const mint = new web3_js_1.PublicKey(constants_1.TTRIAD_MINT);
             const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
             const FromAta = (0, helpers_1.getATASync)(StakeVault, mint);
             const ToAta = (0, helpers_1.getATASync)(wallet, mint);

package/dist/test.js

@@ -36,41 +36,7 @@ const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function*
     console.log(response);
 });
 const getStake = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('BCTdjdcjMiECGFbF5Ps15yjLRPzy5YZGJNa4VdGRbhjB'), constants_1.STAKE_SEASON);
-    const stakeVaults = yield triadProtocol.stake.getStakeVaults();
+    const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'), constants_1.STAKE_SEASON, 5, []);
     console.log(response);
-    console.log(stakeVaults);
 });
-const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.getUsers();
-    console.log(response);
-});
-const getUser = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.getUser(wallet.publicKey);
-    console.log(response);
-});
-const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.hasUser(new web3_js_1.PublicKey('6MuTdUhc4LDHDW3fiTemyns4NgR99oAWvHM2SwCSTcau'));
-    console.log(response);
-});
-const createUser = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.createUser({
-        wallet: wallet.publicKey,
-        referral: new web3_js_1.PublicKey('5vPF9vByRCUB2pr1oGmJsRPm9WDrH9a2v6iF4pbMiobK'),
-        name: 'Builder'
-    }, {
-        microLamports: 10000
-    });
-});
-const getRewards = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.getStakeRewards({
-        wallet: new web3_js_1.PublicKey('BCTdjdcjMiECGFbF5Ps15yjLRPzy5YZGJNa4VdGRbhjB'),
-        mint: new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV'),
-        nftName: 'Triad 2996',
-        stakeVault: constants_1.STAKE_SEASON,
-        collections: 3,
-        rank: 40
-    });
-    console.log(response);
-});
-getRewards();
+getStake();

package/dist/types/stake.d.ts

@@ -55,7 +55,6 @@ export type UpdateStakeVaultStatusArgs = {
 };
 export type ClaimStakeRewardsArgs = {
     wallet: PublicKey;
-    mint: PublicKey;
     stakeVault: string;
     nftName: string;
     collections: number;

package/dist/utils/getRarity.d.ts

@@ -0,0 +1,5 @@
+export declare const getRarityRank: (ranks: {
+    onchainId: string;
+    name: string;
+    rarityRankHrtt: number;
+}[], onchainId: string, name: string) => number;

package/dist/utils/getRarity.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRarityRank = void 0;
+const getRarityRank = (ranks, onchainId, name) => {
+    const item = ranks.find((entry) => entry.onchainId === onchainId || entry.name === name);
+    return item ? item.rarityRankHrtt : 0;
+};
+exports.getRarityRank = getRarityRank;

package/package.json

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