Update SDK to stable 2409 with Rust 1.81 and EVM enhancements (#976)

* wip * wip * cargo check works * wip fix clippy * wip fix clippy * missing pallet_evm impl * main merge * update metadata file * set GasLimitStorageGrowthRatio * fix metadata golden * fix tests * Going back to rust version 1.79 to avoid clippy errors * Go back to Rust 1.81 and solve clippy warnings * remove TODO * Update comment * fmt * Add TODO comment * Update BLOCK_STORAGE_LIMIT * Removing unused constant * Set LimitStorageGrowthRatio to 91 - Equivalent: 160 KB per block --------- Co-authored-by: magecnion <[email protected]> Co-authored-by: Alessandro Siniscalchi <[email protected]>
freeverseio · Feb 4, 2025 · 8e6555d · 8e6555d
1 parent 93a2bfb
commit 8e6555d
Show file tree

Hide file tree

Showing 30 changed files with 1,309 additions and 1,255 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/node/src/chain_spec/laos.rs b/node/src/chain_spec/laos.rs
@@ -93,6 +93,7 @@ fn create_test_genesis_config() -> serde_json::Value {
 				predefined_accounts::ALITH.into(),
 				template_session_keys(get_collator_keys_from_seed("Alice")),
 			)],
+			..Default::default()
 		},
 		polkadot_xcm: laos_runtime::PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with LAOS.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::net::SocketAddr;
-
 use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions;
 use cumulus_primitives_core::ParaId;
 use fc_db::kv::frontier_database_dir;
@@ -24,7 +22,7 @@ use laos_runtime::Block;
 use log::info;
 use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
-	NetworkParams, Result, SharedParams, SubstrateCli,
+	NetworkParams, Result, RpcEndpoint, SharedParams, SubstrateCli,
 };
 use sc_service::{
 	config::{BasePath, PrometheusConfig},
@@ -315,7 +313,10 @@ pub fn run() -> Result<()> {
 				let hwbench = (!cli.no_hardware_benchmarks)
 					.then_some(config.database.path().map(|database_path| {
 						let _ = std::fs::create_dir_all(database_path);
-						sc_sysinfo::gather_hwbench(Some(database_path))
+						sc_sysinfo::gather_hwbench(
+							Some(database_path),
+							&SUBSTRATE_REFERENCE_HARDWARE,
+						)
 					}))
 					.flatten();
 
@@ -398,7 +399,7 @@ impl CliConfiguration<Self> for RelayChainCli {
 			.or_else(|| self.base_path.clone().map(Into::into)))
 	}
 
-	fn rpc_addr(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {
+	fn rpc_addr(&self, default_listen_port: u16) -> Result<Option<Vec<RpcEndpoint>>> {
 		self.base.base.rpc_addr(default_listen_port)
 	}
 
@@ -410,15 +411,9 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.prometheus_config(default_listen_port, chain_spec)
 	}
 
-	fn init<F>(
-		&self,
-		_support_url: &String,
-		_impl_version: &String,
-		_logger_hook: F,
-		_config: &sc_service::Configuration,
-	) -> Result<()>
+	fn init<F>(&self, _support_url: &String, _impl_version: &String, _logger_hook: F) -> Result<()>
 	where
-		F: FnOnce(&mut sc_cli::LoggerBuilder, &sc_service::Configuration),
+		F: FnOnce(&mut sc_cli::LoggerBuilder),
 	{
 		unreachable!("PolkadotCli is never initialized; qed");
 	}

diff --git a/node/src/rpc/mod.rs b/node/src/rpc/mod.rs
@@ -30,7 +30,7 @@ use sc_client_api::{
 	client::BlockchainEvents,
 	UsageProvider,
 };
-pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
+pub use sc_rpc::SubscriptionTaskExecutor;
 use sc_transaction_pool::ChainApi;
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::{CallApiAt, ProvideRuntimeApi};
@@ -51,8 +51,6 @@ pub struct FullDeps<C, P, A: ChainApi, CT, CIDP> {
 	pub client: Arc<C>,
 	/// Transaction pool instance.
 	pub pool: Arc<P>,
-	/// Whether to deny unsafe calls
-	pub deny_unsafe: DenyUnsafe,
 	/// Ethereum-compatibility specific dependencies.
 	pub eth: EthDeps<C, P, A, CT, Block, CIDP>,
 }
@@ -105,9 +103,9 @@ where
 	use substrate_frame_rpc_system::System;
 
 	let mut io = RpcExtension::new(());
-	let FullDeps { client, pool, deny_unsafe, eth } = deps;
+	let FullDeps { client, pool, eth } = deps;
 
-	io.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?;
+	io.merge(System::new(client.clone(), pool).into_rpc())?;
 	io.merge(TransactionPayment::new(client).into_rpc())?;
 
 	// Ethereum compatibility RPCs

diff --git a/node/src/service.rs b/node/src/service.rs
@@ -120,14 +120,15 @@ pub fn new_partial(
 		.transpose()?;
 
 	let heap_pages = config
+		.executor
 		.default_heap_pages
 		.map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { extra_pages: h as _ });
 	let executor = ParachainExecutor::builder()
-		.with_execution_method(config.wasm_method)
+		.with_execution_method(config.executor.wasm_method)
 		.with_onchain_heap_alloc_strategy(heap_pages)
 		.with_offchain_heap_alloc_strategy(heap_pages)
-		.with_max_runtime_instances(config.max_runtime_instances)
-		.with_runtime_cache_size(config.runtime_cache_size)
+		.with_max_runtime_instances(config.executor.max_runtime_instances)
+		.with_runtime_cache_size(config.executor.runtime_cache_size)
 		.build();
 
 	let (client, backend, keystore_container, task_manager) =
@@ -256,11 +257,13 @@ async fn start_node_impl(
 
 	let validator = parachain_config.role.is_authority();
 	let prometheus_registry = parachain_config.prometheus_registry().cloned();
+	let maybe_registry = parachain_config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
 	let import_queue_service = import_queue.service();
-	let net_config =
-		sc_network::config::FullNetworkConfiguration::<_, _, sc_network::NetworkWorker<_, _>>::new(
-			&parachain_config.network,
-		);
+	let net_config = sc_network::config::FullNetworkConfiguration::<
+		_,
+		_,
+		sc_network::NetworkWorker<_, _>,
+	>::new(&parachain_config.network, maybe_registry.cloned());
 
 	let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
 		build_network(BuildNetworkParams {
@@ -308,7 +311,7 @@ async fn start_node_impl(
 	let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks);
 
 	// for ethereum-compatibility rpc.
-	parachain_config.rpc_id_provider = Some(Box::new(fc_rpc::EthereumSubIdProvider));
+	parachain_config.rpc.id_provider = Some(Box::new(fc_rpc::EthereumSubIdProvider));
 
 	let eth_rpc_params = crate::rpc::EthDeps {
 		client: client.clone(),
@@ -377,11 +380,10 @@ async fn start_node_impl(
 		let transaction_pool = transaction_pool.clone();
 		let pubsub_notification_sinks = pubsub_notification_sinks.clone();
 
-		Box::new(move |deny_unsafe, subscription_task_executor| {
+		Box::new(move |subscription_task_executor| {
 			let deps = crate::rpc::FullDeps {
 				client: client.clone(),
 				pool: transaction_pool.clone(),
-				deny_unsafe,
 				eth: eth_rpc_params.clone(),
 			};
 
@@ -428,7 +430,7 @@ async fn start_node_impl(
 		// Here you can check whether the hardware meets your chains' requirements. Putting a link
 		// in there and swapping out the requirements for your own are probably a good idea. The
 		// requirements for a para-chain are dictated by its relay-chain.
-		match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) {
+		match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench, validator) {
 			Err(err) if validator => {
 				log::warn!(
 				"⚠️  The hardware does not meet the minimal requirements {} for role 'Authority'.",

diff --git a/pallets/asset-metadata-extender/src/lib.rs b/pallets/asset-metadata-extender/src/lib.rs
@@ -15,6 +15,11 @@
 // along with LAOS.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+// TODO: This line is needed cause from frontier2409 and rust 1.81 onwards, manual inspect clippy
+// flag is giving a false positive in all our pallets. From this issue: https://github.com/rust-lang/rust-clippy/issues/13185
+// it seems that the flag --manual-inspect may not be 100% ready yet, as it's giving problems to
+// different codes. Maybe we can remove this attribute in the future
+#![allow(clippy::manual_inspect)]
 
 mod benchmarking;
 pub mod precompiles;

diff --git a/pallets/asset-metadata-extender/src/precompiles/asset_metadata_extender/mock.rs b/pallets/asset-metadata-extender/src/precompiles/asset_metadata_extender/mock.rs
@@ -113,9 +113,10 @@ impl pallet_evm::Config for Test {
 	type OnCreate = ();
 	type FindAuthor = FindAuthorTruncated;
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
-	type SuicideQuickClearLimit = ();
+	type AccountProvider = pallet_evm::FrameSystemAccountProvider<Test>;
 }
 
 pub const BLOCK_GAS_LIMIT: u64 = 15_000_000;
@@ -131,6 +132,7 @@ pub type LaosPrecompiles<Test> = PrecompileSetBuilder<
 frame_support::parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
 	pub const GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(MAX_POV_SIZE);
+	pub const GasLimitStorageGrowthRatio: u64 = 91;
 	/// 1 weight to 1 gas, for testing purposes
 	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1, 0);
 	pub PrecompilesInstance: LaosPrecompiles<Test> = LaosPrecompiles::new();

diff --git a/pallets/laos-evolution/src/lib.rs b/pallets/laos-evolution/src/lib.rs
@@ -15,6 +15,11 @@
 // along with LAOS.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+// TODO: This line is needed cause from frontier2409 and rust 1.81 onwards, manual inspect clippy
+// flag is giving a false positive in all our pallets. From this issue: https://github.com/rust-lang/rust-clippy/issues/13185
+// it seems that the flag --manual-inspect may not be 100% ready yet, as it's giving problems to
+// different codes. Maybe we can remove this attribute in the future
+#![allow(clippy::manual_inspect)]
 
 use frame_support::ensure;
 pub use pallet::*;

diff --git a/pallets/laos-evolution/src/precompiles/evolution_collection/mock.rs b/pallets/laos-evolution/src/precompiles/evolution_collection/mock.rs
@@ -138,6 +138,7 @@ pub type LaosPrecompiles<Test> = PrecompileSetBuilder<
 frame_support::parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
 	pub const GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(MAX_POV_SIZE);
+	pub const GasLimitStorageGrowthRatio: u64 = 91;
 	/// 1 weight to 1 gas, for testing purposes
 	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1, 0);
 	pub PrecompilesInstance:  LaosPrecompiles<Test> = LaosPrecompiles::<_>::new();
@@ -162,9 +163,10 @@ impl pallet_evm::Config for Test {
 	type OnCreate = ();
 	type FindAuthor = FindAuthorTruncated;
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
-	type SuicideQuickClearLimit = ();
+	type AccountProvider = pallet_evm::FrameSystemAccountProvider<Test>;
 }
 
 /// New Test Ext

diff --git a/pallets/laos-evolution/src/precompiles/evolution_collection_factory/mock.rs b/pallets/laos-evolution/src/precompiles/evolution_collection_factory/mock.rs
@@ -135,6 +135,7 @@ pub type LaosPrecompiles<Test> = PrecompileSetBuilder<
 frame_support::parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
 	pub const GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(MAX_POV_SIZE);
+	pub const GasLimitStorageGrowthRatio: u64 = 91;
 	/// 1 weight to 1 gas, for testing purposes
 	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1, 0);
 	pub PrecompilesInstance: LaosPrecompiles<Test> = LaosPrecompiles::new();
@@ -159,9 +160,10 @@ impl pallet_evm::Config for Test {
 	type OnCreate = ();
 	type FindAuthor = FindAuthorTruncated;
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
-	type SuicideQuickClearLimit = ();
+	type AccountProvider = pallet_evm::FrameSystemAccountProvider<Test>;
 }
 
 /// New Test Ext

diff --git a/pallets/parachain-staking/src/lib.rs b/pallets/parachain-staking/src/lib.rs
@@ -47,6 +47,11 @@
 //! To leave the set of delegators and revoke all delegations, call `leave_delegators`.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+// TODO: This line is needed cause from frontier2409 and rust 1.81 onwards, manual inspect clippy
+// flag is giving a false positive in all our pallets. From this issue: https://github.com/rust-lang/rust-clippy/issues/13185
+// it seems that the flag --manual-inspect may not be 100% ready yet, as it's giving problems to
+// different codes. Maybe we can remove this attribute in the future
+#![allow(clippy::manual_inspect)]
 
 mod auto_compound;
 mod delegation_requests;

diff --git a/pallets/parachain-staking/src/mock.rs b/pallets/parachain-staking/src/mock.rs
@@ -316,7 +316,7 @@ pub(crate) fn set_block_author(acc: u64) {
 
 /// fn to query the lock amount
 pub(crate) fn query_lock_amount(account_id: u64, id: LockIdentifier) -> Option<Balance> {
-	for lock in Balances::locks(account_id) {
+	for lock in Balances::locks(&account_id) {
 		if lock.id == id {
 			return Some(lock.amount);
 		}

diff --git a/pallets/parachain-staking/src/tests.rs b/pallets/parachain-staking/src/tests.rs
@@ -3948,8 +3948,8 @@ fn multiple_delegations() {
 			assert_eq!(ParachainStaking::delegator_state(7).unwrap().delegations.0.len(), 2usize);
 			assert_eq!(ParachainStaking::delegator_state(6).unwrap().total(), 40);
 			assert_eq!(ParachainStaking::delegator_state(6).unwrap().delegations.0.len(), 4usize);
-			assert_eq!(Balances::locks(6)[0].amount, 40);
-			assert_eq!(Balances::locks(7)[0].amount, 90);
+			assert_eq!(Balances::locks(&6)[0].amount, 40);
+			assert_eq!(Balances::locks(&7)[0].amount, 90);
 			assert_eq!(ParachainStaking::get_delegator_stakable_free_balance(&6), 60);
 			assert_eq!(ParachainStaking::get_delegator_stakable_free_balance(&7), 10);
 			roll_to_round_begin(8);

diff --git a/pallets/precompiles-benchmark/src/lib.rs b/pallets/precompiles-benchmark/src/lib.rs
@@ -15,6 +15,12 @@
 // along with LAOS.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+// TODO: This line is needed cause from frontier2409 and rust 1.81 onwards, manual inspect clippy
+// flag is giving a false positive in all our pallets. From this issue: https://github.com/rust-lang/rust-clippy/issues/13185
+// it seems that the flag --manual-inspect may not be 100% ready yet, as it's giving problems to
+// different codes. Maybe we can remove this attribute in the future
+#![allow(clippy::manual_inspect)]
+
 use sp_core::H160;
 use sp_runtime::traits::{Convert, ConvertBack};
 

diff --git a/pallets/precompiles-benchmark/src/precompiles/vesting/benchmarking.rs b/pallets/precompiles-benchmark/src/precompiles/vesting/benchmarking.rs
@@ -123,6 +123,13 @@ type BalanceOf<Runtime> = <<Runtime as pallet_vesting::Config>::Currency as Curr
 	<Runtime as frame_system::Config>::AccountId,
 >>::Balance;
 
+// The benchmarks macro will add <T:Config> to all benchmark functions and as we specify a where
+// clause, that'll be added to. This triggers the clippy::multiple_bound_locations warning designed
+// to don't confuse developers by repeating trait bound locations. As this will be macro generated
+// code that nobody will see, it's ok to annotate the module with it.
+// TODO: When this PR: https://github.com/paritytech/polkadot-sdk/pull/7418 becomes stable,
+// we will be able to remove this annotation.
+#[allow(clippy::multiple_bound_locations)]
 #[benchmarks(
 	where
 		T: Config + pallet_vesting::Config,

diff --git a/pallets/precompiles-benchmark/src/precompiles/vesting/mock.rs b/pallets/precompiles-benchmark/src/precompiles/vesting/mock.rs
@@ -133,6 +133,7 @@ pub type LaosPrecompiles<Test> =
 frame_support::parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
 	pub const GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(MAX_POV_SIZE);
+	pub const GasLimitStorageGrowthRatio: u64 = 91;
 	/// 1 weight to 1 gas, for testing purposes
 	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1, 0);
 	pub PrecompilesInstance: LaosPrecompiles<Test> = LaosPrecompiles::new();
@@ -157,9 +158,10 @@ impl pallet_evm::Config for Test {
 	type OnCreate = ();
 	type FindAuthor = FindAuthorTruncated;
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
-	type SuicideQuickClearLimit = ();
+	type AccountProvider = pallet_evm::FrameSystemAccountProvider<Test>;
 }
 
 #[derive(Default)]

diff --git a/pallets/treasury-funding/src/benchmarking.rs b/pallets/treasury-funding/src/benchmarking.rs
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with LAOS.  If not, see <http://www.gnu.org/licenses/>.
 //! Benchmarking setup for pallet-treasury-funding
-#![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
 use frame_benchmarking::v2::*;

diff --git a/pallets/treasury-funding/src/lib.rs b/pallets/treasury-funding/src/lib.rs
@@ -33,6 +33,11 @@
 //! - `fund_treasury`: Vest all funds of the vault account and transfer them to the treasury.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+// TODO: This line is needed cause from frontier2409 and rust 1.81 onwards, manual inspect clippy
+// flag is giving a false positive in all our pallets. From this issue: https://github.com/rust-lang/rust-clippy/issues/13185
+// it seems that the flag --manual-inspect may not be 100% ready yet, as it's giving problems to
+// different codes. Maybe we can remove this attribute in the future
+#![allow(clippy::manual_inspect)]
 
 pub use pallet::*;
 

diff --git a/precompiles/parachain-staking/Cargo.toml b/precompiles/parachain-staking/Cargo.toml
@@ -32,7 +32,7 @@ derive_more = { workspace = true }
 serde = { workspace = true }
 sha3 = { workspace = true }
 
-# Moonbeam
+# Frontier
 precompile-utils = { workspace = true, features = [ "std", "testing" ] }
 
 # Substrate