fix: Leather Wallet network mismatch (#5164)

Author: tomiir

.changeset/large-doors-drive.md

@@ -0,0 +1,6 @@
+---
+'@reown/appkit-adapter-bitcoin': patch
+'@reown/appkit': patch
+---
+
+Fixes issue in Leather wallet where requests would target mainnet instead of testnet

.prettierignore

@@ -5,4 +5,5 @@ pnpm-lock.yaml
 .svelte-kit
 bundle-analysis.html
 .open-next
-/apps/pay-test-exchange/**.d.ts
+/apps/pay-test-exchange/**.d.ts
+next-env.d.ts

apps/demo/package.json

@@ -35,14 +35,14 @@
     "@radix-ui/react-switch": "1.2.6",
     "@radix-ui/react-tabs": "1.1.13",
     "@radix-ui/react-tooltip": "1.2.8",
-    "@reown/appkit": "1.8.4",
-    "@reown/appkit-adapter-bitcoin": "1.8.4",
-    "@reown/appkit-adapter-ethers": "1.8.4",
-    "@reown/appkit-adapter-solana": "1.8.4",
-    "@reown/appkit-common": "1.8.4",
-    "@reown/appkit-controllers": "1.8.4",
-    "@reown/appkit-scaffold-ui": "1.8.4",
-    "@reown/appkit-ui": "1.8.4",
+    "@reown/appkit": "1.8.8",
+    "@reown/appkit-adapter-bitcoin": "1.8.8",
+    "@reown/appkit-adapter-ethers": "1.8.8",
+    "@reown/appkit-adapter-solana": "1.8.8",
+    "@reown/appkit-common": "1.8.8",
+    "@reown/appkit-controllers": "1.8.8",
+    "@reown/appkit-scaffold-ui": "1.8.8",
+    "@reown/appkit-ui": "1.8.8",
     "@sentry/core": "8.55.0",
     "@sentry/nextjs": "8.55.0",
     "@solana/web3.js": "1.98.4",
@@ -69,7 +69,7 @@
     "@types/react": "19.1.15",
     "@types/react-dom": "19.1.9",
     "@mailsac/api": "1.0.8",
-    "@reown/appkit-testing": "1.8.4",
+    "@reown/appkit-testing": "1.8.8",
     "@playwright/test": "1.48.2",
     "eslint": "8.56.0",
     "eslint-config-next": "14.1.0",

packages/adapters/bitcoin/package.json

@@ -39,7 +39,7 @@
     "sats-connect": "3.5.0"
   },
   "devDependencies": {
-    "@leather.io/rpc": "2.1.21",
+    "@leather.io/rpc": "2.20.13",
     "@vitest/coverage-v8": "2.1.9",
     "@wallet-standard/features": "1.0.3",
     "@walletconnect/types": "2.22.2",

packages/adapters/bitcoin/src/connectors/LeatherConnector.ts

@@ -1,9 +1,4 @@
-import type {
-  SendTransferRequestParams,
-  SendTransferResponseBody,
-  SignPsbtRequestParams,
-  SignPsbtResponseBody
-} from '@leather.io/rpc'
+import type { RpcEndpointMap, RpcSendTransferParams } from '@leather.io/rpc'
 
 import type { BitcoinConnector } from '@reown/appkit-utils/bitcoin'
 import { bitcoin, bitcoinTestnet } from '@reown/appkit/networks'
@@ -54,8 +49,8 @@ export class LeatherConnector extends SatsConnectConnector {
     recipient
   }: BitcoinConnector.SendTransferParams): Promise<string> {
     const params: LeatherConnector.SendTransferParams = {
-      address: recipient,
-      amount
+      recipients: [{ address: recipient, amount }],
+      network: this.getNetwork()
     }
 
     const res: LeatherConnector.SendTransferResponse = await this.internalRequest(
@@ -109,11 +104,11 @@ export namespace LeatherConnector {
 
   export type Network = 'mainnet' | 'testnet' | 'signet' | 'sbtcDevenv' | 'devnet'
 
-  export type SendTransferParams = SendTransferRequestParams
+  export type SendTransferParams = RpcSendTransferParams
 
-  export type SendTransferResponse = SendTransferResponseBody
+  export type SendTransferResponse = { txid: string }
 
-  export type SignPSBTParams = SignPsbtRequestParams
+  export type SignPSBTParams = RpcEndpointMap['signPsbt']['request']['params']
 
-  export type SignPSBTResponse = SignPsbtResponseBody
+  export type SignPSBTResponse = { hex: string; txid?: string }
 }

packages/adapters/bitcoin/tests/connectors/LeatherConnector.test.ts

@@ -54,7 +54,26 @@ describe('LeatherConnector', () => {
     const res = await connector.sendTransfer({ amount: '100', recipient: 'address' })
 
     expect(res).toBe(txid)
-    expect(requestSpy).toHaveBeenCalledWith('sendTransfer', { address: 'address', amount: '100' })
+    expect(requestSpy).toHaveBeenCalledWith('sendTransfer', {
+      recipients: [{ address: 'address', amount: '100' }],
+      network: 'mainnet'
+    })
+  })
+
+  it('should send a transfer for testnet', async () => {
+    getActiveNetwork.mockReturnValueOnce(bitcoinTestnet)
+
+    const txid = 'txid'
+    const requestSpy = vi.spyOn(mocks.wallet, 'request')
+    requestSpy.mockResolvedValue(mockSatsConnectProvider.mockRequestResolve({ txid }))
+
+    const res = await connector.sendTransfer({ amount: '100', recipient: 'address' })
+
+    expect(res).toBe(txid)
+    expect(requestSpy).toHaveBeenCalledWith('sendTransfer', {
+      recipients: [{ address: 'address', amount: '100' }],
+      network: 'testnet'
+    })
   })
 
   it('should sign a PSBT', async () => {