Merge pull request #503 from Setheum-Labs/blend1

Blend1 - support DustRemovalWhitelist
Setheum-Labs · Aug 30, 2021 · 236268e · 236268e
2 parents 8e650e5 + 813d384
commit 236268e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib-serml/serp/serp-treasury/Cargo.toml b/lib-serml/serp/serp-treasury/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "serp-treasury"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Setheum Labs"]
 edition = "2018"
 

diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -49,8 +49,7 @@ pub use precompile::{
 };
 pub use primitives::currency::{
 	TokenInfo, 
-	DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SEKJ, SGDJ, SETSAR, RENBTC,
-	USD, EUR, GBP, CHF, SAR, KWD, JOD, BHD, KYD, OMR, GIP,
+	DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR, RENBTC,
 };
 
 pub type TimeStampedPrice = orml_oracle::TimestampedValue<Price, primitives::Moment>;

diff --git a/runtime/newrome/src/lib.rs b/runtime/newrome/src/lib.rs
@@ -1100,6 +1100,13 @@ parameter_type_with_key! {
 	};
 }
 
+pub struct DustRemovalWhitelist;
+impl Contains<AccountId> for DustRemovalWhitelist {
+	fn contains(a: &AccountId) -> bool {
+		get_all_module_accounts().contains(a)
+	}
+}
+
 parameter_types! {
 	pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account();
 }
@@ -1112,6 +1119,8 @@ impl orml_tokens::Config for Runtime {
 	type WeightInfo = weights::orml_tokens::WeightInfo<Runtime>;
 	type ExistentialDeposits = ExistentialDeposits;
 	type OnDust = orml_tokens::TransferDust<Runtime, TreasuryAccount>;
+	type MaxLocks = MaxLocks;
+	type DustRemovalWhitelist = DustRemovalWhitelist;
 }
 
 parameter_types! {

diff --git a/runtime/setheum/src/lib.rs b/runtime/setheum/src/lib.rs
@@ -1097,6 +1097,13 @@ parameter_type_with_key! {
 	};
 }
 
+pub struct DustRemovalWhitelist;
+impl Contains<AccountId> for DustRemovalWhitelist {
+	fn contains(a: &AccountId) -> bool {
+		get_all_module_accounts().contains(a)
+	}
+}
+
 parameter_types! {
 	pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account();
 }
@@ -1109,6 +1116,8 @@ impl orml_tokens::Config for Runtime {
 	type WeightInfo = weights::orml_tokens::WeightInfo<Runtime>;
 	type ExistentialDeposits = ExistentialDeposits;
 	type OnDust = orml_tokens::TransferDust<Runtime, TreasuryAccount>;
+	type MaxLocks = MaxLocks;
+	type DustRemovalWhitelist = DustRemovalWhitelist;
 }
 
 parameter_types! {