sigp
diff --git a/‎Cargo.lock‎
Lines changed: 53 additions & 328 deletions b/‎Cargo.lock‎
Lines changed: 53 additions & 328 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 2 additions & 0 deletions b/‎Cargo.toml‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Makefile‎
Lines changed: 1 addition & 1 deletion b/‎Makefile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎account_manager/README.md‎
Lines changed: 2 additions & 2 deletions b/‎account_manager/README.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎account_manager/src/lib.rs‎
Lines changed: 1 addition & 1 deletion b/‎account_manager/src/lib.rs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎account_manager/src/validator/create.rs‎
Lines changed: 2 additions & 2 deletions b/‎account_manager/src/validator/create.rs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎account_manager/src/validator/mod.rs‎
Lines changed: 2 additions & 2 deletions b/‎account_manager/src/validator/mod.rs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎account_manager/src/validator/slashing_protection.rs‎
Lines changed: 3 additions & 3 deletions b/‎account_manager/src/validator/slashing_protection.rs‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎beacon_node/Cargo.toml‎
Lines changed: 1 addition & 1 deletion b/‎beacon_node/Cargo.toml‎
Lines changed: 1 addition & 1 deletion
@@ -9,6 +9,7 @@ members = [
     "beacon_node/client",
     "beacon_node/eth1",
     "beacon_node/lighthouse_network",
+    "beacon_node/lighthouse_network/gossipsub",
     "beacon_node/execution_layer",
     "beacon_node/http_api",
     "beacon_node/http_metrics",
@@ -200,6 +201,7 @@ execution_layer = { path = "beacon_node/execution_layer" }
 filesystem = { path = "common/filesystem" }
 fork_choice = { path = "consensus/fork_choice" }
 genesis = { path = "beacon_node/genesis" }
+gossipsub = { path = "beacon_node/lighthouse_network/gossipsub/" }
 http_api = { path = "beacon_node/http_api" }
 int_to_bytes = { path = "consensus/int_to_bytes" }
 kzg = { path = "crypto/kzg" }
 
@@ -39,7 +39,7 @@ PROFILE ?= release
 
 # List of all hard forks. This list is used to set env variables for several tests so that
 # they run for different forks.
-FORKS=phase0 altair merge capella deneb
+FORKS=phase0 altair merge capella deneb electra
 
 # Extra flags for Cargo
 CARGO_INSTALL_EXTRA_FLAGS?=
 
@@ -41,7 +41,7 @@ as the canonical staking deposit contract address.
 The [Lighthouse Book](https://lighthouse-book.sigmaprime.io) contains information for users and
 developers.
 
-The Lighthouse team maintains a blog at [lighthouse-blog.sigmaprime.io][blog] which contains periodical
+The Lighthouse team maintains a blog at [lighthouse-blog.sigmaprime.io][blog] which contains periodic
 progress updates, roadmap insights and interesting findings.
 
 ## Branches
 
@@ -29,6 +29,6 @@ Simply run `./account_manager generate` to generate a new random private key,
 which will be automatically saved to the correct directory.
 
 If you prefer to use our "deterministic" keys for testing purposes, simply
-run `./accounts_manager generate_deterministic -i <index>`, where `index` is
+run `./account_manager generate_deterministic -i <index>`, where `index` is
 the validator index for the key. This will reliably produce the same key each time
-and save it to the directory.
+and save it to the directory.
@@ -22,7 +22,7 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
 }
 
 /// Run the account manager, returning an error if the operation did not succeed.
-pub fn run<T: EthSpec>(matches: &ArgMatches<'_>, env: Environment<T>) -> Result<(), String> {
+pub fn run<E: EthSpec>(matches: &ArgMatches<'_>, env: Environment<E>) -> Result<(), String> {
     match matches.subcommand() {
         (wallet::CMD, Some(matches)) => wallet::cli_run(matches)?,
         (validator::CMD, Some(matches)) => validator::cli_run(matches, env)?,
 
@@ -112,9 +112,9 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
         )
 }
 
-pub fn cli_run<T: EthSpec>(
+pub fn cli_run<E: EthSpec>(
     matches: &ArgMatches,
-    env: Environment<T>,
+    env: Environment<E>,
     validator_dir: PathBuf,
 ) -> Result<(), String> {
     let spec = env.core_context().eth2_config.spec;
 
@@ -39,7 +39,7 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
         .subcommand(exit::cli_app())
 }
 
-pub fn cli_run<T: EthSpec>(matches: &ArgMatches, env: Environment<T>) -> Result<(), String> {
+pub fn cli_run<E: EthSpec>(matches: &ArgMatches, env: Environment<E>) -> Result<(), String> {
     let validator_base_dir = if matches.value_of("datadir").is_some() {
         let path: PathBuf = clap_utils::parse_required(matches, "datadir")?;
         path.join(DEFAULT_VALIDATOR_DIR)
@@ -49,7 +49,7 @@ pub fn cli_run<T: EthSpec>(matches: &ArgMatches, env: Environment<T>) -> Result<
     eprintln!("validator-dir path: {:?}", validator_base_dir);
 
     match matches.subcommand() {
-        (create::CMD, Some(matches)) => create::cli_run::<T>(matches, env, validator_base_dir),
+        (create::CMD, Some(matches)) => create::cli_run::<E>(matches, env, validator_base_dir),
         (modify::CMD, Some(matches)) => modify::cli_run(matches, validator_base_dir),
         (import::CMD, Some(matches)) => import::cli_run(matches, validator_base_dir),
         (list::CMD, Some(_)) => list::cli_run(validator_base_dir),
 
@@ -53,9 +53,9 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
         )
 }
 
-pub fn cli_run<T: EthSpec>(
+pub fn cli_run<E: EthSpec>(
     matches: &ArgMatches<'_>,
-    env: Environment<T>,
+    env: Environment<E>,
     validator_base_dir: PathBuf,
 ) -> Result<(), String> {
     let slashing_protection_db_path = validator_base_dir.join(SLASHING_PROTECTION_FILENAME);
@@ -64,7 +64,7 @@ pub fn cli_run<T: EthSpec>(
         .ok_or("Unable to get testnet configuration from the environment")?;
 
     let genesis_validators_root = eth2_network_config
-        .genesis_validators_root::<T>()?
+        .genesis_validators_root::<E>()?
         .ok_or_else(|| "Unable to get genesis state, has genesis occurred?".to_string())?;
 
     match matches.subcommand() {
 
@@ -1,6 +1,6 @@
 [package]
 name = "beacon_node"
-version = "5.1.1"
+version = "5.1.3"
 authors = [
     "Paul Hauner <[email protected]>",
     "Age Manning <[email protected]",
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/// Run the account manager, returning an error if the operation did not succeed.`
`25`		`-pub fn run<T: EthSpec>(matches: &ArgMatches<'_>, env: Environment<T>) -> Result<(), String> {`
	`25`	`+pub fn run<E: EthSpec>(matches: &ArgMatches<'_>, env: Environment<E>) -> Result<(), String> {`
`26`	`26`	`match matches.subcommand() {`
`27`	`27`	`(wallet::CMD, Some(matches)) => wallet::cli_run(matches)?,`
`28`	`28`	`(validator::CMD, Some(matches)) => validator::cli_run(matches, env)?,`
Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,9 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {`
`112`	`112`	`)`
`113`	`113`	`}`
`114`	`114`
`115`		`-pub fn cli_run<T: EthSpec>(`
	`115`	`+pub fn cli_run<E: EthSpec>(`
`116`	`116`	`matches: &ArgMatches,`
`117`		`- env: Environment<T>,`
	`117`	`+ env: Environment<E>,`
`118`	`118`	`validator_dir: PathBuf,`
`119`	`119`	`) -> Result<(), String> {`
`120`	`120`	`let spec = env.core_context().eth2_config.spec;`