From 4dc8e7e79268776cc20a2effcb21411be8162d43 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Sat, 25 Sep 2021 01:46:56 +0100 Subject: [PATCH 1/3] fix: slashes can be canceled by technical committee or council majority --- runtime/common/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 757e2fbe4..ba05bfcaf 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -116,9 +116,9 @@ pub type AllTechnicalCommitteeMembers = EnsureOneOf< frame_system::EnsureRoot, >; -// 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, pallet_collective::EnsureMember>; + EnsureOneOf, MajorityOfCouncil, MajorityOfTechnicalCommittee; // frame system parameter_types! { From 48c0f30eb32d8dbc99dbbdf329c63be6b63dacb0 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Sat, 25 Sep 2021 02:14:23 +0100 Subject: [PATCH 2/3] slashes can be canceled by majority of council or technical committee --- runtime/common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index ba05bfcaf..9bf4f4352 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -118,7 +118,7 @@ pub type AllTechnicalCommitteeMembers = EnsureOneOf< // During the testnet slashes can be canceled by majority of council or technical committee pub type SlashCancelOrigin = - EnsureOneOf, MajorityOfCouncil, MajorityOfTechnicalCommittee; + EnsureOneOf; // frame system parameter_types! { From 7780ef9c10dd341e8d20d71bade1b08403a177b7 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Sun, 26 Sep 2021 22:08:20 +0100 Subject: [PATCH 3/3] fix: reduced tip cooldown to 2 hours --- runtime/common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 9bf4f4352..48a91edc1 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -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;