chore: upgrade to stable2409 (and stable2407) (#234)

Co-authored-by: Daanvdplas <[email protected]>
Co-authored-by: Daan van der Plas <[email protected]>

Author: chungquantin

Cargo.lock

@@ -53,6 +53,7 @@ std = [
 	"pallet-balances/std",
 	"pallet-contracts/std",
 	"pallet-timestamp/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",

Cargo.toml

@@ -101,6 +101,7 @@ impl pallet_contracts::Config for Test {
 	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
 	type MaxDelegateDependencies = MaxDelegateDependencies;
 	type MaxStorageKeyLen = ConstU32<128>;
+	type MaxTransientStorageSize = ConstU32<{ 1024 * 1024 }>;
 	type Migrations = ();
 	// crate::migration::codegen::BenchMigrations;
 	type Randomness = Test;

extension/Cargo.toml

@@ -70,8 +70,10 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
 	"paseo-runtime?/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
 	"pop-runtime-common/runtime-benchmarks",
 	"pop-runtime-devnet/runtime-benchmarks",
 	"pop-runtime-mainnet/runtime-benchmarks",
@@ -82,6 +84,8 @@ runtime-benchmarks = [
 std = [
 	"asset-hub-paseo-runtime?/std",
 	"asset-hub-westend-runtime?/std",
+	"asset-test-utils/std",
+	"codec/std",
 	"cumulus-primitives-core/std",
 	"frame-support/std",
 	"pallet-assets/std",
@@ -102,6 +106,7 @@ std = [
 	"sp-consensus-grandpa/std",
 	"sp-core/std",
 	"sp-runtime/std",
+	"tracing-subscriber/std",
 	"westend-runtime-constants?/std",
 	"westend-runtime?/std",
 	"xcm-executor/std",

extension/src/mock.rs

@@ -42,6 +42,7 @@ pub(crate) fn genesis() -> Storage {
 					)
 				})
 				.collect(),
+			..Default::default()
 		},
 		polkadot_xcm: PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),

integration-tests/Cargo.toml

@@ -38,5 +38,5 @@ decl_test_parachains! {
 impl_accounts_helpers_for_parachain!(AssetHub);
 impl_assert_events_helpers_for_parachain!(AssetHub);
 impl_assets_helpers_for_parachain!(AssetHub);
-impl_foreign_assets_helpers_for_parachain!(AssetHub, xcm::v3::Location);
+impl_foreign_assets_helpers_for_parachain!(AssetHub, xcm::v4::Location);
 impl_xcm_helpers_for_parachain!(AssetHub);

integration-tests/src/chains/asset_hub/genesis.rs

@@ -31,6 +31,7 @@ pub(crate) fn genesis() -> Storage {
 					)
 				})
 				.collect(),
+			..Default::default()
 		},
 		polkadot_xcm: runtime::PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),

integration-tests/src/chains/asset_hub/mod.rs

@@ -43,6 +43,7 @@ pub(crate) fn genesis() -> Storage {
 					)
 				})
 				.collect::<Vec<_>>(),
+			..Default::default()
 		},
 		babe: BabeConfig {
 			authorities: Default::default(),

integration-tests/src/chains/pop_network/genesis.rs

@@ -13,6 +13,7 @@ version = "0.2.0-alpha"
 [dependencies]
 clap.workspace = true
 codec.workspace = true
+docify.workspace = true
 futures.workspace = true
 jsonrpsee = { workspace = true, features = [ "server" ] }
 log.workspace = true
@@ -51,6 +52,7 @@ sp-block-builder.workspace = true
 sp-blockchain.workspace = true
 sp-consensus-aura.workspace = true
 sp-core.workspace = true
+sp-genesis-builder = { workspace = true, default-features = true }
 sp-io.workspace = true
 sp-keystore.workspace = true
 sp-offchain.workspace = true
@@ -92,6 +94,7 @@ substrate-build-script-utils.workspace = true
 pallet-multisig.workspace = true
 
 [features]
+default = [ "std" ]
 runtime-benchmarks = [
 	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-benchmarking-cli/runtime-benchmarks",
@@ -105,6 +108,32 @@ runtime-benchmarks = [
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
+std = [
+	"codec/std",
+	"cumulus-primitives-aura/std",
+	"cumulus-primitives-core/std",
+	"frame-benchmarking/std",
+	"ismp-parachain-runtime-api/std",
+	"ismp-parachain/std",
+	"log/std",
+	"pallet-ismp-runtime-api/std",
+	"pallet-multisig/std",
+	"polkadot-primitives/std",
+	"pop-runtime-common/std",
+	"pop-runtime-devnet/std",
+	"pop-runtime-mainnet/std",
+	"pop-runtime-testnet/std",
+	"sp-api/std",
+	"sp-block-builder/std",
+	"sp-consensus-aura/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-offchain/std",
+	"sp-runtime/std",
+	"sp-session/std",
+	"sp-transaction-pool/std",
+	"xcm/std",
+]
 try-runtime = [
 	"polkadot-cli/try-runtime",
 	"pop-runtime-devnet/try-runtime",

integration-tests/src/chains/relay/genesis.rs

@@ -1,4 +1,4 @@
-use std::{net::SocketAddr, path::PathBuf};
+use std::path::PathBuf;
 
 use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions;
 use cumulus_primitives_core::ParaId;
@@ -7,7 +7,7 @@ use log::info;
 use pop_runtime_common::Block;
 use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
-	NetworkParams, Result, SharedParams, SubstrateCli,
+	NetworkParams, Result, RpcEndpoint, SharedParams, SubstrateCli,
 };
 use sc_service::config::{BasePath, PrometheusConfig};
 use sp_runtime::traits::HashingFor;
@@ -348,7 +348,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();
 
@@ -470,7 +473,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)
 	}
 
@@ -482,15 +485,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");
 	}

node/Cargo.toml

@@ -10,7 +10,6 @@ use std::sync::Arc;
 use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
 use pop_runtime_common::{AccountId, Balance, Block, Nonce};
 use sc_client_api::{AuxStore, BlockBackend, ProofProvider};
-pub use sc_rpc::DenyUnsafe;
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
@@ -28,8 +27,6 @@ pub struct FullDeps<C, P, B> {
 	pub client: Arc<C>,
 	/// Transaction pool instance.
 	pub pool: Arc<P>,
-	/// Whether to deny unsafe calls
-	pub deny_unsafe: DenyUnsafe,
 	/// Backend used by the node.
 	pub backend: Arc<B>,
 }
@@ -57,9 +54,9 @@ where
 	B::State: sc_client_api::StateBackend<sp_runtime::traits::HashingFor<Block>>,
 {
 	let mut module = RpcExtension::new(());
-	let FullDeps { client, pool, deny_unsafe, backend: _ } = deps;
+	let FullDeps { client, pool, backend: _ } = deps;
 
-	module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?;
+	module.merge(System::new(client.clone(), pool).into_rpc())?;
 	module.merge(TransactionPayment::new(client.clone()).into_rpc())?;
 
 	Ok(module)
@@ -89,9 +86,9 @@ where
 	B::State: sc_client_api::StateBackend<sp_runtime::traits::HashingFor<Block>>,
 {
 	let mut module = RpcExtension::new(());
-	let FullDeps { client, pool, deny_unsafe, backend } = deps;
+	let FullDeps { client, pool, backend } = deps;
 
-	module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?;
+	module.merge(System::new(client.clone(), pool).into_rpc())?;
 	module.merge(TransactionPayment::new(client.clone()).into_rpc())?;
 
 	use pallet_ismp_rpc::{IsmpApiServer, IsmpRpcHandler};

node/src/command.rs

@@ -6,13 +6,15 @@ use std::{sync::Arc, time::Duration};
 use cumulus_client_cli::CollatorOptions;
 // Cumulus Imports
 use cumulus_client_collator::service::CollatorService;
+#[docify::export(lookahead_collator)]
 use cumulus_client_consensus_aura::collators::lookahead::{self as aura, Params as AuraParams};
 use cumulus_client_consensus_common::ParachainBlockImport as TParachainBlockImport;
 use cumulus_client_consensus_proposer::Proposer;
 use cumulus_client_service::{
 	build_network, build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks,
 	BuildNetworkParams, CollatorSybilResistance, DARecoveryProfile, StartRelayChainTasksParams,
 };
+#[docify::export(cumulus_primitives)]
 use cumulus_primitives_core::{
 	relay_chain::{CollatorPair, ValidationCode},
 	ParaId,
@@ -27,7 +29,6 @@ use sc_client_api::Backend;
 use sc_consensus::ImportQueue;
 use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};
 use sc_network::NetworkBlock;
-use sc_network_sync::SyncingService;
 use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
@@ -88,15 +89,16 @@ where
 		.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) =
@@ -169,7 +171,6 @@ where
 		&TaskManager,
 		Arc<dyn RelayChainInterface>,
 		Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>,
-		Arc<SyncingService<Block>>,
 		KeystorePtr,
 		Duration,
 		ParaId,
@@ -182,11 +183,13 @@ where
 
 	let params = new_partial::<RuntimeApi>(&parachain_config)?;
 	let (block_import, mut telemetry, telemetry_worker_handle) = params.other;
+
+	let prometheus_registry = parachain_config.prometheus_registry().cloned();
 	let net_config = sc_network::config::FullNetworkConfiguration::<
 		_,
 		_,
 		sc_network::NetworkWorker<Block, Hash>,
-	>::new(&parachain_config.network);
+	>::new(&parachain_config.network, prometheus_registry.clone());
 
 	let client = params.client.clone();
 	let backend = params.backend.clone();
@@ -204,7 +207,6 @@ where
 	.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
 
 	let validator = parachain_config.role.is_authority();
-	let prometheus_registry = parachain_config.prometheus_registry().cloned();
 	let transaction_pool = params.transaction_pool.clone();
 	let import_queue_service = params.import_queue.service();
 
@@ -250,12 +252,11 @@ where
 		let backend = backend.clone();
 		let transaction_pool = transaction_pool.clone();
 
-		Box::new(move |deny_unsafe, _| {
+		Box::new(move |_| {
 			let deps = crate::rpc::FullDeps {
 				client: client.clone(),
 				pool: transaction_pool.clone(),
 				backend: backend.clone(),
-				deny_unsafe,
 			};
 
 			crate::rpc::create_full(deps).map_err(Into::into)
@@ -282,7 +283,7 @@ where
 		// 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.
-		if SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench).is_err() && validator {
+		if SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench, false).is_err() && validator {
 			log::warn!(
 				"⚠️  The hardware does not meet the minimal requirements for role 'Authority'."
 			);
@@ -336,7 +337,6 @@ where
 			&task_manager,
 			relay_chain_interface,
 			transaction_pool,
-			sync_service,
 			params.keystore_container.keystore(),
 			relay_chain_slot_duration,
 			para_id,
@@ -393,7 +393,6 @@ fn start_consensus<RuntimeApi>(
 	task_manager: &TaskManager,
 	relay_chain_interface: Arc<dyn RelayChainInterface>,
 	transaction_pool: Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>,
-	sync_oracle: Arc<SyncingService<Block>>,
 	keystore: KeystorePtr,
 	relay_chain_slot_duration: Duration,
 	para_id: ParaId,
@@ -455,7 +454,6 @@ where
 		code_hash_provider: move |block_hash| {
 			client.code_at(block_hash).ok().map(|c| ValidationCode::from(c).hash())
 		},
-		sync_oracle,
 		keystore,
 		collator_key,
 		para_id,
@@ -467,10 +465,9 @@ where
 		reinitialize: false,
 	};
 
-	let fut =
-		aura::run::<Block, sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _, _, _, _>(
-			params,
-		);
+	let fut = aura::run::<Block, sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _, _, _>(
+		params,
+	);
 	task_manager.spawn_essential_handle().spawn("aura", None, fut);
 
 	Ok(())

node/src/rpc.rs

@@ -45,6 +45,7 @@ std = [
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-assets/std",
 	"pallet-balances/std",
 	"pop-chain-extension/std",

node/src/service.rs

@@ -2,7 +2,7 @@ use codec::Encode;
 use frame_support::{
 	assert_noop, assert_ok,
 	dispatch::WithPostDispatchInfo,
-	sp_runtime::{traits::Zero, DispatchError::BadOrigin},
+	sp_runtime::{traits::Zero, DispatchError::BadOrigin, TokenError},
 	traits::fungibles::{
 		approvals::Inspect as ApprovalInspect, metadata::Inspect as MetadataInspect, Inspect,
 	},
@@ -341,7 +341,7 @@ fn start_destroy_works() {
 		// Check that the token is not live after starting the destroy process.
 		assert_noop!(
 			Assets::mint(signed(ALICE), token, ALICE, 10 * UNIT),
-			AssetsError::AssetNotLive
+			TokenError::UnknownAsset
 		);
 	});
 }

pallets/api/Cargo.toml

@@ -8,7 +8,7 @@ version = "0.0.0"
 [dependencies]
 ink = { version = "5.1.0", default-features = false }
 pop-primitives = { path = "../primitives", default-features = false }
-sp-io = { version = "37.0.0", default-features = false, features = [
+sp-io = { version = "38.0.0", default-features = false, features = [
 	"disable_allocator",
 	"disable_oom",
 	"disable_panic_handler",