git.delta.rocks / unique-network / refs/commits / 12dc7ebeba3c

difftreelog

remove warnings

Trubnikov Sergey2023-04-28parent: #5a3127a.patch.diff
in: master

8 files changed

modifiedpallets/balances-adapter/src/common.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/common.rs
+++ b/pallets/balances-adapter/src/common.rs
@@ -12,12 +12,12 @@
 
 pub struct CommonWeights<T: Config>(PhantomData<T>);
 impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {
-	fn create_multiple_items(amount: &[up_data_structs::CreateItemData]) -> Weight {
+	fn create_multiple_items(_amount: &[up_data_structs::CreateItemData]) -> Weight {
 		Weight::default()
 	}
 
 	fn create_multiple_items_ex(
-		cost: &up_data_structs::CreateItemExData<T::CrossAccountId>,
+		_cost: &up_data_structs::CreateItemExData<T::CrossAccountId>,
 	) -> Weight {
 		Weight::default()
 	}
@@ -26,23 +26,23 @@
 		Weight::default()
 	}
 
-	fn set_collection_properties(amount: u32) -> Weight {
+	fn set_collection_properties(_amount: u32) -> Weight {
 		Weight::default()
 	}
 
-	fn delete_collection_properties(amount: u32) -> Weight {
+	fn delete_collection_properties(_amount: u32) -> Weight {
 		Weight::default()
 	}
 
-	fn set_token_properties(amount: u32) -> Weight {
+	fn set_token_properties(_amount: u32) -> Weight {
 		Weight::default()
 	}
 
-	fn delete_token_properties(amount: u32) -> Weight {
+	fn delete_token_properties(_amount: u32) -> Weight {
 		Weight::default()
 	}
 
-	fn set_token_property_permissions(amount: u32) -> Weight {
+	fn set_token_property_permissions(_amount: u32) -> Weight {
 		Weight::default()
 	}
 
@@ -70,7 +70,7 @@
 		Weight::default()
 	}
 
-	fn burn_recursively_breadth_raw(amount: u32) -> Weight {
+	fn burn_recursively_breadth_raw(_amount: u32) -> Weight {
 		Weight::default()
 	}
 
@@ -92,92 +92,92 @@
 impl<T: Config> CommonCollectionOperations<T> for NativeFungibleHandle<T> {
 	fn create_item(
 		&self,
-		sender: <T>::CrossAccountId,
-		to: <T>::CrossAccountId,
-		data: up_data_structs::CreateItemData,
-		nesting_budget: &dyn up_data_structs::budget::Budget,
+		_sender: <T>::CrossAccountId,
+		_to: <T>::CrossAccountId,
+		_data: up_data_structs::CreateItemData,
+		_nesting_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn create_multiple_items(
 		&self,
-		sender: <T>::CrossAccountId,
-		to: <T>::CrossAccountId,
-		data: Vec<up_data_structs::CreateItemData>,
-		nesting_budget: &dyn up_data_structs::budget::Budget,
+		_sender: <T>::CrossAccountId,
+		_to: <T>::CrossAccountId,
+		_data: Vec<up_data_structs::CreateItemData>,
+		_nesting_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn create_multiple_items_ex(
 		&self,
-		sender: <T>::CrossAccountId,
-		data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,
-		nesting_budget: &dyn up_data_structs::budget::Budget,
+		_sender: <T>::CrossAccountId,
+		_data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,
+		_nesting_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn burn_item(
 		&self,
-		sender: <T>::CrossAccountId,
-		token: TokenId,
-		amount: u128,
+		_sender: <T>::CrossAccountId,
+		_token: TokenId,
+		_amount: u128,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn burn_item_recursively(
 		&self,
-		sender: <T>::CrossAccountId,
-		token: TokenId,
-		self_budget: &dyn up_data_structs::budget::Budget,
-		breadth_budget: &dyn up_data_structs::budget::Budget,
+		_sender: <T>::CrossAccountId,
+		_token: TokenId,
+		_self_budget: &dyn up_data_structs::budget::Budget,
+		_breadth_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn set_collection_properties(
 		&self,
-		sender: <T>::CrossAccountId,
-		properties: Vec<up_data_structs::Property>,
+		_sender: <T>::CrossAccountId,
+		_properties: Vec<up_data_structs::Property>,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn delete_collection_properties(
 		&self,
-		sender: &<T>::CrossAccountId,
-		property_keys: Vec<up_data_structs::PropertyKey>,
+		_sender: &<T>::CrossAccountId,
+		_property_keys: Vec<up_data_structs::PropertyKey>,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn set_token_properties(
 		&self,
-		sender: <T>::CrossAccountId,
-		token_id: TokenId,
-		properties: Vec<up_data_structs::Property>,
-		budget: &dyn up_data_structs::budget::Budget,
+		_sender: <T>::CrossAccountId,
+		_token_id: TokenId,
+		_properties: Vec<up_data_structs::Property>,
+		_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn delete_token_properties(
 		&self,
-		sender: <T>::CrossAccountId,
-		token_id: TokenId,
-		property_keys: Vec<up_data_structs::PropertyKey>,
-		budget: &dyn up_data_structs::budget::Budget,
+		_sender: <T>::CrossAccountId,
+		_token_id: TokenId,
+		_property_keys: Vec<up_data_structs::PropertyKey>,
+		_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn set_token_property_permissions(
 		&self,
-		sender: &<T>::CrossAccountId,
-		property_permissions: Vec<up_data_structs::PropertyKeyPermission>,
+		_sender: &<T>::CrossAccountId,
+		_property_permissions: Vec<up_data_structs::PropertyKeyPermission>,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
@@ -186,9 +186,9 @@
 		&self,
 		sender: <T>::CrossAccountId,
 		to: <T>::CrossAccountId,
-		token: TokenId,
+		_token: TokenId,
 		amount: u128,
-		budget: &dyn up_data_structs::budget::Budget,
+		_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		with_weight(
 			<T as Config>::Currency::transfer(
@@ -203,21 +203,21 @@
 
 	fn approve(
 		&self,
-		sender: <T>::CrossAccountId,
-		spender: <T>::CrossAccountId,
-		token: TokenId,
-		amount: u128,
+		_sender: <T>::CrossAccountId,
+		_spender: <T>::CrossAccountId,
+		_token: TokenId,
+		_amount: u128,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn approve_from(
 		&self,
-		sender: <T>::CrossAccountId,
-		from: <T>::CrossAccountId,
-		to: <T>::CrossAccountId,
-		token: TokenId,
-		amount: u128,
+		_sender: <T>::CrossAccountId,
+		_from: <T>::CrossAccountId,
+		_to: <T>::CrossAccountId,
+		_token: TokenId,
+		_amount: u128,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
@@ -227,9 +227,9 @@
 		sender: <T>::CrossAccountId,
 		from: <T>::CrossAccountId,
 		to: <T>::CrossAccountId,
-		token: TokenId,
+		_token: TokenId,
 		amount: u128,
-		budget: &dyn up_data_structs::budget::Budget,
+		_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		if sender != from {
 			fail!(<pallet_common::Error<T>>::NoPermission);
@@ -247,28 +247,28 @@
 
 	fn burn_from(
 		&self,
-		sender: <T>::CrossAccountId,
-		from: <T>::CrossAccountId,
-		token: TokenId,
-		amount: u128,
-		budget: &dyn up_data_structs::budget::Budget,
+		_sender: <T>::CrossAccountId,
+		_from: <T>::CrossAccountId,
+		_token: TokenId,
+		_amount: u128,
+		_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
 	fn check_nesting(
 		&self,
-		sender: <T>::CrossAccountId,
-		from: (up_data_structs::CollectionId, TokenId),
-		under: TokenId,
-		budget: &dyn up_data_structs::budget::Budget,
+		_sender: <T>::CrossAccountId,
+		_from: (up_data_structs::CollectionId, TokenId),
+		_under: TokenId,
+		_budget: &dyn up_data_structs::budget::Budget,
 	) -> frame_support::sp_runtime::DispatchResult {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
-	fn nest(&self, under: TokenId, to_nest: (up_data_structs::CollectionId, TokenId)) {}
+	fn nest(&self, _under: TokenId, _to_nest: (up_data_structs::CollectionId, TokenId)) {}
 
-	fn unnest(&self, under: TokenId, to_nest: (up_data_structs::CollectionId, TokenId)) {}
+	fn unnest(&self, _under: TokenId, _to_nest: (up_data_structs::CollectionId, TokenId)) {}
 
 	fn account_tokens(&self, account: <T>::CrossAccountId) -> Vec<TokenId> {
 		let balance = <T as Config>::Currency::total_balance(account.as_sub());
@@ -293,27 +293,27 @@
 
 	fn token_owner(
 		&self,
-		token: TokenId,
+		_token: TokenId,
 	) -> Result<<T>::CrossAccountId, up_data_structs::TokenOwnerError> {
 		Err(up_data_structs::TokenOwnerError::MultipleOwners)
 	}
 
-	fn token_owners(&self, token: TokenId) -> Vec<<T>::CrossAccountId> {
+	fn token_owners(&self, _token: TokenId) -> Vec<<T>::CrossAccountId> {
 		vec![]
 	}
 
 	fn token_property(
 		&self,
-		token_id: TokenId,
-		key: &up_data_structs::PropertyKey,
+		_token_id: TokenId,
+		_key: &up_data_structs::PropertyKey,
 	) -> Option<up_data_structs::PropertyValue> {
 		None
 	}
 
 	fn token_properties(
 		&self,
-		token: TokenId,
-		keys: Option<Vec<up_data_structs::PropertyKey>>,
+		_token: TokenId,
+		_keys: Option<Vec<up_data_structs::PropertyKey>>,
 	) -> Vec<up_data_structs::Property> {
 		vec![]
 	}
@@ -344,9 +344,9 @@
 
 	fn allowance(
 		&self,
-		sender: <T>::CrossAccountId,
-		spender: <T>::CrossAccountId,
-		token: TokenId,
+		_sender: <T>::CrossAccountId,
+		_spender: <T>::CrossAccountId,
+		_token: TokenId,
 	) -> u128 {
 		0
 	}
@@ -357,20 +357,24 @@
 
 	fn set_allowance_for_all(
 		&self,
-		owner: <T>::CrossAccountId,
-		operator: <T>::CrossAccountId,
-		approve: bool,
+		_owner: <T>::CrossAccountId,
+		_operator: <T>::CrossAccountId,
+		_approve: bool,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
 
-	fn allowance_for_all(&self, owner: <T>::CrossAccountId, operator: <T>::CrossAccountId) -> bool {
+	fn allowance_for_all(
+		&self,
+		_owner: <T>::CrossAccountId,
+		_operator: <T>::CrossAccountId,
+	) -> bool {
 		false
 	}
 
 	fn repair_item(
 		&self,
-		token: TokenId,
+		_token: TokenId,
 	) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
 		fail!(<pallet_common::Error<T>>::UnsupportedOperation);
 	}
modifiedpallets/balances-adapter/src/erc.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/erc.rs
+++ b/pallets/balances-adapter/src/erc.rs
@@ -9,7 +9,7 @@
 use pallet_evm_coder_substrate::{
 	call, dispatch_to_evm,
 	execution::{PreDispatch, Result},
-	frontier_contract, WithRecorder, SubstrateRecorder,
+	frontier_contract,
 };
 use sp_core::{U256, Get};
 use sp_std::vec::Vec;
@@ -26,13 +26,6 @@
 		from: Address,
 		#[indexed]
 		to: Address,
-		value: U256,
-	},
-	Approval {
-		#[indexed]
-		owner: Address,
-		#[indexed]
-		spender: Address,
 		value: U256,
 	},
 }
modifiedpallets/balances-adapter/src/lib.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -1,11 +1,9 @@
 // #![doc = include_str!("../README.md")]
 #![cfg_attr(not(feature = "std"), no_std)]
-#![warn(missing_docs)]
 
 extern crate alloc;
 use frame_support::sp_runtime::DispatchResult;
 pub use pallet::*;
-use pallet_common::CollectionHandle;
 use pallet_evm_coder_substrate::{WithRecorder, SubstrateRecorder};
 
 pub mod common;
@@ -13,12 +11,15 @@
 
 pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
 
+/// Handle for native fungible collection
 pub struct NativeFungibleHandle<T: Config>(SubstrateRecorder<T>);
 impl<T: Config> NativeFungibleHandle<T> {
+	/// Creates a handle
 	pub fn new() -> NativeFungibleHandle<T> {
 		Self(SubstrateRecorder::new(u64::MAX))
 	}
 
+	/// Check if the collection is internal
 	pub fn check_is_internal(&self) -> DispatchResult {
 		Ok(())
 	}
@@ -35,7 +36,7 @@
 #[frame_support::pallet]
 pub mod pallet {
 	use alloc::string::String;
-	use frame_support::{traits::Get, sp_runtime::DispatchResult};
+	use frame_support::{traits::Get};
 	use pallet_balances::WeightInfo;
 	use sp_core::U256;
 
@@ -43,25 +44,24 @@
 	pub trait Config:
 		frame_system::Config + pallet_evm_coder_substrate::Config + pallet_common::Config
 	{
+		/// Currency from `pallet_balances`
 		type Currency: frame_support::traits::Currency<
 			Self::AccountId,
 			Balance = Self::CurrencyBalance,
 		>;
+		/// Balance type of chain
 		type CurrencyBalance: Into<U256> + TryFrom<U256> + PartialEq<u128> + From<u128> + Into<u128>;
 
+		/// Decimals of balance
 		type Decimals: Get<u8>;
+		/// Collection name
 		type Name: Get<String>;
+		/// Collection symbol
 		type Symbol: Get<String>;
 
+		/// Weight information
 		type WeightInfo: WeightInfo;
 	}
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
-
-	// #[pallet::call]
-	impl<T: Config> Pallet<T> {
-		pub fn dummy() -> DispatchResult {
-			Ok(())
-		}
-	}
 }
modifiedpallets/common/src/dispatch.rsdiffbeforeafterboth
--- a/pallets/common/src/dispatch.rs
+++ b/pallets/common/src/dispatch.rs
@@ -11,7 +11,7 @@
 use sp_runtime::DispatchError;
 use up_data_structs::{CollectionId, CreateCollectionData, CollectionFlags};
 
-use crate::{pallet::Config, CommonCollectionOperations, CollectionHandle};
+use crate::{pallet::Config, CommonCollectionOperations};
 
 // TODO: move to benchmarking
 /// Price of [`dispatch_tx`] call with noop `call` argument
@@ -66,6 +66,7 @@
 
 /// Interface for working with different collections through the dispatcher.
 pub trait CollectionDispatch<T: Config> {
+	/// Check if the collection is internal.
 	fn check_is_internal(&self) -> DispatchResult;
 
 	/// Create a collection. The collection will be created according to the value of [`data.mode`](CreateCollectionData::mode).
modifiedpallets/common/src/erc.rsdiffbeforeafterboth
before · pallets/common/src/erc.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/>.1617//! This module contains the implementation of pallet methods for evm.1819pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};20use pallet_evm_coder_substrate::{21	abi::AbiType,22	solidity_interface, ToLog,23	types::*,24	execution::{Result, Error, PreDispatch},25	frontier_contract,26};27use pallet_evm_coder_substrate::dispatch_to_evm;28use sp_std::{vec, vec::Vec};29use up_data_structs::{30	CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property, SponsoringRateLimit,31	SponsorshipState,32};3334use crate::{35	Pallet, CollectionHandle, Config, CollectionProperties, eth, SelfWeightOf, weights::WeightInfo,36};3738frontier_contract! {39	macro_rules! CollectionHandle_result {...}40	impl<T: Config> Contract for CollectionHandle<T> {...}41}4243/// Events for ethereum collection helper.44#[derive(ToLog)]45pub enum CollectionHelpersEvents {46	/// The collection has been created.47	CollectionCreated {48		/// Collection owner.49		#[indexed]50		owner: Address,5152		/// Collection ID.53		#[indexed]54		collection_id: Address,55	},56	/// The collection has been destroyed.57	CollectionDestroyed {58		/// Collection ID.59		#[indexed]60		collection_id: Address,61	},62	/// The collection has been changed.63	CollectionChanged {64		/// Collection ID.65		#[indexed]66		collection_id: Address,67	},68}6970/// Does not always represent a full collection, for RFT it is either71/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).72pub trait CommonEvmHandler {73	/// Raw compiled binary code of the contract stub74	const CODE: &'static [u8];7576	/// Call precompiled handle.77	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;78}7980impl CommonEvmHandler for () {81	const CODE: &'static [u8] = &[];8283	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {84		None85	}86}8788/// @title A contract that allows you to work with collections.89#[solidity_interface(name = Collection, enum(derive(PreDispatch)), enum_attr(weight))]90impl<T: Config> CollectionHandle<T>91where92	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,93{94	/// Set collection property.95	///96	/// @param key Property key.97	/// @param value Propery value.98	#[solidity(hide)]99	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]100	fn set_collection_property(&mut self, caller: Caller, key: String, value: Bytes) -> Result<()> {101		let caller = T::CrossAccountId::from_eth(caller);102		let key = <Vec<u8>>::from(key)103			.try_into()104			.map_err(|_| "key too large")?;105		let value = value.0.try_into().map_err(|_| "value too large")?;106107		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })108			.map_err(dispatch_to_evm::<T>)109	}110111	/// Set collection properties.112	///113	/// @param properties Vector of properties key/value pair.114	#[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]115	fn set_collection_properties(116		&mut self,117		caller: Caller,118		properties: Vec<eth::Property>,119	) -> Result<()> {120		let caller = T::CrossAccountId::from_eth(caller);121122		let properties = properties123			.into_iter()124			.map(eth::Property::try_into)125			.collect::<Result<Vec<_>>>()?;126127		<Pallet<T>>::set_collection_properties(self, &caller, properties.into_iter())128			.map_err(dispatch_to_evm::<T>)129	}130131	/// Delete collection property.132	///133	/// @param key Property key.134	#[solidity(hide)]135	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]136	fn delete_collection_property(&mut self, caller: Caller, key: String) -> Result<()> {137		let caller = T::CrossAccountId::from_eth(caller);138		let key = <Vec<u8>>::from(key)139			.try_into()140			.map_err(|_| "key too large")?;141142		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)143	}144145	/// Delete collection properties.146	///147	/// @param keys Properties keys.148	#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]149	fn delete_collection_properties(&mut self, caller: Caller, keys: Vec<String>) -> Result<()> {150		let caller = T::CrossAccountId::from_eth(caller);151		let keys = keys152			.into_iter()153			.map(|key| {154				<Vec<u8>>::from(key)155					.try_into()156					.map_err(|_| Error::Revert("key too large".into()))157			})158			.collect::<Result<Vec<_>>>()?;159160		<Pallet<T>>::delete_collection_properties(self, &caller, keys.into_iter())161			.map_err(dispatch_to_evm::<T>)162	}163164	/// Get collection property.165	///166	/// @dev Throws error if key not found.167	///168	/// @param key Property key.169	/// @return bytes The property corresponding to the key.170	fn collection_property(&self, key: String) -> Result<Bytes> {171		let key = <Vec<u8>>::from(key)172			.try_into()173			.map_err(|_| "key too large")?;174175		let props = CollectionProperties::<T>::get(self.id);176		let prop = props.get(&key).ok_or("key not found")?;177178		Ok(Bytes(prop.to_vec()))179	}180181	/// Get collection properties.182	///183	/// @param keys Properties keys. Empty keys for all propertyes.184	/// @return Vector of properties key/value pairs.185	fn collection_properties(&self, keys: Vec<String>) -> Result<Vec<eth::Property>> {186		let keys = keys187			.into_iter()188			.map(|key| {189				<Vec<u8>>::from(key)190					.try_into()191					.map_err(|_| Error::Revert("key too large".into()))192			})193			.collect::<Result<Vec<_>>>()?;194195		let properties = Pallet::<T>::filter_collection_properties(196			self.id,197			if keys.is_empty() { None } else { Some(keys) },198		)199		.map_err(dispatch_to_evm::<T>)?;200201		let properties = properties202			.into_iter()203			.map(Property::try_into)204			.collect::<Result<Vec<_>>>()?;205		Ok(properties)206	}207208	/// Set the sponsor of the collection.209	///210	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.211	///212	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.213	#[solidity(hide)]214	fn set_collection_sponsor(&mut self, caller: Caller, sponsor: Address) -> Result<()> {215		self.consume_store_reads_and_writes(1, 1)?;216217		let caller = T::CrossAccountId::from_eth(caller);218219		let sponsor = T::CrossAccountId::from_eth(sponsor);220		self.set_sponsor(&caller, sponsor.as_sub().clone())221			.map_err(dispatch_to_evm::<T>)222	}223224	/// Set the sponsor of the collection.225	///226	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.227	///228	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.229	fn set_collection_sponsor_cross(230		&mut self,231		caller: Caller,232		sponsor: eth::CrossAddress,233	) -> Result<()> {234		self.consume_store_reads_and_writes(1, 1)?;235236		let caller = T::CrossAccountId::from_eth(caller);237238		let sponsor = sponsor.into_sub_cross_account::<T>()?;239		self.set_sponsor(&caller, sponsor.as_sub().clone())240			.map_err(dispatch_to_evm::<T>)241	}242243	/// Whether there is a pending sponsor.244	fn has_collection_pending_sponsor(&self) -> Result<bool> {245		Ok(matches!(246			self.collection.sponsorship,247			SponsorshipState::Unconfirmed(_)248		))249	}250251	/// Collection sponsorship confirmation.252	///253	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.254	fn confirm_collection_sponsorship(&mut self, caller: Caller) -> Result<()> {255		self.consume_store_writes(1)?;256257		let caller = T::CrossAccountId::from_eth(caller);258		self.confirm_sponsorship(caller.as_sub())259			.map_err(dispatch_to_evm::<T>)260	}261262	/// Remove collection sponsor.263	fn remove_collection_sponsor(&mut self, caller: Caller) -> Result<()> {264		self.consume_store_reads_and_writes(1, 1)?;265		let caller = T::CrossAccountId::from_eth(caller);266		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)267	}268269	/// Get current sponsor.270	///271	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.272	fn collection_sponsor(&self) -> Result<eth::CrossAddress> {273		let sponsor = match self.collection.sponsorship.sponsor() {274			Some(sponsor) => sponsor,275			None => return Ok(Default::default()),276		};277278		Ok(eth::CrossAddress::from_sub::<T>(sponsor))279	}280281	/// Get current collection limits.282	///283	/// @return Array of collection limits284	fn collection_limits(&self) -> Result<Vec<eth::CollectionLimit>> {285		let limits = &self.collection.limits;286287		Ok(vec![288			eth::CollectionLimit::new(289				eth::CollectionLimitField::AccountTokenOwnership,290				limits.account_token_ownership_limit,291			),292			eth::CollectionLimit::new(293				eth::CollectionLimitField::SponsoredDataSize,294				limits.sponsored_data_size,295			),296			limits297				.sponsored_data_rate_limit298				.and_then(|limit| {299					if let SponsoringRateLimit::Blocks(blocks) = limit {300						Some(eth::CollectionLimit::new(301							eth::CollectionLimitField::SponsoredDataRateLimit,302							Some(blocks),303						))304					} else {305						None306					}307				})308				.unwrap_or_else(|| {309					eth::CollectionLimit::new(310						eth::CollectionLimitField::SponsoredDataRateLimit,311						Default::default(),312					)313				}),314			eth::CollectionLimit::new(eth::CollectionLimitField::TokenLimit, limits.token_limit),315			eth::CollectionLimit::new(316				eth::CollectionLimitField::SponsorTransferTimeout,317				limits.sponsor_transfer_timeout,318			),319			eth::CollectionLimit::new(320				eth::CollectionLimitField::SponsorApproveTimeout,321				limits.sponsor_approve_timeout,322			),323			eth::CollectionLimit::new(324				eth::CollectionLimitField::OwnerCanTransfer,325				limits.owner_can_transfer.map(u32::from),326			),327			eth::CollectionLimit::new(328				eth::CollectionLimitField::OwnerCanDestroy,329				limits.owner_can_destroy.map(u32::from),330			),331			eth::CollectionLimit::new(332				eth::CollectionLimitField::TransferEnabled,333				limits.transfers_enabled.map(u32::from),334			),335		])336	}337338	/// Set limits for the collection.339	/// @dev Throws error if limit not found.340	/// @param limit Some limit.341	#[solidity(rename_selector = "setCollectionLimit")]342	fn set_collection_limit(&mut self, caller: Caller, limit: eth::CollectionLimit) -> Result<()> {343		self.consume_store_reads_and_writes(1, 1)?;344345		if !limit.has_value() {346			return Err(Error::Revert("user can't disable limits".into()));347		}348349		let caller = T::CrossAccountId::from_eth(caller);350		<Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)351	}352353	/// Get contract address.354	fn contract_address(&self) -> Result<Address> {355		Ok(crate::eth::collection_id_to_address(self.id))356	}357358	/// Add collection admin.359	/// @param newAdmin Cross account administrator address.360	fn add_collection_admin_cross(361		&mut self,362		caller: Caller,363		new_admin: eth::CrossAddress,364	) -> Result<()> {365		self.consume_store_reads_and_writes(2, 2)?;366367		let caller = T::CrossAccountId::from_eth(caller);368		let new_admin = new_admin.into_sub_cross_account::<T>()?;369		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;370		Ok(())371	}372373	/// Remove collection admin.374	/// @param admin Cross account administrator address.375	fn remove_collection_admin_cross(376		&mut self,377		caller: Caller,378		admin: eth::CrossAddress,379	) -> Result<()> {380		self.consume_store_reads_and_writes(2, 2)?;381382		let caller = T::CrossAccountId::from_eth(caller);383		let admin = admin.into_sub_cross_account::<T>()?;384		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;385		Ok(())386	}387388	/// Add collection admin.389	/// @param newAdmin Address of the added administrator.390	#[solidity(hide)]391	fn add_collection_admin(&mut self, caller: Caller, new_admin: Address) -> Result<()> {392		self.consume_store_reads_and_writes(2, 2)?;393394		let caller = T::CrossAccountId::from_eth(caller);395		let new_admin = T::CrossAccountId::from_eth(new_admin);396		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;397		Ok(())398	}399400	/// Remove collection admin.401	///402	/// @param admin Address of the removed administrator.403	#[solidity(hide)]404	fn remove_collection_admin(&mut self, caller: Caller, admin: Address) -> Result<()> {405		self.consume_store_reads_and_writes(2, 2)?;406407		let caller = T::CrossAccountId::from_eth(caller);408		let admin = T::CrossAccountId::from_eth(admin);409		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;410		Ok(())411	}412413	/// Toggle accessibility of collection nesting.414	///415	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'416	#[solidity(rename_selector = "setCollectionNesting")]417	fn set_nesting_bool(&mut self, caller: Caller, enable: bool) -> Result<()> {418		self.consume_store_reads_and_writes(1, 1)?;419420		let caller = T::CrossAccountId::from_eth(caller);421422		let mut permissions = self.collection.permissions.clone();423		let mut nesting = permissions.nesting().clone();424		nesting.token_owner = enable;425		nesting.restricted = None;426		permissions.nesting = Some(nesting);427428		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)429	}430431	/// Toggle accessibility of collection nesting.432	///433	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'434	/// @param collections Addresses of collections that will be available for nesting.435	#[solidity(rename_selector = "setCollectionNesting")]436	fn set_nesting(437		&mut self,438		caller: Caller,439		enable: bool,440		collections: Vec<Address>,441	) -> Result<()> {442		self.consume_store_reads_and_writes(1, 1)?;443444		if collections.is_empty() {445			return Err("no addresses provided".into());446		}447		let caller = T::CrossAccountId::from_eth(caller);448449		let mut permissions = self.collection.permissions.clone();450		match enable {451			false => {452				let mut nesting = permissions.nesting().clone();453				nesting.token_owner = false;454				nesting.restricted = None;455				permissions.nesting = Some(nesting);456			}457			true => {458				let mut bv = OwnerRestrictedSet::new();459				for i in collections {460					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {461						Error::Revert("Can't convert address into collection id".into())462					})?)463					.map_err(|_| "too many collections")?;464				}465				let mut nesting = permissions.nesting().clone();466				nesting.token_owner = true;467				nesting.restricted = Some(bv);468				permissions.nesting = Some(nesting);469			}470		};471472		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)473	}474475	/// Returns nesting for a collection476	#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]477	fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {478		let nesting = self.collection.permissions.nesting();479480		Ok(eth::CollectionNesting::new(481			nesting.token_owner,482			nesting483				.restricted484				.clone()485				.map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())486				.unwrap_or_default(),487		))488	}489490	/// Returns permissions for a collection491	fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {492		let nesting = self.collection.permissions.nesting();493		Ok(vec![494			eth::CollectionNestingPermission::new(495				eth::CollectionPermissionField::CollectionAdmin,496				nesting.collection_admin,497			),498			eth::CollectionNestingPermission::new(499				eth::CollectionPermissionField::TokenOwner,500				nesting.token_owner,501			),502		])503	}504	/// Set the collection access method.505	/// @param mode Access mode506	fn set_collection_access(&mut self, caller: Caller, mode: eth::AccessMode) -> Result<()> {507		self.consume_store_reads_and_writes(1, 1)?;508509		let caller = T::CrossAccountId::from_eth(caller);510		let permissions = CollectionPermissions {511			access: Some(mode.into()),512			..Default::default()513		};514		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)515	}516517	/// Checks that user allowed to operate with collection.518	///519	/// @param user User address to check.520	fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {521		let user = user.into_sub_cross_account::<T>()?;522		Ok(Pallet::<T>::allowed(self.id, user))523	}524525	/// Add the user to the allowed list.526	///527	/// @param user Address of a trusted user.528	#[solidity(hide)]529	fn add_to_collection_allow_list(&mut self, caller: Caller, user: Address) -> Result<()> {530		self.consume_store_writes(1)?;531532		let caller = T::CrossAccountId::from_eth(caller);533		let user = T::CrossAccountId::from_eth(user);534		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;535		Ok(())536	}537538	/// Add user to allowed list.539	///540	/// @param user User cross account address.541	fn add_to_collection_allow_list_cross(542		&mut self,543		caller: Caller,544		user: eth::CrossAddress,545	) -> Result<()> {546		self.consume_store_writes(1)?;547548		let caller = T::CrossAccountId::from_eth(caller);549		let user = user.into_sub_cross_account::<T>()?;550		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;551		Ok(())552	}553554	/// Remove the user from the allowed list.555	///556	/// @param user Address of a removed user.557	#[solidity(hide)]558	fn remove_from_collection_allow_list(&mut self, caller: Caller, user: Address) -> Result<()> {559		self.consume_store_writes(1)?;560561		let caller = T::CrossAccountId::from_eth(caller);562		let user = T::CrossAccountId::from_eth(user);563		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;564		Ok(())565	}566567	/// Remove user from allowed list.568	///569	/// @param user User cross account address.570	fn remove_from_collection_allow_list_cross(571		&mut self,572		caller: Caller,573		user: eth::CrossAddress,574	) -> Result<()> {575		self.consume_store_writes(1)?;576577		let caller = T::CrossAccountId::from_eth(caller);578		let user = user.into_sub_cross_account::<T>()?;579		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;580		Ok(())581	}582583	/// Switch permission for minting.584	///585	/// @param mode Enable if "true".586	fn set_collection_mint_mode(&mut self, caller: Caller, mode: bool) -> Result<()> {587		self.consume_store_reads_and_writes(1, 1)?;588589		let caller = T::CrossAccountId::from_eth(caller);590		let permissions = CollectionPermissions {591			mint_mode: Some(mode),592			..Default::default()593		};594		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)595	}596597	/// Check that account is the owner or admin of the collection598	///599	/// @param user account to verify600	/// @return "true" if account is the owner or admin601	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]602	fn is_owner_or_admin_eth(&self, user: Address) -> Result<bool> {603		let user = T::CrossAccountId::from_eth(user);604		Ok(self.is_owner_or_admin(&user))605	}606607	/// Check that account is the owner or admin of the collection608	///609	/// @param user User cross account to verify610	/// @return "true" if account is the owner or admin611	fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {612		let user = user.into_sub_cross_account::<T>()?;613		Ok(self.is_owner_or_admin(&user))614	}615616	/// Returns collection type617	///618	/// @return `Fungible` or `NFT` or `ReFungible`619	fn unique_collection_type(&self) -> Result<String> {620		let mode = match self.collection.mode {621			CollectionMode::Fungible(_) => "Fungible",622			CollectionMode::NFT => "NFT",623			CollectionMode::ReFungible => "ReFungible",624		};625		Ok(mode.into())626	}627628	/// Get collection owner.629	///630	/// @return Tuble with sponsor address and his substrate mirror.631	/// If address is canonical then substrate mirror is zero and vice versa.632	fn collection_owner(&self) -> Result<eth::CrossAddress> {633		Ok(eth::CrossAddress::from_sub_cross_account::<T>(634			&T::CrossAccountId::from_sub(self.owner.clone()),635		))636	}637638	/// Changes collection owner to another account639	///640	/// @dev Owner can be changed only by current owner641	/// @param newOwner new owner account642	#[solidity(hide, rename_selector = "changeCollectionOwner")]643	fn set_owner(&mut self, caller: Caller, new_owner: Address) -> Result<()> {644		self.consume_store_writes(1)?;645646		let caller = T::CrossAccountId::from_eth(caller);647		let new_owner = T::CrossAccountId::from_eth(new_owner);648		self.change_owner(caller, new_owner)649			.map_err(dispatch_to_evm::<T>)650	}651652	/// Get collection administrators653	///654	/// @return Vector of tuples with admins address and his substrate mirror.655	/// If address is canonical then substrate mirror is zero and vice versa.656	fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {657		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))658			.map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))659			.collect();660		Ok(result)661	}662663	/// Changes collection owner to another account664	///665	/// @dev Owner can be changed only by current owner666	/// @param newOwner new owner cross account667	fn change_collection_owner_cross(668		&mut self,669		caller: Caller,670		new_owner: eth::CrossAddress,671	) -> Result<()> {672		self.consume_store_writes(1)?;673674		let caller = T::CrossAccountId::from_eth(caller);675		let new_owner = new_owner.into_sub_cross_account::<T>()?;676		self.change_owner(caller, new_owner)677			.map_err(dispatch_to_evm::<T>)678	}679}680681/// Contains static property keys and values.682pub mod static_property {683	use pallet_evm_coder_substrate::{684		execution::{Result, Error},685	};686	use alloc::format;687688	const EXPECT_CONVERT_ERROR: &str = "length < limit";689690	/// Keys.691	pub mod key {692		use super::*;693694		/// Key "baseURI".695		pub fn base_uri() -> up_data_structs::PropertyKey {696			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)697		}698699		/// Key "url".700		pub fn url() -> up_data_structs::PropertyKey {701			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)702		}703704		/// Key "suffix".705		pub fn suffix() -> up_data_structs::PropertyKey {706			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)707		}708709		/// Key "parentNft".710		pub fn parent_nft() -> up_data_structs::PropertyKey {711			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)712		}713	}714715	/// Convert `byte` to [`PropertyKey`].716	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {717		bytes.to_vec().try_into().map_err(|_| {718			Error::Revert(format!(719				"Property key is too long. Max length is {}.",720				up_data_structs::PropertyKey::bound()721			))722		})723	}724725	/// Convert `bytes` to [`PropertyValue`].726	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {727		bytes.to_vec().try_into().map_err(|_| {728			Error::Revert(format!(729				"Property key is too long. Max length is {}.",730				up_data_structs::PropertyKey::bound()731			))732		})733	}734}
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -462,6 +462,7 @@
 	}
 
 	const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
+	/// Collection id for native fungible collction.
 	pub const NATIVE_FINGIBLE_COLLECTION_ID: CollectionId = CollectionId(0);
 
 	#[pallet::pallet]
modifiedpallets/structure/src/lib.rsdiffbeforeafterboth
--- a/pallets/structure/src/lib.rs
+++ b/pallets/structure/src/lib.rs
@@ -60,7 +60,7 @@
 use frame_support::dispatch::{DispatchError, DispatchResult, DispatchResultWithPostInfo};
 use frame_support::fail;
 pub use pallet::*;
-use pallet_common::{dispatch::CollectionDispatch, CollectionHandle};
+use pallet_common::{dispatch::CollectionDispatch};
 use up_data_structs::{
 	CollectionId, TokenId, mapping::TokenAddressMapping, budget::Budget, TokenOwnerError,
 };
modifiedruntime/common/dispatch.rsdiffbeforeafterboth
--- a/runtime/common/dispatch.rs
+++ b/runtime/common/dispatch.rs
@@ -25,7 +25,7 @@
 };
 pub use pallet_common::dispatch::CollectionDispatch;
 use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};
-use pallet_balances_adapter::{Pallet as PalletNativeFungible, NativeFungibleHandle};
+use pallet_balances_adapter::{NativeFungibleHandle};
 use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle};
 use pallet_refungible::{
 	Pallet as PalletRefungible, RefungibleHandle, erc_token::RefungibleTokenHandle,