Skip to content

Commit

Permalink
Community council dApp unregister (#1371)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dinonard authored Oct 8, 2024
1 parent 82b60ce commit 37f9e0b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions primitives/src/governance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,8 @@ pub type EnsureRootOrHalfCommunityCouncil = EitherOfDiverse<
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionAtLeast<AccountId, CommunityCouncilCollectiveInst, 1, 2>,
>;

pub type EnsureRootOrFourFifthsCommunityCouncil = EitherOfDiverse<
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionAtLeast<AccountId, CommunityCouncilCollectiveInst, 4, 5>,
>;
10 changes: 5 additions & 5 deletions runtime/shibuya/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ use astar_primitives::{
governance::{
CommunityCouncilCollectiveInst, CommunityCouncilMembershipInst, CommunityTreasuryInst,
EnsureRootOrAllMainCouncil, EnsureRootOrAllTechnicalCommittee,
EnsureRootOrHalfCommunityCouncil, EnsureRootOrHalfMainCouncil,
EnsureRootOrHalfTechnicalCommittee, MainCouncilCollectiveInst, MainCouncilMembershipInst,
MainTreasuryInst, OracleMembershipInst, TechnicalCommitteeCollectiveInst,
TechnicalCommitteeMembershipInst,
EnsureRootOrFourFifthsCommunityCouncil, EnsureRootOrHalfCommunityCouncil,
EnsureRootOrHalfMainCouncil, EnsureRootOrHalfTechnicalCommittee, MainCouncilCollectiveInst,
MainCouncilMembershipInst, MainTreasuryInst, OracleMembershipInst,
TechnicalCommitteeCollectiveInst, TechnicalCommitteeMembershipInst,
},
oracle::{CurrencyAmount, CurrencyId, DummyCombineData, Price},
xcm::AssetLocationIdConverter,
Expand Down Expand Up @@ -466,7 +466,7 @@ impl pallet_dapp_staking::Config for Runtime {
type Currency = Balances;
type SmartContract = SmartContract<AccountId>;
type ContractRegisterOrigin = EnsureRootOrHalfCommunityCouncil;
type ContractUnregisterOrigin = frame_system::EnsureRoot<AccountId>;
type ContractUnregisterOrigin = EnsureRootOrFourFifthsCommunityCouncil;
type ManagerOrigin = EnsureRootOrHalfTechnicalCommittee;
type NativePriceProvider = PriceAggregator;
type StakingRewardHandler = Inflation;
Expand Down

0 comments on commit 37f9e0b

Please sign in to comment.