Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Companion for substrate/pull/7215 #1768

Merged
bkchr merged 11 commits into from
Oct 4, 2020
Merged

Companion for substrate/pull/7215 #1768

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a1193ff
Companion for substrate/pull/7215
kianenigma Sep 29, 2020
56e49da
More fixes
kianenigma Sep 29, 2020
f3849d1
Fix build
kianenigma Sep 29, 2020
d7e391a
fix
kianenigma Sep 30, 2020
1afde63
Fix again with normal
kianenigma Sep 30, 2020
6222a59
Merge branch 'master' of github.com:paritytech/polkadot into kiz-comp…
kianenigma Oct 2, 2020
1d47c1d
Fix build
kianenigma Oct 2, 2020
0b4188a
Latest changes
kianenigma Oct 2, 2020
0dfb92b
"Update Substrate"
Oct 2, 2020
b74afaa
Master.into()
kianenigma Oct 4, 2020
8413e80
Merge branch 'kiz-comp-7215' of github.com:paritytech/polkadot into k…
kianenigma Oct 4, 2020
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
Prev Previous commit
Next Next commit
Fix again with normal
  • Loading branch information
@kianenigma
kianenigma committed Sep 30, 2020
commit 1afde6386738c0f5780df06b1c7b0c1f995cc840
11 changes: 3 additions & 8 deletions runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,6 @@ parameter_types! {
pub const ElectionLookahead: BlockNumber = EPOCH_DURATION_IN_BLOCKS / 4;
pub const MaxIterations: u32 = 10;
pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000);
// The unsigned solution is mandatory, and this is the absolute maximum weight that we allow for
// it.
pub OffchainSolutionWeightLimit: Weight =
MaximumBlockWeight::get()
.saturating_sub(BlockExecutionWeight::get())
.saturating_sub(ExtrinsicBaseWeight::get())
.saturating_sub(AVERAGE_ON_INITIALIZE_WEIGHT * MaximumBlockWeight::get());
}

type SlashCancelOrigin = EnsureOneOf<
Expand Down Expand Up @@ -369,7 +362,9 @@ impl pallet_staking::Trait for Runtime {
type UnsignedPriority = StakingUnsignedPriority;
type MaxIterations = MaxIterations;
type MinSolutionScoreBump = MinSolutionScoreBump;
type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
// The unsigned solution weight targeted by the OCW. We set it to the maximum possible value of
// a single extrinsic.
type OffchainSolutionWeightLimit = MaximumExtrinsicWeight;
type WeightInfo = weights::pallet_staking::WeightInfo;
}

Expand Down
11 changes: 3 additions & 8 deletions runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,13 +339,6 @@ parameter_types! {
pub const ElectionLookahead: BlockNumber = EPOCH_DURATION_IN_BLOCKS / 16;
pub const MaxIterations: u32 = 10;
pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000);
// The unsigned solution is mandatory, and this is the absolute maximum weight that we allow for
// it.
pub OffchainSolutionWeightLimit: Weight =
MaximumBlockWeight::get()
.saturating_sub(BlockExecutionWeight::get())
.saturating_sub(ExtrinsicBaseWeight::get())
.saturating_sub(AVERAGE_ON_INITIALIZE_WEIGHT * MaximumBlockWeight::get());
}

type SlashCancelOrigin = EnsureOneOf<
Expand Down Expand Up @@ -376,7 +369,9 @@ impl pallet_staking::Trait for Runtime {
type UnsignedPriority = StakingUnsignedPriority;
type MaxIterations = MaxIterations;
type MinSolutionScoreBump = MinSolutionScoreBump;
type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
// The unsigned solution weight targeted by the OCW. We set it to the maximum possible value of
// a single extrinsic.
type OffchainSolutionWeightLimit = MaximumExtrinsicWeight;
type WeightInfo = weights::pallet_staking::WeightInfo;
}

Expand Down
9 changes: 1 addition & 8 deletions runtime/westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,6 @@ parameter_types! {
pub const ElectionLookahead: BlockNumber = EPOCH_DURATION_IN_BLOCKS / 4;
pub const MaxIterations: u32 = 10;
pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000);
// The unsigned solution is mandatory, and this is the absolute maximum weight that we allow for
// it.
pub OffchainSolutionWeightLimit: Weight =
MaximumBlockWeight::get()
.saturating_sub(BlockExecutionWeight::get())
.saturating_sub(ExtrinsicBaseWeight::get())
.saturating_sub(AVERAGE_ON_INITIALIZE_WEIGHT * MaximumBlockWeight::get());
}

impl pallet_staking::Trait for Runtime {
Expand All @@ -341,7 +334,7 @@ impl pallet_staking::Trait for Runtime {
type UnsignedPriority = StakingUnsignedPriority;
type MaxIterations = MaxIterations;
type MinSolutionScoreBump = MinSolutionScoreBump;
type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
type OffchainSolutionWeightLimit = MaximumExtrinsicWeight;
type WeightInfo = weights::pallet_staking::WeightInfo;
}

Expand Down