Skip to content

Commit

Permalink
chore(upgrade): v1.7.2 to v1.8.0 (#2081)
Browse files Browse the repository at this point in the history
For more details, please refer to:

[Release
Notes](https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-v1.8.0)

#1894
  • Loading branch information
enddynayn authored Jul 23, 2024
1 parent 4822f39 commit 2676db8
Show file tree
Hide file tree
Showing 37 changed files with 1,793 additions and 1,457 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/verify-pr-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,14 @@ jobs:
steps:
- name: Check Out Repo
uses: actions/checkout@v4
- name: Build Docs
- name: Install Nightly Toolchain
run: rustup toolchain install nightly-2024-03-01
- name: Add Required Components
run: |
rustup target add wasm32-unknown-unknown --toolchain nightly-2024-03-01
rustup component add rust-src --toolchain nightly-2024-03-01
- name: Build Docs
run: |
RUSTDOCFLAGS="--enable-index-page --check -Zunstable-options" cargo +nightly-2024-03-01 doc --no-deps --features frequency
verify-rust-packages-and-deps:
Expand Down
1,361 changes: 775 additions & 586 deletions Cargo.lock

Large diffs are not rendered by default.

198 changes: 99 additions & 99 deletions Cargo.toml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion e2e/capacity/capacity_rpc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('Capacity RPC', function () {
const { baseFee, lenFee, adjustedWeightFee } = feeDetails.inclusionFee.toJSON() as any;
const baseFeeSnapshot = 177812;
assert(
Math.abs(baseFee - baseFeeSnapshot) < 10_000,
Math.abs(baseFee - baseFeeSnapshot) < 50_000,
'The base fee appears to be wrong or have changed more than expected'
);
assert(Math.abs(lenFee - 1170000) < 100, 'The len fee appears to be wrong or have changed more than expected');
Expand Down
6 changes: 4 additions & 2 deletions node/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"]
Expand Down
3 changes: 2 additions & 1 deletion node/cli/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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`."
Expand Down
2 changes: 1 addition & 1 deletion node/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions node/service/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -500,7 +498,6 @@ fn start_consensus(
collator_key,
para_id,
overseer_handle,
slot_duration,
relay_chain_slot_duration,
proposer,
collator_service,
Expand Down
44 changes: 22 additions & 22 deletions pallets/capacity/src/weights.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//! Autogenerated weights for `pallet_capacity`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-07-11, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-07-22, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ip-10-173-5-189`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! HOSTNAME: `ip-10-173-10-212`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("frequency-bench")`, DB CACHE: `1024`
// Executed Command:
Expand Down Expand Up @@ -61,8 +61,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `174`
// Estimated: `6249`
// Minimum execution time: 37_004_000 picoseconds.
Weight::from_parts(37_516_000, 6249)
// Minimum execution time: 39_381_000 picoseconds.
Weight::from_parts(40_678_000, 6249)
.saturating_add(T::DbWeight::get().reads(7_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
Expand All @@ -78,8 +78,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `285`
// Estimated: `6249`
// Minimum execution time: 25_485_000 picoseconds.
Weight::from_parts(26_449_000, 6249)
// Minimum execution time: 27_182_000 picoseconds.
Weight::from_parts(27_758_000, 6249)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
Expand All @@ -91,8 +91,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `2974`
// Minimum execution time: 2_327_000 picoseconds.
Weight::from_parts(2_446_000, 2974)
// Minimum execution time: 2_302_000 picoseconds.
Weight::from_parts(2_416_000, 2974)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
Expand All @@ -108,8 +108,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `271`
// Estimated: `5071`
// Minimum execution time: 24_044_000 picoseconds.
Weight::from_parts(25_140_000, 5071)
// Minimum execution time: 25_138_000 picoseconds.
Weight::from_parts(25_718_000, 5071)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
Expand All @@ -119,8 +119,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 4_537_000 picoseconds.
Weight::from_parts(4_889_000, 0)
// Minimum execution time: 4_067_000 picoseconds.
Weight::from_parts(4_482_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
}
Expand All @@ -145,8 +145,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `174`
// Estimated: `6249`
// Minimum execution time: 37_004_000 picoseconds.
Weight::from_parts(37_516_000, 6249)
// Minimum execution time: 39_381_000 picoseconds.
Weight::from_parts(40_678_000, 6249)
.saturating_add(RocksDbWeight::get().reads(7_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
Expand All @@ -162,8 +162,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `285`
// Estimated: `6249`
// Minimum execution time: 25_485_000 picoseconds.
Weight::from_parts(26_449_000, 6249)
// Minimum execution time: 27_182_000 picoseconds.
Weight::from_parts(27_758_000, 6249)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
Expand All @@ -175,8 +175,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `2974`
// Minimum execution time: 2_327_000 picoseconds.
Weight::from_parts(2_446_000, 2974)
// Minimum execution time: 2_302_000 picoseconds.
Weight::from_parts(2_416_000, 2974)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
Expand All @@ -192,8 +192,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `271`
// Estimated: `5071`
// Minimum execution time: 24_044_000 picoseconds.
Weight::from_parts(25_140_000, 5071)
// Minimum execution time: 25_138_000 picoseconds.
Weight::from_parts(25_718_000, 5071)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
Expand All @@ -203,8 +203,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 4_537_000 picoseconds.
Weight::from_parts(4_889_000, 0)
// Minimum execution time: 4_067_000 picoseconds.
Weight::from_parts(4_482_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
}
Expand Down
1 change: 1 addition & 0 deletions pallets/frequency-tx-payment/src/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
28 changes: 14 additions & 14 deletions pallets/frequency-tx-payment/src/weights.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//! Autogenerated weights for `pallet_frequency_tx_payment`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-07-11, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-07-22, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ip-10-173-5-189`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! HOSTNAME: `ip-10-173-10-212`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("frequency-bench")`, DB CACHE: `1024`
// Executed Command:
Expand Down Expand Up @@ -44,18 +44,18 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 3_236_000 picoseconds.
Weight::from_parts(3_421_000, 0)
// Minimum execution time: 3_330_000 picoseconds.
Weight::from_parts(3_511_000, 0)
}
/// The range of component `n` is `[0, 10]`.
fn pay_with_capacity_batch_all(n: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 5_256_000 picoseconds.
Weight::from_parts(6_282_904, 0)
// Standard Error: 13_079
.saturating_add(Weight::from_parts(3_083_520, 0).saturating_mul(n.into()))
// Minimum execution time: 5_168_000 picoseconds.
Weight::from_parts(6_149_649, 0)
// Standard Error: 10_051
.saturating_add(Weight::from_parts(3_092_193, 0).saturating_mul(n.into()))
}
}

Expand All @@ -65,18 +65,18 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 3_236_000 picoseconds.
Weight::from_parts(3_421_000, 0)
// Minimum execution time: 3_330_000 picoseconds.
Weight::from_parts(3_511_000, 0)
}
/// The range of component `n` is `[0, 10]`.
fn pay_with_capacity_batch_all(n: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 5_256_000 picoseconds.
Weight::from_parts(6_282_904, 0)
// Standard Error: 13_079
.saturating_add(Weight::from_parts(3_083_520, 0).saturating_mul(n.into()))
// Minimum execution time: 5_168_000 picoseconds.
Weight::from_parts(6_149_649, 0)
// Standard Error: 10_051
.saturating_add(Weight::from_parts(3_092_193, 0).saturating_mul(n.into()))
}
}

Expand Down
44 changes: 22 additions & 22 deletions pallets/handles/src/weights.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//! Autogenerated weights for `pallet_handles`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-07-11, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-07-22, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ip-10-173-5-189`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! HOSTNAME: `ip-10-173-10-212`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("frequency-bench")`, DB CACHE: `1024`
// Executed Command:
Expand Down Expand Up @@ -54,10 +54,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `116`
// Estimated: `5009`
// Minimum execution time: 65_766_000 picoseconds.
Weight::from_parts(67_197_664, 5009)
// Standard Error: 7_700
.saturating_add(Weight::from_parts(93_257, 0).saturating_mul(b.into()))
// Minimum execution time: 64_491_000 picoseconds.
Weight::from_parts(66_067_584, 5009)
// Standard Error: 8_565
.saturating_add(Weight::from_parts(107_320, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
}
Expand All @@ -74,10 +74,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `222 + b * (1 ±0)`
// Estimated: `5009`
// Minimum execution time: 73_836_000 picoseconds.
Weight::from_parts(75_189_512, 5009)
// Standard Error: 8_314
.saturating_add(Weight::from_parts(177_972, 0).saturating_mul(b.into()))
// Minimum execution time: 72_719_000 picoseconds.
Weight::from_parts(73_627_821, 5009)
// Standard Error: 8_127
.saturating_add(Weight::from_parts(188_421, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
Expand All @@ -91,8 +91,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `231`
// Estimated: `5009`
// Minimum execution time: 20_598_000 picoseconds.
Weight::from_parts(21_064_000, 5009)
// Minimum execution time: 19_724_000 picoseconds.
Weight::from_parts(20_448_000, 5009)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
Expand All @@ -113,10 +113,10 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `116`
// Estimated: `5009`
// Minimum execution time: 65_766_000 picoseconds.
Weight::from_parts(67_197_664, 5009)
// Standard Error: 7_700
.saturating_add(Weight::from_parts(93_257, 0).saturating_mul(b.into()))
// Minimum execution time: 64_491_000 picoseconds.
Weight::from_parts(66_067_584, 5009)
// Standard Error: 8_565
.saturating_add(Weight::from_parts(107_320, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(3_u64))
}
Expand All @@ -133,10 +133,10 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `222 + b * (1 ±0)`
// Estimated: `5009`
// Minimum execution time: 73_836_000 picoseconds.
Weight::from_parts(75_189_512, 5009)
// Standard Error: 8_314
.saturating_add(Weight::from_parts(177_972, 0).saturating_mul(b.into()))
// Minimum execution time: 72_719_000 picoseconds.
Weight::from_parts(73_627_821, 5009)
// Standard Error: 8_127
.saturating_add(Weight::from_parts(188_421, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
Expand All @@ -150,8 +150,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `231`
// Estimated: `5009`
// Minimum execution time: 20_598_000 picoseconds.
Weight::from_parts(21_064_000, 5009)
// Minimum execution time: 19_724_000 picoseconds.
Weight::from_parts(20_448_000, 5009)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
Expand Down
Loading

0 comments on commit 2676db8

Please sign in to comment.