Skip to content

Commit

Permalink
Merge branch 'master' into prepare-release-v0.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ceyonur authored Feb 23, 2024
2 parents 5bbe4c3 + 814d0de commit 591b9b0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ func SetupGenesisBlock(
if compatErr != nil && ((height != 0 && compatErr.RewindToBlock != 0) || (timestamp != 0 && compatErr.RewindToTime != 0)) {
storedData, _ := storedcfg.ToWithUpgradesJSON().MarshalJSON()
newData, _ := newcfg.ToWithUpgradesJSON().MarshalJSON()
log.Error("found mismatch between config on database vs. new config", "storedConfig", string(storedData), "newConfig", string(newData))
log.Error("found mismatch between config on database vs. new config", "storedConfig", string(storedData), "newConfig", string(newData), "err", compatErr)
return newcfg, stored, compatErr
}
}
Expand Down

0 comments on commit 591b9b0

Please sign in to comment.