git.delta.rocks / unique-network / refs/commits / 64ac6cdfa3e0

difftreelog

fix enable governance on Unique

Daniel Shiposha2023-11-02parent: #4f574e9.patch.diff
in: master

9 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
--- 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! {
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
before · runtime/common/maintenance.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use parity_scale_codec::{Decode, Encode};18use scale_info::TypeInfo;19use sp_runtime::{20	traits::{DispatchInfoOf, SignedExtension},21	transaction_validity::{22		InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction,23	},24};25use up_common::types::AccountId;2627use crate::{Maintenance, RuntimeCall};2829#[derive(Debug, Encode, Decode, PartialEq, Eq, Clone, TypeInfo)]30pub struct CheckMaintenance;3132impl SignedExtension for CheckMaintenance {33	type AccountId = AccountId;34	type Call = RuntimeCall;35	type AdditionalSigned = ();36	type Pre = ();3738	const IDENTIFIER: &'static str = "CheckMaintenance";3940	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {41		Ok(())42	}4344	fn pre_dispatch(45		self,46		who: &Self::AccountId,47		call: &Self::Call,48		info: &DispatchInfoOf<Self::Call>,49		len: usize,50	) -> Result<Self::Pre, TransactionValidityError> {51		self.validate(who, call, info, len).map(|_| ())52	}5354	fn validate(55		&self,56		_who: &Self::AccountId,57		call: &Self::Call,58		_info: &DispatchInfoOf<Self::Call>,59		_len: usize,60	) -> TransactionValidity {61		if Maintenance::is_enabled() {62			match call {63				RuntimeCall::EvmMigration(_)64				| RuntimeCall::EVM(_)65				| RuntimeCall::Ethereum(_)66				| RuntimeCall::Inflation(_)67				| RuntimeCall::Structure(_)68				| RuntimeCall::Unique(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),6970				#[cfg(feature = "app-promotion")]71				RuntimeCall::AppPromotion(_) => {72					Err(TransactionValidityError::Invalid(InvalidTransaction::Call))73				}7475				#[cfg(feature = "foreign-assets")]76				RuntimeCall::ForeignAssets(_) => {77					Err(TransactionValidityError::Invalid(InvalidTransaction::Call))78				}7980				#[cfg(feature = "collator-selection")]81				RuntimeCall::CollatorSelection(_)82				| RuntimeCall::Session(_)83				| RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),8485				#[cfg(feature = "pallet-test-utils")]86				RuntimeCall::TestUtils(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),8788				_ => Ok(ValidTransaction::default()),89			}90		} else {91			Ok(ValidTransaction::default())92		}93	}9495	fn pre_dispatch_unsigned(96		call: &Self::Call,97		info: &DispatchInfoOf<Self::Call>,98		len: usize,99	) -> Result<(), TransactionValidityError> {100		Self::validate_unsigned(call, info, len).map(|_| ())101	}102103	fn validate_unsigned(104		call: &Self::Call,105		_info: &DispatchInfoOf<Self::Call>,106		_len: usize,107	) -> TransactionValidity {108		if Maintenance::is_enabled() {109			match call {110				RuntimeCall::EVM(_) | RuntimeCall::Ethereum(_) | RuntimeCall::EvmMigration(_) => {111					Err(TransactionValidityError::Invalid(InvalidTransaction::Call))112				}113				_ => Ok(ValidTransaction::default()),114			}115		} else {116			Ok(ValidTransaction::default())117		}118	}119}
after · runtime/common/maintenance.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use parity_scale_codec::{Decode, Encode};18use scale_info::TypeInfo;19use sp_runtime::{20	traits::{DispatchInfoOf, SignedExtension},21	transaction_validity::{22		InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction,23	},24};25use up_common::types::AccountId;2627use crate::{Maintenance, RuntimeCall};2829#[derive(Debug, Encode, Decode, PartialEq, Eq, Clone, TypeInfo)]30pub struct CheckMaintenance;3132impl SignedExtension for CheckMaintenance {33	type AccountId = AccountId;34	type Call = RuntimeCall;35	type AdditionalSigned = ();36	type Pre = ();3738	const IDENTIFIER: &'static str = "CheckMaintenance";3940	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {41		Ok(())42	}4344	fn pre_dispatch(45		self,46		who: &Self::AccountId,47		call: &Self::Call,48		info: &DispatchInfoOf<Self::Call>,49		len: usize,50	) -> Result<Self::Pre, TransactionValidityError> {51		self.validate(who, call, info, len).map(|_| ())52	}5354	fn validate(55		&self,56		_who: &Self::AccountId,57		call: &Self::Call,58		_info: &DispatchInfoOf<Self::Call>,59		_len: usize,60	) -> TransactionValidity {61		if Maintenance::is_enabled() {62			match call {63				RuntimeCall::EvmMigration(_)64				| RuntimeCall::EVM(_)65				| RuntimeCall::Ethereum(_)66				| RuntimeCall::Inflation(_)67				| RuntimeCall::Structure(_)68				| RuntimeCall::Unique(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),6970				#[cfg(feature = "app-promotion")]71				RuntimeCall::AppPromotion(_) => {72					Err(TransactionValidityError::Invalid(InvalidTransaction::Call))73				}7475				#[cfg(feature = "foreign-assets")]76				RuntimeCall::ForeignAssets(_) => {77					Err(TransactionValidityError::Invalid(InvalidTransaction::Call))78				}7980				#[cfg(feature = "collator-selection")]81				RuntimeCall::CollatorSelection(_) | RuntimeCall::Session(_) => {82					Err(TransactionValidityError::Invalid(InvalidTransaction::Call))83				}8485				#[cfg(feature = "governance")]86				RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),8788				#[cfg(feature = "pallet-test-utils")]89				RuntimeCall::TestUtils(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),9091				_ => Ok(ValidTransaction::default()),92			}93		} else {94			Ok(ValidTransaction::default())95		}96	}9798	fn pre_dispatch_unsigned(99		call: &Self::Call,100		info: &DispatchInfoOf<Self::Call>,101		len: usize,102	) -> Result<(), TransactionValidityError> {103		Self::validate_unsigned(call, info, len).map(|_| ())104	}105106	fn validate_unsigned(107		call: &Self::Call,108		_info: &DispatchInfoOf<Self::Call>,109		_len: usize,110	) -> TransactionValidity {111		if Maintenance::is_enabled() {112			match call {113				RuntimeCall::EVM(_) | RuntimeCall::Ethereum(_) | RuntimeCall::EvmMigration(_) => {114					Err(TransactionValidityError::Invalid(InvalidTransaction::Call))115				}116				_ => Ok(ValidTransaction::default()),117			}118		} else {119			Ok(ValidTransaction::default())120		}121	}122}
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 = []