Merge pull request #401 from ralexstokes/migrate-kzg-mod

Migrate kzg mod

beacon-api-client/src/types.rs

@@ -2,7 +2,7 @@ use crate::ApiError;
 use ethereum_consensus::{
     altair::networking::MetaData,
     capella::Withdrawal,
-    deneb::polynomial_commitments::KzgProof,
+    crypto::KzgProof,
     networking::{Enr, Multiaddr, PeerId},
     phase0::{Checkpoint, SignedBeaconBlockHeader, Validator},
     primitives::{

ethereum-consensus/src/bin/ec/blobs/bundler.rs

@@ -1,6 +1,7 @@
 use crate::blobs::{Blob, Error};
 use ethereum_consensus::{
-    deneb::{self, polynomial_commitments as spec, presets::TRUSTED_SETUP_JSON},
+    crypto::kzg as spec,
+    deneb::{self, presets::TRUSTED_SETUP_JSON},
     Error as ConsensusError,
 };
 use std::io::Read;

ethereum-consensus/src/bin/ec/blobs/mod.rs

@@ -10,7 +10,7 @@ use thiserror::Error;
 
 pub(crate) const BYTES_PER_BLOB: usize = spec::mainnet::BYTES_PER_BLOB;
 pub(crate) const BYTES_PER_FIELD_ELEMENT: usize =
-    spec::polynomial_commitments::BYTES_PER_FIELD_ELEMENT;
+    ethereum_consensus::crypto::kzg::BYTES_PER_FIELD_ELEMENT;
 // Number of bits in a valid field element.
 pub(crate) const BITS_PER_FIELD_ELEMENT: usize = 254;
 

ethereum-consensus/src/deneb/polynomial_commitments.rs → ethereum-consensus/src/crypto/kzg.rs

@@ -1,6 +1,4 @@
-use crate::{
-    deneb::blob_sidecar::Blob, primitives::Bytes32, ssz::prelude::*, Error as ConsensusError,
-};
+use crate::{primitives::Bytes32, ssz::prelude::*, Error as ConsensusError};
 pub use c_kzg::KzgSettings;
 use thiserror::Error;
 
@@ -10,7 +8,6 @@ pub const BYTES_PER_PROOF: usize = 48;
 pub const BYTES_PER_G1_POINT: usize = 48;
 pub const BYTES_PER_G2_POINT: usize = 96;
 
-pub type VersionedHash = Bytes32;
 pub type FieldElement = Bytes32;
 pub type KzgCommitment = ByteVector<BYTES_PER_COMMITMENT>;
 pub type KzgProof = ByteVector<BYTES_PER_PROOF>;
@@ -60,8 +57,8 @@ pub struct ProofAndEvaluation {
     pub evaluation: FieldElement,
 }
 
-pub fn blob_to_kzg_commitment<const BYTES_PER_BLOB: usize>(
-    blob: &Blob<BYTES_PER_BLOB>,
+pub fn blob_to_kzg_commitment<Blob: AsRef<[u8]>>(
+    blob: Blob,
     kzg_settings: &KzgSettings,
 ) -> Result<KzgCommitment, Error> {
     let blob = c_kzg::Blob::from_bytes(blob.as_ref())?;
@@ -71,8 +68,8 @@ pub fn blob_to_kzg_commitment<const BYTES_PER_BLOB: usize>(
     Ok(inner)
 }
 
-pub fn compute_kzg_proof<const BYTES_PER_BLOB: usize>(
-    blob: &Blob<BYTES_PER_BLOB>,
+pub fn compute_kzg_proof<Blob: AsRef<[u8]>>(
+    blob: Blob,
     evaluation_point: &FieldElement,
     kzg_settings: &KzgSettings,
 ) -> Result<ProofAndEvaluation, Error> {
@@ -88,8 +85,8 @@ pub fn compute_kzg_proof<const BYTES_PER_BLOB: usize>(
     Ok(result)
 }
 
-pub fn compute_blob_kzg_proof<const BYTES_PER_BLOB: usize>(
-    blob: &Blob<BYTES_PER_BLOB>,
+pub fn compute_blob_kzg_proof<Blob: AsRef<[u8]>>(
+    blob: Blob,
     commitment: &KzgCommitment,
     kzg_settings: &KzgSettings,
 ) -> Result<KzgProof, Error> {
@@ -124,8 +121,8 @@ pub fn verify_kzg_proof(
     res.then_some(()).ok_or(Error::InvalidProof)
 }
 
-pub fn verify_blob_kzg_proof<const BYTES_PER_BLOB: usize>(
-    blob: &Blob<BYTES_PER_BLOB>,
+pub fn verify_blob_kzg_proof<Blob: AsRef<[u8]>>(
+    blob: Blob,
     commitment: &KzgCommitment,
     proof: &KzgProof,
     kzg_settings: &KzgSettings,
@@ -139,8 +136,8 @@ pub fn verify_blob_kzg_proof<const BYTES_PER_BLOB: usize>(
     res.then_some(()).ok_or(Error::InvalidProof)
 }
 
-pub fn verify_blob_kzg_proof_batch<const BYTES_PER_BLOB: usize>(
-    blobs: &[Blob<BYTES_PER_BLOB>],
+pub fn verify_blob_kzg_proof_batch<Blob: AsRef<[u8]>>(
+    blobs: &[Blob],
     commitments: &[KzgCommitment],
     proofs: &[KzgProof],
     kzg_settings: &KzgSettings,

ethereum-consensus/src/crypto/mod.rs

@@ -0,0 +1,9 @@
+pub mod bls;
+pub mod kzg;
+
+pub use bls::{
+    aggregate, aggregate_verify, eth_aggregate_public_keys, eth_fast_aggregate_verify,
+    fast_aggregate_verify, hash, verify_signature, Error as BlsError, PublicKey, SecretKey,
+    Signature,
+};
+pub use kzg::{kzg_settings_from_json, Error as KzgError, KzgCommitment, KzgProof, KzgSettings};

ethereum-consensus/src/deneb/beacon_block.rs

@@ -1,7 +1,8 @@
 use crate::{
     altair::SyncAggregate,
     capella::SignedBlsToExecutionChange,
-    deneb::{polynomial_commitments::KzgCommitment, ExecutionPayload},
+    crypto::KzgCommitment,
+    deneb::ExecutionPayload,
     phase0::{
         Attestation, AttesterSlashing, Deposit, Eth1Data, ProposerSlashing, SignedVoluntaryExit,
     },

ethereum-consensus/src/deneb/blinded_beacon_block.rs

@@ -1,7 +1,8 @@
 use crate::{
     altair::SyncAggregate,
     capella::SignedBlsToExecutionChange,
-    deneb::{polynomial_commitments::KzgCommitment, ExecutionPayloadHeader},
+    crypto::KzgCommitment,
+    deneb::ExecutionPayloadHeader,
     phase0::{
         Attestation, AttesterSlashing, Deposit, Eth1Data, ProposerSlashing, SignedVoluntaryExit,
     },

ethereum-consensus/src/deneb/blob_sidecar.rs

@@ -1,15 +1,14 @@
 use crate::{
-    deneb::{
-        polynomial_commitments::{KzgCommitment, KzgProof},
-        SignedBeaconBlockHeader,
-    },
-    primitives::{BlobIndex, Root},
+    crypto::{KzgCommitment, KzgProof},
+    deneb::SignedBeaconBlockHeader,
+    primitives::{BlobIndex, Bytes32, Root},
     ssz::prelude::*,
     Error,
 };
 use ssz_rs::proofs::get_subtree_index;
 
 pub const VERSIONED_HASH_VERSION_KZG: u8 = 1;
+pub type VersionedHash = Bytes32;
 
 pub type Blob<const BYTES_PER_BLOB: usize> = ByteVector<BYTES_PER_BLOB>;
 
@@ -66,10 +65,7 @@ pub fn verify_blob_sidecar_inclusion_proof<
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        deneb::{mainnet as spec, polynomial_commitments as crypto},
-        state_transition::Context,
-    };
+    use crate::{crypto::kzg as crypto, deneb::mainnet as spec, state_transition::Context};
 
     // blob side car from `sepolia` testnet
     const BLOB_SIDECAR_JSON: &str = r#"

ethereum-consensus/src/deneb/execution_engine.rs

@@ -1,5 +1,5 @@
 use crate::{
-    deneb::{execution_payload::ExecutionPayload, polynomial_commitments::VersionedHash},
+    deneb::{blob_sidecar::VersionedHash, execution_payload::ExecutionPayload},
     execution_engine::PayloadRequest,
     primitives::Root,
 };

ethereum-consensus/src/deneb/helpers.rs

@@ -2,12 +2,11 @@ use crate::{
     altair::constants::{
         TIMELY_HEAD_FLAG_INDEX, TIMELY_SOURCE_FLAG_INDEX, TIMELY_TARGET_FLAG_INDEX,
     },
-    crypto::hash,
+    crypto::{hash, KzgCommitment},
     deneb::{
-        beacon_state::BeaconState,
-        get_block_root, get_block_root_at_slot, get_current_epoch, get_validator_churn_limit,
-        polynomial_commitments::{KzgCommitment, VersionedHash},
-        AttestationData, VERSIONED_HASH_VERSION_KZG,
+        beacon_state::BeaconState, blob_sidecar::VersionedHash, get_block_root,
+        get_block_root_at_slot, get_current_epoch, get_validator_churn_limit, AttestationData,
+        VERSIONED_HASH_VERSION_KZG,
     },
     error::{invalid_operation_error, InvalidAttestation, InvalidOperation},
     state_transition::{Context, Result},

ethereum-consensus/src/deneb/mod.rs

@@ -14,7 +14,6 @@ pub mod genesis;
 pub mod helpers;
 pub mod light_client;
 pub mod networking;
-pub mod polynomial_commitments;
 pub mod presets;
 pub mod spec;
 

ethereum-consensus/src/deneb/presets/mainnet.rs

@@ -22,7 +22,7 @@ pub const MAX_BLOBS_PER_BLOCK: usize = 6;
 pub const KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: usize = 17;
 
 pub const BYTES_PER_BLOB: usize =
-    crate::deneb::polynomial_commitments::BYTES_PER_FIELD_ELEMENT * FIELD_ELEMENTS_PER_BLOB;
+    crate::crypto::kzg::BYTES_PER_FIELD_ELEMENT * FIELD_ELEMENTS_PER_BLOB;
 
 pub const MAX_REQUEST_BLOB_SIDECARS: usize = MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK;
 

ethereum-consensus/src/deneb/presets/minimal.rs

@@ -22,7 +22,7 @@ pub const MAX_BLOBS_PER_BLOCK: usize = 6;
 pub const KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: usize = 9;
 
 pub const BYTES_PER_BLOB: usize =
-    crate::deneb::polynomial_commitments::BYTES_PER_FIELD_ELEMENT * FIELD_ELEMENTS_PER_BLOB;
+    crate::crypto::kzg::BYTES_PER_FIELD_ELEMENT * FIELD_ELEMENTS_PER_BLOB;
 
 pub const MAX_REQUEST_BLOB_SIDECARS: usize = MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK;
 

ethereum-consensus/src/deneb/spec/mod.rs

@@ -37,7 +37,7 @@ pub use crate::{
         },
         blob_sidecar::{
             verify_blob_sidecar_inclusion_proof, Blob, BlobIdentifier, BlobSidecar, BlobsBundle,
-            VERSIONED_HASH_VERSION_KZG,
+            VersionedHash, VERSIONED_HASH_VERSION_KZG,
         },
         block_processing::{
             process_attestation, process_block, process_execution_payload, process_voluntary_exit,

ethereum-consensus/src/electra/beacon_block.rs

@@ -1,7 +1,7 @@
 use crate::{
     altair::SyncAggregate,
     capella::SignedBlsToExecutionChange,
-    deneb::polynomial_commitments::KzgCommitment,
+    crypto::KzgCommitment,
     electra::{
         execution_payload::ExecutionPayload,
         operations::{Attestation, AttesterSlashing, SignedConsolidation},

ethereum-consensus/src/electra/execution_engine.rs

@@ -1,5 +1,5 @@
 use crate::{
-    deneb::polynomial_commitments::VersionedHash, electra::ExecutionPayload,
+    deneb::blob_sidecar::VersionedHash, electra::ExecutionPayload,
     execution_engine::PayloadRequest, primitives::Root,
 };
 

ethereum-consensus/src/electra/spec/mod.rs

@@ -32,7 +32,7 @@ pub use crate::{
         },
         blob_sidecar::{
             verify_blob_sidecar_inclusion_proof, Blob, BlobIdentifier, BlobSidecar, BlobsBundle,
-            VERSIONED_HASH_VERSION_KZG,
+            VersionedHash, VERSIONED_HASH_VERSION_KZG,
         },
         helpers::kzg_commitment_to_versioned_hash,
         light_client::{

ethereum-consensus/src/error.rs

@@ -1,7 +1,6 @@
 use crate::{
     capella::Withdrawal,
-    crypto::Error as CryptoError,
-    deneb::polynomial_commitments::Error as PolynomialCommitmentError,
+    crypto::{BlsError, KzgError},
     phase0::{AttestationData, BeaconBlockHeader, Checkpoint},
     primitives::{
         BlsPublicKey, BlsSignature, Bytes32, Epoch, ExecutionAddress, Hash32, Root, Slot,
@@ -19,7 +18,9 @@ pub enum Error {
     #[error("{0}")]
     SimpleSerialize(#[from] SimpleSerializeError),
     #[error("{0}")]
-    Crypto(#[from] CryptoError),
+    Bls(#[from] BlsError),
+    #[error("{0}")]
+    Kzg(#[from] KzgError),
     #[cfg(feature = "serde")]
     #[error("{0}")]
     Io(#[from] std::io::Error),
@@ -62,8 +63,6 @@ pub enum Error {
     UnknownPreset(String),
     #[error(transparent)]
     ExecutionEngine(#[from] ExecutionEngineError),
-    #[error(transparent)]
-    PolynomialCommitment(#[from] PolynomialCommitmentError),
 }
 
 #[derive(Debug, Error)]

ethereum-consensus/src/state_transition/context.rs

@@ -2,11 +2,8 @@ use crate::{
     altair, bellatrix, capella,
     clock::{self, Clock, SystemTimeProvider},
     configs::{self, Config},
-    deneb::{
-        self,
-        polynomial_commitments::{kzg_settings_from_json, KzgSettings},
-        presets::TRUSTED_SETUP_JSON,
-    },
+    crypto::{kzg_settings_from_json, KzgSettings},
+    deneb::{self, presets::TRUSTED_SETUP_JSON},
     electra,
     execution_engine::ExecutionEngine,
     networks::Network,

ethereum-consensus/src/types/beacon_block_body.rs

@@ -3,7 +3,8 @@ use crate::{
     altair::{beacon_block as altair, SyncAggregate},
     bellatrix::beacon_block as bellatrix,
     capella::{beacon_block as capella, SignedBlsToExecutionChange},
-    deneb::{beacon_block as deneb, polynomial_commitments::KzgCommitment},
+    crypto::KzgCommitment,
+    deneb::beacon_block as deneb,
     phase0::{
         beacon_block as phase0, Attestation, AttesterSlashing, Deposit, Eth1Data, ProposerSlashing,
         SignedVoluntaryExit,

ethereum-consensus/src/types/blinded_beacon_block_body.rs

@@ -3,7 +3,8 @@ use crate::{
     altair::SyncAggregate,
     bellatrix::blinded_beacon_block as bellatrix,
     capella::{blinded_beacon_block as capella, SignedBlsToExecutionChange},
-    deneb::{blinded_beacon_block as deneb, polynomial_commitments::KzgCommitment},
+    crypto::KzgCommitment,
+    deneb::blinded_beacon_block as deneb,
     phase0::{
         Attestation, AttesterSlashing, Deposit, Eth1Data, ProposerSlashing, SignedVoluntaryExit,
     },

spec-gen/src/generator.rs

@@ -444,23 +444,21 @@ impl Spec {
                 for name in type_names {
                     if let Some(target_module) = index.get(&name) {
                         let target_module = self.diff.modules.get(target_module).unwrap();
-                        let container = target_module
-                            .containers
-                            .iter()
-                            .find(|&c| c.name == name)
-                            .expect("internal state integrity");
-
-                        // if we find a newer definition, edit the types of this function
-                        // if not, just import from the earlier fork
-                        if container.fork == self.fork {
-                            let arguments = generics_to_arguments(&container.item.generics);
-                            let mut editor = ArgumentsEditor::new(&container.name, &arguments);
-                            editor.edit(&mut fragment);
-
-                            all_arguments.push(arguments);
-                            f.fork = self.fork;
-                        } else {
-                            f.can_import = true;
+                        if let Some(container) =
+                            target_module.containers.iter().find(|&c| c.name == name)
+                        {
+                            // if we find a newer definition, edit the types of this function
+                            // if not, just import from the earlier fork
+                            if container.fork == self.fork {
+                                let arguments = generics_to_arguments(&container.item.generics);
+                                let mut editor = ArgumentsEditor::new(&container.name, &arguments);
+                                editor.edit(&mut fragment);
+
+                                all_arguments.push(arguments);
+                                f.fork = self.fork;
+                            } else {
+                                f.can_import = true;
+                            }
                         }
                     }
                 }

spec-gen/src/type_generator.rs

@@ -123,7 +123,8 @@ impl Type {
                     altair::beacon_block as altair,
                     bellatrix::beacon_block as bellatrix,
                     capella::beacon_block as capella,
-                    deneb::{beacon_block as deneb, polynomial_commitments::KzgCommitment},
+                    crypto::KzgCommitment,
+                    deneb::{beacon_block as deneb},
                     phase0::{
                         beacon_block as phase0, Attestation, AttesterSlashing, Deposit, Eth1Data, ProposerSlashing,
                         SignedVoluntaryExit,
@@ -140,7 +141,8 @@ impl Type {
                 use crate::{
                     bellatrix::blinded_beacon_block as bellatrix,
                     capella::blinded_beacon_block as capella,
-                    deneb::{blinded_beacon_block as deneb, polynomial_commitments::KzgCommitment},
+                    crypto::KzgCommitment,
+                    deneb::{blinded_beacon_block as deneb},
                     phase0::{
                         Attestation, AttesterSlashing, Deposit, Eth1Data, ProposerSlashing,
                         SignedVoluntaryExit,