Merge pull request #125 from bob-collective/feat/taproot-address

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.1.0",
     "@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,7 @@
 'use client';
 
 import { UseQueryOptions, useQuery } from '@tanstack/react-query';
-import { EsploraClient } from '@gobob/bob-sdk';
+import { getBalance } from '@gobob/bob-sdk';
 
 import { useSatsWagmi } from '../provider';
 import { INTERVAL } from '../utils';
@@ -23,17 +23,7 @@ const useBalance = (props: UseBalanceProps = {}) => {
     enabled: Boolean(address),
     queryKey: ['sats-balance', network, address],
     refetchInterval: INTERVAL.SECONDS_30,
-    queryFn: async () => {
-      if (!address) {
-        return { confirmed: BigInt(0), unconfirmed: BigInt(0), total: BigInt(0) };
-      }
-
-      const esploraClient = new EsploraClient(network);
-
-      const { confirmed, unconfirmed, total } = await esploraClient.getBalance(address);
-
-      return { confirmed: BigInt(confirmed), unconfirmed: BigInt(unconfirmed), total: BigInt(total) };
-    },
+    queryFn: () => getBalance(address),
     ...props
   });
 };