ADD: update deps, disable rws and digital twin, minor fixes

frame/digital-twin/src/lib.rs

@@ -18,8 +18,6 @@
 //! Digital twin runtime module. This can be compiled with `#[no_std]`, ready for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub use pallet::*;
-
 #[frame_support::pallet]
 pub mod pallet {
     use frame_support::pallet_prelude::*;
@@ -63,7 +61,6 @@ pub mod pallet {
         StorageMap<_, Twox64Concat, u32, BTreeMap<H256, <T as frame_system::Config>::AccountId>>;
 
     #[pallet::pallet]
-    #[pallet::generate_store(pub(super) trait Store)]
     #[pallet::without_storage_info]
     pub struct Pallet<T>(PhantomData<T>);
 

frame/rws/src/lib.rs

@@ -28,8 +28,6 @@ use sp_runtime::RuntimeDebug;
 //#[cfg(test)]
 //mod tests;
 
-pub use pallet::*;
-
 #[derive(PartialEq, Eq, Clone, Encode, Decode, TypeInfo, RuntimeDebug)]
 pub enum Subscription {
     /// Lifetime subscription.
@@ -232,7 +230,6 @@ pub mod pallet {
     pub(super) type UnspendBondValue<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
 
     #[pallet::pallet]
-    #[pallet::generate_store(pub(super) trait Store)]
     #[pallet::without_storage_info]
     pub struct Pallet<T>(PhantomData<T>);
 

frame/xcm-info/Cargo.toml

@@ -14,7 +14,7 @@ parity-scale-codec = { workspace = true }
 scale-info = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
-xcm = { workspace = true }
+staging-xcm = { workspace = true }
 
 [features]
 default = ["std"]
@@ -25,5 +25,5 @@ std = [
   "scale-info/std",
   "sp-runtime/std",
   "sp-std/std",
-  "xcm/std",
+  "staging-xcm/std",
 ]

node/generic-runtime/src/lib.rs

@@ -26,7 +26,7 @@ use sp_inherents::{CheckInherentsResult, InherentData};
 use sp_runtime::{
     traits::Block as BlockT,
     transaction_validity::{TransactionSource, TransactionValidity},
-    ApplyExtrinsicResult,
+    ApplyExtrinsicResult, ExtrinsicInclusionMode,
 };
 use sp_version::RuntimeVersion;
 
@@ -42,7 +42,7 @@ impl_runtime_apis! {
             unimplemented!()
         }
 
-        fn initialize_block(_header: &<Block as BlockT>::Header) {
+        fn initialize_block(_header: &<Block as BlockT>::Header) -> ExtrinsicInclusionMode {
             unimplemented!()
         }
     }

node/rpc/core/src/lib.rs

@@ -69,8 +69,8 @@ where
         ext_rpc,
     } = deps;
 
-    io.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?;
-    io.merge(TransactionPayment::new(client.clone()).into_rpc())?;
+    //io.merge(System::new(client.clone(), pool.clone()).into_rpc())?;
+    //io.merge(TransactionPayment::new(client.clone()).into_rpc())?;
     io.merge(ext_rpc)?;
 
     Ok(io)

node/service/src/dev.rs

@@ -278,7 +278,6 @@ where
             spawn_handle: task_manager.spawn_handle(),
             import_queue,
             block_announce_validator_builder: None,
-            warp_sync_params: Some(sc_service::WarpSyncParams::WithProvider(warp_sync)),
         })?;
 
     if config.offchain_worker.enabled {

runtime/dev/src/lib.rs

@@ -608,8 +608,8 @@ construct_runtime!(
         // Robonomics Network modules.
         Datalog: pallet_robonomics_datalog,
         Launch: pallet_robonomics_launch,
-        RWS: pallet_robonomics_rws,
-        DigitalTwin: pallet_robonomics_digital_twin,
+        //RWS: pallet_robonomics_rws,
+        //DigitalTwin: pallet_robonomics_digital_twin,
         Liability: pallet_robonomics_liability,
 
         // Sudo. Usable initially.

runtime/main/Cargo.toml

@@ -66,12 +66,12 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-timestamp = { workspace = true }
-parachain-info = { workspace = true }
+staging-parachain-info = { workspace = true }
 
 # polkadot dependencies
-xcm = { workspace = true }
-xcm-builder = { workspace = true }
-xcm-executor = { workspace = true }
+staging-xcm = { workspace = true }
+staging-xcm-builder = { workspace = true }
+staging-xcm-executor = { workspace = true }
 pallet-xcm = { path = "../../vendor/pallet-xcm", default-features = false }
 pallet-xcm-info = { path = "../../frame/xcm-info", default-features = false }
 polkadot-parachain = { workspace = true }
@@ -130,14 +130,14 @@ std = [
   "cumulus-pallet-dmp-queue/std",
   "cumulus-pallet-xcmp-queue/std",
   "cumulus-pallet-xcm/std",
-  "xcm/std",
-  "xcm-builder/std",
-  "xcm-executor/std",
+  "staging-xcm/std",
+  "staging-xcm-builder/std",
+  "staging-xcm-executor/std",
   "pallet-xcm/std",
   "pallet-xcm-info/std",
   "polkadot-parachain/std",
   "polkadot-primitives/std",
-  "parachain-info/std",
+  "staging-parachain-info/std",
   "scale-info/std",
 ]
 runtime-benchmarks = [
@@ -152,7 +152,7 @@ runtime-benchmarks = [
   "pallet-robonomics-launch/runtime-benchmarks",
   "pallet-robonomics-datalog/runtime-benchmarks",
   "pallet-xcm/runtime-benchmarks",
-  "xcm-builder/runtime-benchmarks",
+  "staging-xcm-builder/runtime-benchmarks",
   "frame-system-benchmarking",
   "hex-literal",
 ]

vendor/pallet-xcm/Cargo.toml

@@ -21,14 +21,14 @@ sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
-xcm = { workspace = true }
-xcm-executor = { workspace = true }
+staging-xcm = { workspace = true }
+staging-xcm-executor = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
 polkadot-parachain = { workspace = true }
-xcm-builder = { workspace = true }
+staging-xcm-builder = { workspace = true }
 
 [features]
 default = ["std"]
@@ -46,13 +46,13 @@ std = [
   "frame-benchmarking?/std",
   "frame-support/std",
   "frame-system/std",
-  "xcm/std",
-  "xcm-executor/std",
+  "staging-xcm/std",
+  "staging-xcm-executor/std",
 ]
 runtime-benchmarks = [
   "frame-benchmarking/runtime-benchmarks",
   "frame-support/runtime-benchmarks",
   "frame-system/runtime-benchmarks",
-  "xcm-builder/runtime-benchmarks",
+  "staging-xcm-builder/runtime-benchmarks",
 ]
 try-runtime = ["frame-support/try-runtime"]