Skip to content

Commit ae7f7d8

Browse files
committed
check first
Signed-off-by: Delweng <[email protected]>
1 parent b9ac746 commit ae7f7d8

File tree

8 files changed

+33
-27
lines changed

8 files changed

+33
-27
lines changed

core/blockchain.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -715,14 +715,6 @@ func (bc *BlockChain) initializeHistoryPruning(latest uint64) error {
715715
// was snap synced or full synced and in which state, the method will try to
716716
// delete minimal data from disk whilst retaining chain consistency.
717717
func (bc *BlockChain) SetHead(head uint64) error {
718-
// Only allowed to rewind to a block that is later than the oldest state block.
719-
firstStateBlock, err := bc.triedb.FirstStateBlock()
720-
if err != nil {
721-
return err
722-
}
723-
if head < firstStateBlock {
724-
return fmt.Errorf("cannot rewind to block %d, oldest available state is at block %d", head, firstStateBlock)
725-
}
726718
if _, err := bc.setHeadBeyondRoot(head, 0, common.Hash{}, false); err != nil {
727719
return err
728720
}
@@ -2782,3 +2774,8 @@ func (bc *BlockChain) SetTrieFlushInterval(interval time.Duration) {
27822774
func (bc *BlockChain) GetTrieFlushInterval() time.Duration {
27832775
return time.Duration(bc.flushInterval.Load())
27842776
}
2777+
2778+
// FirstStateBlock returns the first available state block number that is stored in the database.
2779+
func (bc *BlockChain) FirstStateBlock() (uint64, error) {
2780+
return bc.triedb.FirstStateBlock()
2781+
}

eth/api_backend.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package eth
1919
import (
2020
"context"
2121
"errors"
22+
"fmt"
2223
"math/big"
2324
"time"
2425

@@ -61,9 +62,16 @@ func (b *EthAPIBackend) CurrentBlock() *types.Header {
6162
return b.eth.blockchain.CurrentBlock()
6263
}
6364

64-
func (b *EthAPIBackend) SetHead(number uint64) {
65+
func (b *EthAPIBackend) SetHead(number uint64) error {
66+
firstStateBlock, err := b.eth.blockchain.FirstStateBlock()
67+
if err != nil {
68+
return err
69+
}
70+
if number < firstStateBlock {
71+
return fmt.Errorf("cannot rewind to block %d, oldest available state is at block %d", number, firstStateBlock)
72+
}
6573
b.eth.handler.downloader.Cancel()
66-
b.eth.blockchain.SetHead(number)
74+
return b.eth.blockchain.SetHead(number)
6775
}
6876

6977
func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Header, error) {

internal/ethapi/api.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,8 +1830,7 @@ func (api *DebugAPI) SetHead(number hexutil.Uint64) error {
18301830
if header.Number.Uint64() <= uint64(number) {
18311831
return errors.New("not allowed to rewind to a future block")
18321832
}
1833-
api.b.SetHead(uint64(number))
1834-
return nil
1833+
return api.b.SetHead(uint64(number))
18351834
}
18361835

18371836
// NetAPI offers network related RPC methods

internal/ethapi/api_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ func (b testBackend) RPCGasCap() uint64 { return 10000000
484484
func (b testBackend) RPCEVMTimeout() time.Duration { return time.Second }
485485
func (b testBackend) RPCTxFeeCap() float64 { return 0 }
486486
func (b testBackend) UnprotectedAllowed() bool { return false }
487-
func (b testBackend) SetHead(number uint64) {}
487+
func (b testBackend) SetHead(number uint64) error { return nil }
488488
func (b testBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Header, error) {
489489
if number == rpc.LatestBlockNumber {
490490
return b.chain.CurrentBlock(), nil

internal/ethapi/backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ type Backend interface {
5555
UnprotectedAllowed() bool // allows only for EIP155 transactions.
5656

5757
// Blockchain API
58-
SetHead(number uint64)
58+
SetHead(number uint64) error
5959
HeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Header, error)
6060
HeaderByHash(ctx context.Context, hash common.Hash) (*types.Header, error)
6161
HeaderByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (*types.Header, error)

internal/ethapi/transaction_args_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ func (b *backendMock) RPCGasCap() uint64 { return 0 }
336336
func (b *backendMock) RPCEVMTimeout() time.Duration { return time.Second }
337337
func (b *backendMock) RPCTxFeeCap() float64 { return 0 }
338338
func (b *backendMock) UnprotectedAllowed() bool { return false }
339-
func (b *backendMock) SetHead(number uint64) {}
339+
func (b *backendMock) SetHead(number uint64) error { return nil }
340340
func (b *backendMock) HeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Header, error) {
341341
return nil, nil
342342
}

triedb/database.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ func (db *Database) Disk() ethdb.Database {
376376
return db.disk
377377
}
378378

379-
// FirstStateBlock
379+
// FirstStateBlock returns the first available state block number that is stored in the database.
380380
func (db *Database) FirstStateBlock() (uint64, error) {
381381
pdb, ok := db.backend.(*pathdb.Database)
382382
if !ok {

triedb/pathdb/database.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -751,20 +751,22 @@ func (db *Database) StorageIterator(root common.Hash, account common.Hash, seek
751751

752752
// FirstStateBlock returns the block number of the oldest state snapshot in the freezer or disk layer.
753753
func (db *Database) FirstStateBlock() (uint64, error) {
754-
var (
755-
m meta
756-
err error
757-
tailID = db.tree.bottom().stateID()
758-
)
754+
if db.freezer == nil {
755+
return 0, errors.New("freezer is not available")
756+
}
759757

760-
if db.freezer != nil {
761-
tailID, err = db.freezer.Tail()
762-
if err != nil {
763-
return 0, err
764-
}
758+
tailID, err := db.freezer.Tail()
759+
if err != nil {
760+
return 0, err
761+
}
762+
763+
// No state has been persistent
764+
if tailID == 0 {
765+
return 0, nil
765766
}
766767

767-
blob := rawdb.ReadStateHistoryMeta(db.diskdb, tailID)
768+
blob := rawdb.ReadStateHistoryMeta(db.freezer, tailID+1)
769+
var m meta
768770
if err := m.decode(blob); err != nil {
769771
return 0, err
770772
}

0 commit comments

Comments
 (0)