difftreelog
refactor remove redundant foreign flag, use foreign-assets pallet instead
in: master
8 files changed
pallets/balances-adapter/src/common.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/common.rs
+++ b/pallets/balances-adapter/src/common.rs
@@ -368,10 +368,6 @@
}
impl<T: Config> pallet_common::XcmExtensions<T> for NativeFungibleHandle<T> {
- fn is_foreign(&self) -> bool {
- false
- }
-
fn create_item_internal(
&self,
_depositor: &<T>::CrossAccountId,
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1088,7 +1088,6 @@
read_only: flags.external,
flags: RpcCollectionFlags {
- foreign: flags.foreign,
erc721metadata: flags.erc721metadata,
},
})
@@ -1128,17 +1127,17 @@
/// Create new collection.
///
/// * `owner` - The owner of the collection.
+ /// * `payer` - If set, the user that will pay a deposit for the collection creation.
/// * `data` - Description of the created collection.
- /// * `flags` - Extra flags to store.
pub fn init_collection(
owner: T::CrossAccountId,
- payer: T::CrossAccountId,
+ payer: Option<T::CrossAccountId>,
data: CreateCollectionData<T::CrossAccountId>,
) -> Result<CollectionId, DispatchError> {
ensure!(data.flags.is_allowed_for_user(), <Error<T>>::NoPermission);
// Take a (non-refundable) deposit of collection creation
- {
+ if let Some(payer) = payer {
let mut imbalance = <Debt<T::AccountId, <T as Config>::Currency>>::zero();
imbalance.subsume(<T as Config>::Currency::deposit(
&T::TreasuryAccountId::get(),
@@ -1153,16 +1152,6 @@
}
Self::init_collection_internal(owner, data)
- }
-
- /// Initializes the collection with ForeignCollection flag. Returns [CollectionId] on success, [DispatchError] otherwise.
- pub fn init_foreign_collection(
- owner: T::CrossAccountId,
- mut data: CreateCollectionData<T::CrossAccountId>,
- ) -> Result<CollectionId, DispatchError> {
- data.flags.foreign = true;
- let id = Self::init_collection_internal(owner, data)?;
- Ok(id)
}
fn init_collection_internal(
@@ -2348,9 +2337,6 @@
where
T: Config,
{
- /// Is the collection a foreign one?
- fn is_foreign(&self) -> bool;
-
/// Does the token have children?
fn token_has_children(&self, _token: TokenId) -> bool {
false
pallets/foreign-assets/src/lib.rsdiffbeforeafterboth--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -304,11 +304,10 @@
/// If the `asset_instance` is a part of a local collection,
/// the function will return either `Ok(Some(<token ID>))` or an error if the token is not found.
fn asset_instance_to_token_id(
- xcm_ext: &dyn XcmExtensions<T>,
collection_id: CollectionId,
asset_instance: &AssetInstance,
) -> Result<Option<TokenId>, XcmError> {
- if xcm_ext.is_foreign() {
+ if <CollectionToForeignReserveLocation<T>>::contains_key(collection_id) {
Ok(Self::foreign_reserve_asset_instance_to_token_id(
collection_id,
asset_instance,
@@ -363,7 +362,7 @@
to: T::CrossAccountId,
) -> XcmResult {
let deposit_result = if let Some(token_id) =
- Self::asset_instance_to_token_id(xcm_ext, collection_id, asset_instance)?
+ Self::asset_instance_to_token_id(collection_id, asset_instance)?
{
let depositor = &Self::pallet_account();
let from = depositor;
@@ -389,7 +388,7 @@
asset_instance: &AssetInstance,
from: T::CrossAccountId,
) -> XcmResult {
- let token_id = Self::asset_instance_to_token_id(xcm_ext, collection_id, &asset_instance)?
+ let token_id = Self::asset_instance_to_token_id(collection_id, &asset_instance)?
.ok_or(XcmError::AssetNotFound)?;
if xcm_ext.token_has_children(token_id) {
@@ -517,9 +516,8 @@
}
Fungibility::NonFungible(asset_instance) => {
- token_id =
- Self::asset_instance_to_token_id(xcm_ext, collection_id, &asset_instance)?
- .ok_or(XcmError::AssetNotFound)?;
+ token_id = Self::asset_instance_to_token_id(collection_id, &asset_instance)?
+ .ok_or(XcmError::AssetNotFound)?;
amount = 1;
map_error = |_| XcmError::FailedToTransactAsset("nonfungible item transfer failed")
@@ -542,17 +540,11 @@
if collection_id == NATIVE_FUNGIBLE_COLLECTION_ID {
Some(Here.into())
} else {
- let dispatch = T::CollectionDispatch::dispatch(collection_id).ok()?;
- let collection = dispatch.as_dyn();
- let xcm_ext = collection.xcm_extensions()?;
-
- if xcm_ext.is_foreign() {
- <Pallet<T>>::collection_to_foreign_reserve_location(collection_id)
- } else {
+ <Pallet<T>>::collection_to_foreign_reserve_location(collection_id).or_else(|| {
T::SelfLocation::get()
.pushed_with_interior(GeneralIndex(collection_id.0.into()))
.ok()
- }
+ })
}
}
}
pallets/fungible/src/common.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/>.1617use core::marker::PhantomData;1819use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight};20use pallet_common::{21 weights::WeightInfo as _, with_weight, CommonCollectionOperations, CommonWeightInfo,22 Error as CommonError, SelfWeightOf as PalletCommonWeightOf, XcmExtensions,23};24use sp_runtime::{ArithmeticError, DispatchError};25use sp_std::{vec, vec::Vec};26use up_data_structs::{27 budget::Budget, CollectionId, CreateItemData, CreateItemExData, Property, PropertyKey,28 PropertyKeyPermission, PropertyValue, TokenId, TokenOwnerError,29};3031use crate::{32 weights::WeightInfo, Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf,33 TotalSupply,34};3536pub struct CommonWeights<T: Config>(PhantomData<T>);37impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {38 fn create_multiple_items(_data: &[CreateItemData]) -> Weight {39 // All items minted for the same user, so it works same as create_item40 <SelfWeightOf<T>>::create_item()41 }4243 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {44 match data {45 CreateItemExData::Fungible(f) => {46 <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)47 }48 _ => Weight::zero(),49 }50 }5152 fn burn_item() -> Weight {53 <SelfWeightOf<T>>::burn_item()54 }5556 fn set_collection_properties(amount: u32) -> Weight {57 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)58 }5960 fn set_token_properties(_amount: u32) -> Weight {61 // Error62 Weight::zero()63 }6465 fn set_token_property_permissions(_amount: u32) -> Weight {66 // Error67 Weight::zero()68 }6970 fn transfer() -> Weight {71 <SelfWeightOf<T>>::transfer_raw()72 .saturating_add(<PalletCommonWeightOf<T>>::check_accesslist().saturating_mul(2))73 }7475 fn approve() -> Weight {76 <SelfWeightOf<T>>::approve()77 }7879 fn approve_from() -> Weight {80 <SelfWeightOf<T>>::approve_from()81 }8283 fn transfer_from() -> Weight {84 Self::transfer()85 .saturating_add(<SelfWeightOf<T>>::check_allowed_raw())86 .saturating_add(<SelfWeightOf<T>>::set_allowance_unchecked_raw())87 }8889 fn burn_from() -> Weight {90 <SelfWeightOf<T>>::burn_from()91 }9293 fn set_allowance_for_all() -> Weight {94 Weight::zero()95 }9697 fn force_repair_item() -> Weight {98 Weight::zero()99 }100}101102/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete103/// methods and adds weight info.104impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {105 fn create_item(106 &self,107 sender: T::CrossAccountId,108 to: T::CrossAccountId,109 data: up_data_structs::CreateItemData,110 nesting_budget: &dyn Budget,111 ) -> DispatchResultWithPostInfo {112 match &data {113 up_data_structs::CreateItemData::Fungible(fungible_data) => with_weight(114 <Pallet<T>>::create_item(self, &sender, (to, fungible_data.value), nesting_budget),115 <CommonWeights<T>>::create_item(&data),116 ),117 _ => fail!(<CommonError<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),118 }119 }120121 fn create_multiple_items(122 &self,123 sender: T::CrossAccountId,124 to: T::CrossAccountId,125 data: Vec<up_data_structs::CreateItemData>,126 nesting_budget: &dyn Budget,127 ) -> DispatchResultWithPostInfo {128 let mut sum: u128 = 0;129 for data in &data {130 match &data {131 up_data_structs::CreateItemData::Fungible(data) => {132 sum = sum133 .checked_add(data.value)134 .ok_or(ArithmeticError::Overflow)?;135 }136 _ => fail!(<CommonError<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),137 }138 }139140 with_weight(141 <Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),142 <CommonWeights<T>>::create_multiple_items(&data),143 )144 }145146 fn create_multiple_items_ex(147 &self,148 sender: <T>::CrossAccountId,149 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,150 nesting_budget: &dyn Budget,151 ) -> DispatchResultWithPostInfo {152 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);153 let data = match data {154 up_data_structs::CreateItemExData::Fungible(f) => f,155 _ => fail!(<CommonError<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),156 };157158 with_weight(159 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),160 weight,161 )162 }163164 fn burn_item(165 &self,166 sender: T::CrossAccountId,167 token: TokenId,168 amount: u128,169 ) -> DispatchResultWithPostInfo {170 ensure!(171 token == TokenId::default(),172 <CommonError<T>>::FungibleItemsHaveNoId173 );174175 with_weight(176 <Pallet<T>>::burn(self, &sender, amount),177 <CommonWeights<T>>::burn_item(),178 )179 }180181 fn transfer(182 &self,183 from: T::CrossAccountId,184 to: T::CrossAccountId,185 token: TokenId,186 amount: u128,187 nesting_budget: &dyn Budget,188 ) -> DispatchResultWithPostInfo {189 ensure!(190 token == TokenId::default(),191 <CommonError<T>>::FungibleItemsHaveNoId192 );193194 <Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget)195 }196197 fn approve(198 &self,199 sender: T::CrossAccountId,200 spender: T::CrossAccountId,201 token: TokenId,202 amount: u128,203 ) -> DispatchResultWithPostInfo {204 ensure!(205 token == TokenId::default(),206 <CommonError<T>>::FungibleItemsHaveNoId207 );208209 with_weight(210 <Pallet<T>>::set_allowance(self, &sender, &spender, amount),211 <CommonWeights<T>>::approve(),212 )213 }214215 fn approve_from(216 &self,217 sender: T::CrossAccountId,218 from: T::CrossAccountId,219 to: T::CrossAccountId,220 token: TokenId,221 amount: u128,222 ) -> DispatchResultWithPostInfo {223 ensure!(224 token == TokenId::default(),225 <CommonError<T>>::FungibleItemsHaveNoId226 );227228 with_weight(229 <Pallet<T>>::set_allowance_from(self, &sender, &from, &to, amount),230 <CommonWeights<T>>::approve_from(),231 )232 }233234 fn transfer_from(235 &self,236 sender: T::CrossAccountId,237 from: T::CrossAccountId,238 to: T::CrossAccountId,239 token: TokenId,240 amount: u128,241 nesting_budget: &dyn Budget,242 ) -> DispatchResultWithPostInfo {243 ensure!(244 token == TokenId::default(),245 <CommonError<T>>::FungibleItemsHaveNoId246 );247248 <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget)249 }250251 fn burn_from(252 &self,253 sender: T::CrossAccountId,254 from: T::CrossAccountId,255 token: TokenId,256 amount: u128,257 nesting_budget: &dyn Budget,258 ) -> DispatchResultWithPostInfo {259 ensure!(260 token == TokenId::default(),261 <CommonError<T>>::FungibleItemsHaveNoId262 );263264 with_weight(265 <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),266 <CommonWeights<T>>::burn_from(),267 )268 }269270 fn set_collection_properties(271 &self,272 sender: T::CrossAccountId,273 properties: Vec<Property>,274 ) -> DispatchResultWithPostInfo {275 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);276277 with_weight(278 <Pallet<T>>::set_collection_properties(self, &sender, properties),279 weight,280 )281 }282283 fn delete_collection_properties(284 &self,285 sender: &T::CrossAccountId,286 property_keys: Vec<PropertyKey>,287 ) -> DispatchResultWithPostInfo {288 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);289290 with_weight(291 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),292 weight,293 )294 }295296 fn set_token_properties(297 &self,298 _sender: T::CrossAccountId,299 _token_id: TokenId,300 _property: Vec<Property>,301 _nesting_budget: &dyn Budget,302 ) -> DispatchResultWithPostInfo {303 fail!(<Error<T>>::SettingPropertiesNotAllowed)304 }305306 fn set_token_property_permissions(307 &self,308 _sender: &T::CrossAccountId,309 _property_permissions: Vec<PropertyKeyPermission>,310 ) -> DispatchResultWithPostInfo {311 fail!(<Error<T>>::SettingPropertiesNotAllowed)312 }313314 fn delete_token_properties(315 &self,316 _sender: T::CrossAccountId,317 _token_id: TokenId,318 _property_keys: Vec<PropertyKey>,319 _nesting_budget: &dyn Budget,320 ) -> DispatchResultWithPostInfo {321 fail!(<Error<T>>::SettingPropertiesNotAllowed)322 }323324 fn get_token_properties_raw(325 &self,326 _token_id: TokenId,327 ) -> Option<up_data_structs::TokenProperties> {328 // No token properties are defined on fungibles329 None330 }331332 fn set_token_properties_raw(&self, _token_id: TokenId, _map: up_data_structs::TokenProperties) {333 // No token properties are defined on fungibles334 }335336 fn check_nesting(337 &self,338 _sender: &<T>::CrossAccountId,339 _from: (CollectionId, TokenId),340 _under: TokenId,341 _nesting_budget: &dyn Budget,342 ) -> sp_runtime::DispatchResult {343 fail!(<Error<T>>::FungibleDisallowsNesting)344 }345346 fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}347348 fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}349350 fn collection_tokens(&self) -> Vec<TokenId> {351 vec![TokenId::default()]352 }353354 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {355 if <Balance<T>>::get((self.id, account)) != 0 {356 vec![TokenId::default()]357 } else {358 vec![]359 }360 }361362 fn token_exists(&self, token: TokenId) -> bool {363 token == TokenId::default()364 }365366 fn last_token_id(&self) -> TokenId {367 TokenId::default()368 }369370 fn token_owner(&self, _token: TokenId) -> Result<T::CrossAccountId, TokenOwnerError> {371 Err(TokenOwnerError::MultipleOwners)372 }373374 fn check_token_indirect_owner(375 &self,376 _token: TokenId,377 _maybe_owner: &T::CrossAccountId,378 _nesting_budget: &dyn Budget,379 ) -> Result<bool, DispatchError> {380 Ok(false)381 }382383 /// Returns 10 tokens owners in no particular order.384 fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {385 <Pallet<T>>::token_owners(self.id, token).unwrap_or_default()386 }387388 fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {389 None390 }391392 fn token_properties(393 &self,394 _token_id: TokenId,395 _keys: Option<Vec<PropertyKey>>,396 ) -> Vec<Property> {397 Vec::new()398 }399400 fn total_supply(&self) -> u32 {401 1402 }403404 fn account_balance(&self, account: T::CrossAccountId) -> u32 {405 if <Balance<T>>::get((self.id, account)) != 0 {406 1407 } else {408 0409 }410 }411412 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {413 if token != TokenId::default() {414 return 0;415 }416 <Balance<T>>::get((self.id, account))417 }418419 fn allowance(420 &self,421 sender: T::CrossAccountId,422 spender: T::CrossAccountId,423 token: TokenId,424 ) -> u128 {425 if token != TokenId::default() {426 return 0;427 }428 <Allowance<T>>::get((self.id, sender, spender))429 }430431 fn total_pieces(&self, token: TokenId) -> Option<u128> {432 if token != TokenId::default() {433 return None;434 }435 <TotalSupply<T>>::try_get(self.id).ok()436 }437438 fn xcm_extensions(&self) -> Option<&dyn XcmExtensions<T>> {439 Some(self)440 }441442 fn set_allowance_for_all(443 &self,444 _owner: T::CrossAccountId,445 _operator: T::CrossAccountId,446 _approve: bool,447 ) -> DispatchResultWithPostInfo {448 fail!(<Error<T>>::SettingAllowanceForAllNotAllowed)449 }450451 fn allowance_for_all(&self, _owner: T::CrossAccountId, _operator: T::CrossAccountId) -> bool {452 false453 }454455 /// Repairs a possibly broken item.456 fn repair_item(&self, _token: TokenId) -> DispatchResultWithPostInfo {457 fail!(<Error<T>>::FungibleTokensAreAlwaysValid)458 }459}460461impl<T: Config> XcmExtensions<T> for FungibleHandle<T> {462 fn create_item_internal(463 &self,464 depositor: &<T>::CrossAccountId,465 to: <T>::CrossAccountId,466 data: CreateItemData,467 nesting_budget: &dyn Budget,468 ) -> Result<TokenId, sp_runtime::DispatchError> {469 match &data {470 up_data_structs::CreateItemData::Fungible(fungible_data) => {471 <Pallet<T>>::create_multiple_items(472 self,473 &depositor,474 [(to, fungible_data.value)].into_iter().collect(),475 nesting_budget,476 )?477 }478 _ => fail!(<CommonError<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),479 }480481 Ok(TokenId::default())482 }483484 fn transfer_item_internal(485 &self,486 depositor: &<T>::CrossAccountId,487 from: &<T>::CrossAccountId,488 to: &<T>::CrossAccountId,489 token: TokenId,490 amount: u128,491 nesting_budget: &dyn Budget,492 ) -> sp_runtime::DispatchResult {493 ensure!(494 token == TokenId::default(),495 <CommonError<T>>::FungibleItemsHaveNoId496 );497498 <Pallet<T>>::transfer_internal(self, &depositor, &from, &to, amount, nesting_budget)499 .map(|_| ())500 .map_err(|post_info| post_info.error)501 }502503 fn burn_item_internal(504 &self,505 from: <T>::CrossAccountId,506 token: TokenId,507 amount: u128,508 ) -> sp_runtime::DispatchResult {509 <Self as CommonCollectionOperations<T>>::burn_item(&self, from, token, amount)510 .map(|_| ())511 .map_err(|post_info| post_info.error)512 }513}pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -572,10 +572,6 @@
}
impl<T: Config> XcmExtensions<T> for NonfungibleHandle<T> {
- fn is_foreign(&self) -> bool {
- self.flags.foreign
- }
-
fn token_has_children(&self, token: TokenId) -> bool {
<Pallet<T>>::token_has_children(self.id, token)
}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -306,7 +306,7 @@
payer: T::CrossAccountId,
data: CreateCollectionData<T::CrossAccountId>,
) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(owner, payer, data)
+ <PalletCommon<T>>::init_collection(owner, Some(payer), data)
}
/// Destroy RFT collection
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -378,9 +378,9 @@
#[derive(AbiCoderFlags, Bitfields, Clone, Copy, PartialEq, Eq, Debug, Default)]
#[bondrewd(enforce_bytes = 1)]
pub struct CollectionFlags {
- /// Tokens in foreign collections can be transferred, but not burnt
+ /// Reserved flag
#[bondrewd(bits = "0..1")]
- pub foreign: bool,
+ pub reserved_0: bool,
/// Supports ERC721Metadata
#[bondrewd(bits = "1..2")]
pub erc721metadata: bool,
@@ -395,7 +395,7 @@
impl CollectionFlags {
pub fn is_allowed_for_user(self) -> bool {
- !self.foreign && !self.external && self.reserved == 0
+ !self.reserved_0 && !self.external && self.reserved == 0
}
}
@@ -461,8 +461,6 @@
#[derive(Debug, Encode, Decode, Clone, PartialEq, TypeInfo, Serialize, Deserialize)]
pub struct RpcCollectionFlags {
- /// Is collection is foreign.
- pub foreign: bool,
/// Collection supports ERC721Metadata.
pub erc721metadata: bool,
}
@@ -505,7 +503,7 @@
pub read_only: bool,
/// Extra collection flags
- #[version(2.., upper(RpcCollectionFlags {foreign: false, erc721metadata: false}))]
+ #[version(2.., upper(RpcCollectionFlags {erc721metadata: false}))]
pub flags: RpcCollectionFlags,
}
@@ -542,7 +540,6 @@
read_only: true,
flags: RpcCollectionFlags {
- foreign: false,
erc721metadata: false,
},
}
runtime/common/dispatch.rsdiffbeforeafterboth--- a/runtime/common/dispatch.rs
+++ b/runtime/common/dispatch.rs
@@ -86,7 +86,7 @@
_ => {}
};
- <PalletCommon<T>>::init_collection(sender, payer, data)
+ <PalletCommon<T>>::init_collection(sender, Some(payer), data)
}
fn create_foreign(
@@ -106,7 +106,8 @@
_ => {}
};
- <PalletCommon<T>>::init_foreign_collection(sender, data)
+ let payer = None;
+ <PalletCommon<T>>::init_collection(sender, payer, data)
}
fn destroy(sender: T::CrossAccountId, collection_id: CollectionId) -> DispatchResult {