@meshconnect/uwc-injected-connector 0.2.7 → 0.2.9

package/src/wallet-standard-discovery.ts

@@ -7,28 +7,97 @@
 import type { Wallet } from '@wallet-standard/base'
 import { getWallets } from '@wallet-standard/app'
 import { isWalletAdapterCompatibleStandardWallet } from '@solana/wallet-adapter-base'
-import type { WalletAdapter } from '@solana/wallet-adapter-base'
 import { StandardWalletAdapter } from '@solana/wallet-standard-wallet-adapter-base'
-import { CoinbaseWalletAdapter } from '@solana/wallet-adapter-wallets'
+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
+  adapter: SolanaAdapter | undefined
 }
 
-export interface SolanaWalletWithAdapter {
-  info: WalletStandardInfo
-  wallet: Wallet
-  adapter?: WalletAdapter
+/**
+ * Polls for bridge wallets when UWCBridgeInitialized is true
+ * @returns Promise that resolves to an array of detected wallets from the bridge
+ */
+async function pollForBridgeWallets(): Promise<WalletStandardInfo[]> {
+  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 as WalletStandardInfo[]
+        resolve(bridgeWallets)
+        return
+      }
+
+      // Continue polling
+      setTimeout(poll, pollInterval)
+    }
+
+    // Start polling
+    poll()
+  })
 }
 
 /**
  * Gets all available Solana wallets using Wallet Standard
  */
-export function getSolanaWallets(): WalletStandardInfo[] {
+export async function getSolanaWallets(): Promise<WalletStandardInfo[]> {
+  // 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()
 
@@ -56,30 +125,6 @@ export function getSolanaWallets(): WalletStandardInfo[] {
     }
   }
 
-  // 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
 }