@meshconnect/uwc-injected-connector 0.2.7 → 0.2.9

package/dist/wallet-standard-discovery.d.ts

@@ -3,22 +3,24 @@
  *
  * Simple implementation to get Solana wallets using the Wallet Standard API
  */
-import type { Wallet } from '@wallet-standard/base';
-import type { WalletAdapter } from '@solana/wallet-adapter-base';
+import { StandardWalletAdapter } from '@solana/wallet-standard-wallet-adapter-base';
+import type { Transaction } from '@solana/web3.js';
+export interface ExtendedStandardWalletAdapter extends StandardWalletAdapter {
+    customFunctions: ('sendSerializedTransaction' | 'signSerializedTransaction' | 'signAllSerializedTransactions')[];
+    sendSerializedTransaction: (transaction: unknown, rpcUrl: string) => Promise<string>;
+    signSerializedTransaction: (transaction: unknown) => Promise<Error | Transaction>;
+    signAllSerializedTransactions: (transactions: unknown[]) => Promise<Error | Transaction[]>;
+}
+export type SolanaAdapter = ExtendedStandardWalletAdapter | StandardWalletAdapter;
 export interface WalletStandardInfo {
     uuid: string;
     name: string;
     chains: string[];
     features: string[];
-    adapter: WalletAdapter | undefined;
-}
-export interface SolanaWalletWithAdapter {
-    info: WalletStandardInfo;
-    wallet: Wallet;
-    adapter?: WalletAdapter;
+    adapter: SolanaAdapter | undefined;
 }
 /**
  * Gets all available Solana wallets using Wallet Standard
  */
-export declare function getSolanaWallets(): WalletStandardInfo[];
+export declare function getSolanaWallets(): Promise<WalletStandardInfo[]>;
 //# sourceMappingURL=wallet-standard-discovery.d.ts.map

package/dist/wallet-standard-discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-standard-discovery.d.ts","sourceRoot":"","sources":["../src/wallet-standard-discovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAGnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAIhE,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,OAAO,EAAE,aAAa,GAAG,SAAS,CAAA;CACnC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,kBAAkB,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,aAAa,CAAA;CACxB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,kBAAkB,EAAE,CAqDvD"}
+{"version":3,"file":"wallet-standard-discovery.d.ts","sourceRoot":"","sources":["../src/wallet-standard-discovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,MAAM,WAAW,6BAA8B,SAAQ,qBAAqB;IAC1E,eAAe,EAAE,CACb,2BAA2B,GAC3B,2BAA2B,GAC3B,+BAA+B,CAClC,EAAE,CAAA;IACH,yBAAyB,EAAE,CACzB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,CAAC,CAAA;IACpB,yBAAyB,EAAE,CACzB,WAAW,EAAE,OAAO,KACjB,OAAO,CAAC,KAAK,GAAG,WAAW,CAAC,CAAA;IACjC,6BAA6B,EAAE,CAC7B,YAAY,EAAE,OAAO,EAAE,KACpB,OAAO,CAAC,KAAK,GAAG,WAAW,EAAE,CAAC,CAAA;CACpC;AAED,MAAM,MAAM,aAAa,GACrB,6BAA6B,GAC7B,qBAAqB,CAAA;AAEzB,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,OAAO,EAAE,aAAa,GAAG,SAAS,CAAA;CACnC;AA6CD;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAwCtE"}

package/dist/wallet-standard-discovery.js

@@ -6,11 +6,56 @@
 import { getWallets } from '@wallet-standard/app';
 import { isWalletAdapterCompatibleStandardWallet } from '@solana/wallet-adapter-base';
 import { StandardWalletAdapter } from '@solana/wallet-standard-wallet-adapter-base';
-import { CoinbaseWalletAdapter } from '@solana/wallet-adapter-wallets';
+/**
+ * Polls for bridge wallets when UWCBridgeInitialized is true
+ * @returns Promise that resolves to an array of detected wallets from the bridge
+ */
+async function pollForBridgeWallets() {
+    const pollInterval = 100; // Poll every 100ms
+    const maxPollTime = 3000; // Poll for maximum 3 seconds
+    const startTime = Date.now();
+    return new Promise(resolve => {
+        const poll = () => {
+            // Check if we've exceeded the max poll time
+            if (Date.now() - startTime > maxPollTime) {
+                resolve([]);
+                return;
+            }
+            // Check if window.walletStandardWallets is available
+            if (
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore - window.eip6963Wallets is set by the bridge
+            window.walletStandardWallets &&
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore - window.eip6963Wallets is set by the bridge
+                Array.isArray(window.walletStandardWallets)) {
+                const bridgeWallets = 
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
+                window.walletStandardWallets;
+                resolve(bridgeWallets);
+                return;
+            }
+            // Continue polling
+            setTimeout(poll, pollInterval);
+        };
+        // Start polling
+        poll();
+    });
+}
 /**
  * Gets all available Solana wallets using Wallet Standard
  */
-export function getSolanaWallets() {
+export async function getSolanaWallets() {
+    // UWCBridgeChildInitialized is only initialized if app runs in an iframe. We can skip checking for bridge proxy providers when it's not necessary.
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore - window.UWCBridgeInitialized is set by the bridge
+    if (window.UWCBridgeChildInitialized === true) {
+        const wallets = await pollForBridgeWallets();
+        if (wallets.length > 0) {
+            return wallets;
+        }
+    }
     const { get } = getWallets();
     const wallets = get();
     const solanaWallets = [];
@@ -33,27 +78,6 @@ export function getSolanaWallets() {
             walletNames.add(wallet.name);
         }
     }
-    // Initialize traditional wallet adapters - Only import CBW for now, as it's not using Wallet Standard
-    const walletAdapters = [new CoinbaseWalletAdapter()];
-    // Add traditional wallet adapters (but skip duplicates)
-    for (const adapter of walletAdapters) {
-        if (walletNames.has(adapter.name)) {
-            // Skipping duplicate wallet already detected via Wallet Standard
-            continue;
-        }
-        const readyState = adapter.readyState;
-        const isDetected = readyState === 'Installed' || readyState === 'Loadable';
-        // Only add if installed
-        if (isDetected) {
-            solanaWallets.push({
-                uuid: `${adapter.name}-traditional`.toLowerCase().replace(/\s+/g, '-'),
-                name: adapter.name,
-                chains: ['solana:mainnet'],
-                features: [],
-                adapter: adapter
-            });
-        }
-    }
     return solanaWallets;
 }
 /**

package/dist/wallet-standard-discovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-standard-discovery.js","sourceRoot":"","sources":["../src/wallet-standard-discovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,uCAAuC,EAAE,MAAM,6BAA6B,CAAA;AAErF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAA;AAgBtE;;GAEG;AACH,MAAM,UAAU,gBAAgB;IAC9B,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,EAAE,CAAA;IAC5B,MAAM,OAAO,GAAG,GAAG,EAAE,CAAA;IAErB,MAAM,aAAa,GAAyB,EAAE,CAAA;IAC9C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;IAErC,0CAA0C;IAC1C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,mCAAmC;QACnC,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,IAAI,OAA0C,CAAA;YAE9C,IAAI,uCAAuC,CAAC,MAAM,CAAC,EAAE,CAAC;gBACpD,OAAO,GAAG,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YACjD,CAAC;YAED,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC;gBAC9B,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAa;gBACzC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACtC,OAAO,EAAE,OAAO;aACjB,CAAC,CAAA;YACF,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC9B,CAAC;IACH,CAAC;IAED,sGAAsG;IACtG,MAAM,cAAc,GAAG,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAA;IAEpD,wDAAwD;IACxD,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE,CAAC;QACrC,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,iEAAiE;YACjE,SAAQ;QACV,CAAC;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;QACrC,MAAM,UAAU,GAAG,UAAU,KAAK,WAAW,IAAI,UAAU,KAAK,UAAU,CAAA;QAE1E,wBAAwB;QACxB,IAAI,UAAU,EAAE,CAAC;YACf,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;gBACtE,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,CAAC,gBAAgB,CAAC;gBAC1B,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,OAAO;aACjB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IACD,OAAO,aAAa,CAAA;AACtB,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CAAC,MAAc;IACpC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAA;IAClC,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IAExE,OAAO,cAAc,CAAA;AACvB,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,MAAc;IACtC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IAC7C,OAAO,GAAG,MAAM,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AACrE,CAAC"}
+{"version":3,"file":"wallet-standard-discovery.js","sourceRoot":"","sources":["../src/wallet-standard-discovery.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/uwc-injected-connector",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Injected connector for Universal Wallet Connector",
   "type": "module",
   "main": "dist/index.js",
@@ -26,7 +26,7 @@
     "bs58": "^6.0.0",
     "buffer": "^6.0.3",
     "ethers": "^6.15.0",
-    "@meshconnect/uwc-types": "0.2.5"
+    "@meshconnect/uwc-types": "0.2.6"
   },
   "devDependencies": {
     "typescript": "^5.9.2"

package/src/injected-connector.ts

@@ -55,7 +55,7 @@ export class InjectedConnector implements Connector {
    */
   private async initializeWalletDiscovery(): Promise<void> {
     await this.ethereumService.initializeDiscovery()
-    this.solanaService.initializeDiscovery()
+    await this.solanaService.initializeDiscovery()
   }
 
   /**
@@ -84,7 +84,7 @@ export class InjectedConnector implements Connector {
 
       case 'solana': {
         // Re-fetch Solana wallets
-        this.solanaService.initializeDiscovery()
+        await this.solanaService.initializeDiscovery()
 
         // Convert to DetectedWalletInfo format
         return this.solanaService.getDetectedWallets().map(wallet => ({

package/src/services/signature-service.ts

@@ -1,7 +1,7 @@
 import type { EthereumProvider } from '../eip6963-discovery'
-import type { WalletAdapter } from '@solana/wallet-adapter-base'
 import bs58 from 'bs58'
 import { parseError } from '../utils/error-utils'
+import type { SolanaAdapter } from '../wallet-standard-discovery'
 
 /**
  * Service for handling message signing operations for injected wallets
@@ -45,32 +45,20 @@ export class SignatureService {
    */
   async signSolanaMessage(
     message: string,
-    adapter: WalletAdapter
+    adapter: SolanaAdapter
   ): Promise<string> {
-    if (!adapter) {
-      throw new Error('Adapter is required for Solana message signing')
-    }
-
     if (!message) {
       throw new Error('Message is required for signing')
     }
 
-    // Check if adapter supports signMessage
-    const signingAdapter = adapter as WalletAdapter & {
-      signMessage?: (message: Uint8Array) => Promise<Uint8Array>
-    }
-
-    if (!signingAdapter.signMessage) {
-      throw new Error('Solana adapter does not support message signing')
-    }
-
     try {
       // Convert message to Uint8Array for Solana
       const encoder = new TextEncoder()
       const messageBytes = encoder.encode(message)
 
-      // Sign the message
-      const signedMessage = await signingAdapter.signMessage(messageBytes)
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const signedMessage = await adapter.signMessage(messageBytes)
 
       // Encode signature using base58 for Solana (standard encoding for Solana)
       // The signature is returned as a Uint8Array, encode it to base58 string

package/src/services/solana/solana-transaction-service.ts

@@ -1,5 +1,4 @@
-import { Transaction, Connection } from '@solana/web3.js'
-import type { WalletAdapter } from '@solana/wallet-adapter-base'
+import { Transaction, Connection, PublicKey } from '@solana/web3.js'
 import type {
   SolanaNativeTransferRequest,
   NetworkRpcMap,
@@ -10,6 +9,10 @@ import type {
 } from '@meshconnect/uwc-types'
 import { parseError } from '../../utils/error-utils'
 import { SolanaTransactionBuilder } from './solana-transaction-builder'
+import type {
+  ExtendedStandardWalletAdapter,
+  SolanaAdapter
+} from '../../wallet-standard-discovery'
 
 /**
  * Service for handling Solana transaction operations
@@ -28,7 +31,7 @@ export class SolanaTransactionService {
    */
   async sendTransaction(
     request: SolanaTransactionRequest,
-    adapter: WalletAdapter
+    adapter: SolanaAdapter
   ): Promise<string> {
     try {
       // Handle different types of Solana transactions
@@ -55,23 +58,82 @@ export class SolanaTransactionService {
     }
   }
 
+  /**
+   * Helper: Validate wallet address matches
+   */
+  private async validateWalletMatch(
+    adapter: SolanaAdapter,
+    expectedAddress: string
+  ): Promise<string> {
+    const base58PublicKey = await adapter.publicKey?.toBase58()
+    if (base58PublicKey !== expectedAddress) {
+      throw new Error('From address does not match connected wallet')
+    }
+    return base58PublicKey
+  }
+
+  /**
+   * Helper: Get RPC URL with fallback
+   */
+  private getRpcUrl(networkId?: NetworkId): string {
+    return networkId && this.networkRpcMap[networkId]
+      ? this.networkRpcMap[networkId]
+      : 'https://api.mainnet-beta.solana.com'
+  }
+
+  /**
+   * Helper: Execute transaction with sendSerializedTransaction fallback
+   */
+  private async executeTransaction(
+    adapter: SolanaAdapter,
+    transaction: Transaction,
+    rpcUrl: string
+  ): Promise<string> {
+    let transactionSignature: string | undefined
+
+    // Try to use sendSerializedTransaction if available
+    try {
+      const extendedAdapter = adapter as ExtendedStandardWalletAdapter
+      const serializedTx = transaction.serialize({
+        requireAllSignatures: false,
+        verifySignatures: false
+      })
+      if (extendedAdapter.sendSerializedTransaction) {
+        transactionSignature = await extendedAdapter.sendSerializedTransaction(
+          serializedTx,
+          rpcUrl
+        )
+      }
+    } catch {
+      // Fallback to regular sendTransaction
+    }
+
+    // If sendSerializedTransaction didn't work or wasn't available
+    if (!transactionSignature) {
+      const connection = new Connection(rpcUrl)
+      transactionSignature = await adapter.sendTransaction(
+        transaction,
+        connection
+      )
+    }
+
+    if (transactionSignature === undefined) {
+      throw new Error(`Couldn't get the transaction signature`)
+    }
+    return transactionSignature
+  }
+
   /**
    * Send native SOL transfer
    */
   private async sendNativeTransaction(
-    adapter: WalletAdapter,
+    adapter: SolanaAdapter,
     request: SolanaNativeTransferRequest,
     networkId?: NetworkId
   ): Promise<string> {
     try {
-      if (!adapter.publicKey) {
-        throw new Error('Wallet not connected')
-      }
-
-      // Verify the from address matches connected wallet
-      if (adapter.publicKey.toBase58() !== request.from) {
-        throw new Error('From address does not match connected wallet')
-      }
+      // Validate wallet
+      await this.validateWalletMatch(adapter, request.from)
 
       // Blockhash is required
       if (!request.blockhash) {
@@ -84,17 +146,11 @@ export class SolanaTransactionService {
         await this.builder.buildTransferInstructions(request)
 
       transaction.recentBlockhash = request.blockhash
-      transaction.feePayer = adapter.publicKey
+      transaction.feePayer = new PublicKey(request.from)
 
-      // Get RPC URL from the network RPC map or fall back to public endpoint
-      const rpcUrl =
-        networkId && this.networkRpcMap[networkId]
-          ? this.networkRpcMap[networkId]
-          : 'https://api.mainnet-beta.solana.com'
-      const connection = new Connection(rpcUrl)
-
-      const signature = await adapter.sendTransaction(transaction, connection)
-      return signature
+      // Execute with helpers
+      const rpcUrl = this.getRpcUrl(networkId)
+      return await this.executeTransaction(adapter, transaction, rpcUrl)
     } catch (error) {
       parseError(error)
     }
@@ -104,19 +160,13 @@ export class SolanaTransactionService {
    * Send SPL token transfer
    */
   private async sendSplTokenTransaction(
-    adapter: WalletAdapter,
+    adapter: SolanaAdapter,
     request: SolanaTokenTransferRequest,
     networkId?: NetworkId
   ): Promise<string> {
     try {
-      if (!adapter.publicKey) {
-        throw new Error('Wallet not connected')
-      }
-
-      // Verify the from address matches connected wallet
-      if (adapter.publicKey.toBase58() !== request.from) {
-        throw new Error('From address does not match connected wallet')
-      }
+      // Validate wallet
+      await this.validateWalletMatch(adapter, request.from)
 
       // Blockhash is required
       if (!request.blockhash) {
@@ -129,17 +179,11 @@ export class SolanaTransactionService {
         await this.builder.buildTransferInstructions(request)
 
       transaction.recentBlockhash = request.blockhash
-      transaction.feePayer = adapter.publicKey
+      transaction.feePayer = new PublicKey(request.from)
 
-      // Get RPC URL from the network RPC map or fall back to public endpoint
-      const rpcUrl =
-        networkId && this.networkRpcMap[networkId]
-          ? this.networkRpcMap[networkId]
-          : 'https://api.mainnet-beta.solana.com'
-      const connection = new Connection(rpcUrl)
-
-      const signature = await adapter.sendTransaction(transaction, connection)
-      return signature
+      // Execute with helpers
+      const rpcUrl = this.getRpcUrl(networkId)
+      return await this.executeTransaction(adapter, transaction, rpcUrl)
     } catch (error) {
       parseError(error)
     }
@@ -149,40 +193,57 @@ export class SolanaTransactionService {
    * Send native SOL transfer
    */
   private async sendGenericTransferWithInstructions(
-    adapter: WalletAdapter,
+    adapter: SolanaAdapter,
     request: SolanaGenericTransferRequest,
     networkId?: NetworkId
   ): Promise<string> {
     try {
-      if (!adapter.publicKey) {
-        throw new Error('Wallet not connected')
-      }
-
-      // Verify the from address matches connected wallet
-      if (adapter.publicKey.toBase58() !== request.feePayer) {
-        throw new Error('From address does not match connected wallet')
-      }
+      // Validate wallet
+      await this.validateWalletMatch(adapter, request.feePayer)
 
       // Blockhash is required
       if (!request.blockhash) {
         throw new Error('Blockhash is required for Solana transactions')
       }
 
-      // Create transaction
+      // Create versioned transaction
       const transaction = await this.builder.getVersionedTransaction(
-        adapter.publicKey,
+        new PublicKey(request.feePayer),
         request
       )
 
-      // Get RPC URL from the network RPC map or fall back to public endpoint
-      const rpcUrl =
-        networkId && this.networkRpcMap[networkId]
-          ? this.networkRpcMap[networkId]
-          : 'https://api.mainnet-beta.solana.com'
-      const connection = new Connection(rpcUrl)
+      // Get RPC URL
+      const rpcUrl = this.getRpcUrl(networkId)
+
+      // VersionedTransaction can't use our helper method, handle directly
+      let transactionSignature: string | undefined
+
+      try {
+        const extendedAdapter = adapter as ExtendedStandardWalletAdapter
+        const serializedTx = transaction.serialize()
+        if (extendedAdapter.sendSerializedTransaction) {
+          transactionSignature =
+            await extendedAdapter.sendSerializedTransaction(
+              serializedTx,
+              rpcUrl
+            )
+        }
+      } catch {
+        // Fallback to regular sendTransaction
+      }
 
-      const signature = await adapter.sendTransaction(transaction, connection)
-      return signature
+      if (!transactionSignature) {
+        const connection = new Connection(rpcUrl)
+        transactionSignature = await adapter.sendTransaction(
+          transaction,
+          connection
+        )
+      }
+
+      if (transactionSignature === undefined) {
+        throw new Error(`Couldn't get the transaction signature`)
+      }
+      return transactionSignature
     } catch (error) {
       parseError(error)
     }

package/src/services/solana/solana-wallet-service.ts

@@ -1,7 +1,7 @@
 import type { NetworkId, AvailableAddress } from '@meshconnect/uwc-types'
-import type { WalletAdapter } from '@solana/wallet-adapter-base'
 import {
   getSolanaWallets,
+  type SolanaAdapter,
   type WalletStandardInfo
 } from '../../wallet-standard-discovery'
 import { StorageService } from '../storage-service'
@@ -11,7 +11,7 @@ import { StorageService } from '../storage-service'
  */
 export class SolanaWalletService {
   private detectedWallets: WalletStandardInfo[] = []
-  private connectedAdapter: WalletAdapter | null = null
+  private connectedAdapter: SolanaAdapter | null = null
   private account: string | null = null
   private storageService: StorageService
 
@@ -22,8 +22,8 @@ export class SolanaWalletService {
   /**
    * Initialize wallet discovery
    */
-  initializeDiscovery(): void {
-    this.detectedWallets = getSolanaWallets()
+  async initializeDiscovery(): Promise<void> {
+    this.detectedWallets = await getSolanaWallets()
   }
 
   /**
@@ -44,30 +44,27 @@ export class SolanaWalletService {
    * Check if a Solana wallet is already connected
    */
   async checkExistingConnection(
-    adapter: WalletAdapter,
+    adapter: SolanaAdapter,
     walletUuid: string
   ): Promise<string | null> {
     try {
+      const base58PublicKey = await adapter.publicKey?.toBase58()
       // Check if adapter has a publicKey (means it's connected)
-      if (adapter.publicKey) {
-        return adapter.publicKey.toBase58()
+      if (base58PublicKey) {
+        return base58PublicKey
       }
 
       // If this wallet was previously connected, try to reconnect
       // This should work without prompting for wallets that support it
       if (this.storageService.wasSolanaWalletPreviouslyConnected(walletUuid)) {
-        if (
-          'connecting' in adapter &&
-          !adapter.connecting &&
-          'connect' in adapter
-        ) {
+        const walletIsConnecting = await adapter.connecting
+        if (!walletIsConnecting) {
           try {
-            // Type assertion needed because TypeScript can't narrow the type properly
             await adapter.connect()
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const publicKey = (adapter as any).publicKey
-            if (publicKey && 'toBase58' in publicKey) {
-              return publicKey.toBase58()
+
+            const base58PublicKey = await adapter.publicKey?.toBase58()
+            if (base58PublicKey) {
+              return base58PublicKey
             }
           } catch {
             // Silent fail - wallet requires user interaction or doesn't support silent reconnect
@@ -83,15 +80,16 @@ export class SolanaWalletService {
   /**
    * Connect to wallet
    */
-  async connect(adapter: WalletAdapter, walletUuid: string): Promise<string> {
+  async connect(adapter: SolanaAdapter, walletUuid: string): Promise<string> {
     // Connect to the Solana wallet
     await adapter.connect()
 
-    if (!adapter.publicKey) {
-      throw new Error('No public key returned from wallet')
+    const address = await adapter.publicKey?.toBase58()
+
+    if (!address) {
+      throw new Error('No address returned from wallet')
     }
 
-    const address = adapter.publicKey.toBase58()
     this.connectedAdapter = adapter
     this.account = address
 
@@ -124,7 +122,7 @@ export class SolanaWalletService {
    * Set connection state
    */
   setConnectionState(
-    adapter: WalletAdapter | null,
+    adapter: SolanaAdapter | null,
     account: string | null,
     walletUuid?: string
   ): void {
@@ -147,7 +145,7 @@ export class SolanaWalletService {
   /**
    * Get connected adapter
    */
-  getConnectedAdapter(): WalletAdapter | null {
+  getConnectedAdapter(): SolanaAdapter | null {
     return this.connectedAdapter
   }
 

package/src/services/transaction-service.ts

@@ -1,5 +1,4 @@
 import type { EthereumProvider } from '../eip6963-discovery'
-import type { WalletAdapter } from '@solana/wallet-adapter-base'
 import type {
   TransactionRequest,
   TransactionResult,
@@ -10,6 +9,7 @@ import type {
 import { EthereumTransactionService } from './ethereum/ethereum-transaction-service'
 import { SolanaTransactionService } from './solana/solana-transaction-service'
 import { parseError } from '../utils/error-utils'
+import type { SolanaAdapter } from '../wallet-standard-discovery'
 
 /**
  * Service for handling transaction operations across different wallet types
@@ -29,7 +29,7 @@ export class TransactionService {
   async sendTransaction(
     request: TransactionRequest,
     namespace: 'eip155' | 'solana',
-    provider: EthereumProvider | WalletAdapter
+    provider: EthereumProvider | SolanaAdapter
   ): Promise<TransactionResult> {
     if (namespace === 'eip155') {
       return await this.ethereumService.sendTransaction(
@@ -39,7 +39,7 @@ export class TransactionService {
     } else if (namespace === 'solana') {
       return await this.solanaService.sendTransaction(
         request as SolanaTransactionRequest,
-        provider as WalletAdapter
+        provider as SolanaAdapter
       )
     } else {
       throw parseError(new Error(`Unsupported namespace: ${namespace}`))