Add comprehensive test data for Ethereum trie root validation

Cargo.toml

@@ -927,7 +927,7 @@ node-rpc = { path = "substrate/bin/node/rpc" }
 node-testing = { path = "substrate/bin/node/testing" }
 nohash-hasher = { version = "0.2.0" }
 novelpoly = { version = "2.0.0", package = "reed-solomon-novelpoly" }
-num-bigint = { version = "0.4.3", default-features = false }
+num-bigint = { version = "0.4.6", default-features = false }
 num-format = { version = "0.4.3" }
 num-integer = { version = "0.1.46", default-features = false }
 num-rational = { version = "0.4.1" }

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -1166,6 +1166,7 @@ parameter_types! {
 
 impl pallet_revive::Config for Runtime {
 	type Time = Timestamp;
+	type StateRoot = pallet_revive::DeterministicStateRoot<Self::Version>;
 	type Currency = Balances;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;

cumulus/parachains/runtimes/testing/penpal/src/lib.rs

@@ -841,6 +841,7 @@ parameter_types! {
 
 impl pallet_revive::Config for Runtime {
 	type Time = Timestamp;
+	type StateRoot = pallet_revive::DeterministicStateRoot<Self::Version>;
 	type Currency = Balances;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;

substrate/bin/node/runtime/src/lib.rs

@@ -1469,6 +1469,7 @@ impl pallet_contracts::Config for Runtime {
 
 impl pallet_revive::Config for Runtime {
 	type Time = Timestamp;
+	type StateRoot = pallet_revive::DeterministicStateRoot<Self::Version>;
 	type Currency = Balances;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;

substrate/frame/revive/Cargo.toml

@@ -35,9 +35,10 @@ polkavm = { version = "0.26.0", default-features = false }
 polkavm-common = { version = "0.26.0", default-features = false, optional = true }
 rand = { workspace = true, optional = true }
 rand_pcg = { workspace = true, optional = true }
-rlp = { workspace = true }
+rlp = { workspace = true, features = ["derive"] }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true, default-features = false }
+sp-trie = { workspace = true }
 
 # Polkadot SDK Dependencies
 bn = { workspace = true }
@@ -54,10 +55,14 @@ sp-arithmetic = { workspace = true }
 sp-consensus-aura = { workspace = true, optional = true }
 sp-consensus-babe = { workspace = true, optional = true }
 sp-consensus-slots = { workspace = true, optional = true }
-sp-core = { workspace = true }
+# TODO: Is this feature safe? Was it tested? Why experimental? Better to just use alloy-trie/core?
+sp-core = { workspace = true, features = ["bls-experimental", "bandersnatch-experimental"] }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
+sp-version = { workspace = true }
 subxt-signer = { workspace = true, optional = true, features = ["unstable-eth"] }
+hash-db = { workspace = true }
+trie-root = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
@@ -66,6 +71,8 @@ polkavm-common = { version = "0.26.0" }
 pretty_assertions = { workspace = true }
 secp256k1 = { workspace = true, features = ["recovery"] }
 serde_json = { workspace = true }
+ethereum = { version = "0.18.2", default-features = false, features = ["with-scale"] }
+rlp = {version = "0.6.1", default-features = false }
 
 # Polkadot SDK Dependencies
 pallet-balances = { workspace = true, default-features = true }

substrate/frame/revive/rpc/Cargo.toml

@@ -31,6 +31,7 @@ sc-cli = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+serde = {workspace = true, default-features = false, features = ["alloc", "derive"]}
 serde_json = { workspace = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }

substrate/frame/revive/rpc/examples/collect-test-data.rs

@@ -0,0 +1,175 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use clap::Parser;
+use jsonrpsee::http_client::HttpClientBuilder;
+use pallet_revive::evm::{BlockNumberOrTag, ReceiptInfo, TransactionInfo, H256, U256};
+use pallet_revive_eth_rpc::EthRpcClient;
+use serde::Serialize;
+use std::sync::Arc;
+
+#[derive(Parser)]
+#[command(name = "collect-test-data")]
+#[command(about = "Collect block data, transactions and receipts for test data generation")]
+struct Args {
+	/// RPC URL (e.g., http://localhost:8545)
+	#[arg(short, long, default_value = "http://localhost:8545")]
+	rpc_url: String,
+
+	/// Block number (if not provided, uses latest block)
+	#[arg(short, long)]
+	block_number: Option<u64>,
+
+	/// Include transaction infos in the JSON output
+	#[arg(long)]
+	with_transactions: bool,
+
+	/// Include receipt infos in the JSON output
+	#[arg(long)]
+	with_receipts: bool,
+}
+
+#[derive(Serialize)]
+struct TestDataInfo {
+	rpc_url: String,
+	block_number_requested: String,
+}
+
+#[derive(Serialize)]
+struct TestData {
+	info: TestDataInfo,
+	block_number: U256,
+	block_hash: H256,
+	transactions: Option<Vec<TransactionInfo>>,
+	transactions_rlp: Vec<String>,
+	transactions_root: H256,
+	receipts: Option<Vec<ReceiptInfo>>,
+	receipts_rlp: Vec<String>,
+	receipts_root: H256,
+}
+// TODO
+// below command fails
+//   target/debug/examples/collect-test-data -b 23094898 -r https://ethereum-rpc.publicnode.com
+// with such message:
+//   Fetching block data for: U256(23094898)
+//   Error: Parse error: data did not match any variant of untagged enum HashesOrTransactionInfos at
+// line 1 column 520458
+//   Caused by:
+//     data did not match any variant of untagged enum HashesOrTransactionInfos at line 1 column
+// 520458
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+	let args = Args::parse();
+
+	let client = Arc::new(HttpClientBuilder::default().build(&args.rpc_url)?);
+
+	// Determine block number to use
+	let block_number = match args.block_number {
+		Some(num) => BlockNumberOrTag::U256(U256::from(num)),
+		None => BlockNumberOrTag::BlockTag(pallet_revive::evm::BlockTag::Latest),
+	};
+
+	println!("Fetching block data for: {:?}", block_number);
+
+	// Get block information
+	let block = client
+		.get_block_by_number(block_number.clone(), true)
+		.await?
+		.ok_or_else(|| anyhow::anyhow!("Block not found"))?;
+
+	println!("Block hash: {:?}", block.hash);
+	println!("Block number: {:?}", block.number);
+	println!(
+		"Transactions count: {}",
+		match &block.transactions {
+			pallet_revive::evm::HashesOrTransactionInfos::TransactionInfos(txs) => txs.len(),
+			pallet_revive::evm::HashesOrTransactionInfos::Hashes(hashes) => hashes.len(),
+		}
+	);
+
+	// Extract transaction infos
+	let transaction_infos = match block.transactions {
+		pallet_revive::evm::HashesOrTransactionInfos::TransactionInfos(txs) => txs,
+		pallet_revive::evm::HashesOrTransactionInfos::Hashes(hashes) => {
+			// If we only have hashes, fetch full transaction info
+			let mut txs = Vec::new();
+			for hash in hashes {
+				if let Some(tx) = client.get_transaction_by_hash(hash).await? {
+					txs.push(tx);
+				}
+			}
+			txs
+		},
+	};
+
+	// Collect receipts
+	let mut receipts = Vec::new();
+	for tx in &transaction_infos {
+		if let Some(receipt) = client.get_transaction_receipt(tx.hash).await? {
+			receipts.push(receipt);
+		}
+	}
+
+	println!("Collected {} receipts", receipts.len());
+
+	// Generate RLP encoded transactions
+	let mut transactions_rlp = Vec::new();
+	for tx in &transaction_infos {
+		let rlp_encoded = tx.transaction_signed.encode_2718();
+		transactions_rlp.push(format!("0x{}", hex::encode(rlp_encoded)));
+	}
+
+	// Generate RLP encoded receipts
+	let mut receipts_rlp = Vec::new();
+	for receipt in &receipts {
+		let rlp_encoded = receipt.encode_2718();
+		receipts_rlp.push(format!("0x{}", hex::encode(rlp_encoded)));
+	}
+
+	// Create test data structure
+	let test_data = TestData {
+		info: TestDataInfo {
+			rpc_url: args.rpc_url.clone(),
+			block_number_requested: match args.block_number {
+				Some(num) => num.to_string(),
+				None => "latest".to_string(),
+			},
+		},
+		block_number: block.number,
+		block_hash: block.hash,
+		transactions: if args.with_transactions { Some(transaction_infos) } else { None },
+		transactions_rlp,
+		transactions_root: block.transactions_root,
+		receipts: if args.with_receipts { Some(receipts) } else { None },
+		receipts_rlp,
+		receipts_root: block.receipts_root,
+	};
+
+	// Output as JSON
+	let json_output = serde_json::to_string_pretty(&test_data)?;
+	println!("\n=== TEST DATA ===\n");
+	println!("{}", json_output);
+
+	// Also save to file
+	let filename = format!("test_data_block_{}.json", block.number);
+	std::fs::write(&filename, &json_output)?;
+	println!("\n=== SAVED TO FILE ===");
+	println!("Test data saved to: {}", filename);
+
+	Ok(())
+}