Skip to content

Beacon node startup cleanups #7665

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 5 commits into from
Nov 3, 2025
Merged

Beacon node startup cleanups #7665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
904a0f6
Beacon node startup cleanups
arnetheduck Oct 27, 2025
9b2e81e
Merge remote-tracking branch 'origin/unstable' into startup-stuff
arnetheduck Oct 27, 2025
59883db
test fixes
arnetheduck Oct 27, 2025
cd942de
more tests
arnetheduck Oct 27, 2025
aeb3b67
eh
arnetheduck Oct 27, 2025
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
25 changes: 4 additions & 21 deletions beacon_chain/conf.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import
eth/enr/enr,
json_serialization, json_serialization/std/net as jsnet, web3/confutils_defs,
chronos/transports/common,
kzg4844/kzg,
./spec/[engine_authentication, keystore, network, crypto],
./spec/datatypes/base,
./networking/network_metadata,
Expand Down Expand Up @@ -680,13 +679,12 @@ type
defaultValue: HistoryMode.Prune
name: "history".}: HistoryMode

# https://notes.ethereum.org/@bbusa/dencun-devnet-6
# "Please ensure that there is a way for us to specify the file through a
# runtime flag such as --trusted-setup-file (or similar)."
trustedSetupFile* {.
hidden
desc: "Experimental, debug option; could disappear at any time without warning"
name: "temporary-debug-trusted-setup-file" .}: Option[string]
desc: "Alternative EIP-4844 trusted setup file"
defaultValue: none(string)
defaultValueDesc: "Baked in trusted setup"
name: "debug-trusted-setup-file" .}: Option[string]

bandwidthEstimate* {.
hidden
Expand Down Expand Up @@ -760,11 +758,6 @@ type
desc: "Output wallet file"
name: "new-wallet-file" .}: Option[OutFile]

#[
of DepositsCmd.status:
discard
]#

of DepositsCmd.`import`:
importedDepositsDir* {.
argument
Expand Down Expand Up @@ -1530,16 +1523,6 @@ proc engineApiUrls*(config: auto): seq[EngineApiUrl] =
(elUrls & config.web3Urls).toFinalEngineApiUrls(
config.jwtSecret.configJwtSecretOpt)

proc loadKzgTrustedSetup*(): Result[void, string] =
static: doAssert const_preset in ["mainnet", "gnosis", "minimal"]
loadTrustedSetupFromString(kzg.trustedSetup, 0)

proc loadKzgTrustedSetup*(trustedSetupPath: string): Result[void, string] =
try:
loadTrustedSetupFromString(readFile(trustedSetupPath), 0)
except IOError as err:
err(err.msg)

proc formatIt*(v: Option[IpAddress]): string =
if v.isSome():
$v.get()
Expand Down
10 changes: 5 additions & 5 deletions beacon_chain/fork_choice/fork_choice.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ when isMainModule:
var new_balances: seq[Gwei]

for i in 0 ..< validator_count:
indices.add fakeHash(i), i
indices[fakeHash(i)] = i
votes.add VoteTracker(
# Move vote from root 0 to root 1
current_root: fakeHash(0),
Expand Down Expand Up @@ -729,8 +729,8 @@ when isMainModule:
var votes: seq[VoteTracker]

# Add 2 blocks
indices.add fakeHash(1), 0
indices.add fakeHash(2), 1
indices[fakeHash(1)] = 0
indices[fakeHash(2)] = 1

# 1 validator at the start, 2 at the end
var deltas = newSeqUninit[Delta](2)
Expand Down Expand Up @@ -768,8 +768,8 @@ when isMainModule:
var votes: seq[VoteTracker]

# Add 2 blocks
indices.add fakeHash(1), 0
indices.add fakeHash(2), 1
indices[fakeHash(1)] = 0
indices[fakeHash(2)] = 1

# 2 validator at the start, 1 at the end
var deltas = newSeqUninit[Delta](2)
Expand Down
Loading
Loading