[stable2407] Backport #7075

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

@@ -6,13 +6,13 @@ mod util;
 use crate::Pallet as EthereumBeaconClient;
 use frame_benchmarking::v2::*;
 use frame_system::RawOrigin;
-
-use snowbridge_pallet_ethereum_client_fixtures::*;
-
+use hex_literal::hex;
 use snowbridge_beacon_primitives::{
-	fast_aggregate_verify, prepare_aggregate_pubkey, prepare_aggregate_signature,
-	verify_merkle_branch,
+	fast_aggregate_verify,
+	merkle_proof::{generalized_index_length, subtree_index},
+	prepare_aggregate_pubkey, prepare_aggregate_signature, verify_merkle_branch, Fork,
 };
+use snowbridge_pallet_ethereum_client_fixtures::*;
 use util::*;
 
 #[benchmarks]
@@ -111,13 +111,25 @@ mod benchmarks {
 		let update = make_sync_committee_update();
 		let block_root: H256 = update.finalized_header.hash_tree_root().unwrap();
 
+		let fork_versions = ForkVersions {
+			genesis: Fork { version: hex!("00000000"), epoch: 0 },
+			altair: Fork { version: hex!("01000000"), epoch: 0 },
+			bellatrix: Fork { version: hex!("02000000"), epoch: 0 },
+			capella: Fork { version: hex!("03000000"), epoch: 0 },
+			deneb: Fork { version: hex!("04000000"), epoch: 0 },
+			electra: Fork { version: hex!("05000000"), epoch: 80000000000 },
+		};
+		let finalized_root_gindex = EthereumBeaconClient::<T>::finalized_root_gindex_at_slot(
+			update.attested_header.slot,
+			fork_versions,
+		);
 		#[block]
 		{
 			verify_merkle_branch(
 				block_root,
 				&update.finality_branch,
-				config::FINALIZED_ROOT_SUBTREE_INDEX,
-				config::FINALIZED_ROOT_DEPTH,
+				subtree_index(finalized_root_gindex),
+				generalized_index_length(finalized_root_gindex),
 				update.attested_header.state_root,
 			);
 		}

bridges/snowbridge/pallets/ethereum-client/src/config/altair.rs

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+
+/// Generalized Indices
+/// related to Merkle proofs
+/// get_generalized_index(BeaconState, 'block_roots')
+pub const BLOCK_ROOTS_INDEX: usize = 37;
+/// get_generalized_index(BeaconState, 'finalized_checkpoint', 'root')
+pub const FINALIZED_ROOT_INDEX: usize = 105;
+/// get_generalized_index(BeaconState, 'current_sync_committee')
+pub const CURRENT_SYNC_COMMITTEE_INDEX: usize = 54;
+/// get_generalized_index(BeaconState, 'next_sync_committee')
+pub const NEXT_SYNC_COMMITTEE_INDEX: usize = 55;
+///  get_generalized_index(BeaconBlockBody, 'execution_payload')
+pub const EXECUTION_HEADER_INDEX: usize = 25;

bridges/snowbridge/pallets/ethereum-client/src/config/electra.rs

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+
+/// Generalized Indices
+/// related to Merkle proofs
+/// get_generalized_index(BeaconState, 'block_roots')
+pub const BLOCK_ROOTS_INDEX: usize = 69;
+/// get_generalized_index(BeaconState, 'finalized_checkpoint', 'root')
+pub const FINALIZED_ROOT_INDEX: usize = 169;
+/// get_generalized_index(BeaconState, 'current_sync_committee')
+pub const CURRENT_SYNC_COMMITTEE_INDEX: usize = 86;
+/// get_generalized_index(BeaconState, 'next_sync_committee')
+pub const NEXT_SYNC_COMMITTEE_INDEX: usize = 87;

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

@@ -1,35 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
-use snowbridge_beacon_primitives::merkle_proof::{generalized_index_length, subtree_index};
 use static_assertions::const_assert;
 
-/// Generalized Indices
-/// related to Merkle proofs
-/// get_generalized_index(BeaconState, 'block_roots')
-pub const BLOCK_ROOTS_INDEX: usize = 37;
-pub const BLOCK_ROOTS_SUBTREE_INDEX: usize = subtree_index(BLOCK_ROOTS_INDEX);
-pub const BLOCK_ROOTS_DEPTH: usize = generalized_index_length(BLOCK_ROOTS_INDEX);
-
-/// get_generalized_index(BeaconState, 'finalized_checkpoint', 'root')
-pub const FINALIZED_ROOT_INDEX: usize = 105;
-pub const FINALIZED_ROOT_SUBTREE_INDEX: usize = subtree_index(FINALIZED_ROOT_INDEX);
-pub const FINALIZED_ROOT_DEPTH: usize = generalized_index_length(FINALIZED_ROOT_INDEX);
-
-/// get_generalized_index(BeaconState, 'current_sync_committee')
-pub const CURRENT_SYNC_COMMITTEE_INDEX: usize = 54;
-pub const CURRENT_SYNC_COMMITTEE_SUBTREE_INDEX: usize = subtree_index(CURRENT_SYNC_COMMITTEE_INDEX);
-pub const CURRENT_SYNC_COMMITTEE_DEPTH: usize =
-	generalized_index_length(CURRENT_SYNC_COMMITTEE_INDEX);
-
-/// get_generalized_index(BeaconState, 'next_sync_committee')
-pub const NEXT_SYNC_COMMITTEE_INDEX: usize = 55;
-pub const NEXT_SYNC_COMMITTEE_SUBTREE_INDEX: usize = subtree_index(NEXT_SYNC_COMMITTEE_INDEX);
-pub const NEXT_SYNC_COMMITTEE_DEPTH: usize = generalized_index_length(NEXT_SYNC_COMMITTEE_INDEX);
-
-///  get_generalized_index(BeaconBlockBody, 'execution_payload')
-pub const EXECUTION_HEADER_INDEX: usize = 25;
-pub const EXECUTION_HEADER_SUBTREE_INDEX: usize = subtree_index(EXECUTION_HEADER_INDEX);
-pub const EXECUTION_HEADER_DEPTH: usize = generalized_index_length(EXECUTION_HEADER_INDEX);
+pub mod altair;
+pub mod electra;
 
 /// Sizes related to SSZ encoding
 pub const MAX_EXTRA_DATA_BYTES: usize = 32;

bridges/snowbridge/pallets/ethereum-client/src/impls.rs

@@ -4,6 +4,7 @@ use super::*;
 use frame_support::ensure;
 use snowbridge_beacon_primitives::ExecutionProof;
 
+use snowbridge_beacon_primitives::merkle_proof::{generalized_index_length, subtree_index};
 use snowbridge_core::inbound::{
 	VerificationError::{self, *},
 	*,
@@ -13,8 +14,9 @@ use snowbridge_ethereum::Receipt;
 impl<T: Config> Verifier for Pallet<T> {
 	/// Verify a message by verifying the existence of the corresponding
 	/// Ethereum log in a block. Returns the log if successful. The execution header containing
-	/// the log should be in the beacon client storage, meaning it has been verified and is an
-	/// ancestor of a finalized beacon block.
+	/// the log is sent with the message. The beacon header containing the execution header
+	/// is also sent with the message, to check if the header is an ancestor of a finalized
+	/// header.
 	fn verify(event_log: &Log, proof: &Proof) -> Result<(), VerificationError> {
 		Self::verify_execution_proof(&proof.execution_proof)
 			.map_err(|e| InvalidExecutionProof(e.into()))?;
@@ -80,25 +82,6 @@ impl<T: Config> Pallet<T> {
 			Error::<T>::HeaderNotFinalized
 		);
 
-		// Gets the hash tree root of the execution header, in preparation for the execution
-		// header proof (used to check that the execution header is rooted in the beacon
-		// header body.
-		let execution_header_root: H256 = execution_proof
-			.execution_header
-			.hash_tree_root()
-			.map_err(|_| Error::<T>::BlockBodyHashTreeRootFailed)?;
-
-		ensure!(
-			verify_merkle_branch(
-				execution_header_root,
-				&execution_proof.execution_branch,
-				config::EXECUTION_HEADER_SUBTREE_INDEX,
-				config::EXECUTION_HEADER_DEPTH,
-				execution_proof.header.body_root
-			),
-			Error::<T>::InvalidExecutionHeaderProof
-		);
-
 		let beacon_block_root: H256 = execution_proof
 			.header
 			.hash_tree_root()
@@ -125,6 +108,25 @@ impl<T: Config> Pallet<T> {
 			},
 		}
 
+		// Gets the hash tree root of the execution header, in preparation for the execution
+		// header proof (used to check that the execution header is rooted in the beacon
+		// header body.
+		let execution_header_root: H256 = execution_proof
+			.execution_header
+			.hash_tree_root()
+			.map_err(|_| Error::<T>::BlockBodyHashTreeRootFailed)?;
+
+		let execution_header_gindex = Self::execution_header_gindex();
+		ensure!(
+			verify_merkle_branch(
+				execution_header_root,
+				&execution_proof.execution_branch,
+				subtree_index(execution_header_gindex),
+				generalized_index_length(execution_header_gindex),
+				execution_proof.header.body_root
+			),
+			Error::<T>::InvalidExecutionHeaderProof
+		);
 		Ok(())
 	}