chore: Update dependencies to stable2503

bin/utils/tanssi-utils/Cargo.toml

@@ -23,5 +23,5 @@ hex = { workspace = true }
 pallet-external-validators-rewards = { workspace = true, features = [ "std" ] }
 serde = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-snowbridge-outbound-queue-merkle-tree = { workspace = true }
+snowbridge-merkle-tree = { workspace = true }
 sp-runtime = { workspace = true, features = [ "std" ] }

bin/utils/tanssi-utils/src/main.rs

@@ -17,7 +17,7 @@
 use {
     clap::{Parser, Subcommand},
     serde::{Deserialize, Deserializer},
-    snowbridge_outbound_queue_merkle_tree::merkle_proof,
+    snowbridge_merkle_tree::merkle_proof,
     sp_runtime::{traits::Keccak256, AccountId32},
     std::{
         collections::BTreeMap,

chains/container-chains/nodes/frontier/src/chain_spec.rs

@@ -134,6 +134,7 @@ fn testnet_genesis(
                 .cloned()
                 .map(|k| (k, 1 << 80))
                 .collect(),
+            ..Default::default()
         },
         parachain_info: container_chain_template_frontier_runtime::ParachainInfoConfig {
             parachain_id: id,

chains/container-chains/nodes/frontier/src/rpc/eth.rs

@@ -17,7 +17,6 @@
 use {
     sc_network::NetworkService,
     sc_network_sync::SyncingService,
-    sc_transaction_pool::{ChainApi, Pool},
     sp_core::H256,
     sp_runtime::traits::Block as BlockT,
     std::{collections::BTreeMap, sync::Arc},
@@ -31,13 +30,13 @@ pub use {
 };
 
 /// Extra dependencies for Ethereum compatibility.
-pub struct EthDeps<C, P, A: ChainApi, CT, B: BlockT> {
+pub struct EthDeps<C, P, CT, B: BlockT> {
     /// The client instance to use.
     pub client: Arc<C>,
     /// Transaction pool instance.
     pub pool: Arc<P>,
     /// Graph pool instance.
-    pub graph: Arc<Pool<A>>,
+    pub graph: Arc<P>,
     /// Ethereum transaction converter.
     pub converter: Option<CT>,
     /// The Node authority flag
@@ -71,7 +70,7 @@ pub struct EthDeps<C, P, A: ChainApi, CT, B: BlockT> {
     pub forced_parent_hashes: Option<BTreeMap<H256, H256>>,
 }
 
-impl<C, P, A: ChainApi, CT: Clone, B: BlockT> Clone for EthDeps<C, P, A, CT, B> {
+impl<C, P, CT: Clone, B: BlockT> Clone for EthDeps<C, P, CT, B> {
     fn clone(&self) -> Self {
         Self {
             client: self.client.clone(),

chains/container-chains/nodes/frontier/src/rpc/mod.rs

@@ -24,16 +24,14 @@
 pub use sc_rpc::SubscriptionTaskExecutor;
 
 use {
-    container_chain_template_frontier_runtime::{
-        opaque::Block, AccountId, Hash, Index, RuntimeApi,
-    },
+    container_chain_template_frontier_runtime::{opaque::Block, AccountId, Hash, Index},
     core::marker::PhantomData,
     cumulus_client_parachain_inherent::ParachainInherentData,
-    cumulus_client_service::ParachainHostFunctions,
     cumulus_primitives_core::{ParaId, PersistedValidationData},
     cumulus_test_relay_sproof_builder::RelayStateSproofBuilder,
-    fc_rpc::{EthTask, TxPool},
-    fc_rpc_core::TxPoolApiServer,
+    fc_rpc::{
+        EthApiServer, EthFilterApiServer, EthPubSubApiServer, EthTask, TxPool, TxPoolApiServer,
+    },
     fc_storage::StorageOverride,
     fp_rpc::EthereumRuntimeRPCApi,
     frame_support::CloneNoBound,
@@ -46,10 +44,8 @@ use {
         AuxStore, BlockOf, StorageProvider,
     },
     sc_consensus_manual_seal::rpc::{EngineCommand, ManualSeal, ManualSealApiServer},
-    sc_executor::WasmExecutor,
     sc_network_sync::SyncingService,
-    sc_service::{TFullClient, TaskManager},
-    sc_transaction_pool::{ChainApi, Pool},
+    sc_service::TaskManager,
     sc_transaction_pool_api::TransactionPool,
     sp_api::{CallApiAt, ProvideRuntimeApi},
     sp_block_builder::BlockBuilder,
@@ -67,12 +63,6 @@ use {
     tc_service_container_chain::service::{ContainerChainClient, MinimalContainerRuntimeApi},
 };
 
-type ParachainExecutor = WasmExecutor<ParachainHostFunctions>;
-type ParachainClient = TFullClient<Block, RuntimeApi, ParachainExecutor>;
-
-type FullPool<Client> =
-    sc_transaction_pool::BasicPool<sc_transaction_pool::FullChainApi<Client, Block>, Block>;
-
 pub struct DefaultEthConfig<C, BE>(std::marker::PhantomData<(C, BE)>);
 
 impl<C, BE> fc_rpc::EthConfig<Block, C> for DefaultEthConfig<C, BE>
@@ -90,13 +80,13 @@ pub use eth::*;
 mod finality;
 
 /// Full client dependencies.
-pub struct FullDeps<C, P, A: ChainApi, BE> {
+pub struct FullDeps<C, P, BE> {
     /// The client instance to use.
     pub client: Arc<C>,
     /// Transaction pool instance.
     pub pool: Arc<P>,
     /// Graph pool instance.
-    pub graph: Arc<Pool<A>>,
+    pub graph: Arc<P>,
     /// Network service
     pub network: Arc<dyn sc_network::service::traits::NetworkService>,
     /// Chain syncing service
@@ -130,8 +120,8 @@ pub struct FullDeps<C, P, A: ChainApi, BE> {
 }
 
 /// Instantiate all Full RPC extensions.
-pub fn create_full<C, P, BE, A>(
-    deps: FullDeps<C, P, A, BE>,
+pub fn create_full<C, P, BE>(
+    deps: FullDeps<C, P, BE>,
     subscription_task_executor: SubscriptionTaskExecutor,
     pubsub_notification_sinks: Arc<
         fc_mapping_sync::EthereumBlockNotificationSinks<
@@ -148,15 +138,11 @@ where
     C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,
     C: CallApiAt<Block>,
     C: Send + Sync + 'static,
-    A: ChainApi<Block = Block> + 'static,
     C::Api: RuntimeApiCollection,
-    P: TransactionPool<Block = Block> + 'static,
+    P: TransactionPool<Block = Block, Hash = <Block as BlockT>::Hash> + 'static,
 {
     use {
-        fc_rpc::{
-            Eth, EthApiServer, EthFilter, EthFilterApiServer, EthPubSub, EthPubSubApiServer, Net,
-            NetApiServer, Web3, Web3ApiServer,
-        },
+        fc_rpc::{Eth, EthFilter, EthPubSub, Net, NetApiServer, Web3, Web3ApiServer},
         finality::{FrontierFinality, FrontierFinalityApiServer},
         substrate_frame_rpc_system::{System, SystemApiServer},
     };
@@ -200,7 +186,7 @@ where
     let authorities = vec![tc_consensus::get_aura_id_from_seed("alice")];
     let authorities_for_cdp = authorities.clone();
 
-    let pending_create_inherent_data_providers = move |_, _| {
+    let pending_create_inherent_data_providers = move |_, ()| {
         let authorities_for_cidp = authorities.clone();
 
         async move {
@@ -254,7 +240,7 @@ where
     ));
 
     io.merge(
-        Eth::<_, _, _, _, _, _, _, DefaultEthConfig<C, BE>>::new(
+        Eth::<_, _, _, _, _, _, DefaultEthConfig<C, BE>>::new(
             Arc::clone(&client),
             Arc::clone(&pool),
             Arc::clone(&graph),
@@ -275,7 +261,7 @@ where
         .into_rpc(),
     )?;
 
-    let tx_pool = TxPool::new(client.clone(), graph.clone());
+    let tx_pool: TxPool<Block, _, _> = TxPool::new(client.clone(), graph.clone());
     if let Some(filter_pool) = filter_pool {
         io.merge(
             EthFilter::new(
@@ -558,10 +544,6 @@ const _: () = {
             ));
 
             Ok(Box::new(move |subscription_task_executor| {
-                let graph_pool = transaction_pool.0
-                        .as_any()
-                        .downcast_ref::<FullPool<ParachainClient>>()
-                        .expect("Frontier container chain template supports only single state transaction pool! Use --pool-type=single-state");
                 let deps = crate::rpc::FullDeps {
                     backend: backend.clone(),
                     client: client.clone(),
@@ -570,7 +552,7 @@ const _: () = {
                         fc_db::Backend::KeyValue(b) => b.clone(),
                         fc_db::Backend::Sql(b) => b.clone(),
                     },
-                    graph: graph_pool.pool().clone(),
+                    graph: transaction_pool.clone(),
                     pool: transaction_pool.clone(),
                     max_past_logs,
                     max_block_range,

chains/container-chains/nodes/frontier/src/service.rs

@@ -252,12 +252,6 @@ async fn start_node_impl(
         let frontier_backend = frontier_backend.clone();
 
         Box::new(move |subscription_task_executor| {
-            let graph_pool = pool.0.as_any()
-                .downcast_ref::<sc_transaction_pool::BasicPool<
-                    sc_transaction_pool::FullChainApi<ParachainClient, Block>
-                    , Block
-                >>().expect("Frontier container chain template supports only single state transaction pool! Use --pool-type=single-state");
-
             let deps = crate::rpc::FullDeps {
                 backend: backend.clone(),
                 client: client.clone(),
@@ -266,7 +260,7 @@ async fn start_node_impl(
                     fc_db::Backend::KeyValue(b) => b.clone(),
                     fc_db::Backend::Sql(b) => b.clone(),
                 },
-                graph: graph_pool.pool().clone(),
+                graph: pool.clone(),
                 pool: pool.clone(),
                 max_past_logs,
                 max_block_range,
@@ -298,8 +292,6 @@ async fn start_node_impl(
         relay_chain_slot_duration,
     )?;
 
-    node_builder.network.start_network.start_network();
-
     Ok((node_builder.task_manager, node_builder.client))
 }
 
@@ -532,11 +524,6 @@ pub async fn start_dev_node(
         let block_data_cache = block_data_cache;
 
         Box::new(move |subscription_task_executor| {
-            let graph_pool= pool.0.as_any()
-                .downcast_ref::<sc_transaction_pool::BasicPool<
-                    sc_transaction_pool::FullChainApi<ParachainClient, Block>
-                    , Block
-                >>().expect("Frontier container chain template supports only single state transaction pool! Use --pool-type=single-state");
             let deps = crate::rpc::FullDeps {
                 backend: backend.clone(),
                 client: client.clone(),
@@ -545,7 +532,7 @@ pub async fn start_dev_node(
                     fc_db::Backend::KeyValue(b) => b.clone(),
                     fc_db::Backend::Sql(b) => b.clone(),
                 },
-                graph: graph_pool.pool().clone(),
+                graph: pool.clone(),
                 pool: pool.clone(),
                 max_past_logs,
                 max_block_range,
@@ -572,6 +559,5 @@ pub async fn start_dev_node(
 
     log::info!("Development Service Ready");
 
-    node_builder.network.start_network.start_network();
     Ok(node_builder.task_manager)
 }

chains/container-chains/nodes/simple/src/chain_spec.rs

@@ -125,6 +125,7 @@ fn testnet_genesis(
                 .cloned()
                 .map(|k| (k, 1 << 60))
                 .collect(),
+            ..Default::default()
         },
         parachain_info: container_chain_template_simple_runtime::ParachainInfoConfig {
             parachain_id: id,

chains/container-chains/nodes/simple/src/service.rs

@@ -166,8 +166,6 @@ pub async fn start_parachain_node(
         relay_chain_slot_duration,
     )?;
 
-    node_builder.network.start_network.start_network();
-
     Ok((node_builder.task_manager, node_builder.client))
 }
 
@@ -349,7 +347,5 @@ pub async fn start_dev_node(
 
     log::info!("Development Service Ready");
 
-    node_builder.network.start_network.start_network();
-
     Ok(node_builder.task_manager)
 }

chains/container-chains/runtime-templates/frontier/Cargo.toml

@@ -100,10 +100,10 @@ xcm-runtime-apis = { workspace = true }
 # Cumulus
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
+cumulus-pallet-weight-reclaim = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-storage-weight-reclaim = { workspace = true }
 cumulus-primitives-timestamp = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
 parachain-info = { workspace = true }
@@ -137,10 +137,10 @@ std = [
 	"ccp-xcm/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-session-benchmarking/std",
+	"cumulus-pallet-weight-reclaim/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-storage-weight-reclaim/std",
 	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"dp-consensus/std",
@@ -236,6 +236,7 @@ force-debug = [ "sp-debug-derive/force-debug" ]
 runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
+	"cumulus-pallet-weight-reclaim/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
@@ -279,10 +280,12 @@ runtime-benchmarks = [
 	"xcm-executor/runtime-benchmarks",
 	"xcm-primitives/runtime-benchmarks",
 	"xcm-runtime-apis/runtime-benchmarks",
+	"xcm/runtime-benchmarks",
 ]
 
 try-runtime = [
 	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-weight-reclaim/try-runtime",
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"fp-self-contained/try-runtime",