git.delta.rocks / unique-network / refs/commits / 3ee9e950e03f

difftreelog

refactor move properties around

Yaroslav Bolyukin2022-05-27parent: #a034a2f.patch.diff
in: master

18 files changed

modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
before · client/rpc/src/lib.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 std::sync::Arc;1819use codec::{Decode, Encode};20use jsonrpc_core::{Error as RpcError, ErrorCode, Result};21use jsonrpc_derive::rpc;22use up_data_structs::{23	RpcCollection, CollectionId, CollectionStats, CollectionLimits, TokenId, Property,24	PropertyKeyPermission, TokenData,25};26use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};27use sp_blockchain::HeaderBackend;28use up_rpc::UniqueApi as UniqueRuntimeApi;2930// RMRK31use rmrk_rpc::RmrkApi as RmrkRuntimeApi;32use up_data_structs::{33	RmrkCollectionId, RmrkNftId, RmrkBaseId, RmrkNftChild, RmrkThemeName,34	RmrkResourceId,35};3637pub use rmrk_unique_rpc::RmrkApi;3839#[rpc]40pub trait UniqueApi<BlockHash, CrossAccountId, AccountId> {41	#[rpc(name = "unique_accountTokens")]42	fn account_tokens(43		&self,44		collection: CollectionId,45		account: CrossAccountId,46		at: Option<BlockHash>,47	) -> Result<Vec<TokenId>>;48	#[rpc(name = "unique_collectionTokens")]49	fn collection_tokens(50		&self,51		collection: CollectionId,52		at: Option<BlockHash>,53	) -> Result<Vec<TokenId>>;54	#[rpc(name = "unique_tokenExists")]55	fn token_exists(56		&self,57		collection: CollectionId,58		token: TokenId,59		at: Option<BlockHash>,60	) -> Result<bool>;6162	#[rpc(name = "unique_tokenOwner")]63	fn token_owner(64		&self,65		collection: CollectionId,66		token: TokenId,67		at: Option<BlockHash>,68	) -> Result<Option<CrossAccountId>>;69	#[rpc(name = "unique_topmostTokenOwner")]70	fn topmost_token_owner(71		&self,72		collection: CollectionId,73		token: TokenId,74		at: Option<BlockHash>,75	) -> Result<Option<CrossAccountId>>;76	#[rpc(name = "unique_constMetadata")]77	fn const_metadata(78		&self,79		collection: CollectionId,80		token: TokenId,81		at: Option<BlockHash>,82	) -> Result<Vec<u8>>;8384	#[rpc(name = "unique_collectionProperties")]85	fn collection_properties(86		&self,87		collection: CollectionId,88		keys: Option<Vec<String>>,89		at: Option<BlockHash>,90	) -> Result<Vec<Property>>;9192	#[rpc(name = "unique_tokenProperties")]93	fn token_properties(94		&self,95		collection: CollectionId,96		token_id: TokenId,97		keys: Option<Vec<String>>,98		at: Option<BlockHash>,99	) -> Result<Vec<Property>>;100101	#[rpc(name = "unique_propertyPermissions")]102	fn property_permissions(103		&self,104		collection: CollectionId,105		keys: Option<Vec<String>>,106		at: Option<BlockHash>,107	) -> Result<Vec<PropertyKeyPermission>>;108109	#[rpc(name = "unique_tokenData")]110	fn token_data(111		&self,112		collection: CollectionId,113		token_id: TokenId,114		keys: Option<Vec<String>>,115		at: Option<BlockHash>,116	) -> Result<TokenData<CrossAccountId>>;117118	#[rpc(name = "unique_totalSupply")]119	fn total_supply(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<u32>;120	#[rpc(name = "unique_accountBalance")]121	fn account_balance(122		&self,123		collection: CollectionId,124		account: CrossAccountId,125		at: Option<BlockHash>,126	) -> Result<u32>;127	#[rpc(name = "unique_balance")]128	fn balance(129		&self,130		collection: CollectionId,131		account: CrossAccountId,132		token: TokenId,133		at: Option<BlockHash>,134	) -> Result<String>;135	#[rpc(name = "unique_allowance")]136	fn allowance(137		&self,138		collection: CollectionId,139		sender: CrossAccountId,140		spender: CrossAccountId,141		token: TokenId,142		at: Option<BlockHash>,143	) -> Result<String>;144145	#[rpc(name = "unique_adminlist")]146	fn adminlist(147		&self,148		collection: CollectionId,149		at: Option<BlockHash>,150	) -> Result<Vec<CrossAccountId>>;151	#[rpc(name = "unique_allowlist")]152	fn allowlist(153		&self,154		collection: CollectionId,155		at: Option<BlockHash>,156	) -> Result<Vec<CrossAccountId>>;157	#[rpc(name = "unique_allowed")]158	fn allowed(159		&self,160		collection: CollectionId,161		user: CrossAccountId,162		at: Option<BlockHash>,163	) -> Result<bool>;164	#[rpc(name = "unique_lastTokenId")]165	fn last_token_id(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<TokenId>;166	#[rpc(name = "unique_collectionById")]167	fn collection_by_id(168		&self,169		collection: CollectionId,170		at: Option<BlockHash>,171	) -> Result<Option<RpcCollection<AccountId>>>;172	#[rpc(name = "unique_collectionStats")]173	fn collection_stats(&self, at: Option<BlockHash>) -> Result<CollectionStats>;174175	#[rpc(name = "unique_nextSponsored")]176	fn next_sponsored(177		&self,178		collection: CollectionId,179		account: CrossAccountId,180		token: TokenId,181		at: Option<BlockHash>,182	) -> Result<Option<u64>>;183	#[rpc(name = "unique_effectiveCollectionLimits")]184	fn effective_collection_limits(185		&self,186		collection_id: CollectionId,187		at: Option<BlockHash>,188	) -> Result<Option<CollectionLimits>>;189}190191mod rmrk_unique_rpc {192	use super::*;193194	#[rpc(server)]195	pub trait RmrkApi<196		BlockHash,197		AccountId,198		CollectionInfo,199		NftInfo,200		ResourceInfo,201		PropertyInfo,202		BaseInfo,203		PartType,204		Theme,205	>206	{207		#[rpc(name = "rmrk_lastCollectionIdx")]208		/// Get the latest created collection id209		fn last_collection_idx(&self, at: Option<BlockHash>) -> Result<RmrkCollectionId>;210211		#[rpc(name = "rmrk_collectionById")]212		/// Get collection by id213		fn collection_by_id(214			&self,215			id: RmrkCollectionId,216			at: Option<BlockHash>,217		) -> Result<Option<CollectionInfo>>;218219		#[rpc(name = "rmrk_nftById")]220		/// Get NFT by collection id and NFT id221		fn nft_by_id(222			&self,223			collection_id: RmrkCollectionId,224			nft_id: RmrkNftId,225			at: Option<BlockHash>,226		) -> Result<Option<NftInfo>>;227228		#[rpc(name = "rmrk_accountTokens")]229		/// Get tokens owned by an account in a collection230		fn account_tokens(231			&self,232			account_id: AccountId,233			collection_id: RmrkCollectionId,234			at: Option<BlockHash>,235		) -> Result<Vec<RmrkNftId>>;236237		#[rpc(name = "rmrk_nftChildren")]238		/// Get NFT children239		fn nft_children(240			&self,241			collection_id: RmrkCollectionId,242			nft_id: RmrkNftId,243			at: Option<BlockHash>,244		) -> Result<Vec<RmrkNftChild>>;245246		#[rpc(name = "rmrk_collectionProperties")]247		/// Get collection properties248		fn collection_properties(249			&self,250			collection_id: RmrkCollectionId,251			filter_keys: Option<Vec<String>>,252			at: Option<BlockHash>,253		) -> Result<Vec<PropertyInfo>>;254255		#[rpc(name = "rmrk_nftProperties")]256		/// Get NFT properties257		fn nft_properties(258			&self,259			collection_id: RmrkCollectionId,260			nft_id: RmrkNftId,261			filter_keys: Option<Vec<String>>,262			at: Option<BlockHash>,263		) -> Result<Vec<PropertyInfo>>;264265		#[rpc(name = "rmrk_nftResources")]266		/// Get NFT resources267		fn nft_resources(268			&self,269			collection_id: RmrkCollectionId,270			nft_id: RmrkNftId,271			at: Option<BlockHash>,272		) -> Result<Vec<ResourceInfo>>;273274		#[rpc(name = "rmrk_nftResourcePriorities")]275		/// Get NFT resource priorities276		fn nft_resource_priorities(277			&self,278			collection_id: RmrkCollectionId,279			nft_id: RmrkNftId,280			at: Option<BlockHash>,281		) -> Result<Vec<RmrkResourceId>>;282283		#[rpc(name = "rmrk_base")]284		/// Get base info285		fn base(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Option<BaseInfo>>;286287		#[rpc(name = "rmrk_baseParts")]288		/// Get all Base's parts289		fn base_parts(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Vec<PartType>>;290291		#[rpc(name = "rmrk_themeNames")]292		fn theme_names(293			&self,294			base_id: RmrkBaseId,295			at: Option<BlockHash>,296		) -> Result<Vec<RmrkThemeName>>;297298		#[rpc(name = "rmrk_themes")]299		fn theme(300			&self,301			base_id: RmrkBaseId,302			theme_name: String,303			filter_keys: Option<Vec<String>>,304			at: Option<BlockHash>,305		) -> Result<Option<Theme>>;306	}307}308309pub struct Unique<C, P> {310	client: Arc<C>,311	_marker: std::marker::PhantomData<P>,312}313314impl<C, P> Unique<C, P> {315	pub fn new(client: Arc<C>) -> Self {316		Self {317			client,318			_marker: Default::default(),319		}320	}321}322323pub enum Error {324	RuntimeError,325}326327impl From<Error> for i64 {328	fn from(e: Error) -> i64 {329		match e {330			Error::RuntimeError => 1,331		}332	}333}334335macro_rules! pass_method {336	(337		$method_name:ident(338			$($(#[map(|$map_arg:ident| $map:expr)])? $name:ident: $ty:ty),* $(,)?339		) -> $result:ty $(=> $mapper:expr)?,340		//$runtime_name:ident $(<$($lt: tt),+>)*341		$runtime_api_macro:ident342		$(; changed_in $ver:expr, $changed_method_name:ident ($($changed_name:expr), * $(,)?) => $fixer:expr)*343	) => {344		fn $method_name(345			&self,346			$(347				$name: $ty,348			)*349			at: Option<<Block as BlockT>::Hash>,350		) -> Result<$result> {351			let api = self.client.runtime_api();352			let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));353			let _api_version = if let Ok(Some(api_version)) =354				api.api_version::<$runtime_api_macro!()>(&at)355			{356				api_version357			} else {358				// unreachable for our runtime359				return Err(RpcError {360					code: ErrorCode::InvalidParams,361					message: "Api is not available".into(),362					data: None,363				})364			};365366			let result = $(if _api_version < $ver {367				api.$changed_method_name(&at, $($changed_name),*).map(|r| r.map($fixer))368			} else)*369			{ api.$method_name(&at, $($((|$map_arg: $ty| $map))? ($name)),*) };370371			let result = result.map_err(|e| RpcError {372				code: ErrorCode::ServerError(Error::RuntimeError.into()),373				message: "Unable to query".into(),374				data: Some(format!("{:?}", e).into()),375			})?;376			result.map_err(|e| RpcError {377				code: ErrorCode::InvalidParams,378				message: "Runtime returned error".into(),379				data: Some(format!("{:?}", e).into()),380			})$(.map($mapper))?381		}382	};383}384385macro_rules! unique_api {386	() => {387		dyn UniqueRuntimeApi<Block, CrossAccountId, AccountId>388	};389}390391macro_rules! rmrk_api {392	() => {393		dyn RmrkRuntimeApi<Block, AccountId, CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme>394	};395}396397#[allow(deprecated)]398impl<C, Block, CrossAccountId, AccountId>399	UniqueApi<<Block as BlockT>::Hash, CrossAccountId, AccountId> for Unique<C, Block>400where401	Block: BlockT,402	AccountId: Decode,403	C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,404	C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,405	CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,406{407	pass_method!(408		account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>, unique_api409	);410	pass_method!(411		collection_tokens(collection: CollectionId) -> Vec<TokenId>, unique_api412	);413	pass_method!(414		token_exists(collection: CollectionId, token: TokenId) -> bool, unique_api415	);416	pass_method!(417		token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api418	);419	pass_method!(420		topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api421	);422	pass_method!(423		const_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>, unique_api424	);425	pass_method!(total_supply(collection: CollectionId) -> u32, unique_api);426	pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32, unique_api);427	pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string(), unique_api);428	pass_method!(429		allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string(),430		unique_api431	);432433	pass_method!(collection_properties(434		collection: CollectionId,435436		#[map(|keys| string_keys_to_bytes_keys(keys))]437		keys: Option<Vec<String>>438	) -> Vec<Property>, unique_api);439440	pass_method!(token_properties(441		collection: CollectionId,442		token_id: TokenId,443444		#[map(|keys| string_keys_to_bytes_keys(keys))]445		keys: Option<Vec<String>>446	) -> Vec<Property>, unique_api);447448	pass_method!(property_permissions(449		collection: CollectionId,450451		#[map(|keys| string_keys_to_bytes_keys(keys))]452		keys: Option<Vec<String>>453	) -> Vec<PropertyKeyPermission>, unique_api);454455	pass_method!(token_data(456		collection: CollectionId,457		token_id: TokenId,458459		#[map(|keys| string_keys_to_bytes_keys(keys))]460		keys: Option<Vec<String>>,461	) -> TokenData<CrossAccountId>, unique_api);462463	pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);464	pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);465	pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool, unique_api);466	pass_method!(last_token_id(collection: CollectionId) -> TokenId, unique_api);467	pass_method!(collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>, unique_api);468	pass_method!(collection_stats() -> CollectionStats, unique_api);469	pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>, unique_api);470	pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);471}472473#[allow(deprecated)]474impl<475		C,476		Block,477		AccountId,478		CollectionInfo,479		NftInfo,480		ResourceInfo,481		PropertyInfo,482		BaseInfo,483		PartType,484		Theme,485	>486	rmrk_unique_rpc::RmrkApi<487		<Block as BlockT>::Hash,488		AccountId,489		CollectionInfo,490		NftInfo,491		ResourceInfo,492		PropertyInfo,493		BaseInfo,494		PartType,495		Theme,496	> for Unique<C, Block>497where498	C: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,499	C::Api: RmrkRuntimeApi<500		Block,501		AccountId,502		CollectionInfo,503		NftInfo,504		ResourceInfo,505		PropertyInfo,506		BaseInfo,507		PartType,508		Theme,509	>,510	AccountId: Decode + Encode,511	CollectionInfo: Decode,512	NftInfo: Decode,513	ResourceInfo: Decode,514	PropertyInfo: Decode,515	BaseInfo: Decode,516	PartType: Decode,517	Theme: Decode,518	Block: BlockT,519{520	pass_method!(last_collection_idx() -> RmrkCollectionId, rmrk_api);521	pass_method!(collection_by_id(id: RmrkCollectionId) -> Option<CollectionInfo>, rmrk_api);522	pass_method!(nft_by_id(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Option<NftInfo>, rmrk_api);523	pass_method!(account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Vec<RmrkNftId>, rmrk_api);524	pass_method!(nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<RmrkNftChild>, rmrk_api);525	pass_method!(526		collection_properties(527			collection_id: RmrkCollectionId,528529			#[map(|keys| string_keys_to_bytes_keys(keys))]530			filter_keys: Option<Vec<String>>531		) -> Vec<PropertyInfo>,532		rmrk_api533	);534	pass_method!(535		nft_properties(536			collection_id: RmrkCollectionId,537			nft_id: RmrkNftId,538539			#[map(|keys| string_keys_to_bytes_keys(keys))]540			filter_keys: Option<Vec<String>>541		) -> Vec<PropertyInfo>,542		rmrk_api543	);544	pass_method!(nft_resources(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<ResourceInfo>, rmrk_api);545	pass_method!(nft_resource_priorities(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<RmrkResourceId>, rmrk_api);546	pass_method!(base(base_id: RmrkBaseId) -> Option<BaseInfo>, rmrk_api);547	pass_method!(base_parts(base_id: RmrkBaseId) -> Vec<PartType>, rmrk_api);548	pass_method!(theme_names(base_id: RmrkBaseId) -> Vec<RmrkThemeName>, rmrk_api);549	pass_method!(550		theme(551			base_id: RmrkBaseId,552553			#[map(|n| n.into_bytes())]554			theme_name: String,555556			#[map(|keys| string_keys_to_bytes_keys(keys))]557			filter_keys: Option<Vec<String>>558		) -> Option<Theme>, rmrk_api);559}560561fn string_keys_to_bytes_keys(keys: Option<Vec<String>>) -> Option<Vec<Vec<u8>>> {562	keys.map(|keys| keys.into_iter().map(|key| key.into_bytes()).collect())563}
after · client/rpc/src/lib.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 std::sync::Arc;1819use codec::{Decode, Encode};20use jsonrpc_core::{Error as RpcError, ErrorCode, Result};21use jsonrpc_derive::rpc;22use up_data_structs::{23	RpcCollection, CollectionId, CollectionStats, CollectionLimits, TokenId, Property,24	PropertyKeyPermission, TokenData,25};26use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};27use sp_blockchain::HeaderBackend;28use up_rpc::UniqueApi as UniqueRuntimeApi;2930// RMRK31use rmrk_rpc::RmrkApi as RmrkRuntimeApi;32use up_data_structs::{33	RmrkCollectionId, RmrkNftId, RmrkBaseId, RmrkNftChild, RmrkThemeName,34	RmrkResourceId,35};3637pub use rmrk_unique_rpc::RmrkApi;3839#[rpc]40pub trait UniqueApi<BlockHash, CrossAccountId, AccountId> {41	#[rpc(name = "unique_accountTokens")]42	fn account_tokens(43		&self,44		collection: CollectionId,45		account: CrossAccountId,46		at: Option<BlockHash>,47	) -> Result<Vec<TokenId>>;48	#[rpc(name = "unique_collectionTokens")]49	fn collection_tokens(50		&self,51		collection: CollectionId,52		at: Option<BlockHash>,53	) -> Result<Vec<TokenId>>;54	#[rpc(name = "unique_tokenExists")]55	fn token_exists(56		&self,57		collection: CollectionId,58		token: TokenId,59		at: Option<BlockHash>,60	) -> Result<bool>;6162	#[rpc(name = "unique_tokenOwner")]63	fn token_owner(64		&self,65		collection: CollectionId,66		token: TokenId,67		at: Option<BlockHash>,68	) -> Result<Option<CrossAccountId>>;69	#[rpc(name = "unique_topmostTokenOwner")]70	fn topmost_token_owner(71		&self,72		collection: CollectionId,73		token: TokenId,74		at: Option<BlockHash>,75	) -> Result<Option<CrossAccountId>>;7677	#[rpc(name = "unique_collectionProperties")]78	fn collection_properties(79		&self,80		collection: CollectionId,81		keys: Option<Vec<String>>,82		at: Option<BlockHash>,83	) -> Result<Vec<Property>>;8485	#[rpc(name = "unique_tokenProperties")]86	fn token_properties(87		&self,88		collection: CollectionId,89		token_id: TokenId,90		keys: Option<Vec<String>>,91		at: Option<BlockHash>,92	) -> Result<Vec<Property>>;9394	#[rpc(name = "unique_propertyPermissions")]95	fn property_permissions(96		&self,97		collection: CollectionId,98		keys: Option<Vec<String>>,99		at: Option<BlockHash>,100	) -> Result<Vec<PropertyKeyPermission>>;101102	#[rpc(name = "unique_tokenData")]103	fn token_data(104		&self,105		collection: CollectionId,106		token_id: TokenId,107		keys: Option<Vec<String>>,108		at: Option<BlockHash>,109	) -> Result<TokenData<CrossAccountId>>;110111	#[rpc(name = "unique_totalSupply")]112	fn total_supply(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<u32>;113	#[rpc(name = "unique_accountBalance")]114	fn account_balance(115		&self,116		collection: CollectionId,117		account: CrossAccountId,118		at: Option<BlockHash>,119	) -> Result<u32>;120	#[rpc(name = "unique_balance")]121	fn balance(122		&self,123		collection: CollectionId,124		account: CrossAccountId,125		token: TokenId,126		at: Option<BlockHash>,127	) -> Result<String>;128	#[rpc(name = "unique_allowance")]129	fn allowance(130		&self,131		collection: CollectionId,132		sender: CrossAccountId,133		spender: CrossAccountId,134		token: TokenId,135		at: Option<BlockHash>,136	) -> Result<String>;137138	#[rpc(name = "unique_adminlist")]139	fn adminlist(140		&self,141		collection: CollectionId,142		at: Option<BlockHash>,143	) -> Result<Vec<CrossAccountId>>;144	#[rpc(name = "unique_allowlist")]145	fn allowlist(146		&self,147		collection: CollectionId,148		at: Option<BlockHash>,149	) -> Result<Vec<CrossAccountId>>;150	#[rpc(name = "unique_allowed")]151	fn allowed(152		&self,153		collection: CollectionId,154		user: CrossAccountId,155		at: Option<BlockHash>,156	) -> Result<bool>;157	#[rpc(name = "unique_lastTokenId")]158	fn last_token_id(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<TokenId>;159	#[rpc(name = "unique_collectionById")]160	fn collection_by_id(161		&self,162		collection: CollectionId,163		at: Option<BlockHash>,164	) -> Result<Option<RpcCollection<AccountId>>>;165	#[rpc(name = "unique_collectionStats")]166	fn collection_stats(&self, at: Option<BlockHash>) -> Result<CollectionStats>;167168	#[rpc(name = "unique_nextSponsored")]169	fn next_sponsored(170		&self,171		collection: CollectionId,172		account: CrossAccountId,173		token: TokenId,174		at: Option<BlockHash>,175	) -> Result<Option<u64>>;176	#[rpc(name = "unique_effectiveCollectionLimits")]177	fn effective_collection_limits(178		&self,179		collection_id: CollectionId,180		at: Option<BlockHash>,181	) -> Result<Option<CollectionLimits>>;182}183184mod rmrk_unique_rpc {185	use super::*;186187	#[rpc(server)]188	pub trait RmrkApi<189		BlockHash,190		AccountId,191		CollectionInfo,192		NftInfo,193		ResourceInfo,194		PropertyInfo,195		BaseInfo,196		PartType,197		Theme,198	>199	{200		#[rpc(name = "rmrk_lastCollectionIdx")]201		/// Get the latest created collection id202		fn last_collection_idx(&self, at: Option<BlockHash>) -> Result<RmrkCollectionId>;203204		#[rpc(name = "rmrk_collectionById")]205		/// Get collection by id206		fn collection_by_id(207			&self,208			id: RmrkCollectionId,209			at: Option<BlockHash>,210		) -> Result<Option<CollectionInfo>>;211212		#[rpc(name = "rmrk_nftById")]213		/// Get NFT by collection id and NFT id214		fn nft_by_id(215			&self,216			collection_id: RmrkCollectionId,217			nft_id: RmrkNftId,218			at: Option<BlockHash>,219		) -> Result<Option<NftInfo>>;220221		#[rpc(name = "rmrk_accountTokens")]222		/// Get tokens owned by an account in a collection223		fn account_tokens(224			&self,225			account_id: AccountId,226			collection_id: RmrkCollectionId,227			at: Option<BlockHash>,228		) -> Result<Vec<RmrkNftId>>;229230		#[rpc(name = "rmrk_nftChildren")]231		/// Get NFT children232		fn nft_children(233			&self,234			collection_id: RmrkCollectionId,235			nft_id: RmrkNftId,236			at: Option<BlockHash>,237		) -> Result<Vec<RmrkNftChild>>;238239		#[rpc(name = "rmrk_collectionProperties")]240		/// Get collection properties241		fn collection_properties(242			&self,243			collection_id: RmrkCollectionId,244			filter_keys: Option<Vec<String>>,245			at: Option<BlockHash>,246		) -> Result<Vec<PropertyInfo>>;247248		#[rpc(name = "rmrk_nftProperties")]249		/// Get NFT properties250		fn nft_properties(251			&self,252			collection_id: RmrkCollectionId,253			nft_id: RmrkNftId,254			filter_keys: Option<Vec<String>>,255			at: Option<BlockHash>,256		) -> Result<Vec<PropertyInfo>>;257258		#[rpc(name = "rmrk_nftResources")]259		/// Get NFT resources260		fn nft_resources(261			&self,262			collection_id: RmrkCollectionId,263			nft_id: RmrkNftId,264			at: Option<BlockHash>,265		) -> Result<Vec<ResourceInfo>>;266267		#[rpc(name = "rmrk_nftResourcePriorities")]268		/// Get NFT resource priorities269		fn nft_resource_priorities(270			&self,271			collection_id: RmrkCollectionId,272			nft_id: RmrkNftId,273			at: Option<BlockHash>,274		) -> Result<Vec<RmrkResourceId>>;275276		#[rpc(name = "rmrk_base")]277		/// Get base info278		fn base(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Option<BaseInfo>>;279280		#[rpc(name = "rmrk_baseParts")]281		/// Get all Base's parts282		fn base_parts(&self, base_id: RmrkBaseId, at: Option<BlockHash>) -> Result<Vec<PartType>>;283284		#[rpc(name = "rmrk_themeNames")]285		fn theme_names(286			&self,287			base_id: RmrkBaseId,288			at: Option<BlockHash>,289		) -> Result<Vec<RmrkThemeName>>;290291		#[rpc(name = "rmrk_themes")]292		fn theme(293			&self,294			base_id: RmrkBaseId,295			theme_name: String,296			filter_keys: Option<Vec<String>>,297			at: Option<BlockHash>,298		) -> Result<Option<Theme>>;299	}300}301302pub struct Unique<C, P> {303	client: Arc<C>,304	_marker: std::marker::PhantomData<P>,305}306307impl<C, P> Unique<C, P> {308	pub fn new(client: Arc<C>) -> Self {309		Self {310			client,311			_marker: Default::default(),312		}313	}314}315316pub enum Error {317	RuntimeError,318}319320impl From<Error> for i64 {321	fn from(e: Error) -> i64 {322		match e {323			Error::RuntimeError => 1,324		}325	}326}327328macro_rules! pass_method {329	(330		$method_name:ident(331			$($(#[map(|$map_arg:ident| $map:expr)])? $name:ident: $ty:ty),* $(,)?332		) -> $result:ty $(=> $mapper:expr)?,333		//$runtime_name:ident $(<$($lt: tt),+>)*334		$runtime_api_macro:ident335		$(; changed_in $ver:expr, $changed_method_name:ident ($($changed_name:expr), * $(,)?) => $fixer:expr)*336	) => {337		fn $method_name(338			&self,339			$(340				$name: $ty,341			)*342			at: Option<<Block as BlockT>::Hash>,343		) -> Result<$result> {344			let api = self.client.runtime_api();345			let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));346			let _api_version = if let Ok(Some(api_version)) =347				api.api_version::<$runtime_api_macro!()>(&at)348			{349				api_version350			} else {351				// unreachable for our runtime352				return Err(RpcError {353					code: ErrorCode::InvalidParams,354					message: "Api is not available".into(),355					data: None,356				})357			};358359			let result = $(if _api_version < $ver {360				api.$changed_method_name(&at, $($changed_name),*).map(|r| r.map($fixer))361			} else)*362			{ api.$method_name(&at, $($((|$map_arg: $ty| $map))? ($name)),*) };363364			let result = result.map_err(|e| RpcError {365				code: ErrorCode::ServerError(Error::RuntimeError.into()),366				message: "Unable to query".into(),367				data: Some(format!("{:?}", e).into()),368			})?;369			result.map_err(|e| RpcError {370				code: ErrorCode::InvalidParams,371				message: "Runtime returned error".into(),372				data: Some(format!("{:?}", e).into()),373			})$(.map($mapper))?374		}375	};376}377378macro_rules! unique_api {379	() => {380		dyn UniqueRuntimeApi<Block, CrossAccountId, AccountId>381	};382}383384macro_rules! rmrk_api {385	() => {386		dyn RmrkRuntimeApi<Block, AccountId, CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme>387	};388}389390#[allow(deprecated)]391impl<C, Block, CrossAccountId, AccountId>392	UniqueApi<<Block as BlockT>::Hash, CrossAccountId, AccountId> for Unique<C, Block>393where394	Block: BlockT,395	AccountId: Decode,396	C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,397	C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,398	CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,399{400	pass_method!(401		account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>, unique_api402	);403	pass_method!(404		collection_tokens(collection: CollectionId) -> Vec<TokenId>, unique_api405	);406	pass_method!(407		token_exists(collection: CollectionId, token: TokenId) -> bool, unique_api408	);409	pass_method!(410		token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api411	);412	pass_method!(413		topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api414	);415	pass_method!(total_supply(collection: CollectionId) -> u32, unique_api);416	pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32, unique_api);417	pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string(), unique_api);418	pass_method!(419		allowance(collection: CollectionId, sender: CrossAccountId, spender: CrossAccountId, token: TokenId) -> String => |v| v.to_string(),420		unique_api421	);422423	pass_method!(collection_properties(424		collection: CollectionId,425426		#[map(|keys| string_keys_to_bytes_keys(keys))]427		keys: Option<Vec<String>>428	) -> Vec<Property>, unique_api);429430	pass_method!(token_properties(431		collection: CollectionId,432		token_id: TokenId,433434		#[map(|keys| string_keys_to_bytes_keys(keys))]435		keys: Option<Vec<String>>436	) -> Vec<Property>, unique_api);437438	pass_method!(property_permissions(439		collection: CollectionId,440441		#[map(|keys| string_keys_to_bytes_keys(keys))]442		keys: Option<Vec<String>>443	) -> Vec<PropertyKeyPermission>, unique_api);444445	pass_method!(token_data(446		collection: CollectionId,447		token_id: TokenId,448449		#[map(|keys| string_keys_to_bytes_keys(keys))]450		keys: Option<Vec<String>>,451	) -> TokenData<CrossAccountId>, unique_api);452453	pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);454	pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);455	pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool, unique_api);456	pass_method!(last_token_id(collection: CollectionId) -> TokenId, unique_api);457	pass_method!(collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>, unique_api);458	pass_method!(collection_stats() -> CollectionStats, unique_api);459	pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>, unique_api);460	pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);461}462463#[allow(deprecated)]464impl<465		C,466		Block,467		AccountId,468		CollectionInfo,469		NftInfo,470		ResourceInfo,471		PropertyInfo,472		BaseInfo,473		PartType,474		Theme,475	>476	rmrk_unique_rpc::RmrkApi<477		<Block as BlockT>::Hash,478		AccountId,479		CollectionInfo,480		NftInfo,481		ResourceInfo,482		PropertyInfo,483		BaseInfo,484		PartType,485		Theme,486	> for Unique<C, Block>487where488	C: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,489	C::Api: RmrkRuntimeApi<490		Block,491		AccountId,492		CollectionInfo,493		NftInfo,494		ResourceInfo,495		PropertyInfo,496		BaseInfo,497		PartType,498		Theme,499	>,500	AccountId: Decode + Encode,501	CollectionInfo: Decode,502	NftInfo: Decode,503	ResourceInfo: Decode,504	PropertyInfo: Decode,505	BaseInfo: Decode,506	PartType: Decode,507	Theme: Decode,508	Block: BlockT,509{510	pass_method!(last_collection_idx() -> RmrkCollectionId, rmrk_api);511	pass_method!(collection_by_id(id: RmrkCollectionId) -> Option<CollectionInfo>, rmrk_api);512	pass_method!(nft_by_id(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Option<NftInfo>, rmrk_api);513	pass_method!(account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Vec<RmrkNftId>, rmrk_api);514	pass_method!(nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<RmrkNftChild>, rmrk_api);515	pass_method!(516		collection_properties(517			collection_id: RmrkCollectionId,518519			#[map(|keys| string_keys_to_bytes_keys(keys))]520			filter_keys: Option<Vec<String>>521		) -> Vec<PropertyInfo>,522		rmrk_api523	);524	pass_method!(525		nft_properties(526			collection_id: RmrkCollectionId,527			nft_id: RmrkNftId,528529			#[map(|keys| string_keys_to_bytes_keys(keys))]530			filter_keys: Option<Vec<String>>531		) -> Vec<PropertyInfo>,532		rmrk_api533	);534	pass_method!(nft_resources(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<ResourceInfo>, rmrk_api);535	pass_method!(nft_resource_priorities(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Vec<RmrkResourceId>, rmrk_api);536	pass_method!(base(base_id: RmrkBaseId) -> Option<BaseInfo>, rmrk_api);537	pass_method!(base_parts(base_id: RmrkBaseId) -> Vec<PartType>, rmrk_api);538	pass_method!(theme_names(base_id: RmrkBaseId) -> Vec<RmrkThemeName>, rmrk_api);539	pass_method!(540		theme(541			base_id: RmrkBaseId,542543			#[map(|n| n.into_bytes())]544			theme_name: String,545546			#[map(|keys| string_keys_to_bytes_keys(keys))]547			filter_keys: Option<Vec<String>>548		) -> Option<Theme>, rmrk_api);549}550551fn string_keys_to_bytes_keys(keys: Option<Vec<String>>) -> Option<Vec<Vec<u8>>> {552	keys.map(|keys| keys.into_iter().map(|key| key.into_bytes()).collect())553}
modifiedpallets/common/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -86,8 +86,6 @@
 	let name = create_u16_data::<MAX_COLLECTION_NAME_LENGTH>();
 	let description = create_u16_data::<MAX_COLLECTION_DESCRIPTION_LENGTH>();
 	let token_prefix = create_data::<MAX_TOKEN_PREFIX_LENGTH>();
-	let offchain_schema = create_data::<OFFCHAIN_SCHEMA_LIMIT>();
-	let const_on_chain_schema = create_data::<CONST_ON_CHAIN_SCHEMA_LIMIT>();
 	handler(
 		owner,
 		CreateCollectionData {
@@ -95,8 +93,6 @@
 			name,
 			description,
 			token_prefix,
-			offchain_schema,
-			const_on_chain_schema,
 			..Default::default()
 		},
 	)
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -55,7 +55,6 @@
 	SponsoringRateLimit,
 	budget::Budget,
 	COLLECTION_FIELD_LIMIT,
-	CollectionField,
 	PhantomType,
 	Property,
 	Properties,
@@ -77,6 +76,8 @@
 	RmrkPartType,
 	RmrkTheme,
 	RmrkNftChild,
+	CollectionPermissions,
+	SchemaVersion,
 };
 
 pub use pallet::*;
@@ -433,17 +434,6 @@
 		Hasher = Blake2_128Concat,
 		Key = CollectionId,
 		Value = PropertiesPermissionMap,
-		QueryKind = ValueQuery,
-	>;
-
-	/// Large variable-size collection fields are extracted here
-	#[pallet::storage]
-	pub type CollectionData<T> = StorageNMap<
-		Key = (
-			Key<Twox64Concat, CollectionId>,
-			Key<Twox64Concat, CollectionField>,
-		),
-		Value = BoundedVec<u8, ConstU32<COLLECTION_FIELD_LIMIT>>,
 		QueryKind = ValueQuery,
 	>;
 
@@ -505,19 +495,37 @@
 			if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {
 				use up_data_structs::{CollectionVersion1, CollectionVersion2};
 				<CollectionById<T>>::translate::<CollectionVersion1<T::AccountId>, _>(|id, v| {
-					Self::set_field_raw(
-						id,
-						CollectionField::OffchainSchema,
-						v.offchain_schema.clone().into_inner(),
-					)
-					.expect("data has lower bounds than field");
-					Self::set_field_raw(
+					let mut props = Vec::new();
+					if !v.offchain_schema.is_empty() {
+						props.push(Property {
+							key: b"_old_offchainSchema".to_vec().try_into().unwrap(),
+							value: v.offchain_schema.clone().into_inner().try_into().expect("offchain schema too big"),
+						});
+					}
+					if !v.variable_on_chain_schema.is_empty() {
+						props.push(Property {
+							key: b"_old_variableOnChainSchema".to_vec().try_into().unwrap(),
+							value: v.variable_on_chain_schema.clone().into_inner().try_into().expect("offchain schema too big"),
+						});
+					}
+					if !v.const_on_chain_schema.is_empty() {
+						props.push(Property {
+							key: b"_old_constOnChainSchema".to_vec().try_into().unwrap(),
+							value: v.const_on_chain_schema.clone().into_inner().try_into().expect("offchain schema too big"),
+						});
+					}
+					props.push(Property {
+						key: b"_old_schemaVersion".to_vec().try_into().unwrap(),
+						value: match v.schema_version {
+							SchemaVersion::ImageURL => b"ImageUrl".as_slice(),
+							SchemaVersion::Unique => b"Unique".as_slice(),
+						}.to_vec().try_into().unwrap(),
+					});
+					Self::set_scoped_collection_properties(
 						id,
-						CollectionField::ConstOnChainSchema,
-						v.const_on_chain_schema.clone().into_inner(),
-					)
-					.expect("data has lower bounds than field");
-
+						PropertyScope::None,
+						props.into_iter(),
+					).expect("existing data larger than properties");
 					Some(CollectionVersion2::from(v))
 				});
 			}
@@ -587,7 +595,6 @@
 			owner_can_transfer: Some(limits.owner_can_transfer()),
 			owner_can_destroy: Some(limits.owner_can_destroy()),
 			transfers_enabled: Some(limits.transfers_enabled()),
-			nesting_rule: Some(limits.nesting_rule().clone()),
 		};
 
 		Some(effective_limits)
@@ -599,12 +606,10 @@
 			description,
 			owner,
 			mode,
-			access,
 			token_prefix,
-			mint_mode,
-			schema_version,
 			sponsorship,
 			limits,
+			permissions,
 		} = <CollectionById<T>>::get(collection)?;
 
 		let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)
@@ -628,28 +633,45 @@
 			description: description.into_inner(),
 			owner,
 			mode,
-			access,
 			token_prefix: token_prefix.into_inner(),
-			mint_mode,
-			schema_version,
 			sponsorship,
 			limits,
-			offchain_schema: <CollectionData<T>>::get((
-				collection,
-				CollectionField::OffchainSchema,
-			))
-			.into_inner(),
-			const_on_chain_schema: <CollectionData<T>>::get((
-				collection,
-				CollectionField::ConstOnChainSchema,
-			))
-			.into_inner(),
+			permissions,
 			token_property_permissions,
 			properties,
 		})
 	}
 }
 
+macro_rules! limit_default {
+	($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{
+		$(
+			if let Some($new) = $new.$field {
+				let $old = $old.$field($($arg)?);
+				let _ = $new;
+				let _ = $old;
+				$check
+			} else {
+				$new.$field = $old.$field
+			}
+		)*
+	}};
+}
+macro_rules! limit_default_clone {
+	($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{
+		$(
+			if let Some($new) = $new.$field.clone() {
+				let $old = $old.$field($($arg)?);
+				let _ = $new;
+				let _ = $old;
+				$check
+			} else {
+				$new.$field = $old.$field.clone()
+			}
+		)*
+	}};
+}
+
 impl<T: Config> Pallet<T> {
 	pub fn init_collection(
 		owner: T::AccountId,
@@ -681,11 +703,8 @@
 			owner: owner.clone(),
 			name: data.name,
 			mode: data.mode.clone(),
-			mint_mode: false,
-			access: data.access.unwrap_or_default(),
 			description: data.description,
 			token_prefix: data.token_prefix,
-			schema_version: data.schema_version.unwrap_or_default(),
 			sponsorship: data
 				.pending_sponsor
 				.map(SponsorshipState::Unconfirmed)
@@ -694,6 +713,10 @@
 				.limits
 				.map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))
 				.unwrap_or_else(|| Ok(CollectionLimits::default()))?,
+			permissions: data
+				.permissions
+				.map(|permissions| Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions))
+				.unwrap_or_else(|| Ok(CollectionPermissions::default()))?,
 		};
 
 		let mut collection_properties = up_data_structs::CollectionProperties::get();
@@ -732,18 +755,6 @@
 		<CreatedCollectionCount<T>>::put(created_count);
 		<Pallet<T>>::deposit_event(Event::CollectionCreated(id, data.mode.id(), owner.clone()));
 		<CollectionById<T>>::insert(id, collection);
-		Self::set_field_raw(
-			id,
-			CollectionField::OffchainSchema,
-			data.offchain_schema.into_inner(),
-		)
-		.expect("data has lower bounds than field");
-		Self::set_field_raw(
-			id,
-			CollectionField::ConstOnChainSchema,
-			data.const_on_chain_schema.into_inner(),
-		)
-		.expect("data has lower bounds than field");
 		Ok(id)
 	}
 
@@ -766,7 +777,6 @@
 
 		<DestroyedCollectionCount<T>>::put(destroyed_collections);
 		<CollectionById<T>>::remove(collection.id);
-		<CollectionData<T>>::remove_prefix((collection.id,), None);
 		<AdminAmount<T>>::remove(collection.id);
 		<IsAdmin<T>>::remove_prefix((collection.id,), None);
 		<Allowlist<T>>::remove_prefix((collection.id,), None);
@@ -866,6 +876,18 @@
 		Ok(())
 	}
 
+	// For migrations
+	pub fn set_property_permission_unchecked(
+		collection: CollectionId,
+		property_permission: PropertyKeyPermission,
+	) -> DispatchResult {
+		<CollectionPropertyPermissions<T>>::try_mutate(collection, |permissions| {
+			permissions.try_set(property_permission.key, property_permission.permission)
+		})
+		.map_err(<Error<T>>::from)?;
+		Ok(())
+	}
+
 	pub fn set_property_permission(
 		collection: &CollectionHandle<T>,
 		sender: &T::CrossAccountId,
@@ -989,35 +1011,6 @@
 		Ok(key_permissions)
 	}
 
-	fn set_field_raw(
-		collection_id: CollectionId,
-		field: CollectionField,
-		value: Vec<u8>,
-	) -> DispatchResult {
-		if !value.is_empty() {
-			<CollectionData<T>>::insert(
-				(collection_id, field),
-				BoundedVec::try_from(value).map_err(|_| <Error<T>>::CollectionFieldSizeExceeded)?,
-			)
-		} else {
-			<CollectionData<T>>::remove((collection_id, field));
-		}
-		Ok(())
-	}
-
-	pub fn set_field(
-		collection: &CollectionHandle<T>,
-		sender: &T::CrossAccountId,
-		field: CollectionField,
-		value: Vec<u8>,
-	) -> DispatchResult {
-		collection.check_is_owner_or_admin(sender)?;
-
-		// =========
-
-		Self::set_field_raw(collection.id, field, value)
-	}
-
 	pub fn toggle_allowlist(
 		collection: &CollectionHandle<T>,
 		sender: &T::CrossAccountId,
@@ -1077,21 +1070,6 @@
 		old_limit: &CollectionLimits,
 		mut new_limit: CollectionLimits,
 	) -> Result<CollectionLimits, DispatchError> {
-		macro_rules! limit_default {
-				($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{
-					$(
-						if let Some($new) = $new.$field {
-							let $old = $old.$field($($arg)?);
-							let _ = $new;
-							let _ = $old;
-							$check
-						} else {
-							$new.$field = $old.$field
-						}
-					)*
-				}};
-			}
-
 		limit_default!(old_limit, new_limit,
 			account_token_ownership_limit => ensure!(
 				new_limit <= MAX_TOKEN_OWNERSHIP,
@@ -1126,6 +1104,15 @@
 		);
 		Ok(new_limit)
 	}
+	pub fn clamp_permissions(
+		mode: CollectionMode,
+		old_limit: &CollectionPermissions,
+		mut new_limit: CollectionPermissions,
+	) -> Result<CollectionPermissions, DispatchError> {
+		limit_default_clone!(old_limit, new_limit,
+		);
+		Ok(new_limit)
+	}
 }
 
 #[macro_export]
@@ -1253,7 +1240,6 @@
 	fn last_token_id(&self) -> TokenId;
 
 	fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;
-	fn const_metadata(&self, token: TokenId) -> Vec<u8>;
 	fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue>;
 	fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property>;
 	/// Amount of unique collection tokens
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -51,27 +51,27 @@
 		<SelfWeightOf<T>>::burn_item()
 	}
 
-	fn set_collection_properties(amount: u32) -> Weight {
+	fn set_collection_properties(_amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn delete_collection_properties(amount: u32) -> Weight {
+	fn delete_collection_properties(_amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn set_token_properties(amount: u32) -> Weight {
+	fn set_token_properties(_amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn delete_token_properties(amount: u32) -> Weight {
+	fn delete_token_properties(_amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn set_property_permissions(amount: u32) -> Weight {
+	fn set_property_permissions(_amount: u32) -> Weight {
 		// Error
 		0
 	}
@@ -320,9 +320,6 @@
 
 	fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {
 		None
-	}
-	fn const_metadata(&self, _token: TokenId) -> Vec<u8> {
-		Vec::new()
 	}
 
 	fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -168,7 +168,7 @@
 			.checked_sub(amount)
 			.ok_or(<CommonError<T>>::TokenValueTooLow)?;
 
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(owner)?;
 		}
 
@@ -210,7 +210,7 @@
 			<CommonError<T>>::TransferNotAllowed,
 		);
 
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(from)?;
 			collection.check_allowlist(to)?;
 		}
@@ -280,7 +280,7 @@
 	) -> DispatchResult {
 		if !collection.is_owner_or_admin(sender) {
 			ensure!(
-				collection.mint_mode,
+				collection.permissions.mint_mode(),
 				<CommonError<T>>::PublicMintingNotAllowed
 			);
 			collection.check_allowlist(sender)?;
@@ -380,7 +380,7 @@
 		spender: &T::CrossAccountId,
 		amount: u128,
 	) -> DispatchResult {
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(owner)?;
 			collection.check_allowlist(spender)?;
 		}
@@ -408,7 +408,7 @@
 		if spender.conv_eq(from) {
 			return Ok(None);
 		}
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			// `from`, `to` checked in [`transfer`]
 			collection.check_allowlist(spender)?;
 		}
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -29,9 +29,7 @@
 const SEED: u32 = 1;
 
 fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {
-	let const_data = create_data::<CUSTOM_DATA_LIMIT>();
 	CreateItemData::<T> {
-		const_data,
 		owner,
 		properties: Default::default(),
 	}
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -116,7 +116,6 @@
 ) -> Result<CreateItemData<T>, DispatchError> {
 	match data {
 		up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {
-			const_data: data.const_data,
 			properties: data.properties,
 			owner: to.clone(),
 		}),
@@ -376,12 +375,6 @@
 
 	fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId> {
 		<TokenData<T>>::get((self.id, token)).map(|t| t.owner)
-	}
-	fn const_metadata(&self, token: TokenId) -> Vec<u8> {
-		<TokenData<T>>::get((self.id, token))
-			.map(|t| t.const_data)
-			.unwrap_or_default()
-			.into_inner()
 	}
 
 	fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -109,15 +109,6 @@
 	}
 }
 
-fn error_unsupported_schema_version() -> Error {
-	alloc::format!(
-		"Unsupported schema version! Support only {:?}",
-		SchemaVersion::ImageURL
-	)
-	.as_str()
-	.into()
-}
-
 #[derive(ToLog)]
 pub enum ERC721Events {
 	Transfer {
@@ -167,16 +158,10 @@
 	/// Returns token's const_metadata
 	#[solidity(rename_selector = "tokenURI")]
 	fn token_uri(&self, token_id: uint256) -> Result<string> {
-		if !matches!(self.schema_version, SchemaVersion::ImageURL) {
-			return Err(error_unsupported_schema_version());
-		}
-
 		self.consume_store_reads(1)?;
-		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
+		let _token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
 		Ok(string::from_utf8_lossy(
-			&<TokenData<T>>::get((self.id, token_id))
-				.ok_or("token not found")?
-				.const_data,
+			todo!()
 		)
 		.into())
 	}
@@ -344,7 +329,6 @@
 			self,
 			&caller,
 			CreateItemData::<T> {
-				const_data: BoundedVec::default(),
 				properties: BoundedVec::default(),
 				owner: to,
 			},
@@ -366,10 +350,6 @@
 		token_id: uint256,
 		token_uri: string,
 	) -> Result<bool> {
-		if !matches!(self.schema_version, SchemaVersion::ImageURL) {
-			return Err(error_unsupported_schema_version());
-		}
-
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;
@@ -385,13 +365,12 @@
 			return Err("item id should be next".into());
 		}
 
+		todo!("token uri");
+
 		<Pallet<T>>::create_item(
 			self,
 			&caller,
 			CreateItemData::<T> {
-				const_data: Vec::<u8>::from(token_uri)
-					.try_into()
-					.map_err(|_| "token uri is too long")?,
 				properties: BoundedVec::default(),
 				owner: to,
 			},
@@ -477,7 +456,6 @@
 		}
 		let data = (0..total_tokens)
 			.map(|_| CreateItemData::<T> {
-				const_data: BoundedVec::default(),
 				properties: BoundedVec::default(),
 				owner: to.clone(),
 			})
@@ -496,10 +474,6 @@
 		to: address,
 		tokens: Vec<(uint256, string)>,
 	) -> Result<bool> {
-		if !matches!(self.schema_version, SchemaVersion::ImageURL) {
-			return Err(error_unsupported_schema_version());
-		}
-
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let mut expected_index = <TokensMinted<T>>::get(self.id)
@@ -517,10 +491,8 @@
 			}
 			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;
 
+			todo!("token uri");
 			data.push(CreateItemData::<T> {
-				const_data: Vec::<u8>::from(token_uri)
-					.try_into()
-					.map_err(|_| "token uri is too long")?,
 				properties: BoundedVec::default(),
 				owner: to.clone(),
 			});
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -33,7 +33,7 @@
 use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
 use sp_core::H160;
 use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
-use sp_std::{vec::Vec, vec};
+use sp_std::{vec::Vec, vec, collections::btree_set::BTreeSet};
 use core::ops::Deref;
 use sp_std::collections::btree_map::BTreeMap;
 use codec::{Encode, Decode, MaxEncodedLen};
@@ -52,6 +52,7 @@
 #[struct_versioning::versioned(version = 2, upper)]
 #[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]
 pub struct ItemData<CrossAccountId> {
+	#[version(..2)]
 	pub const_data: BoundedVec<u8, CustomDataLimit>,
 
 	#[version(..2)]
@@ -148,9 +149,45 @@
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_runtime_upgrade() -> Weight {
 			if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {
-				<TokenData<T>>::translate_values::<ItemDataVersion1<T::CrossAccountId>, _>(|v| {
+				let mut had_consts = BTreeSet::new();
+				<TokenData<T>>::translate::<ItemDataVersion1<T::CrossAccountId>, _>(|(collection, token), v| {
+					let mut props = vec![];
+					if !v.const_data.is_empty() {
+						props.push(Property {
+							key: b"_old_constData".to_vec().try_into().unwrap(),
+							value: v.const_data.clone().into_inner().try_into().expect("const too long"),
+						});
+						had_consts.insert(collection);
+					}
+					if !v.variable_data.is_empty() {
+						props.push(Property {
+							key: b"_old_variableData".to_vec().try_into().unwrap(),
+							value: v.variable_data.clone().into_inner().try_into().expect("variable too long"),
+						})
+					}
+					if !props.is_empty() {
+						Self::set_scoped_token_properties(
+							collection,
+							token,
+							PropertyScope::None,
+							props.into_iter(),
+						).expect("existing token data exceeds property storage");
+					}
 					Some(<ItemDataVersion2<T::CrossAccountId>>::from(v))
-				})
+				});
+				for collection in had_consts {
+					<PalletCommon<T>>::set_property_permission_unchecked(
+						collection,
+						PropertyKeyPermission {
+							key: b"_old_constData".to_vec().try_into().unwrap(),
+							permission: PropertyPermission {
+								mutable: false,
+								collection_admin: true,
+								token_owner: false,
+							},
+						}
+					).expect("failed to configure permission");
+				}
 			}
 
 			0
@@ -267,7 +304,7 @@
 			<CommonError<T>>::NoPermission
 		);
 
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(sender)?;
 		}
 
@@ -493,7 +530,7 @@
 			<CommonError<T>>::NoPermission
 		);
 
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(from)?;
 			collection.check_allowlist(to)?;
 		}
@@ -579,7 +616,7 @@
 	) -> DispatchResult {
 		if !collection.is_owner_or_admin(sender) {
 			ensure!(
-				collection.mint_mode,
+				collection.permissions.mint_mode(),
 				<CommonError<T>>::PublicMintingNotAllowed
 			);
 			collection.check_allowlist(sender)?;
@@ -639,7 +676,7 @@
 				<TokenData<T>>::insert(
 					(collection.id, token),
 					ItemData {
-						const_data: data.const_data.clone(),
+						// const_data: data.const_data.clone(),
 						owner: data.owner.clone(),
 					},
 				);
@@ -756,7 +793,7 @@
 		token: TokenId,
 		spender: Option<&T::CrossAccountId>,
 	) -> DispatchResult {
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(sender)?;
 			if let Some(spender) = spender {
 				collection.check_allowlist(spender)?;
@@ -791,7 +828,7 @@
 		if spender.conv_eq(from) {
 			return Ok(());
 		}
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			// `from`, `to` checked in [`transfer`]
 			collection.check_allowlist(spender)?;
 		}
@@ -875,7 +912,7 @@
 			);
 			Ok(())
 		}
-		match handle.limits.nesting_rule() {
+		match handle.permissions.nesting() {
 			NestingRule::Disabled => fail!(<CommonError<T>>::NestingIsDisabled),
 			NestingRule::Owner => {
 				ensure_sender_allowed::<T>(handle.id, under, from, sender, nesting_budget)?
modifiedpallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth
--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -403,10 +403,8 @@
         nft_type: NftType,
         properties: impl Iterator<Item=Property>
     ) -> Result<TokenId, DispatchError> {
+        todo!("store nft type");
         let data = CreateNftExData {
-            const_data: nft_type.encode()
-                .try_into()
-                .map_err(|_| <Error<T>>::NftTypeEncodeError)?,
             properties: BoundedVec::default(),
             owner: owner.clone(),
         };
@@ -528,13 +526,8 @@
         Ok(nft_property)
     }
 
-    pub fn get_nft_type(collection_id: CollectionId, token_id: TokenId) -> Result<NftType, DispatchError> {
-        let token_data = <TokenData<T>>::get((collection_id, token_id))
-            .ok_or(<Error<T>>::NoAvailableNftId)?;
-
-        let mut const_data = token_data.const_data.as_slice();
-
-        NftType::decode(&mut const_data).map_err(|_| <Error<T>>::NoAvailableNftId.into())
+    pub fn get_nft_type(_collection_id: CollectionId, _token_id: TokenId) -> Result<NftType, DispatchError> {
+        todo!("should get it from properties?")
     }
 
     pub fn ensure_nft_type(collection_id: CollectionId, token_id: TokenId, nft_type: NftType) -> DispatchResult {
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -336,11 +336,6 @@
 	fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {
 		None
 	}
-	fn const_metadata(&self, token: TokenId) -> Vec<u8> {
-		<TokenData<T>>::get((self.id, token))
-			.const_data
-			.into_inner()
-	}
 
 	fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {
 		None
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -321,7 +321,7 @@
 			<CommonError<T>>::TransferNotAllowed
 		);
 
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(from)?;
 			collection.check_allowlist(to)?;
 		}
@@ -424,7 +424,7 @@
 	) -> DispatchResult {
 		if !collection.is_owner_or_admin(sender) {
 			ensure!(
-				collection.mint_mode,
+				collection.permissions.mint_mode(),
 				<CommonError<T>>::PublicMintingNotAllowed
 			);
 			collection.check_allowlist(sender)?;
@@ -566,7 +566,7 @@
 		token: TokenId,
 		amount: u128,
 	) -> DispatchResult {
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(sender)?;
 			collection.check_allowlist(spender)?;
 		}
@@ -598,7 +598,7 @@
 		if spender.conv_eq(from) {
 			return Ok(None);
 		}
-		if collection.access == AccessMode::AllowList {
+		if collection.permissions.access() == AccessMode::AllowList {
 			// `from`, `to` checked in [`transfer`]
 			collection.check_allowlist(spender)?;
 		}
modifiedpallets/unique/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/unique/src/benchmarking.rs
+++ b/pallets/unique/src/benchmarking.rs
@@ -130,26 +130,6 @@
 		let collection = create_nft_collection::<T>(caller.clone())?;
 	}: _(RawOrigin::Signed(caller.clone()), collection, false)
 
-	set_offchain_schema {
-		let b in 0..OFFCHAIN_SCHEMA_LIMIT;
-
-		let caller: T::AccountId = account("caller", 0, SEED);
-		let collection = create_nft_collection::<T>(caller.clone())?;
-		let data = create_var_data(b);
-	}: set_offchain_schema(RawOrigin::Signed(caller.clone()), collection, data)
-
-	set_const_on_chain_schema {
-		let b in 0..CONST_ON_CHAIN_SCHEMA_LIMIT;
-
-		let caller: T::AccountId = account("caller", 0, SEED);
-		let collection = create_nft_collection::<T>(caller.clone())?;
-		let data = create_var_data(b);
-	}: set_const_on_chain_schema(RawOrigin::Signed(caller.clone()), collection, data)
-
-	set_schema_version {
-		let caller: T::AccountId = account("caller", 0, SEED);
-		let collection = create_nft_collection::<T>(caller.clone())?;
-	}: set_schema_version(RawOrigin::Signed(caller.clone()), collection, SchemaVersion::Unique)
 
 	set_collection_limits{
 		let caller: T::AccountId = account("caller", 0, SEED);
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -35,10 +35,10 @@
 use frame_system::{self as system, ensure_signed};
 use sp_runtime::{sp_std::prelude::Vec};
 use up_data_structs::{
-	CONST_ON_CHAIN_SCHEMA_LIMIT, OFFCHAIN_SCHEMA_LIMIT, MAX_COLLECTION_NAME_LENGTH,
+	MAX_COLLECTION_NAME_LENGTH,
 	MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, AccessMode, CreateItemData,
-	CollectionLimits, CollectionId, CollectionMode, TokenId, SchemaVersion, SponsorshipState,
-	CreateCollectionData, CreateItemExData, budget, CollectionField, Property, PropertyKey,
+	CollectionLimits, CollectionPermissions, CollectionId, CollectionMode, TokenId, SponsorshipState,
+	CreateCollectionData, CreateItemExData, budget, Property, PropertyKey,
 	PropertyKeyPermission,
 };
 use pallet_evm::account::CrossAccountId;
@@ -162,6 +162,8 @@
 		/// * collection_id: Globally unique collection identifier.
 		CollectionLimitSet(CollectionId),
 
+		CollectionPermissionSet(CollectionId),
+
 		/// Mint permission	was set
 		///
 		/// # Arguments
@@ -417,67 +419,6 @@
 			));
 
 			Ok(())
-		}
-
-		/// Toggle between normal and allow list access for the methods with access for `Anyone`.
-		///
-		/// # Permissions
-		///
-		/// * Collection Owner.
-		///
-		/// # Arguments
-		///
-		/// * collection_id.
-		///
-		/// * mode: [AccessMode]
-		#[weight = <SelfWeightOf<T>>::set_public_access_mode()]
-		#[transactional]
-		pub fn set_public_access_mode(origin, collection_id: CollectionId, mode: AccessMode) -> DispatchResult
-		{
-			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
-
-			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
-			target_collection.check_is_owner(&sender)?;
-
-			target_collection.access = mode.clone();
-
-			<Pallet<T>>::deposit_event(Event::<T>::PublicAccessModeSet(
-				collection_id,
-				mode
-			));
-
-			target_collection.save()
-		}
-
-		/// Allows Anyone to create tokens if:
-		/// * Allow List is enabled, and
-		/// * Address is added to allow list, and
-		/// * This method was called with True parameter
-		///
-		/// # Permissions
-		/// * Collection Owner
-		///
-		/// # Arguments
-		///
-		/// * collection_id.
-		///
-		/// * mint_permission: Boolean parameter. If True, allows minting to Anyone with conditions above.
-		#[weight = <SelfWeightOf<T>>::set_mint_permission()]
-		#[transactional]
-		pub fn set_mint_permission(origin, collection_id: CollectionId, mint_permission: bool) -> DispatchResult
-		{
-			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
-
-			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
-			target_collection.check_is_owner(&sender)?;
-
-			target_collection.mint_mode = mint_permission;
-
-			<Pallet<T>>::deposit_event(Event::<T>::MintPermissionSet(
-				collection_id
-			));
-
-			target_collection.save()
 		}
 
 		/// Change the owner of the collection.
@@ -941,118 +882,42 @@
 			dispatch_call::<T, _>(collection_id, |d| d.transfer_from(sender, from, recipient, item_id, value, &budget))
 		}
 
-		/// Set schema standard
-		/// ImageURL
-		/// Unique
-		///
-		/// # Permissions
-		///
-		/// * Collection Owner
-		/// * Collection Admin
-		///
-		/// # Arguments
-		///
-		/// * collection_id.
-		///
-		/// * schema: SchemaVersion: enum
-		#[weight = <SelfWeightOf<T>>::set_schema_version()]
+		#[weight = <SelfWeightOf<T>>::set_collection_limits()]
 		#[transactional]
-		pub fn set_schema_version(
+		pub fn set_collection_limits(
 			origin,
 			collection_id: CollectionId,
-			version: SchemaVersion
+			new_limit: CollectionLimits,
 		) -> DispatchResult {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
-			target_collection.check_is_owner_or_admin(&sender)?;
-			target_collection.schema_version = version;
-
-			<Pallet<T>>::deposit_event(Event::<T>::SchemaVersionSet(
-				collection_id
-			));
-
-			target_collection.save()
-		}
-
-		/// Set off-chain data schema.
-		///
-		/// # Permissions
-		///
-		/// * Collection Owner
-		/// * Collection Admin
-		///
-		/// # Arguments
-		///
-		/// * collection_id.
-		///
-		/// * schema: String representing the offchain data schema.
-		#[weight = <SelfWeightOf<T>>::set_offchain_schema(schema.len() as u32)]
-		#[transactional]
-		pub fn set_offchain_schema(
-			origin,
-			collection_id: CollectionId,
-			schema: BoundedVec<u8, ConstU32<OFFCHAIN_SCHEMA_LIMIT>>,
-		) -> DispatchResult {
-			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
-			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
+			target_collection.check_is_owner(&sender)?;
+			let old_limit = &target_collection.limits;
 
-			// =========
+			target_collection.limits = <PalletCommon<T>>::clamp_limits(target_collection.mode.clone(), &old_limit, new_limit)?;
 
-			<PalletCommon<T>>::set_field(&collection, &sender, CollectionField::OffchainSchema, schema.into_inner())?;
-
-			<Pallet<T>>::deposit_event(Event::<T>::OffchainSchemaSet(
+			<Pallet<T>>::deposit_event(Event::<T>::CollectionLimitSet(
 				collection_id
 			));
-			Ok(())
-		}
 
-		/// Set const on-chain data schema.
-		///
-		/// # Permissions
-		///
-		/// * Collection Owner
-		/// * Collection Admin
-		///
-		/// # Arguments
-		///
-		/// * collection_id.
-		///
-		/// * schema: String representing the const on-chain data schema.
-		#[weight = <SelfWeightOf<T>>::set_const_on_chain_schema(schema.len() as u32)]
-		#[transactional]
-		pub fn set_const_on_chain_schema (
-			origin,
-			collection_id: CollectionId,
-			schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>
-		) -> DispatchResult {
-			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
-			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
-
-			// =========
-
-			<PalletCommon<T>>::set_field(&collection, &sender, CollectionField::ConstOnChainSchema, schema.into_inner())?;
-
-			<Pallet<T>>::deposit_event(Event::<T>::ConstOnChainSchemaSet(
-				collection_id
-			));
-			Ok(())
+			target_collection.save()
 		}
 
 		#[weight = <SelfWeightOf<T>>::set_collection_limits()]
 		#[transactional]
-		pub fn set_collection_limits(
+		pub fn set_collection_permissions(
 			origin,
 			collection_id: CollectionId,
-			new_limit: CollectionLimits,
+			new_limit: CollectionPermissions,
 		) -> DispatchResult {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
 			target_collection.check_is_owner(&sender)?;
-			let old_limit = &target_collection.limits;
+			let old_limit = &target_collection.permissions;
 
-			target_collection.limits = <PalletCommon<T>>::clamp_limits(target_collection.mode.clone(), &old_limit, new_limit)?;
+			target_collection.permissions = <PalletCommon<T>>::clamp_permissions(target_collection.mode.clone(), &old_limit, new_limit)?;
 
-			<Pallet<T>>::deposit_event(Event::<T>::CollectionLimitSet(
+			<Pallet<T>>::deposit_event(Event::<T>::CollectionPermissionSet(
 				collection_id
 			));
 
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -186,7 +186,6 @@
 #[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct TokenData<CrossAccountId> {
-	pub const_data: Vec<u8>,
 	pub properties: Vec<Property>,
 	pub owner: Option<CrossAccountId>,
 }
@@ -223,7 +222,7 @@
 	fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>;
 }
 
-#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]
+#[derive(Encode, Decode, Eq, Debug, Clone, Copy, PartialEq, TypeInfo, MaxEncodedLen)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub enum AccessMode {
 	Normal,
@@ -296,22 +295,26 @@
 pub struct Collection<AccountId> {
 	pub owner: AccountId,
 	pub mode: CollectionMode,
+	#[version(..2)]
 	pub access: AccessMode,
 	pub name: BoundedVec<u16, ConstU32<MAX_COLLECTION_NAME_LENGTH>>,
 	pub description: BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>,
 	pub token_prefix: BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>,
+
+	#[version(..2)]
 	pub mint_mode: bool,
 
 	#[version(..2)]
 	pub offchain_schema: BoundedVec<u8, ConstU32<OFFCHAIN_SCHEMA_LIMIT>>,
 
+	#[version(..2)]
 	pub schema_version: SchemaVersion,
 	pub sponsorship: SponsorshipState<AccountId>,
 
-	#[version(..2)]
-	pub limits: CollectionLimitsVersion1, // Collection private restrictions
-	#[version(2.., upper(limits.into()))]
-	pub limits: CollectionLimitsVersion2,
+	pub limits: CollectionLimits,
+
+	#[version(2.., upper(Default::default()))]
+	pub permissions: CollectionPermissions,
 
 	#[version(..2)]
 	pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,
@@ -329,27 +332,16 @@
 pub struct RpcCollection<AccountId> {
 	pub owner: AccountId,
 	pub mode: CollectionMode,
-	pub access: AccessMode,
 	pub name: Vec<u16>,
 	pub description: Vec<u16>,
 	pub token_prefix: Vec<u8>,
-	pub mint_mode: bool,
-	pub offchain_schema: Vec<u8>,
-	pub schema_version: SchemaVersion,
 	pub sponsorship: SponsorshipState<AccountId>,
 	pub limits: CollectionLimits,
-	pub const_on_chain_schema: Vec<u8>,
+	pub permissions: CollectionPermissions,
 	pub token_property_permissions: Vec<PropertyKeyPermission>,
 	pub properties: Vec<Property>,
 }
 
-#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
-pub enum CollectionField {
-	ConstOnChainSchema,
-	OffchainSchema,
-}
-
 #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, Derivative, MaxEncodedLen)]
 #[derivative(Debug, Default(bound = ""))]
 pub struct CreateCollectionData<AccountId> {
@@ -359,11 +351,9 @@
 	pub name: BoundedVec<u16, ConstU32<MAX_COLLECTION_NAME_LENGTH>>,
 	pub description: BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>,
 	pub token_prefix: BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>,
-	pub offchain_schema: BoundedVec<u8, ConstU32<OFFCHAIN_SCHEMA_LIMIT>>,
-	pub schema_version: Option<SchemaVersion>,
 	pub pending_sponsor: Option<AccountId>,
 	pub limits: Option<CollectionLimits>,
-	pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,
+	pub permissions: Option<CollectionPermissions>,
 	pub token_property_permissions: CollectionPropertiesPermissionsVec,
 	pub properties: CollectionPropertiesVec,
 }
@@ -375,7 +365,6 @@
 	BoundedVec<Property, ConstU32<MAX_PROPERTIES_PER_ITEM>>;
 
 /// All fields are wrapped in `Option`s, where None means chain default
-#[struct_versioning::versioned(version = 2, upper)]
 #[derive(Encode, Decode, Debug, Default, Clone, PartialEq, TypeInfo, MaxEncodedLen)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct CollectionLimits {
@@ -395,9 +384,6 @@
 	pub owner_can_transfer: Option<bool>,
 	pub owner_can_destroy: Option<bool>,
 	pub transfers_enabled: Option<bool>,
-
-	#[version(2.., upper(None))]
-	pub nesting_rule: Option<NestingRule>,
 }
 
 impl CollectionLimits {
@@ -444,9 +430,26 @@
 			SponsoringRateLimit::Blocks(v) => Some(v.min(MAX_SPONSOR_TIMEOUT)),
 		}
 	}
-	pub fn nesting_rule(&self) -> &NestingRule {
+}
+
+#[derive(Encode, Decode, Debug, Default, Clone, PartialEq, TypeInfo, MaxEncodedLen)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+pub struct CollectionPermissions {
+	pub access: Option<AccessMode>,
+	pub mint_mode: Option<bool>,
+	pub nesting: Option<NestingRule>,
+}
+
+impl CollectionPermissions {
+	pub fn access(&self) -> AccessMode {
+		self.access.unwrap_or(AccessMode::Normal)
+	}
+	pub fn mint_mode(&self) -> bool {
+		self.mint_mode.unwrap_or(false)
+	}
+	pub fn nesting(&self) -> &NestingRule {
 		static DEFAULT: NestingRule = NestingRule::Disabled;
-		self.nesting_rule.as_ref().unwrap_or(&DEFAULT)
+		self.nesting.as_ref().unwrap_or(&DEFAULT)
 	}
 }
 
@@ -520,8 +523,6 @@
 #[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]
 #[derivative(Debug)]
 pub struct CreateNftExData<CrossAccountId> {
-	#[derivative(Debug(format_with = "bounded::vec_debug"))]
-	pub const_data: BoundedVec<u8, CustomDataLimit>,
 	#[derivative(Debug(format_with = "bounded::vec_debug"))]
 	pub properties: CollectionPropertiesVec,
 	pub owner: CrossAccountId,
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -41,7 +41,6 @@
 
 		fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;
 		fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;
-		fn const_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>>;
 
 		fn collection_properties(collection: CollectionId, properties: Option<Vec<Vec<u8>>>) -> Result<Vec<Property>>;
 
modifiedruntime/common/src/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -29,9 +29,6 @@
 
                     Ok(Some(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?))
                 }
-                fn const_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>, DispatchError> {
-                    dispatch_unique_runtime!(collection.const_metadata(token))
-                }
 
                 fn collection_properties(
                     collection: CollectionId,
@@ -73,7 +70,6 @@
                     keys: Option<Vec<Vec<u8>>>
                 ) -> Result<TokenData<CrossAccountId>, DispatchError> {
                     let token_data = TokenData {
-                        const_data: Self::const_metadata(collection, token_id)?,
                         properties: Self::token_properties(collection, token_id, keys)?,
                         owner: Self::token_owner(collection, token_id)?
                     };
modifiedruntime/tests/src/tests.rsdiffbeforeafterboth
--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -2399,28 +2399,6 @@
 // #endregion
 
 #[test]
-fn set_const_on_chain_schema() {
-	new_test_ext().execute_with(|| {
-		let collection_id = create_test_collection(&CollectionMode::NFT, CollectionId(1));
-
-		let origin1 = Origin::signed(1);
-		assert_ok!(Unique::set_const_on_chain_schema(
-			origin1,
-			collection_id,
-			b"test const on chain schema".to_vec().try_into().unwrap()
-		));
-
-		assert_eq!(
-			<pallet_common::CollectionData<Test>>::get((
-				collection_id,
-				CollectionField::ConstOnChainSchema
-			)),
-			b"test const on chain schema".to_vec()
-		);
-	});
-}
-
-#[test]
 fn collection_transfer_flag_works() {
 	new_test_ext().execute_with(|| {
 		let origin1 = Origin::signed(1);