chore(upgrade): v1.7.2 to v1.8.0

For more details, please refer to: [Release Notes](https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-v1.8.0) issue-1894
frequency-chain · Jul 17, 2024 · 21678f4 · 21678f4
1 parent 6fde4cf
commit 21678f4
Show file tree

Hide file tree

Showing 12 changed files with 964 additions and 695 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml
@@ -63,7 +63,7 @@ cumulus-primitives-core = { workspace = true }
 substrate-build-script-utils = { workspace = true }
 
 [features]
-std = ["sp-io/std", "sp-api/std", "frame-support/std"]
+std = ["sp-io/std", "sp-api/std", "frame-support/std", "sp-runtime/std", "sp-core/std"]
 cli = [
   "frequency-service",
   "sp-core",
@@ -77,12 +77,14 @@ default = ["std", "cli"]
 runtime-benchmarks = [
   "polkadot-cli/runtime-benchmarks",
   "frequency-runtime/runtime-benchmarks",
+  "sc-service?/runtime-benchmarks",
   "frame-benchmarking-cli/runtime-benchmarks",
+  "sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
   "frequency-service/try-runtime",
-  "try-runtime-cli",
   "try-runtime-cli/try-runtime",
+  "sp-runtime/try-runtime"
 ]
 on-chain-release-build = ["sp-api/disable-logging"]
 frequency = ["frequency-service/frequency"]

diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs
@@ -15,6 +15,7 @@ use sc_cli::{
 	NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
 };
 use sc_service::config::{BasePath, PrometheusConfig};
+use sp_runtime::traits::HashingFor;
 
 enum ChainIdentity {
 	Frequency,
@@ -337,7 +338,7 @@ pub fn run() -> Result<()> {
 			match cmd {
 				BenchmarkCmd::Pallet(cmd) =>
 					if cfg!(feature = "runtime-benchmarks") {
-						runner.sync_run(|config| cmd.run::<Block, ()>(config))
+						runner.sync_run(|config| cmd.run::<HashingFor<Block>, ()>(config))
 					} else {
 						return Err("Benchmarking wasn't enabled when building the node. \
 									You can enable it with `--features runtime-benchmarks`."

diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
@@ -117,7 +117,7 @@ scale-info = { workspace = true, features = ["derive"] }
 
 [features]
 default = ["std"]
-std = ["sp-api/std"]
+std = ["sp-api/std", "sp-core/std"]
 runtime-benchmarks = [
   "frequency-runtime/runtime-benchmarks",
   "polkadot-service/runtime-benchmarks",

diff --git a/node/service/src/service.rs b/node/service/src/service.rs
@@ -463,8 +463,6 @@ fn start_consensus(
 	// NOTE: because we use Aura here explicitly, we can use `CollatorSybilResistance::Resistant`
 	// when starting the network.
 
-	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
-
 	let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
 		task_manager.spawn_handle(),
 		client.clone(),
@@ -500,7 +498,6 @@ fn start_consensus(
 		collator_key,
 		para_id,
 		overseer_handle,
-		slot_duration,
 		relay_chain_slot_duration,
 		proposer,
 		collator_service,

diff --git a/pallets/frequency-tx-payment/src/rpc/Cargo.toml b/pallets/frequency-tx-payment/src/rpc/Cargo.toml
@@ -33,6 +33,7 @@ sc-client-api = { workspace = true }
 [features]
 default = ["std"]
 std = [
+  "sp-core/std",
   "parity-scale-codec/std",
   "sp-api/std",
   "sp-runtime/std",

diff --git a/pallets/msa/src/lib.rs b/pallets/msa/src/lib.rs
@@ -62,7 +62,7 @@ use sp_runtime::{
 	},
 	ArithmeticError, DispatchError, MultiSignature,
 };
-use sp_std::prelude::*;
+use sp_std::{prelude::*, vec};
 
 use common_primitives::msa::DelegationResponse;
 pub use common_primitives::{

diff --git a/pallets/msa/src/rpc/Cargo.toml b/pallets/msa/src/rpc/Cargo.toml
@@ -37,6 +37,7 @@ std = [
   "sp-api/std",
   "sp-runtime/std",
   "sp-offchain/std",
+  "sp-core/std",
   "pallet-msa-runtime-api/std",
   'common-primitives/std',
   "common-helpers/std",

diff --git a/pallets/time-release/Cargo.toml b/pallets/time-release/Cargo.toml
@@ -38,6 +38,7 @@ std = [
   "sp-io/std",
   "sp-runtime/std",
   "sp-std/std",
+  "sp-core/std",
   "frame-benchmarking/std",
   "common-primitives/std",
   "pallet-balances/std",

diff --git a/runtime/common/src/weights/pallet_scheduler.rs b/runtime/common/src/weights/pallet_scheduler.rs
@@ -84,6 +84,80 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for SubstrateWeight<T
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into()))
 	}
+
+	fn schedule_retry(s: u32, ) -> Weight {
+	// Proof Size summary in bytes:
+		//  Measured:  `159`
+		//  Estimated: `159279`
+		// Minimum execution time: 14_069_000 picoseconds.
+		Weight::from_parts(14_868_345, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			// Standard Error: 425
+			.saturating_add(Weight::from_parts(33_468, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `Scheduler::Agenda` (r:1 w:0)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
+	fn set_retry() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `77 + s * (177 ±0)`
+		//  Estimated: `159279`
+		// Minimum execution time: 7_550_000 picoseconds.
+		Weight::from_parts(6_735_955, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Scheduler::Lookup` (r:1 w:0)
+	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:0)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
+	fn set_retry_named() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `513 + s * (179 ±0)`
+		//  Estimated: `159279`
+		// Minimum execution time: 11_017_000 picoseconds.
+		Weight::from_parts(11_749_385, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Scheduler::Agenda` (r:1 w:0)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
+	fn cancel_retry() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `77 + s * (177 ±0)`
+		//  Estimated: `159279`
+		// Minimum execution time: 7_550_000 picoseconds.
+		Weight::from_parts(6_735_955, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Scheduler::Lookup` (r:1 w:0)
+	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:0)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
+	fn cancel_retry_named() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `513 + s * (179 ±0)`
+		//  Estimated: `159279`
+		// Minimum execution time: 11_017_000 picoseconds.
+		Weight::from_parts(11_749_385, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+
 	/// Storage: `Scheduler::Lookup` (r:0 w:1)
 	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	fn service_task_named() -> Weight {

diff --git a/runtime/frequency/Cargo.toml b/runtime/frequency/Cargo.toml
@@ -12,7 +12,7 @@ version = "0.0.0"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0"}
+substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.8.0"}
 
 [dependencies]
 parity-scale-codec = { workspace = true, features = ["derive"] }
@@ -146,7 +146,7 @@ std = [
   "polkadot-parachain-primitives/std",
   "polkadot-runtime-common/std",
   "scale-info/std",
-  "serde",
+  "serde/std",
   "sp-api/std",
   "sp-block-builder/std",
   "sp-consensus-aura/std",
@@ -158,6 +158,7 @@ std = [
   "sp-session/std",
   "sp-std/std",
   "sp-transaction-pool/std",
+  "sp-genesis-builder/std",
   "common-runtime/std",
   "sp-version/std",
   "system-runtime-api/std",
@@ -193,6 +194,7 @@ runtime-benchmarks = [
   "pallet-utility/runtime-benchmarks",
   "sp-runtime/runtime-benchmarks",
   "polkadot-runtime-common/runtime-benchmarks",
+  "polkadot-parachain-primitives/runtime-benchmarks",
   "common-runtime/runtime-benchmarks",
 ]
 try-runtime = [
@@ -228,6 +230,7 @@ try-runtime = [
   "pallet-utility/try-runtime",
   "parachain-info/try-runtime",
   "common-runtime/try-runtime",
+  "sp-runtime/try-runtime",
 ]
 frequency = ["common-runtime/frequency"]
 frequency-testnet = ["common-runtime/frequency-testnet"]