Finer control of origins in pallet-account-fix (#3005)

* finer origin control

* update runtime

Author: Kailai-Wang

pallets/account-fix/src/lib.rs

@@ -50,18 +50,20 @@ pub mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config + pallet_balances::Config {
 		type Currency: ReservableCurrency<Self::AccountId>;
+		type IncConsumerOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+		type AddBalanceOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 		type BurnOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 	}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::call_index(0)]
-		#[pallet::weight(Weight::from_parts(20_000_000u64 * (who.len() as u64), 0))]
+		#[pallet::weight(Weight::from_parts(195_000_000 * (who.len() as u64), 0))]
 		pub fn inc_consumers(
 			origin: OriginFor<T>,
 			who: Vec<T::AccountId>,
 		) -> DispatchResultWithPostInfo {
-			ensure_root(origin)?;
+			let _ = T::IncConsumerOrigin::ensure_origin(origin)?;
 			for i in &who {
 				frame_system::Pallet::<T>::inc_consumers(i)?;
 			}
@@ -70,14 +72,14 @@ pub mod pallet {
 
 		/// add some balance of an existing account
 		#[pallet::call_index(1)]
-		#[pallet::weight({10_000})]
-		pub fn set_balance(
+		#[pallet::weight({195_000_000})]
+		pub fn add_balance(
 			origin: OriginFor<T>,
 			who: AccountIdLookupOf<T>,
 			#[pallet::compact] add_free: BalanceOf<T>,
 			#[pallet::compact] add_reserved: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
-			ensure_root(origin)?;
+			let _ = T::AddBalanceOrigin::ensure_origin(origin)?;
 			let who = T::Lookup::lookup(who)?;
 			let add_total = add_free + add_reserved;
 

runtime/litentry/src/lib.rs

@@ -220,7 +220,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	impl_name: create_runtime_str!("litentry-parachain"),
 	authoring_version: 1,
 	// same versioning-mechanism as polkadot: use last digit for minor updates
-	spec_version: 9194,
+	spec_version: 9195,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -731,7 +731,9 @@ impl pallet_identity::Config for Runtime {
 
 impl pallet_account_fix::Config for Runtime {
 	type Currency = Balances;
-	type BurnOrigin = EnsureRootOrTwoThirdsTechnicalCommittee;
+	type IncConsumerOrigin = EnsureRootOrTwoThirdsTechnicalCommittee;
+	type AddBalanceOrigin = EnsureRoot<AccountId>;
+	type BurnOrigin = EnsureRoot<AccountId>;
 }
 
 parameter_types! {
@@ -1257,9 +1259,7 @@ impl Contains<RuntimeCall> for BaseCallFilter {
 				RuntimeCall::CouncilMembership(_) |
 				RuntimeCall::TechnicalCommittee(_) |
 				RuntimeCall::TechnicalCommitteeMembership(_) |
-				RuntimeCall::Utility(_) |
-				// Temp: should be removed after the one-time burn
-				RuntimeCall::AccountFix(pallet_account_fix::Call::burn { .. })
+				RuntimeCall::Utility(_)
 		) {
 			// always allow core calls
 			return true

runtime/rococo/src/lib.rs

@@ -223,7 +223,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	impl_name: create_runtime_str!("rococo-parachain"),
 	authoring_version: 1,
 	// same versioning-mechanism as polkadot: use last digit for minor updates
-	spec_version: 9194,
+	spec_version: 9195,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -783,7 +783,9 @@ impl pallet_sudo::Config for Runtime {
 
 impl pallet_account_fix::Config for Runtime {
 	type Currency = Balances;
-	type BurnOrigin = EnsureRootOrTwoThirdsTechnicalCommittee;
+	type IncConsumerOrigin = EnsureRootOrTwoThirdsTechnicalCommittee;
+	type AddBalanceOrigin = EnsureRoot<AccountId>;
+	type BurnOrigin = EnsureRoot<AccountId>;
 }
 
 parameter_types! {
@@ -1300,9 +1302,7 @@ impl Contains<RuntimeCall> for BaseCallFilter {
 				RuntimeCall::CouncilMembership(_) |
 				RuntimeCall::TechnicalCommittee(_) |
 				RuntimeCall::TechnicalCommitteeMembership(_) |
-				RuntimeCall::Utility(_) |
-				// Temp: should be removed after the one-time burn
-				RuntimeCall::AccountFix(pallet_account_fix::Call::burn { .. })
+				RuntimeCall::Utility(_)
 		) {
 			// always allow core calls
 			return true

tee-worker/ts-tests/integration-tests/common/utils/assertion.ts

@@ -148,7 +148,7 @@ export async function assertVc(context: IntegrationTestContext, subject: CorePri
     // check runtime version is present
     assert.deepEqual(
         vcPayloadJson.issuer.runtimeVersion,
-        { parachain: 9194, sidechain: 109 },
+        { parachain: 9195, sidechain: 109 },
         'Check VC runtime version: it should equal the current defined versions'
     );