difftreelog
Merge pull request #1033 from UniqueNetwork/fix/enable-gov-on-unique
in: master
10 files changed
.github/workflows/governance.ymldiffbeforeafterboth--- a/.github/workflows/governance.yml
+++ b/.github/workflows/governance.yml
@@ -31,6 +31,7 @@
id: create_matrix
with:
matrix: |
+ network {unique}, wasm_name {unique}
network {quartz}, wasm_name {quartz}
network {opal}, wasm_name {opal}
network {sapphire}, wasm_name {quartz}
runtime/common/config/governance/identity.rsdiffbeforeafterboth--- /dev/null
+++ b/runtime/common/config/governance/identity.rs
@@ -0,0 +1,33 @@
+use frame_support::parameter_types;
+use up_common::constants::{MILLIUNIQUE, UNIQUE};
+
+use crate::{
+ runtime_common::config::governance, Balance, Balances, Runtime, RuntimeEvent, Treasury,
+};
+
+parameter_types! {
+ // These do not matter as we forbid non-gov operations with the identity pallet
+ pub const BasicDeposit: Balance = 10 * UNIQUE;
+ pub const FieldDeposit: Balance = 25 * MILLIUNIQUE;
+ pub const SubAccountDeposit: Balance = 2 * UNIQUE;
+ pub const MaxSubAccounts: u32 = 100;
+ pub const MaxAdditionalFields: u32 = 100;
+ pub const MaxRegistrars: u32 = 20;
+}
+
+impl pallet_identity::Config for Runtime {
+ type RuntimeEvent = RuntimeEvent;
+ type Currency = Balances;
+ type BasicDeposit = BasicDeposit;
+ type FieldDeposit = FieldDeposit;
+ type MaxAdditionalFields = MaxAdditionalFields;
+ type MaxRegistrars = MaxRegistrars;
+ type MaxSubAccounts = MaxSubAccounts;
+ type SubAccountDeposit = SubAccountDeposit;
+
+ type RegistrarOrigin = governance::RootOrTechnicalCommitteeMember;
+ type ForceOrigin = governance::RootOrTechnicalCommitteeMember;
+
+ type Slashed = Treasury;
+ type WeightInfo = pallet_identity::weights::SubstrateWeight<Runtime>;
+}
runtime/common/config/governance/mod.rsdiffbeforeafterboth55pub mod scheduler;55pub mod scheduler;56pub use scheduler::*;56pub use scheduler::*;5758pub mod identity;575958impl pallet_gov_origins::Config for Runtime {}60impl pallet_gov_origins::Config for Runtime {}5961runtime/common/config/pallets/collator_selection.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/collator_selection.rs
+++ b/runtime/common/config/pallets/collator_selection.rs
@@ -22,14 +22,13 @@
CollatorSelectionLicenseBondOverride,
};
use sp_runtime::Perbill;
-use up_common::constants::{MILLIUNIQUE, UNIQUE};
#[cfg(feature = "governance")]
use crate::config::governance;
use crate::{
config::pallets::{MaxCollators, SessionPeriod, TreasuryAccountId},
Aura, Balance, Balances, BlockNumber, CollatorSelection, Runtime, RuntimeEvent,
- RuntimeHoldReason, Session, SessionKeys, Treasury,
+ RuntimeHoldReason, Session, SessionKeys,
};
parameter_types! {
pub const SessionOffset: BlockNumber = 0;
@@ -59,43 +58,9 @@
}
parameter_types! {
- // These do not matter as we forbid non-sudo operations with the identity pallet
- pub const BasicDeposit: Balance = 10 * UNIQUE;
- pub const FieldDeposit: Balance = 25 * MILLIUNIQUE;
- pub const SubAccountDeposit: Balance = 2 * UNIQUE;
- pub const MaxSubAccounts: u32 = 100;
- pub const MaxAdditionalFields: u32 = 100;
- pub const MaxRegistrars: u32 = 20;
- pub const LicenceBondIdentifier: [u8; 16] = *b"licenceidentifie";
pub LicenseBond: Balance = CollatorSelectionLicenseBondOverride::<Runtime>::get();
pub DesiredCollators: u32 = CollatorSelectionDesiredCollatorsOverride::<Runtime>::get();
pub KickThreshold: BlockNumber = CollatorSelectionKickThresholdOverride::<Runtime>::get();
-}
-
-impl pallet_identity::Config for Runtime {
- type RuntimeEvent = RuntimeEvent;
- type Currency = Balances;
- type BasicDeposit = BasicDeposit;
- type FieldDeposit = FieldDeposit;
- type MaxAdditionalFields = MaxAdditionalFields;
- type MaxRegistrars = MaxRegistrars;
- type MaxSubAccounts = MaxSubAccounts;
- type SubAccountDeposit = SubAccountDeposit;
-
- #[cfg(feature = "governance")]
- type RegistrarOrigin = governance::RootOrTechnicalCommitteeMember;
-
- #[cfg(feature = "governance")]
- type ForceOrigin = governance::RootOrTechnicalCommitteeMember;
-
- #[cfg(not(feature = "governance"))]
- type RegistrarOrigin = EnsureRoot<<Self as frame_system::Config>::AccountId>;
-
- #[cfg(not(feature = "governance"))]
- type ForceOrigin = EnsureRoot<<Self as frame_system::Config>::AccountId>;
-
- type Slashed = Treasury;
- type WeightInfo = pallet_identity::weights::SubstrateWeight<Runtime>;
}
parameter_types! {
runtime/common/construct_runtime.rsdiffbeforeafterboth--- a/runtime/common/construct_runtime.rs
+++ b/runtime/common/construct_runtime.rs
@@ -50,7 +50,7 @@
Tokens: orml_tokens = 39,
// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,
- #[cfg(feature = "collator-selection")]
+ #[cfg(feature = "governance")]
Identity: pallet_identity = 40,
#[cfg(feature = "preimage")]
runtime/common/identity.rsdiffbeforeafterboth--- a/runtime/common/identity.rs
+++ b/runtime/common/identity.rs
@@ -16,7 +16,7 @@
use parity_scale_codec::{Decode, Encode};
use scale_info::TypeInfo;
-#[cfg(feature = "collator-selection")]
+#[cfg(feature = "governance")]
use sp_runtime::transaction_validity::InvalidTransaction;
use sp_runtime::{
traits::{DispatchInfoOf, SignedExtension},
@@ -59,7 +59,7 @@
_len: usize,
) -> TransactionValidity {
match call {
- #[cfg(feature = "collator-selection")]
+ #[cfg(feature = "governance")]
RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
_ => Ok(ValidTransaction::default()),
}
runtime/common/maintenance.rsdiffbeforeafterboth--- a/runtime/common/maintenance.rs
+++ b/runtime/common/maintenance.rs
@@ -78,9 +78,12 @@
}
#[cfg(feature = "collator-selection")]
- RuntimeCall::CollatorSelection(_)
- | RuntimeCall::Session(_)
- | RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+ RuntimeCall::CollatorSelection(_) | RuntimeCall::Session(_) => {
+ Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
+ }
+
+ #[cfg(feature = "governance")]
+ RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
#[cfg(feature = "pallet-test-utils")]
RuntimeCall::TestUtils(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -551,7 +551,7 @@
#[cfg(feature = "collator-selection")]
list_benchmark!(list, extra, pallet_collator_selection, CollatorSelection);
- #[cfg(feature = "collator-selection")]
+ #[cfg(feature = "governance")]
list_benchmark!(list, extra, pallet_identity, Identity);
#[cfg(feature = "foreign-assets")]
@@ -615,7 +615,7 @@
#[cfg(feature = "collator-selection")]
add_benchmark!(params, batches, pallet_collator_selection, CollatorSelection);
- #[cfg(feature = "collator-selection")]
+ #[cfg(feature = "governance")]
add_benchmark!(params, batches, pallet_identity, Identity);
#[cfg(feature = "foreign-assets")]
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -214,7 +214,7 @@
'pallet-xcm/try-runtime',
'parachain-info/try-runtime',
]
-unique-runtime = ['app-promotion', 'foreign-assets', 'refungible']
+unique-runtime = ['app-promotion', 'foreign-assets', 'refungible', 'governance', 'preimage']
app-promotion = []
collator-selection = []
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -68,7 +68,7 @@
const refungible = 'refungible';
const foreignAssets = 'foreignassets';
const appPromotion = 'apppromotion';
- const collatorSelection = ['authorship', 'session', 'collatorselection', 'identity'];
+ const collatorSelection = ['authorship', 'session', 'collatorselection'];
const preimage = ['preimage'];
const governance = [
'council',
@@ -80,6 +80,7 @@
'scheduler',
'technicalcommittee',
'technicalcommitteemembership',
+ 'identity',
];
const testUtils = 'testutils';
@@ -108,6 +109,8 @@
refungible,
foreignAssets,
appPromotion,
+ ...preimage,
+ ...governance,
);
}
});