frame/revive: ETH block storage

Cargo.toml

@@ -636,10 +636,11 @@ 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-consensus = { version = "1.0.20", default-features = false }
+alloy-consensus = { version = "1.0.24", 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 }
+alloy-trie = { version = "0.9.1", default-features = false }
 always-assert = { version = "0.1" }
 anyhow = { version = "1.0.81", default-features = false }
 approx = { version = "0.5.1" }

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

@@ -207,7 +207,7 @@ pub type PoolFungiblesTransactor = FungiblesAdapter<
 
 parameter_types! {
 	/// Taken from the real gas and deposits of a standard ERC20 transfer call.
-	pub const ERC20TransferGasLimit: Weight = Weight::from_parts(700_000_000, 200_000);
+	pub const ERC20TransferGasLimit: Weight = Weight::from_parts(500_000_000_000, 10 * 1024 * 1024);
 	pub const ERC20TransferStorageDepositLimit: Balance = 10_200_000_000;
 	pub ERC20TransfersCheckingAccount: AccountId = PalletId(*b"py/revch").into_account_truncating();
 }

cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs

@@ -1667,7 +1667,8 @@ fn withdraw_and_deposit_erc20s() {
 	let revive_account = pallet_revive::Pallet::<Runtime>::account_id();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
-	let initial_wnd_amount = 10_000_000_000_000u128;
+	let initial_wnd_amount = 100_000_000_000_000_000u128;
+	sp_tracing::init_for_tests();
 
 	ExtBuilder::<Runtime>::default().build().execute_with(|| {
 		// Bring the revive account to life.
@@ -1688,15 +1689,15 @@ fn withdraw_and_deposit_erc20s() {
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
 		let Contract { addr: erc20_address, .. } = bare_instantiate(&sender, code)
-			.gas_limit(Weight::from_parts(2_000_000_000, 200_000))
+			.gas_limit(Weight::from_parts(500_000_000_000, 10 * 1024 * 1024))
 			.storage_deposit_limit(Balance::MAX)
 			.data(constructor_data)
 			.build_and_unwrap_contract();
 
 		let sender_balance_before = <Balances as fungible::Inspect<_>>::balance(&sender);
 
 		let erc20_transfer_amount = 100u128;
-		let wnd_amount_for_fees = 1_000_000_000_000u128;
+		let wnd_amount_for_fees = 10_000_000_000_000u128;
 		// Actual XCM to execute locally.
 		let message = Xcm::<RuntimeCall>::builder()
 			.withdraw_asset((Parent, wnd_amount_for_fees))
@@ -1712,7 +1713,7 @@ fn withdraw_and_deposit_erc20s() {
 		assert_ok!(PolkadotXcm::execute(
 			RuntimeOrigin::signed(sender.clone()),
 			Box::new(VersionedXcm::V5(message)),
-			Weight::from_parts(2_500_000_000, 220_000),
+			Weight::from_parts(600_000_000_000, 15 * 1024 * 1024),
 		));
 
 		// Revive is not taking any fees.
@@ -1801,7 +1802,7 @@ fn smart_contract_not_erc20_will_error() {
 		let (code, _) = compile_module("dummy").unwrap();
 
 		let Contract { addr: non_erc20_address, .. } = bare_instantiate(&sender, code)
-			.gas_limit(Weight::from_parts(2_000_000_000, 200_000))
+			.gas_limit(Weight::from_parts(500_000_000_000, 10 * 1024 * 1024))
 			.storage_deposit_limit(Balance::MAX)
 			.build_and_unwrap_contract();
 
@@ -1859,7 +1860,7 @@ fn smart_contract_does_not_return_bool_fails() {
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
 
 		let Contract { addr: non_erc20_address, .. } = bare_instantiate(&sender, code)
-			.gas_limit(Weight::from_parts(2_000_000_000, 200_000))
+			.gas_limit(Weight::from_parts(500_000_000_000, 10 * 1024 * 1024))
 			.storage_deposit_limit(Balance::MAX)
 			.data(constructor_data)
 			.build_and_unwrap_contract();
@@ -1915,7 +1916,7 @@ fn expensive_erc20_runs_out_of_gas() {
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
 		let Contract { addr: non_erc20_address, .. } = bare_instantiate(&sender, code)
-			.gas_limit(Weight::from_parts(2_000_000_000, 200_000))
+			.gas_limit(Weight::from_parts(500_000_000_000, 10 * 1024 * 1024))
 			.storage_deposit_limit(Balance::MAX)
 			.data(constructor_data)
 			.build_and_unwrap_contract();

prdoc/pr_9418.prdoc

@@ -0,0 +1,46 @@
+title: 'frame/revive: ETH block storage'
+doc:
+- audience: Node Dev
+  description: |-
+    This PR constructs the Ethereum block in the following way:
+    - events (logs) are captured via an `environmental!` variable to reduce reliance on pallet storage
+      - A maximum of 512 events is allowed per transaction, with the size of an event capped to `self.ext.max_value_size()`
+    - A memory-efficient intermediate block builder is deserialized and serialized back to the pallet storage
+      - The intermediate block builder builds the transaction and event root hashes using low level RLP encoding primitives to achieve around 90% pallet storage optimization
+      - For more details, see https://github.com/paritytech/polkadot-sdk/pull/9764
+    - A fixup is included for 7702 transaction rlp serialization/deserialization is added to ensure we can build the Ethereum block hash from live Ethereum blocks.
+    - The maximum `CALL_PARAMS_MAX_SIZE` is increased to 512 to 244 to accommodate the transaction added to the Eth call
+
+
+    This PR also includes benchmarking:
+    - https://github.com/paritytech/polkadot-sdk/pull/9496
+
+    ### Testing Done
+    - pallet storage testing and capturing of events / transactions are added at `tests/block_hash.rs`
+    - incremental block storage is tested in `evm/block_hash.rs`, which ensures RLP encoding / hash builder and identical hashes from live ethereum blocks
+    - tested via RPC work
+
+    ### Next Steps
+    - https://github.com/paritytech/polkadot-sdk/pull/9512
+    - https://github.com/paritytech/polkadot-sdk/pull/9616
+    - https://github.com/paritytech/polkadot-sdk/pull/9452
+
+
+    Builds upon https://github.com/paritytech/polkadot-sdk/pull/9413
+
+    Part of: https://github.com/paritytech/contract-issues/issues/139
+crates:
+- name: pallet-revive
+  bump: patch
+- name: sp-core
+  bump: patch
+- name: asset-hub-westend-runtime
+  bump: patch
+- name: penpal-runtime
+  bump: patch
+- name: pallet-xcm
+  bump: patch
+- name: pallet-assets
+  bump: patch
+- name: pallet-revive-eth-rpc
+  bump: patch

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

@@ -155,7 +155,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 /// Max size for serialized extrinsic params for this testing runtime.
 /// This is a quite arbitrary but empirically battle tested value.
 #[cfg(test)]
-pub const CALL_PARAMS_MAX_SIZE: usize = 244;
+pub const CALL_PARAMS_MAX_SIZE: usize = 512;
 
 /// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]