fix(suite): hide non-Everstake Solana staking accounts

trezor · Feb 28, 2025 · ed7f152 · ed7f152
1 parent 0598bb8
commit ed7f152
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/packages/blockchain-link/src/workers/solana/index.ts b/packages/blockchain-link/src/workers/solana/index.ts
@@ -62,8 +62,8 @@ import { IntervalId } from '@trezor/type-utils';
 import { BigNumber, createDeferred, createLazy } from '@trezor/utils';
 
 import { getBaseFee, getPriorityFee } from './fee';
+import { getSolanaStakingData } from './stakingAccounts';
 import { BaseWorker, CONTEXT, ContextType } from '../baseWorker';
-import { getSolanaStakingData } from './utils';
 
 export type SolanaAPI = Readonly<{
     clusterUrl: ClusterUrl;

diff --git a/...ockchain-link/src/workers/solana/utils.ts → ...ink/src/workers/solana/stakingAccounts.ts b/...ockchain-link/src/workers/solana/utils.ts → ...ink/src/workers/solana/stakingAccounts.ts
@@ -1,12 +1,19 @@
 import { Network, Solana, isStake, stakeAccountState } from '@everstake/wallet-sdk-solana';
 
-import config from '../../ui/config';
+import { SolanaStakingAccount } from '@trezor/blockchain-link-types/src/solana';
+
+import config from './../../ui/config';
+
+const EVERSTAKE_VOTER_PUBKEYS = [
+    '9QU2QSxhb24FUX3Tu2FpczXjpK3VYrvRudywSZaM29mF', // mainnet
+    'GkqYQysEGmuL6V2AJoNnWZUz2ZBGWhzQXsJiXm2CLKAN', // devnet
+];
 
 export const getSolanaStakingData = async (
     descriptor: string,
     isTestnet: boolean,
     epoch: number,
-) => {
+): Promise<SolanaStakingAccount[]> => {
     const blockchainEnvironment = isTestnet ? 'devnet' : 'mainnet';
 
     // Find the blockchain configuration for the specified chain and environment
@@ -37,6 +44,9 @@ export const getSolanaStakingData = async (
             if (state && 'fields' in state) {
                 const { fields } = state;
 
+                const voterPubkey = fields[1]?.delegation?.voterPubkey;
+                if (!EVERSTAKE_VOTER_PUBKEYS.includes(voterPubkey)) return; // filter out non-everstake accounts
+
                 return {
                     rentExemptReserve: fields[0]?.rentExemptReserve,
                     stake: fields[1]?.delegation?.stake,

diff --git a/suite-common/wallet-core/src/stake/stakeConstants.ts b/suite-common/wallet-core/src/stake/stakeConstants.ts
@@ -15,3 +15,5 @@ export const EVERSTAKE_ENDPOINT_PREFIX: Record<
 
 export const EVERSTAKE_REWARDS_SOLANA_ENPOINT =
     'https://stake-sync-api.everstake.one/solana/rewards';
+
+export const EVERSTAKE_VALIDATOR = '9QU2QSxhb24FUX3Tu2FpczXjpK3VYrvRudywSZaM29mF';
diff --git a/suite-common/wallet-core/src/stake/stakeThunks.ts b/suite-common/wallet-core/src/stake/stakeThunks.ts
@@ -11,7 +11,11 @@ import {
 import { TimerId } from '@trezor/type-utils';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 
-import { EVERSTAKE_ENDPOINT_PREFIX, EVERSTAKE_REWARDS_SOLANA_ENPOINT } from './stakeConstants';
+import {
+    EVERSTAKE_ENDPOINT_PREFIX,
+    EVERSTAKE_REWARDS_SOLANA_ENPOINT,
+    EVERSTAKE_VALIDATOR,
+} from './stakeConstants';
 import { selectEverstakeData } from './stakeSelectors';
 import {
     EVERSTAKE_ASSET_ENDPOINT_TYPES,
@@ -124,7 +128,11 @@ export const fetchEverstakeRewards = createThunk<
         try {
             const response = await fetch(`${EVERSTAKE_REWARDS_SOLANA_ENPOINT}/${address}`, {
                 method: 'POST',
+                body: `validator=${encodeURIComponent(EVERSTAKE_VALIDATOR)}`,
                 signal,
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                },
             });
 
             if (!response.ok) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,5 @@ export const EVERSTAKE_ENDPOINT_PREFIX: Record<

		export const EVERSTAKE_REWARDS_SOLANA_ENPOINT =
		'https://stake-sync-api.everstake.one/solana/rewards';

		export const EVERSTAKE_VALIDATOR = '9QU2QSxhb24FUX3Tu2FpczXjpK3VYrvRudywSZaM29mF';