allow 0 amount when posting confirmation and a bit optimization

zeta-chain · Oct 2, 2023 · b41ca4d · b41ca4d
1 parent d26b447
commit b41ca4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/zetaclient/bitcoin_client.go b/zetaclient/bitcoin_client.go
@@ -377,12 +377,9 @@ func (ob *BitcoinChainClient) IsSendOutTxProcessed(sendHash string, nonce uint64
 	}
 
 	var amount float64
-	if res.Amount > 0 {
-		ob.logger.ObserveOutTx.Warn().Msg("IsSendOutTxProcessed: res.Amount > 0")
+	if res.Amount >= 0 {
+		ob.logger.ObserveOutTx.Warn().Msgf("IsSendOutTxProcessed: res.Amount >= 0")
 		amount = res.Amount
-	} else if res.Amount == 0 {
-		ob.logger.ObserveOutTx.Error().Msg("IsSendOutTxProcessed: res.Amount == 0")
-		return false, false, nil
 	} else {
 		amount = -res.Amount
 	}
@@ -657,7 +654,7 @@ func (ob *BitcoinChainClient) refreshPendingNonce() {
 	pendingNonce := ob.pendingNonce
 	ob.mu.Unlock()
 
-	if p.NonceLow > 0 && uint64(p.NonceLow) >= pendingNonce {
+	if p.NonceLow > 0 && uint64(p.NonceLow) > pendingNonce {
 		// get the last included outTx hash
 		txid, err := ob.getOutTxidByNonce(uint64(p.NonceLow)-1, false)
 		if err != nil {

diff --git a/zetaclient/zetacore_observer.go b/zetaclient/zetacore_observer.go
@@ -172,7 +172,10 @@ func (co *CoreObserver) startSendScheduler() {
 							outTxID := fmt.Sprintf("%s-%d-%d", cctx.Index, params.ReceiverChainId, nonce) // would outTxID a better ID?
 
 							// Process Bitcoin OutTx
-							if common.IsBitcoinChain(c.ChainId) && !outTxMan.IsOutTxActive(outTxID) {
+							if common.IsBitcoinChain(c.ChainId) {
+								if outTxMan.IsOutTxActive(outTxID) {
+									break // there is no need to process cctx with future nonces
+								}
 								if stop := co.processBitcoinOutTx(outTxMan, idx, cctx, signer, ob, currentHeight); stop {
 									break
 								}