@triadxyz/triad-protocol 0.3.1-beta → 0.3.3-beta

package/dist/stake.d.ts

@@ -11,6 +11,10 @@ export default class Stake {
      * Get all Stake Vaults
      */
     getStakeVaults(): Promise<import("./types/stake").StakeVaultResponse[]>;
+    /**
+     * Get Stake Rewards
+     */
+    getStakeRewards({ wallet, mint, stakeVault, nftName }: ClaimStakeRewardsArgs): Promise<import("@coral-xyz/anchor/dist/cjs/program/namespace/simulate").SimulateResponse<any, any>>;
     /**
      * Get Stake Vault by name
      * @param stakeVault - Stake Vault name
@@ -29,18 +33,6 @@ export default class Stake {
      *
      */
     getStakeByWallet(wallet: PublicKey, stakeVault: string): Promise<StakeResponse[]>;
-    /**
-     * Get Stake Vault Rewards details
-     * @param stakeVault - Stake Vault name
-     */
-    getStakeVaultRewards(stakeVault: string): Promise<{
-        amount: number;
-        perDay: number;
-        perWeek: number;
-        perMonth: number;
-        period: number;
-        days: number[];
-    }>;
     /**
      * Get Stakes by day
      * @param stakeVault - Stake Vault name

package/dist/stake.js

@@ -27,6 +27,29 @@ class Stake {
             return response.map((stakeVault) => (0, helpers_1.formatStakeVault)(stakeVault.account));
         });
     }
+    /**
+     * Get Stake Rewards
+     */
+    getStakeRewards({ wallet, mint, stakeVault, nftName }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            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);
+            const method = this.program.methods
+                .claimStakeRewards()
+                .accounts({
+                signer: wallet,
+                fromAta: FromAta,
+                mint: mint,
+                toAta: ToAta,
+                stake: Stake,
+                stakeVault: StakeVault
+            })
+                .simulate();
+            return method;
+        });
+    }
     /**
      * Get Stake Vault by name
      * @param stakeVault - Stake Vault name
@@ -64,31 +87,6 @@ class Stake {
             return myStakes;
         });
     }
-    /**
-     * Get Stake Vault Rewards details
-     * @param stakeVault - Stake Vault name
-     */
-    getStakeVaultRewards(stakeVault) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
-            const response = yield this.program.account.stakeVault.fetch(StakeVault);
-            const amount = response.amount.toNumber() / Math.pow(10, constants_1.TTRIAD_DECIMALS);
-            const period = (response.endTs.toNumber() - response.initTs.toNumber()) / (60 * 60 * 24);
-            const netAmount = amount - (amount * constants_1.TTRIAD_FEE) / 100;
-            const data = {
-                amount: netAmount,
-                perDay: netAmount / period,
-                perWeek: (netAmount / period) * 7,
-                perMonth: (netAmount / period) * 30,
-                period,
-                days: []
-            };
-            for (let ts = response.initTs.toNumber(); ts <= response.endTs.toNumber(); ts += 60 * 60 * 24) {
-                data.days.push(ts);
-            }
-            return data;
-        });
-    }
     /**
      * Get Stakes by day
      * @param stakeVault - Stake Vault name
@@ -361,7 +359,7 @@ class Stake {
             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);
-            const method = this.program.methods.claimStake().accounts({
+            const method = this.program.methods.claimStakeRewards().accounts({
                 signer: wallet,
                 fromAta: FromAta,
                 mint: mint,

package/dist/test.js

@@ -36,12 +36,9 @@ 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 = await triadProtocol.stake.getStakeByWallet(
-    //   new PublicKey('BCTdjdcjMiECGFbF5Ps15yjLRPzy5YZGJNa4VdGRbhjB'),
-    //   STAKE_SEASON
-    // )
+    const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'), constants_1.STAKE_SEASON);
     const stakeVaults = yield triadProtocol.stake.getStakeVaults();
-    // console.log(response)
+    console.log(response);
     console.log(stakeVaults);
 });
 const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -49,7 +46,7 @@ const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(response);
 });
 const getUser = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.getUser(new web3_js_1.PublicKey('6mGxYSJzJxTHwY43aafsSnSPM3QqXKbNUsnCRj4fMo5q'));
+    const response = yield triadProtocol.getUser(new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'));
     console.log(response);
 });
 const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -65,4 +62,13 @@ const createUser = () => __awaiter(void 0, void 0, void 0, function* () {
         microLamports: 10000
     });
 });
-getUser();
+const getRewards = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.getStakeRewards({
+        wallet: new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'),
+        mint: new web3_js_1.PublicKey('BPK5P2YVnBaJJ4GRESCKQHYFmENzVspd7tZ2Mw7HmJYZ'),
+        nftName: 'Triad 3081',
+        stakeVault: constants_1.STAKE_SEASON
+    });
+    console.log(response);
+});
+getRewards();

package/dist/types/idl_triad_protocol.json

@@ -8,8 +8,8 @@
     },
     "instructions": [
         {
-            "name": "claim_stake",
-            "discriminator": [62, 145, 133, 242, 244, 59, 53, 139],
+            "name": "claim_stake_rewards",
+            "discriminator": [107, 91, 233, 196, 211, 47, 218, 21],
             "accounts": [
                 {
                     "name": "signer",
@@ -77,7 +77,8 @@
                     "address": "11111111111111111111111111111111"
                 }
             ],
-            "args": []
+            "args": [],
+            "returns": "u64"
         },
         {
             "name": "close_position",
@@ -1075,6 +1076,11 @@
             "code": 6021,
             "name": "SwapsReachedLimit",
             "msg": "Swaps reached limit"
+        },
+        {
+            "code": 6022,
+            "name": "InsufficientFunds",
+            "msg": "Insufficient funds"
         }
     ],
     "types": [

package/dist/types/triad_protocol.d.ts

@@ -14,8 +14,8 @@ export type TriadProtocol = {
     };
     instructions: [
         {
-            name: 'claimStake';
-            discriminator: [62, 145, 133, 242, 244, 59, 53, 139];
+            name: 'claimStakeRewards';
+            discriminator: [107, 91, 233, 196, 211, 47, 218, 21];
             accounts: [
                 {
                     name: 'signer';
@@ -56,6 +56,7 @@ export type TriadProtocol = {
                 }
             ];
             args: [];
+            returns: 'u64';
         },
         {
             name: 'closePosition';
@@ -987,6 +988,11 @@ export type TriadProtocol = {
             code: 6021;
             name: 'swapsReachedLimit';
             msg: 'Swaps reached limit';
+        },
+        {
+            code: 6022;
+            name: 'insufficientFunds';
+            msg: 'Insufficient funds';
         }
     ];
     types: [

package/package.json

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