Merge pull request #605 from lochjin/dev1.2

BUG:panic about restore block state
Qitmeer · Feb 3, 2024 · caf3d29 · caf3d29
2 parents 100d08d + 4f63634
commit caf3d29
Showing 1 changed file with 1 addition and 1 deletion.
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 {