git.delta.rocks / unique-network / refs/commits / 9b836649cc42

12926 "frame-support",12926 "frame-support",
12927 "frame-system",12927 "frame-system",
12928 "pallet-balances",12928 "pallet-balances",
12929 "pallet-balances-adapter",
12929 "pallet-common",12930 "pallet-common",
12930 "pallet-configuration",
12931 "pallet-ethereum",12931 "pallet-ethereum",
12932 "pallet-evm",12932 "pallet-evm",
12933 "pallet-evm-coder-substrate",12933 "pallet-evm-coder-substrate",
12938 "pallet-timestamp",12938 "pallet-timestamp",
12939 "pallet-transaction-payment",12939 "pallet-transaction-payment",
12940 "pallet-unique",12940 "pallet-unique",
12941 "pallet-xcm",
12942 "parity-scale-codec",12941 "parity-scale-codec",
12943 "scale-info",12942 "scale-info",
12944 "sp-core",12943 "sp-core",

--- a/pallets/balances-adapter/src/common.rs
+++ b/pallets/balances-adapter/src/common.rs
@@ -249,6 +249,7 @@
 
 	fn account_tokens(&self, account: <T>::CrossAccountId) -> Vec<TokenId> {
 		let balance = <T as Config>::Currency::total_balance(account.as_sub());
+		let balance: u128 = balance.into();
 		if balance != 0 {
 			vec![TokenId::default()]
 		} else {

--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -76,7 +76,7 @@
 			Balance = Self::CurrencyBalance,
 		>;
 		/// Balance type of chain
-		type CurrencyBalance: Into<U256> + TryFrom<U256> + PartialEq<u128> + From<u128> + Into<u128>;
+		type CurrencyBalance: Into<U256> + TryFrom<U256> + TryFrom<u128> + Into<u128>;
 
 		/// Decimals of balance
 		type Decimals: Get<u8>;
@@ -144,7 +144,9 @@
 				<T as Config>::Currency::transfer(
 					from.as_sub(),
 					to.as_sub(),
-					amount.into(),
+					amount
+						.try_into()
+						.map_err(|_| sp_runtime::ArithmeticError::Overflow)?,
 					ExistenceRequirement::KeepAlive,
 				)?;
 

--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -54,10 +54,7 @@
 
 parameter_types! {
 	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;
-	pub const Decimals: u8 = DECIMALS;
 	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();
-	pub Name: String = RUNTIME_NAME.to_string();
-	pub Symbol: String = TOKEN_SYMBOL.to_string();
 }
 
 impl pallet_common::Config for Runtime {
@@ -88,6 +85,12 @@
 impl pallet_nonfungible::Config for Runtime {
 	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;
 }
+
+parameter_types! {
+	pub const Decimals: u8 = DECIMALS;
+	pub Name: String = RUNTIME_NAME.to_string();
+	pub Symbol: String = TOKEN_SYMBOL.to_string();
+}
 impl pallet_balances_adapter::Config for Runtime {
 	type Currency = Balances;
 	type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;

--- a/runtime/tests/Cargo.toml
+++ b/runtime/tests/Cargo.toml
@@ -26,6 +26,7 @@
 pallet-ethereum = { workspace = true }
 pallet-evm = { workspace = true }
 
+pallet-balances-adapter = { workspace = true }
 pallet-common = { workspace = true }
 pallet-fungible = { workspace = true }
 pallet-nonfungible = { workspace = true }
@@ -41,5 +42,3 @@
 evm-coder = { workspace = true }
 up-sponsorship = { workspace = true }
 xcm = { workspace = true }
-pallet-xcm = { workspace = true }
-pallet-configuration = { workspace = true }

--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -19,7 +19,7 @@
 use sp_core::{H160, H256, U256};
 use frame_support::{
 	parameter_types,
-	traits::{Everything, ConstU32, ConstU64},
+	traits::{Everything, ConstU32, ConstU64, Currency},
 	weights::IdentityFee,
 	pallet_prelude::Weight,
 };
@@ -266,6 +266,19 @@
 impl pallet_nonfungible::Config for Test {
 	type WeightInfo = ();
 }
+parameter_types! {
+	pub const Decimals: u8 = 18;
+	pub Name: String = "Test".to_string();
+	pub Symbol: String = "TST".to_string();
+}
+impl pallet_balances_adapter::Config for Test {
+	type Currency = Balances;
+	type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;
+	type Decimals = Decimals;
+	type Name = Name;
+	type Symbol = Symbol;
+	type WeightInfo = ();
+}
 
 parameter_types! {
 	// 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f