revert: changes to Solana getTokenAccount

platforms/solana/src/chain.ts

@@ -3,27 +3,26 @@ import {
   ChainContext,
   NativeAddress,
   UniversalAddress,
+  UniversalOrNative,
   toNative,
 } from '@wormhole-foundation/connect-sdk';
 import { getAssociatedTokenAddress } from '@solana/spl-token';
 import { SolanaPlatform } from './platform';
-import { AnySolanaAddress } from './types';
-import { SolanaAddress } from './address';
 
 export class SolanaChain extends ChainContext<'Solana'> {
   // @ts-ignore
   readonly platform = SolanaPlatform;
 
   async getTokenAccount(
-    token: AnySolanaAddress | 'native',
+    token: UniversalOrNative<'Solana'> | 'native',
     address: UniversalAddress,
   ): Promise<NativeAddress<'Solana'>> {
     const tb = await this.getTokenBridge();
 
-    const mintAddress =
+    const mintAddress: UniversalOrNative<'Solana'> =
       token === 'native'
         ? await tb.getWrappedNative()
-        : new SolanaAddress(token);
+        : token.toUniversalAddress();
 
     const mint = new PublicKey(mintAddress.toUint8Array());
     const owner = new PublicKey(address.toUint8Array());