Skip to content

Commit 3a662d4

Browse files
authored
eth: remove check for tdd reached on pos api block tags (#27799)
This change defers to the blockchain for in what circumstances to return error, instead of handling many error-cases in the api backend.
1 parent 3ff6b3c commit 3a662d4

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

eth/api_backend.go

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,18 @@ func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumb
7878
return b.eth.blockchain.CurrentBlock(), nil
7979
}
8080
if number == rpc.FinalizedBlockNumber {
81-
if !b.eth.Merger().TDDReached() {
82-
return nil, errors.New("'finalized' tag not supported on pre-merge network")
83-
}
8481
block := b.eth.blockchain.CurrentFinalBlock()
85-
if block != nil {
86-
return block, nil
82+
if block == nil {
83+
return nil, errors.New("finalized block not found")
8784
}
88-
return nil, errors.New("finalized block not found")
85+
return block, nil
8986
}
9087
if number == rpc.SafeBlockNumber {
91-
if !b.eth.Merger().TDDReached() {
92-
return nil, errors.New("'safe' tag not supported on pre-merge network")
93-
}
9488
block := b.eth.blockchain.CurrentSafeBlock()
95-
if block != nil {
96-
return block, nil
89+
if block == nil {
90+
return nil, errors.New("safe block not found")
9791
}
98-
return nil, errors.New("safe block not found")
92+
return block, nil
9993
}
10094
return b.eth.blockchain.GetHeaderByNumber(uint64(number)), nil
10195
}
@@ -136,19 +130,13 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
136130
return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
137131
}
138132
if number == rpc.FinalizedBlockNumber {
139-
if !b.eth.Merger().TDDReached() {
140-
return nil, errors.New("'finalized' tag not supported on pre-merge network")
141-
}
142133
header := b.eth.blockchain.CurrentFinalBlock()
143134
if header == nil {
144135
return nil, errors.New("finalized block not found")
145136
}
146137
return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
147138
}
148139
if number == rpc.SafeBlockNumber {
149-
if !b.eth.Merger().TDDReached() {
150-
return nil, errors.New("'safe' tag not supported on pre-merge network")
151-
}
152140
header := b.eth.blockchain.CurrentSafeBlock()
153141
if header == nil {
154142
return nil, errors.New("safe block not found")

0 commit comments

Comments
 (0)