let currency-adapater lock accept council (#1691)

Signed-off-by: Cheng JIANG <[email protected]>

Author: 0x8f701

pallets/amm/src/mock.rs

@@ -191,6 +191,7 @@ impl pallet_currency_adapter::Config for Test {
     type Assets = Assets;
     type Balances = Balances;
     type GetNativeCurrencyId = NativeCurrencyId;
+    type LockOrigin = EnsureRoot<AccountId>;
 }
 
 // Build genesis storage according to the mock runtime.

pallets/bridge/src/mock.rs

@@ -155,6 +155,7 @@ impl pallet_currency_adapter::Config for Test {
     type Assets = Assets;
     type Balances = Balances;
     type GetNativeCurrencyId = NativeCurrencyId;
+    type LockOrigin = EnsureRoot<AccountId>;
 }
 
 parameter_types! {

pallets/currency-adapter/src/lib.rs

@@ -42,11 +42,13 @@ type AssetIdOf<T> =
 type BalanceOf<T> =
     <<T as Config>::Assets as Inspects<<T as frame_system::Config>::AccountId>>::Balance;
 
+const CURRENCY_ADAPTER_ID: LockIdentifier = *b"cadapter";
+
 #[frame_support::pallet]
 pub mod pallet {
     use super::*;
     use frame_support::traits::LockableCurrency;
-    use frame_system::{ensure_root, pallet_prelude::OriginFor};
+    use frame_system::pallet_prelude::OriginFor;
 
     #[pallet::config]
     pub trait Config: frame_system::Config {
@@ -61,6 +63,9 @@ pub mod pallet {
 
         #[pallet::constant]
         type GetNativeCurrencyId: Get<AssetIdOf<Self>>;
+
+        // Origin which can lock asset balance
+        type LockOrigin: EnsureOrigin<<Self as frame_system::Config>::Origin>;
     }
 
     #[pallet::pallet]
@@ -78,32 +83,30 @@ pub mod pallet {
         pub fn force_set_lock(
             origin: OriginFor<T>,
             asset: AssetIdOf<T>,
-            id: LockIdentifier,
             who: T::AccountId,
             #[pallet::compact] amount: BalanceOf<T>,
         ) -> DispatchResult {
-            ensure_root(origin)?;
+            T::LockOrigin::ensure_origin(origin)?;
             ensure!(
                 asset == T::GetNativeCurrencyId::get(),
                 Error::<T>::NotANativeToken
             );
-            T::Balances::set_lock(id, &who, amount, WithdrawReasons::all());
+            T::Balances::set_lock(CURRENCY_ADAPTER_ID, &who, amount, WithdrawReasons::all());
             Ok(())
         }
 
         #[pallet::weight(10_000)]
         pub fn force_remove_lock(
             origin: OriginFor<T>,
             asset: AssetIdOf<T>,
-            id: LockIdentifier,
             who: T::AccountId,
         ) -> DispatchResult {
-            ensure_root(origin)?;
+            T::LockOrigin::ensure_origin(origin)?;
             ensure!(
                 asset == T::GetNativeCurrencyId::get(),
                 Error::<T>::NotANativeToken
             );
-            T::Balances::remove_lock(id, &who);
+            T::Balances::remove_lock(CURRENCY_ADAPTER_ID, &who);
             Ok(())
         }
     }

pallets/farming/src/mock.rs

@@ -159,6 +159,7 @@ impl pallet_currency_adapter::Config for Test {
     type Assets = Assets;
     type Balances = Balances;
     type GetNativeCurrencyId = NativeCurrencyId;
+    type LockOrigin = EnsureRoot<AccountId>;
 }
 
 // Build genesis storage according to the mock runtime.

pallets/loans/src/mock.rs

@@ -273,6 +273,7 @@ impl pallet_currency_adapter::Config for Test {
     type Assets = Assets;
     type Balances = Balances;
     type GetNativeCurrencyId = NativeCurrencyId;
+    type LockOrigin = EnsureRoot<AccountId>;
 }
 
 pub(crate) fn new_test_ext() -> sp_io::TestExternalities {

pallets/router/src/mock.rs

@@ -158,6 +158,7 @@ impl pallet_currency_adapter::Config for Runtime {
     type Assets = Assets;
     type Balances = Balances;
     type GetNativeCurrencyId = NativeCurrencyId;
+    type LockOrigin = EnsureRoot<AccountId>;
 }
 
 parameter_types! {

pallets/stableswap/src/mock.rs

@@ -190,6 +190,7 @@ impl pallet_currency_adapter::Config for Test {
     type Assets = Assets;
     type Balances = Balances;
     type GetNativeCurrencyId = NativeCurrencyId;
+    type LockOrigin = EnsureRoot<AccountId>;
 }
 
 construct_runtime!(

pallets/streaming/src/mock.rs

@@ -140,6 +140,7 @@ impl pallet_currency_adapter::Config for Test {
     type Assets = Assets;
     type Balances = Balances;
     type GetNativeCurrencyId = NativeCurrencyId;
+    type LockOrigin = EnsureRoot<AccountId>;
 }
 
 parameter_types! {

runtime/heiko/src/lib.rs

@@ -1888,6 +1888,7 @@ impl pallet_currency_adapter::Config for Runtime {
     type Assets = Assets;
     type Balances = Balances;
     type GetNativeCurrencyId = NativeCurrencyId;
+    type LockOrigin = EnsureRootOrMoreThanHalfGeneralCouncil;
 }
 
 parameter_types! {

runtime/kerria/src/lib.rs

@@ -1799,6 +1799,7 @@ impl pallet_currency_adapter::Config for Runtime {
     type Assets = Assets;
     type Balances = Balances;
     type GetNativeCurrencyId = NativeCurrencyId;
+    type LockOrigin = EnsureRootOrMoreThanHalfGeneralCouncil;
 }
 
 parameter_types! {