feat: use BBN light client tip height instead from mempool

babylonlabs-io · Dec 11, 2024 · a4576d4 · a4576d4
1 parent 6ace8f6
commit a4576d4
Show file tree

Hide file tree

Showing 8 changed files with 132 additions and 93 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "node": "22.3.0"
   },
   "dependencies": {
-    "@babylonlabs-io/babylon-proto-ts": "0.0.3-canary.4",
+    "@babylonlabs-io/babylon-proto-ts": "0.0.3-canary.5",
     "@babylonlabs-io/bbn-core-ui": "^0.4.1",
     "@babylonlabs-io/bbn-wallet-connect": "^0.1.9",
     "@babylonlabs-io/btc-staking-ts": "0.4.0-canary.3",

diff --git a/src/app/hooks/client/api/useBTCTipHeight.ts b/src/app/hooks/client/api/useBTCTipHeight.ts
diff --git a/src/app/hooks/client/query/useBbnQueryClient.ts b/src/app/hooks/client/query/useBbnQueryClient.ts
@@ -1,4 +1,7 @@
-import { incentivequery } from "@babylonlabs-io/babylon-proto-ts";
+import {
+  btclightclientquery,
+  incentivequery,
+} from "@babylonlabs-io/babylon-proto-ts";
 import {
   QueryClient,
   createProtobufRpcClient,
@@ -8,8 +11,13 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { useCallback, useEffect, useState } from "react";
 
 import { BBN_RPC_URL } from "@/app/common/rpc";
+import { ONE_MINUTE } from "@/app/constants";
 import { useCosmosWallet } from "@/app/context/wallet/CosmosWalletProvider";
 
+import { useAPIQuery } from "../api/useApi";
+
+export const BBN_BTCLIGHTCLIENT_TIP_KEY = "BBN_BTCLIGHTCLIENT_TIP";
+
 /**
  * Query service for Babylon which contains all the queries for
  * interacting with Babylon RPC nodes
@@ -58,9 +66,25 @@ export const useBbnQueryClient = () => {
     return Number(balance?.amount ?? 0);
   }, [connected, queryClient, bech32Address]);
 
+  const btcTipQuery = useAPIQuery({
+    queryKey: [BBN_BTCLIGHTCLIENT_TIP_KEY],
+    queryFn: async () => {
+      if (!queryClient) {
+        return undefined;
+      }
+      const { btclightQueryClient } = setupBtclightClientExtension(queryClient);
+      const req = btclightclientquery.QueryTipRequest.fromPartial({});
+      const { header } = await btclightQueryClient.Tip(req);
+      return header;
+    },
+    enabled: Boolean(queryClient),
+    staleTime: ONE_MINUTE,
+  });
+
   return {
     getRewards,
     getBalance,
+    btcTipQuery,
   };
 };
 
@@ -74,3 +98,13 @@ const setupIncentiveExtension = (
   const incentiveQueryClient = new incentivequery.QueryClientImpl(rpc);
   return { incentive: incentiveQueryClient };
 };
+
+const setupBtclightClientExtension = (
+  base: QueryClient,
+): {
+  btclightQueryClient: btclightclientquery.QueryClientImpl;
+} => {
+  const rpc = createProtobufRpcClient(base);
+  const btclightQueryClient = new btclightclientquery.QueryClientImpl(rpc);
+  return { btclightQueryClient };
+};
diff --git a/src/app/hooks/services/useDelegationService.ts b/src/app/hooks/services/useDelegationService.ts
@@ -14,7 +14,6 @@ export type ActionType = keyof typeof ACTIONS;
 interface TxProps {
   stakingTxHashHex: string;
   stakingTxHex: string;
-  stakingHeight: number;
   paramsVersion: number;
   unbondingTxHex: string;
   covenantUnbondingSignatures?: {
@@ -91,7 +90,7 @@ export function useDelegationService() {
 
       [ACTIONS.UNBOUND]: async ({
         stakingInput,
-        stakingHeight,
+        paramsVersion,
         stakingTxHashHex,
         stakingTxHex,
         unbondingTxHex,
@@ -103,7 +102,7 @@ export function useDelegationService() {
 
         await submitUnbondingTx(
           stakingInput,
-          stakingHeight,
+          paramsVersion,
           stakingTxHex,
           unbondingTxHex,
           covenantUnbondingSignatures.map((sig) => ({
@@ -121,12 +120,12 @@ export function useDelegationService() {
       [ACTIONS.WITHDRAW_ON_EARLY_UNBOUNDING]: async ({
         stakingTxHashHex,
         stakingInput,
-        stakingHeight,
+        paramsVersion,
         unbondingTxHex,
       }: TxProps) => {
         await submitEarlyUnbondedWithdrawalTx(
           stakingInput,
-          stakingHeight,
+          paramsVersion,
           unbondingTxHex,
         );
 
@@ -139,7 +138,7 @@ export function useDelegationService() {
       [ACTIONS.WITHDRAW_ON_EARLY_UNBOUNDING_SLASHING]: async ({
         stakingTxHashHex,
         stakingInput,
-        stakingHeight,
+        paramsVersion,
         unbondingSlashingTxHex,
       }) => {
         if (!unbondingSlashingTxHex) {
@@ -150,7 +149,7 @@ export function useDelegationService() {
 
         await submitEarlyUnbondedWithdrawalTx(
           stakingInput,
-          stakingHeight,
+          paramsVersion,
           unbondingSlashingTxHex,
         );
 
@@ -162,13 +161,13 @@ export function useDelegationService() {
 
       [ACTIONS.WITHDRAW_ON_TIMELOCK]: async ({
         stakingInput,
-        stakingHeight,
+        paramsVersion,
         stakingTxHashHex,
         stakingTxHex,
       }: TxProps) => {
         await submitTimelockUnbondedWithdrawalTx(
           stakingInput,
-          stakingHeight,
+          paramsVersion,
           stakingTxHex,
         );
 
@@ -180,7 +179,7 @@ export function useDelegationService() {
 
       [ACTIONS.WITHDRAW_ON_TIMELOCK_SLASHING]: async ({
         stakingInput,
-        stakingHeight,
+        paramsVersion,
         stakingTxHashHex,
         slashingTxHex,
       }) => {
@@ -190,7 +189,7 @@ export function useDelegationService() {
 
         await submitTimelockUnbondedWithdrawalTx(
           stakingInput,
-          stakingHeight,
+          paramsVersion,
           slashingTxHex,
         );
 
@@ -245,7 +244,6 @@ export function useDelegationService() {
         state,
         slashingTxHex,
         unbondingSlashingTxHex,
-        startHeight,
       } = delegation;
 
       const finalityProviderPk = finalityProviderBtcPksHex[0];
@@ -263,7 +261,6 @@ export function useDelegationService() {
         await execute?.({
           stakingTxHashHex,
           stakingTxHex,
-          stakingHeight: startHeight,
           paramsVersion,
           unbondingTxHex,
           covenantUnbondingSignatures,