Update to polkadot-sdk stable2506

Makefile

@@ -21,10 +21,10 @@ fmt:
 .PHONY: clippy clippy-release
 # Run rust clippy with debug profile
 clippy:
-	cargo clippy --all --all-targets --features=runtime-benchmarks,try-runtime -- -D warnings
+	SKIP_WASM_BUILD=1 cargo clippy --all --all-targets --features=runtime-benchmarks,try-runtime -- -D warnings
 # Run rust clippy with release profile
 clippy-release:
-	cargo clippy --release --all --all-targets --features=runtime-benchmarks,try-runtime -- -D warnings
+	SKIP_WASM_BUILD=1 cargo clippy --release --all --all-targets --features=runtime-benchmarks,try-runtime -- -D warnings
 
 .PHONY: check check-release
 # Check code with debug profile

client/cli/src/frontier_db_cmd/mapping_db.rs

@@ -176,4 +176,4 @@ where
 	}
 }
 
-impl<'a, B: BlockT, C: HeaderBackend<B>> FrontierDbMessage for MappingDb<'a, B, C> {}
+impl<B: BlockT, C: HeaderBackend<B>> FrontierDbMessage for MappingDb<'_, B, C> {}

client/cli/src/frontier_db_cmd/meta_db.rs

@@ -152,4 +152,4 @@ impl<'a, B: BlockT, C: HeaderBackend<B>> MetaDb<'a, B, C> {
 	}
 }
 
-impl<'a, B: BlockT, C: HeaderBackend<B>> FrontierDbMessage for MetaDb<'a, B, C> {}
+impl<B: BlockT, C: HeaderBackend<B>> FrontierDbMessage for MetaDb<'_, B, C> {}

client/cli/src/frontier_db_cmd/tests.rs

@@ -127,7 +127,7 @@ fn schema_create_success_if_value_is_empty() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	assert_eq!(backend.meta().ethereum_schema(), Ok(None));
@@ -158,7 +158,7 @@ fn schema_create_fails_if_value_is_not_empty() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	let data_before = vec![(EthereumStorageSchema::V2, H256::default())];
@@ -189,7 +189,7 @@ fn schema_read_works() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	assert_eq!(backend.meta().ethereum_schema(), Ok(None));
@@ -221,7 +221,7 @@ fn schema_update_works() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	assert_eq!(backend.meta().ethereum_schema(), Ok(None));
@@ -248,7 +248,7 @@ fn schema_delete_works() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	let data = vec![(EthereumStorageSchema::V2, H256::default())];
@@ -279,7 +279,7 @@ fn tips_create_success_if_value_is_empty() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	assert_eq!(backend.meta().current_syncing_tips(), Ok(vec![]));
@@ -308,7 +308,7 @@ fn tips_create_fails_if_value_is_not_empty() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	let data_before = vec![H256::default()];
@@ -338,7 +338,7 @@ fn tips_read_works() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	assert_eq!(backend.meta().current_syncing_tips(), Ok(vec![]));
@@ -369,7 +369,7 @@ fn tips_update_works() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	assert_eq!(backend.meta().current_syncing_tips(), Ok(vec![]));
@@ -396,7 +396,7 @@ fn tips_delete_works() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	let data = vec![H256::default()];
@@ -427,7 +427,7 @@ fn non_existent_meta_static_keys_are_no_op() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 	let client = client;
 
@@ -501,7 +501,7 @@ fn not_deserializable_input_value_is_no_op() {
 	let (client, _) = TestClientBuilder::new().build_with_native_executor::<RuntimeApi, _>(None);
 	let client = Arc::new(client);
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 	let client = client;
 
@@ -563,7 +563,7 @@ fn commitment_create() {
 	let test_value_path = test_json_file(&tmp, &TestValue::Commitment(block_hash));
 
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	// Run the command using some ethereum block hash as key.
@@ -649,7 +649,7 @@ fn commitment_update() {
 	let test_value_path = test_json_file(&tmp, &TestValue::Commitment(block_a1_hash));
 
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	// Run the command using some ethereum block hash as key.
@@ -774,7 +774,7 @@ fn mapping_read_works() {
 	let test_value_path = test_json_file(&tmp, &TestValue::Commitment(block_hash));
 
 	// Create a temporary frontier secondary DB.
-	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+	let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 		.expect("a temporary db was created");
 
 	// Create command using some ethereum block hash as key.

client/rpc-core/src/types/block_count.rs

@@ -74,7 +74,7 @@ impl From<BlockCount> for u64 {
 	}
 }
 
-impl<'a> Visitor<'a> for BlockCountVisitor {
+impl Visitor<'_> for BlockCountVisitor {
 	type Value = BlockCount;
 
 	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

client/rpc-core/src/types/bytes.rs

@@ -75,7 +75,7 @@ impl<'a> Deserialize<'a> for Bytes {
 
 struct BytesVisitor;
 
-impl<'a> Visitor<'a> for BytesVisitor {
+impl Visitor<'_> for BytesVisitor {
 	type Value = Bytes;
 
 	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

client/rpc-core/src/types/index.rs

@@ -45,7 +45,7 @@ impl<'a> Deserialize<'a> for Index {
 
 struct IndexVisitor;
 
-impl<'a> Visitor<'a> for IndexVisitor {
+impl Visitor<'_> for IndexVisitor {
 	type Value = Index;
 
 	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

client/rpc-v2/types/src/index.rs

@@ -63,7 +63,7 @@ impl<'de> serde::Deserialize<'de> for Index {
 
 		struct IndexVisitor;
 
-		impl<'de> de::Visitor<'de> for IndexVisitor {
+		impl de::Visitor<'_> for IndexVisitor {
 			type Value = Index;
 
 			fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

client/rpc-v2/types/src/txpool.rs

@@ -77,7 +77,7 @@ impl<'de> serde::Deserialize<'de> for Summary {
 		D: serde::Deserializer<'de>,
 	{
 		struct SummaryVisitor;
-		impl<'de> de::Visitor<'de> for SummaryVisitor {
+		impl de::Visitor<'_> for SummaryVisitor {
 			type Value = Summary;
 
 			fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {

client/rpc/Cargo.toml

@@ -17,7 +17,7 @@ evm = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
-libsecp256k1 = { workspace = true }
+libsecp256k1 = { workspace = true, features = ["static-context", "hmac"] }
 log = { workspace = true }
 prometheus = { version = "0.13.4", default-features = false }
 rand = "0.9"

client/rpc/src/eth/transaction.rs

@@ -335,7 +335,7 @@ where
 					}
 				};
 
-				return Ok(Some(Receipt {
+				Ok(Some(Receipt {
 					transaction_hash: Some(status.transaction_hash),
 					transaction_index: Some(status.transaction_index.into()),
 					block_hash: Some(block_hash),
@@ -389,7 +389,7 @@ where
 						ethereum::ReceiptV4::EIP1559(_) => U256::from(2),
 						ethereum::ReceiptV4::EIP7702(_) => U256::from(4),
 					},
-				}));
+				}))
 			}
 			_ => Ok(None),
 		}

client/rpc/src/lib.rs

@@ -398,7 +398,7 @@ mod tests {
 		let client = Arc::new(client);
 
 		// Create a temporary frontier secondary DB.
-		let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.into_path())
+		let backend = open_frontier_backend::<OpaqueBlock, _>(client.clone(), tmp.keep())
 			.expect("a temporary db was created");
 
 		// A random ethereum block hash to use

client/storage/src/overrides/schema.rs

@@ -89,7 +89,7 @@ pub mod v1 {
 		}
 	}
 
-	impl<'a, B, C, BE> StorageOverride<B> for SchemaStorageOverrideRef<'a, B, C, BE>
+	impl<B, C, BE> StorageOverride<B> for SchemaStorageOverrideRef<'_, B, C, BE>
 	where
 		B: BlockT,
 		C: StorageProvider<B, BE> + Send + Sync,
@@ -203,7 +203,7 @@ pub mod v2 {
 		}
 	}
 
-	impl<'a, B, C, BE> StorageOverride<B> for SchemaStorageOverrideRef<'a, B, C, BE>
+	impl<B, C, BE> StorageOverride<B> for SchemaStorageOverrideRef<'_, B, C, BE>
 	where
 		B: BlockT,
 		C: StorageProvider<B, BE> + Send + Sync,
@@ -315,7 +315,7 @@ pub mod v3 {
 		}
 	}
 
-	impl<'a, B, C, BE> StorageOverride<B> for SchemaStorageOverrideRef<'a, B, C, BE>
+	impl<B, C, BE> StorageOverride<B> for SchemaStorageOverrideRef<'_, B, C, BE>
 	where
 		B: BlockT,
 		C: StorageProvider<B, BE> + Send + Sync,

frame/base-fee/src/lib.rs

@@ -50,7 +50,6 @@ pub mod pallet {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		/// Lower and upper bounds for increasing / decreasing `BaseFeePerGas`.
 		type Threshold: BaseFeeThreshold;
 		type DefaultBaseFeePerGas: Get<U256>;

frame/base-fee/src/tests.rs

@@ -84,7 +84,6 @@ impl BaseFeeThresholdT for BaseFeeThreshold {
 }
 
 impl Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type Threshold = BaseFeeThreshold;
 	type DefaultBaseFeePerGas = DefaultBaseFeePerGas;
 	type DefaultElasticity = DefaultElasticity;

frame/ethereum/src/lib.rs

@@ -199,9 +199,6 @@ pub mod pallet {
 
 	#[pallet::config(with_default)]
 	pub trait Config: frame_system::Config + pallet_evm::Config {
-		/// The overarching event type.
-		#[pallet::no_default_bounds]
-		type RuntimeEvent: From<Event> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		/// How Ethereum state root is calculated.
 		type StateRoot: Get<H256>;
 		/// What's included in the PostLog.
@@ -228,8 +225,6 @@ pub mod pallet {
 
 		#[register_default_impl(TestDefaultConfig)]
 		impl DefaultConfig for TestDefaultConfig {
-			#[inject_runtime_type]
-			type RuntimeEvent = ();
 			type StateRoot = IntermediateStateRoot<Self::Version>;
 			type PostLogContent = PostBlockAndTxnHashes;
 			type ExtraDataLength = ConstU32<30>;

frame/evm-polkavm/src/vm/runtime.rs

@@ -335,7 +335,7 @@ pub struct Runtime<'a, T, H, M: ?Sized> {
 	_phantom_data: PhantomData<(T, M)>,
 }
 
-impl<'a, T: Config, H: PrecompileHandle, M: PolkaVmInstance> Runtime<'a, T, H, M> {
+impl<T: Config, H: PrecompileHandle, M: PolkaVmInstance> Runtime<'_, T, H, M> {
 	pub fn handle_interrupt(
 		&mut self,
 		interrupt: Result<polkavm::InterruptKind, polkavm::Error>,

frame/evm/precompile/dispatch/src/mock.rs

@@ -148,7 +148,6 @@ impl pallet_evm::Config for Test {
 	type AddressMapping = IdentityAddressMapping;
 	type Currency = Balances;
 
-	type RuntimeEvent = RuntimeEvent;
 	type PrecompilesType = ();
 	type PrecompilesValue = ();
 	type ChainId = ();

frame/evm/src/lib.rs

@@ -168,10 +168,6 @@ pub mod pallet {
 		#[pallet::no_default]
 		type Currency: Currency<AccountIdOf<Self>> + Inspect<AccountIdOf<Self>>;
 
-		/// The overarching event type.
-		#[pallet::no_default_bounds]
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// Precompiles associated with this EVM engine.
 		type PrecompilesType: PrecompileSet;
 		type PrecompilesValue: Get<Self::PrecompilesType>;
@@ -252,8 +248,6 @@ pub mod pallet {
 			type FeeCalculator = FixedGasPrice;
 			type GasWeightMapping = FixedGasWeightMapping<Self>;
 			type WeightPerGas = WeightPerGas;
-			#[inject_runtime_type]
-			type RuntimeEvent = ();
 			type PrecompilesType = ();
 			type PrecompilesValue = ();
 			type ChainId = ChainId;

frame/evm/src/runner/stack.rs

@@ -966,7 +966,7 @@ impl<'vicinity, 'config, T: Config> SubstrateStackState<'vicinity, 'config, T> {
 	}
 }
 
-impl<'vicinity, 'config, T: Config> BackendT for SubstrateStackState<'vicinity, 'config, T>
+impl<T: Config> BackendT for SubstrateStackState<'_, '_, T>
 where
 	BalanceOf<T>: TryFrom<U256> + Into<U256>,
 {
@@ -1058,8 +1058,7 @@ where
 	}
 }
 
-impl<'vicinity, 'config, T: Config> StackStateT<'config>
-	for SubstrateStackState<'vicinity, 'config, T>
+impl<'config, T: Config> StackStateT<'config> for SubstrateStackState<'_, 'config, T>
 where
 	BalanceOf<T>: TryFrom<U256> + Into<U256>,
 {

precompiles/macro/src/precompile/attr.rs

@@ -29,7 +29,7 @@ where
 		attr.path()
 			.segments
 			.first()
-			.map_or(false, |segment| segment.ident == "precompile")
+			.is_some_and(|segment| segment.ident == "precompile")
 	};
 
 	while let Some(index) = attributes.iter().position(pred) {

precompiles/src/precompile_set.rs

@@ -409,7 +409,7 @@ pub struct RestrictiveHandle<'a, H> {
 	allow_subcalls: bool,
 }
 
-impl<'a, H: PrecompileHandle> PrecompileHandle for RestrictiveHandle<'a, H> {
+impl<H: PrecompileHandle> PrecompileHandle for RestrictiveHandle<'_, H> {
 	fn call(
 		&mut self,
 		address: H160,

precompiles/tests-external/Cargo.toml

@@ -25,3 +25,7 @@ pallet-timestamp = { workspace = true }
 fp-evm = { workspace = true }
 pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] }
 precompile-utils = { workspace = true, features = ["testing"] }
+
+[features]
+default = ["std"]
+std = []

precompiles/tests-external/lib.rs

@@ -256,7 +256,6 @@ impl pallet_evm::Config for Runtime {
 	type WithdrawOrigin = EnsureAddressNever<AccountId>;
 	type AddressMapping = AccountId;
 	type Currency = Balances;
-	type RuntimeEvent = RuntimeEvent;
 	type PrecompilesType = Precompiles<Runtime>;
 	type PrecompilesValue = PrecompilesValue;
 	type ChainId = ();