sol: update get stakes and rewards functions

Author: nooxx

examples/sol.ts

@@ -39,6 +39,16 @@ const f = async () => {
     // const hash = await k.sol.broadcast(signedTx);
     // console.log(hash);
 
+    // const stakes = await k.sol.getStakesByAccounts(['771254de-ac5a-4911-afdf-1d5b7e802dc9']);
+    // const stakes = await k.sol.getStakesByStakeAccounts(['22njeUeaSxRL9RUf6cFrn5BMBGhpotAgVvjfnWfh2qsm']);
+    // const stakes = await k.sol.getStakesByWallets(['c5oiYqNcFYVMvWvQ8ifLTjZTsJ8s3X9gitRHFaNi2rk']);
+    // console.log(stakes);
+
+    // const rewards = await k.sol.getRewardsByAccounts(['771254de-ac5a-4911-afdf-1d5b7e802dc9']);
+    // const rewards = await k.sol.getRewardsByStakeAccounts(['22njeUeaSxRL9RUf6cFrn5BMBGhpotAgVvjfnWfh2qsm']);
+    // const rewards = await k.sol.getRewardsByWallets(['c5oiYqNcFYVMvWvQ8ifLTjZTsJ8s3X9gitRHFaNi2rk']);
+    // console.log(rewards);
+
     // const accounts = await k.sol.getAccountsRewards(['771254de-ac5a-4911-afdf-1d5b7e802dc9']);
     // console.log(accounts);
     // const tx = await k.sol.getTxStatus('26GZcovnvTGvf5fXFysbtJkNob5r4K9v4H8ZU9tSm8oF5hgUuUm231cabS8LCiC1cqQMFiRkNRNEgqtiVwpr2Bek');

src/services/sol.ts

@@ -22,6 +22,7 @@ import {
   SolanaTx,
   SolanaTxStatus,
   SolNetworkStats,
+  SolRewards,
   SolStakes,
   TaggedStake,
 } from '../types/sol';
@@ -507,10 +508,10 @@ export class SolService extends Service {
 
     /**
      * Retrieve stakes of given kiln accounts
-     * @param accountIds: account ids of which you wish to retrieve rewards
+     * @param accountIds: kiln account ids of which you wish to retrieve stakes
      * @returns {SolStakes} Solana Stakes
      */
-    async getAccountsRewards(
+    async getStakesByAccounts(
       accountIds: string[],
     ): Promise<SolStakes> {
       const { data } = await api.get<SolStakes>(
@@ -519,13 +520,63 @@ export class SolService extends Service {
     }
 
     /**
-     * Retrieve stake on given stake accounts
-     * @param stakeAccountAddresses validator addresses of which you wish to retrieve rewards
+     * Retrieve stakes of given stake accounts
+     * @param stakeAccounts: stake account addresses of which you wish to retrieve rewards
      * @returns {SolStakes} Solana Stakes
      */
-    async getStakesRewards(stakeAccountAddresses: string[]): Promise<SolStakes> {
+    async getStakesByStakeAccounts(
+      stakeAccounts: string[],
+    ): Promise<SolStakes> {
       const { data } = await api.get<SolStakes>(
-        `/v1/sol/stakes?stakeaccounts=${stakeAccountAddresses.join(',')}`,
+        `/v1/sol/stakes?stake_accounts=${stakeAccounts.join(',')}`);
+      return data;
+    }
+
+    /**
+     * Retrieve stakes of given wallets
+     * @param wallets: wallet addresses of which you wish to retrieve rewards
+     * @returns {SolStakes} Solana Stakes
+     */
+    async getStakesByWallets(
+      wallets: string[],
+    ): Promise<SolStakes> {
+      const { data } = await api.get<SolStakes>(
+        `/v1/sol/stakes?wallets=${wallets.join(',')}`);
+      return data;
+    }
+
+    /**
+     * Retrieve rewards for given accounts
+     * @param accountIds kiln account ids of which you wish to retrieve rewards
+     * @returns {SolRewards} Solana rewards
+     */
+    async getRewardsByAccounts(accountIds: string[]): Promise<SolRewards> {
+      const { data } = await api.get<SolRewards>(
+        `/v1/sol/rewards?accounts=${accountIds.join(',')}`,
+      );
+      return data;
+    }
+
+    /**
+     * Retrieve rewards for given stake accounts
+     * @param stakeAccounts stake account addresses of which you wish to retrieve rewards
+     * @returns {SolRewards} Solana rewards
+     */
+    async getRewardsByStakeAccounts(stakeAccounts: string[]): Promise<SolRewards> {
+      const { data } = await api.get<SolRewards>(
+        `/v1/sol/rewards?stake_accounts=${stakeAccounts.join(',')}`,
+      );
+      return data;
+    }
+
+    /**
+     * Retrieve rewards for given stake accounts
+     * @param wallets wallet addresses of which you wish to retrieve rewards
+     * @returns {SolRewards} Solana rewards
+     */
+    async getRewardsByWallets(wallets: string[]): Promise<SolRewards> {
+      const { data } = await api.get<SolRewards>(
+        `/v1/sol/rewards?wallets=${wallets.join(',')}`,
       );
       return data;
     }

src/types/sol.ts

@@ -9,18 +9,39 @@ export type InternalSolanaConfig = {
 
 export type SolanaTx = Transaction;
 
+type Epoch = {
+  nb: number;
+  begin_at: string;
+};
+
+export type StakeState = 'activating' | 'active' | 'deactivating' | 'inactive';
+
 export type SolStake = {
   stake_account: string;
   withdraw_pubkey: string;
-  balance: number;
-  rewards: number;
-  apy: number;
+  balance: string;
+  rewards: string;
+  activation_epoch: Epoch | null;
+  deactivation_epoch: Epoch | null;
+  state: StakeState;
+  net_apy: number;
+  vote_account: string;
 };
 
 export type SolStakes = {
   data: SolStake[];
 }
 
+export type SolReward = {
+  epoch: Epoch;
+  rewards: number;
+  net_apy: number;
+};
+
+export type SolRewards = {
+  data: SolReward[];
+}
+
 export type SolNetworkStats = {
   data: {
     timestamp: string;