Snowbridge Ethereum Deneb fork preparation

bridges/snowbridge/README.md

@@ -1,6 +1,5 @@
-# Snowbridge ·
-[![codecov](https://codecov.io/gh/Snowfork/snowbridge/branch/main/graph/badge.svg?token=9hvgSws4rN)]
-(https://codecov.io/gh/Snowfork/snowbridge)
+# Snowbridge
+[![codecov](https://codecov.io/gh/Snowfork/snowbridge/branch/main/graph/badge.svg?token=9hvgSws4rN)](https://codecov.io/gh/Snowfork/snowbridge)
 ![GitHub](https://img.shields.io/github/license/Snowfork/snowbridge)
 
 Snowbridge is a trustless bridge between Polkadot and Ethereum. For documentation, visit https://docs.snowbridge.network.

bridges/snowbridge/parachain/pallets/ethereum-client/Cargo.toml

@@ -95,5 +95,3 @@ try-runtime = [
 	"pallet-timestamp?/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-beacon-spec-minimal = []
-fast-runtime = ["beacon-spec-minimal"]

bridges/snowbridge/parachain/pallets/ethereum-client/src/benchmarking/mod.rs

@@ -1,21 +1,14 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 use super::*;
+mod fixtures;
 mod util;
 
 use crate::Pallet as EthereumBeaconClient;
 use frame_benchmarking::v2::*;
 use frame_system::RawOrigin;
 
-#[cfg(feature = "beacon-spec-minimal")]
-mod fixtures_minimal;
-#[cfg(feature = "beacon-spec-minimal")]
-use fixtures_minimal::*;
-
-#[cfg(not(feature = "beacon-spec-minimal"))]
-mod fixtures_mainnet;
-#[cfg(not(feature = "beacon-spec-minimal"))]
-use fixtures_mainnet::*;
+use fixtures::*;
 
 use primitives::{
 	fast_aggregate_verify, prepare_aggregate_pubkey, prepare_aggregate_signature,
@@ -79,7 +72,7 @@ mod benchmarks {
 		let checkpoint_update = make_checkpoint();
 		let finalized_header_update = make_finalized_header_update();
 		let execution_header_update = make_execution_header_update();
-		let execution_header_hash = execution_header_update.execution_header.block_hash;
+		let execution_header_hash = execution_header_update.execution_header.block_hash();
 		EthereumBeaconClient::<T>::process_checkpoint_update(&checkpoint_update)?;
 		EthereumBeaconClient::<T>::process_update(&finalized_header_update)?;
 
@@ -151,16 +144,5 @@ mod benchmarks {
 		Ok(())
 	}
 
-	#[cfg(feature = "beacon-spec-minimal")]
-	impl_benchmark_test_suite!(
-		EthereumBeaconClient,
-		crate::mock::minimal::new_tester(),
-		crate::mock::minimal::Test
-	);
-	#[cfg(not(feature = "beacon-spec-minimal"))]
-	impl_benchmark_test_suite!(
-		EthereumBeaconClient,
-		crate::mock::mainnet::new_tester(),
-		crate::mock::mainnet::Test
-	);
+	impl_benchmark_test_suite!(EthereumBeaconClient, crate::mock::new_tester(), crate::mock::Test);
 }

bridges/snowbridge/parachain/pallets/ethereum-client/src/config/mod.rs

@@ -3,15 +3,6 @@
 use primitives::merkle_proof::{generalized_index_length, subtree_index};
 use static_assertions::const_assert;
 
-pub mod mainnet;
-pub mod minimal;
-
-#[cfg(feature = "beacon-spec-minimal")]
-pub use minimal::*;
-
-#[cfg(not(feature = "beacon-spec-minimal"))]
-pub use mainnet::*;
-
 // Generalized Indices
 
 // get_generalized_index(BeaconState, 'block_roots')
@@ -54,3 +45,10 @@ pub const PUBKEY_SIZE: usize = 48;
 pub const SIGNATURE_SIZE: usize = 96;
 
 const_assert!(SYNC_COMMITTEE_BITS_SIZE == SYNC_COMMITTEE_SIZE / 8);
+
+pub const SLOTS_PER_EPOCH: usize = 32;
+pub const EPOCHS_PER_SYNC_COMMITTEE_PERIOD: usize = 256;
+pub const SYNC_COMMITTEE_SIZE: usize = 512;
+pub const SYNC_COMMITTEE_BITS_SIZE: usize = SYNC_COMMITTEE_SIZE / 8;
+pub const SLOTS_PER_HISTORICAL_ROOT: usize = 8192;
+pub const BLOCK_ROOT_AT_INDEX_DEPTH: usize = 13;

bridges/snowbridge/parachain/pallets/ethereum-client/src/lib.rs

@@ -552,7 +552,7 @@ pub mod pallet {
 			let latest_execution_state: ExecutionHeaderState = Self::latest_execution_state();
 			ensure!(
 				latest_execution_state.block_number == 0 ||
-					update.execution_header.block_number ==
+					update.execution_header.block_number() ==
 						latest_execution_state.block_number + 1,
 				Error::<T>::ExecutionHeaderSkippedBlock
 			);
@@ -603,7 +603,7 @@ pub mod pallet {
 			}
 
 			Self::store_execution_header(
-				update.execution_header.block_hash,
+				update.execution_header.block_hash(),
 				update.execution_header.clone().into(),
 				update.header.slot,
 				block_root,
@@ -786,6 +786,9 @@ pub mod pallet {
 
 		/// Returns the fork version based on the current epoch.
 		pub(super) fn select_fork_version(fork_versions: &ForkVersions, epoch: u64) -> ForkVersion {
+			if epoch >= fork_versions.deneb.epoch {
+				return fork_versions.deneb.version
+			}
 			if epoch >= fork_versions.capella.epoch {
 				return fork_versions.capella.version
 			}
@@ -795,7 +798,6 @@ pub mod pallet {
 			if epoch >= fork_versions.altair.epoch {
 				return fork_versions.altair.version
 			}
-
 			fork_versions.genesis.version
 		}