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

difftreelog

fixup(imports): post-rebase

Yaroslav Bolyukin2023-10-02parent: #2eca527.patch.diff
in: master

14 files changed

modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,8 +26,8 @@
 opt-level = 3
 
 [profile.integration-tests]
+debug-assertions = true
 inherits = "release"
-debug-assertions = true
 
 [workspace.dependencies]
 # Unique
modifiednode/cli/src/command.rsdiffbeforeafterboth
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -32,20 +32,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::time::Duration;
-
-use codec::Encode;
-use cumulus_client_cli::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
-use log::{debug, info};
+use log::info;
 use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
-	NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
+	NetworkParams, Result, SharedParams, SubstrateCli,
 };
 use sc_service::config::{BasePath, PrometheusConfig};
-use sp_core::hexdisplay::HexDisplay;
-use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
-use up_common::types::opaque::{Block, RuntimeId};
+use sp_runtime::traits::AccountIdConversion;
+use up_common::types::opaque::RuntimeId;
 
 #[cfg(feature = "runtime-benchmarks")]
 use crate::chain_spec::default_runtime;
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -824,8 +824,8 @@
 {
 	use fc_consensus::FrontierBlockImport;
 	use sc_consensus_manual_seal::{
-		run_manual_seal, run_delayed_finalize, EngineCommand, ManualSealParams,
-		DelayedFinalizeParams,
+		run_delayed_finalize, run_manual_seal, DelayedFinalizeParams, EngineCommand,
+		ManualSealParams,
 	};
 
 	let sc_service::PartialComponents {
modifiedpallets/collator-selection/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/collator-selection/src/benchmarking.rs
+++ b/pallets/collator-selection/src/benchmarking.rs
@@ -35,15 +35,15 @@
 use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_support::{
 	assert_ok,
-	parity_scale_codec::Decode,
 	traits::{
 		fungible::{Inspect, Mutate},
 		EnsureOrigin, Get,
 	},
 };
-use frame_system::{EventRecord, RawOrigin};
+use frame_system::{pallet_prelude::*, EventRecord, RawOrigin};
 use pallet_authorship::EventHandler;
 use pallet_session::{self as session, SessionManager};
+use parity_scale_codec::Decode;
 use sp_std::prelude::*;
 
 use super::*;
@@ -338,7 +338,7 @@
 		register_candidates::<T>(c);
 
 		let new_block: BlockNumberFor<T>= 1800u32.into();
-		let zero_block: T::BlockNumber = 0u32.into();
+		let zero_block: BlockNumberFor<T> = 0u32.into();
 		let candidates = <Candidates<T>>::get();
 
 		let non_removals = c.saturating_sub(r);
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -54,9 +54,9 @@
 extern crate alloc;
 
 use core::{
+	marker::PhantomData,
 	ops::{Deref, DerefMut},
 	slice::from_ref,
-	marker::PhantomData,
 };
 
 use evm_coder::ToLog;
modifiedpallets/configuration/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/configuration/src/benchmarking.rs
+++ b/pallets/configuration/src/benchmarking.rs
@@ -18,7 +18,7 @@
 
 use frame_benchmarking::benchmarks;
 use frame_support::assert_ok;
-use frame_system::{EventRecord, RawOrigin};
+use frame_system::{pallet_prelude::*, EventRecord, RawOrigin};
 
 use super::*;
 
modifiedpallets/inflation/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/inflation/src/benchmarking.rs
+++ b/pallets/inflation/src/benchmarking.rs
@@ -17,7 +17,7 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use frame_benchmarking::benchmarks;
-use frame_support::traits::OnInitialize;
+use frame_support::{pallet_prelude::*, traits::Hooks};
 
 use super::*;
 use crate::Pallet as Inflation;
@@ -25,9 +25,9 @@
 benchmarks! {
 
 	on_initialize {
-		let block1: T::BlockNumber = T::BlockNumber::from(1u32);
-		let block2: T::BlockNumber = T::BlockNumber::from(2u32);
-		Inflation::<T>::on_initialize(block1); // Create Treasury account
-	}: { Inflation::<T>::on_initialize(block2); } // Benchmark deposit_into_existing path
+		let block1: BlockNumberFor<T> = 1u32.into();
+		let block2: BlockNumberFor<T> = 2u32.into();
+		<Inflation<T> as Hooks>::on_initialize(block1); // Create Treasury account
+	}: { <Inflation<T> as Hooks>::on_initialize(block2); } // Benchmark deposit_into_existing path
 
 }
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -18,7 +18,7 @@
 use pallet_common::{
 	bench_init,
 	benchmarking::{
-		create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions,
+		create_collection_raw, load_is_admin_and_property_permissions, property_key, property_value,
 	},
 	CommonCollectionOperations,
 };
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -103,9 +103,9 @@
 };
 pub use pallet::*;
 use pallet_common::{
-	Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,
-	eth::collection_id_to_address, SelfWeightOf as PalletCommonWeightOf,
-	weights::WeightInfo as CommonWeightInfo, helpers::add_weight_to_post_info,
+	eth::collection_id_to_address, helpers::add_weight_to_post_info,
+	weights::WeightInfo as CommonWeightInfo, CollectionHandle, Error as CommonError,
+	Event as CommonEvent, Pallet as PalletCommon, SelfWeightOf as PalletCommonWeightOf,
 };
 use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
 use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
@@ -116,9 +116,9 @@
 use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
 use sp_std::{collections::btree_map::BTreeMap, vec, vec::Vec};
 use up_data_structs::{
-	AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
-	mapping::TokenAddressMapping, budget::Budget, Property, PropertyKey, PropertyValue,
-	PropertyKeyPermission, PropertyScope, TokenChild, AuxPropertyValue, PropertiesPermissionMap,
+	budget::Budget, mapping::TokenAddressMapping, AccessMode, AuxPropertyValue, CollectionId,
+	CreateCollectionData, CreateNftExData, CustomDataLimit, PropertiesPermissionMap, Property,
+	PropertyKey, PropertyKeyPermission, PropertyScope, PropertyValue, TokenChild, TokenId,
 	TokenProperties as TokenPropertiesT,
 };
 use weights::WeightInfo;
modifiedpallets/refungible/src/benchmarking.rsdiffbeforeafterboth
before · pallets/refungible/src/benchmarking.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::{convert::TryInto, iter::IntoIterator};1819use frame_benchmarking::{account, benchmarks};20use pallet_common::{21	bench_init,22	benchmarking::{23		create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions,24	},25};26use sp_std::prelude::*;27use up_data_structs::{28	budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,29	MAX_PROPERTIES_PER_ITEM,30};3132use super::*;33use crate::{Config, Pallet, RefungibleHandle};3435const SEED: u32 = 1;3637fn create_max_item_data<T: Config>(38	users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,39) -> CreateItemData<T> {40	CreateItemData::<T> {41		users: users42			.into_iter()43			.collect::<BTreeMap<_, _>>()44			.try_into()45			.unwrap(),46		properties: Default::default(),47	}48}4950fn create_max_item<T: Config>(51	collection: &RefungibleHandle<T>,52	sender: &T::CrossAccountId,53	users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,54) -> Result<TokenId, DispatchError> {55	let data: CreateItemData<T> = create_max_item_data::<T>(users);56	<Pallet<T>>::create_item(collection, sender, data, &Unlimited)?;57	Ok(TokenId(<TokensMinted<T>>::get(collection.id)))58}5960fn create_collection<T: Config>(61	owner: T::CrossAccountId,62) -> Result<RefungibleHandle<T>, DispatchError> {63	create_collection_raw(64		owner,65		CollectionMode::ReFungible,66		|owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),67		RefungibleHandle::cast,68	)69}7071benchmarks! {72	create_item {73		bench_init!{74			owner: sub; collection: collection(owner);75			sender: cross_from_sub(owner); to: cross_sub;76		};77	}: {create_max_item(&collection, &sender, [(to.clone(), 200)])?}7879	create_multiple_items {80		let b in 0..MAX_ITEMS_PER_BATCH;81		bench_init!{82			owner: sub; collection: collection(owner);83			sender: cross_from_sub(owner); to: cross_sub;84		};85		let data = (0..b).map(|_| create_max_item_data::<T>([(to.clone(), 200)])).collect();86	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8788	create_multiple_items_ex_multiple_items {89		let b in 0..MAX_ITEMS_PER_BATCH;90		bench_init!{91			owner: sub; collection: collection(owner);92			sender: cross_from_sub(owner);93		};94		let data = (0..b).map(|t| {95			bench_init!(to: cross_sub(t););96			create_max_item_data::<T>([(to, 200)])97		}).collect();98	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}99100	create_multiple_items_ex_multiple_owners {101		let b in 0..MAX_ITEMS_PER_BATCH;102		bench_init!{103			owner: sub; collection: collection(owner);104			sender: cross_from_sub(owner);105		};106		let data = vec![create_max_item_data::<T>((0..b).map(|u| {107			bench_init!(to: cross_sub(u););108			(to, 200)109		}))];110	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}111112	// Other user left, token data is kept113	burn_item_partial {114		bench_init!{115			owner: sub; collection: collection(owner);116			sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;117		};118		let item = create_max_item(&collection, &sender, [(burner.clone(), 200), (another_owner, 200)])?;119	}: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}120	// No users remaining, token is destroyed121	burn_item_fully {122		bench_init!{123			owner: sub; collection: collection(owner);124			sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;125		};126		let item = create_max_item(&collection, &sender, [(burner.clone(), 200)])?;127	}: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}128129	transfer_normal {130		bench_init!{131			owner: sub; collection: collection(owner);132			sender: cross_from_sub(owner); receiver: cross_sub;133		};134		let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;135	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?}136	// Target account is created137	transfer_creating {138		bench_init!{139			owner: sub; collection: collection(owner);140			sender: cross_from_sub(owner); receiver: cross_sub;141		};142		let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;143	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?}144	// Source account is destroyed145	transfer_removing {146		bench_init!{147			owner: sub; collection: collection(owner);148			sender: cross_from_sub(owner); receiver: cross_sub;149		};150		let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;151	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?}152	// Source account destroyed, target created153	transfer_creating_removing {154		bench_init!{155			owner: sub; collection: collection(owner);156			sender: cross_from_sub(owner); receiver: cross_sub;157		};158		let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;159	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?}160161	approve {162		bench_init!{163			owner: sub; collection: collection(owner);164			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;165		};166		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;167	}: {<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?}168169	approve_from {170		bench_init!{171			owner: sub; collection: collection(owner);172			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;173		};174		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());175		let item = create_max_item(&collection, &owner, [(owner_eth.clone(), 200)])?;176	}: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, &spender, item, 100)?}177178	transfer_from_normal {179		bench_init!{180			owner: sub; collection: collection(owner);181			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;182		};183		let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;184		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;185	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}186	// Target account is created187	transfer_from_creating {188		bench_init!{189			owner: sub; collection: collection(owner);190			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;191		};192		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;193		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;194	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}195	// Source account is destroyed196	transfer_from_removing {197		bench_init!{198			owner: sub; collection: collection(owner);199			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;200		};201		let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;202		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;203	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}204	// Source account destroyed, target created205	transfer_from_creating_removing {206		bench_init!{207			owner: sub; collection: collection(owner);208			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;209		};210		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;211		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;212	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}213214	// Both source account and token is destroyed215	burn_from {216		bench_init!{217			owner: sub; collection: collection(owner);218			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;219		};220		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;221		<Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;222	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?}223224	set_token_property_permissions {225		let b in 0..MAX_PROPERTIES_PER_ITEM;226		bench_init!{227			owner: sub; collection: collection(owner);228			owner: cross_from_sub;229		};230		let perms = (0..b).map(|k| PropertyKeyPermission {231			key: property_key(k as usize),232			permission: PropertyPermission {233				mutable: false,234				collection_admin: false,235				token_owner: false,236			},237		}).collect::<Vec<_>>();238	}: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}239240	set_token_properties {241		let b in 0..MAX_PROPERTIES_PER_ITEM;242		bench_init!{243			owner: sub; collection: collection(owner);244			owner: cross_from_sub;245		};246		let perms = (0..b).map(|k| PropertyKeyPermission {247			key: property_key(k as usize),248			permission: PropertyPermission {249				mutable: false,250				collection_admin: true,251				token_owner: true,252			},253		}).collect::<Vec<_>>();254		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;255		let props = (0..b).map(|k| Property {256			key: property_key(k as usize),257			value: property_value(),258		}).collect::<Vec<_>>();259		let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;260	}: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?}261262	init_token_properties {263		let b in 0..MAX_PROPERTIES_PER_ITEM;264		bench_init!{265			owner: sub; collection: collection(owner);266			owner: cross_from_sub;267		};268269		let perms = (0..b).map(|k| PropertyKeyPermission {270			key: property_key(k as usize),271			permission: PropertyPermission {272				mutable: false,273				collection_admin: true,274				token_owner: true,275			},276		}).collect::<Vec<_>>();277		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;278		let props = (0..b).map(|k| Property {279			key: property_key(k as usize),280			value: property_value(),281		}).collect::<Vec<_>>();282		let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;283284		let (is_collection_admin, property_permissions) = load_is_admin_and_property_permissions(&collection, &owner);285	}: {286		let mut property_writer = pallet_common::collection_info_loaded_property_writer(287			&collection,288			is_collection_admin,289			property_permissions,290		);291292		property_writer.write_token_properties(293			true,294			item,295			props.into_iter(),296			crate::erc::ERC721TokenEvent::TokenChanged {297				token_id: item.into(),298			}299			.to_log(T::ContractAddress::get()),300		)?301	}302303	delete_token_properties {304		let b in 0..MAX_PROPERTIES_PER_ITEM;305		bench_init!{306			owner: sub; collection: collection(owner);307			owner: cross_from_sub;308		};309		let perms = (0..b).map(|k| PropertyKeyPermission {310			key: property_key(k as usize),311			permission: PropertyPermission {312				mutable: true,313				collection_admin: true,314				token_owner: true,315			},316		}).collect::<Vec<_>>();317		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;318		let props = (0..b).map(|k| Property {319			key: property_key(k as usize),320			value: property_value(),321		}).collect::<Vec<_>>();322		let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;323		<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?;324		let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();325	}: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}326327	repartition_item {328		bench_init!{329			owner: sub; collection: collection(owner);330			sender: cross_from_sub(owner); owner: cross_sub;331		};332		let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;333	}: {<Pallet<T>>::repartition(&collection, &owner, item, 200)?}334335	token_owner {336		bench_init!{337			owner: sub; collection: collection(owner);338			sender: cross_from_sub(owner); owner: cross_sub;339		};340		let item = create_max_item(&collection, &sender, [(owner, 100)])?;341	}: {<Pallet<T>>::token_owner(collection.id, item).unwrap()}342343	set_allowance_for_all {344		bench_init!{345			owner: sub; collection: collection(owner); owner: cross_from_sub;346			operator: cross_sub;347		};348	}: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}349350	allowance_for_all {351		bench_init!{352			owner: sub; collection: collection(owner); owner: cross_from_sub;353			operator: cross_sub;354		};355	}: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}356357	repair_item {358		bench_init!{359			owner: sub; collection: collection(owner);360			owner: cross_from_sub;361		};362		let item = create_max_item(&collection, &owner, [(owner.clone(), 100)])?;363	}: {<Pallet<T>>::repair_item(&collection, item)?}364}
after · pallets/refungible/src/benchmarking.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::{convert::TryInto, iter::IntoIterator};1819use frame_benchmarking::{account, benchmarks};20use pallet_common::{21	bench_init,22	benchmarking::{23		create_collection_raw, load_is_admin_and_property_permissions, property_key, property_value,24	},25};26use sp_std::prelude::*;27use up_data_structs::{28	budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,29	MAX_PROPERTIES_PER_ITEM,30};3132use super::*;33use crate::{Config, Pallet, RefungibleHandle};3435const SEED: u32 = 1;3637fn create_max_item_data<T: Config>(38	users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,39) -> CreateItemData<T> {40	CreateItemData::<T> {41		users: users42			.into_iter()43			.collect::<BTreeMap<_, _>>()44			.try_into()45			.unwrap(),46		properties: Default::default(),47	}48}4950fn create_max_item<T: Config>(51	collection: &RefungibleHandle<T>,52	sender: &T::CrossAccountId,53	users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,54) -> Result<TokenId, DispatchError> {55	let data: CreateItemData<T> = create_max_item_data::<T>(users);56	<Pallet<T>>::create_item(collection, sender, data, &Unlimited)?;57	Ok(TokenId(<TokensMinted<T>>::get(collection.id)))58}5960fn create_collection<T: Config>(61	owner: T::CrossAccountId,62) -> Result<RefungibleHandle<T>, DispatchError> {63	create_collection_raw(64		owner,65		CollectionMode::ReFungible,66		|owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),67		RefungibleHandle::cast,68	)69}7071benchmarks! {72	create_item {73		bench_init!{74			owner: sub; collection: collection(owner);75			sender: cross_from_sub(owner); to: cross_sub;76		};77	}: {create_max_item(&collection, &sender, [(to.clone(), 200)])?}7879	create_multiple_items {80		let b in 0..MAX_ITEMS_PER_BATCH;81		bench_init!{82			owner: sub; collection: collection(owner);83			sender: cross_from_sub(owner); to: cross_sub;84		};85		let data = (0..b).map(|_| create_max_item_data::<T>([(to.clone(), 200)])).collect();86	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8788	create_multiple_items_ex_multiple_items {89		let b in 0..MAX_ITEMS_PER_BATCH;90		bench_init!{91			owner: sub; collection: collection(owner);92			sender: cross_from_sub(owner);93		};94		let data = (0..b).map(|t| {95			bench_init!(to: cross_sub(t););96			create_max_item_data::<T>([(to, 200)])97		}).collect();98	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}99100	create_multiple_items_ex_multiple_owners {101		let b in 0..MAX_ITEMS_PER_BATCH;102		bench_init!{103			owner: sub; collection: collection(owner);104			sender: cross_from_sub(owner);105		};106		let data = vec![create_max_item_data::<T>((0..b).map(|u| {107			bench_init!(to: cross_sub(u););108			(to, 200)109		}))];110	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}111112	// Other user left, token data is kept113	burn_item_partial {114		bench_init!{115			owner: sub; collection: collection(owner);116			sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;117		};118		let item = create_max_item(&collection, &sender, [(burner.clone(), 200), (another_owner, 200)])?;119	}: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}120	// No users remaining, token is destroyed121	burn_item_fully {122		bench_init!{123			owner: sub; collection: collection(owner);124			sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;125		};126		let item = create_max_item(&collection, &sender, [(burner.clone(), 200)])?;127	}: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}128129	transfer_normal {130		bench_init!{131			owner: sub; collection: collection(owner);132			sender: cross_from_sub(owner); receiver: cross_sub;133		};134		let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;135	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?}136	// Target account is created137	transfer_creating {138		bench_init!{139			owner: sub; collection: collection(owner);140			sender: cross_from_sub(owner); receiver: cross_sub;141		};142		let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;143	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?}144	// Source account is destroyed145	transfer_removing {146		bench_init!{147			owner: sub; collection: collection(owner);148			sender: cross_from_sub(owner); receiver: cross_sub;149		};150		let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;151	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?}152	// Source account destroyed, target created153	transfer_creating_removing {154		bench_init!{155			owner: sub; collection: collection(owner);156			sender: cross_from_sub(owner); receiver: cross_sub;157		};158		let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;159	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?}160161	approve {162		bench_init!{163			owner: sub; collection: collection(owner);164			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;165		};166		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;167	}: {<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?}168169	approve_from {170		bench_init!{171			owner: sub; collection: collection(owner);172			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;173		};174		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());175		let item = create_max_item(&collection, &owner, [(owner_eth.clone(), 200)])?;176	}: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, &spender, item, 100)?}177178	transfer_from_normal {179		bench_init!{180			owner: sub; collection: collection(owner);181			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;182		};183		let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;184		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;185	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}186	// Target account is created187	transfer_from_creating {188		bench_init!{189			owner: sub; collection: collection(owner);190			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;191		};192		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;193		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;194	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}195	// Source account is destroyed196	transfer_from_removing {197		bench_init!{198			owner: sub; collection: collection(owner);199			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;200		};201		let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;202		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;203	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}204	// Source account destroyed, target created205	transfer_from_creating_removing {206		bench_init!{207			owner: sub; collection: collection(owner);208			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;209		};210		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;211		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;212	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}213214	// Both source account and token is destroyed215	burn_from {216		bench_init!{217			owner: sub; collection: collection(owner);218			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;219		};220		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;221		<Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;222	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?}223224	set_token_property_permissions {225		let b in 0..MAX_PROPERTIES_PER_ITEM;226		bench_init!{227			owner: sub; collection: collection(owner);228			owner: cross_from_sub;229		};230		let perms = (0..b).map(|k| PropertyKeyPermission {231			key: property_key(k as usize),232			permission: PropertyPermission {233				mutable: false,234				collection_admin: false,235				token_owner: false,236			},237		}).collect::<Vec<_>>();238	}: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}239240	set_token_properties {241		let b in 0..MAX_PROPERTIES_PER_ITEM;242		bench_init!{243			owner: sub; collection: collection(owner);244			owner: cross_from_sub;245		};246		let perms = (0..b).map(|k| PropertyKeyPermission {247			key: property_key(k as usize),248			permission: PropertyPermission {249				mutable: false,250				collection_admin: true,251				token_owner: true,252			},253		}).collect::<Vec<_>>();254		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;255		let props = (0..b).map(|k| Property {256			key: property_key(k as usize),257			value: property_value(),258		}).collect::<Vec<_>>();259		let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;260	}: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?}261262	init_token_properties {263		let b in 0..MAX_PROPERTIES_PER_ITEM;264		bench_init!{265			owner: sub; collection: collection(owner);266			owner: cross_from_sub;267		};268269		let perms = (0..b).map(|k| PropertyKeyPermission {270			key: property_key(k as usize),271			permission: PropertyPermission {272				mutable: false,273				collection_admin: true,274				token_owner: true,275			},276		}).collect::<Vec<_>>();277		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;278		let props = (0..b).map(|k| Property {279			key: property_key(k as usize),280			value: property_value(),281		}).collect::<Vec<_>>();282		let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;283284		let (is_collection_admin, property_permissions) = load_is_admin_and_property_permissions(&collection, &owner);285	}: {286		let mut property_writer = pallet_common::collection_info_loaded_property_writer(287			&collection,288			is_collection_admin,289			property_permissions,290		);291292		property_writer.write_token_properties(293			true,294			item,295			props.into_iter(),296			crate::erc::ERC721TokenEvent::TokenChanged {297				token_id: item.into(),298			}299			.to_log(T::ContractAddress::get()),300		)?301	}302303	delete_token_properties {304		let b in 0..MAX_PROPERTIES_PER_ITEM;305		bench_init!{306			owner: sub; collection: collection(owner);307			owner: cross_from_sub;308		};309		let perms = (0..b).map(|k| PropertyKeyPermission {310			key: property_key(k as usize),311			permission: PropertyPermission {312				mutable: true,313				collection_admin: true,314				token_owner: true,315			},316		}).collect::<Vec<_>>();317		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;318		let props = (0..b).map(|k| Property {319			key: property_key(k as usize),320			value: property_value(),321		}).collect::<Vec<_>>();322		let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;323		<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?;324		let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();325	}: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}326327	repartition_item {328		bench_init!{329			owner: sub; collection: collection(owner);330			sender: cross_from_sub(owner); owner: cross_sub;331		};332		let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;333	}: {<Pallet<T>>::repartition(&collection, &owner, item, 200)?}334335	token_owner {336		bench_init!{337			owner: sub; collection: collection(owner);338			sender: cross_from_sub(owner); owner: cross_sub;339		};340		let item = create_max_item(&collection, &sender, [(owner, 100)])?;341	}: {<Pallet<T>>::token_owner(collection.id, item).unwrap()}342343	set_allowance_for_all {344		bench_init!{345			owner: sub; collection: collection(owner); owner: cross_from_sub;346			operator: cross_sub;347		};348	}: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}349350	allowance_for_all {351		bench_init!{352			owner: sub; collection: collection(owner); owner: cross_from_sub;353			operator: cross_sub;354		};355	}: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}356357	repair_item {358		bench_init!{359			owner: sub; collection: collection(owner);360			owner: cross_from_sub;361		};362		let item = create_max_item(&collection, &owner, [(owner.clone(), 100)])?;363	}: {<Pallet<T>>::repair_item(&collection, item)?}364}
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -106,7 +106,7 @@
 	budget::Budget, mapping::TokenAddressMapping, AccessMode, CollectionId, CreateCollectionData,
 	CreateRefungibleExMultipleOwners, PropertiesPermissionMap, Property, PropertyKey,
 	PropertyKeyPermission, PropertyScope, PropertyValue, TokenId, TokenOwnerError,
-	TokenProperties as TokenPropertiesT, TrySetProperty, MAX_REFUNGIBLE_PIECES,
+	TokenProperties as TokenPropertiesT, MAX_REFUNGIBLE_PIECES,
 };
 
 use crate::{erc::ERC721Events, erc_token::ERC20Events};
modifiedruntime/opal/src/xcm_barrier.rsdiffbeforeafterboth
--- a/runtime/opal/src/xcm_barrier.rs
+++ b/runtime/opal/src/xcm_barrier.rs
@@ -15,8 +15,10 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::{match_types, traits::Everything};
-use xcm::latest::{Junctions::*, MultiLocation};
-use staging_xcm_builder::{AllowTopLevelPaidExecutionFrom, TakeWeightCredit, AllowExplicitUnpaidExecutionFrom};
+use staging_xcm::latest::{Junctions::*, MultiLocation};
+use staging_xcm_builder::{
+	AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
+};
 
 match_types! {
 	pub type ParentOnly: impl Contains<MultiLocation> = {
modifiedruntime/quartz/src/xcm_barrier.rsdiffbeforeafterboth
--- a/runtime/quartz/src/xcm_barrier.rs
+++ b/runtime/quartz/src/xcm_barrier.rs
@@ -17,8 +17,8 @@
 use frame_support::{match_types, traits::Everything};
 use staging_xcm::latest::{Junctions::*, MultiLocation};
 use staging_xcm_builder::{
-	AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,
-	AllowTopLevelPaidExecutionFrom, AllowExplicitUnpaidExecutionFrom,
+	AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
+	AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
 };
 
 use crate::PolkadotXcm;
modifiedruntime/unique/src/xcm_barrier.rsdiffbeforeafterboth
--- a/runtime/unique/src/xcm_barrier.rs
+++ b/runtime/unique/src/xcm_barrier.rs
@@ -17,8 +17,8 @@
 use frame_support::{match_types, traits::Everything};
 use staging_xcm::latest::{Junctions::*, MultiLocation};
 use staging_xcm_builder::{
-	AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,
-	AllowTopLevelPaidExecutionFrom, AllowExplicitUnpaidExecutionFrom,
+	AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
+	AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
 };
 
 use crate::PolkadotXcm;