Merge pull request #41 from chungquantin/chungquantin/chore-polkadot-…

…v1.14.0

chore: upgrade to v1.14.0

Cargo.toml

@@ -21,7 +21,7 @@ color-print = "0.3.4"
 docify = "0.2.8"
 futures = "0.3.30"
 hex-literal = "0.4.1"
-jsonrpsee = { version = "0.22.5", features = ["server"] }
+jsonrpsee = { version = "0.23.2", features = ["server"] }
 log = { version = "0.4.20", default-features = false }
 scale-info = { version = "2.11.1", default-features = false, features = [
     "derive",
@@ -38,88 +38,88 @@ substrate-wasm-builder = "23.0.0"
 parachain-template-runtime = { path = "./runtime" }
 
 # Substrate
-frame-benchmarking = { version = "35.0.0", default-features = false }
-frame-benchmarking-cli = "39.0.0"
-frame-executive = { version = "35.0.0", default-features = false }
-frame-support = { version = "35.0.0", default-features = false }
-frame-system = { version = "35.0.0", default-features = false }
-frame-system-benchmarking = { version = "35.0.0", default-features = false }
+frame-benchmarking = { version = "36.0.0", default-features = false }
+frame-benchmarking-cli = "40.0.0"
+frame-executive = { version = "36.0.0", default-features = false }
+frame-support = { version = "36.0.0", default-features = false }
+frame-system = { version = "36.0.1", default-features = false }
+frame-system-benchmarking = { version = "36.0.0", default-features = false }
 frame-system-rpc-runtime-api = { version = "33.0.0", default-features = false }
-frame-try-runtime = { version = "0.41.0", default-features = false }
-frame-metadata-hash-extension = { version = "0.3.0", default-features = false }
-pallet-aura = { version = "34.0.0", default-features = false }
-pallet-authorship = { version = "35.0.0", default-features = false }
-pallet-balances = { version = "36.0.0", default-features = false }
-pallet-message-queue = { version = "38.0.0", default-features = false }
-pallet-session = { version = "35.0.0", default-features = false }
-pallet-sudo = { version = "35.0.0", default-features = false }
-pallet-timestamp = { version = "34.0.0", default-features = false }
-pallet-transaction-payment = { version = "35.0.0", default-features = false }
-pallet-transaction-payment-rpc = "37.0.0"
-pallet-transaction-payment-rpc-runtime-api = { version = "35.0.0", default-features = false }
-sc-basic-authorship = "0.41.0"
-sc-chain-spec = "34.0.0"
-sc-cli = "0.43.0"
-sc-client-api = "=35.0.0"
-sc-offchain = "36.0.0"
-sc-consensus = "0.40.0"
+frame-try-runtime = { version = "0.42.0", default-features = false }
+frame-metadata-hash-extension = { version = "0.4.0", default-features = false }
+pallet-aura = { version = "35.0.0", default-features = false }
+pallet-authorship = { version = "36.0.0", default-features = false }
+pallet-balances = { version = "37.0.0", default-features = false }
+pallet-message-queue = { version = "39.0.0", default-features = false }
+pallet-session = { version = "36.0.0", default-features = false }
+pallet-sudo = { version = "36.0.0", default-features = false }
+pallet-timestamp = { version = "35.0.0", default-features = false }
+pallet-transaction-payment = { version = "36.0.0", default-features = false }
+pallet-transaction-payment-rpc = "38.0.0"
+pallet-transaction-payment-rpc-runtime-api = { version = "36.0.0", default-features = false }
+prometheus-endpoint = { version = "0.17.0", default-features = false, package = "substrate-prometheus-endpoint" }
+sc-basic-authorship = "0.42.0"
+sc-chain-spec = "35.0.0"
+sc-cli = "0.44.0"
+sc-client-api = "35.1.0"
+sc-offchain = "37.0.0"
+sc-consensus = "0.41.0"
 sc-executor = "0.39.0"
-sc-network = "0.41.0"
-sc-network-sync = "0.40.0"
-sc-rpc = "36.0.0"
-sc-service = "0.42.0"
-sc-sysinfo = "34.0.0"
-sc-telemetry = "21.0.0"
+sc-network = "0.42.0"
+sc-network-sync = "0.41.0"
+sc-rpc = "37.0.0"
+sc-service = "0.43.0"
+sc-sysinfo = "35.0.0"
+sc-telemetry = "22.0.0"
 sc-tracing = "35.0.0"
 sc-transaction-pool = "35.0.0"
 sc-transaction-pool-api = "35.0.0"
 sp-api = { version = "33.0.0", default-features = false }
 sp-block-builder = { version = "33.0.0", default-features = false }
-sp-blockchain = "35.0.0"
+sp-blockchain = "35.1.0"
 sp-consensus-aura = { version = "0.39.0", default-features = false }
 sp-core = { version = "34.0.0", default-features = false }
 sp-io = { version = "37.0.0", default-features = false }
 sp-genesis-builder = { version = "0.14.0", default-features = false }
 sp-inherents = { version = "33.0.0", default-features = false }
 sp-keystore = "0.40.0"
 sp-offchain = { version = "33.0.0", default-features = false }
-sp-runtime = { version = "=38.0.0", default-features = false }
+sp-runtime = { version = "38.0.0", default-features = false }
 sp-session = { version = "34.0.0", default-features = false }
 sp-std = { version = "14.0.0", default-features = false }
 sp-timestamp = "33.0.0"
 sp-transaction-pool = { version = "33.0.0", default-features = false }
 sp-version = { version = "36.0.0", default-features = false }
-substrate-frame-rpc-system = "35.0.0"
-substrate-prometheus-endpoint = "0.17.0"
+substrate-frame-rpc-system = "36.0.0"
 
 # Polkadot
-pallet-xcm = { version = "14.0.0", default-features = false }
-polkadot-cli = "14.0.0"
+pallet-xcm = { version = "15.0.0", default-features = false }
+polkadot-cli = "15.0.0"
 polkadot-parachain-primitives = { version = "13.0.0", default-features = false }
 polkadot-primitives = "14.0.0"
-polkadot-runtime-common = { version = "14.0.0", default-features = false }
-xcm = { version = "14.0.0", package = "staging-xcm", default-features = false }
-xcm-builder = { version = "14.0.0", package = "staging-xcm-builder", default-features = false }
-xcm-executor = { version = "14.0.0", package = "staging-xcm-executor", default-features = false }
+polkadot-runtime-common = { version = "15.0.0", default-features = false }
+xcm = { version = "14.0.2", package = "staging-xcm", default-features = false }
+xcm-builder = { version = "15.0.0", package = "staging-xcm-builder", default-features = false }
+xcm-executor = { version = "15.0.0", package = "staging-xcm-executor", default-features = false }
 
 # Cumulus
-cumulus-client-cli = "0.14.0"
-cumulus-client-collator = "0.14.0"
-cumulus-client-consensus-aura = "0.14.0"
-cumulus-client-consensus-common = "0.14.0"
+cumulus-client-cli = "0.15.0"
+cumulus-client-collator = "0.15.0"
+cumulus-client-consensus-aura = "0.15.0"
+cumulus-client-consensus-common = "0.15.0"
 cumulus-client-consensus-proposer = "0.14.0"
-cumulus-client-service = "0.14.0"
-cumulus-pallet-aura-ext = { version = "0.14.0", default-features = false }
-cumulus-pallet-parachain-system = { version = "0.14.0", default-features = false }
-cumulus-pallet-session-benchmarking = { version = "16.0.0", default-features = false }
-cumulus-pallet-xcm = { version = "0.14.0", default-features = false }
-cumulus-pallet-xcmp-queue = { version = "0.14.0", default-features = false }
+cumulus-client-service = "0.15.0"
+cumulus-pallet-aura-ext = { version = "0.15.0", default-features = false }
+cumulus-pallet-parachain-system = { version = "0.15.0", default-features = false }
+cumulus-pallet-session-benchmarking = { version = "17.0.0", default-features = false }
+cumulus-pallet-xcm = { version = "0.15.0", default-features = false }
+cumulus-pallet-xcmp-queue = { version = "0.15.0", default-features = false }
 cumulus-primitives-aura = { version = "0.14.0", default-features = false }
 cumulus-primitives-core = { version = "0.14.0", default-features = false }
 cumulus-primitives-parachain-inherent = "0.14.0"
-cumulus-primitives-storage-weight-reclaim = { version = "5.0.0", default-features = false }
-cumulus-primitives-utility = { version = "0.14.0", default-features = false }
-cumulus-relay-chain-interface = "0.14.0"
-pallet-collator-selection = { version = "16.0.0", default-features = false }
-parachains-common = { version = "14.0.0", default-features = false }
-parachain-info = { version = "0.14.0", package = "staging-parachain-info", default-features = false }
+cumulus-primitives-storage-weight-reclaim = { version = "6.0.1", default-features = false }
+cumulus-primitives-utility = { version = "0.15.0", default-features = false }
+cumulus-relay-chain-interface = "0.15.0"
+pallet-collator-selection = { version = "17.0.0", default-features = false }
+parachains-common = { version = "15.0.0", default-features = false }
+parachain-info = { version = "0.15.0", package = "staging-parachain-info", default-features = false }

node/Cargo.toml

@@ -32,6 +32,7 @@ parachain-template-runtime.workspace = true
 frame-benchmarking.workspace = true
 frame-benchmarking-cli.workspace = true
 pallet-transaction-payment-rpc.workspace = true
+prometheus-endpoint.workspace = true
 sc-basic-authorship.workspace = true
 sc-chain-spec.workspace = true
 sc-cli.workspace = true
@@ -58,7 +59,6 @@ sp-io.workspace = true
 sp-runtime.workspace = true
 sp-timestamp.workspace = true
 substrate-frame-rpc-system.workspace = true
-substrate-prometheus-endpoint.workspace = true
 
 # Polkadot
 polkadot-cli = { workspace = true, features = ["rococo-native"] }

node/src/service.rs

@@ -28,6 +28,7 @@ use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
 
 // Substrate Imports
 use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
+use prometheus_endpoint::Registry;
 use sc_client_api::Backend;
 use sc_consensus::ImportQueue;
 use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};
@@ -37,7 +38,6 @@ use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, Ta
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_keystore::KeystorePtr;
-use substrate_prometheus_endpoint::Registry;
 
 #[docify::export(wasm_executor)]
 type ParachainExecutor = WasmExecutor<ParachainHostFunctions>;
@@ -339,7 +339,7 @@ pub async fn start_parachain_node(
         config: parachain_config,
         keystore: params.keystore_container.keystore(),
         backend: backend.clone(),
-        network: network,
+        network,
         sync_service: sync_service.clone(),
         system_rpc_tx,
         tx_handler_controller,

runtime/Cargo.toml

@@ -90,13 +90,13 @@ std = [
     "cumulus-primitives-core/std",
     "cumulus-primitives-storage-weight-reclaim/std",
     "cumulus-primitives-utility/std",
-    "frame-benchmarking/std",
+    "frame-benchmarking?/std",
     "frame-executive/std",
     "frame-support/std",
-    "frame-system-benchmarking/std",
+    "frame-system-benchmarking?/std",
     "frame-system-rpc-runtime-api/std",
     "frame-system/std",
-    "frame-try-runtime/std",
+    "frame-try-runtime?/std",
     "frame-metadata-hash-extension/std",
     "log/std",
     "pallet-aura/std",

runtime/src/configs/mod.rs

@@ -33,7 +33,9 @@ use frame_support::{
     derive_impl,
     dispatch::DispatchClass,
     parameter_types,
-    traits::{ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, TransformOrigin},
+    traits::{
+        ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, TransformOrigin, VariantCountOf,
+    },
     weights::{ConstantMultiplier, Weight},
     PalletId,
 };
@@ -155,8 +157,8 @@ impl pallet_balances::Config for Runtime {
     type ReserveIdentifier = [u8; 8];
     type RuntimeHoldReason = RuntimeHoldReason;
     type RuntimeFreezeReason = RuntimeFreezeReason;
-    type FreezeIdentifier = ();
-    type MaxFreezes = ConstU32<0>;
+    type FreezeIdentifier = RuntimeFreezeReason;
+    type MaxFreezes = VariantCountOf<RuntimeFreezeReason>;
 }
 
 parameter_types! {
@@ -222,7 +224,7 @@ impl pallet_message_queue::Config for Runtime {
     // The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
     type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
     type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
-    type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+    type HeapSize = sp_core::ConstU32<{ 103 * 1024 }>;
     type MaxStale = sp_core::ConstU32<8>;
     type ServiceWeight = MessageQueueServiceWeight;
     type IdleMaxServiceWeight = ();

runtime/src/configs/xcm.rs

@@ -34,10 +34,7 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{
-    xcm_config::{AllSiblingSystemParachains, RelayOrOtherSystemParachains},
-    TREASURY_PALLET_ID,
-};
+use parachains_common::TREASURY_PALLET_ID;
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::impls::ToAuthor;
 use sp_runtime::traits::AccountIdConversion;
@@ -49,7 +46,6 @@ use xcm_builder::{
     RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
     SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
     TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
-    XcmFeeManagerFromComponents, XcmFeeToAccount,
 };
 use xcm_executor::XcmExecutor;
 
@@ -64,11 +60,6 @@ parameter_types! {
     pub TreasuryAccount: AccountId = TREASURY_PALLET_ID.into_account_truncating();
 }
 
-/// Locations that will not be charged fees in the executor,
-/// either execution or delivery.
-/// We only waive fees for system functions, which these locations represent.
-pub type WaivedLocations = (RelayOrOtherSystemParachains<AllSiblingSystemParachains, Runtime>,);
-
 /// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
@@ -180,14 +171,7 @@ impl xcm_executor::Config for XcmConfig {
     type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
     type AssetLocker = ();
     type AssetExchanger = ();
-    type FeeManager = XcmFeeManagerFromComponents<
-        WaivedLocations,
-        // Delivery fees are sent to the treasury account.
-        // These funds are not accessible without a module controlling such an account.
-        // [pallet_treasury](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/treasury)
-        // could be suitable option, configured using the same `TREASURY_PALLET_ID` used above as the pallet config's `PalletId`.
-        XcmFeeToAccount<Self::AssetTransactor, AccountId, TreasuryAccount>,
-    >;
+    type FeeManager = ();
     type MessageExporter = ();
     type UniversalAliases = Nothing;
     type CallDispatcher = RuntimeCall;
@@ -221,7 +205,7 @@ impl pallet_xcm::Config for Runtime {
     // ^ Disable dispatchable execute on the XCM pallet.
     // Needs to be `Everything` for local testing.
     type XcmExecutor = XcmExecutor<XcmConfig>;
-    type XcmTeleportFilter = Nothing;
+    type XcmTeleportFilter = Everything;
     type XcmReserveTransferFilter = Nothing;
     type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
     type UniversalLocation = UniversalLocation;