Merge pull request #434 from gcash/reorg-panic

[Bug] Fix panic in fee estimator from reorgs
gcash · Dec 9, 2020 · 175c1e8 · 175c1e8
2 parents 0e0e371 + 802eaea
commit 175c1e8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/mempool/estimatefee.go b/mempool/estimatefee.go
@@ -273,9 +273,10 @@ func (ef *FeeEstimator) RegisterBlock(block *bchutil.Block) error {
 			return errors.New("Transaction has already been mined")
 		}
 
-		// This shouldn't happen but check just in case to avoid
-		// an out-of-bounds array index later.
-		if blocksToConfirm >= estimateFeeDepth {
+		// This shouldn't happen in normal operation but check just in case
+		// to avoid an out-of-bounds array index later. Make sure to cover
+		// negative indexes in the case of reorgs.
+		if blocksToConfirm >= estimateFeeDepth || blocksToConfirm < 0 {
 			continue
 		}