feat: Bump wallet connect (#515)

* bump wallet connect, adjust tomo methods

* update package

* address in getBalance

* update wallet connect

package.json

@@ -27,7 +27,7 @@
   "dependencies": {
     "@babylonlabs-io/babylon-proto-ts": "0.0.3-canary.5",
     "@babylonlabs-io/bbn-core-ui": "^0.6.1",
-    "@babylonlabs-io/bbn-wallet-connect": "^0.1.18",
+    "@babylonlabs-io/bbn-wallet-connect": "^0.1.22",
     "@babylonlabs-io/btc-staking-ts": "0.4.0-canary.5",
     "@bitcoin-js/tiny-secp256k1-asmjs": "2.2.3",
     "@bitcoinerlab/secp256k1": "^1.1.1",
@@ -36,7 +36,7 @@
     "@sentry/nextjs": "^8.30.0",
     "@tanstack/react-query": "^5.28.14",
     "@tanstack/react-query-next-experimental": "^5.28.14",
-    "@tomo-inc/wallet-connect-sdk": "^0.3.5",
+    "@tomo-inc/wallet-connect-sdk": "^0.3.6",
     "@uidotdev/usehooks": "^2.4.1",
     "axios": "^1.7.4",
     "bitcoinjs-lib": "6.1.5",

src/app/components/PersonalBalance/PersonalBalance.tsx

@@ -19,7 +19,11 @@ const QUERY_KEYS = {
 
 export function PersonalBalance() {
   const { coinName, coinSymbol } = getNetworkConfig();
-  const { getBalance: getBTCBalance, connected: btcConnected } = useBTCWallet();
+  const {
+    getBalance: getBTCBalance,
+    connected: btcConnected,
+    address,
+  } = useBTCWallet();
   const { connected: cosmosConnected } = useCosmosWallet();
 
   const {
@@ -34,7 +38,7 @@ export function PersonalBalance() {
 
   const { data: btcBalance, isLoading: btcBalanceLoading } = useQuery({
     queryKey: [QUERY_KEYS.BTC_BALANCE],
-    queryFn: getBTCBalance,
+    queryFn: () => getBTCBalance(address),
     enabled: btcConnected,
   });
 

src/app/context/tomo/BBNConnector.tsx

@@ -17,15 +17,10 @@ const createProvider = (provider: CosmosProvider): IBBNProvider => {
   return {
     connectWallet: async () => void provider.connectWallet(),
     getAddress: () => provider.getAddress(),
-    getPublicKeyHex: async () => "",
-    // Not implemented yet
-    // getWalletProviderName: () => provider.getWalletProviderName(),
-    // getWalletProviderIcon: () => provider.getWalletProviderIcon(),
-    // getOfflineSigner: () => provider.getOfflineSigner(),
-    // Fallback
-    getWalletProviderName: async () => "",
-    getWalletProviderIcon: async () => "",
-    getOfflineSigner: async () => null as any,
+    getPublicKeyHex: () => provider.getPublicKeyHex(),
+    getWalletProviderName: () => provider.getWalletProviderName(),
+    getWalletProviderIcon: () => provider.getWalletProviderIcon(),
+    getOfflineSigner: () => provider.getOfflineSigner(),
   };
 };
 

src/app/context/tomo/BTCConnector.tsx

@@ -21,19 +21,14 @@ const createProvider = (provider: BTCProvider): IBTCProvider => {
     signPsbt: (psbtHex: string) => provider.signPsbt(psbtHex),
     signPsbts: (psbtsHexes: string[]) => provider.signPsbts(psbtsHexes),
     getNetwork: () => provider.getNetwork(),
-    signMessageBIP322: (message: string) => provider.signMessageBIP322(message),
-    signMessage: (message: string, type: "ecdsa" | "bip322-simple") =>
+    signMessage: (message: string, type: "ecdsa") =>
       provider.signMessage(message, type),
     on: (eventName: string, callBack: () => void) =>
       provider.on(eventName, callBack),
     off: (eventName: string, callBack: () => void) =>
       provider.off(eventName, callBack),
-    getBalance: () => provider.getBalance(),
-    getNetworkFees: () => provider.getNetworkFees(),
-    pushTx: (txHex: string) => provider.pushTx(txHex),
-    getUtxos: (address: string, amount?: number) =>
-      provider.getUtxos(address, amount),
-    getBTCTipHeight: () => provider.getBTCTipHeight(),
+    getWalletProviderName: () => provider.getWalletProviderName(),
+    getWalletProviderIcon: () => provider.getWalletProviderIcon(),
     getInscriptions: () =>
       provider
         .getInscriptions()

src/app/context/wallet/BTCWalletProvider.tsx

@@ -18,6 +18,13 @@ import {
 
 import { useError } from "@/app/context/Error/ErrorContext";
 import { ErrorState } from "@/app/types/errors";
+import {
+  getAddressBalance,
+  getFundingUTXOs,
+  getNetworkFees,
+  getTipHeight,
+  pushTx,
+} from "@/utils/mempool_api";
 import {
   getPublicKeyNoCoord,
   isSupportedAddressType,
@@ -42,11 +49,8 @@ interface BTCWalletContextProps {
   signPsbt: (psbtHex: string) => Promise<string>;
   signPsbts: (psbtsHexes: string[]) => Promise<string[]>;
   getNetwork: () => Promise<Network>;
-  signMessage: (
-    message: string,
-    type?: "ecdsa" | "bip322-simple",
-  ) => Promise<string>;
-  getBalance: () => Promise<number>;
+  signMessage: (message: string, type: "ecdsa") => Promise<string>;
+  getBalance: (address: string) => Promise<number>;
   getNetworkFees: () => Promise<Fees>;
   pushTx: (txHex: string) => Promise<string>;
   getUtxos: (address: string, amount?: number) => Promise<UTXO[]>;
@@ -175,17 +179,14 @@ export const BTCWalletProvider = ({ children }: PropsWithChildren) => {
         btcWalletProvider?.signPsbts(psbtsHexes) ?? [],
       getNetwork: async () =>
         btcWalletProvider?.getNetwork() ?? ({} as Network),
-      signMessage: async (
-        message: string,
-        type: "ecdsa" | "bip322-simple" = "bip322-simple",
-      ) => btcWalletProvider?.signMessage(message, type) ?? "",
-      getBalance: async () => btcWalletProvider?.getBalance() ?? 0,
-      getNetworkFees: async () =>
-        btcWalletProvider?.getNetworkFees() ?? ({} as Fees),
-      pushTx: async (txHex: string) => btcWalletProvider?.pushTx(txHex) ?? "",
+      signMessage: async (message: string, type: "ecdsa") =>
+        btcWalletProvider?.signMessage(message, type) ?? "",
+      getBalance: async (address: string) => getAddressBalance(address),
+      getNetworkFees: async () => getNetworkFees(),
+      pushTx: async (txHex: string) => pushTx(txHex),
       getUtxos: async (address: string, amount?: number) =>
-        btcWalletProvider?.getUtxos(address, amount) ?? [],
-      getBTCTipHeight: async () => btcWalletProvider?.getBTCTipHeight() ?? 0,
+        getFundingUTXOs(address, amount),
+      getBTCTipHeight: async () => getTipHeight(),
       getInscriptions: async (): Promise<InscriptionIdentifier[]> =>
         btcWalletProvider?.getInscriptions().catch(() => []) ?? [],
     }),

src/app/context/wallet/CosmosWalletProvider.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import {
-  BBNProvider,
+  IBBNProvider,
   useChainConnector,
   useWalletConnect,
 } from "@babylonlabs-io/bbn-wallet-connect";
@@ -39,7 +39,7 @@ const CosmosWalletContext = createContext<CosmosWalletContextProps>({
 
 export const CosmosWalletProvider = ({ children }: PropsWithChildren) => {
   const [BBNWalletProvider, setBBNWalletProvider] = useState<
-    BBNProvider | undefined
+    IBBNProvider | undefined
   >();
   const [cosmosBech32Address, setCosmosBech32Address] = useState("");
   const [signingStargateClient, setSigningStargateClient] = useState<
@@ -57,7 +57,7 @@ export const CosmosWalletProvider = ({ children }: PropsWithChildren) => {
   }, []);
 
   const connectCosmos = useCallback(
-    async (provider: BBNProvider | null) => {
+    async (provider: IBBNProvider | null) => {
       if (!provider) return;
 
       try {

src/app/hooks/services/useTransactionService.ts

@@ -43,10 +43,7 @@ export interface BtcStakingInputs {
 
 interface BtcSigningFuncs {
   signPsbt: (psbtHex: string) => Promise<string>;
-  signMessage: (
-    message: string,
-    type?: "ecdsa" | "bip322-simple",
-  ) => Promise<string>;
+  signMessage: (message: string, type: "ecdsa") => Promise<string>;
   signingCallback: (step: SigningStep, status: EOIStepStatus) => Promise<void>;
 }
 

src/utils/mempool_api.ts

@@ -151,6 +151,7 @@ export async function getNetworkFees(): Promise<Fees> {
     return await response.json();
   }
 }
+
 // Get the tip height of the BTC chain
 export async function getTipHeight(): Promise<number> {
   const response = await fetch(btcTipHeightUrl());

src/utils/wallet/btc_wallet_provider.ts

@@ -99,10 +99,7 @@ export abstract class BTCWalletProvider {
    * @param type - The type of the message to sign, defaults to 'ecdsa'
    * @returns A promise that resolves to the signed message
    */
-  abstract signMessage(
-    message: string,
-    type?: "ecdsa" | "bip322-simple",
-  ): Promise<string>;
+  abstract signMessage(message: string, type: "ecdsa"): Promise<string>;
 
   /**
    * Registers an event listener for the specified event.