delete votes if OPBNB roll back

bnb-chain · Oct 25, 2023 · 347c4b5 · 347c4b5
1 parent f5b9b1c
commit 347c4b5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/config/config.go b/config/config.go
@@ -106,8 +106,8 @@ func (cfg *BSCConfig) Validate() {
 	if cfg.GasLimit == 0 {
 		panic("gas_limit of BNB Smart Chain should be larger than 0")
 	}
-	if cfg.NumberOfBlocksForFinality < 2 || cfg.NumberOfBlocksForFinality > 21 {
-		panic("NumberOfBlocksForFinality should be [2, 21]")
+	if cfg.NumberOfBlocksForFinality < 1 || cfg.NumberOfBlocksForFinality > 21 {
+		panic("NumberOfBlocksForFinality should be [1, 21]")
 	}
 }
 

diff --git a/db/dao/bsc_dao.go b/db/dao/bsc_dao.go
@@ -2,6 +2,7 @@ package dao
 
 import (
 	"database/sql"
+	"github.com/cometbft/cometbft/votepool"
 	"time"
 
 	"gorm.io/gorm"
@@ -142,7 +143,7 @@ func (d *BSCDao) SaveBatchPackages(pkgs []*model.BscRelayPackage) error {
 	})
 }
 
-func (d *BSCDao) DeleteBlockAndPackagesAtHeight(height uint64) error {
+func (d *BSCDao) DeleteBlockAndPackagesAndVotesAtHeight(height uint64) error {
 	return d.DB.Transaction(func(dbTx *gorm.DB) error {
 		err := dbTx.Where("height = ?", height).Delete(model.BscBlock{}).Error
 		if err != nil {
@@ -152,6 +153,10 @@ func (d *BSCDao) DeleteBlockAndPackagesAtHeight(height uint64) error {
 		if err != nil {
 			return err
 		}
+		err = dbTx.Where("height = ? and event_type = ?", height, votepool.FromOpCrossChainEvent).Delete(model.Vote{}).Error
+		if err != nil {
+			return err
+		}
 		return nil
 	})
 }

diff --git a/listener/bsc_listener.go b/listener/bsc_listener.go
@@ -167,8 +167,8 @@ func (l *BSCListener) queryCrossChainLogs(blockHash ethcommon.Hash) ([]types.Log
 
 func (l *BSCListener) isForkedBlockAndDelete(latestPolledBlock *model.BscBlock, nextHeight uint64, parentHash ethcommon.Hash) (bool, error) {
 	if latestPolledBlock.Height != 0 && latestPolledBlock.Height+1 == nextHeight && parentHash.String() != latestPolledBlock.BlockHash {
-		// delete latestPolledBlock and its cross-chain packages from DB
-		if err := l.DaoManager.BSCDao.DeleteBlockAndPackagesAtHeight(latestPolledBlock.Height); err != nil {
+		// delete latestPolledBlock and its cross-chain packages and votes for these packages from DB.
+		if err := l.DaoManager.BSCDao.DeleteBlockAndPackagesAndVotesAtHeight(latestPolledBlock.Height); err != nil {
 			return true, err
 		}
 		logging.Logger.Infof("deleted block at height=%d from DB due to there is a fork", latestPolledBlock.Height)