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.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -459,10 +459,6 @@
}
impl<T: Config> XcmExtensions<T> for FungibleHandle<T> {
- fn is_foreign(&self) -> bool {
- self.flags.foreign
- }
-
fn create_item_internal(
&self,
depositor: &<T>::CrossAccountId,
pallets/nonfungible/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, write_token_properties_total_weight,22 CommonCollectionOperations, CommonWeightInfo, SelfWeightOf as PalletCommonWeightOf,23 XcmExtensions,24};25use pallet_structure::Pallet as PalletStructure;26use sp_runtime::DispatchError;27use sp_std::{vec, vec::Vec};28use up_data_structs::{29 budget::Budget, CollectionId, CreateItemExData, Property, PropertyKey, PropertyKeyPermission,30 PropertyValue, TokenId, TokenOwnerError,31};3233use crate::{34 weights::WeightInfo, AccountBalance, Allowance, Config, CreateItemData, Error,35 NonfungibleHandle, Owned, Pallet, SelfWeightOf, TokenData, TokenProperties, TokensMinted,36};3738pub struct CommonWeights<T: Config>(PhantomData<T>);39impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {40 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {41 match data {42 CreateItemExData::NFT(t) => mint_with_props_weight::<T>(43 <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32),44 t.iter().map(|t| t.properties.len() as u32),45 ),46 _ => Weight::zero(),47 }48 }4950 fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {51 mint_with_props_weight::<T>(52 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32),53 data.iter().map(|t| match t {54 up_data_structs::CreateItemData::NFT(n) => n.properties.len() as u32,55 _ => 0,56 }),57 )58 }5960 fn burn_item() -> Weight {61 <SelfWeightOf<T>>::burn_item()62 }6364 fn set_collection_properties(amount: u32) -> Weight {65 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)66 }6768 fn set_token_properties(amount: u32) -> Weight {69 write_token_properties_total_weight::<T, _>([amount].into_iter(), |amount| {70 <SelfWeightOf<T>>::load_token_properties()71 .saturating_add(<SelfWeightOf<T>>::write_token_properties(amount))72 })73 }7475 fn delete_token_properties(amount: u32) -> Weight {76 Self::set_token_properties(amount)77 }7879 fn set_token_property_permissions(amount: u32) -> Weight {80 <SelfWeightOf<T>>::set_token_property_permissions(amount)81 }8283 fn transfer() -> Weight {84 <SelfWeightOf<T>>::transfer_raw()85 .saturating_add(<PalletCommonWeightOf<T>>::check_accesslist().saturating_mul(2))86 }8788 fn approve() -> Weight {89 <SelfWeightOf<T>>::approve()90 }9192 fn approve_from() -> Weight {93 <SelfWeightOf<T>>::approve_from()94 }9596 fn transfer_from() -> Weight {97 Self::transfer().saturating_add(<SelfWeightOf<T>>::check_allowed_raw())98 }99100 fn burn_from() -> Weight {101 <SelfWeightOf<T>>::burn_from()102 }103104 fn set_allowance_for_all() -> Weight {105 <SelfWeightOf<T>>::set_allowance_for_all()106 }107108 fn force_repair_item() -> Weight {109 <SelfWeightOf<T>>::repair_item()110 }111}112113/// Weight of minting tokens with properties114/// * `create_no_data_weight` -- the weight of minting without properties115/// * `token_properties_nums` -- number of properties of each token116#[inline]117pub(crate) fn mint_with_props_weight<T: Config>(118 create_no_data_weight: Weight,119 token_properties_nums: impl Iterator<Item = u32> + Clone,120) -> Weight {121 create_no_data_weight.saturating_add(write_token_properties_total_weight::<T, _>(122 token_properties_nums,123 <SelfWeightOf<T>>::write_token_properties,124 ))125}126127fn map_create_data<T: Config>(128 data: up_data_structs::CreateItemData,129 to: &T::CrossAccountId,130) -> Result<CreateItemData<T>, DispatchError> {131 match data {132 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {133 properties: data.properties,134 owner: to.clone(),135 }),136 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),137 }138}139140/// Implementation of `CommonCollectionOperations` for `NonfungibleHandle`. It wraps Nonfungible Pallete141/// methods and adds weight info.142impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {143 fn create_item(144 &self,145 sender: T::CrossAccountId,146 to: T::CrossAccountId,147 data: up_data_structs::CreateItemData,148 nesting_budget: &dyn Budget,149 ) -> DispatchResultWithPostInfo {150 let weight = <CommonWeights<T>>::create_item(&data);151 with_weight(152 <Pallet<T>>::create_item(153 self,154 &sender,155 map_create_data::<T>(data, &to)?,156 nesting_budget,157 ),158 weight,159 )160 }161162 fn create_multiple_items(163 &self,164 sender: T::CrossAccountId,165 to: T::CrossAccountId,166 data: Vec<up_data_structs::CreateItemData>,167 nesting_budget: &dyn Budget,168 ) -> DispatchResultWithPostInfo {169 let weight = <CommonWeights<T>>::create_multiple_items(&data);170 let data = data171 .into_iter()172 .map(|d| map_create_data::<T>(d, &to))173 .collect::<Result<Vec<_>, DispatchError>>()?;174175 with_weight(176 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),177 weight,178 )179 }180181 fn create_multiple_items_ex(182 &self,183 sender: <T>::CrossAccountId,184 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,185 nesting_budget: &dyn Budget,186 ) -> DispatchResultWithPostInfo {187 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);188 let data = match data {189 up_data_structs::CreateItemExData::NFT(nft) => nft,190 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),191 };192193 with_weight(194 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),195 weight,196 )197 }198199 fn set_collection_properties(200 &self,201 sender: T::CrossAccountId,202 properties: Vec<Property>,203 ) -> DispatchResultWithPostInfo {204 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);205206 with_weight(207 <Pallet<T>>::set_collection_properties(self, &sender, properties),208 weight,209 )210 }211212 fn delete_collection_properties(213 &self,214 sender: &T::CrossAccountId,215 property_keys: Vec<PropertyKey>,216 ) -> DispatchResultWithPostInfo {217 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);218219 with_weight(220 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),221 weight,222 )223 }224225 fn set_token_properties(226 &self,227 sender: T::CrossAccountId,228 token_id: TokenId,229 properties: Vec<Property>,230 nesting_budget: &dyn Budget,231 ) -> DispatchResultWithPostInfo {232 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);233234 with_weight(235 <Pallet<T>>::set_token_properties(236 self,237 &sender,238 token_id,239 properties.into_iter(),240 nesting_budget,241 ),242 weight,243 )244 }245246 fn delete_token_properties(247 &self,248 sender: T::CrossAccountId,249 token_id: TokenId,250 property_keys: Vec<PropertyKey>,251 nesting_budget: &dyn Budget,252 ) -> DispatchResultWithPostInfo {253 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);254255 with_weight(256 <Pallet<T>>::delete_token_properties(257 self,258 &sender,259 token_id,260 property_keys.into_iter(),261 nesting_budget,262 ),263 weight,264 )265 }266267 fn get_token_properties_raw(268 &self,269 token_id: TokenId,270 ) -> Option<up_data_structs::TokenProperties> {271 <TokenProperties<T>>::get((self.id, token_id))272 }273274 fn set_token_properties_raw(&self, token_id: TokenId, map: up_data_structs::TokenProperties) {275 <TokenProperties<T>>::insert((self.id, token_id), map)276 }277278 fn set_token_property_permissions(279 &self,280 sender: &T::CrossAccountId,281 property_permissions: Vec<PropertyKeyPermission>,282 ) -> DispatchResultWithPostInfo {283 let weight =284 <CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);285286 with_weight(287 <Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),288 weight,289 )290 }291292 fn burn_item(293 &self,294 sender: T::CrossAccountId,295 token: TokenId,296 amount: u128,297 ) -> DispatchResultWithPostInfo {298 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);299 if amount == 1 {300 with_weight(301 <Pallet<T>>::burn(self, &sender, token),302 <CommonWeights<T>>::burn_item(),303 )304 } else {305 <Pallet<T>>::check_token_immediate_ownership(self, token, &sender)?;306 Ok(().into())307 }308 }309310 fn transfer(311 &self,312 from: T::CrossAccountId,313 to: T::CrossAccountId,314 token: TokenId,315 amount: u128,316 nesting_budget: &dyn Budget,317 ) -> DispatchResultWithPostInfo {318 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);319 if amount == 1 {320 <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget)321 } else {322 <Pallet<T>>::check_token_immediate_ownership(self, token, &from)?;323 Ok(().into())324 }325 }326327 fn approve(328 &self,329 sender: T::CrossAccountId,330 spender: T::CrossAccountId,331 token: TokenId,332 amount: u128,333 ) -> DispatchResultWithPostInfo {334 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);335336 with_weight(337 if amount == 1 {338 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))339 } else {340 <Pallet<T>>::set_allowance(self, &sender, token, None)341 },342 <CommonWeights<T>>::approve(),343 )344 }345346 fn approve_from(347 &self,348 sender: T::CrossAccountId,349 from: T::CrossAccountId,350 to: T::CrossAccountId,351 token: TokenId,352 amount: u128,353 ) -> DispatchResultWithPostInfo {354 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);355356 with_weight(357 if amount == 1 {358 <Pallet<T>>::set_allowance_from(self, &sender, &from, token, Some(&to))359 } else {360 <Pallet<T>>::set_allowance_from(self, &sender, &from, token, None)361 },362 <CommonWeights<T>>::approve_from(),363 )364 }365366 fn transfer_from(367 &self,368 sender: T::CrossAccountId,369 from: T::CrossAccountId,370 to: T::CrossAccountId,371 token: TokenId,372 amount: u128,373 nesting_budget: &dyn Budget,374 ) -> DispatchResultWithPostInfo {375 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);376377 if amount == 1 {378 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget)379 } else {380 <Pallet<T>>::check_allowed(self, &sender, &from, token, nesting_budget)?;381382 Ok(().into())383 }384 }385386 fn burn_from(387 &self,388 sender: T::CrossAccountId,389 from: T::CrossAccountId,390 token: TokenId,391 amount: u128,392 nesting_budget: &dyn Budget,393 ) -> DispatchResultWithPostInfo {394 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);395396 if amount == 1 {397 with_weight(398 <Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),399 <CommonWeights<T>>::burn_from(),400 )401 } else {402 <Pallet<T>>::check_allowed(self, &sender, &from, token, nesting_budget)?;403404 Ok(().into())405 }406 }407408 fn check_nesting(409 &self,410 sender: &T::CrossAccountId,411 from: (CollectionId, TokenId),412 under: TokenId,413 nesting_budget: &dyn Budget,414 ) -> sp_runtime::DispatchResult {415 <Pallet<T>>::check_nesting(self, sender, from, under, nesting_budget)416 }417418 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {419 <Pallet<T>>::nest((self.id, under), to_nest);420 }421422 fn unnest(&self, under: TokenId, to_unnest: (CollectionId, TokenId)) {423 <Pallet<T>>::unnest((self.id, under), to_unnest);424 }425426 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {427 <Owned<T>>::iter_prefix((self.id, account))428 .map(|(id, _)| id)429 .collect()430 }431432 fn collection_tokens(&self) -> Vec<TokenId> {433 <TokenData<T>>::iter_prefix((self.id,))434 .map(|(id, _)| id)435 .collect()436 }437438 fn token_exists(&self, token: TokenId) -> bool {439 <Pallet<T>>::token_exists(self, token)440 }441442 fn last_token_id(&self) -> TokenId {443 TokenId(<TokensMinted<T>>::get(self.id))444 }445446 fn token_owner(&self, token: TokenId) -> Result<T::CrossAccountId, TokenOwnerError> {447 <TokenData<T>>::get((self.id, token))448 .map(|t| t.owner)449 .ok_or(TokenOwnerError::NotFound)450 }451452 fn check_token_indirect_owner(453 &self,454 token: TokenId,455 maybe_owner: &T::CrossAccountId,456 nesting_budget: &dyn Budget,457 ) -> Result<bool, DispatchError> {458 <PalletStructure<T>>::check_indirectly_owned(459 maybe_owner.clone(),460 self.id,461 token,462 None,463 nesting_budget,464 )465 }466467 /// Returns token owners.468 fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {469 self.token_owner(token).map_or_else(|_| vec![], |t| vec![t])470 }471472 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {473 <Pallet<T>>::token_properties((self.id, token_id))?474 .get(key)475 .cloned()476 }477478 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {479 let Some(properties) = <Pallet<T>>::token_properties((self.id, token_id)) else {480 return vec![];481 };482483 keys.map(|keys| {484 keys.into_iter()485 .filter_map(|key| {486 properties.get(&key).map(|value| Property {487 key,488 value: value.clone(),489 })490 })491 .collect()492 })493 .unwrap_or_else(|| {494 properties495 .into_iter()496 .map(|(key, value)| Property { key, value })497 .collect()498 })499 }500501 fn total_supply(&self) -> u32 {502 <Pallet<T>>::total_supply(self)503 }504505 fn account_balance(&self, account: T::CrossAccountId) -> u32 {506 <AccountBalance<T>>::get((self.id, account))507 }508509 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {510 if <TokenData<T>>::get((self.id, token))511 .map(|a| a.owner == account)512 .unwrap_or(false)513 {514 1515 } else {516 0517 }518 }519520 fn allowance(521 &self,522 sender: T::CrossAccountId,523 spender: T::CrossAccountId,524 token: TokenId,525 ) -> u128 {526 if <TokenData<T>>::get((self.id, token))527 .map(|a| a.owner != sender)528 .unwrap_or(true)529 {530 0531 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {532 1533 } else {534 0535 }536 }537538 fn total_pieces(&self, token: TokenId) -> Option<u128> {539 if <TokenData<T>>::contains_key((self.id, token)) {540 Some(1)541 } else {542 None543 }544 }545546 fn xcm_extensions(&self) -> Option<&dyn XcmExtensions<T>> {547 Some(self)548 }549550 fn set_allowance_for_all(551 &self,552 owner: T::CrossAccountId,553 operator: T::CrossAccountId,554 approve: bool,555 ) -> DispatchResultWithPostInfo {556 with_weight(557 <Pallet<T>>::set_allowance_for_all(self, &owner, &operator, approve),558 <CommonWeights<T>>::set_allowance_for_all(),559 )560 }561562 fn allowance_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool {563 <Pallet<T>>::allowance_for_all(self, &owner, &operator)564 }565566 fn repair_item(&self, token: TokenId) -> DispatchResultWithPostInfo {567 with_weight(568 <Pallet<T>>::repair_item(self, token),569 <CommonWeights<T>>::force_repair_item(),570 )571 }572}573574impl<T: Config> XcmExtensions<T> for NonfungibleHandle<T> {575 fn is_foreign(&self) -> bool {576 self.flags.foreign577 }578579 fn token_has_children(&self, token: TokenId) -> bool {580 <Pallet<T>>::token_has_children(self.id, token)581 }582583 fn create_item_internal(584 &self,585 depositor: &<T>::CrossAccountId,586 to: <T>::CrossAccountId,587 data: up_data_structs::CreateItemData,588 nesting_budget: &dyn Budget,589 ) -> Result<TokenId, sp_runtime::DispatchError> {590 <Pallet<T>>::create_multiple_items(591 self,592 &depositor,593 vec![map_create_data::<T>(data, &to)?],594 nesting_budget,595 )?;596597 Ok(self.last_token_id())598 }599600 fn transfer_item_internal(601 &self,602 depositor: &<T>::CrossAccountId,603 from: &<T>::CrossAccountId,604 to: &<T>::CrossAccountId,605 token: TokenId,606 amount: u128,607 nesting_budget: &dyn Budget,608 ) -> sp_runtime::DispatchResult {609 ensure!(amount == 1, <Error<T>>::NonfungibleItemsHaveNoAmount);610611 <Pallet<T>>::transfer_internal(self, &depositor, &from, &to, token, nesting_budget)612 .map(|_| ())613 .map_err(|post_info| post_info.error)614 }615616 fn burn_item_internal(617 &self,618 from: T::CrossAccountId,619 token: TokenId,620 amount: u128,621 ) -> sp_runtime::DispatchResult {622 ensure!(amount == 1, <Error<T>>::NonfungibleItemsHaveNoAmount);623624 <Pallet<T>>::burn(self, &from, token)625 }626}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 {