Bump (#2336)

* bump * update currencies
AcalaNetwork · Sep 5, 2022 · 528a213 · 528a213
1 parent 090f68e
commit 528a213
Show file tree

Hide file tree

Showing 57 changed files with 234 additions and 106 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ecosystem-modules/compound-cash/Cargo.toml b/ecosystem-modules/compound-cash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecosystem-compound-cash"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/ecosystem-modules/ren/renvm-bridge/Cargo.toml b/ecosystem-modules/ren/renvm-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecosystem-renvm-bridge"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/ecosystem-modules/starport/Cargo.toml b/ecosystem-modules/starport/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecosystem-starport"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala-inspect"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/aggregated-dex/Cargo.toml b/modules/aggregated-dex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-aggregated-dex"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-asset-registry"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-auction-manager"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-cdp-engine"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-cdp-treasury"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'module-collator-selection'
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-currencies"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/currencies/src/lib.rs b/modules/currencies/src/lib.rs
@@ -243,6 +243,37 @@ pub mod module {
 			}
 			Ok(())
 		}
+
+		/// Set lock by lock_id
+		///
+		/// The dispatch origin of this call must be _Root_.
+		#[pallet::weight(T::WeightInfo::update_balance_non_native_currency())]
+		pub fn force_set_lock(
+			origin: OriginFor<T>,
+			who: <T::Lookup as StaticLookup>::Source,
+			currency_id: CurrencyId,
+			#[pallet::compact] amount: BalanceOf<T>,
+			lock_id: LockIdentifier,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			let who = T::Lookup::lookup(who)?;
+			<Self as MultiLockableCurrency<T::AccountId>>::set_lock(lock_id, currency_id, &who, amount)
+		}
+
+		/// Remove lock by lock_id
+		///
+		/// The dispatch origin of this call must be _Root_.
+		#[pallet::weight(T::WeightInfo::update_balance_non_native_currency())]
+		pub fn force_remove_lock(
+			origin: OriginFor<T>,
+			who: <T::Lookup as StaticLookup>::Source,
+			currency_id: CurrencyId,
+			lock_id: LockIdentifier,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			let who = T::Lookup::lookup(who)?;
+			<Self as MultiLockableCurrency<T::AccountId>>::remove_lock(lock_id, currency_id, &who)
+		}
 	}
 }
 

diff --git a/modules/currencies/src/tests.rs b/modules/currencies/src/tests.rs
@@ -22,7 +22,7 @@
 
 use super::*;
 use crate::mock::Erc20HoldingAccount;
-use frame_support::{assert_noop, assert_ok, weights::GetDispatchInfo};
+use frame_support::{assert_noop, assert_ok, traits::WithdrawReasons, weights::GetDispatchInfo};
 use mock::{
 	alice, bob, deploy_contracts, erc20_address, eva, AccountId, AdaptedBasicCurrency, CouncilAccount, Currencies,
 	DustAccount, Event, ExtBuilder, NativeCurrency, Origin, PalletBalances, Runtime, System, Tokens, ALICE_BALANCE,
@@ -36,6 +36,103 @@ use sp_runtime::{
 use support::mocks::MockAddressMapping;
 use support::EVM as EVMTrait;
 
+#[test]
+fn force_set_lock_and_force_remove_lock_should_work() {
+	ExtBuilder::default()
+		.one_hundred_for_alice_n_bob()
+		.build()
+		.execute_with(|| {
+			assert_noop!(
+				Currencies::force_set_lock(Some(bob()).into(), alice(), DOT, 100, ID_1,),
+				BadOrigin
+			);
+
+			assert_eq!(Tokens::locks(&alice(), DOT).len(), 0);
+			assert_eq!(PalletBalances::locks(&alice()).len(), 0);
+
+			assert_ok!(Currencies::force_set_lock(Origin::root(), alice(), DOT, 100, ID_1,));
+			assert_ok!(Currencies::force_set_lock(
+				Origin::root(),
+				alice(),
+				NATIVE_CURRENCY_ID,
+				1000,
+				ID_1,
+			));
+
+			assert_eq!(
+				Tokens::locks(&alice(), DOT)[0],
+				tokens::BalanceLock { id: ID_1, amount: 100 }
+			);
+			assert_eq!(
+				PalletBalances::locks(&alice())[0],
+				pallet_balances::BalanceLock {
+					id: ID_1,
+					amount: 1000,
+					reasons: WithdrawReasons::all().into(),
+				}
+			);
+
+			assert_ok!(Currencies::force_set_lock(Origin::root(), alice(), DOT, 10, ID_1,));
+			assert_ok!(Currencies::force_set_lock(
+				Origin::root(),
+				alice(),
+				NATIVE_CURRENCY_ID,
+				100,
+				ID_1,
+			));
+			assert_eq!(
+				Tokens::locks(&alice(), DOT)[0],
+				tokens::BalanceLock { id: ID_1, amount: 10 }
+			);
+			assert_eq!(
+				PalletBalances::locks(&alice())[0],
+				pallet_balances::BalanceLock {
+					id: ID_1,
+					amount: 100,
+					reasons: WithdrawReasons::all().into(),
+				}
+			);
+
+			// do nothing
+			assert_ok!(Currencies::force_set_lock(Origin::root(), alice(), DOT, 0, ID_1,));
+			assert_ok!(Currencies::force_set_lock(
+				Origin::root(),
+				alice(),
+				NATIVE_CURRENCY_ID,
+				0,
+				ID_1,
+			));
+			assert_eq!(
+				Tokens::locks(&alice(), DOT)[0],
+				tokens::BalanceLock { id: ID_1, amount: 10 }
+			);
+			assert_eq!(
+				PalletBalances::locks(&alice())[0],
+				pallet_balances::BalanceLock {
+					id: ID_1,
+					amount: 100,
+					reasons: WithdrawReasons::all().into(),
+				}
+			);
+
+			// remove lock
+			assert_noop!(
+				Currencies::force_remove_lock(Some(bob()).into(), alice(), DOT, ID_1,),
+				BadOrigin
+			);
+
+			assert_ok!(Currencies::force_remove_lock(Origin::root(), alice(), DOT, ID_1,));
+			assert_ok!(Currencies::force_remove_lock(
+				Origin::root(),
+				alice(),
+				NATIVE_CURRENCY_ID,
+				ID_1,
+			));
+			assert_eq!(Tokens::locks(&alice(), DOT).len(), 0);
+			assert_eq!(PalletBalances::locks(&alice()).len(), 0);
+		});
+}
+
 #[test]
 fn multi_lockable_currency_should_work() {
 	ExtBuilder::default()

diff --git a/modules/dex-oracle/Cargo.toml b/modules/dex-oracle/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-dex-oracle"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-dex"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/earning/Cargo.toml b/modules/earning/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-earning"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-emergency-shutdown"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-accounts"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/evm-bridge/Cargo.toml b/modules/evm-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-bridge"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-utility"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/evm-utility/macro/Cargo.toml b/modules/evm-utility/macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-utility-macro"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/evm/rpc/Cargo.toml b/modules/evm/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "evm-rpc"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-rpc-runtime-api"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/example/Cargo.toml b/modules/example/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-example"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/homa-lite/Cargo.toml b/modules/homa-lite/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-homa-lite"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-homa-validator-list"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-homa"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/honzon-bridge/Cargo.toml b/modules/honzon-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-honzon-bridge"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-honzon"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-idle-scheduler"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/incentives/Cargo.toml b/modules/incentives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-incentives"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"
 

diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-loans"
-version = "2.9.2"
+version = "2.9.3"
 authors = ["Acala Developers"]
 edition = "2021"