difftreelog
fix restore foreign flag, minor fixes
in: master
11 files changed
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -121,7 +121,7 @@
owner,
CollectionMode::NFT,
|owner: T::CrossAccountId, data| {
- <Pallet<T>>::init_collection(owner.clone(), Some(owner), data)
+ <Pallet<T>>::init_collection(owner.clone(), Some(owner), false, data)
},
|h| h,
)
pallets/common/src/dispatch.rsdiffbeforeafterboth--- a/pallets/common/src/dispatch.rs
+++ b/pallets/common/src/dispatch.rs
@@ -78,6 +78,21 @@
sender: T::CrossAccountId,
payer: Option<T::CrossAccountId>,
data: CreateCollectionData<T::CrossAccountId>,
+ ) -> Result<CollectionId, DispatchError> {
+ Self::create_internal(sender, payer, false, data)
+ }
+
+ /// Create a collection. The collection will be created according to the value of [`data.mode`](CreateCollectionData::mode).
+ ///
+ /// * `sender` - The user who will become the owner of the collection.
+ /// * `payer` - If set, the user who pays the collection creation deposit.
+ /// * `data` - Description of the created collection.
+ /// * `is_special_collection` -- Whether this collection is a system one, i.e. can have special flags set.
+ fn create_internal(
+ sender: T::CrossAccountId,
+ payer: Option<T::CrossAccountId>,
+ is_special_collection: bool,
+ data: CreateCollectionData<T::CrossAccountId>,
) -> Result<CollectionId, DispatchError>;
/// Delete the collection.
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1088,6 +1088,7 @@
read_only: flags.external,
flags: RpcCollectionFlags {
+ foreign: flags.foreign,
erc721metadata: flags.erc721metadata,
},
})
@@ -1129,12 +1130,16 @@
/// * `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.
+ /// * `is_special_collection` -- Whether this collection is a special one, i.e. can have special flags set.
pub fn init_collection(
owner: T::CrossAccountId,
payer: Option<T::CrossAccountId>,
+ is_special_collection: bool,
data: CreateCollectionData<T::CrossAccountId>,
) -> Result<CollectionId, DispatchError> {
- ensure!(data.flags.is_allowed_for_user(), <Error<T>>::NoPermission);
+ if !is_special_collection {
+ ensure!(data.flags.is_allowed_for_user(), <Error<T>>::NoPermission);
+ }
// Take a (non-refundable) deposit of collection creation
if let Some(payer) = payer {
pallets/foreign-assets/src/lib.rsdiffbeforeafterboth--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -153,9 +153,11 @@
.expect("description length < max description length; qed");
let payer = None;
- let collection_id = T::CollectionDispatch::create(
+ let is_special_collection = true;
+ let collection_id = T::CollectionDispatch::create_internal(
foreign_collection_owner,
payer,
+ is_special_collection,
CreateCollectionData {
name,
description,
pallets/fungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -31,7 +31,7 @@
owner,
CollectionMode::Fungible(0),
|owner: T::CrossAccountId, data| {
- <PalletCommon<T>>::init_collection(owner.clone(), Some(owner), data)
+ <PalletCommon<T>>::init_collection(owner.clone(), Some(owner), false, data)
},
FungibleHandle::cast,
)
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -58,7 +58,7 @@
owner,
CollectionMode::NFT,
|owner: T::CrossAccountId, data| {
- <PalletCommon<T>>::init_collection(owner.clone(), Some(owner), data)
+ <PalletCommon<T>>::init_collection(owner.clone(), Some(owner), false, data)
},
NonfungibleHandle::cast,
)
pallets/refungible/src/benchmarking.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::{convert::TryInto, iter::IntoIterator};1819use frame_benchmarking::v2::*;20use pallet_common::{21 bench_init,22 benchmarking::{create_collection_raw, property_key, property_value},23};24use sp_std::prelude::*;25use up_data_structs::{26 budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,27 MAX_PROPERTIES_PER_ITEM,28};2930use super::*;31use crate::{Config, Pallet, RefungibleHandle};3233const SEED: u32 = 1;3435fn create_max_item_data<T: Config>(36 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,37) -> CreateItemData<T> {38 CreateItemData::<T> {39 users: users40 .into_iter()41 .collect::<BTreeMap<_, _>>()42 .try_into()43 .unwrap(),44 properties: Default::default(),45 }46}4748fn create_max_item<T: Config>(49 collection: &RefungibleHandle<T>,50 sender: &T::CrossAccountId,51 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,52) -> Result<TokenId, DispatchError> {53 let data: CreateItemData<T> = create_max_item_data::<T>(users);54 <Pallet<T>>::create_item(collection, sender, data, &Unlimited)?;55 Ok(TokenId(<TokensMinted<T>>::get(collection.id)))56}5758fn create_collection<T: Config>(59 owner: T::CrossAccountId,60) -> Result<RefungibleHandle<T>, DispatchError> {61 create_collection_raw(62 owner,63 CollectionMode::ReFungible,64 |owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),65 RefungibleHandle::cast,66 )67}6869#[benchmarks]70mod benchmarks {71 use super::*;7273 #[benchmark]74 fn create_item() -> Result<(), BenchmarkError> {75 bench_init! {76 owner: sub; collection: collection(owner);77 sender: cross_from_sub(owner); to: cross_sub;78 };7980 #[block]81 {82 create_max_item(&collection, &sender, [(to, 200)])?;83 }8485 Ok(())86 }8788 #[benchmark]89 fn create_multiple_items(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {90 bench_init! {91 owner: sub; collection: collection(owner);92 sender: cross_from_sub(owner); to: cross_sub;93 };94 let data = (0..b)95 .map(|_| create_max_item_data::<T>([(to.clone(), 200)]))96 .collect();9798 #[block]99 {100 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;101 }102103 Ok(())104 }105 #[benchmark]106 fn create_multiple_items_ex_multiple_items(107 b: Linear<0, MAX_ITEMS_PER_BATCH>,108 ) -> Result<(), BenchmarkError> {109 bench_init! {110 owner: sub; collection: collection(owner);111 sender: cross_from_sub(owner);112 };113 let data = (0..b)114 .map(|t| {115 bench_init!(to: cross_sub(t););116 create_max_item_data::<T>([(to, 200)])117 })118 .collect();119120 #[block]121 {122 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;123 }124125 Ok(())126 }127128 #[benchmark]129 fn create_multiple_items_ex_multiple_owners(130 b: Linear<0, MAX_ITEMS_PER_BATCH>,131 ) -> Result<(), BenchmarkError> {132 bench_init! {133 owner: sub; collection: collection(owner);134 sender: cross_from_sub(owner);135 };136 let data = vec![create_max_item_data::<T>((0..b).map(|u| {137 bench_init!(to: cross_sub(u););138 (to, 200)139 }))];140141 #[block]142 {143 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;144 }145146 Ok(())147 }148149 // Other user left, token data is kept150 #[benchmark]151 fn burn_item_partial() -> Result<(), BenchmarkError> {152 bench_init! {153 owner: sub; collection: collection(owner);154 sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;155 };156 let item = create_max_item(157 &collection,158 &sender,159 [(burner.clone(), 200), (another_owner, 200)],160 )?;161162 #[block]163 {164 <Pallet<T>>::burn(&collection, &burner, item, 200)?;165 }166167 Ok(())168 }169170 // No users remaining, token is destroyed171 #[benchmark]172 fn burn_item_fully() -> Result<(), BenchmarkError> {173 bench_init! {174 owner: sub; collection: collection(owner);175 sender: cross_from_sub(owner); burner: cross_sub;176 };177 let item = create_max_item(&collection, &sender, [(burner.clone(), 200)])?;178179 #[block]180 {181 <Pallet<T>>::burn(&collection, &burner, item, 200)?;182 }183184 Ok(())185 }186187 #[benchmark]188 fn transfer_normal() -> Result<(), BenchmarkError> {189 bench_init! {190 owner: sub; collection: collection(owner);191 sender: cross_from_sub(owner); receiver: cross_sub;192 };193 let item = create_max_item(194 &collection,195 &sender,196 [(sender.clone(), 200), (receiver.clone(), 200)],197 )?;198199 #[block]200 {201 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?;202 }203204 Ok(())205 }206207 // Target account is created208 #[benchmark]209 fn transfer_creating() -> Result<(), BenchmarkError> {210 bench_init! {211 owner: sub; collection: collection(owner);212 sender: cross_from_sub(owner); receiver: cross_sub;213 };214 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;215216 #[block]217 {218 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?;219 }220221 Ok(())222 }223224 // Source account is destroyed225 #[benchmark]226 fn transfer_removing() -> Result<(), BenchmarkError> {227 bench_init! {228 owner: sub; collection: collection(owner);229 sender: cross_from_sub(owner); receiver: cross_sub;230 };231 let item = create_max_item(232 &collection,233 &sender,234 [(sender.clone(), 200), (receiver.clone(), 200)],235 )?;236237 #[block]238 {239 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?;240 }241242 Ok(())243 }244245 // Source account destroyed, target created246 #[benchmark]247 fn transfer_creating_removing() -> Result<(), BenchmarkError> {248 bench_init! {249 owner: sub; collection: collection(owner);250 sender: cross_from_sub(owner); receiver: cross_sub;251 };252 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;253254 #[block]255 {256 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?;257 }258259 Ok(())260 }261262 #[benchmark]263 fn approve() -> Result<(), BenchmarkError> {264 bench_init! {265 owner: sub; collection: collection(owner);266 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;267 };268 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;269270 #[block]271 {272 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;273 }274275 Ok(())276 }277278 #[benchmark]279 fn approve_from() -> Result<(), BenchmarkError> {280 bench_init! {281 owner: sub; collection: collection(owner);282 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;283 };284 let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());285 let item = create_max_item(&collection, &owner, [(owner_eth.clone(), 200)])?;286287 #[block]288 {289 <Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, &spender, item, 100)?;290 }291292 Ok(())293 }294295 #[benchmark]296 fn transfer_from_normal() -> Result<(), BenchmarkError> {297 bench_init! {298 owner: sub; collection: collection(owner);299 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;300 };301 let item = create_max_item(302 &collection,303 &owner,304 [(sender.clone(), 200), (receiver.clone(), 200)],305 )?;306 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;307308 #[block]309 {310 <Pallet<T>>::transfer_from(311 &collection,312 &spender,313 &sender,314 &receiver,315 item,316 100,317 &Unlimited,318 )?;319 }320321 Ok(())322 }323324 // Target account is created325 #[benchmark]326 fn transfer_from_creating() -> Result<(), BenchmarkError> {327 bench_init! {328 owner: sub; collection: collection(owner);329 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;330 };331 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;332 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;333334 #[block]335 {336 <Pallet<T>>::transfer_from(337 &collection,338 &spender,339 &sender,340 &receiver,341 item,342 100,343 &Unlimited,344 )?;345 }346347 Ok(())348 }349350 // Source account is destroyed351 #[benchmark]352 fn transfer_from_removing() -> Result<(), BenchmarkError> {353 bench_init! {354 owner: sub; collection: collection(owner);355 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;356 };357 let item = create_max_item(358 &collection,359 &owner,360 [(sender.clone(), 200), (receiver.clone(), 200)],361 )?;362 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;363364 #[block]365 {366 <Pallet<T>>::transfer_from(367 &collection,368 &spender,369 &sender,370 &receiver,371 item,372 200,373 &Unlimited,374 )?;375 }376377 Ok(())378 }379380 // Source account destroyed, target created381 #[benchmark]382 fn transfer_from_creating_removing() -> Result<(), BenchmarkError> {383 bench_init! {384 owner: sub; collection: collection(owner);385 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;386 };387 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;388 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;389390 #[block]391 {392 <Pallet<T>>::transfer_from(393 &collection,394 &spender,395 &sender,396 &receiver,397 item,398 200,399 &Unlimited,400 )?;401 }402403 Ok(())404 }405406 // Both source account and token is destroyed407 #[benchmark]408 fn burn_from() -> Result<(), BenchmarkError> {409 bench_init! {410 owner: sub; collection: collection(owner);411 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;412 };413 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;414 <Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;415416 #[block]417 {418 <Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?;419 }420421 Ok(())422 }423424 #[benchmark]425 fn load_token_properties() -> Result<(), BenchmarkError> {426 bench_init! {427 owner: sub; collection: collection(owner);428 owner: cross_from_sub;429 };430431 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;432433 #[block]434 {435 pallet_common::BenchmarkPropertyWriter::<T>::load_token_properties(&collection, item);436 }437438 Ok(())439 }440441 #[benchmark]442 fn write_token_properties(b: Linear<0, MAX_PROPERTIES_PER_ITEM>) -> Result<(), BenchmarkError> {443 bench_init! {444 owner: sub; collection: collection(owner);445 owner: cross_from_sub;446 };447448 let perms = (0..b)449 .map(|k| PropertyKeyPermission {450 key: property_key(k as usize),451 permission: PropertyPermission {452 mutable: false,453 collection_admin: true,454 token_owner: true,455 },456 })457 .collect::<Vec<_>>();458 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;459 let props = (0..b)460 .map(|k| Property {461 key: property_key(k as usize),462 value: property_value(),463 })464 .collect::<Vec<_>>();465 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;466467 let lazy_collection_info =468 pallet_common::BenchmarkPropertyWriter::<T>::load_collection_info(&collection, &owner);469470 #[block]471 {472 let mut property_writer =473 pallet_common::BenchmarkPropertyWriter::new(&collection, lazy_collection_info);474475 property_writer.write_token_properties(476 item,477 props.into_iter(),478 crate::erc::ERC721TokenEvent::TokenChanged {479 token_id: item.into(),480 }481 .to_log(T::ContractAddress::get()),482 )?;483 }484485 Ok(())486 }487488 #[benchmark]489 fn set_token_property_permissions(490 b: Linear<0, MAX_PROPERTIES_PER_ITEM>,491 ) -> Result<(), BenchmarkError> {492 bench_init! {493 owner: sub; collection: collection(owner);494 owner: cross_from_sub;495 };496 let perms = (0..b)497 .map(|k| PropertyKeyPermission {498 key: property_key(k as usize),499 permission: PropertyPermission {500 mutable: false,501 collection_admin: false,502 token_owner: false,503 },504 })505 .collect::<Vec<_>>();506507 #[block]508 {509 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;510 }511512 Ok(())513 }514515 #[benchmark]516 fn repartition_item() -> Result<(), BenchmarkError> {517 bench_init! {518 owner: sub; collection: collection(owner);519 sender: cross_from_sub(owner); owner: cross_sub;520 };521 let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;522523 #[block]524 {525 <Pallet<T>>::repartition(&collection, &owner, item, 200)?;526 }527528 Ok(())529 }530531 #[benchmark]532 fn set_allowance_for_all() -> Result<(), BenchmarkError> {533 bench_init! {534 owner: sub; collection: collection(owner); owner: cross_from_sub;535 operator: cross_sub;536 };537538 #[block]539 {540 <Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?;541 }542543 Ok(())544 }545546 #[benchmark]547 fn allowance_for_all() -> Result<(), BenchmarkError> {548 bench_init! {549 owner: sub; collection: collection(owner); owner: cross_from_sub;550 operator: cross_sub;551 };552553 #[block]554 {555 <Pallet<T>>::allowance_for_all(&collection, &owner, &operator);556 }557558 Ok(())559 }560561 #[benchmark]562 fn repair_item() -> Result<(), BenchmarkError> {563 bench_init! {564 owner: sub; collection: collection(owner);565 owner: cross_from_sub;566 };567 let item = create_max_item(&collection, &owner, [(owner.clone(), 100)])?;568569 #[block]570 {571 <Pallet<T>>::repair_item(&collection, item)?;572 }573574 Ok(())575 }576}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/>.1617use core::{convert::TryInto, iter::IntoIterator};1819use frame_benchmarking::v2::*;20use pallet_common::{21 bench_init,22 benchmarking::{create_collection_raw, property_key, property_value},23 Pallet as PalletCommon,24};25use sp_std::prelude::*;26use up_data_structs::{27 budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,28 MAX_PROPERTIES_PER_ITEM,29};3031use super::*;32use crate::{Config, Pallet, RefungibleHandle};3334const SEED: u32 = 1;3536fn create_max_item_data<T: Config>(37 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,38) -> CreateItemData<T> {39 CreateItemData::<T> {40 users: users41 .into_iter()42 .collect::<BTreeMap<_, _>>()43 .try_into()44 .unwrap(),45 properties: Default::default(),46 }47}4849fn create_max_item<T: Config>(50 collection: &RefungibleHandle<T>,51 sender: &T::CrossAccountId,52 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,53) -> Result<TokenId, DispatchError> {54 let data: CreateItemData<T> = create_max_item_data::<T>(users);55 <Pallet<T>>::create_item(collection, sender, data, &Unlimited)?;56 Ok(TokenId(<TokensMinted<T>>::get(collection.id)))57}5859fn create_collection<T: Config>(60 owner: T::CrossAccountId,61) -> Result<RefungibleHandle<T>, DispatchError> {62 create_collection_raw(63 owner,64 CollectionMode::ReFungible,65 |owner: T::CrossAccountId, data| {66 <PalletCommon<T>>::init_collection(owner.clone(), Some(owner), false, data)67 },68 RefungibleHandle::cast,69 )70}7172#[benchmarks]73mod benchmarks {74 use super::*;7576 #[benchmark]77 fn create_item() -> Result<(), BenchmarkError> {78 bench_init! {79 owner: sub; collection: collection(owner);80 sender: cross_from_sub(owner); to: cross_sub;81 };8283 #[block]84 {85 create_max_item(&collection, &sender, [(to, 200)])?;86 }8788 Ok(())89 }9091 #[benchmark]92 fn create_multiple_items(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {93 bench_init! {94 owner: sub; collection: collection(owner);95 sender: cross_from_sub(owner); to: cross_sub;96 };97 let data = (0..b)98 .map(|_| create_max_item_data::<T>([(to.clone(), 200)]))99 .collect();100101 #[block]102 {103 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;104 }105106 Ok(())107 }108 #[benchmark]109 fn create_multiple_items_ex_multiple_items(110 b: Linear<0, MAX_ITEMS_PER_BATCH>,111 ) -> Result<(), BenchmarkError> {112 bench_init! {113 owner: sub; collection: collection(owner);114 sender: cross_from_sub(owner);115 };116 let data = (0..b)117 .map(|t| {118 bench_init!(to: cross_sub(t););119 create_max_item_data::<T>([(to, 200)])120 })121 .collect();122123 #[block]124 {125 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;126 }127128 Ok(())129 }130131 #[benchmark]132 fn create_multiple_items_ex_multiple_owners(133 b: Linear<0, MAX_ITEMS_PER_BATCH>,134 ) -> Result<(), BenchmarkError> {135 bench_init! {136 owner: sub; collection: collection(owner);137 sender: cross_from_sub(owner);138 };139 let data = vec![create_max_item_data::<T>((0..b).map(|u| {140 bench_init!(to: cross_sub(u););141 (to, 200)142 }))];143144 #[block]145 {146 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;147 }148149 Ok(())150 }151152 // Other user left, token data is kept153 #[benchmark]154 fn burn_item_partial() -> Result<(), BenchmarkError> {155 bench_init! {156 owner: sub; collection: collection(owner);157 sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;158 };159 let item = create_max_item(160 &collection,161 &sender,162 [(burner.clone(), 200), (another_owner, 200)],163 )?;164165 #[block]166 {167 <Pallet<T>>::burn(&collection, &burner, item, 200)?;168 }169170 Ok(())171 }172173 // No users remaining, token is destroyed174 #[benchmark]175 fn burn_item_fully() -> Result<(), BenchmarkError> {176 bench_init! {177 owner: sub; collection: collection(owner);178 sender: cross_from_sub(owner); burner: cross_sub;179 };180 let item = create_max_item(&collection, &sender, [(burner.clone(), 200)])?;181182 #[block]183 {184 <Pallet<T>>::burn(&collection, &burner, item, 200)?;185 }186187 Ok(())188 }189190 #[benchmark]191 fn transfer_normal() -> Result<(), BenchmarkError> {192 bench_init! {193 owner: sub; collection: collection(owner);194 sender: cross_from_sub(owner); receiver: cross_sub;195 };196 let item = create_max_item(197 &collection,198 &sender,199 [(sender.clone(), 200), (receiver.clone(), 200)],200 )?;201202 #[block]203 {204 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?;205 }206207 Ok(())208 }209210 // Target account is created211 #[benchmark]212 fn transfer_creating() -> Result<(), BenchmarkError> {213 bench_init! {214 owner: sub; collection: collection(owner);215 sender: cross_from_sub(owner); receiver: cross_sub;216 };217 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;218219 #[block]220 {221 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?;222 }223224 Ok(())225 }226227 // Source account is destroyed228 #[benchmark]229 fn transfer_removing() -> Result<(), BenchmarkError> {230 bench_init! {231 owner: sub; collection: collection(owner);232 sender: cross_from_sub(owner); receiver: cross_sub;233 };234 let item = create_max_item(235 &collection,236 &sender,237 [(sender.clone(), 200), (receiver.clone(), 200)],238 )?;239240 #[block]241 {242 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?;243 }244245 Ok(())246 }247248 // Source account destroyed, target created249 #[benchmark]250 fn transfer_creating_removing() -> Result<(), BenchmarkError> {251 bench_init! {252 owner: sub; collection: collection(owner);253 sender: cross_from_sub(owner); receiver: cross_sub;254 };255 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;256257 #[block]258 {259 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?;260 }261262 Ok(())263 }264265 #[benchmark]266 fn approve() -> Result<(), BenchmarkError> {267 bench_init! {268 owner: sub; collection: collection(owner);269 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;270 };271 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;272273 #[block]274 {275 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;276 }277278 Ok(())279 }280281 #[benchmark]282 fn approve_from() -> Result<(), BenchmarkError> {283 bench_init! {284 owner: sub; collection: collection(owner);285 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;286 };287 let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());288 let item = create_max_item(&collection, &owner, [(owner_eth.clone(), 200)])?;289290 #[block]291 {292 <Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, &spender, item, 100)?;293 }294295 Ok(())296 }297298 #[benchmark]299 fn transfer_from_normal() -> Result<(), BenchmarkError> {300 bench_init! {301 owner: sub; collection: collection(owner);302 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;303 };304 let item = create_max_item(305 &collection,306 &owner,307 [(sender.clone(), 200), (receiver.clone(), 200)],308 )?;309 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;310311 #[block]312 {313 <Pallet<T>>::transfer_from(314 &collection,315 &spender,316 &sender,317 &receiver,318 item,319 100,320 &Unlimited,321 )?;322 }323324 Ok(())325 }326327 // Target account is created328 #[benchmark]329 fn transfer_from_creating() -> Result<(), BenchmarkError> {330 bench_init! {331 owner: sub; collection: collection(owner);332 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;333 };334 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;335 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;336337 #[block]338 {339 <Pallet<T>>::transfer_from(340 &collection,341 &spender,342 &sender,343 &receiver,344 item,345 100,346 &Unlimited,347 )?;348 }349350 Ok(())351 }352353 // Source account is destroyed354 #[benchmark]355 fn transfer_from_removing() -> Result<(), BenchmarkError> {356 bench_init! {357 owner: sub; collection: collection(owner);358 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;359 };360 let item = create_max_item(361 &collection,362 &owner,363 [(sender.clone(), 200), (receiver.clone(), 200)],364 )?;365 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;366367 #[block]368 {369 <Pallet<T>>::transfer_from(370 &collection,371 &spender,372 &sender,373 &receiver,374 item,375 200,376 &Unlimited,377 )?;378 }379380 Ok(())381 }382383 // Source account destroyed, target created384 #[benchmark]385 fn transfer_from_creating_removing() -> Result<(), BenchmarkError> {386 bench_init! {387 owner: sub; collection: collection(owner);388 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;389 };390 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;391 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;392393 #[block]394 {395 <Pallet<T>>::transfer_from(396 &collection,397 &spender,398 &sender,399 &receiver,400 item,401 200,402 &Unlimited,403 )?;404 }405406 Ok(())407 }408409 // Both source account and token is destroyed410 #[benchmark]411 fn burn_from() -> Result<(), BenchmarkError> {412 bench_init! {413 owner: sub; collection: collection(owner);414 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;415 };416 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;417 <Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;418419 #[block]420 {421 <Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?;422 }423424 Ok(())425 }426427 #[benchmark]428 fn load_token_properties() -> Result<(), BenchmarkError> {429 bench_init! {430 owner: sub; collection: collection(owner);431 owner: cross_from_sub;432 };433434 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;435436 #[block]437 {438 pallet_common::BenchmarkPropertyWriter::<T>::load_token_properties(&collection, item);439 }440441 Ok(())442 }443444 #[benchmark]445 fn write_token_properties(b: Linear<0, MAX_PROPERTIES_PER_ITEM>) -> Result<(), BenchmarkError> {446 bench_init! {447 owner: sub; collection: collection(owner);448 owner: cross_from_sub;449 };450451 let perms = (0..b)452 .map(|k| PropertyKeyPermission {453 key: property_key(k as usize),454 permission: PropertyPermission {455 mutable: false,456 collection_admin: true,457 token_owner: true,458 },459 })460 .collect::<Vec<_>>();461 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;462 let props = (0..b)463 .map(|k| Property {464 key: property_key(k as usize),465 value: property_value(),466 })467 .collect::<Vec<_>>();468 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;469470 let lazy_collection_info =471 pallet_common::BenchmarkPropertyWriter::<T>::load_collection_info(&collection, &owner);472473 #[block]474 {475 let mut property_writer =476 pallet_common::BenchmarkPropertyWriter::new(&collection, lazy_collection_info);477478 property_writer.write_token_properties(479 item,480 props.into_iter(),481 crate::erc::ERC721TokenEvent::TokenChanged {482 token_id: item.into(),483 }484 .to_log(T::ContractAddress::get()),485 )?;486 }487488 Ok(())489 }490491 #[benchmark]492 fn set_token_property_permissions(493 b: Linear<0, MAX_PROPERTIES_PER_ITEM>,494 ) -> Result<(), BenchmarkError> {495 bench_init! {496 owner: sub; collection: collection(owner);497 owner: cross_from_sub;498 };499 let perms = (0..b)500 .map(|k| PropertyKeyPermission {501 key: property_key(k as usize),502 permission: PropertyPermission {503 mutable: false,504 collection_admin: false,505 token_owner: false,506 },507 })508 .collect::<Vec<_>>();509510 #[block]511 {512 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;513 }514515 Ok(())516 }517518 #[benchmark]519 fn repartition_item() -> Result<(), BenchmarkError> {520 bench_init! {521 owner: sub; collection: collection(owner);522 sender: cross_from_sub(owner); owner: cross_sub;523 };524 let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;525526 #[block]527 {528 <Pallet<T>>::repartition(&collection, &owner, item, 200)?;529 }530531 Ok(())532 }533534 #[benchmark]535 fn set_allowance_for_all() -> Result<(), BenchmarkError> {536 bench_init! {537 owner: sub; collection: collection(owner); owner: cross_from_sub;538 operator: cross_sub;539 };540541 #[block]542 {543 <Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?;544 }545546 Ok(())547 }548549 #[benchmark]550 fn allowance_for_all() -> Result<(), BenchmarkError> {551 bench_init! {552 owner: sub; collection: collection(owner); owner: cross_from_sub;553 operator: cross_sub;554 };555556 #[block]557 {558 <Pallet<T>>::allowance_for_all(&collection, &owner, &operator);559 }560561 Ok(())562 }563564 #[benchmark]565 fn repair_item() -> Result<(), BenchmarkError> {566 bench_init! {567 owner: sub; collection: collection(owner);568 owner: cross_from_sub;569 };570 let item = create_max_item(&collection, &owner, [(owner.clone(), 100)])?;571572 #[block]573 {574 <Pallet<T>>::repair_item(&collection, item)?;575 }576577 Ok(())578 }579}pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -103,7 +103,7 @@
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
use sp_std::{collections::btree_map::BTreeMap, vec, vec::Vec};
use up_data_structs::{
- budget::Budget, mapping::TokenAddressMapping, AccessMode, CollectionId, CreateCollectionData,
+ budget::Budget, mapping::TokenAddressMapping, AccessMode, CollectionId,
CreateRefungibleExMultipleOwners, PropertiesPermissionMap, Property, PropertyKey,
PropertyKeyPermission, PropertyScope, PropertyValue, TokenId, TokenOwnerError,
TokenProperties as TokenPropertiesT, MAX_REFUNGIBLE_PIECES,
@@ -296,19 +296,6 @@
// unchecked calls skips any permission checks
impl<T: Config> Pallet<T> {
- /// Create RFT collection
- ///
- /// `init_collection` will take non-refundable deposit for collection creation.
- ///
- /// - `data`: Contains settings for collection limits and permissions.
- pub fn init_collection(
- owner: T::CrossAccountId,
- payer: T::CrossAccountId,
- data: CreateCollectionData<T::CrossAccountId>,
- ) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(owner, Some(payer), data)
- }
-
/// Destroy RFT collection
///
/// `destroy_collection` will throw error if collection contains any tokens.
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -380,7 +380,7 @@
pub struct CollectionFlags {
/// Reserved flag
#[bondrewd(bits = "0..1")]
- pub reserved_0: bool,
+ pub foreign: 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.reserved_0 && !self.external && self.reserved == 0
+ !self.foreign && !self.external && self.reserved == 0
}
}
@@ -461,6 +461,8 @@
#[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,
}
@@ -503,7 +505,7 @@
pub read_only: bool,
/// Extra collection flags
- #[version(2.., upper(RpcCollectionFlags {erc721metadata: false}))]
+ #[version(2.., upper(RpcCollectionFlags {foreign: false, erc721metadata: false}))]
pub flags: RpcCollectionFlags,
}
@@ -540,6 +542,7 @@
read_only: true,
flags: RpcCollectionFlags {
+ foreign: false,
erc721metadata: false,
},
}
runtime/common/config/pallets/foreign_asset.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/foreign_asset.rs
+++ b/runtime/common/config/pallets/foreign_asset.rs
@@ -1,4 +1,6 @@
use frame_support::{parameter_types, PalletId};
+#[cfg(not(feature = "governance"))]
+use frame_system::EnsureRoot;
use pallet_evm::account::CrossAccountId;
use sp_core::H160;
use staging_xcm::prelude::*;
@@ -6,10 +8,6 @@
#[cfg(feature = "governance")]
use crate::runtime_common::config::governance;
-
-#[cfg(not(feature = "governance"))]
-use frame_system::EnsureRoot;
-
use crate::{
runtime_common::config::{
ethereum::CrossAccountId as ConfigCrossAccountId,
runtime/common/dispatch.rsdiffbeforeafterboth--- a/runtime/common/dispatch.rs
+++ b/runtime/common/dispatch.rs
@@ -66,9 +66,10 @@
}
}
- fn create(
+ fn create_internal(
sender: T::CrossAccountId,
payer: Option<T::CrossAccountId>,
+ is_special_collection: bool,
data: CreateCollectionData<T::CrossAccountId>,
) -> Result<CollectionId, DispatchError> {
match data.mode {
@@ -86,7 +87,7 @@
_ => {}
};
- <PalletCommon<T>>::init_collection(sender, payer, data)
+ <PalletCommon<T>>::init_collection(sender, payer, is_special_collection, data)
}
fn destroy(sender: T::CrossAccountId, collection_id: CollectionId) -> DispatchResult {