Merge pull request #605 from lochjin/dev1.2

dindinw · web-flow · commit caf3d293e4e6 · 2024-02-03T14:31:09.000+08:00
BUG:panic about restore block state
diff --git a/meerevm/meer/meerchain.go b/meerevm/meer/meerchain.go
@@ -342,7 +342,7 @@ func (b *MeerChain) prepareEnvironment(state model.BlockState) (*types.Header, e
 		}
 		log.Info("Try to restore block state for EVM", "evm.hash", list[i].GetEVMHash().String(), "evm.number", list[i].GetEVMNumber(), "state.order", list[i].GetOrder())
 		block := b.chain.Ether().BlockChain().GetBlock(list[i].GetEVMHash(), list[i].GetEVMNumber())
-		if block != nil {
+		if block == nil {
 			log.Info("Try to rebuild evm block", "state.order", list[i].GetOrder())
 			sb, err := b.consensus.BlockChain().BlockByOrder(list[i].GetOrder())
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ func (b MeerChain) prepareEnvironment(state model.BlockState) (types.Header, e`
`342`	`342`	`}`
`343`	`343`	`log.Info("Try to restore block state for EVM", "evm.hash", list[i].GetEVMHash().String(), "evm.number", list[i].GetEVMNumber(), "state.order", list[i].GetOrder())`
`344`	`344`	`block := b.chain.Ether().BlockChain().GetBlock(list[i].GetEVMHash(), list[i].GetEVMNumber())`
`345`		`- if block != nil {`
	`345`	`+ if block == nil {`
`346`	`346`	`log.Info("Try to rebuild evm block", "state.order", list[i].GetOrder())`
`347`	`347`	`sb, err := b.consensus.BlockChain().BlockByOrder(list[i].GetOrder())`
`348`	`348`	`if err != nil {`