convert math.Uint -> float64 for bitcoin only

zeta-chain · Sep 7, 2023 · d7a7e72 · d7a7e72
1 parent 41c4b6b
commit d7a7e72
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/zetaclient/bitcoin_client.go b/zetaclient/bitcoin_client.go
@@ -331,7 +331,7 @@ func (ob *BitcoinChainClient) ConfirmationsThreshold(amount *big.Int) int64 {
 }
 
 // returns isIncluded, isConfirmed, Error
-func (ob *BitcoinChainClient) IsSendOutTxProcessed(sendHash string, nonce uint64, _ common.CoinType, logger zerolog.Logger, sendAmount float64) (bool, bool, error) {
+func (ob *BitcoinChainClient) IsSendOutTxProcessed(sendHash string, nonce uint64, _ common.CoinType, logger zerolog.Logger, params *types.OutboundTxParams) (bool, bool, error) {
 	outTxID := ob.GetTxID(nonce)
 	logger.Info().Msgf("IsSendOutTxProcessed %s", outTxID)
 
@@ -370,8 +370,8 @@ func (ob *BitcoinChainClient) IsSendOutTxProcessed(sendHash string, nonce uint64
 	} else if res.Amount == 0 {
 		// TODO: amount checking should be done in zeta core to block invalid cctx
 		// Note: we use original amount here as zetacore checks against cctx's amount
-		amount = sendAmount
-		ob.logger.ObserveOutTx.Error().Msg("IsSendOutTxProcessed: res.Amount == 0")
+		amount = float64(params.Amount.Uint64()) / 1e8
+		ob.logger.ObserveOutTx.Error().Msgf("IsSendOutTxProcessed: res.Amount == 0, using original amount %f", amount)
 		//return false, false, nil
 	} else {
 		amount = -res.Amount

diff --git a/zetaclient/btc_signer.go b/zetaclient/btc_signer.go
@@ -240,7 +240,7 @@ func (signer *BTCSigner) TryProcessOutTx(send *types.CrossChainTx, outTxMan *Out
 	// Early return if the send is already processed
 	// FIXME: handle revert case
 	outboundTxTssNonce := params.OutboundTxTssNonce
-	included, confirmed, _ := btcClient.IsSendOutTxProcessed(send.Index, outboundTxTssNonce, common.CoinType_Gas, logger, float64(params.Amount.Uint64())/1e8)
+	included, confirmed, _ := btcClient.IsSendOutTxProcessed(send.Index, outboundTxTssNonce, common.CoinType_Gas, logger, params)
 	if included || confirmed {
 		logger.Info().Msgf("CCTX already processed; exit signer")
 		return

diff --git a/zetaclient/chainclient.go b/zetaclient/chainclient.go
@@ -4,6 +4,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rs/zerolog"
 	"github.com/zeta-chain/zetacore/common"
+	"github.com/zeta-chain/zetacore/x/crosschain/types"
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
@@ -15,7 +16,7 @@ type ChainClient interface {
 	Start()
 	Stop()
 	//GetBaseGasPrice() *big.Int
-	IsSendOutTxProcessed(sendHash string, nonce uint64, cointype common.CoinType, logger zerolog.Logger, sendAmount float64) (bool, bool, error)
+	IsSendOutTxProcessed(sendHash string, nonce uint64, cointype common.CoinType, logger zerolog.Logger, params *types.OutboundTxParams) (bool, bool, error)
 	//PostNonceIfNotRecorded(logger zerolog.Logger) error
 	SetCoreParams(observertypes.CoreParams)
 	GetCoreParams() observertypes.CoreParams

diff --git a/zetaclient/evm_client.go b/zetaclient/evm_client.go
@@ -214,7 +214,7 @@ func (ob *EVMChainClient) Stop() {
 
 // returns: isIncluded, isConfirmed, Error
 // If isConfirmed, it also post to ZetaCore
-func (ob *EVMChainClient) IsSendOutTxProcessed(sendHash string, nonce uint64, cointype common.CoinType, logger zerolog.Logger, _ float64) (bool, bool, error) {
+func (ob *EVMChainClient) IsSendOutTxProcessed(sendHash string, nonce uint64, cointype common.CoinType, logger zerolog.Logger, _ *types.OutboundTxParams) (bool, bool, error) {
 	ob.mu.Lock()
 	params := ob.params
 	receipt, found1 := ob.outTXConfirmedReceipts[ob.GetTxID(nonce)]

diff --git a/zetaclient/evm_signer.go b/zetaclient/evm_signer.go
@@ -282,7 +282,7 @@ func (signer *EVMSigner) TryProcessOutTx(send *types.CrossChainTx, outTxMan *Out
 	}
 
 	// Early return if the cctx is already processed
-	included, confirmed, err := evmClient.IsSendOutTxProcessed(send.Index, send.GetCurrentOutTxParam().OutboundTxTssNonce, send.GetCurrentOutTxParam().CoinType, logger, 0)
+	included, confirmed, err := evmClient.IsSendOutTxProcessed(send.Index, send.GetCurrentOutTxParam().OutboundTxTssNonce, send.GetCurrentOutTxParam().CoinType, logger, nil)
 	if err != nil {
 		logger.Error().Err(err).Msg("IsSendOutTxProcessed failed")
 	}

diff --git a/zetaclient/zetacore_observer.go b/zetaclient/zetacore_observer.go
@@ -165,7 +165,7 @@ func (co *CoreObserver) startSendScheduler() {
 							}
 
 							// Monitor Core Logger for OutboundTxTssNonce
-							included, _, err := ob.IsSendOutTxProcessed(send.Index, params.OutboundTxTssNonce, params.CoinType, co.logger.ZetaChainWatcher, float64(params.Amount.Uint64())/1e8)
+							included, _, err := ob.IsSendOutTxProcessed(send.Index, params.OutboundTxTssNonce, params.CoinType, co.logger.ZetaChainWatcher, params)
 							if err != nil {
 								co.logger.ZetaChainWatcher.Error().Err(err).Msgf("IsSendOutTxProcessed fail, Chain ID: %s", c.ChainName)
 								continue