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.

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

changes for unified[wip] #6758

Draft
wants to merge 4 commits into
base: unstable
Choose a base branch
from
Draft

changes for unified[wip] #6758

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f32c73
Initial changes required by nimbus suite (aka "unified")
Dec 3, 2024
76e6141
make some procedures public
Dec 11, 2024
133919e
Merge branch 'unstable' into dev/pedro/unified_changes
pedromiguelmiranda Dec 17, 2024
7389c2f
Merge branch 'unstable' into dev/pedro/unified_changes
pedromiguelmiranda Dec 19, 2024
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: 6 additions & 6 deletions beacon_chain/nimbus_beacon_node.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ declareGauge sync_committee_active,
declareCounter db_checkpoint_seconds,
"Time spent checkpointing the database to clear the WAL file"

proc fetchGenesisState(
proc fetchGenesisState*(
metadata: Eth2NetworkMetadata,
genesisState = none(InputFile),
genesisStateUrl = none(Uri)
Expand Down Expand Up @@ -101,7 +101,7 @@ proc fetchGenesisState(
else:
nil

proc doRunTrustedNodeSync(
proc doRunTrustedNodeSync*(
db: BeaconChainDB,
metadata: Eth2NetworkMetadata,
databaseDir: string,
Expand Down Expand Up @@ -1885,7 +1885,7 @@ proc onSlotStart(node: BeaconNode, wallTime: BeaconTime,

proc onSecond(node: BeaconNode, time: Moment) =
# Nim GC metrics (for the main thread)
updateThreadMetrics()
# updateThreadMetrics()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Metrics collection not generated, and this code is commented. possible solutions may required a significant rewrite (using some strategy simliar to an aggregator pattern)


if node.config.stopAtSyncedEpoch != 0 and
node.dag.head.slot.epoch >= node.config.stopAtSyncedEpoch:
Expand Down Expand Up @@ -2344,7 +2344,7 @@ when not defined(windows):

asyncSpawn statusBarUpdatesPollingLoop()

proc doRunBeaconNode(config: var BeaconNodeConf, rng: ref HmacDrbgContext) {.raises: [CatchableError].} =
proc doRunBeaconNode*(config: var BeaconNodeConf, rng: ref HmacDrbgContext) {.raises: [CatchableError].} =
info "Launching beacon node",
version = fullVersionStr,
bls_backend = $BLS_BACKEND,
Expand Down Expand Up @@ -2380,7 +2380,7 @@ proc doRunBeaconNode(config: var BeaconNodeConf, rng: ref HmacDrbgContext) {.rai

# Nim GC metrics (for the main thread) will be collected in onSecond(), but
# we disable piggy-backing on other metrics here.
setSystemMetricsAutomaticUpdate(false)
# setSystemMetricsAutomaticUpdate(false)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same


# There are no managed event loops in here, to do a graceful shutdown, but
# letting the default Ctrl+C handler exit is safe, since we only read from
Expand Down Expand Up @@ -2564,7 +2564,7 @@ proc handleStartUpCmd(config: var BeaconNodeConf) {.raises: [CatchableError].} =

{.pop.} # TODO moduletests exceptions

programMain:
when isMainModule:
Copy link
Contributor Author

@pedromiguelmiranda pedromiguelmiranda Dec 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be an outdated strategy.however it's present in other "main" modules as well.
What is the impact of using the "when is" approach vs this one?

var config = makeBannerAndConfig(clientId, copyrights, nimBanner,
SPEC_VERSION, [], BeaconNodeConf).valueOr:
stderr.write error
Expand Down
Loading