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

Companion for Substrate #13564 #6845

Merged
merged 3 commits into from
Mar 11, 2023
Merged

Companion for Substrate #13564 #6845

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7278344
Update beefy pallet to last offence report system
davxy Mar 8, 2023
199fb0a
Merge remote-tracking branch 'origin/master' into davxy-companion-for…
Mar 11, 2023
00a9b00
update lockfile for {"substrate"}
Mar 11, 2023
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
25 changes: 3 additions & 22 deletions runtime/rococo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,19 +245,13 @@ parameter_types! {
impl pallet_babe::Config for Runtime {
type EpochDuration = EpochDurationInBlocks;
type ExpectedBlockTime = ExpectedBlockTime;

// session module is the trigger
type EpochChangeTrigger = pallet_babe::ExternalTrigger;

type DisabledValidators = Session;

type WeightInfo = ();

type MaxAuthorities = MaxAuthorities;

type KeyOwnerProof =
<Historical as KeyOwnerProofSystem<(KeyTypeId, pallet_babe::AuthorityId)>>::Proof;

type EquivocationReportSystem =
pallet_babe::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
}
Expand Down Expand Up @@ -659,13 +653,10 @@ parameter_types! {

impl pallet_grandpa::Config for Runtime {
type RuntimeEvent = RuntimeEvent;

type WeightInfo = ();
type MaxAuthorities = MaxAuthorities;
type MaxSetIdSessionEntries = MaxSetIdSessionEntries;

type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;

type EquivocationReportSystem =
pallet_grandpa::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
}
Expand Down Expand Up @@ -1234,23 +1225,13 @@ parameter_types! {

impl pallet_beefy::Config for Runtime {
type BeefyId = BeefyId;
type KeyOwnerProofSystem = Historical;
type KeyOwnerProof =
<Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, BeefyId)>>::Proof;
type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
KeyTypeId,
BeefyId,
)>>::IdentificationTuple;
type HandleEquivocation = pallet_beefy::EquivocationHandler<
BlockNumber,
Self::KeyOwnerIdentification,
Offences,
ReportLongevity,
>;
type MaxAuthorities = MaxAuthorities;
type MaxSetIdSessionEntries = BeefySetIdSessionEntries;
type OnNewValidatorSet = MmrLeaf;
type WeightInfo = ();
type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, BeefyId)>>::Proof;
type EquivocationReportSystem =
pallet_beefy::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
}

type MmrHash = <Keccak256 as sp_runtime::traits::Hash>::Output;
Expand Down