git.delta.rocks / unique-network / refs/commits / 81762e018aaf

difftreelog

Cargo fmt

Trubnikov Sergey2022-06-03parent: #4695760.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// 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()).map_err(dispatch_to_evm::<T>)?;91		save(self)92	}9394	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {95		let caller = T::CrossAccountId::from_eth(caller);96		if !self.confirm_sponsorship(caller.as_sub()).map_err(dispatch_to_evm::<T>)? {97			return Err(Error::Revert("Caller is not set as sponsor".into()));98		}99		save(self)100	}101102	#[solidity(rename_selector = "setCollectionLimit")]103	fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {104		check_is_owner(caller, self)?;105		let mut limits = self.limits.clone();106107		match limit.as_str() {108			"accountTokenOwnershipLimit" => {109				limits.account_token_ownership_limit = Some(value);110			}111			"sponsoredDataSize" => {112				limits.sponsored_data_size = Some(value);113			}114			"sponsoredDataRateLimit" => {115				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));116			}117			"tokenLimit" => {118				limits.token_limit = Some(value);119			}120			"sponsorTransferTimeout" => {121				limits.sponsor_transfer_timeout = Some(value);122			}123			"sponsorApproveTimeout" => {124				limits.sponsor_approve_timeout = Some(value);125			}126			_ => {127				return Err(Error::Revert(format!(128					"Unknown integer limit \"{}\"",129					limit130				)))131			}132		}133		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)134			.map_err(dispatch_to_evm::<T>)?;135		save(self)136	}137138	#[solidity(rename_selector = "setCollectionLimit")]139	fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {140		check_is_owner(caller, self)?;141		let mut limits = self.limits.clone();142143		match limit.as_str() {144			"ownerCanTransfer" => {145				limits.owner_can_transfer = Some(value);146			}147			"ownerCanDestroy" => {148				limits.owner_can_destroy = Some(value);149			}150			"transfersEnabled" => {151				limits.transfers_enabled = Some(value);152			}153			_ => {154				return Err(Error::Revert(format!(155					"Unknown boolean limit \"{}\"",156					limit157				)))158			}159		}160		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)161			.map_err(dispatch_to_evm::<T>)?;162		save(self)163	}164165	fn contract_address(&self, _caller: caller) -> Result<address> {166		Ok(crate::eth::collection_id_to_address(self.id))167	}168169	// fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {170	// 	let mut new_admin_h256 = H256::default();171	// 	new_admin.to_little_endian(&mut new_admin_h256.0);172	// 	let account_id = T::AccountId::from(new_admin_h256);173	// 	let caller = T::CrossAccountId::from_eth(caller);174	// 	let new_admin = T::CrossAccountId::from_sub(account_id);175	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)176	// 		.map_err(dispatch_to_evm::<T>)?;177	// 	Ok(())178	// }179180	// fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {181	// 	let mut new_admin_h256 = H256::default();182	// 	new_admin.to_little_endian(&mut new_admin_h256.0);183	// 	let account_id = T::AccountId::from(new_admin_h256);184	// 	let caller = T::CrossAccountId::from_eth(caller);185	// 	let new_admin = T::CrossAccountId::from_sub(account_id);186	// 	<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)187	// 		.map_err(dispatch_to_evm::<T>)?;188	// 	Ok(())189	// }190191	fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {192		let caller = T::CrossAccountId::from_eth(caller);193		self.check_is_owner_or_admin(&caller)194			.map_err(dispatch_to_evm::<T>)?;195		let new_admin = T::CrossAccountId::from_eth(new_admin);196		<Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)197			.map_err(dispatch_to_evm::<T>)?;198		Ok(())199	}200201	fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {202		let caller = T::CrossAccountId::from_eth(caller);203		self.check_is_owner_or_admin(&caller)204			.map_err(dispatch_to_evm::<T>)?;205		let admin = T::CrossAccountId::from_eth(admin);206		<Pallet<T>>::toggle_admin(&self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;207		Ok(())208	}209210	#[solidity(rename_selector = "setCollectionNesting")]211	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {212		let caller = T::CrossAccountId::from_eth(caller);213		self.check_is_owner_or_admin(&caller)214			.map_err(dispatch_to_evm::<T>)?;215		self.collection.permissions.nesting = Some(match enable {216			false => NestingRule::Disabled,217			true => NestingRule::Owner,218		});219		save(self);220		Ok(())221	}222223	#[solidity(rename_selector = "setCollectionNesting")]224	fn set_nesting(225		&mut self,226		caller: caller,227		enable: bool,228		collections: Vec<address>,229	) -> 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!(235				"Out of bound: {} >= {}",236				collections.len(),237				OwnerRestrictedSet::bound()238			)));239		}240		let caller = T::CrossAccountId::from_eth(caller);241		self.check_is_owner_or_admin(&caller)242			.map_err(dispatch_to_evm::<T>)?;243		self.collection.permissions.nesting = Some(match enable {244			false => NestingRule::Disabled,245			true => {246				let mut bv = OwnerRestrictedSet::new();247				for i in collections {248					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(249						"Can't convert address into collection id".into(),250					))?)251					.map_err(|e| Error::Revert(format!("{:?}", e)))?;252				}253				NestingRule::OwnerRestricted(bv)254			}255		});256		save(self);257		Ok(())258	}259260	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {261		let caller = T::CrossAccountId::from_eth(caller);262		self.check_is_owner_or_admin(&caller)263			.map_err(dispatch_to_evm::<T>)?;264		self.collection.permissions.access = Some(match mode {265			0 => AccessMode::Normal,266			1 => AccessMode::AllowList,267			_ => return Err("Not supported access mode".into()),268		});269		save(self);270		Ok(())271	}272273	fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {274		let caller = check_is_owner_or_admin(caller, self)?;275		let user = T::CrossAccountId::from_eth(user);276		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;277		Ok(())278	}279280	fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {281		let caller = check_is_owner_or_admin(caller, self)?;282		let user = T::CrossAccountId::from_eth(user);283		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;284		Ok(())285	}286287	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {288		check_is_owner_or_admin(caller, self)?;289		self.collection.permissions.mint_mode = Some(mode);290		save(self);291		Ok(())292	}293}294295fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<void> {296	let caller = T::CrossAccountId::from_eth(caller);297	collection298		.check_is_owner(&caller)299		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;300	Ok(())301}302303fn check_is_owner_or_admin<T: Config>(304	caller: caller,305	collection: &CollectionHandle<T>,306) -> Result<T::CrossAccountId> {307	let caller = T::CrossAccountId::from_eth(caller);308	collection309		.check_is_owner_or_admin(&caller)310		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;311	Ok(caller)312}313314fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {315	collection.check_is_read_only().map_err(dispatch_to_evm::<T>)?;316	<crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());317	Ok(())318}319320pub fn token_uri_key() -> up_data_structs::PropertyKey {321	b"tokenURI"322		.to_vec()323		.try_into()324		.expect("length < limit; qed")325}
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			.map_err(dispatch_to_evm::<T>)?;92		save(self)93	}9495	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {96		let caller = T::CrossAccountId::from_eth(caller);97		if !self98			.confirm_sponsorship(caller.as_sub())99			.map_err(dispatch_to_evm::<T>)?100		{101			return Err(Error::Revert("Caller is not set as sponsor".into()));102		}103		save(self)104	}105106	#[solidity(rename_selector = "setCollectionLimit")]107	fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {108		check_is_owner(caller, self)?;109		let mut limits = self.limits.clone();110111		match limit.as_str() {112			"accountTokenOwnershipLimit" => {113				limits.account_token_ownership_limit = Some(value);114			}115			"sponsoredDataSize" => {116				limits.sponsored_data_size = Some(value);117			}118			"sponsoredDataRateLimit" => {119				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));120			}121			"tokenLimit" => {122				limits.token_limit = Some(value);123			}124			"sponsorTransferTimeout" => {125				limits.sponsor_transfer_timeout = Some(value);126			}127			"sponsorApproveTimeout" => {128				limits.sponsor_approve_timeout = Some(value);129			}130			_ => {131				return Err(Error::Revert(format!(132					"Unknown integer limit \"{}\"",133					limit134				)))135			}136		}137		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)138			.map_err(dispatch_to_evm::<T>)?;139		save(self)140	}141142	#[solidity(rename_selector = "setCollectionLimit")]143	fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {144		check_is_owner(caller, self)?;145		let mut limits = self.limits.clone();146147		match limit.as_str() {148			"ownerCanTransfer" => {149				limits.owner_can_transfer = Some(value);150			}151			"ownerCanDestroy" => {152				limits.owner_can_destroy = Some(value);153			}154			"transfersEnabled" => {155				limits.transfers_enabled = Some(value);156			}157			_ => {158				return Err(Error::Revert(format!(159					"Unknown boolean limit \"{}\"",160					limit161				)))162			}163		}164		self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)165			.map_err(dispatch_to_evm::<T>)?;166		save(self)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: uint8) -> 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 {269			0 => AccessMode::Normal,270			1 => 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<void> {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>) -> Result<void> {319	collection320		.check_is_read_only()321		.map_err(dispatch_to_evm::<T>)?;322	<crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());323	Ok(())324}325326pub fn token_uri_key() -> up_data_structs::PropertyKey {327	b"tokenURI"328		.to_vec()329		.try_into()330		.expect("length < limit; qed")331}
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -175,7 +175,7 @@
 		if self.read_only {
 			return Err(<Error<T>>::CollectionNotFound)?;
 		}
-		
+
 		Ok(())
 	}
 }
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -903,7 +903,7 @@
 		spender: Option<&T::CrossAccountId>,
 	) -> DispatchResult {
 		collection.check_is_read_only()?;
-		
+
 		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(sender)?;
 			if let Some(spender) = spender {