git.delta.rocks / unique-network / refs/commits / 9e201d9e49be

difftreelog

Cargo fmt

Trubnikov Sergey2022-06-03parent: #85427bc.patch.diff
in: master

3 files changed

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/>.1617use evm_coder::{18	solidity_interface, solidity, ToLog,19	types::*,20	execution::{Result, Error},21};22pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};23use pallet_evm_coder_substrate::dispatch_to_evm;24use sp_core::{H160, U256, H256};25use sp_std::vec::Vec;26use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};27use alloc::format;2829use crate::{Pallet, CollectionHandle, Config, CollectionProperties};3031#[derive(ToLog)]32pub enum CollectionHelpersEvents {33	CollectionCreated {34		#[indexed]35		owner: address,36		#[indexed]37		collection_id: address,38	},39}4041/// Does not always represent a full collection, for RFT it is either42/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)43pub trait CommonEvmHandler {44	const CODE: &'static [u8];4546	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;47}4849#[solidity_interface(name = "Collection")]50impl<T: Config> CollectionHandle<T> 51// where 52// 	T::AccountId: From<H256>53{54	fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {55		let caller = T::CrossAccountId::from_eth(caller);56		let key = <Vec<u8>>::from(key)57			.try_into()58			.map_err(|_| "key too large")?;59		let value = value.try_into().map_err(|_| "value too large")?;6061		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })62			.map_err(dispatch_to_evm::<T>)63	}6465	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {66		let caller = T::CrossAccountId::from_eth(caller);67		let key = <Vec<u8>>::from(key)68			.try_into()69			.map_err(|_| "key too large")?;7071		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)72	}7374	/// Throws error if key not found75	fn collection_property(&self, key: string) -> Result<bytes> {76		let key = <Vec<u8>>::from(key)77			.try_into()78			.map_err(|_| "key too large")?;7980		let props = <CollectionProperties<T>>::get(self.id);81		let prop = props.get(&key).ok_or("key not found")?;8283		Ok(prop.to_vec())84	}8586	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {87		check_is_owner(caller, self)?;8889		let sponsor = T::CrossAccountId::from_eth(sponsor);90		self.set_sponsor(sponsor.as_sub().clone());91		save(self);92		Ok(())93	}9495	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {96		let caller = T::CrossAccountId::from_eth(caller);97		if !self.confirm_sponsorship(caller.as_sub()) {98			return Err(Error::Revert("Caller is not set as sponsor".into()));99		}100		save(self);101		Ok(())102	}103104	#[solidity(rename_selector = "setCollectionLimit")]105	fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {106		check_is_owner(caller, self)?;107		let mut limits = self.limits.clone();108109		match limit.as_str() {110			"accountTokenOwnershipLimit" => {111				limits.account_token_ownership_limit = Some(value);112			}113			"sponsoredDataSize" => {114				limits.sponsored_data_size = Some(value);115			}116			"sponsoredDataRateLimit" => {117				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));118			}119			"tokenLimit" => {120				limits.token_limit = Some(value);121			}122			"sponsorTransferTimeout" => {123				limits.sponsor_transfer_timeout = Some(value);124			}125			"sponsorApproveTimeout" => {126				limits.sponsor_approve_timeout = Some(value);127			}128			_ => {129				return Err(Error::Revert(format!(130					"Unknown integer limit \"{}\"",131					limit132				)))133			}134		}135		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)136			.map_err(dispatch_to_evm::<T>)?;137		save(self);138		Ok(())139	}140141	#[solidity(rename_selector = "setCollectionLimit")]142	fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {143		check_is_owner(caller, self)?;144		let mut limits = self.limits.clone();145146		match limit.as_str() {147			"ownerCanTransfer" => {148				limits.owner_can_transfer = Some(value);149			}150			"ownerCanDestroy" => {151				limits.owner_can_destroy = Some(value);152			}153			"transfersEnabled" => {154				limits.transfers_enabled = Some(value);155			}156			_ => {157				return Err(Error::Revert(format!(158					"Unknown boolean limit \"{}\"",159					limit160				)))161			}162		}163		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)164			.map_err(dispatch_to_evm::<T>)?;165		save(self);166		Ok(())167	}168169	fn contract_address(&self, _caller: caller) -> Result<address> {170		Ok(crate::eth::collection_id_to_address(self.id))171	}172173	// fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {174	// 	let mut new_admin_h256 = H256::default();175	// 	new_admin.to_little_endian(&mut new_admin_h256.0);176	// 	let account_id = T::AccountId::from(new_admin_h256);177	// 	let caller = T::CrossAccountId::from_eth(caller);178	// 	let new_admin = T::CrossAccountId::from_sub(account_id);179	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)180	// 		.map_err(dispatch_to_evm::<T>)?;181	// 	Ok(())182	// }183184	// fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {185	// 	let mut new_admin_h256 = H256::default();186	// 	new_admin.to_little_endian(&mut new_admin_h256.0);187	// 	let account_id = T::AccountId::from(new_admin_h256);188	// 	let caller = T::CrossAccountId::from_eth(caller);189	// 	let new_admin = T::CrossAccountId::from_sub(account_id);190	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)191	// 		.map_err(dispatch_to_evm::<T>)?;192	// 	Ok(())193	// }194195	fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {196		let caller = T::CrossAccountId::from_eth(caller);197		self.check_is_owner_or_admin(&caller)198			.map_err(dispatch_to_evm::<T>)?;199		let new_admin = T::CrossAccountId::from_eth(new_admin);200		<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)201			.map_err(dispatch_to_evm::<T>)?;202		Ok(())203	}204205	fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {206		let caller = T::CrossAccountId::from_eth(caller);207		self.check_is_owner_or_admin(&caller)208			.map_err(dispatch_to_evm::<T>)?;209		let admin = T::CrossAccountId::from_eth(admin);210		<Pallet<T>>::toggle_admin(&self, &caller, &admin, false)211			.map_err(dispatch_to_evm::<T>)?;212		Ok(())213	}214215	#[solidity(rename_selector = "setCollectionNesting")]216	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {217		let caller = T::CrossAccountId::from_eth(caller);218		self.check_is_owner_or_admin(&caller)219			.map_err(dispatch_to_evm::<T>)?;220		self.collection.permissions.nesting = Some(match enable {221			false => NestingRule::Disabled,222			true => NestingRule::Owner,223		});224		save(self);225		Ok(())226	}227228	#[solidity(rename_selector = "setCollectionNesting")]229	fn set_nesting(&mut self, caller: caller, enable: bool, collections: Vec<address>) -> Result<void> {230		if collections.is_empty() {231			return Err("No addresses provided".into());232		}233		if collections.len() >= OwnerRestrictedSet::bound() {234			return Err(Error::Revert(format!("Out of bound: {} >= {}", collections.len(), OwnerRestrictedSet::bound())));235		}236		let caller = T::CrossAccountId::from_eth(caller);237		self.check_is_owner_or_admin(&caller)238			.map_err(dispatch_to_evm::<T>)?;239		self.collection.permissions.nesting = Some(match enable {240			false => NestingRule::Disabled,241			true => {242				let mut bv = OwnerRestrictedSet::new();243				for i in collections {244					bv.try_insert(245						crate::eth::map_eth_to_id(&i)246							.ok_or(Error::Revert("Can't convert address into collection id".into()))?247					).map_err(|e| Error::Revert(format!("{:?}", e)))?;248				}249				NestingRule::OwnerRestricted (bv)250			}251		});252		save(self);253		Ok(())254	}255256	fn set_collection_access(&mut self, caller: caller, mode: string) -> Result<void> {257		let caller = T::CrossAccountId::from_eth(caller);258		self.check_is_owner_or_admin(&caller)259			.map_err(dispatch_to_evm::<T>)?;260		self.collection.permissions.access = Some(match mode.as_str() {261			"Normal" => AccessMode::Normal,262			"AllowList" => AccessMode::AllowList,263			_ => return Err("Not supported access mode".into()),264		});265		save(self);266		Ok(())267	}268269	fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {270		let caller = check_is_owner_or_admin(caller, self)?;271		let user = T::CrossAccountId::from_eth(user);272		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true)273			.map_err(dispatch_to_evm::<T>)?;274		Ok(())275	}276277	fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {278		let caller = check_is_owner_or_admin(caller, self)?;279		let user = T::CrossAccountId::from_eth(user);280		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false)281			.map_err(dispatch_to_evm::<T>)?;282		Ok(())283	}284285	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {286		check_is_owner_or_admin(caller, self)?;287		self.collection.permissions.mint_mode = Some(mode);288		save(self);289		Ok(())290	}291}292293fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<()> {294	let caller = T::CrossAccountId::from_eth(caller);295	collection296		.check_is_owner(&caller)297		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;298	Ok(())299}300301fn check_is_owner_or_admin<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<T::CrossAccountId> {302	let caller = T::CrossAccountId::from_eth(caller);303	collection304		.check_is_owner_or_admin(&caller)305		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;306	Ok(caller)307}308309fn save<T: Config>(collection: &CollectionHandle<T>) {310	<crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());311}312313pub fn token_uri_key() -> up_data_structs::PropertyKey {314	b"tokenURI"315		.to_vec()316		.try_into()317		.expect("length < limit; qed")318}
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/>.1617use evm_coder::{18	solidity_interface, solidity, ToLog,19	types::*,20	execution::{Result, Error},21};22pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};23use pallet_evm_coder_substrate::dispatch_to_evm;24use sp_core::{H160, U256, H256};25use sp_std::vec::Vec;26use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};27use alloc::format;2829use crate::{Pallet, CollectionHandle, Config, CollectionProperties};3031#[derive(ToLog)]32pub enum CollectionHelpersEvents {33	CollectionCreated {34		#[indexed]35		owner: address,36		#[indexed]37		collection_id: address,38	},39}4041/// Does not always represent a full collection, for RFT it is either42/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)43pub trait CommonEvmHandler {44	const CODE: &'static [u8];4546	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;47}4849#[solidity_interface(name = "Collection")]50impl<T: Config> CollectionHandle<T>51// where52// 	T::AccountId: From<H256>53{54	fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {55		let caller = T::CrossAccountId::from_eth(caller);56		let key = <Vec<u8>>::from(key)57			.try_into()58			.map_err(|_| "key too large")?;59		let value = value.try_into().map_err(|_| "value too large")?;6061		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })62			.map_err(dispatch_to_evm::<T>)63	}6465	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {66		let caller = T::CrossAccountId::from_eth(caller);67		let key = <Vec<u8>>::from(key)68			.try_into()69			.map_err(|_| "key too large")?;7071		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)72	}7374	/// Throws error if key not found75	fn collection_property(&self, key: string) -> Result<bytes> {76		let key = <Vec<u8>>::from(key)77			.try_into()78			.map_err(|_| "key too large")?;7980		let props = <CollectionProperties<T>>::get(self.id);81		let prop = props.get(&key).ok_or("key not found")?;8283		Ok(prop.to_vec())84	}8586	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {87		check_is_owner(caller, self)?;8889		let sponsor = T::CrossAccountId::from_eth(sponsor);90		self.set_sponsor(sponsor.as_sub().clone());91		save(self);92		Ok(())93	}9495	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {96		let caller = T::CrossAccountId::from_eth(caller);97		if !self.confirm_sponsorship(caller.as_sub()) {98			return Err(Error::Revert("Caller is not set as sponsor".into()));99		}100		save(self);101		Ok(())102	}103104	#[solidity(rename_selector = "setCollectionLimit")]105	fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {106		check_is_owner(caller, self)?;107		let mut limits = self.limits.clone();108109		match limit.as_str() {110			"accountTokenOwnershipLimit" => {111				limits.account_token_ownership_limit = Some(value);112			}113			"sponsoredDataSize" => {114				limits.sponsored_data_size = Some(value);115			}116			"sponsoredDataRateLimit" => {117				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));118			}119			"tokenLimit" => {120				limits.token_limit = Some(value);121			}122			"sponsorTransferTimeout" => {123				limits.sponsor_transfer_timeout = Some(value);124			}125			"sponsorApproveTimeout" => {126				limits.sponsor_approve_timeout = Some(value);127			}128			_ => {129				return Err(Error::Revert(format!(130					"Unknown integer limit \"{}\"",131					limit132				)))133			}134		}135		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)136			.map_err(dispatch_to_evm::<T>)?;137		save(self);138		Ok(())139	}140141	#[solidity(rename_selector = "setCollectionLimit")]142	fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {143		check_is_owner(caller, self)?;144		let mut limits = self.limits.clone();145146		match limit.as_str() {147			"ownerCanTransfer" => {148				limits.owner_can_transfer = Some(value);149			}150			"ownerCanDestroy" => {151				limits.owner_can_destroy = Some(value);152			}153			"transfersEnabled" => {154				limits.transfers_enabled = Some(value);155			}156			_ => {157				return Err(Error::Revert(format!(158					"Unknown boolean limit \"{}\"",159					limit160				)))161			}162		}163		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)164			.map_err(dispatch_to_evm::<T>)?;165		save(self);166		Ok(())167	}168169	fn contract_address(&self, _caller: caller) -> Result<address> {170		Ok(crate::eth::collection_id_to_address(self.id))171	}172173	// fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {174	// 	let mut new_admin_h256 = H256::default();175	// 	new_admin.to_little_endian(&mut new_admin_h256.0);176	// 	let account_id = T::AccountId::from(new_admin_h256);177	// 	let caller = T::CrossAccountId::from_eth(caller);178	// 	let new_admin = T::CrossAccountId::from_sub(account_id);179	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)180	// 		.map_err(dispatch_to_evm::<T>)?;181	// 	Ok(())182	// }183184	// fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {185	// 	let mut new_admin_h256 = H256::default();186	// 	new_admin.to_little_endian(&mut new_admin_h256.0);187	// 	let account_id = T::AccountId::from(new_admin_h256);188	// 	let caller = T::CrossAccountId::from_eth(caller);189	// 	let new_admin = T::CrossAccountId::from_sub(account_id);190	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)191	// 		.map_err(dispatch_to_evm::<T>)?;192	// 	Ok(())193	// }194195	fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {196		let caller = T::CrossAccountId::from_eth(caller);197		self.check_is_owner_or_admin(&caller)198			.map_err(dispatch_to_evm::<T>)?;199		let new_admin = T::CrossAccountId::from_eth(new_admin);200		<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)201			.map_err(dispatch_to_evm::<T>)?;202		Ok(())203	}204205	fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {206		let caller = T::CrossAccountId::from_eth(caller);207		self.check_is_owner_or_admin(&caller)208			.map_err(dispatch_to_evm::<T>)?;209		let admin = T::CrossAccountId::from_eth(admin);210		<Pallet<T>>::toggle_admin(&self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;211		Ok(())212	}213214	#[solidity(rename_selector = "setCollectionNesting")]215	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {216		let caller = T::CrossAccountId::from_eth(caller);217		self.check_is_owner_or_admin(&caller)218			.map_err(dispatch_to_evm::<T>)?;219		self.collection.permissions.nesting = Some(match enable {220			false => NestingRule::Disabled,221			true => NestingRule::Owner,222		});223		save(self);224		Ok(())225	}226227	#[solidity(rename_selector = "setCollectionNesting")]228	fn set_nesting(229		&mut self,230		caller: caller,231		enable: bool,232		collections: Vec<address>,233	) -> Result<void> {234		if collections.is_empty() {235			return Err("No addresses provided".into());236		}237		if collections.len() >= OwnerRestrictedSet::bound() {238			return Err(Error::Revert(format!(239				"Out of bound: {} >= {}",240				collections.len(),241				OwnerRestrictedSet::bound()242			)));243		}244		let caller = T::CrossAccountId::from_eth(caller);245		self.check_is_owner_or_admin(&caller)246			.map_err(dispatch_to_evm::<T>)?;247		self.collection.permissions.nesting = Some(match enable {248			false => NestingRule::Disabled,249			true => {250				let mut bv = OwnerRestrictedSet::new();251				for i in collections {252					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(253						"Can't convert address into collection id".into(),254					))?)255					.map_err(|e| Error::Revert(format!("{:?}", e)))?;256				}257				NestingRule::OwnerRestricted(bv)258			}259		});260		save(self);261		Ok(())262	}263264	fn set_collection_access(&mut self, caller: caller, mode: string) -> Result<void> {265		let caller = T::CrossAccountId::from_eth(caller);266		self.check_is_owner_or_admin(&caller)267			.map_err(dispatch_to_evm::<T>)?;268		self.collection.permissions.access = Some(match mode.as_str() {269			"Normal" => AccessMode::Normal,270			"AllowList" => AccessMode::AllowList,271			_ => return Err("Not supported access mode".into()),272		});273		save(self);274		Ok(())275	}276277	fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {278		let caller = check_is_owner_or_admin(caller, self)?;279		let user = T::CrossAccountId::from_eth(user);280		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;281		Ok(())282	}283284	fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {285		let caller = check_is_owner_or_admin(caller, self)?;286		let user = T::CrossAccountId::from_eth(user);287		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;288		Ok(())289	}290291	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {292		check_is_owner_or_admin(caller, self)?;293		self.collection.permissions.mint_mode = Some(mode);294		save(self);295		Ok(())296	}297}298299fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<()> {300	let caller = T::CrossAccountId::from_eth(caller);301	collection302		.check_is_owner(&caller)303		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;304	Ok(())305}306307fn check_is_owner_or_admin<T: Config>(308	caller: caller,309	collection: &CollectionHandle<T>,310) -> Result<T::CrossAccountId> {311	let caller = T::CrossAccountId::from_eth(caller);312	collection313		.check_is_owner_or_admin(&caller)314		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;315	Ok(caller)316}317318fn save<T: Config>(collection: &CollectionHandle<T>) {319	<crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());320}321322pub fn token_uri_key() -> up_data_structs::PropertyKey {323	b"tokenURI"324		.to_vec()325		.try_into()326		.expect("length < limit; qed")327}
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -82,8 +82,14 @@
 			.map_err(|_| "key too long")?;
 		let value = value.try_into().map_err(|_| "value too long")?;
 
-		<Pallet<T>>::set_token_property(self, &caller, TokenId(token_id), Property { key, value }, false)
-			.map_err(dispatch_to_evm::<T>)
+		<Pallet<T>>::set_token_property(
+			self,
+			&caller,
+			TokenId(token_id),
+			Property { key, value },
+			false,
+		)
+		.map_err(dispatch_to_evm::<T>)
 	}
 
 	fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -449,7 +449,13 @@
 		property: Property,
 		is_token_create: bool,
 	) -> DispatchResult {
-		Self::check_token_change_permission(collection, sender, token_id, &property.key, is_token_create)?;
+		Self::check_token_change_permission(
+			collection,
+			sender,
+			token_id,
+			&property.key,
+			is_token_create,
+		)?;
 
 		<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
 			let property = property.clone();