fix compilation issues

.github/workflows/docker.yml

@@ -41,7 +41,6 @@ jobs:
               run: |
                     echo "VERSION=capella" >> $GITHUB_ENV
                     echo "VERSION_SUFFIX=" >> $GITHUB_ENV
-                    echo "CROSS_FEATURES=withdrawals-processing" >> $GITHUB_ENV
             - name: Extract version (if eip4844)
               if: github.event.ref == 'refs/heads/eip4844'
               run: |

Cargo.lock

@@ -564,6 +564,7 @@ dependencies = [
  "eth1",
  "eth2",
  "eth2_hashing",
+ "eth2_network_config",
  "eth2_ssz",
  "eth2_ssz_derive",
  "eth2_ssz_types",
@@ -575,6 +576,7 @@ dependencies = [
  "hex",
  "int_to_bytes",
  "itertools",
+ "kzg",
  "lazy_static",
  "lighthouse_metrics",
  "logging",
@@ -634,6 +636,7 @@ dependencies = [
  "node_test_rig",
  "sensitive_url",
  "serde",
+ "serde_json",
  "slasher",
  "slog",
  "store",
@@ -890,6 +893,15 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "c-kzg"
+version = "0.1.0"
+source = "git+https://github.com/pawanjay176/c-kzg-4844?rev=c9e4fa0dabdd000738b7fcdf85a72880a5da8748#c9e4fa0dabdd000738b7fcdf85a72880a5da8748"
+dependencies = [
+ "hex",
+ "libc",
+]
+
 [[package]]
 name = "cached_tree_hash"
 version = "0.1.0"
@@ -2196,6 +2208,8 @@ dependencies = [
  "enr",
  "eth2_config",
  "eth2_ssz",
+ "kzg",
+ "serde_json",
  "serde_yaml",
  "tempfile",
  "types",
@@ -3666,6 +3680,25 @@ dependencies = [
  "tiny-keccak",
 ]
 
+[[package]]
+name = "kzg"
+version = "0.1.0"
+dependencies = [
+ "arbitrary",
+ "c-kzg",
+ "derivative",
+ "eth2_hashing",
+ "eth2_serde_utils",
+ "eth2_ssz",
+ "eth2_ssz_derive",
+ "ethereum-types 0.12.1",
+ "hex",
+ "rand 0.7.3",
+ "serde",
+ "serde_derive",
+ "tree_hash",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -3696,6 +3729,7 @@ dependencies = [
  "environment",
  "eth1_test_rig",
  "eth2",
+ "eth2_hashing",
  "eth2_network_config",
  "eth2_ssz",
  "eth2_wallet",
@@ -8244,6 +8278,7 @@ dependencies = [
  "hex",
  "int_to_bytes",
  "itertools",
+ "kzg",
  "lazy_static",
  "log",
  "maplit",

beacon_node/execution_layer/src/lib.rs

@@ -327,7 +327,7 @@ impl<T: EthSpec> ExecutionLayer<T> {
             let auth = Auth::new(jwt_key, jwt_id, jwt_version);
             debug!(log, "Loaded execution endpoint"; "endpoint" => %execution_url, "jwt_path" => ?secret_file.as_path());
             let api =
-                HttpJsonRpc::new_with_auth(execution_url, auth, execution_timeout_multiplier, spec)
+                HttpJsonRpc::new_with_auth(execution_url, auth, execution_timeout_multiplier, &spec)
                     .map_err(Error::ApiError)?;
             Engine::new(api, executor.clone(), &log)
         };

consensus/types/Cargo.toml

@@ -12,7 +12,7 @@ harness = false
 serde-big-array = {version = "0.3.2", features = ["const-generics"]}
 merkle_proof = { path = "../../consensus/merkle_proof" }
 bls = { path = "../../crypto/bls", features = ["arbitrary"] }
-kzg = { path = "../../crypto/kzg" }
+kzg = { path = "../../crypto/kzg", features = ["arbitrary"] }
 compare_fields = { path = "../../common/compare_fields" }
 compare_fields_derive = { path = "../../common/compare_fields_derive" }
 eth2_interop_keypairs = { path = "../../common/eth2_interop_keypairs" }

consensus/types/src/blobs_sidecar.rs

@@ -17,7 +17,6 @@ use tree_hash_derive::TreeHash;
     Encode,
     Decode,
     TreeHash,
-    PartialEq,
     Default,
         TestRandom,
 Derivative,

crypto/kzg/Cargo.toml

@@ -19,6 +19,7 @@ hex = "0.4.2"
 eth2_hashing = "0.3.0"
 ethereum-types = "0.12.1"
 c-kzg = {git = "https://github.com/pawanjay176/c-kzg-4844", rev = "c9e4fa0dabdd000738b7fcdf85a72880a5da8748" }
+arbitrary = { version = "1.0", features = ["derive"], optional = true }
 
 [features]
 default = ["mainnet-spec"]

crypto/kzg/src/kzg_commitment.rs

@@ -102,3 +102,12 @@ impl Debug for KzgCommitment {
         write!(f, "{}", eth2_serde_utils::hex::encode(&self.0))
     }
 }
+
+#[cfg(feature = "arbitrary")]
+impl arbitrary::Arbitrary<'_> for KzgCommitment {
+    fn arbitrary(u: &mut arbitrary::Unstructured<'_>) -> arbitrary::Result<Self> {
+        let mut bytes = [0u8; KZG_COMMITMENT_BYTES_LEN];
+        u.fill_buffer(&mut bytes)?;
+        Ok(KzgCommitment(bytes))
+    }
+}

crypto/kzg/src/kzg_proof.rs

@@ -126,3 +126,12 @@ impl Debug for KzgProof {
         write!(f, "{}", eth2_serde_utils::hex::encode(&self.0))
     }
 }
+
+#[cfg(feature = "arbitrary")]
+impl arbitrary::Arbitrary<'_> for KzgProof {
+    fn arbitrary(u: &mut arbitrary::Unstructured<'_>) -> arbitrary::Result<Self> {
+        let mut bytes = [0u8; KZG_PROOF_BYTES_LEN];
+        u.fill_buffer(&mut bytes)?;
+        Ok(KzgProof(bytes))
+    }
+}

lcli/Cargo.toml

@@ -8,7 +8,6 @@ edition = "2021"
 [features]
 portable = ["bls/supranational-portable"]
 fake_crypto = ['bls/fake_crypto']
-withdrawals-processing = ["beacon_chain/withdrawals-processing", "store/withdrawals-processing", "state_processing/withdrawals-processing"]
 
 [dependencies]
 bls = { path = "../crypto/bls" }

testing/ef_tests/Cargo.toml

@@ -9,7 +9,6 @@ edition = "2021"
 ef_tests = []
 milagro = ["bls/milagro"]
 fake_crypto = ["bls/fake_crypto"]
-withdrawals-processing = ["state_processing/withdrawals-processing", "store/withdrawals-processing", "beacon_chain/withdrawals-processing", "execution_layer/withdrawals-processing"]
 
 [dependencies]
 bls = { path = "../../crypto/bls", default-features = false }