Merge branch 'unstable' into update-fulu-spec-config

Author: jimmygchen

Cargo.lock

@@ -6,7 +6,6 @@ members = [
     "beacon_node/beacon_processor",
     "beacon_node/builder_client",
     "beacon_node/client",
-    "beacon_node/eth1",
     "beacon_node/execution_layer",
     "beacon_node/genesis",
     "beacon_node/http_api",
@@ -72,7 +71,6 @@ members = [
     "slasher",
     "slasher/service",
     "testing/ef_tests",
-    "testing/eth1_test_rig",
     "testing/execution_engine_integration",
     "testing/node_test_rig",
     "testing/simulator",
@@ -138,8 +136,6 @@ doppelganger_service = { path = "validator_client/doppelganger_service" }
 either = "1.9"
 env_logger = "0.9"
 environment = { path = "lighthouse/environment" }
-eth1 = { path = "beacon_node/eth1" }
-eth1_test_rig = { path = "testing/eth1_test_rig" }
 eth2 = { path = "common/eth2" }
 eth2_config = { path = "common/eth2_config" }
 eth2_key_derivation = { path = "crypto/eth2_key_derivation" }

Cargo.toml

@@ -19,7 +19,6 @@ alloy-primitives = { workspace = true }
 bitvec = { workspace = true }
 bls = { workspace = true }
 derivative = { workspace = true }
-eth1 = { workspace = true }
 eth2 = { workspace = true }
 eth2_network_config = { workspace = true }
 ethereum_hashing = { workspace = true }

beacon_node/beacon_chain/Cargo.toml

@@ -353,7 +353,7 @@ impl<T: BeaconChainTypes> Clone for IndexedUnaggregatedAttestation<'_, T> {
 /// A helper trait implemented on wrapper types that can be progressed to a state where they can be
 /// verified for application to fork choice.
 pub trait VerifiedAttestation<T: BeaconChainTypes>: Sized {
-    fn attestation(&self) -> AttestationRef<T::EthSpec>;
+    fn attestation(&self) -> AttestationRef<'_, T::EthSpec>;
 
     fn indexed_attestation(&self) -> &IndexedAttestation<T::EthSpec>;
 
@@ -366,7 +366,7 @@ pub trait VerifiedAttestation<T: BeaconChainTypes>: Sized {
 }
 
 impl<T: BeaconChainTypes> VerifiedAttestation<T> for VerifiedAggregatedAttestation<'_, T> {
-    fn attestation(&self) -> AttestationRef<T::EthSpec> {
+    fn attestation(&self) -> AttestationRef<'_, T::EthSpec> {
         self.attestation()
     }
 
@@ -376,7 +376,7 @@ impl<T: BeaconChainTypes> VerifiedAttestation<T> for VerifiedAggregatedAttestati
 }
 
 impl<T: BeaconChainTypes> VerifiedAttestation<T> for VerifiedUnaggregatedAttestation<'_, T> {
-    fn attestation(&self) -> AttestationRef<T::EthSpec> {
+    fn attestation(&self) -> AttestationRef<'_, T::EthSpec> {
         self.attestation.to_ref()
     }