Skip to content

Commit 37f9e0b

Browse files
authored
Community council dApp unregister (#1371)
1 parent 82b60ce commit 37f9e0b

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

primitives/src/governance.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,8 @@ pub type EnsureRootOrHalfCommunityCouncil = EitherOfDiverse<
8080
EnsureRoot<AccountId>,
8181
pallet_collective::EnsureProportionAtLeast<AccountId, CommunityCouncilCollectiveInst, 1, 2>,
8282
>;
83+
84+
pub type EnsureRootOrFourFifthsCommunityCouncil = EitherOfDiverse<
85+
EnsureRoot<AccountId>,
86+
pallet_collective::EnsureProportionAtLeast<AccountId, CommunityCouncilCollectiveInst, 4, 5>,
87+
>;

runtime/shibuya/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ use astar_primitives::{
8787
governance::{
8888
CommunityCouncilCollectiveInst, CommunityCouncilMembershipInst, CommunityTreasuryInst,
8989
EnsureRootOrAllMainCouncil, EnsureRootOrAllTechnicalCommittee,
90-
EnsureRootOrHalfCommunityCouncil, EnsureRootOrHalfMainCouncil,
91-
EnsureRootOrHalfTechnicalCommittee, MainCouncilCollectiveInst, MainCouncilMembershipInst,
92-
MainTreasuryInst, OracleMembershipInst, TechnicalCommitteeCollectiveInst,
93-
TechnicalCommitteeMembershipInst,
90+
EnsureRootOrFourFifthsCommunityCouncil, EnsureRootOrHalfCommunityCouncil,
91+
EnsureRootOrHalfMainCouncil, EnsureRootOrHalfTechnicalCommittee, MainCouncilCollectiveInst,
92+
MainCouncilMembershipInst, MainTreasuryInst, OracleMembershipInst,
93+
TechnicalCommitteeCollectiveInst, TechnicalCommitteeMembershipInst,
9494
},
9595
oracle::{CurrencyAmount, CurrencyId, DummyCombineData, Price},
9696
xcm::AssetLocationIdConverter,
@@ -466,7 +466,7 @@ impl pallet_dapp_staking::Config for Runtime {
466466
type Currency = Balances;
467467
type SmartContract = SmartContract<AccountId>;
468468
type ContractRegisterOrigin = EnsureRootOrHalfCommunityCouncil;
469-
type ContractUnregisterOrigin = frame_system::EnsureRoot<AccountId>;
469+
type ContractUnregisterOrigin = EnsureRootOrFourFifthsCommunityCouncil;
470470
type ManagerOrigin = EnsureRootOrHalfTechnicalCommittee;
471471
type NativePriceProvider = PriceAggregator;
472472
type StakingRewardHandler = Inflation;

0 commit comments

Comments
 (0)