git.delta.rocks / unique-network / refs/commits / 22e4325fd490

difftreelog

Merge pull request #1033 from UniqueNetwork/fix/enable-gov-on-unique

Yaroslav Bolyukin2023-11-03parents: #4f574e9 #88b31e7.patch.diff
in: master

10 files changed

modified.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}
addedruntime/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>;
+}
modifiedruntime/common/config/governance/mod.rsdiffbeforeafterboth
--- a/runtime/common/config/governance/mod.rs
+++ b/runtime/common/config/governance/mod.rs
@@ -55,6 +55,8 @@
 pub mod scheduler;
 pub use scheduler::*;
 
+pub mod identity;
+
 impl pallet_gov_origins::Config for Runtime {}
 
 morph_types! {
modifiedruntime/common/config/pallets/collator_selection.rsdiffbeforeafterboth
22	CollatorSelectionLicenseBondOverride,22	CollatorSelectionLicenseBondOverride,
23};23};
24use sp_runtime::Perbill;24use sp_runtime::Perbill;
25use up_common::constants::{MILLIUNIQUE, UNIQUE};
2625
27#[cfg(feature = "governance")]26#[cfg(feature = "governance")]
28use crate::config::governance;27use crate::config::governance;
29use crate::{28use crate::{
30	config::pallets::{MaxCollators, SessionPeriod, TreasuryAccountId},29	config::pallets::{MaxCollators, SessionPeriod, TreasuryAccountId},
31	Aura, Balance, Balances, BlockNumber, CollatorSelection, Runtime, RuntimeEvent,30	Aura, Balance, Balances, BlockNumber, CollatorSelection, Runtime, RuntimeEvent,
32	RuntimeHoldReason, Session, SessionKeys, Treasury,31	RuntimeHoldReason, Session, SessionKeys,
33};32};
34parameter_types! {33parameter_types! {
35	pub const SessionOffset: BlockNumber = 0;34	pub const SessionOffset: BlockNumber = 0;
59}58}
6059
61parameter_types! {60parameter_types! {
62	// These do not matter as we forbid non-sudo operations with the identity pallet
63	pub const BasicDeposit: Balance = 10 * UNIQUE;
64	pub const FieldDeposit: Balance = 25 * MILLIUNIQUE;
65	pub const SubAccountDeposit: Balance = 2 * UNIQUE;
66	pub const MaxSubAccounts: u32 = 100;
67	pub const MaxAdditionalFields: u32 = 100;
68	pub const MaxRegistrars: u32 = 20;
69	pub const LicenceBondIdentifier: [u8; 16] = *b"licenceidentifie";
70	pub LicenseBond: Balance =  CollatorSelectionLicenseBondOverride::<Runtime>::get();61	pub LicenseBond: Balance =  CollatorSelectionLicenseBondOverride::<Runtime>::get();
71	pub DesiredCollators: u32 = CollatorSelectionDesiredCollatorsOverride::<Runtime>::get();62	pub DesiredCollators: u32 = CollatorSelectionDesiredCollatorsOverride::<Runtime>::get();
72	pub KickThreshold: BlockNumber = CollatorSelectionKickThresholdOverride::<Runtime>::get();63	pub KickThreshold: BlockNumber = CollatorSelectionKickThresholdOverride::<Runtime>::get();
73}64}
74
75impl pallet_identity::Config for Runtime {
76	type RuntimeEvent = RuntimeEvent;
77	type Currency = Balances;
78	type BasicDeposit = BasicDeposit;
79	type FieldDeposit = FieldDeposit;
80	type MaxAdditionalFields = MaxAdditionalFields;
81	type MaxRegistrars = MaxRegistrars;
82	type MaxSubAccounts = MaxSubAccounts;
83	type SubAccountDeposit = SubAccountDeposit;
84
85	#[cfg(feature = "governance")]
86	type RegistrarOrigin = governance::RootOrTechnicalCommitteeMember;
87
88	#[cfg(feature = "governance")]
89	type ForceOrigin = governance::RootOrTechnicalCommitteeMember;
90
91	#[cfg(not(feature = "governance"))]
92	type RegistrarOrigin = EnsureRoot<<Self as frame_system::Config>::AccountId>;
93
94	#[cfg(not(feature = "governance"))]
95	type ForceOrigin = EnsureRoot<<Self as frame_system::Config>::AccountId>;
96
97	type Slashed = Treasury;
98	type WeightInfo = pallet_identity::weights::SubstrateWeight<Runtime>;
99}
10065
101parameter_types! {66parameter_types! {
102	pub const PotId: PalletId = PalletId(*b"PotStake");67	pub const PotId: PalletId = PalletId(*b"PotStake");
modifiedruntime/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")]
modifiedruntime/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()),
 		}
modifiedruntime/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)),
modifiedruntime/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")]
modifiedruntime/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 = []
modifiedtests/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,
         );
       }
     });