v2.2.0 (#3139)

## Proposed Changes Cut release v2.2.0 including proposer boost. ## Additional Info I also updated the clippy lints for the imminent release of Rust 1.60, although LH v2.2.0 will continue to compile using Rust 1.58 (our MSRV).
sigp · Apr 5, 2022 · bac7c3f · bac7c3f
1 parent 99bb554
commit bac7c3f
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 44 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 = "2.1.5"
+version = "2.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com"]
 edition = "2021"
 

diff --git a/beacon_node/beacon_chain/src/observed_aggregates.rs b/beacon_node/beacon_chain/src/observed_aggregates.rs
@@ -203,6 +203,7 @@ impl<T: TreeHash + SlotData + Consts, E: EthSpec> ObservedAggregates<T, E> {
     /// Check to see if the `root` of `item` is in self.
     ///
     /// `root` must equal `a.tree_hash_root()`.
+    #[allow(clippy::wrong_self_convention)]
     pub fn is_known(&mut self, item: &T, root: Hash256) -> Result<bool, Error> {
         let index = self.get_set_index(item.get_slot())?;
 

diff --git a/beacon_node/eth1/src/http.rs b/beacon_node/eth1/src/http.rs
@@ -358,7 +358,7 @@ pub async fn get_deposit_logs_in_range(
     }]);
 
     let response_body = send_rpc_request(endpoint, "eth_getLogs", params, timeout).await?;
-    Ok(response_result_or_error(&response_body)
+    response_result_or_error(&response_body)
         .map_err(|e| format!("eth_getLogs failed: {}", e))?
         .as_array()
         .cloned()
@@ -383,7 +383,7 @@ pub async fn get_deposit_logs_in_range(
             })
         })
         .collect::<Result<Vec<Log>, String>>()
-        .map_err(|e| format!("Failed to get logs in range: {}", e))?)
+        .map_err(|e| format!("Failed to get logs in range: {}", e))
 }
 
 /// Sends an RPC request to `endpoint`, using a POST with the given `body`.

diff --git a/beacon_node/network/src/sync/block_lookups/mod.rs b/beacon_node/network/src/sync/block_lookups/mod.rs
@@ -406,8 +406,8 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
             trace!(self.log, "Single block processing succeeded"; "block" => %root);
         }
 
-        match result {
-            Err(e) => match e {
+        if let Err(e) = result {
+            match e {
                 BlockError::BlockIsAlreadyKnown => {
                     // No error here
                 }
@@ -435,9 +435,6 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
                         }
                     }
                 }
-            },
-            Ok(()) => {
-                // No error here
             }
         }
 

diff --git a/boot_node/Cargo.toml b/boot_node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "boot_node"
-version = "2.1.5"
+version = "2.2.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 edition = "2021"
 

diff --git a/common/lighthouse_version/src/lib.rs b/common/lighthouse_version/src/lib.rs
@@ -16,7 +16,7 @@ pub const VERSION: &str = git_version!(
         // NOTE: using --match instead of --exclude for compatibility with old Git
         "--match=thiswillnevermatchlol"
     ],
-    prefix = "Lighthouse/v2.1.5-",
+    prefix = "Lighthouse/v2.2.0-",
     fallback = "unknown"
 );
 

diff --git a/consensus/state_processing/src/per_epoch_processing/altair/rewards_and_penalties.rs b/consensus/state_processing/src/per_epoch_processing/altair/rewards_and_penalties.rs
@@ -52,7 +52,7 @@ pub fn process_rewards_and_penalties<T: EthSpec>(
 ///
 /// Spec v1.1.0
 pub fn get_flag_index_deltas<T: EthSpec>(
-    deltas: &mut Vec<Delta>,
+    deltas: &mut [Delta],
     state: &BeaconState<T>,
     flag_index: usize,
     total_active_balance: u64,
@@ -101,7 +101,7 @@ pub fn get_flag_weight(flag_index: usize) -> Result<u64, Error> {
 }
 
 pub fn get_inactivity_penalty_deltas<T: EthSpec>(
-    deltas: &mut Vec<Delta>,
+    deltas: &mut [Delta],
     state: &BeaconState<T>,
     participation_cache: &ParticipationCache,
     spec: &ChainSpec,

diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "lcli"
 description = "Lighthouse CLI (modeled after zcli)"
-version = "2.1.5"
+version = "2.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2021"
 

diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lighthouse"
-version = "2.1.5"
+version = "2.2.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 edition = "2021"
 autotests = false