git.delta.rocks / unique-network / refs/commits / b12d77148755

difftreelog

fix make pallets build on 0.9.42

Yaroslav Bolyukin2023-05-22parent: #09fadf7.patch.diff
in: master

9 files changed

modifiedpallets/app-promotion/Cargo.tomldiffbeforeafterboth
--- a/pallets/app-promotion/Cargo.toml
+++ b/pallets/app-promotion/Cargo.toml
@@ -48,7 +48,7 @@
 frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-pallet-balances = { workspace = true }
+pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
 pallet-evm = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
modifiedpallets/collator-selection/Cargo.tomldiffbeforeafterboth
--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -33,7 +33,7 @@
 
 [dev-dependencies]
 pallet-aura = { workspace = true }
-pallet-balances = { workspace = true }
+pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
 pallet-timestamp = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
modifiedpallets/foreign-assets/Cargo.tomldiffbeforeafterboth
--- a/pallets/foreign-assets/Cargo.toml
+++ b/pallets/foreign-assets/Cargo.toml
@@ -15,7 +15,7 @@
 frame-system = { workspace = true }
 log = { workspace = true }
 orml-tokens = { workspace = true }
-pallet-balances = { workspace = true }
+pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
 pallet-common = { workspace = true }
 pallet-fungible = { workspace = true }
 serde = { workspace = true, optional = true }
modifiedpallets/foreign-assets/src/impl_fungibles.rsdiffbeforeafterboth
before · pallets/foreign-assets/src/impl_fungibles.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! Implementations for fungibles trait.1819use super::*;20use frame_system::Config as SystemConfig;2122use frame_support::traits::tokens::{DepositConsequence, WithdrawConsequence};23use pallet_common::CollectionHandle;24use pallet_fungible::FungibleHandle;25use pallet_common::CommonCollectionOperations;26use up_data_structs::budget::Value;27use sp_runtime::traits::{CheckedAdd, CheckedSub};2829impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T>30where31	T: orml_tokens::Config<CurrencyId = AssetIds>,32	BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,33	BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,34	<T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,35	<T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,36{37	type AssetId = AssetIds;38	type Balance = BalanceOf<T>;3940	fn total_issuance(asset: Self::AssetId) -> Self::Balance {41		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible total_issuance");4243		match asset {44			AssetIds::NativeAssetId(NativeCurrency::Here) => {45				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::total_issuance()46					.into()47			}48			AssetIds::NativeAssetId(NativeCurrency::Parent) => {49				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::total_issuance(50					AssetIds::NativeAssetId(NativeCurrency::Parent),51				)52				.into()53			}54			AssetIds::ForeignAssetId(fid) => {55				let target_collection_id = match <AssetBinding<T>>::get(fid) {56					Some(v) => v,57					None => return Zero::zero(),58				};59				let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {60					Ok(v) => v,61					Err(_) => return Zero::zero(),62				};63				let collection = FungibleHandle::cast(collection_handle);64				Self::Balance::try_from(collection.total_supply()).unwrap_or(Zero::zero())65			}66		}67	}6869	fn minimum_balance(asset: Self::AssetId) -> Self::Balance {70		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible minimum_balance");71		match asset {72			AssetIds::NativeAssetId(NativeCurrency::Here) => {73				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::minimum_balance()74					.into()75			}76			AssetIds::NativeAssetId(NativeCurrency::Parent) => {77				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::minimum_balance(78					AssetIds::NativeAssetId(NativeCurrency::Parent),79				)80				.into()81			}82			AssetIds::ForeignAssetId(fid) => {83				AssetMetadatas::<T>::get(AssetIds::ForeignAssetId(fid))84					.map(|x| x.minimal_balance)85					.unwrap_or_else(Zero::zero)86			}87		}88	}8990	fn balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {91		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible balance");92		match asset {93			AssetIds::NativeAssetId(NativeCurrency::Here) => {94				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::balance(who).into()95			}96			AssetIds::NativeAssetId(NativeCurrency::Parent) => {97				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::balance(98					AssetIds::NativeAssetId(NativeCurrency::Parent),99					who,100				)101				.into()102			}103			AssetIds::ForeignAssetId(fid) => {104				let target_collection_id = match <AssetBinding<T>>::get(fid) {105					Some(v) => v,106					None => return Zero::zero(),107				};108				let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {109					Ok(v) => v,110					Err(_) => return Zero::zero(),111				};112				let collection = FungibleHandle::cast(collection_handle);113				Self::Balance::try_from(114					collection.balance(T::CrossAccountId::from_sub(who.clone()), TokenId(0)),115				)116				.unwrap_or(Zero::zero())117			}118		}119	}120121	fn reducible_balance(122		asset: Self::AssetId,123		who: &<T as SystemConfig>::AccountId,124		keep_alive: bool,125	) -> Self::Balance {126		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible reducible_balance");127128		match asset {129			AssetIds::NativeAssetId(NativeCurrency::Here) => {130				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::reducible_balance(131					who, keep_alive,132				)133				.into()134			}135			AssetIds::NativeAssetId(NativeCurrency::Parent) => {136				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::reducible_balance(137					AssetIds::NativeAssetId(NativeCurrency::Parent),138					who,139					keep_alive,140				)141				.into()142			}143			_ => Self::balance(asset, who),144		}145	}146147	fn can_deposit(148		asset: Self::AssetId,149		who: &<T as SystemConfig>::AccountId,150		amount: Self::Balance,151		mint: bool,152	) -> DepositConsequence {153		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_deposit");154155		match asset {156			AssetIds::NativeAssetId(NativeCurrency::Here) => {157				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_deposit(158					who,159					amount.into(),160					mint,161				)162			}163			AssetIds::NativeAssetId(NativeCurrency::Parent) => {164				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_deposit(165					AssetIds::NativeAssetId(NativeCurrency::Parent),166					who,167					amount.into(),168					mint,169				)170			}171			_ => {172				if amount.is_zero() {173					return DepositConsequence::Success;174				}175176				let extential_deposit_value = T::ExistentialDeposit::get();177				let ed_value: u128 = match extential_deposit_value.try_into() {178					Ok(val) => val,179					Err(_) => return DepositConsequence::CannotCreate,180				};181				let extential_deposit: Self::Balance = match ed_value.try_into() {182					Ok(val) => val,183					Err(_) => return DepositConsequence::CannotCreate,184				};185186				let new_total_balance = match Self::balance(asset, who).checked_add(&amount) {187					Some(x) => x,188					None => return DepositConsequence::Overflow,189				};190191				if new_total_balance < extential_deposit {192					return DepositConsequence::BelowMinimum;193				}194195				DepositConsequence::Success196			}197		}198	}199200	fn can_withdraw(201		asset: Self::AssetId,202		who: &<T as SystemConfig>::AccountId,203		amount: Self::Balance,204	) -> WithdrawConsequence<Self::Balance> {205		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_withdraw");206		let value: u128 = match amount.try_into() {207			Ok(val) => val,208			Err(_) => return WithdrawConsequence::UnknownAsset,209		};210211		match asset {212			AssetIds::NativeAssetId(NativeCurrency::Here) => {213				let this_amount: <T as pallet_balances::Config>::Balance = match value.try_into() {214					Ok(val) => val,215					Err(_) => {216						return WithdrawConsequence::UnknownAsset;217					}218				};219				match <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_withdraw(220					who,221					this_amount,222				) {223					WithdrawConsequence::NoFunds => WithdrawConsequence::NoFunds,224					WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,225					WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,226					WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,227					WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,228					WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,229					WithdrawConsequence::Success => WithdrawConsequence::Success,230					_ => WithdrawConsequence::NoFunds,231				}232			}233			AssetIds::NativeAssetId(NativeCurrency::Parent) => {234				let parent_amount: <T as orml_tokens::Config>::Balance = match value.try_into() {235					Ok(val) => val,236					Err(_) => {237						return WithdrawConsequence::UnknownAsset;238					}239				};240				match <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_withdraw(241					AssetIds::NativeAssetId(NativeCurrency::Parent),242					who,243					parent_amount,244				) {245					WithdrawConsequence::NoFunds => WithdrawConsequence::NoFunds,246					WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,247					WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,248					WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,249					WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,250					WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,251					WithdrawConsequence::Success => WithdrawConsequence::Success,252					_ => WithdrawConsequence::NoFunds,253				}254			}255			_ => match Self::balance(asset, who).checked_sub(&amount) {256				Some(_) => WithdrawConsequence::Success,257				None => WithdrawConsequence::NoFunds,258			},259		}260	}261262	fn asset_exists(asset: AssetIds) -> bool {263		match asset {264			AssetIds::NativeAssetId(_) => true,265			AssetIds::ForeignAssetId(fid) => <AssetBinding<T>>::contains_key(fid),266		}267	}268}269270impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T>271where272	T: orml_tokens::Config<CurrencyId = AssetIds>,273	BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,274	BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,275	<T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,276	<T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,277	u128: From<BalanceOf<T>>,278{279	fn mint_into(280		asset: Self::AssetId,281		who: &<T as SystemConfig>::AccountId,282		amount: Self::Balance,283	) -> DispatchResult {284		//Self::do_mint(asset, who, amount, None)285		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible mint_into {:?}", asset);286287		match asset {288			AssetIds::NativeAssetId(NativeCurrency::Here) => {289				<pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::mint_into(290					who,291					amount.into(),292				)293				.into()294			}295			AssetIds::NativeAssetId(NativeCurrency::Parent) => {296				<orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::mint_into(297					AssetIds::NativeAssetId(NativeCurrency::Parent),298					who,299					amount.into(),300				)301				.into()302			}303			AssetIds::ForeignAssetId(fid) => {304				let target_collection_id = match <AssetBinding<T>>::get(fid) {305					Some(v) => v,306					None => {307						return Err(DispatchError::Other(308							"Associated collection not found for asset",309						))310					}311				};312				let collection =313					FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);314				let account = T::CrossAccountId::from_sub(who.clone());315316				let amount_data: pallet_fungible::CreateItemData<T> =317					(account.clone(), amount.into());318319				pallet_fungible::Pallet::<T>::create_item_foreign(320					&collection,321					&account,322					amount_data,323					&Value::new(0),324				)?;325326				Ok(())327			}328		}329	}330331	fn burn_from(332		asset: Self::AssetId,333		who: &<T as SystemConfig>::AccountId,334		amount: Self::Balance,335	) -> Result<Self::Balance, DispatchError> {336		// let f = DebitFlags { keep_alive: false, best_effort: false };337		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible burn_from");338339		match asset {340			AssetIds::NativeAssetId(NativeCurrency::Here) => {341				match <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::burn_from(342					who,343					amount.into(),344				) {345					Ok(v) => Ok(v.into()),346					Err(e) => Err(e),347				}348			}349			AssetIds::NativeAssetId(NativeCurrency::Parent) => {350				match <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::burn_from(351					AssetIds::NativeAssetId(NativeCurrency::Parent),352					who,353					amount.into(),354				) {355					Ok(v) => Ok(v.into()),356					Err(e) => Err(e),357				}358			}359			AssetIds::ForeignAssetId(fid) => {360				let target_collection_id = match <AssetBinding<T>>::get(fid) {361					Some(v) => v,362					None => {363						return Err(DispatchError::Other(364							"Associated collection not found for asset",365						))366					}367				};368				let collection =369					FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);370				pallet_fungible::Pallet::<T>::burn_foreign(371					&collection,372					&T::CrossAccountId::from_sub(who.clone()),373					amount.into(),374				)?;375376				Ok(amount)377			}378		}379	}380381	fn slash(382		asset: Self::AssetId,383		who: &<T as SystemConfig>::AccountId,384		amount: Self::Balance,385	) -> Result<Self::Balance, DispatchError> {386		// let f = DebitFlags { keep_alive: false, best_effort: true };387		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible slash");388		Ok(Self::burn_from(asset, who, amount)?)389	}390}391392impl<T: Config> fungibles::Transfer<T::AccountId> for Pallet<T>393where394	T: orml_tokens::Config<CurrencyId = AssetIds>,395	BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,396	BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,397	<T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,398	<T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,399	u128: From<BalanceOf<T>>,400{401	fn transfer(402		asset: Self::AssetId,403		source: &<T as SystemConfig>::AccountId,404		dest: &<T as SystemConfig>::AccountId,405		amount: Self::Balance,406		keep_alive: bool,407	) -> Result<Self::Balance, DispatchError> {408		// let f = TransferFlags { keep_alive, best_effort: false, burn_dust: false };409		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible transfer");410411		match asset {412			AssetIds::NativeAssetId(NativeCurrency::Here) => {413				match <pallet_balances::Pallet<T> as fungible::Transfer<T::AccountId>>::transfer(414					source,415					dest,416					amount.into(),417					keep_alive,418				) {419					Ok(_) => Ok(amount),420					Err(_) => Err(DispatchError::Other(421						"Bad amount to relay chain value conversion",422					)),423				}424			}425			AssetIds::NativeAssetId(NativeCurrency::Parent) => {426				match <orml_tokens::Pallet<T> as fungibles::Transfer<T::AccountId>>::transfer(427					AssetIds::NativeAssetId(NativeCurrency::Parent),428					source,429					dest,430					amount.into(),431					keep_alive,432				) {433					Ok(_) => Ok(amount),434					Err(e) => Err(e),435				}436			}437			AssetIds::ForeignAssetId(fid) => {438				let target_collection_id = match <AssetBinding<T>>::get(fid) {439					Some(v) => v,440					None => {441						return Err(DispatchError::Other(442							"Associated collection not found for asset",443						))444					}445				};446				let collection =447					FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);448449				pallet_fungible::Pallet::<T>::transfer(450					&collection,451					&T::CrossAccountId::from_sub(source.clone()),452					&T::CrossAccountId::from_sub(dest.clone()),453					amount.into(),454					&Value::new(0),455				)456				.map_err(|e| e.error)?;457458				Ok(amount)459			}460		}461	}462}
modifiedpallets/foreign-assets/src/lib.rsdiffbeforeafterboth
--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -448,9 +448,7 @@
 
 pub use frame_support::{
 	traits::{
-		fungibles::{Balanced, CreditOf},
-		tokens::currency::Currency as CurrencyT,
-		OnUnbalanced as OnUnbalancedT,
+		fungibles::Balanced, tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT,
 	},
 	weights::{WeightToFeePolynomial, WeightToFee},
 };
modifiedpallets/identity/Cargo.tomldiffbeforeafterboth
--- a/pallets/identity/Cargo.toml
+++ b/pallets/identity/Cargo.toml
@@ -26,7 +26,7 @@
 sp-std = { workspace = true }
 
 [dev-dependencies]
-pallet-balances = { workspace = true }
+pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
 sp-core = { workspace = true }
 
 [features]
modifiedpallets/inflation/Cargo.tomldiffbeforeafterboth
--- a/pallets/inflation/Cargo.toml
+++ b/pallets/inflation/Cargo.toml
@@ -37,7 +37,7 @@
 frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-pallet-balances = { workspace = true }
+pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
modifiedruntime/common/config/xcm/mod.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm/mod.rs
+++ b/runtime/common/config/xcm/mod.rs
@@ -114,12 +114,26 @@
 );
 
 pub trait TryPass {
+<<<<<<< HEAD
 	fn try_pass<Call>(origin: &MultiLocation, message: &mut [Instruction<Call>]) -> Result<(), ()>;
+=======
+	fn try_pass<Call>(
+		origin: &MultiLocation,
+		message: &mut [Instruction<Call>],
+	) -> Result<(), ProcessMessageError>;
+>>>>>>> fd33b0ac (fixup pallets)
 }
 
 #[impl_trait_for_tuples::impl_for_tuples(30)]
 impl TryPass for Tuple {
+<<<<<<< HEAD
 	fn try_pass<Call>(origin: &MultiLocation, message: &mut [Instruction<Call>]) -> Result<(), ()> {
+=======
+	fn try_pass<Call>(
+		origin: &MultiLocation,
+		message: &mut [Instruction<Call>],
+	) -> Result<(), ProcessMessageError> {
+>>>>>>> fd33b0ac (fixup pallets)
 		for_tuples!( #(
 			Tuple::try_pass(origin, message)?;
 		)* );
modifiedtest-pallets/utils/src/lib.rsdiffbeforeafterboth
--- a/test-pallets/utils/src/lib.rs
+++ b/test-pallets/utils/src/lib.rs
@@ -20,7 +20,7 @@
 use frame_support::pallet_prelude::*;
 use frame_system::pallet_prelude::*;
 
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod pallet {
 	use frame_support::{
 		pallet_prelude::*,