Fixed vendor

Author: KyrylR

web/src/simplicity/lwk.ts

@@ -3,18 +3,13 @@
  * Only the address / serialization helpers are still used by the Wallet ABI web flow.
  */
 
-let lwkInit: Promise<typeof import('lwk_web')> | null = null
+let lwkInit: Promise<typeof import('wallet-abi-sdk-alpha/vendor')> | null = null
 
-function getWasmUrl(): string {
-  if (import.meta.env.DEV) return '/lwk_wasm_bg.wasm'
-  return `${import.meta.env.BASE_URL}assets/lwk_wasm_bg.wasm`
-}
-
-export async function getLwk(): Promise<typeof import('lwk_web')> {
+export async function getLwk(): Promise<typeof import('wallet-abi-sdk-alpha/vendor')> {
   if (!lwkInit) {
     lwkInit = (async () => {
-      const lwk = await import('lwk_web')
-      if (typeof lwk.default === 'function') await lwk.default(getWasmUrl())
+      const lwk = await import('wallet-abi-sdk-alpha/vendor')
+      if (typeof lwk.default === 'function') await lwk.default()
       return lwk
     })()
   }

web/src/walletAbi/WalletAbiSessionContext.tsx

@@ -1,3 +1,5 @@
+/* eslint-disable react-refresh/only-export-components */
+
 import {
   createContext,
   useContext,
@@ -44,6 +46,7 @@ export interface WalletAbiSessionValue {
 }
 
 const REQUEST_TIMEOUT_MS = 300_000
+const SESSION_IDENTITY_REQUEST_TIMEOUT_MS = 15_000
 const WalletAbiSessionContext = createContext<WalletAbiSessionValue | null>(null)
 
 function errorMessage(error: unknown): string {
@@ -141,6 +144,13 @@ export function WalletAbiSessionProvider({ children }: PropsWithChildren) {
     return nextClient
   }
 
+  const createIdentityClient = (controller: WalletAbiSessionController): WalletAbiClient => {
+    return new WalletAbiClient({
+      requester: buildRequester(controller),
+      requestTimeoutMs: SESSION_IDENTITY_REQUEST_TIMEOUT_MS,
+    })
+  }
+
   const getController = async (): Promise<WalletAbiSessionController> => {
     if (reownProjectId.length === 0) {
       throw new Error('Missing VITE_REOWN_PROJECT_ID')
@@ -158,7 +168,7 @@ export function WalletAbiSessionProvider({ children }: PropsWithChildren) {
     const nextControllerPromise = createWalletAbiSessionController({
       projectId: reownProjectId,
       network: walletAbiNetwork,
-      origin: window.location.origin,
+      appUrl: window.location.href,
     }).then((controller) => {
       controllerRef.current = controller
       return controller
@@ -174,9 +184,10 @@ export function WalletAbiSessionProvider({ children }: PropsWithChildren) {
   }
 
   const hydrateSession = async (controller: WalletAbiSessionController): Promise<WalletAbiClient> => {
+    const identityClient = createIdentityClient(controller)
     const client = getClient(controller)
-    const nextAddress = await client.getSignerReceiveAddress()
-    const nextPubkey = await client.getRawSigningXOnlyPubkey()
+    const nextAddress = await identityClient.getSignerReceiveAddress()
+    const nextPubkey = await identityClient.getRawSigningXOnlyPubkey()
     const nextScript = await getScriptPubkeyHexFromAddress(nextAddress)
 
     setSignerReceiveAddress(nextAddress)
@@ -238,6 +249,8 @@ export function WalletAbiSessionProvider({ children }: PropsWithChildren) {
     rememberWalletScript(signingXOnlyPubkey, network, signerScriptPubkeyHex)
   }, [network, signerScriptPubkeyHex, signingXOnlyPubkey])
 
+  // This effect should only rebind the controller when the project id or target network changes.
+  // The helper functions close over refs/state and are intentionally not dependency drivers here.
   useEffect(() => {
     let cancelled = false
     let unsubscribe: (() => void) | undefined
@@ -294,7 +307,7 @@ export function WalletAbiSessionProvider({ children }: PropsWithChildren) {
       cancelled = true
       unsubscribe?.()
     }
-  }, [reownProjectId, walletAbiNetwork])
+  }, [reownProjectId, walletAbiNetwork]) // eslint-disable-line react-hooks/exhaustive-deps
 
   const value: WalletAbiSessionValue = {
     status,

web/src/walletAbi/walletConnectSession.test.ts

@@ -1,7 +1,10 @@
+import { EventEmitter } from 'node:events'
 import { describe, expect, it } from 'vitest'
-import type { SessionTypes } from '@walletconnect/types'
+import type { SessionTypes, SignClientTypes } from '@walletconnect/types'
 import {
+  awaitWalletAbiApprovedSession,
   createWalletAbiCaipNetwork,
+  createWalletAbiMetadata,
   resolveWalletAbiNetwork,
   selectWalletAbiSessions,
 } from './walletConnectSession'
@@ -69,6 +72,40 @@ function sessionWith({
   }
 }
 
+function createMockApprovalSignClient(initialSessions: SessionTypes.Struct[] = []) {
+  const emitter = new EventEmitter()
+  const sessions = [...initialSessions]
+
+  return {
+    signClient: {
+      session: {
+        getAll() {
+          return [...sessions]
+        },
+      },
+      on(
+        event: 'session_connect',
+        listener: (event: SignClientTypes.EventArguments['session_connect']) => void
+      ) {
+        emitter.on(event, listener)
+      },
+      off(
+        event: 'session_connect',
+        listener: (event: SignClientTypes.EventArguments['session_connect']) => void
+      ) {
+        emitter.off(event, listener)
+      },
+    },
+    addSession(session: SessionTypes.Struct) {
+      sessions.unshift(session)
+    },
+    emitSessionConnect(session: SessionTypes.Struct) {
+      sessions.unshift(session)
+      emitter.emit('session_connect', { session })
+    },
+  }
+}
+
 describe('walletConnectSession', () => {
   it('keeps the newest wallet_abi session and marks older ones as stale', () => {
     const chainId = 'walabi:testnet-liquid'
@@ -105,6 +142,96 @@ describe('walletConnectSession', () => {
     expect(resolveWalletAbiNetwork('unsupported-network')).toBe('testnet-liquid')
   })
 
+  it('includes a redirect target in WalletConnect metadata for mobile handoff', () => {
+    expect(createWalletAbiMetadata('https://app.example/connect?wallet=green')).toEqual({
+      name: 'Simplicity Lending',
+      description: 'Wallet ABI WalletConnect session for the Simplicity Lending web app.',
+      url: 'https://app.example/connect?wallet=green',
+      icons: ['https://app.example/vite.svg'],
+      redirect: {
+        universal: 'https://app.example/connect?wallet=green',
+      },
+    })
+  })
+
+  it('accepts session_connect as a fallback when approval does not settle', async () => {
+    const chainId = 'walabi:testnet-liquid'
+    const { signClient, emitSessionConnect } = createMockApprovalSignClient()
+    const connectedSession = sessionWith({
+      topic: 'connected',
+      expiry: 50,
+      chainId,
+    })
+
+    const approval = awaitWalletAbiApprovedSession({
+      approval: () => new Promise(() => undefined),
+      signClient,
+      chainId,
+      connectTimeoutMs: 500,
+      sessionPollMs: 5,
+    })
+
+    setTimeout(() => {
+      emitSessionConnect(connectedSession)
+    }, 10)
+
+    await expect(approval).resolves.toMatchObject({
+      topic: 'connected',
+    })
+  })
+
+  it('falls back to the stored session when approval rejects after the wallet settles', async () => {
+    const chainId = 'walabi:testnet-liquid'
+    const { signClient, addSession } = createMockApprovalSignClient()
+    const settledSession = sessionWith({
+      topic: 'settled',
+      expiry: 60,
+      chainId,
+    })
+
+    const approval = awaitWalletAbiApprovedSession({
+      approval: async () => {
+        setTimeout(() => {
+          addSession(settledSession)
+        }, 10)
+        throw new Error('approval promise failed')
+      },
+      signClient,
+      chainId,
+      connectTimeoutMs: 500,
+      approvalRejectionGraceMs: 50,
+      sessionPollMs: 5,
+    })
+
+    await expect(approval).resolves.toMatchObject({
+      topic: 'settled',
+    })
+  })
+
+  it('does not treat a stored session as approved before approval settles', async () => {
+    const chainId = 'walabi:testnet-liquid'
+    const { signClient, addSession } = createMockApprovalSignClient()
+    const storedSession = sessionWith({
+      topic: 'stored-only',
+      expiry: 70,
+      chainId,
+    })
+
+    const approval = awaitWalletAbiApprovedSession({
+      approval: () => new Promise(() => undefined),
+      signClient,
+      chainId,
+      connectTimeoutMs: 50,
+      sessionPollMs: 5,
+    })
+
+    setTimeout(() => {
+      addSession(storedSession)
+    }, 10)
+
+    await expect(approval).rejects.toThrow('WalletConnect session approval timed out')
+  })
+
   it('infers wallet abi networks from Liquid address prefixes', () => {
     expect(
       inferWalletAbiNetworkFromAddress(