Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
6968dcf
Start updating to Edition 2024
michaelsproul Jul 17, 2025
5c29427
update to edition 2024
chong-he Jul 21, 2025
66bfa2c
ori
chong-he Jul 21, 2025
8e29f0b
cargo fmt
chong-he Jul 21, 2025
4771275
update
chong-he Jul 21, 2025
9aef6fb
Add explicit static lifetimes in task executor
michaelsproul Jul 23, 2025
d1d1ca9
update
chong-he Jul 23, 2025
1a17cf6
Merge remote-tracking branch 'origin/unstable' into edition2024
chong-he Jul 23, 2025
9fad29d
fix merge
chong-he Jul 23, 2025
9ec26ab
fmt
chong-he Jul 23, 2025
43f1dcc
Merge branch 'unstable' into edition2024
chong-he Jul 24, 2025
19032aa
update
chong-he Jul 24, 2025
9cde5c4
Revert "update"
chong-he Jul 24, 2025
a81f149
chacharng
chong-he Jul 24, 2025
9ae12a1
rand crate
chong-he Jul 24, 2025
36a6fc0
Revert "rand crate"
chong-he Jul 24, 2025
57a5f5d
Reapply "rand crate"
chong-he Jul 24, 2025
5fedd86
double dependency approach
dknopik Jul 24, 2025
e3fc68f
Merge branch 'unstable' into edition2024
chong-he Jul 28, 2025
4ca4377
update
chong-he Jul 28, 2025
262c7b8
lifetime
chong-he Jul 28, 2025
136e4e4
fmt
chong-he Jul 28, 2025
07468a5
thanks @dknopik
chong-he Jul 28, 2025
dcb061e
update test
chong-he Jul 28, 2025
fdc8456
cargo sort
chong-he Jul 28, 2025
913494d
version
chong-he Jul 28, 2025
e9eba45
change to static
chong-he Aug 6, 2025
a7d5db1
fmt
chong-he Aug 6, 2025
c144bd6
change to ran_chacha_03
chong-he Aug 6, 2025
26181d0
Update beacon_node/network/src/sync/manager.rs
chong-he Aug 6, 2025
ba41aa0
Merge branch 'unstable' into edition2024
chong-he Aug 7, 2025
e41fcaa
formatting
chong-he Aug 7, 2025
a303cdd
rng and lint
chong-he Aug 7, 2025
4e6cf8b
Update lighthouse/src/main.rs
chong-he Aug 8, 2025
6a4300e
Merge remote-tracking branch 'origin/unstable' into edition2024
chong-he Aug 8, 2025
cd93db3
merge unstable
chong-he Aug 8, 2025
8665e63
if / if let chain to use &&
chong-he Aug 8, 2025
ab831b0
Merge branch 'unstable' into edition2024
chong-he Aug 12, 2025
b8691e3
formatting and lint
chong-he Aug 12, 2025
be16b4e
Merge branch 'unstable' into edition2024
chong-he Aug 12, 2025
05e5aac
formatting
chong-he Aug 12, 2025
f8d8d0f
Merge branch 'unstable' into edition2024
macladson Aug 12, 2025
b349552
Merge branch 'unstable' into edition2024
michaelsproul Aug 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
70 changes: 40 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ members = [
resolver = "2"

[workspace.package]
edition = "2021"
edition = "2024"

[workspace.dependencies]
account_utils = { path = "common/account_utils" }
Expand Down Expand Up @@ -208,7 +208,7 @@ quickcheck = "1"
quickcheck_macros = "1"
quote = "1"
r2d2 = "0.8"
rand = "0.8"
rand = "0.9.0"
rayon = "1.7"
regex = "1"
reqwest = { version = "0.11", default-features = false, features = [
Expand Down
12 changes: 7 additions & 5 deletions account_manager/src/validator/create.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
use crate::common::read_wallet_name_from_cli;
use crate::{SECRETS_DIR_FLAG, WALLETS_DIR_FLAG};
use account_utils::{
random_password, read_password_from_user, strip_off_newlines, validator_definitions, PlainText,
STDIN_INPUTS_FLAG,
PlainText, STDIN_INPUTS_FLAG, random_password, read_password_from_user, strip_off_newlines,
validator_definitions,
};
use clap::{Arg, ArgAction, ArgMatches, Command};
use clap_utils::FLAG_HEADER;
use directory::{parse_path_or_default_with_flag, DEFAULT_SECRET_DIR, DEFAULT_WALLET_DIR};
use directory::{DEFAULT_SECRET_DIR, DEFAULT_WALLET_DIR, parse_path_or_default_with_flag};
use environment::Environment;
use eth2_wallet_manager::WalletManager;
use slashing_protection::{SlashingDatabase, SLASHING_PROTECTION_FILENAME};
use slashing_protection::{SLASHING_PROTECTION_FILENAME, SlashingDatabase};
use std::ffi::OsStr;
use std::fs;
use std::fs::create_dir_all;
Expand Down Expand Up @@ -148,7 +148,9 @@ pub fn cli_run<E: EthSpec>(
return Err(format!(
"No wallet directory at {:?}. Use the `lighthouse --network {} {} {} {}` command to create a wallet",
wallet_base_dir,
matches.get_one::<String>("network").unwrap_or(&String::from("<NETWORK>")),
matches
.get_one::<String>("network")
.unwrap_or(&String::from("<NETWORK>")),
crate::CMD,
crate::wallet::CMD,
crate::wallet::create::CMD
Expand Down
10 changes: 6 additions & 4 deletions account_manager/src/validator/exit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use clap::{Arg, ArgAction, ArgMatches, Command};
use clap_utils::FLAG_HEADER;
use environment::Environment;
use eth2::{
types::{GenesisData, StateId, ValidatorData, ValidatorId, ValidatorStatus},
BeaconNodeHttpClient, Timeouts,
types::{GenesisData, StateId, ValidatorData, ValidatorId, ValidatorStatus},
};
use eth2_keystore::Keystore;
use eth2_network_config::Eth2NetworkConfig;
Expand Down Expand Up @@ -239,9 +239,11 @@ async fn publish_voluntary_exit<E: EthSpec>(
let withdrawal_epoch = validator_data.validator.withdrawable_epoch;
let current_epoch = get_current_epoch::<E>(genesis_data.genesis_time, spec)
.ok_or("Failed to get current epoch. Please check your system time")?;
eprintln!("Voluntary exit has been accepted into the beacon chain, but not yet finalized. \
eprintln!(
"Voluntary exit has been accepted into the beacon chain, but not yet finalized. \
Finalization may take several minutes or longer. Before finalization there is a low \
probability that the exit may be reverted.");
probability that the exit may be reverted."
);
eprintln!(
"Current epoch: {}, Exit epoch: {}, Withdrawable epoch: {}",
current_epoch, exit_epoch, withdrawal_epoch
Expand Down Expand Up @@ -401,7 +403,7 @@ mod tests {
use eth2_keystore::KeystoreBuilder;
use std::fs::File;
use std::io::Write;
use tempfile::{tempdir, TempDir};
use tempfile::{TempDir, tempdir};

const PASSWORD: &str = "cats";
const KEYSTORE_NAME: &str = "keystore-m_12381_3600_0_0_0-1595406747.json";
Expand Down
Loading