fix(blockchain-link): correctly handle Solana server URL

trezor · Feb 28, 2025 · 1fe9034 · 1fe9034
1 parent cbb6cdb
commit 1fe9034
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/packages/blockchain-link/src/workers/solana/index.ts b/packages/blockchain-link/src/workers/solana/index.ts
@@ -384,6 +384,7 @@ const getAccountInfo = async (
                 payload.descriptor,
                 isTestnet,
                 solEpoch,
+                api.clusterUrl,
             );
             misc = {
                 owner: accountInfo?.owner,

diff --git a/packages/blockchain-link/src/workers/solana/stakingAccounts.ts b/packages/blockchain-link/src/workers/solana/stakingAccounts.ts
@@ -2,8 +2,6 @@ import { Network, Solana, isStake, stakeAccountState } from '@everstake/wallet-s
 
 import { SolanaStakingAccount } from '@trezor/blockchain-link-types/src/solana';
 
-import config from './../../ui/config';
-
 const EVERSTAKE_VOTER_PUBKEYS = [
     '9QU2QSxhb24FUX3Tu2FpczXjpK3VYrvRudywSZaM29mF', // mainnet
     'GkqYQysEGmuL6V2AJoNnWZUz2ZBGWhzQXsJiXm2CLKAN', // devnet
@@ -13,14 +11,8 @@ export const getSolanaStakingData = async (
     descriptor: string,
     isTestnet: boolean,
     epoch: number,
+    serverUrl: string,
 ): Promise<SolanaStakingAccount[]> => {
-    const blockchainEnvironment = isTestnet ? 'devnet' : 'mainnet';
-
-    // Find the blockchain configuration for the specified chain and environment
-    const blockchainConfig = config.find(c =>
-        c.blockchain.name.toLowerCase().includes(`solana ${blockchainEnvironment}`),
-    );
-    const serverUrl = blockchainConfig?.blockchain.server[0];
     const network = isTestnet ? Network.Devnet : Network.Mainnet;
 
     const solanaClient = new Solana(network, serverUrl);