Snowbridge: Refactor with Alloy primitives and clean up code (#9204)

Just some cleanup — not blocking the V2 release if it can’t be included
in time.

---------

Co-authored-by: Adrian Catangiu <[email protected]>

Author: yrong

Cargo.lock

@@ -636,7 +636,10 @@ pallet-oracle-runtime-api = { path = "substrate/frame/honzon/oracle/runtime-api"
 Inflector = { version = "0.11.4" }
 aes-gcm = { version = "0.10" }
 ahash = { version = "0.8.2" }
-alloy-core = { version = "1.1.0", default-features = false }
+alloy-consensus = { version = "1.0.20", default-features = false }
+alloy-core = { version = "1.2.1", default-features = false }
+alloy-primitives = { version = "1.2.1", default-features = false }
+alloy-rlp = { version = "0.3", default-features = false }
 always-assert = { version = "0.1" }
 anyhow = { version = "1.0.81", default-features = false }
 approx = { version = "0.5.1" }

Cargo.toml

@@ -4,8 +4,10 @@ use super::*;
 use frame_support::ensure;
 use snowbridge_beacon_primitives::ExecutionProof;
 
-use snowbridge_beacon_primitives::merkle_proof::{generalized_index_length, subtree_index};
-use snowbridge_ethereum::Receipt;
+use snowbridge_beacon_primitives::{
+	merkle_proof::{generalized_index_length, subtree_index},
+	receipt::verify_receipt_proof,
+};
 use snowbridge_verification_primitives::{
 	VerificationError::{self, *},
 	Verifier, *,
@@ -21,28 +23,12 @@ impl<T: Config> Verifier for Pallet<T> {
 		Self::verify_execution_proof(&proof.execution_proof)
 			.map_err(|e| InvalidExecutionProof(e.into()))?;
 
-		let receipt = Self::verify_receipt_inclusion(
+		Self::verify_receipt_inclusion(
 			proof.execution_proof.execution_header.receipts_root(),
 			&proof.receipt_proof.1,
+			event_log,
 		)?;
 
-		event_log.validate().map_err(|_| InvalidLog)?;
-
-		// Convert snowbridge_core::inbound::Log to snowbridge_ethereum::Log.
-		let event_log = snowbridge_ethereum::Log {
-			address: event_log.address,
-			topics: event_log.topics.clone(),
-			data: event_log.data.clone(),
-		};
-
-		if !receipt.contains_log(&event_log) {
-			log::error!(
-				target: "ethereum-client",
-				"💫 Event log not found in receipt for transaction",
-			);
-			return Err(LogNotFound)
-		}
-
 		Ok(())
 	}
 }
@@ -53,20 +39,21 @@ impl<T: Config> Pallet<T> {
 	pub fn verify_receipt_inclusion(
 		receipts_root: H256,
 		receipt_proof: &[Vec<u8>],
-	) -> Result<Receipt, VerificationError> {
-		let result = verify_receipt_proof(receipts_root, receipt_proof).ok_or(InvalidProof)?;
-
-		match result {
-			Ok(receipt) => Ok(receipt),
-			Err(err) => {
-				log::trace!(
-					target: "ethereum-client",
-					"💫 Failed to decode transaction receipt: {}",
-					err
-				);
-				Err(InvalidProof)
-			},
+		log: &Log,
+	) -> Result<(), VerificationError> {
+		let receipt = verify_receipt_proof(receipts_root, receipt_proof).ok_or(InvalidProof)?;
+		if !receipt.logs().iter().any(|l| {
+			l.data.data.0 == log.data &&
+				l.address.0 == log.address.0 &&
+				l.topics().len() == log.topics.len()
+		}) {
+			log::error!(
+				target: "ethereum-client",
+				"💫 Event log not found in receipt for transaction",
+			);
+			return Err(LogNotFound)
 		}
+		Ok(())
 	}
 
 	/// Validates an execution header with ancestry_proof against a finalized checkpoint on

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

@@ -42,8 +42,8 @@ use frame_system::ensure_signed;
 use snowbridge_beacon_primitives::{
 	fast_aggregate_verify,
 	merkle_proof::{generalized_index_length, subtree_index},
-	verify_merkle_branch, verify_receipt_proof, BeaconHeader, BlsError, CompactBeaconState,
-	ForkData, ForkVersion, ForkVersions, PublicKeyPrepared, SigningData,
+	verify_merkle_branch, BeaconHeader, BlsError, CompactBeaconState, ForkData, ForkVersion,
+	ForkVersions, PublicKeyPrepared, SigningData,
 };
 use snowbridge_core::{BasicOperatingMode, RingBufferMap};
 use sp_core::H256;

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

@@ -803,7 +803,7 @@ fn verify_message_invalid_log() {
 		assert_ok!(initialize_storage());
 		assert_err!(
 			EthereumBeaconClient::verify(&event_log, &proof),
-			VerificationError::InvalidLog
+			VerificationError::LogNotFound
 		);
 	});
 }

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

@@ -1,17 +1,14 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
+use snowbridge_ethereum::{mpt, Decodable, ReceiptEnvelope};
 use sp_core::H256;
 use sp_io::hashing::keccak_256;
 use sp_std::prelude::*;
 
-use snowbridge_ethereum::{mpt, Receipt};
-
-pub fn verify_receipt_proof(
-	receipts_root: H256,
-	proof: &[Vec<u8>],
-) -> Option<Result<Receipt, rlp::DecoderError>> {
-	match apply_merkle_proof(proof) {
-		Some((root, data)) if root == receipts_root => Some(rlp::decode(&data)),
+pub fn verify_receipt_proof(receipts_root: H256, values: &[Vec<u8>]) -> Option<ReceiptEnvelope> {
+	match apply_merkle_proof(values) {
+		Some((root, data)) if root == receipts_root =>
+			ReceiptEnvelope::decode(&mut data.as_slice()).ok(),
 		Some((_, _)) => None,
 		None => None,
 	}
@@ -64,15 +61,9 @@ mod tests {
 		assert!(verify_receipt_proof(root, &proof_empty).is_none());
 		assert!(verify_receipt_proof(root, &proof_missing_full_node).is_none());
 
-		assert_eq!(
-			verify_receipt_proof(root, &proof_missing_short_node1),
-			Some(Err(rlp::DecoderError::Custom("Unsupported receipt type")))
-		);
+		assert_eq!(verify_receipt_proof(root, &proof_missing_short_node1), None);
 
-		assert_eq!(
-			verify_receipt_proof(root, &proof_missing_short_node2),
-			Some(Err(rlp::DecoderError::Custom("Unsupported receipt type")))
-		);
+		assert_eq!(verify_receipt_proof(root, &proof_missing_short_node2), None);
 
 		assert!(verify_receipt_proof(root, &proof_invalid_encoding).is_none());
 		assert!(verify_receipt_proof(root, &proof_no_full_node).is_none());

bridges/snowbridge/primitives/beacon/src/receipt.rs

@@ -15,6 +15,10 @@ workspace = true
 exclude-from-umbrella = true
 
 [dependencies]
+alloy-consensus = { workspace = true }
+alloy-core = { workspace = true }
+alloy-primitives = { workspace = true }
+alloy-rlp = { workspace = true }
 codec = { features = ["derive"], workspace = true }
 ethbloom = { workspace = true }
 ethereum-types = { features = ["codec", "rlp", "serialize"], workspace = true }
@@ -31,10 +35,15 @@ sp-std = { workspace = true }
 
 ethabi = { workspace = true }
 
+
 [features]
 default = ["std"]
 expensive_tests = []
 std = [
+	"alloy-consensus/std",
+	"alloy-core/std",
+	"alloy-primitives/std",
+	"alloy-rlp/std",
 	"codec/std",
 	"ethabi/std",
 	"ethbloom/std",