git.delta.rocks / unique-network / refs/commits / 8ca834e34e7f

difftreelog

feat add evm OptionUint type

Trubnikov Sergey2022-12-20parent: #fef3ff1.patch.diff
in: master

19 files changed

modifiedpallets/common/src/eth.rsdiffbeforeafterboth
before · pallets/common/src/eth.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! The module contains a number of functions for converting and checking ethereum identifiers.1819use alloc::format;20use sp_std::{vec, vec::Vec};21use evm_coder::{22	AbiCoder,23	types::{uint256, address},24};25pub use pallet_evm::{Config, account::CrossAccountId};26use sp_core::H160;27use up_data_structs::CollectionId;2829// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 130// TODO: Unhardcode prefix31const ETH_COLLECTION_PREFIX: [u8; 16] = [32	0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,33];3435/// Maps the ethereum address of the collection in substrate.36pub fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {37	if eth[0..16] != ETH_COLLECTION_PREFIX {38		return None;39	}40	let mut id_bytes = [0; 4];41	id_bytes.copy_from_slice(&eth[16..20]);42	Some(CollectionId(u32::from_be_bytes(id_bytes)))43}4445/// Maps the substrate collection id in ethereum.46pub fn collection_id_to_address(id: CollectionId) -> H160 {47	let mut out = [0; 20];48	out[0..16].copy_from_slice(&ETH_COLLECTION_PREFIX);49	out[16..20].copy_from_slice(&u32::to_be_bytes(id.0));50	H160(out)51}5253/// Check if the ethereum address is a collection.54pub fn is_collection(address: &H160) -> bool {55	address[0..16] == ETH_COLLECTION_PREFIX56}5758/// Convert `uint256` to `CrossAccountId`.59pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId60where61	T::AccountId: From<[u8; 32]>,62{63	let mut new_admin_arr = [0_u8; 32];64	from.to_big_endian(&mut new_admin_arr);65	let account_id = T::AccountId::from(new_admin_arr);66	T::CrossAccountId::from_sub(account_id)67}6869/// Cross account struct70#[derive(Debug, Default, AbiCoder)]71pub struct CrossAccount {72	pub(crate) eth: address,73	pub(crate) sub: uint256,74}7576impl CrossAccount {77	/// Converts `CrossAccountId` to [`CrossAccount`]78	pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self79	where80		T: pallet_evm::Config,81		T::AccountId: AsRef<[u8; 32]>,82	{83		if cross_account_id.is_canonical_substrate() {84			Self::from_sub::<T>(cross_account_id.as_sub())85		} else {86			Self {87				eth: *cross_account_id.as_eth(),88				sub: Default::default(),89			}90		}91	}92	/// Creates [`CrossAccount`] from substrate account93	pub fn from_sub<T>(account_id: &T::AccountId) -> Self94	where95		T: pallet_evm::Config,96		T::AccountId: AsRef<[u8; 32]>,97	{98		Self {99			eth: Default::default(),100			sub: uint256::from_big_endian(account_id.as_ref()),101		}102	}103	/// Converts [`CrossAccount`] to `CrossAccountId`104	pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>105	where106		T: pallet_evm::Config,107		T::AccountId: From<[u8; 32]>,108	{109		if self.eth == Default::default() && self.sub == Default::default() {110			Err("All fields of cross account is zeroed".into())111		} else if self.eth == Default::default() {112			Ok(convert_uint256_to_cross_account::<T>(self.sub))113		} else if self.sub == Default::default() {114			Ok(T::CrossAccountId::from_eth(self.eth))115		} else {116			Err("All fields of cross account is non zeroed".into())117		}118	}119}120121/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).122#[derive(Debug, Default, AbiCoder)]123pub struct Property {124	/// Property key.125	pub key: evm_coder::types::string,126	/// Property value.127	pub value: evm_coder::types::bytes,128}129130/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.131#[derive(Debug, Default, Clone, Copy, AbiCoder)]132#[repr(u8)]133pub enum CollectionLimitField {134	/// How many tokens can a user have on one account.135	#[default]136	AccountTokenOwnership,137138	/// How many bytes of data are available for sponsorship.139	SponsoredDataSize,140141	/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]142	SponsoredDataRateLimit,143144	/// How many tokens can be mined into this collection.145	TokenLimit,146147	/// Timeouts for transfer sponsoring.148	SponsorTransferTimeout,149150	/// Timeout for sponsoring an approval in passed blocks.151	SponsorApproveTimeout,152153	/// Whether the collection owner of the collection can send tokens (which belong to other users).154	OwnerCanTransfer,155156	/// Can the collection owner burn other people's tokens.157	OwnerCanDestroy,158159	/// Is it possible to send tokens from this collection between users.160	TransferEnabled,161}162163/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.164#[derive(Debug, Default, AbiCoder)]165pub struct CollectionLimit {166	field: CollectionLimitField,167	status: bool,168	value: uint256,169}170171impl CollectionLimit {172	/// Make [`CollectionLimit`] from [`CollectionLimitField`] and int value.173	pub fn from_int(field: CollectionLimitField, value: u32) -> Self {174		Self {175			field,176			status: true,177			value: value.into(),178		}179	}180181	/// Make [`CollectionLimit`] from [`CollectionLimitField`] and optional int value.182	pub fn from_opt_int(field: CollectionLimitField, value: Option<u32>) -> Self {183		value184			.map(|v| Self {185				field,186				status: true,187				value: v.into(),188			})189			.unwrap_or(Self {190				field,191				status: false,192				value: Default::default(),193			})194	}195196	/// Make [`CollectionLimit`] from [`CollectionLimitField`] and bool value.197	pub fn from_opt_bool(field: CollectionLimitField, value: Option<bool>) -> Self {198		value199			.map(|v| Self {200				field,201				status: true,202				value: if v {203					uint256::from(1)204				} else {205					Default::default()206				},207			})208			.unwrap_or(Self {209				field,210				status: false,211				value: Default::default(),212			})213	}214}215216impl TryInto<up_data_structs::CollectionLimits> for CollectionLimit {217	type Error = evm_coder::execution::Error;218219	fn try_into(self) -> Result<up_data_structs::CollectionLimits, Self::Error> {220		if !self.status {221			return Err(Self::Error::Revert("user can't disable limits".into()));222		}223224		let value = self.value.try_into().map_err(|error| {225			Self::Error::Revert(format!(226				"can't convert value to u32 \"{}\" because: \"{error}\"",227				self.value228			))229		})?;230231		let convert_value_to_bool = || match value {232			0 => Ok(false),233			1 => Ok(true),234			_ => {235				return Err(Self::Error::Revert(format!(236					"can't convert value to boolean \"{value}\""237				)))238			}239		};240241		let mut limits = up_data_structs::CollectionLimits::default();242		match self.field {243			CollectionLimitField::AccountTokenOwnership => {244				limits.account_token_ownership_limit = Some(value);245			}246			CollectionLimitField::SponsoredDataSize => {247				limits.sponsored_data_size = Some(value);248			}249			CollectionLimitField::SponsoredDataRateLimit => {250				limits.sponsored_data_rate_limit =251					Some(up_data_structs::SponsoringRateLimit::Blocks(value));252			}253			CollectionLimitField::TokenLimit => {254				limits.token_limit = Some(value);255			}256			CollectionLimitField::SponsorTransferTimeout => {257				limits.sponsor_transfer_timeout = Some(value);258			}259			CollectionLimitField::SponsorApproveTimeout => {260				limits.sponsor_approve_timeout = Some(value);261			}262			CollectionLimitField::OwnerCanTransfer => {263				limits.owner_can_transfer = Some(convert_value_to_bool()?);264			}265			CollectionLimitField::OwnerCanDestroy => {266				limits.owner_can_destroy = Some(convert_value_to_bool()?);267			}268			CollectionLimitField::TransferEnabled => {269				limits.transfers_enabled = Some(convert_value_to_bool()?);270			}271		};272		Ok(limits)273	}274}275276/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.277#[derive(Default, Debug, Clone, Copy, AbiCoder)]278#[repr(u8)]279pub enum CollectionPermissions {280	/// Owner of token can nest tokens under it.281	#[default]282	TokenOwner,283284	/// Admin of token collection can nest tokens under token.285	CollectionAdmin,286}287288/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.289#[derive(AbiCoder, Copy, Clone, Default, Debug)]290#[repr(u8)]291pub enum TokenPermissionField {292	/// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]293	#[default]294	Mutable,295296	/// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]297	TokenOwner,298299	/// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]300	CollectionAdmin,301}302303/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.304#[derive(Debug, Default, AbiCoder)]305pub struct PropertyPermission {306	/// TokenPermission field.307	code: TokenPermissionField,308	/// TokenPermission value.309	value: bool,310}311312impl PropertyPermission {313	/// Make vector of [`PropertyPermission`] from [`up_data_structs::PropertyPermission`].314	pub fn into_vec(pp: up_data_structs::PropertyPermission) -> Vec<Self> {315		vec![316			PropertyPermission {317				code: TokenPermissionField::Mutable,318				value: pp.mutable,319			},320			PropertyPermission {321				code: TokenPermissionField::TokenOwner,322				value: pp.token_owner,323			},324			PropertyPermission {325				code: TokenPermissionField::CollectionAdmin,326				value: pp.collection_admin,327			},328		]329	}330331	/// Make [`up_data_structs::PropertyPermission`] from vector of [`PropertyPermission`].332	pub fn from_vec(permission: Vec<Self>) -> up_data_structs::PropertyPermission {333		let mut token_permission = up_data_structs::PropertyPermission::default();334335		for PropertyPermission { code, value } in permission {336			match code {337				TokenPermissionField::Mutable => token_permission.mutable = value,338				TokenPermissionField::TokenOwner => token_permission.token_owner = value,339				TokenPermissionField::CollectionAdmin => token_permission.collection_admin = value,340			}341		}342		token_permission343	}344}345346/// Ethereum representation of Token Property Permissions.347#[derive(Debug, Default, AbiCoder)]348pub struct TokenPropertyPermission {349	/// Token property key.350	key: evm_coder::types::string,351	/// Token property permissions.352	permissions: Vec<PropertyPermission>,353}354355impl356	From<(357		up_data_structs::PropertyKey,358		up_data_structs::PropertyPermission,359	)> for TokenPropertyPermission360{361	fn from(362		value: (363			up_data_structs::PropertyKey,364			up_data_structs::PropertyPermission,365		),366	) -> Self {367		let (key, permission) = value;368		let key = evm_coder::types::string::from_utf8(key.into_inner())369			.expect("Stored key must be valid");370		let permissions = PropertyPermission::into_vec(permission);371		Self { key, permissions }372	}373}374375impl TokenPropertyPermission {376	/// Convert vector of [`TokenPropertyPermission`] into vector of [`up_data_structs::PropertyKeyPermission`].377	pub fn into_property_key_permissions(378		permissions: Vec<TokenPropertyPermission>,379	) -> evm_coder::execution::Result<Vec<up_data_structs::PropertyKeyPermission>> {380		let mut perms = Vec::new();381382		for TokenPropertyPermission { key, permissions } in permissions {383			if permissions.len() > <TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT {384				return Err(alloc::format!(385					"Actual number of fields {} for {}, which exceeds the maximum value of {}",386					permissions.len(),387					stringify!(EthTokenPermissions),388					<TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT389				)390				.as_str()391				.into());392			}393394			let token_permission = PropertyPermission::from_vec(permissions);395396			perms.push(up_data_structs::PropertyKeyPermission {397				key: key.into_bytes().try_into().map_err(|_| "too long key")?,398				permission: token_permission,399			});400		}401		Ok(perms)402	}403}
after · pallets/common/src/eth.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! The module contains a number of functions for converting and checking ethereum identifiers.1819use alloc::format;20use sp_std::{vec, vec::Vec};21use evm_coder::{22	AbiCoder,23	types::{uint256, address},24};25pub use pallet_evm::{Config, account::CrossAccountId};26use sp_core::H160;27use up_data_structs::CollectionId;2829// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 130// TODO: Unhardcode prefix31const ETH_COLLECTION_PREFIX: [u8; 16] = [32	0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,33];3435/// Maps the ethereum address of the collection in substrate.36pub fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {37	if eth[0..16] != ETH_COLLECTION_PREFIX {38		return None;39	}40	let mut id_bytes = [0; 4];41	id_bytes.copy_from_slice(&eth[16..20]);42	Some(CollectionId(u32::from_be_bytes(id_bytes)))43}4445/// Maps the substrate collection id in ethereum.46pub fn collection_id_to_address(id: CollectionId) -> H160 {47	let mut out = [0; 20];48	out[0..16].copy_from_slice(&ETH_COLLECTION_PREFIX);49	out[16..20].copy_from_slice(&u32::to_be_bytes(id.0));50	H160(out)51}5253/// Check if the ethereum address is a collection.54pub fn is_collection(address: &H160) -> bool {55	address[0..16] == ETH_COLLECTION_PREFIX56}5758/// Convert `uint256` to `CrossAccountId`.59pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId60where61	T::AccountId: From<[u8; 32]>,62{63	let mut new_admin_arr = [0_u8; 32];64	from.to_big_endian(&mut new_admin_arr);65	let account_id = T::AccountId::from(new_admin_arr);66	T::CrossAccountId::from_sub(account_id)67}6869/// Ethereum representation of Optional value with uint256.70#[derive(Debug, Default, AbiCoder)]71pub struct OptionUint {72	status: bool,73	value: uint256,74}7576impl From<u32> for OptionUint {77	fn from(value: u32) -> Self {78		Self {79			status: true,80			value: uint256::from(value),81		}82	}83}8485impl From<Option<u32>> for OptionUint {86	fn from(value: Option<u32>) -> Self {87		match value {88			Some(value) => Self {89				status: true,90				value: value.into(),91			},92			None => Self {93				status: false,94				value: Default::default(),95			},96		}97	}98}99100impl From<Option<bool>> for OptionUint {101	fn from(value: Option<bool>) -> Self {102		match value {103			Some(value) => Self {104				status: true,105				value: if value {106					uint256::from(1)107				} else {108					Default::default()109				},110			},111			None => Self {112				status: false,113				value: Default::default(),114			},115		}116	}117}118119/// Cross account struct120#[derive(Debug, Default, AbiCoder)]121pub struct CrossAccount {122	pub(crate) eth: address,123	pub(crate) sub: uint256,124}125126impl CrossAccount {127	/// Converts `CrossAccountId` to [`CrossAccount`]128	pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self129	where130		T: pallet_evm::Config,131		T::AccountId: AsRef<[u8; 32]>,132	{133		if cross_account_id.is_canonical_substrate() {134			Self::from_sub::<T>(cross_account_id.as_sub())135		} else {136			Self {137				eth: *cross_account_id.as_eth(),138				sub: Default::default(),139			}140		}141	}142	/// Creates [`CrossAccount`] from substrate account143	pub fn from_sub<T>(account_id: &T::AccountId) -> Self144	where145		T: pallet_evm::Config,146		T::AccountId: AsRef<[u8; 32]>,147	{148		Self {149			eth: Default::default(),150			sub: uint256::from_big_endian(account_id.as_ref()),151		}152	}153	/// Converts [`CrossAccount`] to `CrossAccountId`154	pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>155	where156		T: pallet_evm::Config,157		T::AccountId: From<[u8; 32]>,158	{159		if self.eth == Default::default() && self.sub == Default::default() {160			Err("All fields of cross account is zeroed".into())161		} else if self.eth == Default::default() {162			Ok(convert_uint256_to_cross_account::<T>(self.sub))163		} else if self.sub == Default::default() {164			Ok(T::CrossAccountId::from_eth(self.eth))165		} else {166			Err("All fields of cross account is non zeroed".into())167		}168	}169}170171/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).172#[derive(Debug, Default, AbiCoder)]173pub struct Property {174	/// Property key.175	pub key: evm_coder::types::string,176	/// Property value.177	pub value: evm_coder::types::bytes,178}179180/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.181#[derive(Debug, Default, Clone, Copy, AbiCoder)]182#[repr(u8)]183pub enum CollectionLimitField {184	/// How many tokens can a user have on one account.185	#[default]186	AccountTokenOwnership,187188	/// How many bytes of data are available for sponsorship.189	SponsoredDataSize,190191	/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]192	SponsoredDataRateLimit,193194	/// How many tokens can be mined into this collection.195	TokenLimit,196197	/// Timeouts for transfer sponsoring.198	SponsorTransferTimeout,199200	/// Timeout for sponsoring an approval in passed blocks.201	SponsorApproveTimeout,202203	/// Whether the collection owner of the collection can send tokens (which belong to other users).204	OwnerCanTransfer,205206	/// Can the collection owner burn other people's tokens.207	OwnerCanDestroy,208209	/// Is it possible to send tokens from this collection between users.210	TransferEnabled,211}212213/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.214#[derive(Debug, Default, AbiCoder)]215pub struct CollectionLimit {216	field: CollectionLimitField,217	value: OptionUint,218}219220impl CollectionLimit {221	/// Make [`CollectionLimit`] from [`CollectionLimitField`] and int value.222	pub fn from_int(field: CollectionLimitField, value: u32) -> Self {223		Self {224			field,225			value: value.into(),226		}227	}228229	/// Make [`CollectionLimit`] from [`CollectionLimitField`] and optional int value.230	pub fn from_opt_int(field: CollectionLimitField, value: Option<u32>) -> Self {231		Self {232			field,233			value: value.into(),234		}235	}236237	/// Make [`CollectionLimit`] from [`CollectionLimitField`] and bool value.238	pub fn from_opt_bool(field: CollectionLimitField, value: Option<bool>) -> Self {239		Self {240			field,241			value: value.into(),242		}243	}244}245246impl TryInto<up_data_structs::CollectionLimits> for CollectionLimit {247	type Error = evm_coder::execution::Error;248249	fn try_into(self) -> Result<up_data_structs::CollectionLimits, Self::Error> {250		if !self.value.status {251			return Err(Self::Error::Revert("user can't disable limits".into()));252		}253254		let value = self.value.value.try_into().map_err(|error| {255			Self::Error::Revert(format!(256				"can't convert value to u32 \"{}\" because: \"{error}\"",257				self.value.value258			))259		})?;260261		let convert_value_to_bool = || match value {262			0 => Ok(false),263			1 => Ok(true),264			_ => {265				return Err(Self::Error::Revert(format!(266					"can't convert value to boolean \"{value}\""267				)))268			}269		};270271		let mut limits = up_data_structs::CollectionLimits::default();272		match self.field {273			CollectionLimitField::AccountTokenOwnership => {274				limits.account_token_ownership_limit = Some(value);275			}276			CollectionLimitField::SponsoredDataSize => {277				limits.sponsored_data_size = Some(value);278			}279			CollectionLimitField::SponsoredDataRateLimit => {280				limits.sponsored_data_rate_limit =281					Some(up_data_structs::SponsoringRateLimit::Blocks(value));282			}283			CollectionLimitField::TokenLimit => {284				limits.token_limit = Some(value);285			}286			CollectionLimitField::SponsorTransferTimeout => {287				limits.sponsor_transfer_timeout = Some(value);288			}289			CollectionLimitField::SponsorApproveTimeout => {290				limits.sponsor_approve_timeout = Some(value);291			}292			CollectionLimitField::OwnerCanTransfer => {293				limits.owner_can_transfer = Some(convert_value_to_bool()?);294			}295			CollectionLimitField::OwnerCanDestroy => {296				limits.owner_can_destroy = Some(convert_value_to_bool()?);297			}298			CollectionLimitField::TransferEnabled => {299				limits.transfers_enabled = Some(convert_value_to_bool()?);300			}301		};302		Ok(limits)303	}304}305306/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.307#[derive(Default, Debug, Clone, Copy, AbiCoder)]308#[repr(u8)]309pub enum CollectionPermissions {310	/// Owner of token can nest tokens under it.311	#[default]312	TokenOwner,313314	/// Admin of token collection can nest tokens under token.315	CollectionAdmin,316}317318/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.319#[derive(AbiCoder, Copy, Clone, Default, Debug)]320#[repr(u8)]321pub enum TokenPermissionField {322	/// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]323	#[default]324	Mutable,325326	/// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]327	TokenOwner,328329	/// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]330	CollectionAdmin,331}332333/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.334#[derive(Debug, Default, AbiCoder)]335pub struct PropertyPermission {336	/// TokenPermission field.337	code: TokenPermissionField,338	/// TokenPermission value.339	value: bool,340}341342impl PropertyPermission {343	/// Make vector of [`PropertyPermission`] from [`up_data_structs::PropertyPermission`].344	pub fn into_vec(pp: up_data_structs::PropertyPermission) -> Vec<Self> {345		vec![346			PropertyPermission {347				code: TokenPermissionField::Mutable,348				value: pp.mutable,349			},350			PropertyPermission {351				code: TokenPermissionField::TokenOwner,352				value: pp.token_owner,353			},354			PropertyPermission {355				code: TokenPermissionField::CollectionAdmin,356				value: pp.collection_admin,357			},358		]359	}360361	/// Make [`up_data_structs::PropertyPermission`] from vector of [`PropertyPermission`].362	pub fn from_vec(permission: Vec<Self>) -> up_data_structs::PropertyPermission {363		let mut token_permission = up_data_structs::PropertyPermission::default();364365		for PropertyPermission { code, value } in permission {366			match code {367				TokenPermissionField::Mutable => token_permission.mutable = value,368				TokenPermissionField::TokenOwner => token_permission.token_owner = value,369				TokenPermissionField::CollectionAdmin => token_permission.collection_admin = value,370			}371		}372		token_permission373	}374}375376/// Ethereum representation of Token Property Permissions.377#[derive(Debug, Default, AbiCoder)]378pub struct TokenPropertyPermission {379	/// Token property key.380	key: evm_coder::types::string,381	/// Token property permissions.382	permissions: Vec<PropertyPermission>,383}384385impl386	From<(387		up_data_structs::PropertyKey,388		up_data_structs::PropertyPermission,389	)> for TokenPropertyPermission390{391	fn from(392		value: (393			up_data_structs::PropertyKey,394			up_data_structs::PropertyPermission,395		),396	) -> Self {397		let (key, permission) = value;398		let key = evm_coder::types::string::from_utf8(key.into_inner())399			.expect("Stored key must be valid");400		let permissions = PropertyPermission::into_vec(permission);401		Self { key, permissions }402	}403}404405impl TokenPropertyPermission {406	/// Convert vector of [`TokenPropertyPermission`] into vector of [`up_data_structs::PropertyKeyPermission`].407	pub fn into_property_key_permissions(408		permissions: Vec<TokenPropertyPermission>,409	) -> evm_coder::execution::Result<Vec<up_data_structs::PropertyKeyPermission>> {410		let mut perms = Vec::new();411412		for TokenPropertyPermission { key, permissions } in permissions {413			if permissions.len() > <TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT {414				return Err(alloc::format!(415					"Actual number of fields {} for {}, which exceeds the maximum value of {}",416					permissions.len(),417					stringify!(EthTokenPermissions),418					<TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT419				)420				.as_str()421				.into());422			}423424			let token_permission = PropertyPermission::from_vec(permissions);425426			perms.push(up_data_structs::PropertyKeyPermission {427				key: key.into_bytes().try_into().map_err(|_| "too long key")?,428				permission: token_permission,429			});430		}431		Ok(perms)432	}433}
modifiedpallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -18,7 +18,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -172,8 +172,8 @@
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
 	/// @param limit Some limit.
-	/// @dev EVM selector for this function is: 0x2a2235e7,
-	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	/// @dev EVM selector for this function is: 0x2316ee74,
+	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
 	function setCollectionLimit(CollectionLimit memory limit) public {
 		require(false, stub_error);
 		limit;
@@ -257,19 +257,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple30 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple33 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple30(false, new uint256[](0));
+		return Tuple33(false, new uint256[](0));
 	}
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() public view returns (Tuple33[] memory) {
+	function collectionNestingPermissions() public view returns (Tuple36[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple33[](0);
+		return new Tuple36[](0);
 	}
 
 	/// Set the collection access method.
@@ -452,13 +452,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple33 {
+struct Tuple36 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple30 {
+struct Tuple33 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -466,6 +466,10 @@
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
+	OptionUint value;
+}
+
+struct OptionUint {
 	bool status;
 	uint256 value;
 }
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -162,7 +162,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -316,8 +316,8 @@
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
 	/// @param limit Some limit.
-	/// @dev EVM selector for this function is: 0x2a2235e7,
-	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	/// @dev EVM selector for this function is: 0x2316ee74,
+	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
 	function setCollectionLimit(CollectionLimit memory limit) public {
 		require(false, stub_error);
 		limit;
@@ -401,19 +401,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple42 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple45 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple42(false, new uint256[](0));
+		return Tuple45(false, new uint256[](0));
 	}
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() public view returns (Tuple45[] memory) {
+	function collectionNestingPermissions() public view returns (Tuple48[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple45[](0);
+		return new Tuple48[](0);
 	}
 
 	/// Set the collection access method.
@@ -596,13 +596,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple45 {
+struct Tuple48 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple42 {
+struct Tuple45 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -610,6 +610,10 @@
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
+	OptionUint value;
+}
+
+struct OptionUint {
 	bool status;
 	uint256 value;
 }
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -162,7 +162,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -316,8 +316,8 @@
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
 	/// @param limit Some limit.
-	/// @dev EVM selector for this function is: 0x2a2235e7,
-	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	/// @dev EVM selector for this function is: 0x2316ee74,
+	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
 	function setCollectionLimit(CollectionLimit memory limit) public {
 		require(false, stub_error);
 		limit;
@@ -401,19 +401,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple44 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple41(false, new uint256[](0));
+		return Tuple44(false, new uint256[](0));
 	}
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() public view returns (Tuple44[] memory) {
+	function collectionNestingPermissions() public view returns (Tuple47[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple44[](0);
+		return new Tuple47[](0);
 	}
 
 	/// Set the collection access method.
@@ -596,13 +596,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple44 {
+struct Tuple47 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple41 {
+struct Tuple44 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -610,6 +610,10 @@
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
+	OptionUint value;
+}
+
+struct OptionUint {
 	bool status;
 	uint256 value;
 }
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -217,8 +217,15 @@
             "name": "field",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "status", "type": "bool" },
-          { "internalType": "uint256", "name": "value", "type": "uint256" }
+          {
+            "components": [
+              { "internalType": "bool", "name": "status", "type": "bool" },
+              { "internalType": "uint256", "name": "value", "type": "uint256" }
+            ],
+            "internalType": "struct OptionUint",
+            "name": "value",
+            "type": "tuple"
+          }
         ],
         "internalType": "struct CollectionLimit[]",
         "name": "",
@@ -241,7 +248,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple33[]",
+        "internalType": "struct Tuple36[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -262,7 +269,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple30",
+        "internalType": "struct Tuple33",
         "name": "",
         "type": "tuple"
       }
@@ -500,8 +507,15 @@
             "name": "field",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "status", "type": "bool" },
-          { "internalType": "uint256", "name": "value", "type": "uint256" }
+          {
+            "components": [
+              { "internalType": "bool", "name": "status", "type": "bool" },
+              { "internalType": "uint256", "name": "value", "type": "uint256" }
+            ],
+            "internalType": "struct OptionUint",
+            "name": "value",
+            "type": "tuple"
+          }
         ],
         "internalType": "struct CollectionLimit",
         "name": "limit",
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -247,8 +247,15 @@
             "name": "field",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "status", "type": "bool" },
-          { "internalType": "uint256", "name": "value", "type": "uint256" }
+          {
+            "components": [
+              { "internalType": "bool", "name": "status", "type": "bool" },
+              { "internalType": "uint256", "name": "value", "type": "uint256" }
+            ],
+            "internalType": "struct OptionUint",
+            "name": "value",
+            "type": "tuple"
+          }
         ],
         "internalType": "struct CollectionLimit[]",
         "name": "",
@@ -271,7 +278,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple45[]",
+        "internalType": "struct Tuple48[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -292,7 +299,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple42",
+        "internalType": "struct Tuple45",
         "name": "",
         "type": "tuple"
       }
@@ -662,8 +669,15 @@
             "name": "field",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "status", "type": "bool" },
-          { "internalType": "uint256", "name": "value", "type": "uint256" }
+          {
+            "components": [
+              { "internalType": "bool", "name": "status", "type": "bool" },
+              { "internalType": "uint256", "name": "value", "type": "uint256" }
+            ],
+            "internalType": "struct OptionUint",
+            "name": "value",
+            "type": "tuple"
+          }
         ],
         "internalType": "struct CollectionLimit",
         "name": "limit",
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -229,8 +229,15 @@
             "name": "field",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "status", "type": "bool" },
-          { "internalType": "uint256", "name": "value", "type": "uint256" }
+          {
+            "components": [
+              { "internalType": "bool", "name": "status", "type": "bool" },
+              { "internalType": "uint256", "name": "value", "type": "uint256" }
+            ],
+            "internalType": "struct OptionUint",
+            "name": "value",
+            "type": "tuple"
+          }
         ],
         "internalType": "struct CollectionLimit[]",
         "name": "",
@@ -253,7 +260,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple44[]",
+        "internalType": "struct Tuple47[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -274,7 +281,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple41",
+        "internalType": "struct Tuple44",
         "name": "",
         "type": "tuple"
       }
@@ -644,8 +651,15 @@
             "name": "field",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "status", "type": "bool" },
-          { "internalType": "uint256", "name": "value", "type": "uint256" }
+          {
+            "components": [
+              { "internalType": "bool", "name": "status", "type": "bool" },
+              { "internalType": "uint256", "name": "value", "type": "uint256" }
+            ],
+            "internalType": "struct OptionUint",
+            "name": "value",
+            "type": "tuple"
+          }
         ],
         "internalType": "struct CollectionLimit",
         "name": "limit",
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -13,7 +13,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -114,8 +114,8 @@
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
 	/// @param limit Some limit.
-	/// @dev EVM selector for this function is: 0x2a2235e7,
-	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	/// @dev EVM selector for this function is: 0x2316ee74,
+	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
 	function setCollectionLimit(CollectionLimit memory limit) external;
 
 	/// Get contract address.
@@ -166,12 +166,12 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() external view returns (Tuple26 memory);
+	function collectionNestingRestrictedCollectionIds() external view returns (Tuple28 memory);
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() external view returns (Tuple29[] memory);
+	function collectionNestingPermissions() external view returns (Tuple31[] memory);
 
 	/// Set the collection access method.
 	/// @param mode Access mode
@@ -286,7 +286,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple29 {
+struct Tuple31 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
@@ -300,7 +300,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple26 {
+struct Tuple28 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -308,6 +308,10 @@
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
+	OptionUint value;
+}
+
+struct OptionUint {
 	bool status;
 	uint256 value;
 }
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -115,7 +115,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -216,8 +216,8 @@
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
 	/// @param limit Some limit.
-	/// @dev EVM selector for this function is: 0x2a2235e7,
-	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	/// @dev EVM selector for this function is: 0x2316ee74,
+	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
 	function setCollectionLimit(CollectionLimit memory limit) external;
 
 	/// Get contract address.
@@ -268,12 +268,12 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() external view returns (Tuple36 memory);
+	function collectionNestingRestrictedCollectionIds() external view returns (Tuple38 memory);
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() external view returns (Tuple39[] memory);
+	function collectionNestingPermissions() external view returns (Tuple41[] memory);
 
 	/// Set the collection access method.
 	/// @param mode Access mode
@@ -388,7 +388,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple39 {
+struct Tuple41 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
@@ -402,7 +402,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple36 {
+struct Tuple38 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -410,6 +410,10 @@
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
+	OptionUint value;
+}
+
+struct OptionUint {
 	bool status;
 	uint256 value;
 }
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -115,7 +115,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -216,8 +216,8 @@
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
 	/// @param limit Some limit.
-	/// @dev EVM selector for this function is: 0x2a2235e7,
-	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	/// @dev EVM selector for this function is: 0x2316ee74,
+	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
 	function setCollectionLimit(CollectionLimit memory limit) external;
 
 	/// Get contract address.
@@ -268,12 +268,12 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);
+	function collectionNestingRestrictedCollectionIds() external view returns (Tuple37 memory);
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() external view returns (Tuple38[] memory);
+	function collectionNestingPermissions() external view returns (Tuple40[] memory);
 
 	/// Set the collection access method.
 	/// @param mode Access mode
@@ -388,7 +388,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple38 {
+struct Tuple40 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
@@ -402,7 +402,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple35 {
+struct Tuple37 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -410,6 +410,10 @@
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
+	OptionUint value;
+}
+
+struct OptionUint {
 	bool status;
 	uint256 value;
 }
modifiedtests/src/eth/collectionLimits.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionLimits.test.ts
+++ b/tests/src/eth/collectionLimits.test.ts
@@ -46,15 +46,15 @@
       };
      
       const collectionEvm = helper.ethNativeContract.collection(collectionAddress, testCase.case, owner);
-      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: limits.accountTokenOwnershipLimit}).send();
-      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, status: true, value: limits.sponsoredDataSize}).send();
-      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataRateLimit, status: true, value: limits.sponsoredDataRateLimit}).send();
-      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TokenLimit, status: true, value: limits.tokenLimit}).send();
-      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorTransferTimeout, status: true, value: limits.sponsorTransferTimeout}).send();
-      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorApproveTimeout, status: true, value: limits.sponsorApproveTimeout}).send();
-      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, status: true, value: limits.ownerCanTransfer}).send();
-      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanDestroy, status: true, value: limits.ownerCanDestroy}).send();
-      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TransferEnabled, status: true, value: limits.transfersEnabled}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: limits.accountTokenOwnershipLimit}}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, value: {status: true, value: limits.sponsoredDataSize}}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataRateLimit, value: {status: true, value: limits.sponsoredDataRateLimit}}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TokenLimit, value: {status: true, value: limits.tokenLimit}}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorTransferTimeout, value: {status: true, value: limits.sponsorTransferTimeout}}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorApproveTimeout, value: {status: true, value: limits.sponsorApproveTimeout}}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, value: {status: true, value: limits.ownerCanTransfer}}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanDestroy, value: {status: true, value: limits.ownerCanDestroy}}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TransferEnabled, value: {status: true, value: limits.transfersEnabled}}).send();
       
       // Check limits from sub:
       const data = (await helper.rft.getData(collectionId))!;
@@ -63,15 +63,15 @@
       // Check limits from eth:
       const limitsEvm = await collectionEvm.methods.collectionLimits().call({from: owner});
       expect(limitsEvm).to.have.length(9);
-      expect(limitsEvm[0]).to.deep.eq([CollectionLimitField.AccountTokenOwnership.toString(), true, limits.accountTokenOwnershipLimit.toString()]);
-      expect(limitsEvm[1]).to.deep.eq([CollectionLimitField.SponsoredDataSize.toString(), true, limits.sponsoredDataSize.toString()]);
-      expect(limitsEvm[2]).to.deep.eq([CollectionLimitField.SponsoredDataRateLimit.toString(), true, limits.sponsoredDataRateLimit.toString()]);
-      expect(limitsEvm[3]).to.deep.eq([CollectionLimitField.TokenLimit.toString(), true, limits.tokenLimit.toString()]);
-      expect(limitsEvm[4]).to.deep.eq([CollectionLimitField.SponsorTransferTimeout.toString(), true, limits.sponsorTransferTimeout.toString()]);
-      expect(limitsEvm[5]).to.deep.eq([CollectionLimitField.SponsorApproveTimeout.toString(), true, limits.sponsorApproveTimeout.toString()]);
-      expect(limitsEvm[6]).to.deep.eq([CollectionLimitField.OwnerCanTransfer.toString(), true, limits.ownerCanTransfer.toString()]);
-      expect(limitsEvm[7]).to.deep.eq([CollectionLimitField.OwnerCanDestroy.toString(), true, limits.ownerCanDestroy.toString()]);
-      expect(limitsEvm[8]).to.deep.eq([CollectionLimitField.TransferEnabled.toString(), true, limits.transfersEnabled.toString()]);
+      expect(limitsEvm[0]).to.deep.eq([CollectionLimitField.AccountTokenOwnership.toString(), [true, limits.accountTokenOwnershipLimit.toString()]]);
+      expect(limitsEvm[1]).to.deep.eq([CollectionLimitField.SponsoredDataSize.toString(), [true, limits.sponsoredDataSize.toString()]]);
+      expect(limitsEvm[2]).to.deep.eq([CollectionLimitField.SponsoredDataRateLimit.toString(), [true, limits.sponsoredDataRateLimit.toString()]]);
+      expect(limitsEvm[3]).to.deep.eq([CollectionLimitField.TokenLimit.toString(), [true, limits.tokenLimit.toString()]]);
+      expect(limitsEvm[4]).to.deep.eq([CollectionLimitField.SponsorTransferTimeout.toString(), [true, limits.sponsorTransferTimeout.toString()]]);
+      expect(limitsEvm[5]).to.deep.eq([CollectionLimitField.SponsorApproveTimeout.toString(), [true, limits.sponsorApproveTimeout.toString()]]);
+      expect(limitsEvm[6]).to.deep.eq([CollectionLimitField.OwnerCanTransfer.toString(), [true, limits.ownerCanTransfer.toString()]]);
+      expect(limitsEvm[7]).to.deep.eq([CollectionLimitField.OwnerCanDestroy.toString(), [true, limits.ownerCanDestroy.toString()]]);
+      expect(limitsEvm[8]).to.deep.eq([CollectionLimitField.TransferEnabled.toString(), [true, limits.transfersEnabled.toString()]]);
     }));
 });
 
@@ -101,24 +101,24 @@
 
       // Cannot set non-existing limit
       await expect(collectionEvm.methods
-        .setCollectionLimit({field: 9, status: true, value: 1})
+        .setCollectionLimit({field: 9, value: {status: true, value: 1}})
         .call()).to.be.rejectedWith('Value not convertible into enum "CollectionLimitField"');      
         
       // Cannot disable limits
       await expect(collectionEvm.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: false, value: 200})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: false, value: 200}})
         .call()).to.be.rejectedWith('user can\'t disable limits');
 
       await expect(collectionEvm.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: invalidLimits.accountTokenOwnershipLimit})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: invalidLimits.accountTokenOwnershipLimit}})
         .call()).to.be.rejectedWith(`can't convert value to u32 "${invalidLimits.accountTokenOwnershipLimit}"`);
  
       await expect(collectionEvm.methods
-        .setCollectionLimit({field: CollectionLimitField.TransferEnabled, status: true, value: 3})
+        .setCollectionLimit({field: CollectionLimitField.TransferEnabled, value: {status: true, value: 3}})
         .call()).to.be.rejectedWith(`can't convert value to boolean "${invalidLimits.transfersEnabled}"`);
 
       expect(() => collectionEvm.methods
-        .setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, status: true, value: -1}).send()).to.throw('value out-of-bounds');
+        .setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, value: {status: true, value: -1}}).send()).to.throw('value out-of-bounds');
     }));
 
   [
@@ -133,12 +133,12 @@
 
       const collectionEvm = helper.ethNativeContract.collection(collectionAddress, testCase.case, owner);
       await expect(collectionEvm.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
         .call({from: nonOwner}))
         .to.be.rejectedWith('NoPermission');
 
       await expect(collectionEvm.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
         .send({from: nonOwner}))
         .to.be.rejected;
     }));
modifiedtests/src/eth/createFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createFTCollection.test.ts
+++ b/tests/src/eth/createFTCollection.test.ts
@@ -197,7 +197,7 @@
     }
     {
       await expect(peasantCollection.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
@@ -222,7 +222,7 @@
     }
     {
       await expect(peasantCollection.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
modifiedtests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -208,7 +208,7 @@
     }
     {
       await expect(malfeasantCollection.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
@@ -233,7 +233,7 @@
     }
     {
       await expect(malfeasantCollection.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
modifiedtests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -240,7 +240,7 @@
     }
     {
       await expect(peasantCollection.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
@@ -265,7 +265,7 @@
     }
     {
       await expect(peasantCollection.methods
-        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
modifiedtests/src/eth/events.test.tsdiffbeforeafterboth
--- a/tests/src/eth/events.test.ts
+++ b/tests/src/eth/events.test.ts
@@ -233,7 +233,7 @@
   });
   const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['CollectionLimitSet']}]);
   {
-    await collection.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, status: true, value: 0}).send({from: owner});
+    await collection.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, value: {status: true, value: 0}}).send({from: owner});
     await helper.wait.newBlocks(1);
     expect(ethEvents).to.containSubset([
       {
modifiedtests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/types.ts
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -13,6 +13,12 @@
   event: string,
   args: { [key: string]: string }
 };
+
+export interface OptionUint {
+  status: boolean,
+  value: bigint,
+}
+
 export interface TEthCrossAccount {
   readonly eth: string,
   readonly sub: string | Uint8Array,
@@ -40,6 +46,5 @@
 
 export interface CollectionLimit {
   field: CollectionLimitField,
-  status: boolean,
-  value: bigint | number,
+  value: OptionUint,
 }