Skip to content

Retain vanity specific logic back through second latest Mainnet fork #7000

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
tersec merged 1 commit into from
Mar 9, 2025
Merged

Retain vanity specific logic back through second latest Mainnet fork #7000

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
6 changes: 3 additions & 3 deletions beacon_chain/consensus_object_pools/block_pools_types.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# beacon_chain
# Copyright (c) 2018-2024 Status Research & Development GmbH
# Copyright (c) 2018-2025 Status Research & Development GmbH
# Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
Expand All @@ -22,11 +22,11 @@ import
from ../spec/datatypes/capella import TrustedSignedBeaconBlock
from ../spec/datatypes/deneb import TrustedSignedBeaconBlock

from "."/vanity_logs/vanity_logs import VanityLogs
from "."/vanity_logs/vanity_logs import LogProc, VanityLogs

export
sets, tables, hashes, helpers, beacon_chain_db, era_db, block_dag,
block_pools_types_light_client, validator_monitor, VanityLogs
block_pools_types_light_client, validator_monitor, LogProc, VanityLogs

# ChainDAG and types related to forming a DAG of blocks, keeping track of their
# relationships and allowing various forms of lookups
Expand Down
40 changes: 13 additions & 27 deletions beacon_chain/consensus_object_pools/blockchain_dag.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2410,7 +2410,6 @@ proc updateHead*(

let
lastHeadStateRoot = getStateRoot(dag.headState)
lastHeadMergeComplete = dag.headState.is_merge_transition_complete()
lastHeadKind = dag.headState.kind
lastKnownValidatorsChangeStatuses = getBlsToExecutionChangeStatuses(
dag.headState, knownValidators)
Expand All @@ -2432,26 +2431,20 @@ proc updateHead*(

dag.head = newHead

if dag.headState.is_merge_transition_complete() and not
lastHeadMergeComplete and
dag.vanityLogs.onMergeTransitionBlock != nil:
dag.vanityLogs.onMergeTransitionBlock()

if dag.headState.kind > lastHeadKind:
case dag.headState.kind
of ConsensusFork.Phase0 .. ConsensusFork.Bellatrix:
discard
of ConsensusFork.Capella:
if dag.vanityLogs.onUpgradeToCapella != nil:
dag.vanityLogs.onUpgradeToCapella()
of ConsensusFork.Deneb:
if dag.vanityLogs.onUpgradeToDeneb != nil:
dag.vanityLogs.onUpgradeToDeneb()
of ConsensusFork.Electra:
if dag.vanityLogs.onUpgradeToElectra != nil:
dag.vanityLogs.onUpgradeToElectra()
of ConsensusFork.Fulu:
discard
proc logForkUpgrade(consensusFork: ConsensusFork, handler: LogProc) =
if handler != nil and
dag.headState.kind >= consensusFork and
lastHeadKind < consensusFork:
handler()

# Policy: Retain back through Mainnet's second latest fork.
ConsensusFork.Capella.logForkUpgrade(
dag.vanityLogs.onUpgradeToCapella)
ConsensusFork.Deneb.logForkUpgrade(
dag.vanityLogs.onUpgradeToDeneb)
ConsensusFork.Electra.logForkUpgrade(
dag.vanityLogs.onUpgradeToElectra)

if dag.vanityLogs.onKnownBlsToExecutionChange != nil and
checkBlsToExecutionChanges(
Expand Down Expand Up @@ -2567,13 +2560,6 @@ proc updateHead*(

dag.db.updateFinalizedBlocks(newFinalized)

let oldBlockHash = dag.loadExecutionBlockHash(oldFinalizedHead.blck)
if oldBlockHash.isSome and oldBlockHash.unsafeGet.isZero:
let newBlockHash = dag.loadExecutionBlockHash(dag.finalizedHead.blck)
if newBlockHash.isSome and not newBlockHash.unsafeGet.isZero:
if dag.vanityLogs.onFinalizedMergeTransitionBlock != nil:
dag.vanityLogs.onFinalizedMergeTransitionBlock()

# Pruning the block dag is required every time the finalized head changes
# in order to clear out blocks that are no longer viable and should
# therefore no longer be considered as part of the chain we're following
Expand Down
15 changes: 3 additions & 12 deletions beacon_chain/consensus_object_pools/vanity_logs/vanity_logs.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,9 @@ import chronicles
from std/os import `/`

type
LogProc = proc() {.gcsafe, raises: [].}
LogProc* = proc() {.gcsafe, raises: [].}

VanityLogs* = object
# Upon the merge activating, these get displayed, at least once when the
# head becomes post-merge and then when the merge is finalized. If chain
# reorgs happen around the initial merge onMergeTransitionBlock might be
# called several times.
onMergeTransitionBlock*: LogProc
onFinalizedMergeTransitionBlock*: LogProc

# Gets displayed on upgrade to Capella. May be displayed multiple times
# in case of chain reorgs around the upgrade.
onUpgradeToCapella*: LogProc
Expand All @@ -44,10 +37,8 @@ type

# Created by https://beatscribe.com (beatscribe#1008 on Discord)
# These need to be the main body of the log not to be reformatted or escaped.

proc bellatrixMono*() = notice "\n" & staticRead("bellatrix" / "mono.txt")
proc bellatrixColor*() = notice "\n" & staticRead("bellatrix" / "color.ans")
proc bellatrixBlink*() = notice "\n" & staticRead("bellatrix" / "blink.ans")
#
# Policy: Retain retired art files in the directory, but don't link them anymore

proc capellaMono*() = notice "\n" & staticRead("capella" / "mono.txt")
proc capellaColor*() = notice "\n" & staticRead("capella" / "color.ans")
Expand Down
10 changes: 1 addition & 9 deletions beacon_chain/nimbus_beacon_node.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,28 +146,20 @@ func getVanityLogs(stdoutKind: StdoutLogKind): VanityLogs =
of StdoutLogKind.Auto: raiseAssert "inadmissable here"
of StdoutLogKind.Colors:
VanityLogs(
onMergeTransitionBlock: bellatrixColor,
onFinalizedMergeTransitionBlock: bellatrixBlink,
onUpgradeToCapella: capellaColor,
onKnownBlsToExecutionChange: capellaBlink,
onUpgradeToDeneb: denebColor,
onUpgradeToElectra: electraColor,
onKnownCompoundingChange: electraBlink)
of StdoutLogKind.NoColors:
VanityLogs(
onMergeTransitionBlock: bellatrixMono,
onFinalizedMergeTransitionBlock: bellatrixMono,
onUpgradeToCapella: capellaMono,
onKnownBlsToExecutionChange: capellaMono,
onUpgradeToDeneb: denebMono,
onUpgradeToElectra: electraMono,
onKnownCompoundingChange: electraMono)
of StdoutLogKind.Json, StdoutLogKind.None:
VanityLogs(
onMergeTransitionBlock:
(proc() = notice "🐼 Proof of Stake Activated 🐼"),
onFinalizedMergeTransitionBlock:
(proc() = notice "🐼 Proof of Stake Finalized 🐼"),
onUpgradeToCapella:
(proc() = notice "🦉 Withdrowls now available 🦉"),
onKnownBlsToExecutionChange:
Expand All @@ -182,7 +174,7 @@ func getVanityLogs(stdoutKind: StdoutLogKind): VanityLogs =
func getVanityMascot(consensusFork: ConsensusFork): string =
case consensusFork
of ConsensusFork.Fulu:
"not decided yet?"
"❓"
of ConsensusFork.Electra:
"🦒"
of ConsensusFork.Deneb:
Expand Down