Merge latest unstable

sigp · Mar 13, 2023 · 4988a15 · 4988a15
2 parents 6cf9338 + 90cef1d
commit 4988a15
Show file tree

Hide file tree

Showing 30 changed files with 228 additions and 157 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/beacon_node/Cargo.toml b/beacon_node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "beacon_node"
-version = "3.5.0"
+version = "3.5.1"
 authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com"]
 edition = "2021"
 

diff --git a/beacon_node/beacon_chain/src/events.rs b/beacon_node/beacon_chain/src/events.rs
@@ -65,43 +65,43 @@ impl<T: EthSpec> ServerSentEventHandler<T> {
             EventKind::Attestation(_) => self
                 .attestation_tx
                 .send(kind)
-                .map(|count| log_count(count, "attestation")),
+                .map(|count| log_count("attestation", count)),
             EventKind::Block(_) => self
                 .block_tx
                 .send(kind)
-                .map(|count| log_count(count, "block")),
+                .map(|count| log_count("block", count)),
             EventKind::FinalizedCheckpoint(_) => self
                 .finalized_tx
                 .send(kind)
-                .map(|count| log_count(count, "finalized checkpoint")),
+                .map(|count| log_count("finalized checkpoint", count)),
             EventKind::Head(_) => self
                 .head_tx
                 .send(kind)
-                .map(|count| log_count(count, "head")),
+                .map(|count| log_count("head", count)),
             EventKind::VoluntaryExit(_) => self
                 .exit_tx
                 .send(kind)
-                .map(|count| log_count(count, "exit")),
+                .map(|count| log_count("exit", count)),
             EventKind::ChainReorg(_) => self
                 .chain_reorg_tx
                 .send(kind)
-                .map(|count| log_count(count, "chain reorg")),
+                .map(|count| log_count("chain reorg", count)),
             EventKind::ContributionAndProof(_) => self
                 .contribution_tx
                 .send(kind)
-                .map(|count| log_count(count, "contribution and proof")),
+                .map(|count| log_count("contribution and proof", count)),
             EventKind::PayloadAttributes(_) => self
                 .payload_attributes_tx
                 .send(kind)
-                .map(|count| log_count(count, "payload attributes")),
+                .map(|count| log_count("payload attributes", count)),
             EventKind::LateHead(_) => self
                 .late_head
                 .send(kind)
-                .map(|count| log_count(count, "late head")),
+                .map(|count| log_count("late head", count)),
             EventKind::BlockReward(_) => self
                 .block_reward_tx
                 .send(kind)
-                .map(|count| log_count(count, "block reward")),
+                .map(|count| log_count("block reward", count)),
         };
         if let Err(SendError(event)) = result {
             trace!(self.log, "No receivers registered to listen for event"; "event" => ?event);

diff --git a/beacon_node/beacon_chain/src/lib.rs b/beacon_node/beacon_chain/src/lib.rs
@@ -1,4 +1,3 @@
-#![recursion_limit = "128"] // For lazy-static
 pub mod attestation_rewards;
 pub mod attestation_verification;
 mod attester_cache;

diff --git a/beacon_node/client/src/config.rs b/beacon_node/client/src/config.rs
@@ -79,6 +79,7 @@ pub struct Config {
     pub monitoring_api: Option<monitoring_api::Config>,
     pub slasher: Option<slasher::Config>,
     pub logger_config: LoggerConfig,
+    pub always_prefer_builder_payload: bool,
 }
 
 impl Default for Config {
@@ -105,6 +106,7 @@ impl Default for Config {
             validator_monitor_pubkeys: vec![],
             validator_monitor_individual_tracking_threshold: DEFAULT_INDIVIDUAL_TRACKING_THRESHOLD,
             logger_config: LoggerConfig::default(),
+            always_prefer_builder_payload: false,
         }
     }
 }

diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs
@@ -219,6 +219,7 @@ struct Inner<E: EthSpec> {
     payload_cache: PayloadCache<E>,
     builder_profit_threshold: Uint256,
     log: Logger,
+    always_prefer_builder_payload: bool,
 }
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
@@ -241,6 +242,7 @@ pub struct Config {
     /// The minimum value of an external payload for it to be considered in a proposal.
     pub builder_profit_threshold: u128,
     pub execution_timeout_multiplier: Option<u32>,
+    pub always_prefer_builder_payload: bool,
 }
 
 /// Provides access to one execution engine and provides a neat interface for consumption by the
@@ -263,6 +265,7 @@ impl<T: EthSpec> ExecutionLayer<T> {
             default_datadir,
             builder_profit_threshold,
             execution_timeout_multiplier,
+            always_prefer_builder_payload,
         } = config;
 
         if urls.len() > 1 {
@@ -335,6 +338,7 @@ impl<T: EthSpec> ExecutionLayer<T> {
             payload_cache: PayloadCache::default(),
             builder_profit_threshold: Uint256::from(builder_profit_threshold),
             log,
+            always_prefer_builder_payload,
         };
 
         Ok(Self {
@@ -796,7 +800,9 @@ impl<T: EthSpec> ExecutionLayer<T> {
 
                             let relay_value = relay.data.message.value;
                             let local_value = *local.block_value();
-                            if local_value >= relay_value {
+                            if !self.inner.always_prefer_builder_payload
+                                && local_value >= relay_value
+                            {
                                 info!(
                                     self.log(),
                                     "Local block is more profitable than relay block";