difftreelog
fix PR
in: master
10 files changed
crates/evm-coder/procedural/src/abi_derive/derive_enum.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs
+++ b/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs
@@ -47,11 +47,10 @@
)
}
-pub fn impl_enum_abi_type(name: &syn::Ident, option_count: usize) -> proc_macro2::TokenStream {
+pub fn impl_enum_abi_type(name: &syn::Ident) -> proc_macro2::TokenStream {
quote! {
impl ::evm_coder::abi::AbiType for #name {
const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = <u8 as ::evm_coder::abi::AbiType>::SIGNATURE;
- const FIELDS_COUNT: usize = #option_count;
fn is_dynamic() -> bool {
<u8 as ::evm_coder::abi::AbiType>::is_dynamic()
crates/evm-coder/procedural/src/abi_derive/derive_struct.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/abi_derive/derive_struct.rs
+++ b/crates/evm-coder/procedural/src/abi_derive/derive_struct.rs
@@ -100,12 +100,10 @@
pub fn impl_struct_abi_type(
name: &syn::Ident,
tuple_type: proc_macro2::TokenStream,
- fields_count: usize,
) -> proc_macro2::TokenStream {
quote! {
impl ::evm_coder::abi::AbiType for #name {
const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = <#tuple_type as ::evm_coder::abi::AbiType>::SIGNATURE;
- const FIELDS_COUNT: usize = #fields_count;
fn is_dynamic() -> bool {
<#tuple_type as ::evm_coder::abi::AbiType>::is_dynamic()
}
crates/evm-coder/procedural/src/abi_derive/mod.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/abi_derive/mod.rs
+++ b/crates/evm-coder/procedural/src/abi_derive/mod.rs
@@ -49,7 +49,7 @@
let struct_from_tuple = struct_from_tuple(name, is_named_fields, field_names.clone());
let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);
- let abi_type = impl_struct_abi_type(name, tuple_type.clone(), params_count);
+ let abi_type = impl_struct_abi_type(name, tuple_type.clone());
let abi_read = impl_struct_abi_read(name, tuple_type, tuple_names, struct_from_tuple);
let abi_write = impl_struct_abi_write(name, is_named_fields, tuple_ref_type, tuple_data);
let solidity_type = impl_struct_solidity_type(name, field_types.clone(), params_count);
@@ -83,7 +83,7 @@
let from = impl_enum_from_u8(name, enum_options.clone());
let solidity_option = impl_solidity_option(name, enum_options.clone());
let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);
- let abi_type = impl_enum_abi_type(name, option_count);
+ let abi_type = impl_enum_abi_type(name);
let abi_read = impl_enum_abi_read(name);
let abi_write = impl_enum_abi_write(name);
let solidity_type = impl_enum_solidity_type(name);
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -16,7 +16,6 @@
impl AbiType for $ty {
const SIGNATURE: SignatureUnit = make_signature!(new fixed(stringify!($name)));
- const FIELDS_COUNT: usize = 1;
fn is_dynamic() -> bool {
$dynamic
@@ -97,7 +96,6 @@
impl<T: AbiType> AbiType for &T {
const SIGNATURE: SignatureUnit = T::SIGNATURE;
- const FIELDS_COUNT: usize = T::FIELDS_COUNT;
fn is_dynamic() -> bool {
T::is_dynamic()
@@ -127,7 +125,6 @@
impl<T: AbiType> AbiType for Vec<T> {
const SIGNATURE: SignatureUnit = make_signature!(new nameof(T::SIGNATURE) fixed("[]"));
- const FIELDS_COUNT: usize = 1;
fn is_dynamic() -> bool {
true
@@ -203,7 +200,6 @@
shift_left(1)
fixed(")")
);
- const FIELDS_COUNT: usize = count!($($ident)*);
fn is_dynamic() -> bool {
false
crates/evm-coder/src/abi/traits.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/traits.rs
+++ b/crates/evm-coder/src/abi/traits.rs
@@ -10,9 +10,6 @@
/// Signature for Etherium ABI.
const SIGNATURE: SignatureUnit;
- /// Count of enum variants or struct fields.
- const FIELDS_COUNT: usize;
-
/// Signature as str.
fn as_str() -> &'static str {
from_utf8(&Self::SIGNATURE.data[..Self::SIGNATURE.len]).expect("bad utf-8")
crates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/abi_derive_generation.rs
+++ b/crates/evm-coder/tests/abi_derive_generation.rs
@@ -173,50 +173,6 @@
}
#[test]
- fn impl_abi_type_fields_count() {
- assert_eq!(
- <TypeStruct1SimpleParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 1
- );
- assert_eq!(
- <TypeStruct1DynamicParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 1
- );
- assert_eq!(
- <TypeStruct2SimpleParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct2DynamicParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct2MixedParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 1
- );
- assert_eq!(
- <TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 1
- );
- assert_eq!(
- <TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 3
- );
- }
-
- #[test]
fn impl_abi_type_is_dynamic() {
assert_eq!(
<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -347,6 +347,10 @@
) -> Result<void> {
self.consume_store_reads_and_writes(1, 1)?;
+ if !limit.has_value() {
+ return Err(Error::Revert("user can't disable limits".into()));
+ }
+
let caller = T::CrossAccountId::from_eth(caller);
<Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)
}
pallets/common/src/eth.rsdiffbeforeafterboth1// 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(ð[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(Ð_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 CrossAddress {122 pub(crate) eth: address,123 pub(crate) sub: uint256,124}125126impl CrossAddress {127 /// Converts `CrossAccountId` to [`CrossAddress`]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 [`CrossAddress`] 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 [`CrossAddress`] 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 key: evm_coder::types::string,175 value: evm_coder::types::bytes,176}177178impl TryFrom<up_data_structs::Property> for Property {179 type Error = evm_coder::execution::Error;180181 fn try_from(from: up_data_structs::Property) -> Result<Self, Self::Error> {182 let key = evm_coder::types::string::from_utf8(from.key.into())183 .map_err(|e| Self::Error::Revert(format!("utf8 conversion error: {}", e)))?;184 let value = evm_coder::types::bytes(from.value.to_vec());185 Ok(Property { key, value })186 }187}188189impl TryInto<up_data_structs::Property> for Property {190 type Error = evm_coder::execution::Error;191192 fn try_into(self) -> Result<up_data_structs::Property, Self::Error> {193 let key = <Vec<u8>>::from(self.key)194 .try_into()195 .map_err(|_| "key too large")?;196197 let value = self.value.0.try_into().map_err(|_| "value too large")?;198199 Ok(up_data_structs::Property { key, value })200 }201}202203/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.204#[derive(Debug, Default, Clone, Copy, AbiCoder)]205#[repr(u8)]206pub enum CollectionLimitField {207 /// How many tokens can a user have on one account.208 #[default]209 AccountTokenOwnership,210211 /// How many bytes of data are available for sponsorship.212 SponsoredDataSize,213214 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]215 SponsoredDataRateLimit,216217 /// How many tokens can be mined into this collection.218 TokenLimit,219220 /// Timeouts for transfer sponsoring.221 SponsorTransferTimeout,222223 /// Timeout for sponsoring an approval in passed blocks.224 SponsorApproveTimeout,225226 /// Whether the collection owner of the collection can send tokens (which belong to other users).227 OwnerCanTransfer,228229 /// Can the collection owner burn other people's tokens.230 OwnerCanDestroy,231232 /// Is it possible to send tokens from this collection between users.233 TransferEnabled,234}235236/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.237#[derive(Debug, Default, AbiCoder)]238pub struct CollectionLimit {239 field: CollectionLimitField,240 value: OptionUint,241}242243impl CollectionLimit {244 /// Make [`CollectionLimit`] from [`CollectionLimitField`] and int value.245 pub fn from_int(field: CollectionLimitField, value: u32) -> Self {246 Self {247 field,248 value: value.into(),249 }250 }251252 /// Make [`CollectionLimit`] from [`CollectionLimitField`] and optional int value.253 pub fn from_opt_int(field: CollectionLimitField, value: Option<u32>) -> Self {254 Self {255 field,256 value: value.into(),257 }258 }259260 /// Make [`CollectionLimit`] from [`CollectionLimitField`] and bool value.261 pub fn from_opt_bool(field: CollectionLimitField, value: Option<bool>) -> Self {262 Self {263 field,264 value: value.into(),265 }266 }267}268269impl TryInto<up_data_structs::CollectionLimits> for CollectionLimit {270 type Error = evm_coder::execution::Error;271272 fn try_into(self) -> Result<up_data_structs::CollectionLimits, Self::Error> {273 if !self.value.status {274 return Err(Self::Error::Revert("user can't disable limits".into()));275 }276277 let value = self.value.value.try_into().map_err(|error| {278 Self::Error::Revert(format!(279 "can't convert value to u32 \"{}\" because: \"{error}\"",280 self.value.value281 ))282 })?;283284 let convert_value_to_bool = || match value {285 0 => Ok(false),286 1 => Ok(true),287 _ => {288 return Err(Self::Error::Revert(format!(289 "can't convert value to boolean \"{value}\""290 )))291 }292 };293294 let mut limits = up_data_structs::CollectionLimits::default();295 match self.field {296 CollectionLimitField::AccountTokenOwnership => {297 limits.account_token_ownership_limit = Some(value);298 }299 CollectionLimitField::SponsoredDataSize => {300 limits.sponsored_data_size = Some(value);301 }302 CollectionLimitField::SponsoredDataRateLimit => {303 limits.sponsored_data_rate_limit =304 Some(up_data_structs::SponsoringRateLimit::Blocks(value));305 }306 CollectionLimitField::TokenLimit => {307 limits.token_limit = Some(value);308 }309 CollectionLimitField::SponsorTransferTimeout => {310 limits.sponsor_transfer_timeout = Some(value);311 }312 CollectionLimitField::SponsorApproveTimeout => {313 limits.sponsor_approve_timeout = Some(value);314 }315 CollectionLimitField::OwnerCanTransfer => {316 limits.owner_can_transfer = Some(convert_value_to_bool()?);317 }318 CollectionLimitField::OwnerCanDestroy => {319 limits.owner_can_destroy = Some(convert_value_to_bool()?);320 }321 CollectionLimitField::TransferEnabled => {322 limits.transfers_enabled = Some(convert_value_to_bool()?);323 }324 };325 Ok(limits)326 }327}328329/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.330#[derive(Default, Debug, Clone, Copy, AbiCoder)]331#[repr(u8)]332pub enum CollectionPermissionField {333 /// Owner of token can nest tokens under it.334 #[default]335 TokenOwner,336337 /// Admin of token collection can nest tokens under token.338 CollectionAdmin,339}340341/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.342#[derive(AbiCoder, Copy, Clone, Default, Debug)]343#[repr(u8)]344pub enum TokenPermissionField {345 /// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]346 #[default]347 Mutable,348349 /// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]350 TokenOwner,351352 /// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]353 CollectionAdmin,354}355356/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.357#[derive(Debug, Default, AbiCoder)]358pub struct PropertyPermission {359 /// TokenPermission field.360 code: TokenPermissionField,361 /// TokenPermission value.362 value: bool,363}364365impl PropertyPermission {366 /// Make vector of [`PropertyPermission`] from [`up_data_structs::PropertyPermission`].367 pub fn into_vec(pp: up_data_structs::PropertyPermission) -> Vec<Self> {368 vec![369 PropertyPermission {370 code: TokenPermissionField::Mutable,371 value: pp.mutable,372 },373 PropertyPermission {374 code: TokenPermissionField::TokenOwner,375 value: pp.token_owner,376 },377 PropertyPermission {378 code: TokenPermissionField::CollectionAdmin,379 value: pp.collection_admin,380 },381 ]382 }383384 /// Make [`up_data_structs::PropertyPermission`] from vector of [`PropertyPermission`].385 pub fn from_vec(permission: Vec<Self>) -> up_data_structs::PropertyPermission {386 let mut token_permission = up_data_structs::PropertyPermission::default();387388 for PropertyPermission { code, value } in permission {389 match code {390 TokenPermissionField::Mutable => token_permission.mutable = value,391 TokenPermissionField::TokenOwner => token_permission.token_owner = value,392 TokenPermissionField::CollectionAdmin => token_permission.collection_admin = value,393 }394 }395 token_permission396 }397}398399/// Ethereum representation of Token Property Permissions.400#[derive(Debug, Default, AbiCoder)]401pub struct TokenPropertyPermission {402 /// Token property key.403 key: evm_coder::types::string,404 /// Token property permissions.405 permissions: Vec<PropertyPermission>,406}407408impl409 From<(410 up_data_structs::PropertyKey,411 up_data_structs::PropertyPermission,412 )> for TokenPropertyPermission413{414 fn from(415 value: (416 up_data_structs::PropertyKey,417 up_data_structs::PropertyPermission,418 ),419 ) -> Self {420 let (key, permission) = value;421 let key = evm_coder::types::string::from_utf8(key.into_inner())422 .expect("Stored key must be valid");423 let permissions = PropertyPermission::into_vec(permission);424 Self { key, permissions }425 }426}427428impl TokenPropertyPermission {429 /// Convert vector of [`TokenPropertyPermission`] into vector of [`up_data_structs::PropertyKeyPermission`].430 pub fn into_property_key_permissions(431 permissions: Vec<TokenPropertyPermission>,432 ) -> evm_coder::execution::Result<Vec<up_data_structs::PropertyKeyPermission>> {433 let mut perms = Vec::new();434435 for TokenPropertyPermission { key, permissions } in permissions {436 if permissions.len() > <TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT {437 return Err(alloc::format!(438 "Actual number of fields {} for {}, which exceeds the maximum value of {}",439 permissions.len(),440 stringify!(EthTokenPermissions),441 <TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT442 )443 .as_str()444 .into());445 }446447 let token_permission = PropertyPermission::from_vec(permissions);448449 perms.push(up_data_structs::PropertyKeyPermission {450 key: key.into_bytes().try_into().map_err(|_| "too long key")?,451 permission: token_permission,452 });453 }454 Ok(perms)455 }456}457458/// Nested collections.459#[derive(Debug, Default, AbiCoder)]460pub struct CollectionNesting {461 token_owner: bool,462 ids: Vec<uint256>,463}464465impl CollectionNesting {466 /// Create [`CollectionNesting`].467 pub fn new(token_owner: bool, ids: Vec<uint256>) -> Self {468 Self { token_owner, ids }469 }470}471472/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.473#[derive(Debug, Default, AbiCoder)]474pub struct CollectionNestingPermission {475 field: CollectionPermissionField,476 value: bool,477}478479impl CollectionNestingPermission {480 /// Create [`CollectionNestingPermission`].481 pub fn new(field: CollectionPermissionField, value: bool) -> Self {482 Self { field, value }483 }484}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(ð[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(Ð_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 CrossAddress {122 pub(crate) eth: address,123 pub(crate) sub: uint256,124}125126impl CrossAddress {127 /// Converts `CrossAccountId` to [`CrossAddress`]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 [`CrossAddress`] 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 [`CrossAddress`] 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 key: evm_coder::types::string,175 value: evm_coder::types::bytes,176}177178impl TryFrom<up_data_structs::Property> for Property {179 type Error = evm_coder::execution::Error;180181 fn try_from(from: up_data_structs::Property) -> Result<Self, Self::Error> {182 let key = evm_coder::types::string::from_utf8(from.key.into())183 .map_err(|e| Self::Error::Revert(format!("utf8 conversion error: {}", e)))?;184 let value = evm_coder::types::bytes(from.value.to_vec());185 Ok(Property { key, value })186 }187}188189impl TryInto<up_data_structs::Property> for Property {190 type Error = evm_coder::execution::Error;191192 fn try_into(self) -> Result<up_data_structs::Property, Self::Error> {193 let key = <Vec<u8>>::from(self.key)194 .try_into()195 .map_err(|_| "key too large")?;196197 let value = self.value.0.try_into().map_err(|_| "value too large")?;198199 Ok(up_data_structs::Property { key, value })200 }201}202203/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.204#[derive(Debug, Default, Clone, Copy, AbiCoder)]205#[repr(u8)]206pub enum CollectionLimitField {207 /// How many tokens can a user have on one account.208 #[default]209 AccountTokenOwnership,210211 /// How many bytes of data are available for sponsorship.212 SponsoredDataSize,213214 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]215 SponsoredDataRateLimit,216217 /// How many tokens can be mined into this collection.218 TokenLimit,219220 /// Timeouts for transfer sponsoring.221 SponsorTransferTimeout,222223 /// Timeout for sponsoring an approval in passed blocks.224 SponsorApproveTimeout,225226 /// Whether the collection owner of the collection can send tokens (which belong to other users).227 OwnerCanTransfer,228229 /// Can the collection owner burn other people's tokens.230 OwnerCanDestroy,231232 /// Is it possible to send tokens from this collection between users.233 TransferEnabled,234}235236/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.237#[derive(Debug, Default, AbiCoder)]238pub struct CollectionLimit {239 field: CollectionLimitField,240 value: OptionUint,241}242243impl CollectionLimit {244 /// Make [`CollectionLimit`] from [`CollectionLimitField`] and int value.245 pub fn from_int(field: CollectionLimitField, value: u32) -> Self {246 Self {247 field,248 value: value.into(),249 }250 }251252 /// Make [`CollectionLimit`] from [`CollectionLimitField`] and optional int value.253 pub fn from_opt_int(field: CollectionLimitField, value: Option<u32>) -> Self {254 Self {255 field,256 value: value.into(),257 }258 }259260 /// Make [`CollectionLimit`] from [`CollectionLimitField`] and bool value.261 pub fn from_opt_bool(field: CollectionLimitField, value: Option<bool>) -> Self {262 Self {263 field,264 value: value.into(),265 }266 }267268 /// Whether the field contains a value.269 pub fn has_value(&self) -> bool {270 self.value.status271 }272}273274impl TryInto<up_data_structs::CollectionLimits> for CollectionLimit {275 type Error = evm_coder::execution::Error;276277 fn try_into(self) -> Result<up_data_structs::CollectionLimits, Self::Error> {278 let value = self.value.value.try_into().map_err(|error| {279 Self::Error::Revert(format!(280 "can't convert value to u32 \"{}\" because: \"{error}\"",281 self.value.value282 ))283 })?;284285 let convert_value_to_bool = || match value {286 0 => Ok(false),287 1 => Ok(true),288 _ => {289 return Err(Self::Error::Revert(format!(290 "can't convert value to boolean \"{value}\""291 )))292 }293 };294295 let mut limits = up_data_structs::CollectionLimits::default();296 match self.field {297 CollectionLimitField::AccountTokenOwnership => {298 limits.account_token_ownership_limit = Some(value);299 }300 CollectionLimitField::SponsoredDataSize => {301 limits.sponsored_data_size = Some(value);302 }303 CollectionLimitField::SponsoredDataRateLimit => {304 limits.sponsored_data_rate_limit =305 Some(up_data_structs::SponsoringRateLimit::Blocks(value));306 }307 CollectionLimitField::TokenLimit => {308 limits.token_limit = Some(value);309 }310 CollectionLimitField::SponsorTransferTimeout => {311 limits.sponsor_transfer_timeout = Some(value);312 }313 CollectionLimitField::SponsorApproveTimeout => {314 limits.sponsor_approve_timeout = Some(value);315 }316 CollectionLimitField::OwnerCanTransfer => {317 limits.owner_can_transfer = Some(convert_value_to_bool()?);318 }319 CollectionLimitField::OwnerCanDestroy => {320 limits.owner_can_destroy = Some(convert_value_to_bool()?);321 }322 CollectionLimitField::TransferEnabled => {323 limits.transfers_enabled = Some(convert_value_to_bool()?);324 }325 };326 Ok(limits)327 }328}329330/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.331#[derive(Default, Debug, Clone, Copy, AbiCoder)]332#[repr(u8)]333pub enum CollectionPermissionField {334 /// Owner of token can nest tokens under it.335 #[default]336 TokenOwner,337338 /// Admin of token collection can nest tokens under token.339 CollectionAdmin,340}341342/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.343#[derive(AbiCoder, Copy, Clone, Default, Debug)]344#[repr(u8)]345pub enum TokenPermissionField {346 /// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]347 #[default]348 Mutable,349350 /// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]351 TokenOwner,352353 /// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]354 CollectionAdmin,355}356357/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.358#[derive(Debug, Default, AbiCoder)]359pub struct PropertyPermission {360 /// TokenPermission field.361 code: TokenPermissionField,362 /// TokenPermission value.363 value: bool,364}365366impl PropertyPermission {367 /// Make vector of [`PropertyPermission`] from [`up_data_structs::PropertyPermission`].368 pub fn into_vec(pp: up_data_structs::PropertyPermission) -> Vec<Self> {369 vec![370 PropertyPermission {371 code: TokenPermissionField::Mutable,372 value: pp.mutable,373 },374 PropertyPermission {375 code: TokenPermissionField::TokenOwner,376 value: pp.token_owner,377 },378 PropertyPermission {379 code: TokenPermissionField::CollectionAdmin,380 value: pp.collection_admin,381 },382 ]383 }384385 /// Make [`up_data_structs::PropertyPermission`] from vector of [`PropertyPermission`].386 pub fn from_vec(permission: Vec<Self>) -> up_data_structs::PropertyPermission {387 let mut token_permission = up_data_structs::PropertyPermission::default();388389 for PropertyPermission { code, value } in permission {390 match code {391 TokenPermissionField::Mutable => token_permission.mutable = value,392 TokenPermissionField::TokenOwner => token_permission.token_owner = value,393 TokenPermissionField::CollectionAdmin => token_permission.collection_admin = value,394 }395 }396 token_permission397 }398}399400/// Ethereum representation of Token Property Permissions.401#[derive(Debug, Default, AbiCoder)]402pub struct TokenPropertyPermission {403 /// Token property key.404 key: evm_coder::types::string,405 /// Token property permissions.406 permissions: Vec<PropertyPermission>,407}408409impl410 From<(411 up_data_structs::PropertyKey,412 up_data_structs::PropertyPermission,413 )> for TokenPropertyPermission414{415 fn from(416 value: (417 up_data_structs::PropertyKey,418 up_data_structs::PropertyPermission,419 ),420 ) -> Self {421 let (key, permission) = value;422 let key = evm_coder::types::string::from_utf8(key.into_inner())423 .expect("Stored key must be valid");424 let permissions = PropertyPermission::into_vec(permission);425 Self { key, permissions }426 }427}428429impl TokenPropertyPermission {430 /// Convert vector of [`TokenPropertyPermission`] into vector of [`up_data_structs::PropertyKeyPermission`].431 pub fn into_property_key_permissions(432 permissions: Vec<TokenPropertyPermission>,433 ) -> evm_coder::execution::Result<Vec<up_data_structs::PropertyKeyPermission>> {434 let mut perms = Vec::new();435436 for TokenPropertyPermission { key, permissions } in permissions {437 let token_permission = PropertyPermission::from_vec(permissions);438439 perms.push(up_data_structs::PropertyKeyPermission {440 key: key.into_bytes().try_into().map_err(|_| "too long key")?,441 permission: token_permission,442 });443 }444 Ok(perms)445 }446}447448/// Nested collections.449#[derive(Debug, Default, AbiCoder)]450pub struct CollectionNesting {451 token_owner: bool,452 ids: Vec<uint256>,453}454455impl CollectionNesting {456 /// Create [`CollectionNesting`].457 pub fn new(token_owner: bool, ids: Vec<uint256>) -> Self {458 Self { token_owner, ids }459 }460}461462/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.463#[derive(Debug, Default, AbiCoder)]464pub struct CollectionNestingPermission {465 field: CollectionPermissionField,466 value: bool,467}468469impl CollectionNestingPermission {470 /// Create [`CollectionNestingPermission`].471 pub fn new(field: CollectionPermissionField, value: bool) -> Self {472 Self { field, value }473 }474}pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -38,6 +38,7 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
+ eth,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::call;
@@ -93,25 +94,21 @@
fn set_token_property_permissions(
&mut self,
caller: caller,
- permissions: Vec<pallet_common::eth::TokenPropertyPermission>,
+ permissions: Vec<eth::TokenPropertyPermission>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
- let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(
- permissions,
- )?;
+ let perms = eth::TokenPropertyPermission::into_property_key_permissions(permissions)?;
<Pallet<T>>::set_token_property_permissions(self, &caller, perms)
.map_err(dispatch_to_evm::<T>)
}
/// @notice Get permissions for token properties.
- fn token_property_permissions(
- &self,
- ) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {
+ fn token_property_permissions(&self) -> Result<Vec<eth::TokenPropertyPermission>> {
let perms = <Pallet<T>>::token_property_permission(self.id);
Ok(perms
.into_iter()
- .map(pallet_common::eth::TokenPropertyPermission::from)
+ .map(eth::TokenPropertyPermission::from)
.collect())
}
@@ -159,7 +156,7 @@
&mut self,
caller: caller,
token_id: uint256,
- properties: Vec<pallet_common::eth::Property>,
+ properties: Vec<eth::Property>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -170,7 +167,7 @@
let properties = properties
.into_iter()
- .map(pallet_common::eth::Property::try_into)
+ .map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?;
<Pallet<T>>::set_token_properties(
@@ -753,9 +750,9 @@
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
- fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAddress> {
+ fn cross_owner_of(&self, token_id: uint256) -> Result<eth::CrossAddress> {
Self::token_owner(&self, token_id.try_into()?)
- .map(|o| pallet_common::eth::CrossAddress::from_sub_cross_account::<T>(&o))
+ .map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
}
@@ -764,11 +761,7 @@
/// @param tokenId Id for the token.
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn properties(
- &self,
- token_id: uint256,
- keys: Vec<string>,
- ) -> Result<Vec<pallet_common::eth::Property>> {
+ fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -784,7 +777,7 @@
if keys.is_empty() { None } else { Some(keys) },
)
.into_iter()
- .map(pallet_common::eth::Property::try_from)
+ .map(eth::Property::try_from)
.collect::<Result<Vec<_>>>()
}
@@ -798,7 +791,7 @@
fn approve_cross(
&mut self,
caller: caller,
- approved: pallet_common::eth::CrossAddress,
+ approved: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -837,7 +830,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAddress,
+ to: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -861,8 +854,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAddress,
- to: pallet_common::eth::CrossAddress,
+ from: eth::CrossAddress,
+ to: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -908,7 +901,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAddress,
+ from: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -1030,8 +1023,8 @@
fn mint_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAddress,
- properties: Vec<pallet_common::eth::Property>,
+ to: eth::CrossAddress,
+ properties: Vec<eth::Property>,
) -> Result<uint256> {
let token_id = <TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -1041,7 +1034,7 @@
let properties = properties
.into_iter()
- .map(pallet_common::eth::Property::try_into)
+ .map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?
.try_into()
.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -32,8 +32,9 @@
use frame_support::{BoundedBTreeMap, BoundedVec};
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
+ Error as CommonError,
erc::{CommonEvmHandler, CollectionCall, static_property::key},
- Error as CommonError,
+ eth,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
@@ -96,25 +97,21 @@
fn set_token_property_permissions(
&mut self,
caller: caller,
- permissions: Vec<pallet_common::eth::TokenPropertyPermission>,
+ permissions: Vec<eth::TokenPropertyPermission>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
- let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(
- permissions,
- )?;
+ let perms = eth::TokenPropertyPermission::into_property_key_permissions(permissions)?;
<Pallet<T>>::set_token_property_permissions(self, &caller, perms)
.map_err(dispatch_to_evm::<T>)
}
/// @notice Get permissions for token properties.
- fn token_property_permissions(
- &self,
- ) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {
+ fn token_property_permissions(&self) -> Result<Vec<eth::TokenPropertyPermission>> {
let perms = <Pallet<T>>::token_property_permission(self.id);
Ok(perms
.into_iter()
- .map(pallet_common::eth::TokenPropertyPermission::from)
+ .map(eth::TokenPropertyPermission::from)
.collect())
}
@@ -162,7 +159,7 @@
&mut self,
caller: caller,
token_id: uint256,
- properties: Vec<pallet_common::eth::Property>,
+ properties: Vec<eth::Property>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -173,7 +170,7 @@
let properties = properties
.into_iter()
- .map(pallet_common::eth::Property::try_into)
+ .map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?;
<Pallet<T>>::set_token_properties(
@@ -788,9 +785,9 @@
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
- fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAddress> {
+ fn cross_owner_of(&self, token_id: uint256) -> Result<eth::CrossAddress> {
Self::token_owner(&self, token_id.try_into()?)
- .map(|o| pallet_common::eth::CrossAddress::from_sub_cross_account::<T>(&o))
+ .map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
}
@@ -799,11 +796,7 @@
/// @param tokenId Id for the token.
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn properties(
- &self,
- token_id: uint256,
- keys: Vec<string>,
- ) -> Result<Vec<pallet_common::eth::Property>> {
+ fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -819,7 +812,7 @@
if keys.is_empty() { None } else { Some(keys) },
)
.into_iter()
- .map(pallet_common::eth::Property::try_from)
+ .map(eth::Property::try_from)
.collect::<Result<Vec<_>>>()
}
/// @notice Transfer ownership of an RFT
@@ -855,7 +848,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAddress,
+ to: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -883,8 +876,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAddress,
- to: pallet_common::eth::CrossAddress,
+ from: eth::CrossAddress,
+ to: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -939,7 +932,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAddress,
+ from: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -1076,8 +1069,8 @@
fn mint_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAddress,
- properties: Vec<pallet_common::eth::Property>,
+ to: eth::CrossAddress,
+ properties: Vec<eth::Property>,
) -> Result<uint256> {
let token_id = <TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -1087,7 +1080,7 @@
let properties = properties
.into_iter()
- .map(pallet_common::eth::Property::try_into)
+ .map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?
.try_into()
.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;