Skip to content

Commit

Permalink
Merge pull request #329 from liberland/BLOCKCHAIN-169-update-blockchain
Browse files Browse the repository at this point in the history
BLOCKCHAIN-164 - Congress & Senate should be pallet-democracy BlacklistOrigin
  • Loading branch information
DorianSternVukotic authored Oct 5, 2023
2 parents 37831b5 + 40fecce commit fcdf800
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion bin/node/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,11 @@ impl pallet_democracy::Config for Runtime {
pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCollective, 1, 1>,
>
>;
type BlacklistOrigin = EnsureRoot<AccountId>;
type BlacklistOrigin = EitherOfDiverse<
EnsureRoot<AccountId>,
EnsureSenateOrCouncilMajority
>;

// Any single technical committee member may veto a coming council proposal, however they can
// only do it once and it lasts only for the cool-off period.
type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
Expand Down

0 comments on commit fcdf800

Please sign in to comment.