difftreelog
refactor eth::Property
in: master
4 files changed
pallets/common/src/erc.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//! This module contains the implementation of pallet methods for evm.1819pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};20use evm_coder::{21 abi::AbiType,22 solidity_interface, solidity, ToLog,23 types::*,24 execution::{Result, Error},25 weight,26};27use pallet_evm_coder_substrate::dispatch_to_evm;28use sp_std::{vec, vec::Vec};29use up_data_structs::{30 AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,31 SponsoringRateLimit, SponsorshipState,32};33use alloc::format;3435use crate::{36 Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf, eth, weights::WeightInfo,37};3839/// Events for ethereum collection helper.40#[derive(ToLog)]41pub enum CollectionHelpersEvents {42 /// The collection has been created.43 CollectionCreated {44 /// Collection owner.45 #[indexed]46 owner: address,4748 /// Collection ID.49 #[indexed]50 collection_id: address,51 },52 /// The collection has been destroyed.53 CollectionDestroyed {54 /// Collection ID.55 #[indexed]56 collection_id: address,57 },58 /// The collection has been changed.59 CollectionChanged {60 /// Collection ID.61 #[indexed]62 collection_id: address,63 },6465 /// The token has been changed.66 TokenChanged {67 /// Collection ID.68 #[indexed]69 collection_id: address,70 /// Token ID.71 token_id: uint256,72 },73}7475/// Does not always represent a full collection, for RFT it is either76/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).77pub trait CommonEvmHandler {78 /// Raw compiled binary code of the contract stub79 const CODE: &'static [u8];8081 /// Call precompiled handle.82 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;83}8485/// @title A contract that allows you to work with collections.86#[solidity_interface(name = Collection)]87impl<T: Config> CollectionHandle<T>88where89 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,90{91 /// Set collection property.92 ///93 /// @param key Property key.94 /// @param value Propery value.95 #[solidity(hide)]96 #[weight(<SelfWeightOf<T>>::set_collection_properties(1))]97 fn set_collection_property(98 &mut self,99 caller: caller,100 key: string,101 value: bytes,102 ) -> Result<void> {103 let caller = T::CrossAccountId::from_eth(caller);104 let key = <Vec<u8>>::from(key)105 .try_into()106 .map_err(|_| "key too large")?;107 let value = value.0.try_into().map_err(|_| "value too large")?;108109 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })110 .map_err(dispatch_to_evm::<T>)111 }112113 /// Set collection properties.114 ///115 /// @param properties Vector of properties key/value pair.116 #[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]117 fn set_collection_properties(118 &mut self,119 caller: caller,120 properties: Vec<eth::Property>,121 ) -> Result<void> {122 let caller = T::CrossAccountId::from_eth(caller);123124 let properties = properties125 .into_iter()126 .map(|property| {127 let (key, value) = property.take_key_value();128 let key = <Vec<u8>>::from(key)129 .try_into()130 .map_err(|_| "key too large")?;131132 let value = value.0.try_into().map_err(|_| "value too large")?;133134 Ok(Property { key, value })135 })136 .collect::<Result<Vec<_>>>()?;137138 <Pallet<T>>::set_collection_properties(self, &caller, properties)139 .map_err(dispatch_to_evm::<T>)140 }141142 /// Delete collection property.143 ///144 /// @param key Property key.145 #[solidity(hide)]146 #[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]147 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {148 let caller = T::CrossAccountId::from_eth(caller);149 let key = <Vec<u8>>::from(key)150 .try_into()151 .map_err(|_| "key too large")?;152153 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)154 }155156 /// Delete collection properties.157 ///158 /// @param keys Properties keys.159 #[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]160 fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {161 let caller = T::CrossAccountId::from_eth(caller);162 let keys = keys163 .into_iter()164 .map(|key| {165 <Vec<u8>>::from(key)166 .try_into()167 .map_err(|_| Error::Revert("key too large".into()))168 })169 .collect::<Result<Vec<_>>>()?;170171 <Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)172 }173174 /// Get collection property.175 ///176 /// @dev Throws error if key not found.177 ///178 /// @param key Property key.179 /// @return bytes The property corresponding to the key.180 fn collection_property(&self, key: string) -> Result<bytes> {181 let key = <Vec<u8>>::from(key)182 .try_into()183 .map_err(|_| "key too large")?;184185 let props = CollectionProperties::<T>::get(self.id);186 let prop = props.get(&key).ok_or("key not found")?;187188 Ok(bytes(prop.to_vec()))189 }190191 /// Get collection properties.192 ///193 /// @param keys Properties keys. Empty keys for all propertyes.194 /// @return Vector of properties key/value pairs.195 fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<eth::Property>> {196 let keys = keys197 .into_iter()198 .map(|key| {199 <Vec<u8>>::from(key)200 .try_into()201 .map_err(|_| Error::Revert("key too large".into()))202 })203 .collect::<Result<Vec<_>>>()?;204205 let properties = Pallet::<T>::filter_collection_properties(206 self.id,207 if keys.is_empty() { None } else { Some(keys) },208 )209 .map_err(dispatch_to_evm::<T>)?;210211 let properties = properties212 .into_iter()213 .map(|p| {214 let key =215 string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;216 let value = bytes(p.value.to_vec());217 Ok(eth::Property::new(key, value))218 })219 .collect::<Result<Vec<_>>>()?;220 Ok(properties)221 }222223 /// Set the sponsor of the collection.224 ///225 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.226 ///227 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.228 #[solidity(hide)]229 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {230 self.consume_store_reads_and_writes(1, 1)?;231232 let caller = T::CrossAccountId::from_eth(caller);233234 let sponsor = T::CrossAccountId::from_eth(sponsor);235 self.set_sponsor(&caller, sponsor.as_sub().clone())236 .map_err(dispatch_to_evm::<T>)237 }238239 /// Set the sponsor of the collection.240 ///241 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.242 ///243 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.244 fn set_collection_sponsor_cross(245 &mut self,246 caller: caller,247 sponsor: eth::CrossAddress,248 ) -> Result<void> {249 self.consume_store_reads_and_writes(1, 1)?;250251 let caller = T::CrossAccountId::from_eth(caller);252253 let sponsor = sponsor.into_sub_cross_account::<T>()?;254 self.set_sponsor(&caller, sponsor.as_sub().clone())255 .map_err(dispatch_to_evm::<T>)256 }257258 /// Whether there is a pending sponsor.259 fn has_collection_pending_sponsor(&self) -> Result<bool> {260 Ok(matches!(261 self.collection.sponsorship,262 SponsorshipState::Unconfirmed(_)263 ))264 }265266 /// Collection sponsorship confirmation.267 ///268 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.269 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {270 self.consume_store_writes(1)?;271272 let caller = T::CrossAccountId::from_eth(caller);273 self.confirm_sponsorship(caller.as_sub())274 .map_err(dispatch_to_evm::<T>)275 }276277 /// Remove collection sponsor.278 fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {279 self.consume_store_reads_and_writes(1, 1)?;280 let caller = T::CrossAccountId::from_eth(caller);281 self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)282 }283284 /// Get current sponsor.285 ///286 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.287 fn collection_sponsor(&self) -> Result<eth::CrossAddress> {288 let sponsor = match self.collection.sponsorship.sponsor() {289 Some(sponsor) => sponsor,290 None => return Ok(Default::default()),291 };292293 Ok(eth::CrossAddress::from_sub::<T>(&sponsor))294 }295296 /// Get current collection limits.297 ///298 /// @return Array of collection limits299 fn collection_limits(&self) -> Result<Vec<eth::CollectionLimit>> {300 let limits = &self.collection.limits;301302 Ok(vec![303 eth::CollectionLimit::from_opt_int(304 eth::CollectionLimitField::AccountTokenOwnership,305 limits.account_token_ownership_limit,306 ),307 eth::CollectionLimit::from_opt_int(308 eth::CollectionLimitField::SponsoredDataSize,309 limits.sponsored_data_size,310 ),311 limits312 .sponsored_data_rate_limit313 .and_then(|limit| {314 if let SponsoringRateLimit::Blocks(blocks) = limit {315 Some(eth::CollectionLimit::from_int(316 eth::CollectionLimitField::SponsoredDataRateLimit,317 blocks,318 ))319 } else {320 None321 }322 })323 .unwrap_or(eth::CollectionLimit::from_int(324 eth::CollectionLimitField::SponsoredDataRateLimit,325 Default::default(),326 )),327 eth::CollectionLimit::from_opt_int(328 eth::CollectionLimitField::TokenLimit,329 limits.token_limit,330 ),331 eth::CollectionLimit::from_opt_int(332 eth::CollectionLimitField::SponsorTransferTimeout,333 limits.sponsor_transfer_timeout,334 ),335 eth::CollectionLimit::from_opt_int(336 eth::CollectionLimitField::SponsorApproveTimeout,337 limits.sponsor_approve_timeout,338 ),339 eth::CollectionLimit::from_opt_bool(340 eth::CollectionLimitField::OwnerCanTransfer,341 limits.owner_can_transfer,342 ),343 eth::CollectionLimit::from_opt_bool(344 eth::CollectionLimitField::OwnerCanDestroy,345 limits.owner_can_destroy,346 ),347 eth::CollectionLimit::from_opt_bool(348 eth::CollectionLimitField::TransferEnabled,349 limits.transfers_enabled,350 ),351 ])352 }353354 /// Set limits for the collection.355 /// @dev Throws error if limit not found.356 /// @param limit Some limit.357 #[solidity(rename_selector = "setCollectionLimit")]358 fn set_collection_limit(359 &mut self,360 caller: caller,361 limit: eth::CollectionLimit,362 ) -> Result<void> {363 self.consume_store_reads_and_writes(1, 1)?;364365 let caller = T::CrossAccountId::from_eth(caller);366 <Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)367 }368369 /// Get contract address.370 fn contract_address(&self) -> Result<address> {371 Ok(crate::eth::collection_id_to_address(self.id))372 }373374 /// Add collection admin.375 /// @param newAdmin Cross account administrator address.376 fn add_collection_admin_cross(377 &mut self,378 caller: caller,379 new_admin: eth::CrossAddress,380 ) -> Result<void> {381 self.consume_store_reads_and_writes(2, 2)?;382383 let caller = T::CrossAccountId::from_eth(caller);384 let new_admin = new_admin.into_sub_cross_account::<T>()?;385 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;386 Ok(())387 }388389 /// Remove collection admin.390 /// @param admin Cross account administrator address.391 fn remove_collection_admin_cross(392 &mut self,393 caller: caller,394 admin: eth::CrossAddress,395 ) -> Result<void> {396 self.consume_store_reads_and_writes(2, 2)?;397398 let caller = T::CrossAccountId::from_eth(caller);399 let admin = admin.into_sub_cross_account::<T>()?;400 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;401 Ok(())402 }403404 /// Add collection admin.405 /// @param newAdmin Address of the added administrator.406 #[solidity(hide)]407 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {408 self.consume_store_reads_and_writes(2, 2)?;409410 let caller = T::CrossAccountId::from_eth(caller);411 let new_admin = T::CrossAccountId::from_eth(new_admin);412 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;413 Ok(())414 }415416 /// Remove collection admin.417 ///418 /// @param admin Address of the removed administrator.419 #[solidity(hide)]420 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {421 self.consume_store_reads_and_writes(2, 2)?;422423 let caller = T::CrossAccountId::from_eth(caller);424 let admin = T::CrossAccountId::from_eth(admin);425 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;426 Ok(())427 }428429 /// Toggle accessibility of collection nesting.430 ///431 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'432 #[solidity(rename_selector = "setCollectionNesting")]433 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {434 self.consume_store_reads_and_writes(1, 1)?;435436 let caller = T::CrossAccountId::from_eth(caller);437438 let mut permissions = self.collection.permissions.clone();439 let mut nesting = permissions.nesting().clone();440 nesting.token_owner = enable;441 nesting.restricted = None;442 permissions.nesting = Some(nesting);443444 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)445 }446447 /// Toggle accessibility of collection nesting.448 ///449 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'450 /// @param collections Addresses of collections that will be available for nesting.451 #[solidity(rename_selector = "setCollectionNesting")]452 fn set_nesting(453 &mut self,454 caller: caller,455 enable: bool,456 collections: Vec<address>,457 ) -> Result<void> {458 self.consume_store_reads_and_writes(1, 1)?;459460 if collections.is_empty() {461 return Err("no addresses provided".into());462 }463 let caller = T::CrossAccountId::from_eth(caller);464465 let mut permissions = self.collection.permissions.clone();466 match enable {467 false => {468 let mut nesting = permissions.nesting().clone();469 nesting.token_owner = false;470 nesting.restricted = None;471 permissions.nesting = Some(nesting);472 }473 true => {474 let mut bv = OwnerRestrictedSet::new();475 for i in collections {476 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {477 Error::Revert("Can't convert address into collection id".into())478 })?)479 .map_err(|_| "too many collections")?;480 }481 let mut nesting = permissions.nesting().clone();482 nesting.token_owner = true;483 nesting.restricted = Some(bv);484 permissions.nesting = Some(nesting);485 }486 };487488 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)489 }490491 /// Returns nesting for a collection492 #[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]493 fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {494 let nesting = self.collection.permissions.nesting();495496 Ok(eth::CollectionNesting::new(497 nesting.token_owner,498 nesting499 .restricted500 .clone()501 .map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())502 .unwrap_or_default(),503 ))504 }505506 /// Returns permissions for a collection507 fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {508 let nesting = self.collection.permissions.nesting();509 Ok(vec![510 eth::CollectionNestingPermission::new(511 eth::CollectionPermissionField::CollectionAdmin,512 nesting.collection_admin,513 ),514 eth::CollectionNestingPermission::new(515 eth::CollectionPermissionField::TokenOwner,516 nesting.token_owner,517 ),518 ])519 }520 /// Set the collection access method.521 /// @param mode Access mode522 /// 0 for Normal523 /// 1 for AllowList524 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {525 self.consume_store_reads_and_writes(1, 1)?;526527 let caller = T::CrossAccountId::from_eth(caller);528 let permissions = CollectionPermissions {529 access: Some(match mode {530 0 => AccessMode::Normal,531 1 => AccessMode::AllowList,532 _ => return Err("not supported access mode".into()),533 }),534 ..Default::default()535 };536 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)537 }538539 /// Checks that user allowed to operate with collection.540 ///541 /// @param user User address to check.542 fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {543 let user = user.into_sub_cross_account::<T>()?;544 Ok(Pallet::<T>::allowed(self.id, user))545 }546547 /// Add the user to the allowed list.548 ///549 /// @param user Address of a trusted user.550 #[solidity(hide)]551 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {552 self.consume_store_writes(1)?;553554 let caller = T::CrossAccountId::from_eth(caller);555 let user = T::CrossAccountId::from_eth(user);556 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;557 Ok(())558 }559560 /// Add user to allowed list.561 ///562 /// @param user User cross account address.563 fn add_to_collection_allow_list_cross(564 &mut self,565 caller: caller,566 user: eth::CrossAddress,567 ) -> Result<void> {568 self.consume_store_writes(1)?;569570 let caller = T::CrossAccountId::from_eth(caller);571 let user = user.into_sub_cross_account::<T>()?;572 Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;573 Ok(())574 }575576 /// Remove the user from the allowed list.577 ///578 /// @param user Address of a removed user.579 #[solidity(hide)]580 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {581 self.consume_store_writes(1)?;582583 let caller = T::CrossAccountId::from_eth(caller);584 let user = T::CrossAccountId::from_eth(user);585 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;586 Ok(())587 }588589 /// Remove user from allowed list.590 ///591 /// @param user User cross account address.592 fn remove_from_collection_allow_list_cross(593 &mut self,594 caller: caller,595 user: eth::CrossAddress,596 ) -> Result<void> {597 self.consume_store_writes(1)?;598599 let caller = T::CrossAccountId::from_eth(caller);600 let user = user.into_sub_cross_account::<T>()?;601 Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;602 Ok(())603 }604605 /// Switch permission for minting.606 ///607 /// @param mode Enable if "true".608 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {609 self.consume_store_reads_and_writes(1, 1)?;610611 let caller = T::CrossAccountId::from_eth(caller);612 let permissions = CollectionPermissions {613 mint_mode: Some(mode),614 ..Default::default()615 };616 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)617 }618619 /// Check that account is the owner or admin of the collection620 ///621 /// @param user account to verify622 /// @return "true" if account is the owner or admin623 #[solidity(hide, rename_selector = "isOwnerOrAdmin")]624 fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {625 let user = T::CrossAccountId::from_eth(user);626 Ok(self.is_owner_or_admin(&user))627 }628629 /// Check that account is the owner or admin of the collection630 ///631 /// @param user User cross account to verify632 /// @return "true" if account is the owner or admin633 fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {634 let user = user.into_sub_cross_account::<T>()?;635 Ok(self.is_owner_or_admin(&user))636 }637638 /// Returns collection type639 ///640 /// @return `Fungible` or `NFT` or `ReFungible`641 fn unique_collection_type(&self) -> Result<string> {642 let mode = match self.collection.mode {643 CollectionMode::Fungible(_) => "Fungible",644 CollectionMode::NFT => "NFT",645 CollectionMode::ReFungible => "ReFungible",646 };647 Ok(mode.into())648 }649650 /// Get collection owner.651 ///652 /// @return Tuble with sponsor address and his substrate mirror.653 /// If address is canonical then substrate mirror is zero and vice versa.654 fn collection_owner(&self) -> Result<eth::CrossAddress> {655 Ok(eth::CrossAddress::from_sub_cross_account::<T>(656 &T::CrossAccountId::from_sub(self.owner.clone()),657 ))658 }659660 /// Changes collection owner to another account661 ///662 /// @dev Owner can be changed only by current owner663 /// @param newOwner new owner account664 #[solidity(hide, rename_selector = "changeCollectionOwner")]665 fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {666 self.consume_store_writes(1)?;667668 let caller = T::CrossAccountId::from_eth(caller);669 let new_owner = T::CrossAccountId::from_eth(new_owner);670 self.change_owner(caller, new_owner)671 .map_err(dispatch_to_evm::<T>)672 }673674 /// Get collection administrators675 ///676 /// @return Vector of tuples with admins address and his substrate mirror.677 /// If address is canonical then substrate mirror is zero and vice versa.678 fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {679 let result = crate::IsAdmin::<T>::iter_prefix((self.id,))680 .map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))681 .collect();682 Ok(result)683 }684685 /// Changes collection owner to another account686 ///687 /// @dev Owner can be changed only by current owner688 /// @param newOwner new owner cross account689 fn change_collection_owner_cross(690 &mut self,691 caller: caller,692 new_owner: eth::CrossAddress,693 ) -> Result<void> {694 self.consume_store_writes(1)?;695696 let caller = T::CrossAccountId::from_eth(caller);697 let new_owner = new_owner.into_sub_cross_account::<T>()?;698 self.change_owner(caller, new_owner)699 .map_err(dispatch_to_evm::<T>)700 }701}702703/// Contains static property keys and values.704pub mod static_property {705 use evm_coder::{706 execution::{Result, Error},707 };708 use alloc::format;709710 const EXPECT_CONVERT_ERROR: &str = "length < limit";711712 /// Keys.713 pub mod key {714 use super::*;715716 /// Key "baseURI".717 pub fn base_uri() -> up_data_structs::PropertyKey {718 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)719 }720721 /// Key "url".722 pub fn url() -> up_data_structs::PropertyKey {723 property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)724 }725726 /// Key "suffix".727 pub fn suffix() -> up_data_structs::PropertyKey {728 property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)729 }730731 /// Key "parentNft".732 pub fn parent_nft() -> up_data_structs::PropertyKey {733 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)734 }735 }736737 /// Convert `byte` to [`PropertyKey`].738 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {739 bytes.to_vec().try_into().map_err(|_| {740 Error::Revert(format!(741 "Property key is too long. Max length is {}.",742 up_data_structs::PropertyKey::bound()743 ))744 })745 }746747 /// Convert `bytes` to [`PropertyValue`].748 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {749 bytes.to_vec().try_into().map_err(|_| {750 Error::Revert(format!(751 "Property key is too long. Max length is {}.",752 up_data_structs::PropertyKey::bound()753 ))754 })755 }756}pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -175,13 +175,28 @@
value: evm_coder::types::bytes,
}
-impl Property {
- pub fn new(key: evm_coder::types::string, value: evm_coder::types::bytes) -> Self {
- Self { key, value }
+impl TryFrom<up_data_structs::Property> for Property {
+ type Error = evm_coder::execution::Error;
+
+ fn try_from(from: up_data_structs::Property) -> Result<Self, Self::Error> {
+ let key = evm_coder::types::string::from_utf8(from.key.into())
+ .map_err(|e| Self::Error::Revert(format!("utf8 conversion error: {}", e)))?;
+ let value = evm_coder::types::bytes(from.value.to_vec());
+ Ok(Property { key, value })
}
+}
- pub fn take_key_value(self) -> (evm_coder::types::string, evm_coder::types::bytes) {
- (self.key, self.value)
+impl TryInto<up_data_structs::Property> for Property {
+ type Error = evm_coder::execution::Error;
+
+ fn try_into(self) -> Result<up_data_structs::Property, Self::Error> {
+ let key = <Vec<u8>>::from(self.key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = self.value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(up_data_structs::Property { key, value })
}
}
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -170,16 +170,7 @@
let properties = properties
.into_iter()
- .map(|property| {
- let (key, value) = property.take_key_value();
- let key = <Vec<u8>>::from(key)
- .try_into()
- .map_err(|_| "key too large")?;
-
- let value = value.0.try_into().map_err(|_| "value too large")?;
-
- Ok(Property { key, value })
- })
+ .map(pallet_common::eth::Property::try_into)
.collect::<Result<Vec<_>>>()?;
<Pallet<T>>::set_token_properties(
@@ -793,12 +784,7 @@
if keys.is_empty() { None } else { Some(keys) },
)
.into_iter()
- .map(|p| {
- let key = string::from_utf8(p.key.to_vec())
- .map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
- let value = bytes(p.value.to_vec());
- Ok(pallet_common::eth::Property::new(key, value))
- })
+ .map(pallet_common::eth::Property::try_from)
.collect::<Result<Vec<_>>>()
}
@@ -1055,16 +1041,7 @@
let properties = properties
.into_iter()
- .map(|property| {
- let (key, value) = property.take_key_value();
- let key = <Vec<u8>>::from(key)
- .try_into()
- .map_err(|_| "key too large")?;
-
- let value = value.0.try_into().map_err(|_| "value too large")?;
-
- Ok(Property { key, value })
- })
+ .map(pallet_common::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
@@ -173,16 +173,7 @@
let properties = properties
.into_iter()
- .map(|property| {
- let (key, value) = property.take_key_value();
- let key = <Vec<u8>>::from(key)
- .try_into()
- .map_err(|_| "key too large")?;
-
- let value = value.0.try_into().map_err(|_| "value too large")?;
-
- Ok(Property { key, value })
- })
+ .map(pallet_common::eth::Property::try_into)
.collect::<Result<Vec<_>>>()?;
<Pallet<T>>::set_token_properties(
@@ -828,12 +819,7 @@
if keys.is_empty() { None } else { Some(keys) },
)
.into_iter()
- .map(|p| {
- let key = string::from_utf8(p.key.to_vec())
- .map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
- let value = bytes(p.value.to_vec());
- Ok(pallet_common::eth::Property::new(key, value))
- })
+ .map(pallet_common::eth::Property::try_from)
.collect::<Result<Vec<_>>>()
}
/// @notice Transfer ownership of an RFT
@@ -1101,16 +1087,7 @@
let properties = properties
.into_iter()
- .map(|property| {
- let (key, value) = property.take_key_value();
- let key = <Vec<u8>>::from(key)
- .try_into()
- .map_err(|_| "key too large")?;
-
- let value = value.0.try_into().map_err(|_| "value too large")?;
-
- Ok(Property { key, value })
- })
+ .map(pallet_common::eth::Property::try_into)
.collect::<Result<Vec<_>>>()?
.try_into()
.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;