difftreelog
fix make pallets build on 0.9.42
in: master
9 files changed
pallets/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 }
pallets/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 }
pallets/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 }
pallets/foreign-assets/src/impl_fungibles.rsdiffbeforeafterboth1// 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}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::{23 DepositConsequence, WithdrawConsequence, Preservation, Fortitude, Provenance, Precision,24};25use pallet_common::CollectionHandle;26use pallet_fungible::FungibleHandle;27use pallet_common::CommonCollectionOperations;28use up_data_structs::budget::Value;29use sp_runtime::traits::{CheckedAdd, CheckedSub};3031impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T>32where33 T: orml_tokens::Config<CurrencyId = AssetIds>,34 BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,35 BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,36 <T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,37 <T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,38{39 type AssetId = AssetIds;40 type Balance = BalanceOf<T>;4142 fn total_issuance(asset: Self::AssetId) -> Self::Balance {43 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible total_issuance");4445 match asset {46 AssetIds::NativeAssetId(NativeCurrency::Here) => {47 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::total_issuance()48 .into()49 }50 AssetIds::NativeAssetId(NativeCurrency::Parent) => {51 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::total_issuance(52 AssetIds::NativeAssetId(NativeCurrency::Parent),53 )54 .into()55 }56 AssetIds::ForeignAssetId(fid) => {57 let target_collection_id = match <AssetBinding<T>>::get(fid) {58 Some(v) => v,59 None => return Zero::zero(),60 };61 let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {62 Ok(v) => v,63 Err(_) => return Zero::zero(),64 };65 let collection = FungibleHandle::cast(collection_handle);66 Self::Balance::try_from(collection.total_supply()).unwrap_or(Zero::zero())67 }68 }69 }7071 fn minimum_balance(asset: Self::AssetId) -> Self::Balance {72 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible minimum_balance");73 match asset {74 AssetIds::NativeAssetId(NativeCurrency::Here) => {75 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::minimum_balance()76 .into()77 }78 AssetIds::NativeAssetId(NativeCurrency::Parent) => {79 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::minimum_balance(80 AssetIds::NativeAssetId(NativeCurrency::Parent),81 )82 .into()83 }84 AssetIds::ForeignAssetId(fid) => {85 AssetMetadatas::<T>::get(AssetIds::ForeignAssetId(fid))86 .map(|x| x.minimal_balance)87 .unwrap_or_else(Zero::zero)88 }89 }90 }9192 fn balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {93 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible balance");94 match asset {95 AssetIds::NativeAssetId(NativeCurrency::Here) => {96 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::balance(who).into()97 }98 AssetIds::NativeAssetId(NativeCurrency::Parent) => {99 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::balance(100 AssetIds::NativeAssetId(NativeCurrency::Parent),101 who,102 )103 .into()104 }105 AssetIds::ForeignAssetId(fid) => {106 let target_collection_id = match <AssetBinding<T>>::get(fid) {107 Some(v) => v,108 None => return Zero::zero(),109 };110 let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {111 Ok(v) => v,112 Err(_) => return Zero::zero(),113 };114 let collection = FungibleHandle::cast(collection_handle);115 Self::Balance::try_from(116 collection.balance(T::CrossAccountId::from_sub(who.clone()), TokenId(0)),117 )118 .unwrap_or(Zero::zero())119 }120 }121 }122123 fn total_balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {124 Self::balance(asset, who)125 }126127 fn reducible_balance(128 asset: Self::AssetId,129 who: &<T as SystemConfig>::AccountId,130 preservation: Preservation,131 fortitude: Fortitude,132 ) -> Self::Balance {133 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible reducible_balance");134135 match asset {136 AssetIds::NativeAssetId(NativeCurrency::Here) => {137 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::reducible_balance(138 who,139 preservation,140 fortitude,141 )142 .into()143 }144 AssetIds::NativeAssetId(NativeCurrency::Parent) => {145 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::reducible_balance(146 AssetIds::NativeAssetId(NativeCurrency::Parent),147 who,148 preservation,149 fortitude,150 )151 .into()152 }153 _ => Self::balance(asset, who),154 }155 }156157 fn can_deposit(158 asset: Self::AssetId,159 who: &<T as SystemConfig>::AccountId,160 amount: Self::Balance,161 provenance: Provenance,162 ) -> DepositConsequence {163 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_deposit");164165 match asset {166 AssetIds::NativeAssetId(NativeCurrency::Here) => {167 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_deposit(168 who,169 amount.into(),170 provenance,171 )172 }173 AssetIds::NativeAssetId(NativeCurrency::Parent) => {174 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_deposit(175 AssetIds::NativeAssetId(NativeCurrency::Parent),176 who,177 amount.into(),178 provenance,179 )180 }181 _ => {182 if amount.is_zero() {183 return DepositConsequence::Success;184 }185186 let extential_deposit_value = T::ExistentialDeposit::get();187 let ed_value: u128 = match extential_deposit_value.try_into() {188 Ok(val) => val,189 Err(_) => return DepositConsequence::CannotCreate,190 };191 let extential_deposit: Self::Balance = match ed_value.try_into() {192 Ok(val) => val,193 Err(_) => return DepositConsequence::CannotCreate,194 };195196 let new_total_balance = match Self::balance(asset, who).checked_add(&amount) {197 Some(x) => x,198 None => return DepositConsequence::Overflow,199 };200201 if new_total_balance < extential_deposit {202 return DepositConsequence::BelowMinimum;203 }204205 DepositConsequence::Success206 }207 }208 }209210 fn can_withdraw(211 asset: Self::AssetId,212 who: &<T as SystemConfig>::AccountId,213 amount: Self::Balance,214 ) -> WithdrawConsequence<Self::Balance> {215 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_withdraw");216 let value: u128 = match amount.try_into() {217 Ok(val) => val,218 Err(_) => return WithdrawConsequence::UnknownAsset,219 };220221 match asset {222 AssetIds::NativeAssetId(NativeCurrency::Here) => {223 let this_amount: <T as pallet_balances::Config>::Balance = match value.try_into() {224 Ok(val) => val,225 Err(_) => {226 return WithdrawConsequence::UnknownAsset;227 }228 };229 match <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_withdraw(230 who,231 this_amount,232 ) {233 WithdrawConsequence::BalanceLow => WithdrawConsequence::BalanceLow,234 WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,235 WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,236 WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,237 WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,238 WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,239 WithdrawConsequence::Success => WithdrawConsequence::Success,240 _ => WithdrawConsequence::BalanceLow,241 }242 }243 AssetIds::NativeAssetId(NativeCurrency::Parent) => {244 let parent_amount: <T as orml_tokens::Config>::Balance = match value.try_into() {245 Ok(val) => val,246 Err(_) => {247 return WithdrawConsequence::UnknownAsset;248 }249 };250 match <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_withdraw(251 AssetIds::NativeAssetId(NativeCurrency::Parent),252 who,253 parent_amount,254 ) {255 WithdrawConsequence::BalanceLow => WithdrawConsequence::BalanceLow,256 WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,257 WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,258 WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,259 WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,260 WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,261 WithdrawConsequence::Success => WithdrawConsequence::Success,262 _ => WithdrawConsequence::BalanceLow,263 }264 }265 _ => match Self::balance(asset, who).checked_sub(&amount) {266 Some(_) => WithdrawConsequence::Success,267 None => WithdrawConsequence::BalanceLow,268 },269 }270 }271272 fn asset_exists(asset: AssetIds) -> bool {273 match asset {274 AssetIds::NativeAssetId(_) => true,275 AssetIds::ForeignAssetId(fid) => <AssetBinding<T>>::contains_key(fid),276 }277 }278}279280impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T>281where282 T: orml_tokens::Config<CurrencyId = AssetIds>,283 BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,284 BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,285 <T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,286 <T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,287 u128: From<BalanceOf<T>>,288{289 fn mint_into(290 asset: Self::AssetId,291 who: &<T as SystemConfig>::AccountId,292 amount: Self::Balance,293 ) -> Result<BalanceOf<T>, DispatchError> {294 //Self::do_mint(asset, who, amount, None)295 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible mint_into {:?}", asset);296297 match asset {298 AssetIds::NativeAssetId(NativeCurrency::Here) => {299 <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::mint_into(300 who,301 amount.into(),302 )303 .map(Into::into)304 }305 AssetIds::NativeAssetId(NativeCurrency::Parent) => {306 <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::mint_into(307 AssetIds::NativeAssetId(NativeCurrency::Parent),308 who,309 amount.into(),310 )311 .map(Into::into)312 }313 AssetIds::ForeignAssetId(fid) => {314 let target_collection_id = match <AssetBinding<T>>::get(fid) {315 Some(v) => v,316 None => {317 return Err(DispatchError::Other(318 "Associated collection not found for asset",319 ))320 }321 };322 let collection =323 FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);324 let account = T::CrossAccountId::from_sub(who.clone());325326 let amount_data: pallet_fungible::CreateItemData<T> =327 (account.clone(), amount.into());328329 pallet_fungible::Pallet::<T>::create_item_foreign(330 &collection,331 &account,332 amount_data,333 &Value::new(0),334 )?;335336 Ok(amount.into())337 }338 }339 }340341 fn burn_from(342 asset: Self::AssetId,343 who: &<T as SystemConfig>::AccountId,344 amount: Self::Balance,345 precision: Precision,346 fortitude: Fortitude,347 ) -> Result<Self::Balance, DispatchError> {348 // let f = DebitFlags { keep_alive: false, best_effort: false };349 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible burn_from");350351 match asset {352 AssetIds::NativeAssetId(NativeCurrency::Here) => {353 <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::burn_from(354 who,355 amount.into(),356 precision,357 fortitude,358 )359 .map(Into::into)360 }361 AssetIds::NativeAssetId(NativeCurrency::Parent) => {362 <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::burn_from(363 AssetIds::NativeAssetId(NativeCurrency::Parent),364 who,365 amount.into(),366 precision,367 fortitude,368 )369 .map(Into::into)370 }371 AssetIds::ForeignAssetId(fid) => {372 let target_collection_id = match <AssetBinding<T>>::get(fid) {373 Some(v) => v,374 None => {375 return Err(DispatchError::Other(376 "Associated collection not found for asset",377 ))378 }379 };380 let collection =381 FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);382 pallet_fungible::Pallet::<T>::burn_foreign(383 &collection,384 &T::CrossAccountId::from_sub(who.clone()),385 amount.into(),386 )?;387388 Ok(amount)389 }390 }391 }392393 fn transfer(394 asset: Self::AssetId,395 source: &<T as SystemConfig>::AccountId,396 dest: &<T as SystemConfig>::AccountId,397 amount: Self::Balance,398 preservation: Preservation,399 ) -> Result<Self::Balance, DispatchError> {400 // let f = TransferFlags { keep_alive, best_effort: false, burn_dust: false };401 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible transfer");402403 match asset {404 AssetIds::NativeAssetId(NativeCurrency::Here) => {405 match <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::transfer(406 source,407 dest,408 amount.into(),409 preservation,410 ) {411 Ok(_) => Ok(amount),412 Err(_) => Err(DispatchError::Other(413 "Bad amount to relay chain value conversion",414 )),415 }416 }417 AssetIds::NativeAssetId(NativeCurrency::Parent) => {418 match <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::transfer(419 AssetIds::NativeAssetId(NativeCurrency::Parent),420 source,421 dest,422 amount.into(),423 preservation,424 ) {425 Ok(_) => Ok(amount),426 Err(e) => Err(e),427 }428 }429 AssetIds::ForeignAssetId(fid) => {430 let target_collection_id = match <AssetBinding<T>>::get(fid) {431 Some(v) => v,432 None => {433 return Err(DispatchError::Other(434 "Associated collection not found for asset",435 ))436 }437 };438 let collection =439 FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);440441 pallet_fungible::Pallet::<T>::transfer(442 &collection,443 &T::CrossAccountId::from_sub(source.clone()),444 &T::CrossAccountId::from_sub(dest.clone()),445 amount.into(),446 &Value::new(0),447 )448 .map_err(|e| e.error)?;449450 Ok(amount)451 }452 }453 }454}455456#[cfg(not(debug_assertions))]457extern "C" {458 // This function does not exists, thus compilation will fail, if its call is459 // not optimized away, which is only possible if it's not called at all.460 //461 // not(debug_assertions) is used to ensure compiler is dropping unused functions, as462 // this option is enabled in release by defailt463 //464 // FIXME: maybe use build.rs, to ensure it will fail even in release with debug_assertions465 // enabled?466 fn unbalanced_fungible_is_called();467}468macro_rules! ensure_balanced {469 () => {{470 #[cfg(debug_assertions)]471 panic!("unbalanced fungible methods should not be used");472 #[cfg(not(debug_assertions))]473 {474 unsafe { unbalanced_fungible_is_called() };475 unreachable!();476 }477 }};478}479480impl<T: Config> fungibles::Unbalanced<<T as SystemConfig>::AccountId> for Pallet<T>481where482 T: orml_tokens::Config<CurrencyId = AssetIds>,483 BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,484 BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,485 <T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,486 <T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,487 u128: From<BalanceOf<T>>,488{489 fn handle_dust(_dust: fungibles::Dust<<T as SystemConfig>::AccountId, Self>) {490 ensure_balanced!();491 }492 fn write_balance(493 _asset: Self::AssetId,494 _who: &<T as SystemConfig>::AccountId,495 _amount: Self::Balance,496 ) -> Result<Option<Self::Balance>, DispatchError> {497 ensure_balanced!();498 }499 fn set_total_issuance(_asset: Self::AssetId, _amount: Self::Balance) {500 ensure_balanced!();501 }502}pallets/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},
};
pallets/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]
pallets/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 }
runtime/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)?;
)* );
test-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::*,