fix: upgrade to polkadot2412 and use fork-aware txpool (#648)

node/src/service.rs

@@ -53,7 +53,7 @@ pub type Service = PartialComponents<
     ParachainBackend,
     (),
     sc_consensus::DefaultImportQueue<Block>,
-    sc_transaction_pool::FullPool<Block, ParachainClient>,
+    sc_transaction_pool::TransactionPoolHandle<Block, ParachainClient>,
     (
         ParachainBlockImport,
         Option<Telemetry>,
@@ -111,12 +111,15 @@ pub fn new_partial(config: &Configuration) -> Result<Service, sc_service::Error>
         telemetry
     });
 
-    let transaction_pool = sc_transaction_pool::BasicPool::new_full(
-        config.transaction_pool.clone(),
-        config.role.is_authority().into(),
-        config.prometheus_registry(),
-        task_manager.spawn_essential_handle(),
-        client.clone(),
+    let transaction_pool = Arc::from(
+        sc_transaction_pool::Builder::new(
+            task_manager.spawn_essential_handle(),
+            client.clone(),
+            config.role.is_authority().into(),
+        )
+        .with_options(config.transaction_pool.clone())
+        .with_prometheus(config.prometheus_registry())
+        .build(),
     );
 
     let block_import = ParachainBlockImport::new(client.clone(), backend.clone());
@@ -177,7 +180,7 @@ fn start_consensus(
     telemetry: Option<TelemetryHandle>,
     task_manager: &TaskManager,
     relay_chain_interface: Arc<dyn RelayChainInterface>,
-    transaction_pool: Arc<sc_transaction_pool::FullPool<Block, ParachainClient>>,
+    transaction_pool: Arc<sc_transaction_pool::TransactionPoolHandle<Block, ParachainClient>>,
     keystore: KeystorePtr,
     relay_chain_slot_duration: Duration,
     para_id: ParaId,
@@ -293,9 +296,7 @@ pub async fn start_parachain_node(
     if parachain_config.offchain_worker.enabled {
         use futures::FutureExt;
 
-        task_manager.spawn_handle().spawn(
-            "offchain-workers-runner",
-            "offchain-work",
+        let offchain_workers =
             sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
                 runtime_api_provider: client.clone(),
                 keystore: Some(params.keystore_container.keystore()),
@@ -307,9 +308,13 @@ pub async fn start_parachain_node(
                 is_validator: parachain_config.role.is_authority(),
                 enable_http_requests: false,
                 custom_extensions: move |_| vec![],
-            })
-            .run(client.clone(), task_manager.spawn_handle())
-            .boxed(),
+            })?;
+        task_manager.spawn_handle().spawn(
+            "offchain-workers-runner",
+            "offchain-work",
+            offchain_workers
+                .run(client.clone(), task_manager.spawn_handle())
+                .boxed(),
         );
     }
 

pallets/randomness/src/inherent.rs

@@ -1,14 +1,14 @@
 use codec::Encode;
 use sp_inherents::{InherentIdentifier, IsFatalError};
-use sp_runtime::RuntimeString;
+extern crate alloc;
 
 /// BABE VRF Inherent Identifier
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"babe_vrf";
 
 #[derive(Encode)]
 #[cfg_attr(feature = "std", derive(Debug, codec::Decode))]
 pub enum InherentError {
-    Other(RuntimeString),
+    Other(alloc::borrow::Cow<'static, str>),
 }
 
 impl IsFatalError for InherentError {

pallets/randomness/src/lib.rs

@@ -103,11 +103,9 @@ pub mod pallet {
         fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> {
             // Return Ok(Some(_)) unconditionally because this inherent is required in every block
             // If it is not found, throw a VrfInherentRequired error.
-            Ok(Some(InherentError::Other(
-                sp_runtime::RuntimeString::Borrowed(
-                    "Inherent required to set babe randomness results",
-                ),
-            )))
+            Ok(Some(InherentError::Other(alloc::borrow::Cow::Borrowed(
+                "Inherent required to set babe randomness results",
+            ))))
         }
 
         fn create_inherent(_data: &InherentData) -> Option<Self::Call> {

runtime/src/configs/mod.rs

@@ -157,6 +157,7 @@ impl pallet_balances::Config for Runtime {
     type RuntimeFreezeReason = RuntimeFreezeReason;
     type FreezeIdentifier = ();
     type MaxFreezes = ConstU32<0>;
+    type DoneSlashHandler = ();
 }
 
 parameter_types! {
@@ -171,6 +172,7 @@ impl pallet_transaction_payment::Config for Runtime {
     type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
     type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
     type OperationalFeeMultiplier = ConstU8<5>;
+    type WeightInfo = ();
 }
 
 impl pallet_sudo::Config for Runtime {
@@ -197,6 +199,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
     type ReservedXcmpWeight = ReservedXcmpWeight;
     type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
     type ConsensusHook = ConsensusHook;
+    type SelectCore = cumulus_pallet_parachain_system::DefaultCoreSelector<Runtime>;
 }
 
 impl parachain_info::Config for Runtime {}

runtime/src/lib.rs

@@ -30,7 +30,7 @@ use sp_core::{crypto::KeyTypeId, hex2array, Get, OpaqueMetadata};
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
 use sp_runtime::{
-    create_runtime_str, generic, impl_opaque_keys,
+    generic, impl_opaque_keys,
     traits::{BlakeTwo256, Block as BlockT, IdentifyAccount, Verify},
     transaction_validity::{TransactionSource, TransactionValidity},
     ApplyExtrinsicResult, MultiSignature,
@@ -159,14 +159,14 @@ impl_opaque_keys! {
 
 #[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
-    spec_name: create_runtime_str!("polka-storage-runtime"),
-    impl_name: create_runtime_str!("polka-storage-runtime"),
+    spec_name: alloc::borrow::Cow::Borrowed("polka-storage-runtime"),
+    impl_name: alloc::borrow::Cow::Borrowed("polka-storage-runtime"),
     authoring_version: 1,
     spec_version: 1,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,
-    state_version: 1,
+    system_version: 1,
 };
 
 #[docify::export]
@@ -611,7 +611,7 @@ impl_runtime_apis! {
 
         fn dispatch_benchmark(
             config: frame_benchmarking::BenchmarkConfig
-        ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
+        ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> {
             use frame_benchmarking::{BenchmarkError, Benchmarking, BenchmarkBatch};
             use super::*;
 

zombienet/local-testnet.toml

@@ -21,7 +21,7 @@ id = 1000
 
 # run charlie as parachain collator
 [[parachains.collators]]
-args = ["--detailed-log-output", "-lparachain=debug,xcm=trace,runtime=trace"]
+args = ["--detailed-log-output", "--pool-type=fork-aware", "-lparachain=debug,xcm=trace,runtime=trace,txpool=debug,basic-authorship=debug"]
 command = "target/release/polka-storage-node"
 name = "charlie"
 validator = true