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

testing/ef_tests/Cargo.toml

@@ -20,7 +20,6 @@ hex = { workspace = true }
 kzg = { workspace = true }
 rayon = { workspace = true }
 serde = { workspace = true }
-serde_derive = "1.0.116"
 serde_json = { workspace = true }
 serde_repr = { workspace = true }
 serde_yaml = { workspace = true }

testing/ef_tests/src/cases/bls_aggregate_sigs.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use crate::impl_bls_load_case;
 use bls::{AggregateSignature, Signature};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct BlsAggregateSigs {

testing/ef_tests/src/cases/bls_aggregate_verify.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use crate::impl_bls_load_case;
 use bls::{AggregateSignature, PublicKeyBytes};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use types::Hash256;
 
 #[derive(Debug, Clone, Deserialize)]

testing/ef_tests/src/cases/bls_batch_verify.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use crate::impl_bls_load_case;
 use bls::{verify_signature_sets, BlsWrappedSignature, PublicKeyBytes, Signature, SignatureSet};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::borrow::Cow;
 use std::str::FromStr;
 use types::Hash256;

testing/ef_tests/src/cases/bls_eth_aggregate_pubkeys.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use crate::impl_bls_load_case;
 use bls::{AggregatePublicKey, PublicKeyBytes};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct BlsEthAggregatePubkeys {

testing/ef_tests/src/cases/bls_eth_fast_aggregate_verify.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use crate::impl_bls_load_case;
 use bls::{AggregateSignature, PublicKeyBytes};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::convert::TryInto;
 use types::Hash256;
 

testing/ef_tests/src/cases/bls_fast_aggregate_verify.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use crate::impl_bls_load_case;
 use bls::{AggregateSignature, PublicKeyBytes};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::convert::TryInto;
 use types::Hash256;
 

testing/ef_tests/src/cases/bls_sign_msg.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use crate::impl_bls_load_case;
 use bls::SecretKey;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use types::Hash256;
 
 #[derive(Debug, Clone, Deserialize)]

testing/ef_tests/src/cases/bls_verify_msg.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use crate::impl_bls_load_case;
 use bls::{PublicKey, PublicKeyBytes, Signature, SignatureBytes};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::convert::TryInto;
 use types::Hash256;
 

testing/ef_tests/src/cases/common.rs

@@ -1,4 +1,4 @@
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use ssz::Encode;
 use ssz_derive::{Decode, Encode};
 use std::convert::TryFrom;

testing/ef_tests/src/cases/epoch_processing.rs

@@ -4,7 +4,7 @@ use crate::case_result::{check_state_diff, compare_beacon_state_results_without_
 use crate::decode::{ssz_decode_state, yaml_decode_file};
 use crate::type_name;
 use crate::type_name::TypeName;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use state_processing::common::update_progressive_balances_cache::initialize_progressive_balances_cache;
 use state_processing::epoch_cache::initialize_epoch_cache;
 use state_processing::per_epoch_processing::capella::process_historical_summaries_update;

testing/ef_tests/src/cases/fork.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_beacon_state_results_without_caches;
 use crate::cases::common::previous_fork;
 use crate::decode::{ssz_decode_state, yaml_decode_file};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use state_processing::upgrade::{
     upgrade_to_altair, upgrade_to_bellatrix, upgrade_to_capella, upgrade_to_deneb,
 };

testing/ef_tests/src/cases/genesis_initialization.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::case_result::compare_beacon_state_results_without_caches;
 use crate::decode::{ssz_decode_file, ssz_decode_file_with, ssz_decode_state, yaml_decode_file};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use state_processing::initialize_beacon_state_from_eth1;
 use std::path::PathBuf;
 use types::{BeaconState, Deposit, EthSpec, ExecutionPayloadHeader, ForkName, Hash256};

testing/ef_tests/src/cases/genesis_validity.rs

@@ -1,6 +1,6 @@
 use super::*;
 use crate::decode::{ssz_decode_state, yaml_decode_file};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use state_processing::is_valid_genesis_state;
 use std::path::Path;
 use types::{BeaconState, EthSpec, ForkName};

testing/ef_tests/src/cases/kzg_blob_to_kzg_commitment.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use beacon_chain::kzg_utils::blob_to_kzg_commitment;
 use kzg::KzgCommitment;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::marker::PhantomData;
 
 #[derive(Debug, Clone, Deserialize)]

testing/ef_tests/src/cases/kzg_compute_blob_kzg_proof.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use beacon_chain::kzg_utils::compute_blob_kzg_proof;
 use kzg::KzgProof;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::marker::PhantomData;
 
 #[derive(Debug, Clone, Deserialize)]

testing/ef_tests/src/cases/kzg_compute_kzg_proof.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use beacon_chain::kzg_utils::compute_kzg_proof;
 use kzg::KzgProof;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::marker::PhantomData;
 use std::str::FromStr;
 use types::Hash256;

testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof.rs

@@ -3,7 +3,7 @@ use crate::case_result::compare_result;
 use beacon_chain::kzg_utils::validate_blob;
 use eth2_network_config::get_trusted_setup;
 use kzg::{Kzg, KzgCommitment, KzgPreset, KzgProof, TrustedSetup};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::convert::TryInto;
 use std::marker::PhantomData;
 use types::Blob;
@@ -91,7 +91,7 @@ impl<E: EthSpec> Case for KZGVerifyBlobKZGProof<E> {
 
         let kzg = get_kzg::<E::Kzg>()?;
         let result = parse_input(&self.input).and_then(|(blob, commitment, proof)| {
-            validate_blob::<E>(&kzg, blob, commitment, proof)
+            validate_blob::<E>(&kzg, &blob, commitment, proof)
                 .map_err(|e| Error::InternalError(format!("Failed to validate blob: {:?}", e)))
         });
 

testing/ef_tests/src/cases/kzg_verify_blob_kzg_proof_batch.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::case_result::compare_result;
 use beacon_chain::kzg_utils::validate_blobs;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::marker::PhantomData;
 
 #[derive(Debug, Clone, Deserialize)]
@@ -54,7 +54,7 @@ impl<E: EthSpec> Case for KZGVerifyBlobKZGProofBatch<E> {
 
         let kzg = get_kzg::<E::Kzg>()?;
         let result = parse_input(&self.input).and_then(|(commitments, blobs, proofs)| {
-            validate_blobs::<E>(&kzg, &commitments, &blobs, &proofs)
+            validate_blobs::<E>(&kzg, &commitments, blobs.iter().collect(), &proofs)
                 .map_err(|e| Error::InternalError(format!("Failed to validate blobs: {:?}", e)))
         });
 

testing/ef_tests/src/cases/kzg_verify_kzg_proof.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::case_result::compare_result;
 use beacon_chain::kzg_utils::verify_kzg_proof;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::marker::PhantomData;
 
 #[derive(Debug, Clone, Deserialize)]

testing/ef_tests/src/cases/merkle_proof_validity.rs

@@ -1,6 +1,6 @@
 use super::*;
 use crate::decode::{ssz_decode_state, yaml_decode_file};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::path::Path;
 use tree_hash::Hash256;
 use types::{BeaconState, EthSpec, ForkName};

testing/ef_tests/src/cases/operations.rs

@@ -3,7 +3,7 @@ use crate::bls_setting::BlsSetting;
 use crate::case_result::{check_state_diff, compare_beacon_state_results_without_caches};
 use crate::decode::{ssz_decode_file, ssz_decode_file_with, ssz_decode_state, yaml_decode_file};
 use crate::testing_spec;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use ssz::Decode;
 use state_processing::common::update_progressive_balances_cache::initialize_progressive_balances_cache;
 use state_processing::epoch_cache::initialize_epoch_cache;

testing/ef_tests/src/cases/rewards.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result_detailed;
 use crate::decode::{ssz_decode_file, ssz_decode_state, yaml_decode_file};
 use compare_fields_derive::CompareFields;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use ssz::four_byte_option_impl;
 use ssz_derive::{Decode, Encode};
 use state_processing::{

testing/ef_tests/src/cases/sanity_blocks.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::bls_setting::BlsSetting;
 use crate::case_result::{check_state_diff, compare_beacon_state_results_without_caches};
 use crate::decode::{ssz_decode_file_with, ssz_decode_state, yaml_decode_file};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use state_processing::{
     per_block_processing, per_slot_processing, BlockProcessingError, BlockSignatureStrategy,
     ConsensusContext, StateProcessingStrategy, VerifyBlockRoot,

testing/ef_tests/src/cases/sanity_slots.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::bls_setting::BlsSetting;
 use crate::case_result::{check_state_diff, compare_beacon_state_results_without_caches};
 use crate::decode::{ssz_decode_state, yaml_decode_file};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use state_processing::per_slot_processing;
 use types::{BeaconState, EthSpec, ForkName};
 

testing/ef_tests/src/cases/shuffling.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::case_result::compare_result;
 use crate::decode::yaml_decode_file;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::marker::PhantomData;
 use swap_or_not_shuffle::{compute_shuffled_index, shuffle_list};
 use types::ForkName;

testing/ef_tests/src/cases/ssz_generic.rs

@@ -4,8 +4,7 @@ use super::*;
 use crate::cases::common::{SszStaticType, TestU128, TestU256};
 use crate::cases::ssz_static::{check_serialization, check_tree_hash};
 use crate::decode::{log_file_access, snappy_decode_file, yaml_decode_file};
-use serde::{de::Error as SerdeError, Deserializer};
-use serde_derive::Deserialize;
+use serde::{de::Error as SerdeError, Deserialize, Deserializer};
 use ssz_derive::{Decode, Encode};
 use std::path::{Path, PathBuf};
 use tree_hash_derive::TreeHash;

testing/ef_tests/src/cases/ssz_static.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::case_result::compare_result;
 use crate::cases::common::SszStaticType;
 use crate::decode::{snappy_decode_file, yaml_decode_file};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use ssz::Decode;
 use tree_hash::TreeHash;
 use types::{BeaconBlock, BeaconState, ForkName, Hash256, SignedBeaconBlock};

testing/ef_tests/src/cases/transition.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::case_result::compare_beacon_state_results_without_caches;
 use crate::decode::{ssz_decode_file_with, ssz_decode_state, yaml_decode_file};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use state_processing::{
     per_block_processing, state_advance::complete_state_advance, BlockSignatureStrategy,
     ConsensusContext, StateProcessingStrategy, VerifyBlockRoot,