Merge remote-tracking branch 'origin/unstable' into tree-states

lcli/Cargo.toml

@@ -3,7 +3,7 @@ name = "lcli"
 description = "Lighthouse CLI (modeled after zcli)"
 version = "2.1.3"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 portable = ["bls/supranational-portable"]

lcli/src/create_payload_header.rs

@@ -23,7 +23,7 @@ pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
         base_fee_per_gas,
         timestamp: genesis_time,
         block_hash: eth1_block_hash,
-        random: eth1_block_hash,
+        random: eth1_block_hash.into_root(),
         ..ExecutionPayloadHeader::default()
     };
     let mut file = File::create(file_name).map_err(|_| "Unable to create file".to_string())?;

lcli/src/etl/block_efficiency.rs

@@ -74,9 +74,9 @@ async fn get_block_attestations_set<'a, T: EthSpec>(
             .graffiti()
             .as_utf8_lossy()
             // Remove commas and apostropes from graffiti to ensure correct CSV format.
-            .replace(",", "")
-            .replace("\"", "")
-            .replace("'", ""),
+            .replace(',', "")
+            .replace('"', "")
+            .replace('\'', ""),
     };
 
     let attestations = block.message().body().attestations();

lcli/src/new_testnet.rs

@@ -108,7 +108,7 @@ pub fn run<T: EthSpec>(testnet_dir_path: PathBuf, matches: &ArgMatches) -> Resul
         let genesis_state = interop_genesis_state::<T>(
             &keypairs,
             genesis_time,
-            eth1_block_hash,
+            eth1_block_hash.into_root(),
             execution_payload_header,
             &spec,
         )?;