Skip to content
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.

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

stop calling engine_exchangeTransitionConfigurationV1 with Dencun-ready ELs #5157

Closed
wants to merge 7 commits into from
Closed
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions beacon_chain/el/el_manager.nim
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,11 @@ proc exchangeTransitionConfiguration*(m: ELManager) {.async.} =
if m.elConnections.len == 0:
return

# https://github.com/ethereum/execution-apis/blob/ee3df5bc38f28ef35385cefc9d9ca18d5e502778/src/engine/cancun.md#deprecate-engine_exchangetransitionconfigurationv1
# Consensus layer clients MUST NOT call this method.
if m.eth1Chain.cfg.DENEB_FORK_EPOCH != FAR_FUTURE_EPOCH:
return

let
deadline = sleepAsync(3.seconds)
requests = m.elConnections.mapIt(m.exchangeConfigWithSingleEL(it))
Expand All @@ -1433,7 +1438,7 @@ proc exchangeTransitionConfiguration*(m: ELManager) {.async.} =
inc cancelled

if cancelled == requests.len:
warn "Failed to exchange configuration with the configured EL end-points"
warn "Failed to exchange configuration with the configured EL endpoints"

template readJsonField(j: JsonNode, fieldName: string, ValueType: type): untyped =
var res: ValueType
Expand Down Expand Up @@ -2174,7 +2179,10 @@ proc start*(m: ELManager, syncChain = true) {.gcsafe.} =
m.chainSyncingLoopFut =
m.startChainSyncingLoop()

if m.hasJwtSecret and m.exchangeTransitionConfigurationLoopFut.isNil:
# https://github.com/ethereum/execution-apis/blob/ee3df5bc38f28ef35385cefc9d9ca18d5e502778/src/engine/cancun.md#deprecate-engine_exchangetransitionconfigurationv1
# Consensus layer clients MUST NOT call this method.
if m.hasJwtSecret and m.exchangeTransitionConfigurationLoopFut.isNil and
m.eth1Chain.cfg.DENEB_FORK_EPOCH == FAR_FUTURE_EPOCH:
m.exchangeTransitionConfigurationLoopFut =
m.startExchangeTransitionConfigurationLoop()

Expand Down