difftreelog
feat Rewrite tuple to named structures for TokenPropertyPermission. fix: AbiCoder derive macro
in: master
23 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
@@ -86,6 +86,21 @@
)
}
+pub fn impl_enum_solidity_type<'a>(name: &syn::Ident) -> proc_macro2::TokenStream {
+ quote! {
+ #[cfg(feature = "stubgen")]
+ impl ::evm_coder::solidity::SolidityType for #name {
+ fn names(tc: &::evm_coder::solidity::TypeCollector) -> Vec<String> {
+ Vec::new()
+ }
+
+ fn len() -> usize {
+ 1
+ }
+ }
+ }
+}
+
pub fn impl_enum_solidity_type_name(name: &syn::Ident) -> proc_macro2::TokenStream {
quote!(
#[cfg(feature = "stubgen")]
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
@@ -86,6 +86,7 @@
let abi_type = impl_enum_abi_type(name, option_count);
let abi_read = impl_enum_abi_read(name);
let abi_write = impl_enum_abi_write(name);
+ let solidity_type = impl_enum_solidity_type(name);
let solidity_type_name = impl_enum_solidity_type_name(name);
let solidity_struct_collect = impl_enum_solidity_struct_collect(
name,
@@ -102,6 +103,7 @@
#abi_type
#abi_read
#abi_write
+ #solidity_type
#solidity_type_name
#solidity_struct_collect
})
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -184,6 +184,11 @@
}
}
+macro_rules! count {
+ () => (0usize);
+ ( $x:tt $($xs:tt)* ) => (1usize + count!($($xs)*));
+}
+
macro_rules! impl_tuples {
($($ident:ident)+) => {
impl<$($ident: AbiType,)+> AbiType for ($($ident,)+)
@@ -198,7 +203,7 @@
shift_left(1)
fixed(")")
);
- const FIELDS_COUNT: usize = 0 $(+ {let _ = <$ident as AbiType>::FIELDS_COUNT; 1})+;
+ const FIELDS_COUNT: usize = count!($($ident)*);
fn is_dynamic() -> bool {
false
crates/evm-coder/src/solidity/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/impls.rs
+++ b/crates/evm-coder/src/solidity/impls.rs
@@ -74,6 +74,16 @@
}
}
+impl<T: StructCollect + sealed::CanBePlacedInVec> StructCollect for Vec<T> {
+ fn name() -> String {
+ <T as StructCollect>::name() + "[]"
+ }
+
+ fn declaration() -> String {
+ unimplemented!("Vectors have not declarations.")
+ }
+}
+
macro_rules! count {
() => (0usize);
( $x:tt $($xs:tt)* ) => (1usize + count!($($xs)*));
@@ -131,60 +141,3 @@
impl_tuples! {A B C D E F G H}
impl_tuples! {A B C D E F G H I}
impl_tuples! {A B C D E F G H I J}
-
-impl StructCollect for Property {
- fn name() -> String {
- "Property".into()
- }
-
- fn declaration() -> String {
- use std::fmt::Write;
-
- let mut str = String::new();
- writeln!(str, "/// @dev Property struct").unwrap();
- writeln!(str, "struct {} {{", Self::name()).unwrap();
- writeln!(str, "\tstring key;").unwrap();
- writeln!(str, "\tbytes value;").unwrap();
- writeln!(str, "}}").unwrap();
- str
- }
-}
-
-impl SolidityTypeName for Property {
- fn solidity_name(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
- write!(writer, "{}", tc.collect_struct::<Self>())
- }
-
- fn is_simple() -> bool {
- false
- }
-
- fn solidity_default(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
- write!(writer, "{}(", tc.collect_struct::<Self>())?;
- address::solidity_default(writer, tc)?;
- write!(writer, ",")?;
- uint256::solidity_default(writer, tc)?;
- write!(writer, ")")
- }
-}
-
-impl SolidityType for Property {
- fn names(tc: &TypeCollector) -> Vec<string> {
- let mut collected = Vec::with_capacity(Self::len());
- {
- let mut out = string::new();
- string::solidity_name(&mut out, tc).expect("no fmt error");
- collected.push(out);
- }
- {
- let mut out = string::new();
- bytes::solidity_name(&mut out, tc).expect("no fmt error");
- collected.push(out);
- }
- collected
- }
-
- fn len() -> usize {
- 2
- }
-}
crates/evm-coder/src/solidity/mod.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/mod.rs
+++ b/crates/evm-coder/src/solidity/mod.rs
@@ -76,7 +76,8 @@
self.anonymous.borrow_mut().insert(names, id);
format!("Tuple{}", id)
}
- pub fn collect_struct<T: StructCollect>(&self) -> String {
+ pub fn collect_struct<T: StructCollect + SolidityType>(&self) -> String {
+ let _names = T::names(self);
self.collect(<T as StructCollect>::declaration());
<T as StructCollect>::name()
}
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
@@ -100,6 +100,15 @@
}
#[test]
+ #[cfg(feature = "stubgen")]
+ fn struct_collect_vec() {
+ assert_eq!(
+ <Vec<u8> as ::evm_coder::solidity::StructCollect>::name(),
+ "uint8[]"
+ );
+ }
+
+ #[test]
fn impl_abi_type_signature() {
assert_eq!(
<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::SIGNATURE
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -16,6 +16,7 @@
//! The module contains a number of functions for converting and checking ethereum identifiers.
+use sp_std::{vec, vec::Vec};
use evm_coder::{
AbiCoder,
types::{uint256, address},
@@ -183,3 +184,102 @@
/// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]
CollectionAdmin,
}
+
+/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
+#[derive(Debug, Default, AbiCoder)]
+pub struct PropertyPermission {
+ /// TokenPermission field.
+ code: EthTokenPermissions,
+ /// TokenPermission value.
+ value: bool,
+}
+
+impl PropertyPermission {
+ pub fn into_vec(pp: up_data_structs::PropertyPermission) -> Vec<Self> {
+ vec![
+ PropertyPermission {
+ code: EthTokenPermissions::Mutable,
+ value: pp.mutable,
+ },
+ PropertyPermission {
+ code: EthTokenPermissions::TokenOwner,
+ value: pp.token_owner,
+ },
+ PropertyPermission {
+ code: EthTokenPermissions::CollectionAdmin,
+ value: pp.collection_admin,
+ },
+ ]
+ }
+
+ pub fn from_vec(permission: Vec<Self>) -> up_data_structs::PropertyPermission {
+ let mut token_permission = up_data_structs::PropertyPermission::default();
+
+ for PropertyPermission { code, value } in permission {
+ match code {
+ EthTokenPermissions::Mutable => token_permission.mutable = value,
+ EthTokenPermissions::TokenOwner => token_permission.token_owner = value,
+ EthTokenPermissions::CollectionAdmin => token_permission.collection_admin = value,
+ }
+ }
+ token_permission
+ }
+}
+
+/// Ethereum representation of Token Property Permissions.
+#[derive(Debug, Default, AbiCoder)]
+pub struct TokenPropertyPermission {
+ /// Token property key.
+ key: evm_coder::types::string,
+ /// Token property permissions.
+ permissions: Vec<PropertyPermission>,
+}
+
+impl
+ From<(
+ up_data_structs::PropertyKey,
+ up_data_structs::PropertyPermission,
+ )> for TokenPropertyPermission
+{
+ fn from(
+ value: (
+ up_data_structs::PropertyKey,
+ up_data_structs::PropertyPermission,
+ ),
+ ) -> Self {
+ let (key, permission) = value;
+ let key = evm_coder::types::string::from_utf8(key.into_inner())
+ .expect("Stored key must be valid");
+ let permissions = PropertyPermission::into_vec(permission);
+ Self { key, permissions }
+ }
+}
+
+impl TokenPropertyPermission {
+ pub fn into_property_key_permissions(
+ permissions: Vec<TokenPropertyPermission>,
+ ) -> evm_coder::execution::Result<Vec<up_data_structs::PropertyKeyPermission>> {
+ let mut perms = Vec::new();
+
+ for TokenPropertyPermission { key, permissions } in permissions {
+ if permissions.len() > <EthTokenPermissions as evm_coder::abi::AbiType>::FIELDS_COUNT {
+ return Err(alloc::format!(
+ "Actual number of fields {} for {}, which exceeds the maximum value of {}",
+ permissions.len(),
+ stringify!(EthTokenPermissions),
+ <EthTokenPermissions as evm_coder::abi::AbiType>::FIELDS_COUNT
+ )
+ .as_str()
+ .into());
+ }
+
+ let token_permission = PropertyPermission::from_vec(permissions);
+
+ perms.push(up_data_structs::PropertyKeyPermission {
+ key: key.into_bytes().try_into().map_err(|_| "too long key")?,
+ permission: token_permission,
+ });
+ }
+ Ok(perms)
+ }
+}
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7contract Dummy {8 uint8 dummy;9 string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13 function supportsInterface(bytes4 interfaceID) external view returns (bool) {14 require(false, stub_error);15 interfaceID;16 return true;17 }18}1920/// @title A contract that allows you to work with collections.21/// @dev the ERC-165 identifier for this interface is 0x81172a7522contract Collection is Dummy, ERC165 {23 // /// Set collection property.24 // ///25 // /// @param key Property key.26 // /// @param value Propery value.27 // /// @dev EVM selector for this function is: 0x2f073f66,28 // /// or in textual repr: setCollectionProperty(string,bytes)29 // function setCollectionProperty(string memory key, bytes memory value) public {30 // require(false, stub_error);31 // key;32 // value;33 // dummy = 0;34 // }3536 /// Set collection properties.37 ///38 /// @param properties Vector of properties key/value pair.39 /// @dev EVM selector for this function is: 0x50b26b2a,40 /// or in textual repr: setCollectionProperties((string,bytes)[])41 function setCollectionProperties(Property[] memory properties) public {42 require(false, stub_error);43 properties;44 dummy = 0;45 }4647 // /// Delete collection property.48 // ///49 // /// @param key Property key.50 // /// @dev EVM selector for this function is: 0x7b7debce,51 // /// or in textual repr: deleteCollectionProperty(string)52 // function deleteCollectionProperty(string memory key) public {53 // require(false, stub_error);54 // key;55 // dummy = 0;56 // }5758 /// Delete collection properties.59 ///60 /// @param keys Properties keys.61 /// @dev EVM selector for this function is: 0xee206ee3,62 /// or in textual repr: deleteCollectionProperties(string[])63 function deleteCollectionProperties(string[] memory keys) public {64 require(false, stub_error);65 keys;66 dummy = 0;67 }6869 /// Get collection property.70 ///71 /// @dev Throws error if key not found.72 ///73 /// @param key Property key.74 /// @return bytes The property corresponding to the key.75 /// @dev EVM selector for this function is: 0xcf24fd6d,76 /// or in textual repr: collectionProperty(string)77 function collectionProperty(string memory key) public view returns (bytes memory) {78 require(false, stub_error);79 key;80 dummy;81 return hex"";82 }8384 /// Get collection properties.85 ///86 /// @param keys Properties keys. Empty keys for all propertyes.87 /// @return Vector of properties key/value pairs.88 /// @dev EVM selector for this function is: 0x285fb8e6,89 /// or in textual repr: collectionProperties(string[])90 function collectionProperties(string[] memory keys) public view returns (Property[] memory) {91 require(false, stub_error);92 keys;93 dummy;94 return new Property[](0);95 }9697 // /// Set the sponsor of the collection.98 // ///99 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.100 // ///101 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.102 // /// @dev EVM selector for this function is: 0x7623402e,103 // /// or in textual repr: setCollectionSponsor(address)104 // function setCollectionSponsor(address sponsor) public {105 // require(false, stub_error);106 // sponsor;107 // dummy = 0;108 // }109110 /// Set the sponsor of the collection.111 ///112 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.113 ///114 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.115 /// @dev EVM selector for this function is: 0x84a1d5a8,116 /// or in textual repr: setCollectionSponsorCross((address,uint256))117 function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {118 require(false, stub_error);119 sponsor;120 dummy = 0;121 }122123 /// Whether there is a pending sponsor.124 /// @dev EVM selector for this function is: 0x058ac185,125 /// or in textual repr: hasCollectionPendingSponsor()126 function hasCollectionPendingSponsor() public view returns (bool) {127 require(false, stub_error);128 dummy;129 return false;130 }131132 /// Collection sponsorship confirmation.133 ///134 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.135 /// @dev EVM selector for this function is: 0x3c50e97a,136 /// or in textual repr: confirmCollectionSponsorship()137 function confirmCollectionSponsorship() public {138 require(false, stub_error);139 dummy = 0;140 }141142 /// Remove collection sponsor.143 /// @dev EVM selector for this function is: 0x6e0326a3,144 /// or in textual repr: removeCollectionSponsor()145 function removeCollectionSponsor() public {146 require(false, stub_error);147 dummy = 0;148 }149150 /// Get current sponsor.151 ///152 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.153 /// @dev EVM selector for this function is: 0x6ec0a9f1,154 /// or in textual repr: collectionSponsor()155 function collectionSponsor() public view returns (EthCrossAccount memory) {156 require(false, stub_error);157 dummy;158 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);159 }160161 /// Get current collection limits.162 ///163 /// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:164 /// "accountTokenOwnershipLimit",165 /// "sponsoredDataSize",166 /// "sponsoredDataRateLimit",167 /// "tokenLimit",168 /// "sponsorTransferTimeout",169 /// "sponsorApproveTimeout"170 /// "ownerCanTransfer",171 /// "ownerCanDestroy",172 /// "transfersEnabled"173 /// Return `false` if a limit not set.174 /// @dev EVM selector for this function is: 0xf63bc572,175 /// or in textual repr: collectionLimits()176 function collectionLimits() public view returns (Tuple23[] memory) {177 require(false, stub_error);178 dummy;179 return new Tuple23[](0);180 }181182 /// Set limits for the collection.183 /// @dev Throws error if limit not found.184 /// @param limit Name of the limit. Valid names:185 /// "accountTokenOwnershipLimit",186 /// "sponsoredDataSize",187 /// "sponsoredDataRateLimit",188 /// "tokenLimit",189 /// "sponsorTransferTimeout",190 /// "sponsorApproveTimeout"191 /// "ownerCanTransfer",192 /// "ownerCanDestroy",193 /// "transfersEnabled"194 /// @param status enable\disable limit. Works only with `true`.195 /// @param value Value of the limit.196 /// @dev EVM selector for this function is: 0x88150bd0,197 /// or in textual repr: setCollectionLimit(uint8,bool,uint256)198 function setCollectionLimit(199 CollectionLimits limit,200 bool status,201 uint256 value202 ) public {203 require(false, stub_error);204 limit;205 status;206 value;207 dummy = 0;208 }209210 /// Get contract address.211 /// @dev EVM selector for this function is: 0xf6b4dfb4,212 /// or in textual repr: contractAddress()213 function contractAddress() public view returns (address) {214 require(false, stub_error);215 dummy;216 return 0x0000000000000000000000000000000000000000;217 }218219 /// Add collection admin.220 /// @param newAdmin Cross account administrator address.221 /// @dev EVM selector for this function is: 0x859aa7d6,222 /// or in textual repr: addCollectionAdminCross((address,uint256))223 function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {224 require(false, stub_error);225 newAdmin;226 dummy = 0;227 }228229 /// Remove collection admin.230 /// @param admin Cross account administrator address.231 /// @dev EVM selector for this function is: 0x6c0cd173,232 /// or in textual repr: removeCollectionAdminCross((address,uint256))233 function removeCollectionAdminCross(EthCrossAccount memory admin) public {234 require(false, stub_error);235 admin;236 dummy = 0;237 }238239 // /// Add collection admin.240 // /// @param newAdmin Address of the added administrator.241 // /// @dev EVM selector for this function is: 0x92e462c7,242 // /// or in textual repr: addCollectionAdmin(address)243 // function addCollectionAdmin(address newAdmin) public {244 // require(false, stub_error);245 // newAdmin;246 // dummy = 0;247 // }248249 // /// Remove collection admin.250 // ///251 // /// @param admin Address of the removed administrator.252 // /// @dev EVM selector for this function is: 0xfafd7b42,253 // /// or in textual repr: removeCollectionAdmin(address)254 // function removeCollectionAdmin(address admin) public {255 // require(false, stub_error);256 // admin;257 // dummy = 0;258 // }259260 /// Toggle accessibility of collection nesting.261 ///262 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'263 /// @dev EVM selector for this function is: 0x112d4586,264 /// or in textual repr: setCollectionNesting(bool)265 function setCollectionNesting(bool enable) public {266 require(false, stub_error);267 enable;268 dummy = 0;269 }270271 /// Toggle accessibility of collection nesting.272 ///273 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'274 /// @param collections Addresses of collections that will be available for nesting.275 /// @dev EVM selector for this function is: 0x64872396,276 /// or in textual repr: setCollectionNesting(bool,address[])277 function setCollectionNesting(bool enable, address[] memory collections) public {278 require(false, stub_error);279 enable;280 collections;281 dummy = 0;282 }283284 /// Returns nesting for a collection285 /// @dev EVM selector for this function is: 0x22d25bfe,286 /// or in textual repr: collectionNestingRestrictedCollectionIds()287 function collectionNestingRestrictedCollectionIds() public view returns (Tuple29 memory) {288 require(false, stub_error);289 dummy;290 return Tuple29(false, new uint256[](0));291 }292293 /// Returns permissions for a collection294 /// @dev EVM selector for this function is: 0x5b2eaf4b,295 /// or in textual repr: collectionNestingPermissions()296 function collectionNestingPermissions() public view returns (Tuple32[] memory) {297 require(false, stub_error);298 dummy;299 return new Tuple32[](0);300 }301302 /// Set the collection access method.303 /// @param mode Access mode304 /// 0 for Normal305 /// 1 for AllowList306 /// @dev EVM selector for this function is: 0x41835d4c,307 /// or in textual repr: setCollectionAccess(uint8)308 function setCollectionAccess(uint8 mode) public {309 require(false, stub_error);310 mode;311 dummy = 0;312 }313314 /// Checks that user allowed to operate with collection.315 ///316 /// @param user User address to check.317 /// @dev EVM selector for this function is: 0x91b6df49,318 /// or in textual repr: allowlistedCross((address,uint256))319 function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {320 require(false, stub_error);321 user;322 dummy;323 return false;324 }325326 // /// Add the user to the allowed list.327 // ///328 // /// @param user Address of a trusted user.329 // /// @dev EVM selector for this function is: 0x67844fe6,330 // /// or in textual repr: addToCollectionAllowList(address)331 // function addToCollectionAllowList(address user) public {332 // require(false, stub_error);333 // user;334 // dummy = 0;335 // }336337 /// Add user to allowed list.338 ///339 /// @param user User cross account address.340 /// @dev EVM selector for this function is: 0xa0184a3a,341 /// or in textual repr: addToCollectionAllowListCross((address,uint256))342 function addToCollectionAllowListCross(EthCrossAccount memory user) public {343 require(false, stub_error);344 user;345 dummy = 0;346 }347348 // /// Remove the user from the allowed list.349 // ///350 // /// @param user Address of a removed user.351 // /// @dev EVM selector for this function is: 0x85c51acb,352 // /// or in textual repr: removeFromCollectionAllowList(address)353 // function removeFromCollectionAllowList(address user) public {354 // require(false, stub_error);355 // user;356 // dummy = 0;357 // }358359 /// Remove user from allowed list.360 ///361 /// @param user User cross account address.362 /// @dev EVM selector for this function is: 0x09ba452a,363 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))364 function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {365 require(false, stub_error);366 user;367 dummy = 0;368 }369370 /// Switch permission for minting.371 ///372 /// @param mode Enable if "true".373 /// @dev EVM selector for this function is: 0x00018e84,374 /// or in textual repr: setCollectionMintMode(bool)375 function setCollectionMintMode(bool mode) public {376 require(false, stub_error);377 mode;378 dummy = 0;379 }380381 // /// Check that account is the owner or admin of the collection382 // ///383 // /// @param user account to verify384 // /// @return "true" if account is the owner or admin385 // /// @dev EVM selector for this function is: 0x9811b0c7,386 // /// or in textual repr: isOwnerOrAdmin(address)387 // function isOwnerOrAdmin(address user) public view returns (bool) {388 // require(false, stub_error);389 // user;390 // dummy;391 // return false;392 // }393394 /// Check that account is the owner or admin of the collection395 ///396 /// @param user User cross account to verify397 /// @return "true" if account is the owner or admin398 /// @dev EVM selector for this function is: 0x3e75a905,399 /// or in textual repr: isOwnerOrAdminCross((address,uint256))400 function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {401 require(false, stub_error);402 user;403 dummy;404 return false;405 }406407 /// Returns collection type408 ///409 /// @return `Fungible` or `NFT` or `ReFungible`410 /// @dev EVM selector for this function is: 0xd34b55b8,411 /// or in textual repr: uniqueCollectionType()412 function uniqueCollectionType() public view returns (string memory) {413 require(false, stub_error);414 dummy;415 return "";416 }417418 /// Get collection owner.419 ///420 /// @return Tuble with sponsor address and his substrate mirror.421 /// If address is canonical then substrate mirror is zero and vice versa.422 /// @dev EVM selector for this function is: 0xdf727d3b,423 /// or in textual repr: collectionOwner()424 function collectionOwner() public view returns (EthCrossAccount memory) {425 require(false, stub_error);426 dummy;427 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);428 }429430 // /// Changes collection owner to another account431 // ///432 // /// @dev Owner can be changed only by current owner433 // /// @param newOwner new owner account434 // /// @dev EVM selector for this function is: 0x4f53e226,435 // /// or in textual repr: changeCollectionOwner(address)436 // function changeCollectionOwner(address newOwner) public {437 // require(false, stub_error);438 // newOwner;439 // dummy = 0;440 // }441442 /// Get collection administrators443 ///444 /// @return Vector of tuples with admins address and his substrate mirror.445 /// If address is canonical then substrate mirror is zero and vice versa.446 /// @dev EVM selector for this function is: 0x5813216b,447 /// or in textual repr: collectionAdmins()448 function collectionAdmins() public view returns (EthCrossAccount[] memory) {449 require(false, stub_error);450 dummy;451 return new EthCrossAccount[](0);452 }453454 /// Changes collection owner to another account455 ///456 /// @dev Owner can be changed only by current owner457 /// @param newOwner new owner cross account458 /// @dev EVM selector for this function is: 0x6496c497,459 /// or in textual repr: changeCollectionOwnerCross((address,uint256))460 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {461 require(false, stub_error);462 newOwner;463 dummy = 0;464 }465}466467/// @dev Cross account struct468struct EthCrossAccount {469 address eth;470 uint256 sub;471}472473enum CollectionPermissions {474 CollectionAdmin,475 TokenOwner476}477478/// @dev anonymous struct479struct Tuple32 {480 CollectionPermissions field_0;481 bool field_1;482}483484/// @dev anonymous struct485struct Tuple29 {486 bool field_0;487 uint256[] field_1;488}489490/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.491enum CollectionLimits {492 /// @dev How many tokens can a user have on one account.493 AccountTokenOwnership,494 /// @dev How many bytes of data are available for sponsorship.495 SponsoredDataSize,496 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]497 SponsoredDataRateLimit,498 /// @dev How many tokens can be mined into this collection.499 TokenLimit,500 /// @dev Timeouts for transfer sponsoring.501 SponsorTransferTimeout,502 /// @dev Timeout for sponsoring an approval in passed blocks.503 SponsorApproveTimeout,504 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).505 OwnerCanTransfer,506 /// @dev Can the collection owner burn other people's tokens.507 OwnerCanDestroy,508 /// @dev Is it possible to send tokens from this collection between users.509 TransferEnabled510}511512/// @dev anonymous struct513struct Tuple23 {514 CollectionLimits field_0;515 bool field_1;516 uint256 field_2;517}518519/// @dev Property struct520struct Property {521 string key;522 bytes value;523}524525/// @dev the ERC-165 identifier for this interface is 0x7dee5997526contract ERC20UniqueExtensions is Dummy, ERC165 {527 /// @notice A description for the collection.528 /// @dev EVM selector for this function is: 0x7284e416,529 /// or in textual repr: description()530 function description() public view returns (string memory) {531 require(false, stub_error);532 dummy;533 return "";534 }535536 /// @dev EVM selector for this function is: 0x269e6158,537 /// or in textual repr: mintCross((address,uint256),uint256)538 function mintCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {539 require(false, stub_error);540 to;541 amount;542 dummy = 0;543 return false;544 }545546 /// @dev EVM selector for this function is: 0x0ecd0ab0,547 /// or in textual repr: approveCross((address,uint256),uint256)548 function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {549 require(false, stub_error);550 spender;551 amount;552 dummy = 0;553 return false;554 }555556 // /// Burn tokens from account557 // /// @dev Function that burns an `amount` of the tokens of a given account,558 // /// deducting from the sender's allowance for said account.559 // /// @param from The account whose tokens will be burnt.560 // /// @param amount The amount that will be burnt.561 // /// @dev EVM selector for this function is: 0x79cc6790,562 // /// or in textual repr: burnFrom(address,uint256)563 // function burnFrom(address from, uint256 amount) public returns (bool) {564 // require(false, stub_error);565 // from;566 // amount;567 // dummy = 0;568 // return false;569 // }570571 /// Burn tokens from account572 /// @dev Function that burns an `amount` of the tokens of a given account,573 /// deducting from the sender's allowance for said account.574 /// @param from The account whose tokens will be burnt.575 /// @param amount The amount that will be burnt.576 /// @dev EVM selector for this function is: 0xbb2f5a58,577 /// or in textual repr: burnFromCross((address,uint256),uint256)578 function burnFromCross(EthCrossAccount memory from, uint256 amount) public returns (bool) {579 require(false, stub_error);580 from;581 amount;582 dummy = 0;583 return false;584 }585586 /// Mint tokens for multiple accounts.587 /// @param amounts array of pairs of account address and amount588 /// @dev EVM selector for this function is: 0x1acf2d55,589 /// or in textual repr: mintBulk((address,uint256)[])590 function mintBulk(Tuple9[] memory amounts) public returns (bool) {591 require(false, stub_error);592 amounts;593 dummy = 0;594 return false;595 }596597 /// @dev EVM selector for this function is: 0x2ada85ff,598 /// or in textual repr: transferCross((address,uint256),uint256)599 function transferCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {600 require(false, stub_error);601 to;602 amount;603 dummy = 0;604 return false;605 }606607 /// @dev EVM selector for this function is: 0xd5cf430b,608 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)609 function transferFromCross(610 EthCrossAccount memory from,611 EthCrossAccount memory to,612 uint256 amount613 ) public returns (bool) {614 require(false, stub_error);615 from;616 to;617 amount;618 dummy = 0;619 return false;620 }621}622623/// @dev anonymous struct624struct Tuple9 {625 address field_0;626 uint256 field_1;627}628629/// @dev the ERC-165 identifier for this interface is 0x40c10f19630contract ERC20Mintable is Dummy, ERC165 {631 /// Mint tokens for `to` account.632 /// @param to account that will receive minted tokens633 /// @param amount amount of tokens to mint634 /// @dev EVM selector for this function is: 0x40c10f19,635 /// or in textual repr: mint(address,uint256)636 function mint(address to, uint256 amount) public returns (bool) {637 require(false, stub_error);638 to;639 amount;640 dummy = 0;641 return false;642 }643}644645/// @dev inlined interface646contract ERC20Events {647 event Transfer(address indexed from, address indexed to, uint256 value);648 event Approval(address indexed owner, address indexed spender, uint256 value);649}650651/// @dev the ERC-165 identifier for this interface is 0x8cb847c4652contract ERC20 is Dummy, ERC165, ERC20Events {653 /// @dev EVM selector for this function is: 0x06fdde03,654 /// or in textual repr: name()655 function name() public view returns (string memory) {656 require(false, stub_error);657 dummy;658 return "";659 }660661 /// @dev EVM selector for this function is: 0x95d89b41,662 /// or in textual repr: symbol()663 function symbol() public view returns (string memory) {664 require(false, stub_error);665 dummy;666 return "";667 }668669 /// @dev EVM selector for this function is: 0x18160ddd,670 /// or in textual repr: totalSupply()671 function totalSupply() public view returns (uint256) {672 require(false, stub_error);673 dummy;674 return 0;675 }676677 /// @dev EVM selector for this function is: 0x313ce567,678 /// or in textual repr: decimals()679 function decimals() public view returns (uint8) {680 require(false, stub_error);681 dummy;682 return 0;683 }684685 /// @dev EVM selector for this function is: 0x70a08231,686 /// or in textual repr: balanceOf(address)687 function balanceOf(address owner) public view returns (uint256) {688 require(false, stub_error);689 owner;690 dummy;691 return 0;692 }693694 /// @dev EVM selector for this function is: 0xa9059cbb,695 /// or in textual repr: transfer(address,uint256)696 function transfer(address to, uint256 amount) public returns (bool) {697 require(false, stub_error);698 to;699 amount;700 dummy = 0;701 return false;702 }703704 /// @dev EVM selector for this function is: 0x23b872dd,705 /// or in textual repr: transferFrom(address,address,uint256)706 function transferFrom(707 address from,708 address to,709 uint256 amount710 ) public returns (bool) {711 require(false, stub_error);712 from;713 to;714 amount;715 dummy = 0;716 return false;717 }718719 /// @dev EVM selector for this function is: 0x095ea7b3,720 /// or in textual repr: approve(address,uint256)721 function approve(address spender, uint256 amount) public returns (bool) {722 require(false, stub_error);723 spender;724 amount;725 dummy = 0;726 return false;727 }728729 /// @dev EVM selector for this function is: 0xdd62ed3e,730 /// or in textual repr: allowance(address,address)731 function allowance(address owner, address spender) public view returns (uint256) {732 require(false, stub_error);733 owner;734 spender;735 dummy;736 return 0;737 }738739 /// @notice Returns collection helper contract address740 /// @dev EVM selector for this function is: 0x1896cce6,741 /// or in textual repr: collectionHelperAddress()742 function collectionHelperAddress() public view returns (address) {743 require(false, stub_error);744 dummy;745 return 0x0000000000000000000000000000000000000000;746 }747}748749contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -38,7 +38,7 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
- eth::{Property as PropertyStruct, EthCrossAccount, EthTokenPermissions},
+ eth::{Property as PropertyStruct, EthCrossAccount},
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::call;
@@ -94,40 +94,12 @@
fn set_token_property_permissions(
&mut self,
caller: caller,
- permissions: Vec<(string, Vec<(EthTokenPermissions, bool)>)>,
+ permissions: Vec<pallet_common::eth::TokenPropertyPermission>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
- let mut perms = Vec::new();
-
- for (key, pp) in permissions {
- if pp.len() > EthTokenPermissions::FIELDS_COUNT {
- return Err(alloc::format!(
- "Actual number of fields {} for {}, which exceeds the maximum value of {}",
- pp.len(),
- stringify!(EthTokenPermissions),
- EthTokenPermissions::FIELDS_COUNT
- )
- .as_str()
- .into());
- }
-
- let mut token_permission = PropertyPermission::default();
-
- for (perm, value) in pp {
- match perm {
- EthTokenPermissions::Mutable => token_permission.mutable = value,
- EthTokenPermissions::TokenOwner => token_permission.token_owner = value,
- EthTokenPermissions::CollectionAdmin => {
- token_permission.collection_admin = value
- }
- }
- }
-
- perms.push(PropertyKeyPermission {
- key: key.into_bytes().try_into().map_err(|_| "too long key")?,
- permission: token_permission,
- });
- }
+ let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(
+ permissions,
+ )?;
<Pallet<T>>::set_token_property_permissions(self, &caller, perms)
.map_err(dispatch_to_evm::<T>)
@@ -136,19 +108,11 @@
/// @notice Get permissions for token properties.
fn token_property_permissions(
&self,
- ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {
+ ) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {
let perms = <Pallet<T>>::token_property_permission(self.id);
Ok(perms
.into_iter()
- .map(|(key, pp)| {
- let key = string::from_utf8(key.into_inner()).expect("Stored key must be valid");
- let pp = vec![
- (EthTokenPermissions::Mutable, pp.mutable),
- (EthTokenPermissions::TokenOwner, pp.token_owner),
- (EthTokenPermissions::CollectionAdmin, pp.collection_admin),
- ];
- (key, pp)
- })
+ .map(pallet_common::eth::TokenPropertyPermission::from)
.collect())
}
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -42,7 +42,7 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple61[] memory permissions) public {
+ function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) public {
require(false, stub_error);
permissions;
dummy = 0;
@@ -51,10 +51,10 @@
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() public view returns (Tuple61[] memory) {
+ function tokenPropertyPermissions() public view returns (TokenPropertyPermission[] memory) {
require(false, stub_error);
dummy;
- return new Tuple61[](0);
+ return new TokenPropertyPermission[](0);
}
// /// @notice Set token property value.
@@ -127,12 +127,30 @@
}
}
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
+ /// @dev Property key.
string key;
+ /// @dev Property value.
bytes value;
}
+/// @dev Ethereum representation of Token Property Permissions.
+struct TokenPropertyPermission {
+ /// @dev Token property key.
+ string key;
+ /// @dev Token property permissions.
+ PropertyPermission[] permissions;
+}
+
+/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
+struct PropertyPermission {
+ /// @dev TokenPermission field.
+ EthTokenPermissions code;
+ /// @dev TokenPermission value.
+ bool value;
+}
+
/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
enum EthTokenPermissions {
/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
@@ -141,18 +159,6 @@
TokenOwner,
/// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]
CollectionAdmin
-}
-
-/// @dev anonymous struct
-struct Tuple61 {
- string field_0;
- Tuple59[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple59 {
- EthTokenPermissions field_0;
- bool field_1;
}
/// @title A contract that allows you to work with collections.
@@ -608,9 +614,12 @@
uint256 sub;
}
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
enum CollectionPermissions {
- CollectionAdmin,
- TokenOwner
+ /// @dev Owner of token can nest tokens under it.
+ TokenOwner,
+ /// @dev Admin of token collection can nest tokens under token.
+ CollectionAdmin
}
/// @dev anonymous struct
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -33,7 +33,7 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
erc::{CommonEvmHandler, CollectionCall, static_property::key},
- eth::{Property as PropertyStruct, EthCrossAccount, EthTokenPermissions},
+ eth::{Property as PropertyStruct, EthCrossAccount},
Error as CommonError,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
@@ -97,47 +97,13 @@
fn set_token_property_permissions(
&mut self,
caller: caller,
- permissions: Vec<(string, Vec<(EthTokenPermissions, bool)>)>,
+ permissions: Vec<pallet_common::eth::TokenPropertyPermission>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
- const PERMISSIONS_FIELDS_COUNT: usize = 3;
-
- let mut perms = Vec::new();
-
- for (key, pp) in permissions {
- if pp.len() > PERMISSIONS_FIELDS_COUNT {
- return Err(alloc::format!(
- "Actual number of fields {} for {}, which exceeds the maximum value of {}",
- pp.len(),
- stringify!(EthTokenPermissions),
- PERMISSIONS_FIELDS_COUNT
- )
- .as_str()
- .into());
- }
-
- let mut token_permission = PropertyPermission {
- mutable: false,
- collection_admin: false,
- token_owner: false,
- };
+ let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(
+ permissions,
+ )?;
- for (perm, value) in pp {
- match perm {
- EthTokenPermissions::Mutable => token_permission.mutable = value,
- EthTokenPermissions::TokenOwner => token_permission.token_owner = value,
- EthTokenPermissions::CollectionAdmin => {
- token_permission.collection_admin = value
- }
- }
- }
-
- perms.push(PropertyKeyPermission {
- key: key.into_bytes().try_into().map_err(|_| "too long key")?,
- permission: token_permission,
- });
- }
-
<Pallet<T>>::set_token_property_permissions(self, &caller, perms)
.map_err(dispatch_to_evm::<T>)
}
@@ -145,19 +111,11 @@
/// @notice Get permissions for token properties.
fn token_property_permissions(
&self,
- ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {
+ ) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {
let perms = <Pallet<T>>::token_property_permission(self.id);
Ok(perms
.into_iter()
- .map(|(key, pp)| {
- let key = string::from_utf8(key.into_inner()).expect("Stored key must be valid");
- let pp = vec![
- (EthTokenPermissions::Mutable, pp.mutable),
- (EthTokenPermissions::TokenOwner, pp.token_owner),
- (EthTokenPermissions::CollectionAdmin, pp.collection_admin),
- ];
- (key, pp)
- })
+ .map(pallet_common::eth::TokenPropertyPermission::from)
.collect())
}
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -42,7 +42,7 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple60[] memory permissions) public {
+ function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) public {
require(false, stub_error);
permissions;
dummy = 0;
@@ -51,10 +51,10 @@
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() public view returns (Tuple60[] memory) {
+ function tokenPropertyPermissions() public view returns (TokenPropertyPermission[] memory) {
require(false, stub_error);
dummy;
- return new Tuple60[](0);
+ return new TokenPropertyPermission[](0);
}
// /// @notice Set token property value.
@@ -127,12 +127,30 @@
}
}
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
+ /// @dev Property key.
string key;
+ /// @dev Property value.
bytes value;
}
+/// @dev Ethereum representation of Token Property Permissions.
+struct TokenPropertyPermission {
+ /// @dev Token property key.
+ string key;
+ /// @dev Token property permissions.
+ PropertyPermission[] permissions;
+}
+
+/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
+struct PropertyPermission {
+ /// @dev TokenPermission field.
+ EthTokenPermissions code;
+ /// @dev TokenPermission value.
+ bool value;
+}
+
/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
enum EthTokenPermissions {
/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
@@ -141,18 +159,6 @@
TokenOwner,
/// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]
CollectionAdmin
-}
-
-/// @dev anonymous struct
-struct Tuple60 {
- string field_0;
- Tuple58[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple58 {
- EthTokenPermissions field_0;
- bool field_1;
}
/// @title A contract that allows you to work with collections.
@@ -608,9 +614,12 @@
uint256 sub;
}
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
enum CollectionPermissions {
- CollectionAdmin,
- TokenOwner
+ /// @dev Owner of token can nest tokens under it.
+ TokenOwner,
+ /// @dev Admin of token collection can nest tokens under token.
+ CollectionAdmin
}
/// @dev anonymous struct
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -752,22 +752,22 @@
"inputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "string", "name": "key", "type": "string" },
{
"components": [
{
"internalType": "enum EthTokenPermissions",
- "name": "field_0",
+ "name": "code",
"type": "uint8"
},
- { "internalType": "bool", "name": "field_1", "type": "bool" }
+ { "internalType": "bool", "name": "value", "type": "bool" }
],
- "internalType": "struct Tuple59[]",
- "name": "field_1",
+ "internalType": "struct PropertyPermission[]",
+ "name": "permissions",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple61[]",
+ "internalType": "struct TokenPropertyPermission[]",
"name": "permissions",
"type": "tuple[]"
}
@@ -818,22 +818,22 @@
"outputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "string", "name": "key", "type": "string" },
{
"components": [
{
"internalType": "enum EthTokenPermissions",
- "name": "field_0",
+ "name": "code",
"type": "uint8"
},
- { "internalType": "bool", "name": "field_1", "type": "bool" }
+ { "internalType": "bool", "name": "value", "type": "bool" }
],
- "internalType": "struct Tuple59[]",
- "name": "field_1",
+ "internalType": "struct PropertyPermission[]",
+ "name": "permissions",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple61[]",
+ "internalType": "struct TokenPropertyPermission[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -734,22 +734,22 @@
"inputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "string", "name": "key", "type": "string" },
{
"components": [
{
"internalType": "enum EthTokenPermissions",
- "name": "field_0",
+ "name": "code",
"type": "uint8"
},
- { "internalType": "bool", "name": "field_1", "type": "bool" }
+ { "internalType": "bool", "name": "value", "type": "bool" }
],
- "internalType": "struct Tuple58[]",
- "name": "field_1",
+ "internalType": "struct PropertyPermission[]",
+ "name": "permissions",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple60[]",
+ "internalType": "struct TokenPropertyPermission[]",
"name": "permissions",
"type": "tuple[]"
}
@@ -809,22 +809,22 @@
"outputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "string", "name": "key", "type": "string" },
{
"components": [
{
"internalType": "enum EthTokenPermissions",
- "name": "field_0",
+ "name": "code",
"type": "uint8"
},
- { "internalType": "bool", "name": "field_1", "type": "bool" }
+ { "internalType": "bool", "name": "value", "type": "bool" }
],
- "internalType": "struct Tuple58[]",
- "name": "field_1",
+ "internalType": "struct PropertyPermission[]",
+ "name": "permissions",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple60[]",
+ "internalType": "struct TokenPropertyPermission[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -316,9 +316,12 @@
bool field_1;
}
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
enum CollectionPermissions {
- CollectionAdmin,
- TokenOwner
+ /// @dev Owner of token can nest tokens under it.
+ TokenOwner,
+ /// @dev Admin of token collection can nest tokens under token.
+ CollectionAdmin
}
/// @dev anonymous struct
@@ -356,9 +359,11 @@
uint256 field_2;
}
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
+ /// @dev Property key.
string key;
+ /// @dev Property value.
bytes value;
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -30,12 +30,12 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple53[] memory permissions) external;
+ function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) external;
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() external view returns (Tuple53[] memory);
+ function tokenPropertyPermissions() external view returns (TokenPropertyPermission[] memory);
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -80,12 +80,30 @@
function property(uint256 tokenId, string memory key) external view returns (bytes memory);
}
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
+ /// @dev Property key.
string key;
+ /// @dev Property value.
bytes value;
}
+/// @dev Ethereum representation of Token Property Permissions.
+struct TokenPropertyPermission {
+ /// @dev Token property key.
+ string key;
+ /// @dev Token property permissions.
+ PropertyPermission[] permissions;
+}
+
+/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
+struct PropertyPermission {
+ /// @dev TokenPermission field.
+ EthTokenPermissions code;
+ /// @dev TokenPermission value.
+ bool value;
+}
+
/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
enum EthTokenPermissions {
/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
@@ -96,18 +114,6 @@
CollectionAdmin
}
-/// @dev anonymous struct
-struct Tuple53 {
- string field_0;
- Tuple51[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple51 {
- EthTokenPermissions field_0;
- bool field_1;
-}
-
/// @title A contract that allows you to work with collections.
/// @dev the ERC-165 identifier for this interface is 0x81172a75
interface Collection is Dummy, ERC165 {
@@ -412,9 +418,12 @@
bool field_1;
}
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
enum CollectionPermissions {
- CollectionAdmin,
- TokenOwner
+ /// @dev Owner of token can nest tokens under it.
+ TokenOwner,
+ /// @dev Admin of token collection can nest tokens under token.
+ CollectionAdmin
}
/// @dev anonymous struct
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -30,12 +30,12 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
+ function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) external;
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() external view returns (Tuple52[] memory);
+ function tokenPropertyPermissions() external view returns (TokenPropertyPermission[] memory);
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -80,12 +80,30 @@
function property(uint256 tokenId, string memory key) external view returns (bytes memory);
}
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
+ /// @dev Property key.
string key;
+ /// @dev Property value.
bytes value;
}
+/// @dev Ethereum representation of Token Property Permissions.
+struct TokenPropertyPermission {
+ /// @dev Token property key.
+ string key;
+ /// @dev Token property permissions.
+ PropertyPermission[] permissions;
+}
+
+/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
+struct PropertyPermission {
+ /// @dev TokenPermission field.
+ EthTokenPermissions code;
+ /// @dev TokenPermission value.
+ bool value;
+}
+
/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
enum EthTokenPermissions {
/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
@@ -96,18 +114,6 @@
CollectionAdmin
}
-/// @dev anonymous struct
-struct Tuple52 {
- string field_0;
- Tuple50[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple50 {
- EthTokenPermissions field_0;
- bool field_1;
-}
-
/// @title A contract that allows you to work with collections.
/// @dev the ERC-165 identifier for this interface is 0x81172a75
interface Collection is Dummy, ERC165 {
@@ -412,9 +418,12 @@
bool field_1;
}
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
enum CollectionPermissions {
- CollectionAdmin,
- TokenOwner
+ /// @dev Owner of token can nest tokens under it.
+ TokenOwner,
+ /// @dev Admin of token collection can nest tokens under token.
+ CollectionAdmin
}
/// @dev anonymous struct