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

fix: change tip payout time, slashes are cancellable by council and technical committee #310

Merged
merged 4 commits into from
Sep 27, 2021
Merged

fix: change tip payout time, slashes are cancellable by council and technical committee #310

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dc8e7e
fix: slashes can be canceled by technical committee or council majority
mrq1911 Sep 25, 2021
48c0f30
slashes can be canceled by majority of council or technical committee
mrq1911 Sep 25, 2021
7780ef9
fix: reduced tip cooldown to 2 hours
mrq1911 Sep 26, 2021
3f48a18
Merge branch 'master' into gov-tweaks
mrq1911 Sep 27, 2021
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
6 changes: 3 additions & 3 deletions runtime/common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ pub type AllTechnicalCommitteeMembers = EnsureOneOf<
frame_system::EnsureRoot<AccountId>,
>;

// During the testnet slashes can be canceled by single technical collective members
// During the testnet slashes can be canceled by majority of council or technical committee
pub type SlashCancelOrigin =
EnsureOneOf<AccountId, EnsureRoot<AccountId>, pallet_collective::EnsureMember<AccountId, TechnicalCollective>>;
EnsureOneOf<AccountId, MajorityOfTechnicalCommittee, MajorityOfCouncil>;

// frame system
parameter_types! {
Expand Down Expand Up @@ -238,7 +238,7 @@ parameter_types! {
// pallet tips
parameter_types! {
pub const DataDepositPerByte: Balance = CENTS;
pub const TipCountdown: BlockNumber = 24 * HOURS;
pub const TipCountdown: BlockNumber = 2 * HOURS;
pub const TipFindersFee: Percent = Percent::from_percent(1);
pub const TipReportDepositBase: Balance = 10 * DOLLARS;
pub const TipReportDepositPerByte: Balance = CENTS;
Expand Down