Merge pull request #430 from lochjin/main

BUG:upgradde database
Qitmeer · May 18, 2023 · e280927 · e280927
2 parents 0d3dd5f + 3d1add2
commit e280927
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/cmd/relaynode/node.go b/cmd/relaynode/node.go
@@ -405,7 +405,6 @@ func (node *Node) getChainState() *pb.ChainState {
 		GraphState:      gs,
 		UserAgent:       []byte(p2p.BuildUserAgent("Qitmeer-relay")),
 		DisableRelayTx:  true,
-		StateRoot:       &pb.Hash{Hash: hash.ZeroHash.Bytes()},
 	}
 }
 

diff --git a/meerdag/upgradedb.go b/meerdag/upgradedb.go
@@ -71,8 +71,7 @@ func (bd *MeerDAG) UpgradeDB(db database.DB, mainTip *hash.Hash, total uint64, g
 			bs.Valid()
 		}
 		// evm
-		if i == 0 ||
-			forks.IsBeforeMeerEVMForkHeight(int64(ib.GetHeight())) {
+		if i == 0 {
 			curEVM = evmGenesis
 			bs.SetEVM(curEVM)
 		} else {
@@ -94,14 +93,19 @@ func (bd *MeerDAG) UpgradeDB(db database.DB, mainTip *hash.Hash, total uint64, g
 				})
 			}
 			//
-			number := getBlockNumber(edb, block.Hash())
-			if number != 0 {
-				header := evmbc.GetHeaderByNumber(number)
-				if header == nil {
-					return fmt.Errorf("No block in number:%d", number)
+			if forks.IsBeforeMeerEVMForkHeight(int64(ib.GetHeight())) {
+				curEVM = evmGenesis
+			} else {
+				number := getBlockNumber(edb, block.Hash())
+				if number != 0 {
+					header := evmbc.GetHeaderByNumber(number)
+					if header == nil {
+						return fmt.Errorf("No block in number:%d", number)
+					}
+					curEVM = header
 				}
-				curEVM = header
 			}
+
 			bs.Update(block, prev, curEVM)
 		}