Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(upgrade): polkadot v1.10 to v1.2.0 #1982

Merged
merged 1 commit into from
May 29, 2024
Merged

chore(upgrade): polkadot v1.10 to v1.2.0 #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
813 changes: 367 additions & 446 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

190 changes: 95 additions & 95 deletions Cargo.toml
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion e2e/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions e2e/proxy-pallet/proxy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('Proxy', function () {
ExtrinsicHelper.api.tx.proxy.proxy(
stashKeys.address,
'Any',
ExtrinsicHelper.api.tx.balances.transfer(proxyKeys.address, 1n * DOLLARS)
ExtrinsicHelper.api.tx.balances.transferAllowDeath(proxyKeys.address, 1n * DOLLARS)
),
proxyKeys,
ExtrinsicHelper.api.events.balances.Transfer
Expand Down Expand Up @@ -84,7 +84,7 @@ describe('Proxy', function () {
ExtrinsicHelper.api.tx.proxy.proxy(
stashKeys.address,
'Any',
ExtrinsicHelper.api.tx.balances.transfer(proxyKeys.address, 1n * DOLLARS)
ExtrinsicHelper.api.tx.balances.transferAllowDeath(proxyKeys.address, 1n * DOLLARS)
),
proxyKeys,
ExtrinsicHelper.api.events.system.ExtrinsicFailed
Expand All @@ -104,7 +104,7 @@ describe('Proxy', function () {
stashKeys.address,
'Any',
ExtrinsicHelper.api.tx.utility.batch([
ExtrinsicHelper.api.tx.balances.transfer(proxyKeys.address, 1n * DOLLARS),
ExtrinsicHelper.api.tx.balances.transferAllowDeath(proxyKeys.address, 1n * DOLLARS),
])
),
proxyKeys,
Expand Down
1 change: 1 addition & 0 deletions node/service/src/block_sealing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ pub fn frequency_dev_sealing(
import_queue,
block_announce_validator_builder: None,
warp_sync_params: None,
block_relay: None,
})?;

// Start off-chain workers if enabled
Expand Down
44 changes: 22 additions & 22 deletions pallets/capacity/src/weights.rs
View file
Open in desktop
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 4.0.0-dev
//! DATE: 2024-05-21, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-05-24, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ip-10-173-4-174`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! HOSTNAME: `ip-10-173-4-53`, 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: 40_905_000 picoseconds.
Weight::from_parts(41_735_000, 6249)
// Minimum execution time: 39_892_000 picoseconds.
Weight::from_parts(41_069_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: 27_968_000 picoseconds.
Weight::from_parts(28_258_000, 6249)
// Minimum execution time: 27_071_000 picoseconds.
Weight::from_parts(27_828_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: 3_960_000 picoseconds.
Weight::from_parts(4_060_000, 2974)
// Minimum execution time: 3_837_000 picoseconds.
Weight::from_parts(4_100_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: 26_250_000 picoseconds.
Weight::from_parts(26_923_000, 5071)
// Minimum execution time: 26_393_000 picoseconds.
Weight::from_parts(27_053_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: 6_267_000 picoseconds.
Weight::from_parts(6_644_000, 0)
// Minimum execution time: 6_456_000 picoseconds.
Weight::from_parts(6_752_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: 40_905_000 picoseconds.
Weight::from_parts(41_735_000, 6249)
// Minimum execution time: 39_892_000 picoseconds.
Weight::from_parts(41_069_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: 27_968_000 picoseconds.
Weight::from_parts(28_258_000, 6249)
// Minimum execution time: 27_071_000 picoseconds.
Weight::from_parts(27_828_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: 3_960_000 picoseconds.
Weight::from_parts(4_060_000, 2974)
// Minimum execution time: 3_837_000 picoseconds.
Weight::from_parts(4_100_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: 26_250_000 picoseconds.
Weight::from_parts(26_923_000, 5071)
// Minimum execution time: 26_393_000 picoseconds.
Weight::from_parts(27_053_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: 6_267_000 picoseconds.
Weight::from_parts(6_644_000, 0)
// Minimum execution time: 6_456_000 picoseconds.
Weight::from_parts(6_752_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
}
Expand Down
5 changes: 3 additions & 2 deletions pallets/frequency-tx-payment/src/tests/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,15 @@ pub struct TestCapacityCalls;
impl GetStableWeight<RuntimeCall, Weight> for TestCapacityCalls {
fn get_stable_weight(call: &RuntimeCall) -> Option<Weight> {
match call {
RuntimeCall::Balances(BalancesCall::transfer { .. }) => Some(Weight::from_parts(11, 0)),
RuntimeCall::Balances(BalancesCall::transfer_allow_death { .. }) =>
Some(Weight::from_parts(11, 0)),
RuntimeCall::Msa(pallet_msa::Call::create { .. }) => Some(Weight::from_parts(12, 0)),
_ => None,
}
}

fn get_inner_calls(_call: &RuntimeCall) -> Option<Vec<&RuntimeCall>> {
return Some(vec![&RuntimeCall::Msa(pallet_msa::Call::create {})])
return Some(vec![&RuntimeCall::Msa(pallet_msa::Call::create {})]);
}
}

Expand Down
Loading