rebase

Author: GeemoCandama

beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs

@@ -15,11 +15,10 @@ use std::io::{Read, Write};
 use std::marker::PhantomData;
 use std::sync::Arc;
 use tokio_util::codec::{Decoder, Encoder};
-use types::light_client_bootstrap::LightClientBootstrap;
 use types::{
-    light_client_bootstrap::LightClientBootstrap, EthSpec, ForkContext, ForkName, Hash256,
+    LightClientBootstrap, EthSpec, ForkContext, ForkName, Hash256,
     LightClientFinalityUpdate, LightClientOptimisticUpdate, SignedBeaconBlock,
-    SignedBeaconBlockAltair, SignedBeaconBlockBase, SignedBeaconBlockMerge,
+    SignedBeaconBlockAltair, SignedBeaconBlockBase, SignedBeaconBlockMerge, SignedBeaconBlockCapella,
 };
 use unsigned_varint::codec::Uvi;
 

beacon_node/lighthouse_network/src/rpc/config.rs

@@ -139,7 +139,9 @@ impl FromStr for OutboundRateLimiterConfig {
                 Protocol::BlocksByRoot => blocks_by_root_quota = blocks_by_root_quota.or(quota),
                 Protocol::Ping => ping_quota = ping_quota.or(quota),
                 Protocol::MetaData => meta_data_quota = meta_data_quota.or(quota),
-                Protocol::LightClientBootstrap => return Err("Lighthouse does not send LightClientBootstrap requests. Quota should not be set."),
+                Protocol::LightClientBootstrap
+                | Protocol::LightClientOptimisticUpdate
+                | Protocol::LightClientFinalityUpdate => return Err("Lighthouse does not send LightClient requests. Quota should not be set."),
             }
         }
         Ok(OutboundRateLimiterConfig {

beacon_node/lighthouse_network/src/rpc/methods.rs

@@ -13,7 +13,7 @@ use std::sync::Arc;
 use strum::IntoStaticStr;
 use superstruct::superstruct;
 use types::{
-    light_client_bootstrap::LightClientBootstrap, Epoch, EthSpec, Hash256,
+    LightClientBootstrap, Epoch, EthSpec, Hash256,
     LightClientFinalityUpdate, LightClientOptimisticUpdate, SignedBeaconBlock, Slot,
 };
 

beacon_node/lighthouse_network/src/rpc/protocol.rs

@@ -178,8 +178,10 @@ pub enum Protocol {
     #[strum(serialize = "light_client_bootstrap")]
     LightClientBootstrap,
     /// The `LightClientOptimisticUpdate` protocol name.
+    #[strum(serialize = "light_client_optimistic_update")]
     LightClientOptimisticUpdate,
     /// The `LightClientFinalityUpdate` protocol name.
+    #[strum(serialize = "light_client_finality_update")]
     LightClientFinalityUpdate,
 }
 

beacon_node/lighthouse_network/src/service/api_types.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use libp2p::core::connection::ConnectionId;
 use types::{
-    light_client_bootstrap::LightClientBootstrap, EthSpec, LightClientFinalityUpdate,
+    LightClientBootstrap, EthSpec, LightClientFinalityUpdate,
     LightClientOptimisticUpdate, SignedBeaconBlock,
 };
 

beacon_node/network/src/beacon_processor/worker/rpc_methods.rs

@@ -11,7 +11,7 @@ use slog::{debug, error, warn};
 use slot_clock::SlotClock;
 use std::sync::Arc;
 use task_executor::TaskExecutor;
-use types::{light_client_bootstrap::LightClientBootstrap, Epoch, EthSpec, Hash256, Slot};
+use types::{LightClientBootstrap, Epoch, EthSpec, Hash256, Slot};
 
 use super::Worker;
 

consensus/types/src/lib.rs

@@ -151,6 +151,7 @@ pub use crate::fork_versioned_response::{
 pub use crate::graffiti::{Graffiti, GRAFFITI_BYTES_LEN};
 pub use crate::historical_batch::HistoricalBatch;
 pub use crate::indexed_attestation::IndexedAttestation;
+pub use crate::light_client_bootstrap::LightClientBootstrap;
 pub use crate::light_client_finality_update::LightClientFinalityUpdate;
 pub use crate::light_client_optimistic_update::LightClientOptimisticUpdate;
 pub use crate::participation_flags::ParticipationFlags;