clean up solana

hummingbot · Jan 17, 2025 · 7b423df · 7b423df
1 parent 243c884
commit 7b423df
Showing 1 changed file with 24 additions and 64 deletions.
diff --git a/src/chains/solana/solana.ts b/src/chains/solana/solana.ts
@@ -4,12 +4,10 @@ import { BigNumber } from 'ethers';
 import fse from 'fs-extra';
 import { TokenListType } from '../../services/base';
 
-import { TokenInfo, TokenListContainer } from '@solana/spl-token-registry';
+import { TokenInfo } from '@solana/spl-token-registry';
 import {
-  AccountInfo,
   Connection,
   Keypair,
-  ParsedAccountData,
   PublicKey,
   ComputeBudgetProgram,
   Signer,
@@ -18,7 +16,7 @@ import {
   TransactionResponse,
   VersionedTransactionResponse,
 } from '@solana/web3.js';
-import { Client, UtlConfig, Token } from '@solflare-wallet/utl-sdk';
+import { Client, UtlConfig } from '@solflare-wallet/utl-sdk';
 import { TOKEN_PROGRAM_ID, unpackAccount } from "@solana/spl-token";
 
 import { TokenValue, walletPath } from '../../services/base';
@@ -162,26 +160,21 @@ export class Solana {
     return this._ready;
   }
 
-  public async getTokenByAddress(tokenAddress: string, useApi: boolean = false): Promise<Token> {
-    if (useApi && this.network !== 'mainnet-beta') {
-      throw new Error('API usage is only allowed on mainnet-beta');
-    }
-
-    const publicKey = new PublicKey(tokenAddress);
-    let token: Token;
-
-    if (useApi) {
-      token = await this._utl.fetchMint(publicKey);
-    } else {
-      const tokenList = await this.getTokenList(this.config.network.tokenListSource, this.config.network.tokenListType);
-      const foundToken = tokenList.find((t) => t.address === tokenAddress);
-      if (!foundToken) {
-        throw new Error('Token not found in the token list');
-      }
-      token = foundToken as unknown as Token;
+  async getTokenList(
+    tokenListSource?: string,
+    tokenListType?: TokenListType
+  ): Promise<TokenInfo[]> {
+    // If no source/type provided, return stored list
+    if (!tokenListSource || !tokenListType) {
+      return this.tokenList;
     }
-
-    return token;
+
+    // Otherwise fetch new list
+    const tokens = await new TokenListResolutionStrategy(
+      tokenListSource,
+      tokenListType
+    ).resolve();
+    return tokens;
   }
 
   async loadTokens(
@@ -210,8 +203,10 @@ export class Solana {
   }
 
   public getTokenBySymbol(tokenSymbol: string): TokenInfo | undefined {
+    // Normalize both strings by converting to uppercase and removing any spaces
+    const normalizedSearch = tokenSymbol.toUpperCase().trim();
     return this.tokenList.find(
-      (token: TokenInfo) => token.symbol.toUpperCase() === tokenSymbol.toUpperCase()
+      (token: TokenInfo) => token.symbol.toUpperCase().trim() === normalizedSearch
     );
   }
 
@@ -340,11 +335,13 @@ export class Solana {
 
     for (const tokenAccount of allSplTokens.value) {
       const tokenInfo = tokenAccount.account.data.parsed['info'];
-      const symbol = (await this.getTokenByAddress(tokenInfo['mint']))?.symbol;
-      if (symbol != null)
-        balances[symbol] = this.tokenResponseToTokenValue(
+      const mintAddress = tokenInfo['mint'];
+      const token = this.tokenList.find(t => t.address === mintAddress);
+      if (token?.symbol) {
+        balances[token.symbol] = this.tokenResponseToTokenValue(
           tokenInfo['tokenAmount']
         );
+      }
     }
 
     let allSolBalance = BigNumber.from(0);
@@ -412,26 +409,6 @@ export class Solana {
     );
   }
 
-  // returns whether the token account is initialized, given its mint address
-  async isTokenAccountInitialized(
-    walletAddress: PublicKey,
-    mintAddress: PublicKey
-  ): Promise<boolean> {
-    const response = await this.connectionPool.getNextConnection().getParsedTokenAccountsByOwner(
-      walletAddress,
-      { programId: TOKEN_PROGRAM_ADDRESS }
-    );
-    for (const accountInfo of response.value) {
-      if (
-        accountInfo.account.data.parsed['info']['mint'] ==
-        mintAddress.toBase58()
-      )
-        return true;
-    }
-    return false;
-  }
-
-
   // returns a Solana TransactionResponse for a txHash.
   async getTransaction(
     payerSignature: string
@@ -854,21 +831,4 @@ export class Solana {
     }
   }
 
-  async getTokenList(
-    tokenListSource?: string,
-    tokenListType?: TokenListType
-  ): Promise<TokenInfo[]> {
-    // If no source/type provided, return stored list
-    if (!tokenListSource || !tokenListType) {
-      return this.tokenList;
-    }
-
-    // Otherwise fetch new list
-    const tokens = await new TokenListResolutionStrategy(
-      tokenListSource,
-      tokenListType
-    ).resolve();
-    return tokens;
-  }
-
 }