@meshconnect/uwc-core 2.2.0-snapshot.ec6b95b → 2.3.0

package/src/services/connection-service.ts

@@ -15,6 +15,7 @@ import { NoCommonNetworkError } from '@meshconnect/uwc-types'
 import type { SessionManager } from '../managers/session-manager'
 import type { EventManager } from '../managers/event-manager'
 import { raceAbort } from '../utils/abort'
+import { generateId } from '../utils/id'
 import { instrumentHandoff } from '../observability/instrument-handoff'
 import { attachLifecycle } from '../observability/lifecycle-bridge'
 
@@ -95,6 +96,7 @@ export class ConnectionService {
     const provider = this.getProviderForMode(wallet, connectionMode)
     const network = this.validateAndDetermineNetwork(networkId, provider)
     const connector = this.getConnector(connectionMode)
+    const connectAttemptId = generateId()
 
     // Supersede any prior in-flight attempt: abort it so its URI poll and
     // handoff visibility listeners tear down (via the abort paths below) BEFORE
@@ -122,7 +124,11 @@ export class ConnectionService {
 
     // Emit AFTER validation so a thrown lookup/validation error doesn't leave
     // listeners seeing a "connecting" state for an attempt that never started.
-    this.eventManager.emit('connecting', { connectionMode, walletId })
+    this.eventManager.emit('connecting', {
+      connectionMode,
+      walletId,
+      connectAttemptId
+    })
 
     // Store the active connector BEFORE starting connection
     // This allows getConnectionURI to work while connection is in progress
@@ -145,7 +151,8 @@ export class ConnectionService {
           connectionMode,
           walletId,
           namespace: network.namespace,
-          chainId: network.id
+          chainId: network.id,
+          connectAttemptId
         },
         async handoffId => {
           // Publish this attempt's routing for the connector's step sink.
@@ -156,7 +163,8 @@ export class ConnectionService {
               connector,
               network,
               provider,
-              signal
+              signal,
+              connectAttemptId
             )
           } finally {
             // Retract ONLY if we are still the published attempt. An
@@ -245,7 +253,8 @@ export class ConnectionService {
     connector: Connector,
     network: Network,
     provider: SupportedProvider,
-    signal: AbortSignal
+    signal: AbortSignal,
+    connectAttemptId: string
   ): Promise<ConnectorResult> {
     // Race the connector call against the AbortSignal so a mid-flight abort
     // (e.g. user cancels the WalletConnect QR while the prompt is open)
@@ -271,7 +280,8 @@ export class ConnectionService {
           network,
           provider,
           connectionMode,
-          signal
+          signal,
+          connectAttemptId
         ),
         signal
       )
@@ -730,7 +740,8 @@ export class ConnectionService {
     network: Network,
     provider: SupportedProvider,
     connectionMode: ConnectionMode,
-    signal?: AbortSignal
+    signal: AbortSignal | undefined,
+    connectAttemptId: string
   ): Promise<ConnectorResult> {
     const connectPromise = connector.connect(network, provider)
 
@@ -752,7 +763,11 @@ export class ConnectionService {
       }
       if (uri && uri !== emittedUri) {
         emittedUri = uri
-        this.eventManager.emit('connectionUri', { uri, connectionMode })
+        this.eventManager.emit('connectionUri', {
+          uri,
+          connectionMode,
+          connectAttemptId
+        })
       }
     }, 100)
 

package/src/universal-wallet-connector.ts

@@ -12,6 +12,7 @@ import type {
   DetectedSolanaWalletInfo,
   DetectedTronWalletInfo,
   DetectedTonWalletInfo,
+  DetectedBitcoinWalletInfo,
   TransactionRequest,
   TransactionResult,
   NetworkRpcMap,
@@ -19,7 +20,8 @@ import type {
   SignatureResult,
   EIP712TypedData,
   LogLevel,
-  Logger
+  Logger,
+  BitcoinConfig
 } from '@meshconnect/uwc-types'
 import { InjectedConnector } from '@meshconnect/uwc-injected-connector'
 import { WalletConnectConnector } from '@meshconnect/uwc-wallet-connect-connector'
@@ -63,6 +65,8 @@ export interface UWCConfig {
   walletConnectConfig?: WalletConnectConfig
   tonConnectConfig?: TonConnectConfig
   tronConnectorConfig?: TronConnectorConfig
+  /** Config for the Bitcoin (bip122) namespace module, threaded into the injected connector. */
+  bitcoinConfig?: BitcoinConfig
   // ---- Observability (all optional; defaults preserve current behaviour) -----
   /**
    * Vendor-agnostic telemetry sink. When omitted, UWC emits NOTHING externally —
@@ -211,7 +215,8 @@ export class UniversalWalletConnector {
       usingIntegratedBrowser: configuredUsingIntegratedBrowser = false,
       walletConnectConfig: configuredWalletConnectConfig,
       tonConnectConfig: configuredTonConnectConfig,
-      tronConnectorConfig: configuredTronConnectorConfig
+      tronConnectorConfig: configuredTronConnectorConfig,
+      bitcoinConfig: configuredBitcoinConfig
     } = config
 
     // Observability seam — wire the event bus, logger, and (optional) observer
@@ -299,6 +304,7 @@ export class UniversalWalletConnector {
       expectedWallets: this.wallets,
       tonConnectConfig: configuredTonConnectConfig,
       tronConnectorConfig: configuredTronConnectorConfig,
+      bitcoinConfig: configuredBitcoinConfig,
       networks,
       // Only forward when the consumer set it, so the connector's own default
       // stays the single source of truth for the value (exactOptionalPropertyTypes).
@@ -611,6 +617,14 @@ export class UniversalWalletConnector {
           pickProvider(w)?.namespaceMetaData?.tvm?.jsBridgeKey ===
           tonDetected.jsBridgeKey
       )
+    } else if (namespace === 'bip122') {
+      wallet = this.wallets.find(
+        w =>
+          pickProvider(
+            w
+          )?.namespaceMetaData?.bip122?.walletStandardName?.toLowerCase() ===
+          detected.name.toLowerCase()
+      )
     } else {
       wallet = this.wallets.find(
         w => w.name.toLowerCase() === detected.name.toLowerCase()
@@ -676,6 +690,18 @@ export class UniversalWalletConnector {
         icon: d.icon,
         jsBridgeKey: d.jsBridgeKey
       }
+    } else if (namespace === 'bip122') {
+      const m = nsMetadata as {
+        installed?: boolean
+        detectedWallet?: DetectedBitcoinWalletInfo
+      }
+      const d = detected as DetectedBitcoinWalletInfo
+      m.installed = true
+      m.detectedWallet = {
+        uuid: d.uuid,
+        name: d.name,
+        features: d.features ?? []
+      }
     }
   }
 

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated from package.json by scripts/generate-version.mjs — do not edit.
-export const UWC_CORE_VERSION = '2.2.0'
+export const UWC_CORE_VERSION = '2.3.0'