Refactor beacon client

.github/workflows/parachain.yml

@@ -100,10 +100,6 @@ jobs:
           args: >-
             --manifest-path parachain/Cargo.toml
             --verbose --workspace
-            --exclude snowbridge 
-            --exclude snowbridge-runtime 
-            --exclude snowblink-runtime 
-            --exclude snowbase-runtime
             --features runtime-benchmarks
             --avoid-cfg-tarpaulin
             --coveralls ${{ secrets.COVERALLS_REPO_TOKEN }}

parachain/pallets/ethereum-beacon-client/Cargo.toml

@@ -26,15 +26,16 @@ frame-support = { git = "https://github.com/paritytech/substrate.git", branch =
 frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false }
 
 snowbridge-core = { path = "../../primitives/core", default-features = false }
 snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false }
-snowbridge-beacon-primitives = { path = "../../primitives/beacon", default-features = false }
+primitives = { package = "snowbridge-beacon-primitives", path = "../../primitives/beacon", default-features = false }
+static_assertions = { version = "1.1.0" }
 
 [dev-dependencies]
 sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
 snowbridge-testutils = { path = "../../primitives/testutils" }
 serde_json = "1.0.96"
 hex-literal = { version = "0.4.1" }
@@ -50,12 +51,11 @@ std = [
     "frame-system/std",
     'frame-benchmarking/std',
     "sp-core/std",
-    "sp-io/std",
     "sp-runtime/std",
     "sp-std/std",
     "snowbridge-core/std",
     "snowbridge-ethereum/std",
-    "snowbridge-beacon-primitives/std",
+    "primitives/std",
     "milagro_bls/std",
     "ssz-rs/std",
     "byte-slice-cast/std",

parachain/pallets/ethereum-beacon-client/src/benchmarking/mod.rs

@@ -18,7 +18,7 @@ benchmarks! {
 
 	}: sync_committee_period_update(RawOrigin::Signed(caller.clone()), sync_committee_update.clone())
 	verify {
-		assert!(<SyncCommittees<T>>::get(sync_committee_update.sync_committee_period+1).pubkeys.len() > 0);
+		assert!(<SyncCommittees<T>>::get(sync_committee_update.sync_committee_period+1).unwrap().pubkeys.len() > 0);
 	}
 
 	import_finalized_header {
@@ -46,9 +46,7 @@ benchmarks! {
 
 	}: _(RawOrigin::Signed(caller.clone()), finalized_header_update.clone())
 	verify {
-		let header_hash_bytes = merkleization::hash_tree_root_beacon_header(finalized_header_update.finalized_header).unwrap();
-
-		let header_hash: H256 = header_hash_bytes.into();
+		let header_hash: H256 = finalized_header_update.finalized_header.hash_tree_root().unwrap();
 
 		<FinalizedBeaconHeaders<T>>::get(header_hash).unwrap();
 	}
@@ -66,13 +64,11 @@ benchmarks! {
 				header_update.beacon_header.slot,
 			), initial_sync_data.current_sync_committee);
 
-		let finalized_update: FinalizedHeaderUpdate<T::MaxSignatureSize, T::MaxProofBranchSize, T::MaxSyncCommitteeSize> = finalized_header_update();
+		let finalized_update: FinalizedHeaderUpdate<> = finalized_header_update();
 
 		let finalized_slot = finalized_update.finalized_header.slot;
-		let finalized_block_root: H256 =
-			merkleization::hash_tree_root_beacon_header(finalized_update.finalized_header)
-				.unwrap()
-				.into();
+		let finalized_block_root = finalized_update.finalized_header.hash_tree_root()
+				.unwrap();
 
 		LatestFinalizedHeaderState::<T>::set(FinalizedHeaderState{
 			beacon_block_root: finalized_block_root,
@@ -85,8 +81,7 @@ benchmarks! {
 		);
 	}: _(RawOrigin::Signed(caller.clone()), header_update.clone())
 	verify {
-		let header: ExecutionHeader = header_update.execution_header.try_into().unwrap();
-		<ExecutionHeaders<T>>::get(header.block_hash).unwrap();
+		assert!(<ExecutionHeaders<T>>::contains_key(header_update.execution_header.block_hash))
 	}
 
 	unblock_bridge {
@@ -100,7 +95,7 @@ benchmarks! {
 		let participant_pubkeys = get_participant_pubkeys::<T>(&update)?;
 		let signing_root = get_signing_message::<T>(&update)?;
 	}:{
-		EthereumBeaconClient::<T>::bls_fast_aggregate_verify(participant_pubkeys,signing_root,update.sync_aggregate.sync_committee_signature)?;
+		EthereumBeaconClient::<T>::bls_fast_aggregate_verify(&participant_pubkeys,signing_root,&update.sync_aggregate.sync_committee_signature)?;
 	}
 
 	bls_aggregate_pubkey {

parachain/pallets/ethereum-beacon-client/src/benchmarking/util.rs

@@ -1,14 +1,19 @@
-use super::*;
-use crate::Pallet as EthereumBeaconClient;
-use milagro_bls::{AggregatePublicKey, AggregateSignature, Signature};
+use crate::{
+	Config, LatestSyncCommitteePeriod, Pallet as EthereumBeaconClient, PublicKey, Signature,
+	SyncCommitteeUpdate, SyncCommittees, ValidatorsRoot, Vec,
+};
+use milagro_bls::{AggregatePublicKey, AggregateSignature, Signature as MilagroSignature};
+use sp_core::H256;
 
-pub fn initialize_sync_committee<T: Config>() -> Result<SyncCommitteePeriodUpdateOf<T>, &'static str>
-{
+use super::{initial_sync, sync_committee_update};
+use crate::{decompress_sync_committee_bits, Error};
+
+pub fn initialize_sync_committee<T: Config>() -> Result<SyncCommitteeUpdate, &'static str> {
 	let initial_sync_data = initial_sync();
 
 	EthereumBeaconClient::<T>::initial_sync(initial_sync_data.clone())?;
 
-	let sync_committee_update: SyncCommitteePeriodUpdateOf<T> = sync_committee_update();
+	let sync_committee_update = sync_committee_update();
 
 	//initialize SyncCommittees with period in sync_committee_update
 	LatestSyncCommitteePeriod::<T>::set(EthereumBeaconClient::<T>::compute_current_sync_period(
@@ -24,14 +29,14 @@ pub fn initialize_sync_committee<T: Config>() -> Result<SyncCommitteePeriodUpdat
 }
 
 pub fn get_participant_pubkeys<T: Config>(
-	update: &SyncCommitteePeriodUpdateOf<T>,
+	update: &SyncCommitteeUpdate,
 ) -> Result<Vec<PublicKey>, &'static str> {
 	let sync_committee_bits =
-		get_sync_committee_bits(update.sync_aggregate.sync_committee_bits.clone()).unwrap();
+		decompress_sync_committee_bits(update.sync_aggregate.sync_committee_bits.clone());
 	let current_period =
 		EthereumBeaconClient::<T>::compute_current_sync_period(update.attested_header.slot);
 	let current_sync_committee =
-		EthereumBeaconClient::<T>::get_sync_committee_for_period(current_period)?;
+		SyncCommittees::<T>::get(current_period).ok_or("no sync committee")?;
 	let sync_committee_pubkeys = current_sync_committee.pubkeys;
 	let mut participant_pubkeys: Vec<PublicKey> = Vec::new();
 	for (bit, pubkey) in sync_committee_bits.iter().zip(sync_committee_pubkeys.iter()) {
@@ -43,17 +48,15 @@ pub fn get_participant_pubkeys<T: Config>(
 	Ok(participant_pubkeys)
 }
 
-pub fn get_signing_message<T: Config>(
-	update: &SyncCommitteePeriodUpdateOf<T>,
-) -> Result<Root, &'static str> {
+pub fn get_signing_message<T: Config>(update: &SyncCommitteeUpdate) -> Result<H256, &'static str> {
 	let validators_root = <ValidatorsRoot<T>>::get();
 	let fork_version = EthereumBeaconClient::<T>::compute_fork_version(
 		EthereumBeaconClient::<T>::compute_epoch_at_slot(
 			update.signature_slot,
-			config::SLOTS_PER_EPOCH,
+			crate::config::SLOTS_PER_EPOCH,
 		),
 	);
-	let domain_type = config::DOMAIN_SYNC_COMMITTEE.to_vec();
+	let domain_type = crate::config::DOMAIN_SYNC_COMMITTEE.to_vec();
 	let domain =
 		EthereumBeaconClient::<T>::compute_domain(domain_type, fork_version, validators_root)?;
 	let signing_root =
@@ -62,9 +65,10 @@ pub fn get_signing_message<T: Config>(
 }
 
 pub fn get_aggregate_signature<T: Config>(
-	signature: BoundedVec<u8, T::MaxSignatureSize>,
+	signature: Signature,
 ) -> Result<AggregateSignature, Error<T>> {
-	let sig = Signature::from_bytes(&signature[..]).map_err(|_| Error::<T>::InvalidSignature)?;
+	let sig =
+		MilagroSignature::from_bytes(&signature.0[..]).map_err(|_| Error::<T>::InvalidSignature)?;
 	let agg_sig = AggregateSignature::from_signature(&sig);
 	Ok(agg_sig)
 }

parachain/pallets/ethereum-beacon-client/src/config/mainnet.rs

@@ -2,6 +2,7 @@ pub const SLOTS_PER_EPOCH: u64 = 32;
 pub const SECONDS_PER_SLOT: u64 = 12;
 pub const EPOCHS_PER_SYNC_COMMITTEE_PERIOD: u64 = 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 IS_MINIMAL: bool = false;
 pub const BLOCK_ROOT_AT_INDEX_PROOF_DEPTH: u64 = 13;

parachain/pallets/ethereum-beacon-client/src/config/minimal.rs

@@ -2,6 +2,7 @@ pub const SLOTS_PER_EPOCH: u64 = 8;
 pub const SECONDS_PER_SLOT: u64 = 6;
 pub const EPOCHS_PER_SYNC_COMMITTEE_PERIOD: u64 = 8;
 pub const SYNC_COMMITTEE_SIZE: usize = 32;
+pub const SYNC_COMMITTEE_BITS_SIZE: usize = SYNC_COMMITTEE_SIZE / 8;
 pub const SLOTS_PER_HISTORICAL_ROOT: usize = 64;
 pub const IS_MINIMAL: bool = true;
 pub const BLOCK_ROOT_AT_INDEX_PROOF_DEPTH: u64 = 6;

parachain/pallets/ethereum-beacon-client/src/config.rs → parachain/pallets/ethereum-beacon-client/src/config/mod.rs

@@ -1,8 +1,7 @@
-#[cfg(feature = "minimal")]
-mod minimal;
+use static_assertions::const_assert;
 
-#[cfg(not(feature = "minimal"))]
-mod mainnet;
+pub mod mainnet;
+pub mod minimal;
 
 #[cfg(feature = "minimal")]
 pub use minimal::*;
@@ -11,10 +10,8 @@ pub use minimal::*;
 pub use mainnet::*;
 
 pub const CURRENT_SYNC_COMMITTEE_INDEX: u64 = 22;
-pub const CURRENT_SYNC_COMMITTEE_DEPTH: u64 = 5;
-
-pub const NEXT_SYNC_COMMITTEE_DEPTH: u64 = 5;
 pub const NEXT_SYNC_COMMITTEE_INDEX: u64 = 23;
+pub const SYNC_COMMITTEE_DEPTH: u64 = 5;
 
 pub const FINALIZED_ROOT_DEPTH: u64 = 6;
 pub const FINALIZED_ROOT_INDEX: u64 = 41;
@@ -29,9 +26,14 @@ pub const MAX_EXTRA_DATA_BYTES: usize = 32;
 pub const MAX_LOGS_BLOOM_SIZE: usize = 256;
 pub const MAX_FEE_RECIPIENT_SIZE: usize = 20;
 
+pub const MAX_FINALIZED_HEADER_SLOT_ARRAY: u32 = 1000;
+pub const MAX_BRANCH_PROOF_SIZE: u32 = 20;
+
 /// DomainType('0x07000000')
 /// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/beacon-chain.md#domain-types
 pub const DOMAIN_SYNC_COMMITTEE: [u8; 4] = [7, 0, 0, 0];
 
 pub const PUBKEY_SIZE: usize = 48;
 pub const SIGNATURE_SIZE: usize = 96;
+
+const_assert!(SYNC_COMMITTEE_BITS_SIZE == SYNC_COMMITTEE_SIZE / 8);