get rid of block hash check (#110)

executor/bsc_executor.go

@@ -6,12 +6,12 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"math/big"
 	"sync"
 	"time"
 
 	"github.com/avast/retry-go/v4"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"

listener/bsc_listener.go

@@ -107,17 +107,6 @@ func (l *BSCListener) monitorCrossChainPkgAt(nextHeight uint64, latestPolledBloc
 	}
 	logging.Logger.Infof("retrieved BSC block header at height=%d", nextHeight)
 
-	if l.config.BSCConfig.IsOpCrossChain() {
-		// check if the latest polled block in DB is forked, if so, delete it.
-		isForked, err := l.isForkedBlockAndDelete(latestPolledBlock, nextHeight, nextHeightBlockHeader.ParentHash)
-		if err != nil {
-			return err
-		}
-		if isForked {
-			return fmt.Errorf("there is fork at block height=%d", latestPolledBlock.Height)
-		}
-	}
-
 	logs, err := l.queryCrossChainLogs(nextHeight)
 	if err != nil {
 		return fmt.Errorf("failed to get logs from block at height=%d, err=%s", nextHeight, err.Error())
@@ -168,18 +157,6 @@ func (l *BSCListener) queryCrossChainLogs(height uint64) ([]types.Log, error) {
 	return logs, nil
 }
 
-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 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)
-		return true, nil
-	}
-	return false, nil
-}
-
 func (l *BSCListener) getCrossChainPackageEventHash() ethcommon.Hash {
 	return ethcommon.HexToHash(CrossChainPackageEventHex)
 }