@meshconnect/uwc-core 2.5.16 → 2.7.0-snapshot.c392d3d

package/dist/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,gBAAgB,WAAW,CAAA"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,gBAAgB,UAAU,CAAA"}

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated from package.json by scripts/generate-version.mjs — do not edit.
-export const UWC_CORE_VERSION = '2.5.16';
+export const UWC_CORE_VERSION = '2.7.0';
 //# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/uwc-core",
-  "version": "2.5.16",
+  "version": "2.7.0-snapshot.c392d3d",
   "description": "Core functionality for Universal Wallet Connector",
   "type": "module",
   "main": "dist/index.js",
@@ -16,10 +16,10 @@
     "src"
   ],
   "dependencies": {
-    "@meshconnect/uwc-injected-connector": "0.26.3",
-    "@meshconnect/uwc-ton-connector": "0.9.9",
-    "@meshconnect/uwc-types": "0.30.1",
-    "@meshconnect/uwc-wallet-connect-connector": "0.14.19"
+    "@meshconnect/uwc-injected-connector": "0.27.1-snapshot.c392d3d",
+    "@meshconnect/uwc-ton-connector": "0.9.11-snapshot.c392d3d",
+    "@meshconnect/uwc-types": "0.32.0-snapshot.c392d3d",
+    "@meshconnect/uwc-wallet-connect-connector": "0.14.21-snapshot.c392d3d"
   },
   "devDependencies": {
     "typescript": "^7.0.2"

package/src/events.ts

@@ -251,6 +251,10 @@ export interface UWCEventMap {
     connectAttemptId?: string | undefined
     /** switchNetwork only: target chain already the active one (no-op switch). */
     targetAlreadyActive?: boolean | undefined
+    /** connect only: a `silentOnly` attempt (no wallet UI allowed). */
+    silentOnly?: boolean | undefined
+    /** connect only: how the connect network was chosen. */
+    networkSelection?: 'explicit' | 'detected' | 'catalogOrder' | undefined
   }
 
   /** The wallet resolved the op successfully. Closes a handoff. */
@@ -270,6 +274,10 @@ export interface UWCEventMap {
     connectAttemptId?: string | undefined
     /** switchNetwork only: target chain already the active one (no-op switch). */
     targetAlreadyActive?: boolean | undefined
+    /** connect only: a `silentOnly` attempt (no wallet UI allowed). */
+    silentOnly?: boolean | undefined
+    /** connect only: how the connect network was chosen. */
+    networkSelection?: 'explicit' | 'detected' | 'catalogOrder' | undefined
     /** Backgrounding during this handoff: cumulative hidden time (ms) + transition count. */
     backgroundedMs?: number | undefined
     backgroundCount?: number | undefined
@@ -303,6 +311,10 @@ export interface UWCEventMap {
     /** Per-connect identifier shared by all events in this connect flow. */
     connectAttemptId?: string | undefined
     targetAlreadyActive?: boolean | undefined
+    /** connect only: a `silentOnly` attempt (no wallet UI allowed). */
+    silentOnly?: boolean | undefined
+    /** connect only: how the connect network was chosen. */
+    networkSelection?: 'explicit' | 'detected' | 'catalogOrder' | undefined
     /** Stringified error code (EIP-1193 numeric / string), when present. */
     errorCode?: string | undefined
     failureKind?: FailureKind | undefined
@@ -328,6 +340,10 @@ export interface UWCEventMap {
     /** Per-connect identifier shared by all events in this connect flow. */
     connectAttemptId?: string | undefined
     targetAlreadyActive?: boolean | undefined
+    /** connect only: a `silentOnly` attempt (no wallet UI allowed). */
+    silentOnly?: boolean | undefined
+    /** connect only: how the connect network was chosen. */
+    networkSelection?: 'explicit' | 'detected' | 'catalogOrder' | undefined
     /** Stringified error code (EIP-1193 numeric / string), when present. */
     errorCode?: string | undefined
     failureKind?: FailureKind | undefined
@@ -358,6 +374,10 @@ export interface UWCEventMap {
     connectAttemptId?: string | undefined
     /** switchNetwork only: target chain already the active one (no-op switch). */
     targetAlreadyActive?: boolean | undefined
+    /** connect only: a `silentOnly` attempt (no wallet UI allowed). */
+    silentOnly?: boolean | undefined
+    /** connect only: how the connect network was chosen. */
+    networkSelection?: 'explicit' | 'detected' | 'catalogOrder' | undefined
     /** Backgrounding so far (marker fires mid-flight): hidden time (ms) + transition count. */
     backgroundedMs?: number | undefined
     backgroundCount?: number | undefined

package/src/index.ts

@@ -21,3 +21,7 @@ export {
   type UWCTelemetryEvent
 } from './observability/telemetry'
 export { toBaseUnits } from './utils/to-base-units'
+export {
+  DEFAULT_NAMESPACE_PRIORITY,
+  type NetworkSelection
+} from './services/network-selection'

package/src/observability/instrument-handoff.ts

@@ -1,3 +1,4 @@
+import type { NetworkSelection } from '../services/network-selection'
 import {
   BatchConfirmedWithoutReceiptError,
   type ConnectionMode,
@@ -29,6 +30,10 @@ export interface HandoffContext {
   connectAttemptId?: string | undefined
   /** switchNetwork only: target chain already the active one (no-op switch). */
   targetAlreadyActive?: boolean | undefined
+  /** connect only: the attempt was `silentOnly` (see `ConnectOptions.silentOnly`). */
+  silentOnly?: boolean | undefined
+  /** connect only: how the connect network was chosen (see `NetworkSelection`). */
+  networkSelection?: NetworkSelection | undefined
 }
 
 /** Build handoff routing facets from the active session (no address). */
@@ -151,6 +156,12 @@ export async function instrumentHandoff<T>(
     }),
     ...(context.targetAlreadyActive !== undefined && {
       targetAlreadyActive: context.targetAlreadyActive
+    }),
+    ...(context.silentOnly !== undefined && {
+      silentOnly: context.silentOnly
+    }),
+    ...(context.networkSelection !== undefined && {
+      networkSelection: context.networkSelection
     })
   })
 
@@ -196,6 +207,12 @@ export async function instrumentHandoff<T>(
     }),
     ...(context.targetAlreadyActive !== undefined && {
       targetAlreadyActive: context.targetAlreadyActive
+    }),
+    ...(context.silentOnly !== undefined && {
+      silentOnly: context.silentOnly
+    }),
+    ...(context.networkSelection !== undefined && {
+      networkSelection: context.networkSelection
     })
   }
 

package/src/observability/telemetry.test.ts

@@ -867,6 +867,89 @@ describe('normalizeEvent', () => {
     expect(out.connectAttemptId).toBe('attempt-1')
   })
 
+  it('forwards a scrubbed providerReason on walletFailed', () => {
+    const out = normalizeEvent(
+      'walletFailed',
+      {
+        handoffId: 'h-1',
+        operation: 'sendTransaction',
+        durationMs: 1,
+        error: {
+          type: 'unknown',
+          message: 'An unknown RPC error occurred.',
+          providerReason:
+            'cancelled for 0x1234567890123456789012345678901234567890'
+        },
+        connectionMode: 'injected',
+        timedOut: false
+      },
+      SDK_SESSION,
+      NOW
+    )
+    expect(out.error?.providerReason).toContain('cancelled for ')
+    expect(out.error?.providerReason).not.toContain(
+      '1234567890123456789012345678901234567890'
+    )
+  })
+
+  it('redacts an address in a long providerReason before capping it', () => {
+    const address = '0x1234567890123456789012345678901234567890'
+    const out = normalizeEvent(
+      'walletFailed',
+      {
+        handoffId: 'h-1',
+        operation: 'sendTransaction',
+        durationMs: 1,
+        error: {
+          type: 'unknown',
+          message: 'An unknown RPC error occurred.',
+          // The address straddles the 500-character cap.
+          providerReason: `${'x'.repeat(480)} ${address}`
+        },
+        connectionMode: 'injected',
+        timedOut: false
+      },
+      SDK_SESSION,
+      NOW
+    )
+    expect(out.error?.providerReason).not.toContain('0x1234567890')
+    expect(out.error?.providerReason).toContain('0x[redacted-hex]')
+  })
+
+  it('omits providerReason from the record when the error has none', () => {
+    const out = normalizeEvent(
+      'walletFailed',
+      {
+        handoffId: 'h-1',
+        operation: 'sendTransaction',
+        durationMs: 1,
+        error: { type: 'unknown', message: 'failed' },
+        connectionMode: 'injected',
+        timedOut: false
+      },
+      SDK_SESSION,
+      NOW
+    )
+    expect(out.error).toEqual({ type: 'unknown', message: 'failed' })
+  })
+
+  it('forwards providerReason on the error event too', () => {
+    const out = normalizeEvent(
+      'error',
+      {
+        error: {
+          type: 'unknown',
+          message: 'failed',
+          providerReason: 'cancelled'
+        },
+        operation: 'sendTransaction'
+      },
+      SDK_SESSION,
+      NOW
+    )
+    expect(out.error?.providerReason).toBe('cancelled')
+  })
+
   it('does not expose a stray connectAttemptId on data-bearing non-connect events', () => {
     const out = normalizeEvent(
       'error',

package/src/observability/telemetry.ts

@@ -52,6 +52,20 @@ function capNetworkMismatch(
   }
 }
 
+/**
+ * Egress shape for a wallet error. `providerReason` is wallet-controlled text, so
+ * it gets the same scrubber as `message` and is omitted when absent.
+ */
+function toTelemetryError(error: WalletError): WalletError {
+  return {
+    type: error.type,
+    message: scrubMessage(error.message),
+    ...(error.providerReason
+      ? { providerReason: scrubMessage(error.providerReason) }
+      : {})
+  }
+}
+
 /**
  * A normalized, PII-safe telemetry record derived from a `UWCEventMap` event.
  *
@@ -107,6 +121,10 @@ export interface UWCTelemetryEvent {
   timeoutMs?: number | undefined
   /** switchNetwork only: target chain was already the active one (no-op switch). */
   targetAlreadyActive?: boolean | undefined
+  /** connect only: a `silentOnly` attempt — tells a silent restore from a tapped connect. */
+  silentOnly?: boolean | undefined
+  /** connect only: how the connect network was chosen — explicit, detected, or catalog order. */
+  networkSelection?: 'explicit' | 'detected' | 'catalogOrder' | undefined
   /** Non-success outcomes: stringified error code when reliably known. */
   errorCode?: string | undefined
   /** Non-success outcomes: coarse cause bucket. `unknown` when not classifiable. */
@@ -432,7 +450,7 @@ function buildTelemetryEvent<K extends UWCEventName>(
       return {
         ...base,
         operation: d.operation,
-        error: { type: d.error.type, message: scrubMessage(d.error.message) },
+        error: toTelemetryError(d.error),
         // Telemetry-only classification — undefined for ordinary errors, set for
         // pre-wallet validation failures (e.g. no_common_network) that never
         // reach the handoff funnel.
@@ -456,7 +474,9 @@ function buildTelemetryEvent<K extends UWCEventName>(
         connectAttemptId: getConnectAttemptId(d.operation, d.connectAttemptId),
         walletFlowType: d.walletFlowType,
         platform: d.platform,
-        targetAlreadyActive: d.targetAlreadyActive
+        targetAlreadyActive: d.targetAlreadyActive,
+        silentOnly: d.silentOnly,
+        networkSelection: d.networkSelection
       }
     }
     case 'walletSucceeded': {
@@ -474,6 +494,8 @@ function buildTelemetryEvent<K extends UWCEventName>(
         timedOut: d.timedOut,
         timeoutMs: d.timeoutMs,
         targetAlreadyActive: d.targetAlreadyActive,
+        silentOnly: d.silentOnly,
+        networkSelection: d.networkSelection,
         backgroundedMs: d.backgroundedMs,
         backgroundCount: d.backgroundCount,
         relayDropCount: d.relayDropCount,
@@ -495,12 +517,12 @@ function buildTelemetryEvent<K extends UWCEventName>(
         timedOut: d.timedOut,
         timeoutMs: d.timeoutMs,
         targetAlreadyActive: d.targetAlreadyActive,
+        silentOnly: d.silentOnly,
+        networkSelection: d.networkSelection,
         errorCode: d.errorCode,
         failureKind: d.failureKind,
         source: d.source,
-        error: d.error
-          ? { type: d.error.type, message: scrubMessage(d.error.message) }
-          : undefined,
+        error: d.error ? toTelemetryError(d.error) : undefined,
         backgroundedMs: d.backgroundedMs,
         backgroundCount: d.backgroundCount,
         relayDropCount: d.relayDropCount
@@ -520,6 +542,8 @@ function buildTelemetryEvent<K extends UWCEventName>(
         durationMs: d.durationMs,
         timeoutMs: d.timeoutMs,
         targetAlreadyActive: d.targetAlreadyActive,
+        silentOnly: d.silentOnly,
+        networkSelection: d.networkSelection,
         backgroundedMs: d.backgroundedMs,
         backgroundCount: d.backgroundCount,
         relayDropCount: d.relayDropCount
@@ -555,10 +579,12 @@ function buildTelemetryEvent<K extends UWCEventName>(
         timedOut: d.timedOut,
         timeoutMs: d.timeoutMs,
         targetAlreadyActive: d.targetAlreadyActive,
+        silentOnly: d.silentOnly,
+        networkSelection: d.networkSelection,
         errorCode: d.errorCode,
         failureKind: d.failureKind,
         source: d.source,
-        error: { type: d.error.type, message: scrubMessage(d.error.message) },
+        error: toTelemetryError(d.error),
         backgroundedMs: d.backgroundedMs,
         backgroundCount: d.backgroundCount,
         relayDropCount: d.relayDropCount
@@ -602,7 +628,7 @@ function buildTelemetryEvent<K extends UWCEventName>(
         ...base,
         connectionMode: d.connectionMode,
         namespace: d.namespace,
-        error: { type: d.error.type, message: scrubMessage(d.error.message) }
+        error: toTelemetryError(d.error)
       }
     }
     case 'secondarySolanaConnectSkipped': {
@@ -644,7 +670,7 @@ function buildTelemetryEvent<K extends UWCEventName>(
         namespace: d.namespace,
         source: 'bridge',
         failureKind: 'bridge_error',
-        error: { type: d.error.type, message: scrubMessage(d.error.message) }
+        error: toTelemetryError(d.error)
       }
     }
     case 'relayError': {
@@ -656,7 +682,7 @@ function buildTelemetryEvent<K extends UWCEventName>(
         connectionMode: 'walletConnect',
         source: 'provider',
         failureKind: 'network_error',
-        error: { type: d.error.type, message: scrubMessage(d.error.message) }
+        error: toTelemetryError(d.error)
       }
     }
     case 'relayErrorCapped':
@@ -677,7 +703,7 @@ function buildTelemetryEvent<K extends UWCEventName>(
         connectionMode: 'walletConnect',
         source: 'provider',
         failureKind: 'client_init_failed',
-        error: { type: d.error.type, message: scrubMessage(d.error.message) }
+        error: toTelemetryError(d.error)
       }
     }
     case 'walletAccountChanged':

package/src/services/connection-service.test.ts

@@ -12,7 +12,10 @@ import type {
   ConnectionMode,
   Connector
 } from '@meshconnect/uwc-types'
-import { NoCommonNetworkError } from '@meshconnect/uwc-types'
+import {
+  NoCommonNetworkError,
+  WalletNotAuthorizedError
+} from '@meshconnect/uwc-types'
 import type { WalletLifecycleEvent } from '@meshconnect/uwc-types'
 
 describe('ConnectionService', () => {
@@ -111,11 +114,11 @@ describe('ConnectionService', () => {
     const mockProvider = {
       supportedNetworkIds: ['eip155:1']
     }
-    const network = connectionService['validateAndDetermineNetwork'](
-      'eip155:1',
-      mockProvider as any
-    )
+    const { network, selection } = connectionService[
+      'validateAndDetermineNetwork'
+    ]('eip155:1', mockProvider as any, 'injected')
     expect(network).toEqual(networks[0])
+    expect(selection).toBe('explicit')
   })
 
   it('should throw error for unknown network', () => {
@@ -125,7 +128,8 @@ describe('ConnectionService', () => {
     expect(() => {
       connectionService['validateAndDetermineNetwork'](
         'eip155:8453',
-        mockProvider as any
+        mockProvider as any,
+        'injected'
       )
     }).toThrow('Network eip155:8453 is not in the configured networks')
   })
@@ -140,7 +144,8 @@ describe('ConnectionService', () => {
     try {
       connectionService['validateAndDetermineNetwork'](
         undefined,
-        mockProvider as any
+        mockProvider as any,
+        'injected'
       )
     } catch (e) {
       thrown = e
@@ -211,6 +216,115 @@ describe('ConnectionService', () => {
       expect(connectionService['activeConnector']).toBe(mockConnector)
     })
 
+    // ONC-1975: silentOnly is a promise never to open wallet UI.
+    it('forwards silentOnly to the injected connector', async () => {
+      const provider = { supportedNetworkIds: ['eip155:1'] }
+      wallets[0].extensionInjectedProvider = provider as any
+      mockConnector.connect = vi.fn().mockResolvedValue({
+        networkId: 'eip155:1',
+        address: '0x1234',
+        availableAddresses: [{ address: '0x1234', networkId: 'eip155:1' }]
+      })
+
+      await connectionService.connect('injected', 'metamask', 'eip155:1', {
+        silentOnly: true
+      })
+
+      expect(mockConnector.connect).toHaveBeenCalledWith(
+        networks[0],
+        provider,
+        {
+          silentOnly: true
+        }
+      )
+    })
+
+    it('tags the connect funnel with silentOnly, so a silent restore is not counted as a tap', async () => {
+      const provider = { supportedNetworkIds: ['eip155:1'] }
+      wallets[0].extensionInjectedProvider = provider as any
+      mockConnector.connect = vi.fn().mockResolvedValue({
+        networkId: 'eip155:1',
+        address: '0x1234',
+        availableAddresses: [{ address: '0x1234', networkId: 'eip155:1' }]
+      })
+      const awaiting = vi.fn()
+      const succeeded = vi.fn()
+      eventManager.on('awaitingWallet', awaiting)
+      eventManager.on('walletSucceeded', succeeded)
+
+      await connectionService.connect('injected', 'metamask', 'eip155:1', {
+        silentOnly: true
+      })
+      await connectionService.connect('injected', 'metamask', 'eip155:1')
+
+      expect(awaiting.mock.calls.map(([e]) => e.silentOnly)).toEqual([
+        true,
+        false
+      ])
+      expect(succeeded.mock.calls.map(([e]) => e.silentOnly)).toEqual([
+        true,
+        false
+      ])
+    })
+
+    it('passes no connect options when neither silentOnly nor requiredAddresses is set', async () => {
+      const provider = { supportedNetworkIds: ['eip155:1'] }
+      wallets[0].extensionInjectedProvider = provider as any
+      mockConnector.connect = vi.fn().mockResolvedValue({
+        networkId: 'eip155:1',
+        address: '0x1234',
+        availableAddresses: [{ address: '0x1234', networkId: 'eip155:1' }]
+      })
+
+      await connectionService.connect('injected', 'metamask', 'eip155:1', {
+        silentOnly: false
+      })
+
+      expect(mockConnector.connect).toHaveBeenCalledWith(
+        networks[0],
+        provider,
+        undefined
+      )
+    })
+
+    it('rejects silentOnly for a non-injected mode before the attempt starts', async () => {
+      const walletConnectConnector: Connector = {
+        connect: vi.fn(),
+        disconnect: vi.fn(),
+        signMessage: vi.fn(),
+        sendTransaction: vi.fn(),
+        switchNetwork: vi.fn()
+      }
+      connectors.set('walletConnect', walletConnectConnector)
+      wallets[0].walletConnectProvider = {
+        supportedNetworkIds: ['eip155:1']
+      } as any
+      const connectingListener = vi.fn()
+      const awaiting = vi.fn()
+      eventManager.on('connecting', connectingListener)
+      eventManager.on('awaitingWallet', awaiting)
+
+      await expect(
+        connectionService.connect('walletConnect', 'metamask', 'eip155:1', {
+          silentOnly: true
+        })
+      ).rejects.toThrow(
+        "silentOnly is not supported for connection mode 'walletConnect'"
+      )
+      // A caller bug, not the expected `not_authorized` miss.
+      await expect(
+        connectionService.connect('walletConnect', 'metamask', 'eip155:1', {
+          silentOnly: true
+        })
+      ).rejects.not.toBeInstanceOf(WalletNotAuthorizedError)
+
+      // A validation failure: never reaches the wallet, never enters the funnel.
+      expect(walletConnectConnector.connect).not.toHaveBeenCalled()
+      expect(connectingListener).not.toHaveBeenCalled()
+      expect(awaiting).not.toHaveBeenCalled()
+      expect(connectionService['activeConnector']).toBeNull()
+    })
+
     it('does not emit "connecting" when validation throws (unknown wallet)', async () => {
       const connectingListener = vi.fn()
       eventManager.on('connecting', connectingListener)
@@ -264,6 +378,44 @@ describe('ConnectionService', () => {
       expect(awaiting.namespace).toBe('eip155')
       expect(awaiting.chainId).toBe('eip155:1')
       expect(awaiting.handoffId).toBe(events[1].data.handoffId)
+      expect(awaiting.networkSelection).toBe('explicit')
+    })
+
+    it('auto-picks a detected namespace over an undetected first network (ONC-2110)', async () => {
+      networks.push({
+        ...networks[0],
+        id: 'tron:0x2b6653dc',
+        internalId: 2,
+        name: 'Tron',
+        namespace: 'tron',
+        networkType: 'tron'
+      } as Network)
+      // Trust mobile: catalog lists Tron first, but only EVM was detected.
+      wallets[0].extensionInjectedProvider = {
+        supportedNetworkIds: ['tron:0x2b6653dc', 'eip155:1'],
+        namespaceMetaData: {
+          tron: { injectedId: 'trustWallet.tronLink', installed: false },
+          eip155: { eip155Name: 'Trust Wallet', installed: true }
+        }
+      } as any
+      const awaiting = vi.fn()
+      eventManager.on('awaitingWallet', awaiting)
+      mockConnector.connect = vi.fn().mockResolvedValue({
+        networkId: 'eip155:1',
+        address: '0x1234',
+        availableAddresses: [{ address: '0x1234', networkId: 'eip155:1' }]
+      })
+
+      await connectionService.connect('injected', 'metamask')
+
+      expect(awaiting).toHaveBeenCalledWith(
+        expect.objectContaining({
+          chainId: 'eip155:1',
+          namespace: 'eip155',
+          networkSelection: 'detected'
+        })
+      )
+      expect(sessionManager.getSession().activeNetwork?.id).toBe('eip155:1')
     })
 
     it('emits one stable attempt ID per connect and a different ID for the next connect', async () => {