Skip to content

fix(core): prevent --set-head startup rewind overshooting to N-1, close #2465 #2467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gzliudan wants to merge 1 commit into
base: dev-upgrade
Choose a base branch
from
Open

fix(core): prevent --set-head startup rewind overshooting to N-1, close #2465 #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ func (bc *BlockChain) ResetWithGenesisBlock(genesis *types.Block) error {
func (bc *BlockChain) repair(head **types.Block) error {
for {
// Abort if we've rewound to a head block that does have associated state
if (common.RollbackNumber == 0) || ((*head).Number().Uint64() < common.RollbackNumber) {
if (common.RollbackNumber == 0) || ((*head).Number().Uint64() <= common.RollbackNumber) {
if bc.HasState((*head).Root()) {
log.Info("Rewound blockchain to past state", "number", (*head).Number(), "hash", (*head).Hash())
engine, ok := bc.Engine().(*XDPoS.XDPoS)
Expand Down
53 changes: 53 additions & 0 deletions core/blockchain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,59 @@ func TestNewBlockChainRepairsMissingHeadStateConsistently(t *testing.T) {
}
}

// TestNewBlockChainRepairsMissingHeadStateRespectsRollbackTarget ensures
// startup repair does not rewind below the user-requested rollback target.
func TestNewBlockChainRepairsMissingHeadStateRespectsRollbackTarget(t *testing.T) {
var (
key, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
address = crypto.PubkeyToAddress(key.PublicKey)
funds = big.NewInt(1000000000000000)
gspec = &Genesis{
Alloc: types.GenesisAlloc{address: {Balance: funds}},
BaseFee: big.NewInt(params.InitialBaseFee),
Config: params.TestChainConfig,
}
)
db := rawdb.NewMemoryDatabase()
chain, err := NewBlockChain(db, nil, gspec, ethash.NewFaker(), vm.Config{})
if err != nil {
t.Fatalf("failed to create chain: %v", err)
}

_, blocks, _ := GenerateChainWithGenesis(gspec, ethash.NewFaker(), 3, nil)
if n, err := chain.InsertChain(blocks); err != nil {
chain.Stop()
t.Fatalf("failed to insert block %d: %v", n, err)
}
head := blocks[len(blocks)-1]
target := blocks[len(blocks)-2]
chain.Stop()

rawdb.DeleteLegacyTrieNode(db, head.Root())

prevRollback := common.RollbackNumber
common.RollbackNumber = target.NumberU64()
t.Cleanup(func() {
common.RollbackNumber = prevRollback
})

reopened, err := NewBlockChain(db, nil, gspec, ethash.NewFaker(), vm.Config{})
if err != nil {
t.Fatalf("failed to reopen repaired chain: %v", err)
}
defer reopened.Stop()

if got := reopened.CurrentBlock().Hash(); got != target.Hash() {
t.Fatalf("unexpected repaired current block: have %s want %s", got, target.Hash())
}
if got := reopened.CurrentSnapBlock().Hash(); got != target.Hash() {
t.Fatalf("unexpected repaired current snap block: have %s want %s", got, target.Hash())
}
if got := reopened.CurrentHeader().Hash(); got != target.Hash() {
t.Fatalf("unexpected repaired current header: have %s want %s", got, target.Hash())
}
}

// TestNewBlockChainReadOnlyFailsHeadStateRepair tests readonly options-based open fails when head state repair would mutate the database.
func TestNewBlockChainReadOnlyFailsHeadStateRepair(t *testing.T) {
var (
Expand Down
Loading