Skip to content

eth: core: implement final block #24282

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

Merged
merged 8 commits into from
May 18, 2022
Merged

eth: core: implement final block #24282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e068edc
eth: core: implement finalized block
MariusVanDerWijden Jan 24, 2022
38b368b
eth/catalyst: fix final block
MariusVanDerWijden May 10, 2022
eb285f2
eth/catalyst: update finalized head gauge
MariusVanDerWijden May 10, 2022
5d58d48
internal/jsre/deps: updated web3.js to allow for finalized block
MariusVanDerWijden May 13, 2022
2c43cc0
eth/catalyst: make sure only one thread can call fcu
MariusVanDerWijden May 16, 2022
a4a0182
eth/catalyst: nitpicks
MariusVanDerWijden May 17, 2022
665cee2
eth/catalyst: use plain mutex
MariusVanDerWijden May 18, 2022
03241f0
eth: nitpicks
MariusVanDerWijden May 18, 2022
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/rawdb/accessors_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ func ReadFinalizedBlockHash(db ethdb.KeyValueReader) common.Hash {
// WriteFinalizedBlockHash stores the hash of the finalized block.
func WriteFinalizedBlockHash(db ethdb.KeyValueWriter, hash common.Hash) {
if err := db.Put(headFinalizedBlockKey, hash.Bytes()); err != nil {
log.Crit("Failed to store last fast block's hash", "err", err)
log.Crit("Failed to store last finalized block's hash", "err", err)
}
}

Expand Down
16 changes: 8 additions & 8 deletions eth/catalyst/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ type ConsensusAPI struct {
eth *eth.Ethereum
remoteBlocks *headerQueue // Cache of remote payloads received
localBlocks *payloadQueue // Cache of local payloads generated
// Lock for the FCU method
mu *sync.Mutex
// Lock for the forkChoiceUpdated method
forkChoiceLock *sync.Mutex
}

// NewConsensusAPI creates a new consensus api for the given backend.
Expand All @@ -72,10 +72,10 @@ func NewConsensusAPI(eth *eth.Ethereum) *ConsensusAPI {
panic("Catalyst started without valid total difficulty")
}
return &ConsensusAPI{
eth: eth,
remoteBlocks: newHeaderQueue(),
localBlocks: newPayloadQueue(),
mu: new(sync.Mutex),
eth: eth,
remoteBlocks: newHeaderQueue(),
localBlocks: newPayloadQueue(),
forkChoiceLock: new(sync.Mutex),
}
}

Expand All @@ -90,8 +90,8 @@ func NewConsensusAPI(eth *eth.Ethereum) *ConsensusAPI {
// If there are payloadAttributes:
// we try to assemble a block with the payloadAttributes and return its payloadID
func (api *ConsensusAPI) ForkchoiceUpdatedV1(update beacon.ForkchoiceStateV1, payloadAttributes *beacon.PayloadAttributesV1) (beacon.ForkChoiceResponse, error) {
api.mu.Lock()
defer api.mu.Unlock()
api.forkChoiceLock.Lock()
defer api.forkChoiceLock.Unlock()

log.Trace("Engine API request received", "method", "ForkchoiceUpdated", "head", update.HeadBlockHash, "finalized", update.FinalizedBlockHash, "safe", update.SafeBlockHash)
if update.HeadBlockHash == (common.Hash{}) {
Expand Down