Merge branch 'develop' into fix-out-gas-to-zeta-rpc

changelog.md

@@ -15,6 +15,7 @@
 * [1687](https://github.com/zeta-chain/node/pull/1687) - only use EVM supported chains for gas stability pool
 * [1692](https://github.com/zeta-chain/node/pull/1692) - fix get params query for emissions module
 * ([1733](https://github.com/zeta-chain/node/pull/1733)) - remove the unnecessary 2x multiplier in the convertGasToZeta RPC
+* [1721](https://github.com/zeta-chain/node/issues/1721) - zetaclient should provide bitcoin_chain_id when querying TSS address
 
 ### Tests
 

zetaclient/bitcoin_client.go

@@ -700,7 +700,7 @@ func GetBtcEvent(
 				return nil, err
 			}
 			if wpkhAddress.EncodeAddress() != targetAddress {
-				return nil, err
+				return nil, nil // irrelevant tx to us, skip
 			}
 			// deposit amount has to be no less than the minimum depositor fee
 			if out.Value < BtcDepositorFeeMin {

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
 	}
@@ -116,7 +116,7 @@ func (ob *BitcoinChainClient) CheckReceiptForBtcTxHash(txHash string, vote bool)
 	if err != nil {
 		ob.logger.WatchInTx.Error().Err(err).Msg("error posting to zeta core")
 		return "", err
-	} else if ballot == "" {
+	} else if zetaHash != "" {
 		ob.logger.WatchInTx.Info().Msgf("BTC deposit detected and reported: PostVoteInbound zeta tx: %s ballot %s", zetaHash, ballot)
 	}
 	return msg.Digest(), nil

zetaclient/interfaces.go

@@ -87,7 +87,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

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
 	}