fix: reorg check by GetJustifiedNumberAndHash (#111)

node-real · May 31, 2023 · f0ac7c5 · f0ac7c5
1 parent e7d0c7b
commit f0ac7c5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/params/chainspecs/rialto.json b/params/chainspecs/rialto.json
@@ -13,16 +13,16 @@
   "ramanujanBlock": 0,
   "nielsBlock": 0,
   "__comment1__": "leave enough time to update the genesis hash and restart",
-  "mirrorSyncBlock": 201,
-  "brunoBlock": 210,
-  "eulerBlock": 220,
-  "nanoBlock": 230,
-  "gibbsBlock": 240,
-  "moranBlock": 250,
-  "planckBlock": 260,
+  "mirrorSyncBlock": 0,
+  "brunoBlock": 0,
+  "eulerBlock": 0,
+  "nanoBlock": 0,
+  "gibbsBlock": 3,
+  "moranBlock": 4,
+  "planckBlock": 5,
   "__comment2__": "lubanBlock%200 != 0, e.g. lubanBlock == 400 is unacceptable",
-  "lubanBlock": 270,
-  "platoblock": 1000000,
+  "lubanBlock": 6,
+  "platoblock": 7,
   "parlia": {
     "DBPath": "",
     "InMemory": false,

diff --git a/turbo/node/node.go b/turbo/node/node.go
@@ -65,7 +65,7 @@ func NewNodConfigUrfave(ctx *cli.Context) *nodecfg.Config {
 	case networkname.ChapelChainName:
 		log.Info("Starting Erigon on Chapel testnet...")
 	case networkname.RialtoChainName:
-		log.Info("Starting Erigon on Chapel testnet...")
+		log.Info("Starting Erigon on Rialto testnet...")
 	case networkname.DevChainName:
 		log.Info("Starting Erigon in ephemeral dev mode...")
 	case networkname.MumbaiChainName:

diff --git a/turbo/stages/headerdownload/header_algos.go b/turbo/stages/headerdownload/header_algos.go
@@ -873,6 +873,10 @@ func (hi *HeaderInserter) FeedHeaderPoW(db kv.StatelessRwTx, headerReader servic
 		return nil, fmt.Errorf("could not find parent with hash %x and height %d for header %x %d", header.ParentHash, blockHeight-1, hash, blockHeight)
 	}
 
+	if err = db.Put(kv.Headers, dbutils.HeaderKey(blockHeight, hash), headerRaw); err != nil {
+		return nil, fmt.Errorf("[%s] failed to store header: %w", hi.logPrefix, err)
+	}
+
 	isWithFastFinality := true
 	reorgFunc := func() (bool, error) {
 		if p, ok := engine.(consensus.PoSA); ok {
@@ -883,8 +887,12 @@ func (hi *HeaderInserter) FeedHeaderPoW(db kv.StatelessRwTx, headerReader servic
 				}
 			}
 			if config.IsPlato(hi.highest) {
-				if justifiedNumberGot, _, err := p.GetJustifiedNumberAndHash(consensusHeaderReader, header); err == nil {
-					curJustifiedNumber = justifiedNumberGot
+				if highestHeader, err := headerReader.Header(context.Background(), db, hi.highestHash, hi.highest); highestHeader != nil {
+					if justifiedNumberGot, _, err := p.GetJustifiedNumberAndHash(consensusHeaderReader, highestHeader); err == nil {
+						curJustifiedNumber = justifiedNumberGot
+					}
+				} else {
+					log.Error("FeedHeaderPoW Get highestHeader fail", "err", err, "hi.highest", hi.highest, "hi.highestHash", hi.highestHash)
 				}
 			}
 			if justifiedNumber == curJustifiedNumber {
@@ -927,11 +935,6 @@ func (hi *HeaderInserter) FeedHeaderPoW(db kv.StatelessRwTx, headerReader servic
 	if err = rawdb.WriteTd(db, hash, blockHeight, td); err != nil {
 		return nil, fmt.Errorf("[%s] failed to WriteTd: %w", hi.logPrefix, err)
 	}
-
-	if err = db.Put(kv.Headers, dbutils.HeaderKey(blockHeight, hash), headerRaw); err != nil {
-		return nil, fmt.Errorf("[%s] failed to store header: %w", hi.logPrefix, err)
-	}
-
 	hi.prevHash = hash
 	return td, nil
 }