Separe ReadOnlyWallet creation

Author: Alex99y

wormhole-connect/src/utils/wallet/ReadOnlyWallet.ts

@@ -2,7 +2,7 @@ import {
   Chain as WormholeChain,
   chainToChainId,
   NativeAddress,
-  ChainId,
+  ChainId as WormholeChainId,
 } from '@wormhole-foundation/sdk';
 import { TransferWallet } from '.';
 import {
@@ -12,7 +12,7 @@ import {
 import { Dispatch } from '@reduxjs/toolkit';
 import { ConnectedWallet } from './wallet';
 import React from 'react';
-import { Context } from 'sdklegacy';
+import { ChainConfig, Context } from 'sdklegacy';
 import config from 'config';
 import EventEmitter from 'eventemitter3';
 
@@ -40,10 +40,6 @@ export class ReadOnlyWallet extends EventEmitter {
     return ReadOnlyWallet.NAME;
   }
 
-  getUrl(): string {
-    return '';
-  }
-
   async connect(): Promise<string[]> {
     this._isConnected = true;
     return [this._address.toString()];
@@ -53,13 +49,8 @@ export class ReadOnlyWallet extends EventEmitter {
     this._isConnected = false;
   }
 
-  getChainId(): ChainId {
-    // TODO: wallet aggregator should use SDK ChainId type
-    return chainToChainId(this._chain) as ChainId;
-  }
-
-  getNetworkInfo() {
-    throw new Error('Method not implemented.');
+  getChainId(): WormholeChainId {
+    return chainToChainId(this._chain);
   }
 
   getAddress(): string {
@@ -70,42 +61,29 @@ export class ReadOnlyWallet extends EventEmitter {
     return [this.getAddress()];
   }
 
-  setMainAddress(address: string): void {
-    // No-op: can't change address for read-only wallet
-  }
-
-  async getBalance(): Promise<string> {
-    // Could implement this to fetch balance from RPC if needed
-    throw new Error('Address only wallet cannot fetch balance');
-  }
-
   isConnected(): boolean {
     return this._isConnected;
   }
 
-  async signTransaction(tx: any): Promise<any> {
-    throw new Error('Address only wallet cannot sign transactions');
-  }
-
-  async sendTransaction(tx: any): Promise<any> {
-    throw new Error('Address only wallet cannot send transactions');
-  }
-
-  async signMessage(msg: any): Promise<any> {
-    throw new Error('Address only wallet cannot sign messages');
-  }
-
-  async signAndSendTransaction(tx: any): Promise<any> {
-    throw new Error('Address only wallet cannot sign or send transactions');
+  supportsChain(chainId: WormholeChainId): boolean {
+    return this.getChainId() === chainId;
   }
+}
 
-  getFeatures(): string[] {
-    return [];
-  }
+export function createReadOnlyWalletData(
+  address: NativeAddress<WormholeChain>,
+  chain: WormholeChain,
+  chainConfig: ChainConfig
+): ReadOnlyWalletData {
+  const wallet = new ReadOnlyWallet(address, chain);
 
-  supportsChain(chainId: ChainId): boolean {
-    return this.getChainId() === chainId;
-  }
+  return {
+    name: wallet.getName(),
+    type: chainConfig.context,
+    icon: '',
+    isReady: true,
+    wallet,
+  };
 }
 
 export function isReadOnlyWallet(wallet: any): wallet is ReadOnlyWalletData {

wormhole-connect/src/views/v2/Bridge/WalletConnector/Sidebar.tsx

@@ -26,7 +26,7 @@ import AlertBannerV2 from 'components/v2/AlertBanner';
 import { useAvailableWallets } from 'hooks/useAvailableWallets';
 import { validateWalletAddress } from 'utils/address';
 import { SANCTIONED_WALLETS } from 'consts/wallet';
-import { ReadOnlyWallet, ReadOnlyWalletData } from 'utils/wallet/ReadOnlyWallet';
+import { createReadOnlyWalletData } from 'utils/wallet/ReadOnlyWallet';
 
 const useStyles = makeStyles()((theme) => ({
   listButton: {
@@ -136,16 +136,7 @@ const WalletSidebar = (props: Props) => {
       }
     }
 
-    // TODO: Move this code to ReadOnlyWallet file
-    const wallet = new ReadOnlyWallet(nativeAddress, selectedChain);
-
-    const walletInfo: ReadOnlyWalletData = {
-      name: wallet.getName(),
-      type: chainConfig.context,
-      icon: '',
-      isReady: true,
-      wallet,
-    };
+    const walletInfo = createReadOnlyWalletData(nativeAddress, selectedChain, chainConfig)
 
     await props.onConnectWallet(walletInfo, props.type, selectedChain)
     props.onClose?.();