Enable tweak signer for taproot address

.changeset/moody-lobsters-cheat.md

@@ -0,0 +1,5 @@
+---
+"@gobob/sats-wagmi": patch
+---
+
+Enable tweak signer for taproot address

packages/sats-wagmi/package.json

@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
-    "@gobob/bob-sdk": "^3.0.3",
+    "@gobob/bob-sdk": "^3.0.4",
     "@metamask/providers": "^12.0.0",
     "@scure/base": "^1.1.6",
     "@scure/btc-signer": "^1.3.1",

packages/sats-wagmi/src/connectors/base.ts

@@ -119,7 +119,7 @@ abstract class SatsConnector {
     return this.ordinalsAddress;
   }
 
-  /** Convience wrapper around the getAddressInfo function
+  /** Convenience wrapper around the getAddressInfo function
    * @param address - The address to get the type of.
    * @returns The address type of the address.
    */

packages/sats-wagmi/src/connectors/okx.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoin-address-validation';
+import { AddressType, Network } from 'bitcoin-address-validation';
 
 import { okxLogo } from '../assets/okx';
 
@@ -157,7 +157,7 @@ class OKXConnector extends SatsConnector {
       return {
         index,
         publicKey,
-        disableTweakSigner: true
+        disableTweakSigner: this.getAddressType(this.paymentAddress!) !== AddressType.p2tr
       };
     });
 

packages/sats-wagmi/src/connectors/unisat.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoin-address-validation';
+import { AddressType, Network } from 'bitcoin-address-validation';
 
 import { bitgetLogo } from '../assets/bitget';
 
@@ -200,11 +200,16 @@ class UnisatConnector extends SatsConnector {
         inputs.push(index);
       }
     }
+
+    if (!this.paymentAddress) {
+      throw new Error('No payment address specified');
+    }
+
     const toSignInputs = inputs.map((index) => {
       return {
         index,
         publicKey: this.publicKey,
-        disableTweakSigner: true
+        disableTweakSigner: this.getAddressType(this.paymentAddress!) !== AddressType.p2tr
       };
     });
 

packages/sats-wagmi/src/hooks/useBalance.tsx

@@ -1,7 +1,8 @@
 'use client';
 
 import { UseQueryOptions, useQuery } from '@tanstack/react-query';
-import { EsploraClient } from '@gobob/bob-sdk';
+import { EsploraClient, OrdinalsClient, OutPoint } from '@gobob/bob-sdk';
+import { AddressType, getAddressInfo } from 'bitcoin-address-validation';
 
 import { useSatsWagmi } from '../provider';
 import { INTERVAL } from '../utils';
@@ -29,10 +30,49 @@ const useBalance = (props: UseBalanceProps = {}) => {
       }
 
       const esploraClient = new EsploraClient(network);
+      const ordinalsClient = new OrdinalsClient(network);
 
-      const { confirmed, unconfirmed, total } = await esploraClient.getBalance(address);
+      const addressInfo = getAddressInfo(address);
 
-      return { confirmed: BigInt(confirmed), unconfirmed: BigInt(unconfirmed), total: BigInt(total) };
+      if (addressInfo.type === AddressType.p2tr) {
+        const [outputs, cardinalOutputs] = await Promise.all([
+          esploraClient.getAddressUtxos(address),
+          // cardinal = return UTXOs not containing inscriptions or runes
+          ordinalsClient.getOutputsFromAddress(address, 'cardinal')
+        ]);
+
+        const cardinalOutputsSet = new Set(cardinalOutputs.map((output) => output.outpoint));
+
+        const total = outputs.reduce((acc, output) => {
+          if (cardinalOutputsSet.has(OutPoint.toString(output))) {
+            return acc + output.value;
+          }
+
+          return acc;
+        }, 0);
+
+        const confirmed = outputs.reduce((acc, output) => {
+          if (cardinalOutputsSet.has(OutPoint.toString(output)) && output.confirmed) {
+            return acc + output.value;
+          }
+
+          return acc;
+        }, 0);
+
+        return {
+          confirmed: BigInt(confirmed),
+          unconfirmed: BigInt(total - confirmed),
+          total: BigInt(total)
+        };
+      } else {
+        const { confirmed, unconfirmed, total } = await esploraClient.getBalance(address);
+
+        return {
+          confirmed: BigInt(confirmed),
+          unconfirmed: BigInt(unconfirmed),
+          total: BigInt(total)
+        };
+      }
     },
     ...props
   });