git.delta.rocks / unique-network / refs/commits / 2f30e2f1b171

difftreelog

misk: remove simple type aliases

Trubnikov Sergey2023-01-11parent: #916ae42.patch.diff
in: master

9 files changed

modifiedcrates/evm-coder/src/events.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/events.rs
+++ b/crates/evm-coder/src/events.rs
@@ -61,7 +61,7 @@
 	}
 }
 
-impl ToTopic for uint32 {
+impl ToTopic for u32 {
 	fn to_topic(&self) -> H256 {
 		let mut out = [0u8; 32];
 		out[28..32].copy_from_slice(&self.to_be_bytes());
modifiedcrates/evm-coder/src/lib.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -132,11 +132,6 @@
 	use primitive_types::{U256, H160, H256};
 
 	pub type address = H160;
-	pub type uint8 = u8;
-	pub type uint16 = u16;
-	pub type uint32 = u32;
-	pub type uint64 = u64;
-	pub type uint128 = u128;
 	pub type uint256 = U256;
 	pub type bytes4 = [u8; 4];
 	pub type topic = H256;
@@ -148,10 +143,6 @@
 
 	#[derive(Default, Debug, PartialEq, Eq, Clone)]
 	pub struct bytes(pub Vec<u8>);
-
-	/// Solidity doesn't have `void` type, however we have special implementation
-	/// for empty tuple return type
-	pub type void = ();
 
 	//#region Special types
 	/// Makes function payable
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 evm_coder::{21	abi::AbiType,22	solidity_interface, solidity, ToLog,23	types::*,24	execution::{Result, Error},25	weight,26};27use pallet_evm_coder_substrate::dispatch_to_evm;28use sp_std::{vec, vec::Vec};29use up_data_structs::{30	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,31	SponsoringRateLimit, SponsorshipState,32};3334use crate::{35	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf, eth, weights::WeightInfo,36};3738/// Events for ethereum collection helper.39#[derive(ToLog)]40pub enum CollectionHelpersEvents {41	/// The collection has been created.42	CollectionCreated {43		/// Collection owner.44		#[indexed]45		owner: address,4647		/// Collection ID.48		#[indexed]49		collection_id: address,50	},51	/// The collection has been destroyed.52	CollectionDestroyed {53		/// Collection ID.54		#[indexed]55		collection_id: address,56	},57	/// The collection has been changed.58	CollectionChanged {59		/// Collection ID.60		#[indexed]61		collection_id: address,62	},6364	/// The token has been changed.65	TokenChanged {66		/// Collection ID.67		#[indexed]68		collection_id: address,69		/// Token ID.70		token_id: uint256,71	},72}7374/// Does not always represent a full collection, for RFT it is either75/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).76pub trait CommonEvmHandler {77	/// Raw compiled binary code of the contract stub78	const CODE: &'static [u8];7980	/// Call precompiled handle.81	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;82}8384/// @title A contract that allows you to work with collections.85#[solidity_interface(name = Collection)]86impl<T: Config> CollectionHandle<T>87where88	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,89{90	/// Set collection property.91	///92	/// @param key Property key.93	/// @param value Propery value.94	#[solidity(hide)]95	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]96	fn set_collection_property(97		&mut self,98		caller: caller,99		key: string,100		value: bytes,101	) -> Result<void> {102		let caller = T::CrossAccountId::from_eth(caller);103		let key = <Vec<u8>>::from(key)104			.try_into()105			.map_err(|_| "key too large")?;106		let value = value.0.try_into().map_err(|_| "value too large")?;107108		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })109			.map_err(dispatch_to_evm::<T>)110	}111112	/// Set collection properties.113	///114	/// @param properties Vector of properties key/value pair.115	#[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]116	fn set_collection_properties(117		&mut self,118		caller: caller,119		properties: Vec<eth::Property>,120	) -> Result<void> {121		let caller = T::CrossAccountId::from_eth(caller);122123		let properties = properties124			.into_iter()125			.map(eth::Property::try_into)126			.collect::<Result<Vec<_>>>()?;127128		<Pallet<T>>::set_collection_properties(self, &caller, properties.into_iter())129			.map_err(dispatch_to_evm::<T>)130	}131132	/// Delete collection property.133	///134	/// @param key Property key.135	#[solidity(hide)]136	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]137	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {138		let caller = T::CrossAccountId::from_eth(caller);139		let key = <Vec<u8>>::from(key)140			.try_into()141			.map_err(|_| "key too large")?;142143		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)144	}145146	/// Delete collection properties.147	///148	/// @param keys Properties keys.149	#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]150	fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {151		let caller = T::CrossAccountId::from_eth(caller);152		let keys = keys153			.into_iter()154			.map(|key| {155				<Vec<u8>>::from(key)156					.try_into()157					.map_err(|_| Error::Revert("key too large".into()))158			})159			.collect::<Result<Vec<_>>>()?;160161		<Pallet<T>>::delete_collection_properties(self, &caller, keys.into_iter())162			.map_err(dispatch_to_evm::<T>)163	}164165	/// Get collection property.166	///167	/// @dev Throws error if key not found.168	///169	/// @param key Property key.170	/// @return bytes The property corresponding to the key.171	fn collection_property(&self, key: string) -> Result<bytes> {172		let key = <Vec<u8>>::from(key)173			.try_into()174			.map_err(|_| "key too large")?;175176		let props = CollectionProperties::<T>::get(self.id);177		let prop = props.get(&key).ok_or("key not found")?;178179		Ok(bytes(prop.to_vec()))180	}181182	/// Get collection properties.183	///184	/// @param keys Properties keys. Empty keys for all propertyes.185	/// @return Vector of properties key/value pairs.186	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<eth::Property>> {187		let keys = keys188			.into_iter()189			.map(|key| {190				<Vec<u8>>::from(key)191					.try_into()192					.map_err(|_| Error::Revert("key too large".into()))193			})194			.collect::<Result<Vec<_>>>()?;195196		let properties = Pallet::<T>::filter_collection_properties(197			self.id,198			if keys.is_empty() { None } else { Some(keys) },199		)200		.map_err(dispatch_to_evm::<T>)?;201202		let properties = properties203			.into_iter()204			.map(Property::try_into)205			.collect::<Result<Vec<_>>>()?;206		Ok(properties)207	}208209	/// Set the sponsor of the collection.210	///211	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.212	///213	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.214	#[solidity(hide)]215	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {216		self.consume_store_reads_and_writes(1, 1)?;217218		let caller = T::CrossAccountId::from_eth(caller);219220		let sponsor = T::CrossAccountId::from_eth(sponsor);221		self.set_sponsor(&caller, sponsor.as_sub().clone())222			.map_err(dispatch_to_evm::<T>)223	}224225	/// Set the sponsor of the collection.226	///227	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.228	///229	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.230	fn set_collection_sponsor_cross(231		&mut self,232		caller: caller,233		sponsor: eth::CrossAddress,234	) -> Result<void> {235		self.consume_store_reads_and_writes(1, 1)?;236237		let caller = T::CrossAccountId::from_eth(caller);238239		let sponsor = sponsor.into_sub_cross_account::<T>()?;240		self.set_sponsor(&caller, sponsor.as_sub().clone())241			.map_err(dispatch_to_evm::<T>)242	}243244	/// Whether there is a pending sponsor.245	fn has_collection_pending_sponsor(&self) -> Result<bool> {246		Ok(matches!(247			self.collection.sponsorship,248			SponsorshipState::Unconfirmed(_)249		))250	}251252	/// Collection sponsorship confirmation.253	///254	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.255	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {256		self.consume_store_writes(1)?;257258		let caller = T::CrossAccountId::from_eth(caller);259		self.confirm_sponsorship(caller.as_sub())260			.map_err(dispatch_to_evm::<T>)261	}262263	/// Remove collection sponsor.264	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {265		self.consume_store_reads_and_writes(1, 1)?;266		let caller = T::CrossAccountId::from_eth(caller);267		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)268	}269270	/// Get current sponsor.271	///272	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.273	fn collection_sponsor(&self) -> Result<eth::CrossAddress> {274		let sponsor = match self.collection.sponsorship.sponsor() {275			Some(sponsor) => sponsor,276			None => return Ok(Default::default()),277		};278279		Ok(eth::CrossAddress::from_sub::<T>(&sponsor))280	}281282	/// Get current collection limits.283	///284	/// @return Array of collection limits285	fn collection_limits(&self) -> Result<Vec<eth::CollectionLimit>> {286		let limits = &self.collection.limits;287288		let convert_value_from_bool = |ob: Option<bool>| match ob {289			Some(b) => Some(b as u32),290			None => None,291		};292293		Ok(vec![294			eth::CollectionLimit::new(295				eth::CollectionLimitField::AccountTokenOwnership,296				limits.account_token_ownership_limit,297			),298			eth::CollectionLimit::new(299				eth::CollectionLimitField::SponsoredDataSize,300				limits.sponsored_data_size,301			),302			limits303				.sponsored_data_rate_limit304				.and_then(|limit| {305					if let SponsoringRateLimit::Blocks(blocks) = limit {306						Some(eth::CollectionLimit::new(307							eth::CollectionLimitField::SponsoredDataRateLimit,308							Some(blocks),309						))310					} else {311						None312					}313				})314				.unwrap_or(eth::CollectionLimit::new(315					eth::CollectionLimitField::SponsoredDataRateLimit,316					Default::default(),317				)),318			eth::CollectionLimit::new(eth::CollectionLimitField::TokenLimit, limits.token_limit),319			eth::CollectionLimit::new(320				eth::CollectionLimitField::SponsorTransferTimeout,321				limits.sponsor_transfer_timeout,322			),323			eth::CollectionLimit::new(324				eth::CollectionLimitField::SponsorApproveTimeout,325				limits.sponsor_approve_timeout,326			),327			eth::CollectionLimit::new(328				eth::CollectionLimitField::OwnerCanTransfer,329				convert_value_from_bool(limits.owner_can_transfer),330			),331			eth::CollectionLimit::new(332				eth::CollectionLimitField::OwnerCanDestroy,333				convert_value_from_bool(limits.owner_can_destroy),334			),335			eth::CollectionLimit::new(336				eth::CollectionLimitField::TransferEnabled,337				convert_value_from_bool(limits.transfers_enabled),338			),339		])340	}341342	/// Set limits for the collection.343	/// @dev Throws error if limit not found.344	/// @param limit Some limit.345	#[solidity(rename_selector = "setCollectionLimit")]346	fn set_collection_limit(347		&mut self,348		caller: caller,349		limit: eth::CollectionLimit,350	) -> Result<void> {351		self.consume_store_reads_and_writes(1, 1)?;352353		if !limit.has_value() {354			return Err(Error::Revert("user can't disable limits".into()));355		}356357		let caller = T::CrossAccountId::from_eth(caller);358		<Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)359	}360361	/// Get contract address.362	fn contract_address(&self) -> Result<address> {363		Ok(crate::eth::collection_id_to_address(self.id))364	}365366	/// Add collection admin.367	/// @param newAdmin Cross account administrator address.368	fn add_collection_admin_cross(369		&mut self,370		caller: caller,371		new_admin: eth::CrossAddress,372	) -> Result<void> {373		self.consume_store_reads_and_writes(2, 2)?;374375		let caller = T::CrossAccountId::from_eth(caller);376		let new_admin = new_admin.into_sub_cross_account::<T>()?;377		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;378		Ok(())379	}380381	/// Remove collection admin.382	/// @param admin Cross account administrator address.383	fn remove_collection_admin_cross(384		&mut self,385		caller: caller,386		admin: eth::CrossAddress,387	) -> Result<void> {388		self.consume_store_reads_and_writes(2, 2)?;389390		let caller = T::CrossAccountId::from_eth(caller);391		let admin = admin.into_sub_cross_account::<T>()?;392		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;393		Ok(())394	}395396	/// Add collection admin.397	/// @param newAdmin Address of the added administrator.398	#[solidity(hide)]399	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {400		self.consume_store_reads_and_writes(2, 2)?;401402		let caller = T::CrossAccountId::from_eth(caller);403		let new_admin = T::CrossAccountId::from_eth(new_admin);404		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;405		Ok(())406	}407408	/// Remove collection admin.409	///410	/// @param admin Address of the removed administrator.411	#[solidity(hide)]412	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {413		self.consume_store_reads_and_writes(2, 2)?;414415		let caller = T::CrossAccountId::from_eth(caller);416		let admin = T::CrossAccountId::from_eth(admin);417		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;418		Ok(())419	}420421	/// Toggle accessibility of collection nesting.422	///423	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'424	#[solidity(rename_selector = "setCollectionNesting")]425	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {426		self.consume_store_reads_and_writes(1, 1)?;427428		let caller = T::CrossAccountId::from_eth(caller);429430		let mut permissions = self.collection.permissions.clone();431		let mut nesting = permissions.nesting().clone();432		nesting.token_owner = enable;433		nesting.restricted = None;434		permissions.nesting = Some(nesting);435436		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)437	}438439	/// Toggle accessibility of collection nesting.440	///441	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'442	/// @param collections Addresses of collections that will be available for nesting.443	#[solidity(rename_selector = "setCollectionNesting")]444	fn set_nesting(445		&mut self,446		caller: caller,447		enable: bool,448		collections: Vec<address>,449	) -> Result<void> {450		self.consume_store_reads_and_writes(1, 1)?;451452		if collections.is_empty() {453			return Err("no addresses provided".into());454		}455		let caller = T::CrossAccountId::from_eth(caller);456457		let mut permissions = self.collection.permissions.clone();458		match enable {459			false => {460				let mut nesting = permissions.nesting().clone();461				nesting.token_owner = false;462				nesting.restricted = None;463				permissions.nesting = Some(nesting);464			}465			true => {466				let mut bv = OwnerRestrictedSet::new();467				for i in collections {468					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {469						Error::Revert("Can't convert address into collection id".into())470					})?)471					.map_err(|_| "too many collections")?;472				}473				let mut nesting = permissions.nesting().clone();474				nesting.token_owner = true;475				nesting.restricted = Some(bv);476				permissions.nesting = Some(nesting);477			}478		};479480		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)481	}482483	/// Returns nesting for a collection484	#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]485	fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {486		let nesting = self.collection.permissions.nesting();487488		Ok(eth::CollectionNesting::new(489			nesting.token_owner,490			nesting491				.restricted492				.clone()493				.map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())494				.unwrap_or_default(),495		))496	}497498	/// Returns permissions for a collection499	fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {500		let nesting = self.collection.permissions.nesting();501		Ok(vec![502			eth::CollectionNestingPermission::new(503				eth::CollectionPermissionField::CollectionAdmin,504				nesting.collection_admin,505			),506			eth::CollectionNestingPermission::new(507				eth::CollectionPermissionField::TokenOwner,508				nesting.token_owner,509			),510		])511	}512	/// Set the collection access method.513	/// @param mode Access mode514	/// 	0 for Normal515	/// 	1 for AllowList516	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {517		self.consume_store_reads_and_writes(1, 1)?;518519		let caller = T::CrossAccountId::from_eth(caller);520		let permissions = CollectionPermissions {521			access: Some(match mode {522				0 => AccessMode::Normal,523				1 => AccessMode::AllowList,524				_ => return Err("not supported access mode".into()),525			}),526			..Default::default()527		};528		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)529	}530531	/// Checks that user allowed to operate with collection.532	///533	/// @param user User address to check.534	fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {535		let user = user.into_sub_cross_account::<T>()?;536		Ok(Pallet::<T>::allowed(self.id, user))537	}538539	/// Add the user to the allowed list.540	///541	/// @param user Address of a trusted user.542	#[solidity(hide)]543	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {544		self.consume_store_writes(1)?;545546		let caller = T::CrossAccountId::from_eth(caller);547		let user = T::CrossAccountId::from_eth(user);548		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;549		Ok(())550	}551552	/// Add user to allowed list.553	///554	/// @param user User cross account address.555	fn add_to_collection_allow_list_cross(556		&mut self,557		caller: caller,558		user: eth::CrossAddress,559	) -> Result<void> {560		self.consume_store_writes(1)?;561562		let caller = T::CrossAccountId::from_eth(caller);563		let user = user.into_sub_cross_account::<T>()?;564		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;565		Ok(())566	}567568	/// Remove the user from the allowed list.569	///570	/// @param user Address of a removed user.571	#[solidity(hide)]572	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {573		self.consume_store_writes(1)?;574575		let caller = T::CrossAccountId::from_eth(caller);576		let user = T::CrossAccountId::from_eth(user);577		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;578		Ok(())579	}580581	/// Remove user from allowed list.582	///583	/// @param user User cross account address.584	fn remove_from_collection_allow_list_cross(585		&mut self,586		caller: caller,587		user: eth::CrossAddress,588	) -> Result<void> {589		self.consume_store_writes(1)?;590591		let caller = T::CrossAccountId::from_eth(caller);592		let user = user.into_sub_cross_account::<T>()?;593		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;594		Ok(())595	}596597	/// Switch permission for minting.598	///599	/// @param mode Enable if "true".600	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {601		self.consume_store_reads_and_writes(1, 1)?;602603		let caller = T::CrossAccountId::from_eth(caller);604		let permissions = CollectionPermissions {605			mint_mode: Some(mode),606			..Default::default()607		};608		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)609	}610611	/// Check that account is the owner or admin of the collection612	///613	/// @param user account to verify614	/// @return "true" if account is the owner or admin615	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]616	fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {617		let user = T::CrossAccountId::from_eth(user);618		Ok(self.is_owner_or_admin(&user))619	}620621	/// Check that account is the owner or admin of the collection622	///623	/// @param user User cross account to verify624	/// @return "true" if account is the owner or admin625	fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {626		let user = user.into_sub_cross_account::<T>()?;627		Ok(self.is_owner_or_admin(&user))628	}629630	/// Returns collection type631	///632	/// @return `Fungible` or `NFT` or `ReFungible`633	fn unique_collection_type(&self) -> Result<string> {634		let mode = match self.collection.mode {635			CollectionMode::Fungible(_) => "Fungible",636			CollectionMode::NFT => "NFT",637			CollectionMode::ReFungible => "ReFungible",638		};639		Ok(mode.into())640	}641642	/// Get collection owner.643	///644	/// @return Tuble with sponsor address and his substrate mirror.645	/// If address is canonical then substrate mirror is zero and vice versa.646	fn collection_owner(&self) -> Result<eth::CrossAddress> {647		Ok(eth::CrossAddress::from_sub_cross_account::<T>(648			&T::CrossAccountId::from_sub(self.owner.clone()),649		))650	}651652	/// Changes collection owner to another account653	///654	/// @dev Owner can be changed only by current owner655	/// @param newOwner new owner account656	#[solidity(hide, rename_selector = "changeCollectionOwner")]657	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {658		self.consume_store_writes(1)?;659660		let caller = T::CrossAccountId::from_eth(caller);661		let new_owner = T::CrossAccountId::from_eth(new_owner);662		self.change_owner(caller, new_owner)663			.map_err(dispatch_to_evm::<T>)664	}665666	/// Get collection administrators667	///668	/// @return Vector of tuples with admins address and his substrate mirror.669	/// If address is canonical then substrate mirror is zero and vice versa.670	fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {671		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))672			.map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))673			.collect();674		Ok(result)675	}676677	/// Changes collection owner to another account678	///679	/// @dev Owner can be changed only by current owner680	/// @param newOwner new owner cross account681	fn change_collection_owner_cross(682		&mut self,683		caller: caller,684		new_owner: eth::CrossAddress,685	) -> Result<void> {686		self.consume_store_writes(1)?;687688		let caller = T::CrossAccountId::from_eth(caller);689		let new_owner = new_owner.into_sub_cross_account::<T>()?;690		self.change_owner(caller, new_owner)691			.map_err(dispatch_to_evm::<T>)692	}693}694695/// Contains static property keys and values.696pub mod static_property {697	use evm_coder::{698		execution::{Result, Error},699	};700	use alloc::format;701702	const EXPECT_CONVERT_ERROR: &str = "length < limit";703704	/// Keys.705	pub mod key {706		use super::*;707708		/// Key "baseURI".709		pub fn base_uri() -> up_data_structs::PropertyKey {710			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)711		}712713		/// Key "url".714		pub fn url() -> up_data_structs::PropertyKey {715			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)716		}717718		/// Key "suffix".719		pub fn suffix() -> up_data_structs::PropertyKey {720			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)721		}722723		/// Key "parentNft".724		pub fn parent_nft() -> up_data_structs::PropertyKey {725			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)726		}727	}728729	/// Convert `byte` to [`PropertyKey`].730	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {731		bytes.to_vec().try_into().map_err(|_| {732			Error::Revert(format!(733				"Property key is too long. Max length is {}.",734				up_data_structs::PropertyKey::bound()735			))736		})737	}738739	/// Convert `bytes` to [`PropertyValue`].740	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {741		bytes.to_vec().try_into().map_err(|_| {742			Error::Revert(format!(743				"Property key is too long. Max length is {}.",744				up_data_structs::PropertyKey::bound()745			))746		})747	}748}
after · 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 evm_coder::{21	abi::AbiType,22	solidity_interface, solidity, ToLog,23	types::*,24	execution::{Result, Error},25	weight,26};27use pallet_evm_coder_substrate::dispatch_to_evm;28use sp_std::{vec, vec::Vec};29use up_data_structs::{30	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,31	SponsoringRateLimit, SponsorshipState,32};3334use crate::{35	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf, eth, weights::WeightInfo,36};3738/// Events for ethereum collection helper.39#[derive(ToLog)]40pub enum CollectionHelpersEvents {41	/// The collection has been created.42	CollectionCreated {43		/// Collection owner.44		#[indexed]45		owner: address,4647		/// Collection ID.48		#[indexed]49		collection_id: address,50	},51	/// The collection has been destroyed.52	CollectionDestroyed {53		/// Collection ID.54		#[indexed]55		collection_id: address,56	},57	/// The collection has been changed.58	CollectionChanged {59		/// Collection ID.60		#[indexed]61		collection_id: address,62	},6364	/// The token has been changed.65	TokenChanged {66		/// Collection ID.67		#[indexed]68		collection_id: address,69		/// Token ID.70		token_id: uint256,71	},72}7374/// Does not always represent a full collection, for RFT it is either75/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).76pub trait CommonEvmHandler {77	/// Raw compiled binary code of the contract stub78	const CODE: &'static [u8];7980	/// Call precompiled handle.81	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;82}8384/// @title A contract that allows you to work with collections.85#[solidity_interface(name = Collection)]86impl<T: Config> CollectionHandle<T>87where88	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,89{90	/// Set collection property.91	///92	/// @param key Property key.93	/// @param value Propery value.94	#[solidity(hide)]95	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]96	fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {97		let caller = T::CrossAccountId::from_eth(caller);98		let key = <Vec<u8>>::from(key)99			.try_into()100			.map_err(|_| "key too large")?;101		let value = value.0.try_into().map_err(|_| "value too large")?;102103		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })104			.map_err(dispatch_to_evm::<T>)105	}106107	/// Set collection properties.108	///109	/// @param properties Vector of properties key/value pair.110	#[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]111	fn set_collection_properties(112		&mut self,113		caller: caller,114		properties: Vec<eth::Property>,115	) -> Result<()> {116		let caller = T::CrossAccountId::from_eth(caller);117118		let properties = properties119			.into_iter()120			.map(eth::Property::try_into)121			.collect::<Result<Vec<_>>>()?;122123		<Pallet<T>>::set_collection_properties(self, &caller, properties.into_iter())124			.map_err(dispatch_to_evm::<T>)125	}126127	/// Delete collection property.128	///129	/// @param key Property key.130	#[solidity(hide)]131	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]132	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {133		let caller = T::CrossAccountId::from_eth(caller);134		let key = <Vec<u8>>::from(key)135			.try_into()136			.map_err(|_| "key too large")?;137138		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)139	}140141	/// Delete collection properties.142	///143	/// @param keys Properties keys.144	#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]145	fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {146		let caller = T::CrossAccountId::from_eth(caller);147		let keys = keys148			.into_iter()149			.map(|key| {150				<Vec<u8>>::from(key)151					.try_into()152					.map_err(|_| Error::Revert("key too large".into()))153			})154			.collect::<Result<Vec<_>>>()?;155156		<Pallet<T>>::delete_collection_properties(self, &caller, keys.into_iter())157			.map_err(dispatch_to_evm::<T>)158	}159160	/// Get collection property.161	///162	/// @dev Throws error if key not found.163	///164	/// @param key Property key.165	/// @return bytes The property corresponding to the key.166	fn collection_property(&self, key: string) -> Result<bytes> {167		let key = <Vec<u8>>::from(key)168			.try_into()169			.map_err(|_| "key too large")?;170171		let props = CollectionProperties::<T>::get(self.id);172		let prop = props.get(&key).ok_or("key not found")?;173174		Ok(bytes(prop.to_vec()))175	}176177	/// Get collection properties.178	///179	/// @param keys Properties keys. Empty keys for all propertyes.180	/// @return Vector of properties key/value pairs.181	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<eth::Property>> {182		let keys = keys183			.into_iter()184			.map(|key| {185				<Vec<u8>>::from(key)186					.try_into()187					.map_err(|_| Error::Revert("key too large".into()))188			})189			.collect::<Result<Vec<_>>>()?;190191		let properties = Pallet::<T>::filter_collection_properties(192			self.id,193			if keys.is_empty() { None } else { Some(keys) },194		)195		.map_err(dispatch_to_evm::<T>)?;196197		let properties = properties198			.into_iter()199			.map(Property::try_into)200			.collect::<Result<Vec<_>>>()?;201		Ok(properties)202	}203204	/// Set the sponsor of the collection.205	///206	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.207	///208	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.209	#[solidity(hide)]210	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<()> {211		self.consume_store_reads_and_writes(1, 1)?;212213		let caller = T::CrossAccountId::from_eth(caller);214215		let sponsor = T::CrossAccountId::from_eth(sponsor);216		self.set_sponsor(&caller, sponsor.as_sub().clone())217			.map_err(dispatch_to_evm::<T>)218	}219220	/// Set the sponsor of the collection.221	///222	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.223	///224	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.225	fn set_collection_sponsor_cross(226		&mut self,227		caller: caller,228		sponsor: eth::CrossAddress,229	) -> Result<()> {230		self.consume_store_reads_and_writes(1, 1)?;231232		let caller = T::CrossAccountId::from_eth(caller);233234		let sponsor = sponsor.into_sub_cross_account::<T>()?;235		self.set_sponsor(&caller, sponsor.as_sub().clone())236			.map_err(dispatch_to_evm::<T>)237	}238239	/// Whether there is a pending sponsor.240	fn has_collection_pending_sponsor(&self) -> Result<bool> {241		Ok(matches!(242			self.collection.sponsorship,243			SponsorshipState::Unconfirmed(_)244		))245	}246247	/// Collection sponsorship confirmation.248	///249	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.250	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<()> {251		self.consume_store_writes(1)?;252253		let caller = T::CrossAccountId::from_eth(caller);254		self.confirm_sponsorship(caller.as_sub())255			.map_err(dispatch_to_evm::<T>)256	}257258	/// Remove collection sponsor.259	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<()> {260		self.consume_store_reads_and_writes(1, 1)?;261		let caller = T::CrossAccountId::from_eth(caller);262		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)263	}264265	/// Get current sponsor.266	///267	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.268	fn collection_sponsor(&self) -> Result<eth::CrossAddress> {269		let sponsor = match self.collection.sponsorship.sponsor() {270			Some(sponsor) => sponsor,271			None => return Ok(Default::default()),272		};273274		Ok(eth::CrossAddress::from_sub::<T>(&sponsor))275	}276277	/// Get current collection limits.278	///279	/// @return Array of collection limits280	fn collection_limits(&self) -> Result<Vec<eth::CollectionLimit>> {281		let limits = &self.collection.limits;282283		let convert_value_from_bool = |ob: Option<bool>| match ob {284			Some(b) => Some(b as u32),285			None => None,286		};287288		Ok(vec![289			eth::CollectionLimit::new(290				eth::CollectionLimitField::AccountTokenOwnership,291				limits.account_token_ownership_limit,292			),293			eth::CollectionLimit::new(294				eth::CollectionLimitField::SponsoredDataSize,295				limits.sponsored_data_size,296			),297			limits298				.sponsored_data_rate_limit299				.and_then(|limit| {300					if let SponsoringRateLimit::Blocks(blocks) = limit {301						Some(eth::CollectionLimit::new(302							eth::CollectionLimitField::SponsoredDataRateLimit,303							Some(blocks),304						))305					} else {306						None307					}308				})309				.unwrap_or(eth::CollectionLimit::new(310					eth::CollectionLimitField::SponsoredDataRateLimit,311					Default::default(),312				)),313			eth::CollectionLimit::new(eth::CollectionLimitField::TokenLimit, limits.token_limit),314			eth::CollectionLimit::new(315				eth::CollectionLimitField::SponsorTransferTimeout,316				limits.sponsor_transfer_timeout,317			),318			eth::CollectionLimit::new(319				eth::CollectionLimitField::SponsorApproveTimeout,320				limits.sponsor_approve_timeout,321			),322			eth::CollectionLimit::new(323				eth::CollectionLimitField::OwnerCanTransfer,324				convert_value_from_bool(limits.owner_can_transfer),325			),326			eth::CollectionLimit::new(327				eth::CollectionLimitField::OwnerCanDestroy,328				convert_value_from_bool(limits.owner_can_destroy),329			),330			eth::CollectionLimit::new(331				eth::CollectionLimitField::TransferEnabled,332				convert_value_from_bool(limits.transfers_enabled),333			),334		])335	}336337	/// Set limits for the collection.338	/// @dev Throws error if limit not found.339	/// @param limit Some limit.340	#[solidity(rename_selector = "setCollectionLimit")]341	fn set_collection_limit(&mut self, caller: caller, limit: eth::CollectionLimit) -> Result<()> {342		self.consume_store_reads_and_writes(1, 1)?;343344		if !limit.has_value() {345			return Err(Error::Revert("user can't disable limits".into()));346		}347348		let caller = T::CrossAccountId::from_eth(caller);349		<Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)350	}351352	/// Get contract address.353	fn contract_address(&self) -> Result<address> {354		Ok(crate::eth::collection_id_to_address(self.id))355	}356357	/// Add collection admin.358	/// @param newAdmin Cross account administrator address.359	fn add_collection_admin_cross(360		&mut self,361		caller: caller,362		new_admin: eth::CrossAddress,363	) -> Result<()> {364		self.consume_store_reads_and_writes(2, 2)?;365366		let caller = T::CrossAccountId::from_eth(caller);367		let new_admin = new_admin.into_sub_cross_account::<T>()?;368		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;369		Ok(())370	}371372	/// Remove collection admin.373	/// @param admin Cross account administrator address.374	fn remove_collection_admin_cross(375		&mut self,376		caller: caller,377		admin: eth::CrossAddress,378	) -> Result<()> {379		self.consume_store_reads_and_writes(2, 2)?;380381		let caller = T::CrossAccountId::from_eth(caller);382		let admin = admin.into_sub_cross_account::<T>()?;383		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;384		Ok(())385	}386387	/// Add collection admin.388	/// @param newAdmin Address of the added administrator.389	#[solidity(hide)]390	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<()> {391		self.consume_store_reads_and_writes(2, 2)?;392393		let caller = T::CrossAccountId::from_eth(caller);394		let new_admin = T::CrossAccountId::from_eth(new_admin);395		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;396		Ok(())397	}398399	/// Remove collection admin.400	///401	/// @param admin Address of the removed administrator.402	#[solidity(hide)]403	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<()> {404		self.consume_store_reads_and_writes(2, 2)?;405406		let caller = T::CrossAccountId::from_eth(caller);407		let admin = T::CrossAccountId::from_eth(admin);408		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;409		Ok(())410	}411412	/// Toggle accessibility of collection nesting.413	///414	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'415	#[solidity(rename_selector = "setCollectionNesting")]416	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<()> {417		self.consume_store_reads_and_writes(1, 1)?;418419		let caller = T::CrossAccountId::from_eth(caller);420421		let mut permissions = self.collection.permissions.clone();422		let mut nesting = permissions.nesting().clone();423		nesting.token_owner = enable;424		nesting.restricted = None;425		permissions.nesting = Some(nesting);426427		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)428	}429430	/// Toggle accessibility of collection nesting.431	///432	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'433	/// @param collections Addresses of collections that will be available for nesting.434	#[solidity(rename_selector = "setCollectionNesting")]435	fn set_nesting(436		&mut self,437		caller: caller,438		enable: bool,439		collections: Vec<address>,440	) -> Result<()> {441		self.consume_store_reads_and_writes(1, 1)?;442443		if collections.is_empty() {444			return Err("no addresses provided".into());445		}446		let caller = T::CrossAccountId::from_eth(caller);447448		let mut permissions = self.collection.permissions.clone();449		match enable {450			false => {451				let mut nesting = permissions.nesting().clone();452				nesting.token_owner = false;453				nesting.restricted = None;454				permissions.nesting = Some(nesting);455			}456			true => {457				let mut bv = OwnerRestrictedSet::new();458				for i in collections {459					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {460						Error::Revert("Can't convert address into collection id".into())461					})?)462					.map_err(|_| "too many collections")?;463				}464				let mut nesting = permissions.nesting().clone();465				nesting.token_owner = true;466				nesting.restricted = Some(bv);467				permissions.nesting = Some(nesting);468			}469		};470471		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)472	}473474	/// Returns nesting for a collection475	#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]476	fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {477		let nesting = self.collection.permissions.nesting();478479		Ok(eth::CollectionNesting::new(480			nesting.token_owner,481			nesting482				.restricted483				.clone()484				.map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())485				.unwrap_or_default(),486		))487	}488489	/// Returns permissions for a collection490	fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {491		let nesting = self.collection.permissions.nesting();492		Ok(vec![493			eth::CollectionNestingPermission::new(494				eth::CollectionPermissionField::CollectionAdmin,495				nesting.collection_admin,496			),497			eth::CollectionNestingPermission::new(498				eth::CollectionPermissionField::TokenOwner,499				nesting.token_owner,500			),501		])502	}503	/// Set the collection access method.504	/// @param mode Access mode505	/// 	0 for Normal506	/// 	1 for AllowList507	fn set_collection_access(&mut self, caller: caller, mode: u8) -> Result<()> {508		self.consume_store_reads_and_writes(1, 1)?;509510		let caller = T::CrossAccountId::from_eth(caller);511		let permissions = CollectionPermissions {512			access: Some(match mode {513				0 => AccessMode::Normal,514				1 => AccessMode::AllowList,515				_ => return Err("not supported access mode".into()),516			}),517			..Default::default()518		};519		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)520	}521522	/// Checks that user allowed to operate with collection.523	///524	/// @param user User address to check.525	fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {526		let user = user.into_sub_cross_account::<T>()?;527		Ok(Pallet::<T>::allowed(self.id, user))528	}529530	/// Add the user to the allowed list.531	///532	/// @param user Address of a trusted user.533	#[solidity(hide)]534	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> {535		self.consume_store_writes(1)?;536537		let caller = T::CrossAccountId::from_eth(caller);538		let user = T::CrossAccountId::from_eth(user);539		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;540		Ok(())541	}542543	/// Add user to allowed list.544	///545	/// @param user User cross account address.546	fn add_to_collection_allow_list_cross(547		&mut self,548		caller: caller,549		user: eth::CrossAddress,550	) -> Result<()> {551		self.consume_store_writes(1)?;552553		let caller = T::CrossAccountId::from_eth(caller);554		let user = user.into_sub_cross_account::<T>()?;555		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;556		Ok(())557	}558559	/// Remove the user from the allowed list.560	///561	/// @param user Address of a removed user.562	#[solidity(hide)]563	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> {564		self.consume_store_writes(1)?;565566		let caller = T::CrossAccountId::from_eth(caller);567		let user = T::CrossAccountId::from_eth(user);568		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;569		Ok(())570	}571572	/// Remove user from allowed list.573	///574	/// @param user User cross account address.575	fn remove_from_collection_allow_list_cross(576		&mut self,577		caller: caller,578		user: eth::CrossAddress,579	) -> Result<()> {580		self.consume_store_writes(1)?;581582		let caller = T::CrossAccountId::from_eth(caller);583		let user = user.into_sub_cross_account::<T>()?;584		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;585		Ok(())586	}587588	/// Switch permission for minting.589	///590	/// @param mode Enable if "true".591	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<()> {592		self.consume_store_reads_and_writes(1, 1)?;593594		let caller = T::CrossAccountId::from_eth(caller);595		let permissions = CollectionPermissions {596			mint_mode: Some(mode),597			..Default::default()598		};599		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)600	}601602	/// Check that account is the owner or admin of the collection603	///604	/// @param user account to verify605	/// @return "true" if account is the owner or admin606	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]607	fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {608		let user = T::CrossAccountId::from_eth(user);609		Ok(self.is_owner_or_admin(&user))610	}611612	/// Check that account is the owner or admin of the collection613	///614	/// @param user User cross account to verify615	/// @return "true" if account is the owner or admin616	fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {617		let user = user.into_sub_cross_account::<T>()?;618		Ok(self.is_owner_or_admin(&user))619	}620621	/// Returns collection type622	///623	/// @return `Fungible` or `NFT` or `ReFungible`624	fn unique_collection_type(&self) -> Result<string> {625		let mode = match self.collection.mode {626			CollectionMode::Fungible(_) => "Fungible",627			CollectionMode::NFT => "NFT",628			CollectionMode::ReFungible => "ReFungible",629		};630		Ok(mode.into())631	}632633	/// Get collection owner.634	///635	/// @return Tuble with sponsor address and his substrate mirror.636	/// If address is canonical then substrate mirror is zero and vice versa.637	fn collection_owner(&self) -> Result<eth::CrossAddress> {638		Ok(eth::CrossAddress::from_sub_cross_account::<T>(639			&T::CrossAccountId::from_sub(self.owner.clone()),640		))641	}642643	/// Changes collection owner to another account644	///645	/// @dev Owner can be changed only by current owner646	/// @param newOwner new owner account647	#[solidity(hide, rename_selector = "changeCollectionOwner")]648	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<()> {649		self.consume_store_writes(1)?;650651		let caller = T::CrossAccountId::from_eth(caller);652		let new_owner = T::CrossAccountId::from_eth(new_owner);653		self.change_owner(caller, new_owner)654			.map_err(dispatch_to_evm::<T>)655	}656657	/// Get collection administrators658	///659	/// @return Vector of tuples with admins address and his substrate mirror.660	/// If address is canonical then substrate mirror is zero and vice versa.661	fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {662		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))663			.map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))664			.collect();665		Ok(result)666	}667668	/// Changes collection owner to another account669	///670	/// @dev Owner can be changed only by current owner671	/// @param newOwner new owner cross account672	fn change_collection_owner_cross(673		&mut self,674		caller: caller,675		new_owner: eth::CrossAddress,676	) -> Result<()> {677		self.consume_store_writes(1)?;678679		let caller = T::CrossAccountId::from_eth(caller);680		let new_owner = new_owner.into_sub_cross_account::<T>()?;681		self.change_owner(caller, new_owner)682			.map_err(dispatch_to_evm::<T>)683	}684}685686/// Contains static property keys and values.687pub mod static_property {688	use evm_coder::{689		execution::{Result, Error},690	};691	use alloc::format;692693	const EXPECT_CONVERT_ERROR: &str = "length < limit";694695	/// Keys.696	pub mod key {697		use super::*;698699		/// Key "baseURI".700		pub fn base_uri() -> up_data_structs::PropertyKey {701			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)702		}703704		/// Key "url".705		pub fn url() -> up_data_structs::PropertyKey {706			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)707		}708709		/// Key "suffix".710		pub fn suffix() -> up_data_structs::PropertyKey {711			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)712		}713714		/// Key "parentNft".715		pub fn parent_nft() -> up_data_structs::PropertyKey {716			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)717		}718	}719720	/// Convert `byte` to [`PropertyKey`].721	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {722		bytes.to_vec().try_into().map_err(|_| {723			Error::Revert(format!(724				"Property key is too long. Max length is {}.",725				up_data_structs::PropertyKey::bound()726			))727		})728	}729730	/// Convert `bytes` to [`PropertyValue`].731	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {732		bytes.to_vec().try_into().map_err(|_| {733			Error::Revert(format!(734				"Property key is too long. Max length is {}.",735				up_data_structs::PropertyKey::bound()736			))737		})738	}739}
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -108,7 +108,7 @@
 		caller: caller,
 		contract_address: address,
 		sponsor: address,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -125,7 +125,7 @@
 	/// Set contract as self sponsored.
 	///
 	/// @param contractAddress Contract for which a self sponsoring is being enabled.
-	fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {
+	fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -146,7 +146,7 @@
 	/// Remove sponsor.
 	///
 	/// @param contractAddress Contract for which a sponsorship is being removed.
-	fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {
+	fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -161,7 +161,7 @@
 	/// @dev Caller must be same that set via [`setSponsor`].
 	///
 	/// @param contractAddress Сontract for which need to confirm sponsorship.
-	fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {
+	fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -210,7 +210,7 @@
 		caller: caller,
 		contract_address: address,
 		mode: SponsoringModeT,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -223,7 +223,7 @@
 	/// Get current contract sponsoring rate limit
 	/// @param contractAddress Contract to get sponsoring rate limit of
 	/// @return uint32 Amount of blocks between two sponsored transactions
-	fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {
+	fn sponsoring_rate_limit(&self, contract_address: address) -> Result<u32> {
 		self.recorder().consume_sload()?;
 
 		Ok(<SponsoringRateLimit<T>>::get(contract_address)
@@ -241,8 +241,8 @@
 		&mut self,
 		caller: caller,
 		contract_address: address,
-		rate_limit: uint32,
-	) -> Result<void> {
+		rate_limit: u32,
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -262,7 +262,7 @@
 		caller: caller,
 		contract_address: address,
 		fee_limit: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -304,7 +304,7 @@
 		contract_address: address,
 		user: address,
 		is_allowed: bool,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
@@ -332,7 +332,7 @@
 		caller: caller,
 		contract_address: address,
 		enabled: bool,
-	) -> Result<void> {
+	) -> Result<()> {
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -72,7 +72,7 @@
 		Ok(<TotalSupply<T>>::get(self.id).into())
 	}
 
-	fn decimals(&self) -> Result<uint8> {
+	fn decimals(&self) -> Result<u8> {
 		Ok(if let CollectionMode::Fungible(decimals) = &self.mode {
 			*decimals
 		} else {
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -423,7 +423,7 @@
 		_to: address,
 		_token_id: uint256,
 		_data: bytes,
-	) -> Result<void> {
+	) -> Result<()> {
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
@@ -433,7 +433,7 @@
 		_from: address,
 		_to: address,
 		_token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
@@ -454,7 +454,7 @@
 		from: address,
 		to: address,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = T::CrossAccountId::from_eth(from);
 		let to = T::CrossAccountId::from_eth(to);
@@ -475,7 +475,7 @@
 	/// @param approved The new approved NFT controller
 	/// @param tokenId The NFT to approve
 	#[weight(<SelfWeightOf<T>>::approve())]
-	fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<void> {
+	fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let approved = T::CrossAccountId::from_eth(approved);
 		let token = token_id.try_into()?;
@@ -495,7 +495,7 @@
 		caller: caller,
 		operator: address,
 		approved: bool,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let operator = T::CrossAccountId::from_eth(operator);
 
@@ -528,7 +528,7 @@
 	///  operator of the current owner.
 	/// @param tokenId The NFT to approve
 	#[weight(<SelfWeightOf<T>>::burn_item())]
-	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {
+	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let token = token_id.try_into()?;
 
@@ -773,7 +773,7 @@
 		caller: caller,
 		approved: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let approved = approved.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
@@ -789,7 +789,7 @@
 	/// @param to The new owner
 	/// @param tokenId The NFT to transfer
 	#[weight(<SelfWeightOf<T>>::transfer())]
-	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {
+	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let token = token_id.try_into()?;
@@ -812,7 +812,7 @@
 		caller: caller,
 		to: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = to.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
@@ -837,7 +837,7 @@
 		from: eth::CrossAddress,
 		to: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = from.into_sub_cross_account::<T>()?;
 		let to = to.into_sub_cross_account::<T>()?;
@@ -858,7 +858,7 @@
 	/// @param tokenId The NFT to transfer
 	#[solidity(hide)]
 	#[weight(<SelfWeightOf<T>>::burn_from())]
-	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {
+	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = T::CrossAccountId::from_eth(from);
 		let token = token_id.try_into()?;
@@ -883,7 +883,7 @@
 		caller: caller,
 		from: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = from.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -424,7 +424,7 @@
 		_to: address,
 		_token_id: uint256,
 		_data: bytes,
-	) -> Result<void> {
+	) -> Result<()> {
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
@@ -436,7 +436,7 @@
 		_from: address,
 		_to: address,
 		_token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
@@ -458,7 +458,7 @@
 		from: address,
 		to: address,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = T::CrossAccountId::from_eth(from);
 		let to = T::CrossAccountId::from_eth(to);
@@ -477,7 +477,7 @@
 	}
 
 	/// @dev Not implemented
-	fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<void> {
+	fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<()> {
 		Err("not implemented".into())
 	}
 
@@ -491,7 +491,7 @@
 		caller: caller,
 		operator: address,
 		approved: bool,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let operator = T::CrossAccountId::from_eth(operator);
 
@@ -556,7 +556,7 @@
 	///  operator of the current owner.
 	/// @param tokenId The RFT to approve
 	#[weight(<SelfWeightOf<T>>::burn_item_fully())]
-	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {
+	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let token = token_id.try_into()?;
 
@@ -805,7 +805,7 @@
 	/// @param to The new owner
 	/// @param tokenId The RFT to transfer
 	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]
-	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {
+	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let token = token_id.try_into()?;
@@ -833,7 +833,7 @@
 		caller: caller,
 		to: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = to.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
@@ -862,7 +862,7 @@
 		from: eth::CrossAddress,
 		to: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = from.into_sub_cross_account::<T>()?;
 		let to = to.into_sub_cross_account::<T>()?;
@@ -888,7 +888,7 @@
 	/// @param tokenId The RFT to transfer
 	#[solidity(hide)]
 	#[weight(<SelfWeightOf<T>>::burn_from())]
-	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {
+	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = T::CrossAccountId::from_eth(from);
 		let token = token_id.try_into()?;
@@ -917,7 +917,7 @@
 		caller: caller,
 		from: eth::CrossAddress,
 		token_id: uint256,
-	) -> Result<void> {
+	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let from = from.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
modifiedpallets/refungible/src/erc_token.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -109,7 +109,7 @@
 	}
 
 	/// @dev Not supported
-	fn decimals(&self) -> Result<uint8> {
+	fn decimals(&self) -> Result<u8> {
 		// Decimals aren't supported for refungible tokens
 		Ok(0)
 	}
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -231,7 +231,7 @@
 		caller: caller,
 		value: value,
 		name: string,
-		decimals: uint8,
+		decimals: u8,
 		description: string,
 		token_prefix: string,
 	) -> Result<address> {
@@ -334,7 +334,7 @@
 	}
 
 	#[weight(<SelfWeightOf<T>>::destroy_collection())]
-	fn destroy_collection(&mut self, caller: caller, collection_address: address) -> Result<void> {
+	fn destroy_collection(&mut self, caller: caller, collection_address: address) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 
 		let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)
@@ -366,14 +366,14 @@
 	/// Returns address of a collection.
 	/// @param collectionId  - CollectionId  of the collection
 	/// @return eth mirror address of the collection
-	fn collection_address(&self, collection_id: uint32) -> Result<address> {
+	fn collection_address(&self, collection_id: u32) -> Result<address> {
 		Ok(collection_id_to_address(collection_id.into()))
 	}
 
 	/// Returns collectionId of a collection.
 	/// @param collectionAddress  - Eth address of the collection
 	/// @return collectionId of the collection
-	fn collection_id(&self, collection_address: address) -> Result<uint32> {
+	fn collection_id(&self, collection_address: address) -> Result<u32> {
 		map_eth_to_id(&collection_address)
 			.map(|id| id.0)
 			.ok_or(Error::Revert(format!(