provide bitcoin_chain_id when query tss address

zeta-chain · Feb 6, 2024 · 54d7613 · 54d7613
1 parent 7cb3e9b
commit 54d7613
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/zetaclient/bitcoin_client.go b/zetaclient/bitcoin_client.go
@@ -696,7 +696,7 @@ func GetBtcEvent(
 				return nil, err
 			}
 			if wpkhAddress.EncodeAddress() != targetAddress {
-				return nil, err
+				return nil, nil
 			}
 			// deposit amount has to be no less than the minimum depositor fee
 			if out.Value < BtcDepositorFeeMin {

diff --git a/zetaclient/inbound_tracker.go b/zetaclient/inbound_tracker.go
@@ -96,7 +96,7 @@ func (ob *BitcoinChainClient) CheckReceiptForBtcTxHash(txHash string, vote bool)
 	if err != nil {
 		return "", err
 	}
-	tss, err := ob.zetaClient.GetBtcTssAddress()
+	tss, err := ob.zetaClient.GetBtcTssAddress(ob.chain.ChainId)
 	if err != nil {
 		return "", err
 	}

diff --git a/zetaclient/interfaces.go b/zetaclient/interfaces.go
@@ -86,7 +86,7 @@ type ZetaCoreBridger interface {
 	GetCrosschainFlags() (observertypes.CrosschainFlags, error)
 	GetObserverList() ([]string, error)
 	GetKeyGen() (*observertypes.Keygen, error)
-	GetBtcTssAddress() (string, error)
+	GetBtcTssAddress(chainID int64) (string, error)
 	GetInboundTrackersForChain(chainID int64) ([]crosschaintypes.InTxTracker, error)
 	GetLogger() *zerolog.Logger
 	ZetaChain() common.Chain

diff --git a/zetaclient/query.go b/zetaclient/query.go
@@ -308,9 +308,11 @@ func (b *ZetaCoreBridge) GetEthTssAddress() (string, error) {
 	return resp.Eth, nil
 }
 
-func (b *ZetaCoreBridge) GetBtcTssAddress() (string, error) {
+func (b *ZetaCoreBridge) GetBtcTssAddress(chainID int64) (string, error) {
 	client := observertypes.NewQueryClient(b.grpcConn)
-	resp, err := client.GetTssAddress(context.Background(), &observertypes.QueryGetTssAddressRequest{})
+	resp, err := client.GetTssAddress(context.Background(), &observertypes.QueryGetTssAddressRequest{
+		BitcoinChainId: chainID,
+	})
 	if err != nil {
 		return "", err
 	}