difftreelog
Merge branch 'develop' into feature/docker-base-img
in: master
11 files changed
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -176,7 +176,7 @@
key: property_key(p as usize),
value: property_value(),
}).collect::<Vec<_>>();
- }: {<Pallet<T>>::set_collection_properties(&collection, &owner, props)?}
+ }: {<Pallet<T>>::set_collection_properties(&collection, &owner, props.into_iter())?}
delete_collection_properties {
let b in 0..MAX_PROPERTIES_PER_ITEM;
@@ -188,7 +188,7 @@
key: property_key(p as usize),
value: property_value(),
}).collect::<Vec<_>>();
- <Pallet<T>>::set_collection_properties(&collection, &owner, props)?;
+ <Pallet<T>>::set_collection_properties(&collection, &owner, props.into_iter())?;
let to_delete = (0..b).map(|p| property_key(p as usize)).collect::<Vec<_>>();
- }: {<Pallet<T>>::delete_collection_properties(&collection, &owner, to_delete)?}
+ }: {<Pallet<T>>::delete_collection_properties(&collection, &owner, to_delete.into_iter())?}
}
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};3334use crate::{35 Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf, eth, weights::WeightInfo,36};3738/// Events for ethereum collection helper.39#[derive(ToLog)]40pub enum CollectionHelpersEvents {41 /// The collection has been created.42 CollectionCreated {43 /// Collection owner.44 #[indexed]45 owner: address,4647 /// Collection ID.48 #[indexed]49 collection_id: address,50 },51 /// The collection has been destroyed.52 CollectionDestroyed {53 /// Collection ID.54 #[indexed]55 collection_id: address,56 },57 /// The collection has been changed.58 CollectionChanged {59 /// Collection ID.60 #[indexed]61 collection_id: address,62 },6364 /// The token has been changed.65 TokenChanged {66 /// Collection ID.67 #[indexed]68 collection_id: address,69 /// Token ID.70 token_id: uint256,71 },72}7374/// Does not always represent a full collection, for RFT it is either75/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).76pub trait CommonEvmHandler {77 /// Raw compiled binary code of the contract stub78 const CODE: &'static [u8];7980 /// Call precompiled handle.81 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;82}8384/// @title A contract that allows you to work with collections.85#[solidity_interface(name = Collection)]86impl<T: Config> CollectionHandle<T>87where88 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,89{90 /// Set collection property.91 ///92 /// @param key Property key.93 /// @param value Propery value.94 #[solidity(hide)]95 #[weight(<SelfWeightOf<T>>::set_collection_properties(1))]96 fn set_collection_property(97 &mut self,98 caller: caller,99 key: string,100 value: bytes,101 ) -> Result<void> {102 let caller = T::CrossAccountId::from_eth(caller);103 let key = <Vec<u8>>::from(key)104 .try_into()105 .map_err(|_| "key too large")?;106 let value = value.0.try_into().map_err(|_| "value too large")?;107108 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })109 .map_err(dispatch_to_evm::<T>)110 }111112 /// Set collection properties.113 ///114 /// @param properties Vector of properties key/value pair.115 #[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]116 fn set_collection_properties(117 &mut self,118 caller: caller,119 properties: Vec<eth::Property>,120 ) -> Result<void> {121 let caller = T::CrossAccountId::from_eth(caller);122123 let properties = properties124 .into_iter()125 .map(eth::Property::try_into)126 .collect::<Result<Vec<_>>>()?;127128 <Pallet<T>>::set_collection_properties(self, &caller, properties)129 .map_err(dispatch_to_evm::<T>)130 }131132 /// Delete collection property.133 ///134 /// @param key Property key.135 #[solidity(hide)]136 #[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]137 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {138 let caller = T::CrossAccountId::from_eth(caller);139 let key = <Vec<u8>>::from(key)140 .try_into()141 .map_err(|_| "key too large")?;142143 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)144 }145146 /// Delete collection properties.147 ///148 /// @param keys Properties keys.149 #[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]150 fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {151 let caller = T::CrossAccountId::from_eth(caller);152 let keys = keys153 .into_iter()154 .map(|key| {155 <Vec<u8>>::from(key)156 .try_into()157 .map_err(|_| Error::Revert("key too large".into()))158 })159 .collect::<Result<Vec<_>>>()?;160161 <Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)162 }163164 /// Get collection property.165 ///166 /// @dev Throws error if key not found.167 ///168 /// @param key Property key.169 /// @return bytes The property corresponding to the key.170 fn collection_property(&self, key: string) -> Result<bytes> {171 let key = <Vec<u8>>::from(key)172 .try_into()173 .map_err(|_| "key too large")?;174175 let props = CollectionProperties::<T>::get(self.id);176 let prop = props.get(&key).ok_or("key not found")?;177178 Ok(bytes(prop.to_vec()))179 }180181 /// Get collection properties.182 ///183 /// @param keys Properties keys. Empty keys for all propertyes.184 /// @return Vector of properties key/value pairs.185 fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<eth::Property>> {186 let keys = keys187 .into_iter()188 .map(|key| {189 <Vec<u8>>::from(key)190 .try_into()191 .map_err(|_| Error::Revert("key too large".into()))192 })193 .collect::<Result<Vec<_>>>()?;194195 let properties = Pallet::<T>::filter_collection_properties(196 self.id,197 if keys.is_empty() { None } else { Some(keys) },198 )199 .map_err(dispatch_to_evm::<T>)?;200201 let properties = properties202 .into_iter()203 .map(Property::try_into)204 .collect::<Result<Vec<_>>>()?;205 Ok(properties)206 }207208 /// Set the sponsor of the collection.209 ///210 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.211 ///212 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.213 #[solidity(hide)]214 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {215 self.consume_store_reads_and_writes(1, 1)?;216217 let caller = T::CrossAccountId::from_eth(caller);218219 let sponsor = T::CrossAccountId::from_eth(sponsor);220 self.set_sponsor(&caller, sponsor.as_sub().clone())221 .map_err(dispatch_to_evm::<T>)222 }223224 /// Set the sponsor of the collection.225 ///226 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.227 ///228 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.229 fn set_collection_sponsor_cross(230 &mut self,231 caller: caller,232 sponsor: eth::CrossAddress,233 ) -> Result<void> {234 self.consume_store_reads_and_writes(1, 1)?;235236 let caller = T::CrossAccountId::from_eth(caller);237238 let sponsor = sponsor.into_sub_cross_account::<T>()?;239 self.set_sponsor(&caller, sponsor.as_sub().clone())240 .map_err(dispatch_to_evm::<T>)241 }242243 /// Whether there is a pending sponsor.244 fn has_collection_pending_sponsor(&self) -> Result<bool> {245 Ok(matches!(246 self.collection.sponsorship,247 SponsorshipState::Unconfirmed(_)248 ))249 }250251 /// Collection sponsorship confirmation.252 ///253 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.254 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {255 self.consume_store_writes(1)?;256257 let caller = T::CrossAccountId::from_eth(caller);258 self.confirm_sponsorship(caller.as_sub())259 .map_err(dispatch_to_evm::<T>)260 }261262 /// Remove collection sponsor.263 fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {264 self.consume_store_reads_and_writes(1, 1)?;265 let caller = T::CrossAccountId::from_eth(caller);266 self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)267 }268269 /// Get current sponsor.270 ///271 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.272 fn collection_sponsor(&self) -> Result<eth::CrossAddress> {273 let sponsor = match self.collection.sponsorship.sponsor() {274 Some(sponsor) => sponsor,275 None => return Ok(Default::default()),276 };277278 Ok(eth::CrossAddress::from_sub::<T>(&sponsor))279 }280281 /// Get current collection limits.282 ///283 /// @return Array of collection limits284 fn collection_limits(&self) -> Result<Vec<eth::CollectionLimit>> {285 let limits = &self.collection.limits;286287 let convert_value_from_bool = |ob: Option<bool>| match ob {288 Some(b) => Some(b as u32),289 None => None,290 };291292 Ok(vec![293 eth::CollectionLimit::new(294 eth::CollectionLimitField::AccountTokenOwnership,295 limits.account_token_ownership_limit,296 ),297 eth::CollectionLimit::new(298 eth::CollectionLimitField::SponsoredDataSize,299 limits.sponsored_data_size,300 ),301 limits302 .sponsored_data_rate_limit303 .and_then(|limit| {304 if let SponsoringRateLimit::Blocks(blocks) = limit {305 Some(eth::CollectionLimit::new(306 eth::CollectionLimitField::SponsoredDataRateLimit,307 Some(blocks),308 ))309 } else {310 None311 }312 })313 .unwrap_or(eth::CollectionLimit::new(314 eth::CollectionLimitField::SponsoredDataRateLimit,315 Default::default(),316 )),317 eth::CollectionLimit::new(eth::CollectionLimitField::TokenLimit, limits.token_limit),318 eth::CollectionLimit::new(319 eth::CollectionLimitField::SponsorTransferTimeout,320 limits.sponsor_transfer_timeout,321 ),322 eth::CollectionLimit::new(323 eth::CollectionLimitField::SponsorApproveTimeout,324 limits.sponsor_approve_timeout,325 ),326 eth::CollectionLimit::new(327 eth::CollectionLimitField::OwnerCanTransfer,328 convert_value_from_bool(limits.owner_can_transfer),329 ),330 eth::CollectionLimit::new(331 eth::CollectionLimitField::OwnerCanDestroy,332 convert_value_from_bool(limits.owner_can_destroy),333 ),334 eth::CollectionLimit::new(335 eth::CollectionLimitField::TransferEnabled,336 convert_value_from_bool(limits.transfers_enabled),337 ),338 ])339 }340341 /// Set limits for the collection.342 /// @dev Throws error if limit not found.343 /// @param limit Some limit.344 #[solidity(rename_selector = "setCollectionLimit")]345 fn set_collection_limit(346 &mut self,347 caller: caller,348 limit: eth::CollectionLimit,349 ) -> Result<void> {350 self.consume_store_reads_and_writes(1, 1)?;351352 if !limit.has_value() {353 return Err(Error::Revert("user can't disable limits".into()));354 }355356 let caller = T::CrossAccountId::from_eth(caller);357 <Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)358 }359360 /// Get contract address.361 fn contract_address(&self) -> Result<address> {362 Ok(crate::eth::collection_id_to_address(self.id))363 }364365 /// Add collection admin.366 /// @param newAdmin Cross account administrator address.367 fn add_collection_admin_cross(368 &mut self,369 caller: caller,370 new_admin: eth::CrossAddress,371 ) -> Result<void> {372 self.consume_store_reads_and_writes(2, 2)?;373374 let caller = T::CrossAccountId::from_eth(caller);375 let new_admin = new_admin.into_sub_cross_account::<T>()?;376 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;377 Ok(())378 }379380 /// Remove collection admin.381 /// @param admin Cross account administrator address.382 fn remove_collection_admin_cross(383 &mut self,384 caller: caller,385 admin: eth::CrossAddress,386 ) -> Result<void> {387 self.consume_store_reads_and_writes(2, 2)?;388389 let caller = T::CrossAccountId::from_eth(caller);390 let admin = admin.into_sub_cross_account::<T>()?;391 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;392 Ok(())393 }394395 /// Add collection admin.396 /// @param newAdmin Address of the added administrator.397 #[solidity(hide)]398 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {399 self.consume_store_reads_and_writes(2, 2)?;400401 let caller = T::CrossAccountId::from_eth(caller);402 let new_admin = T::CrossAccountId::from_eth(new_admin);403 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;404 Ok(())405 }406407 /// Remove collection admin.408 ///409 /// @param admin Address of the removed administrator.410 #[solidity(hide)]411 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {412 self.consume_store_reads_and_writes(2, 2)?;413414 let caller = T::CrossAccountId::from_eth(caller);415 let admin = T::CrossAccountId::from_eth(admin);416 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;417 Ok(())418 }419420 /// Toggle accessibility of collection nesting.421 ///422 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'423 #[solidity(rename_selector = "setCollectionNesting")]424 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {425 self.consume_store_reads_and_writes(1, 1)?;426427 let caller = T::CrossAccountId::from_eth(caller);428429 let mut permissions = self.collection.permissions.clone();430 let mut nesting = permissions.nesting().clone();431 nesting.token_owner = enable;432 nesting.restricted = None;433 permissions.nesting = Some(nesting);434435 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)436 }437438 /// Toggle accessibility of collection nesting.439 ///440 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'441 /// @param collections Addresses of collections that will be available for nesting.442 #[solidity(rename_selector = "setCollectionNesting")]443 fn set_nesting(444 &mut self,445 caller: caller,446 enable: bool,447 collections: Vec<address>,448 ) -> Result<void> {449 self.consume_store_reads_and_writes(1, 1)?;450451 if collections.is_empty() {452 return Err("no addresses provided".into());453 }454 let caller = T::CrossAccountId::from_eth(caller);455456 let mut permissions = self.collection.permissions.clone();457 match enable {458 false => {459 let mut nesting = permissions.nesting().clone();460 nesting.token_owner = false;461 nesting.restricted = None;462 permissions.nesting = Some(nesting);463 }464 true => {465 let mut bv = OwnerRestrictedSet::new();466 for i in collections {467 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {468 Error::Revert("Can't convert address into collection id".into())469 })?)470 .map_err(|_| "too many collections")?;471 }472 let mut nesting = permissions.nesting().clone();473 nesting.token_owner = true;474 nesting.restricted = Some(bv);475 permissions.nesting = Some(nesting);476 }477 };478479 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)480 }481482 /// Returns nesting for a collection483 #[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]484 fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {485 let nesting = self.collection.permissions.nesting();486487 Ok(eth::CollectionNesting::new(488 nesting.token_owner,489 nesting490 .restricted491 .clone()492 .map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())493 .unwrap_or_default(),494 ))495 }496497 /// Returns permissions for a collection498 fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {499 let nesting = self.collection.permissions.nesting();500 Ok(vec![501 eth::CollectionNestingPermission::new(502 eth::CollectionPermissionField::CollectionAdmin,503 nesting.collection_admin,504 ),505 eth::CollectionNestingPermission::new(506 eth::CollectionPermissionField::TokenOwner,507 nesting.token_owner,508 ),509 ])510 }511 /// Set the collection access method.512 /// @param mode Access mode513 /// 0 for Normal514 /// 1 for AllowList515 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {516 self.consume_store_reads_and_writes(1, 1)?;517518 let caller = T::CrossAccountId::from_eth(caller);519 let permissions = CollectionPermissions {520 access: Some(match mode {521 0 => AccessMode::Normal,522 1 => AccessMode::AllowList,523 _ => return Err("not supported access mode".into()),524 }),525 ..Default::default()526 };527 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)528 }529530 /// Checks that user allowed to operate with collection.531 ///532 /// @param user User address to check.533 fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {534 let user = user.into_sub_cross_account::<T>()?;535 Ok(Pallet::<T>::allowed(self.id, user))536 }537538 /// Add the user to the allowed list.539 ///540 /// @param user Address of a trusted user.541 #[solidity(hide)]542 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {543 self.consume_store_writes(1)?;544545 let caller = T::CrossAccountId::from_eth(caller);546 let user = T::CrossAccountId::from_eth(user);547 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;548 Ok(())549 }550551 /// Add user to allowed list.552 ///553 /// @param user User cross account address.554 fn add_to_collection_allow_list_cross(555 &mut self,556 caller: caller,557 user: eth::CrossAddress,558 ) -> Result<void> {559 self.consume_store_writes(1)?;560561 let caller = T::CrossAccountId::from_eth(caller);562 let user = user.into_sub_cross_account::<T>()?;563 Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;564 Ok(())565 }566567 /// Remove the user from the allowed list.568 ///569 /// @param user Address of a removed user.570 #[solidity(hide)]571 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {572 self.consume_store_writes(1)?;573574 let caller = T::CrossAccountId::from_eth(caller);575 let user = T::CrossAccountId::from_eth(user);576 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;577 Ok(())578 }579580 /// Remove user from allowed list.581 ///582 /// @param user User cross account address.583 fn remove_from_collection_allow_list_cross(584 &mut self,585 caller: caller,586 user: eth::CrossAddress,587 ) -> Result<void> {588 self.consume_store_writes(1)?;589590 let caller = T::CrossAccountId::from_eth(caller);591 let user = user.into_sub_cross_account::<T>()?;592 Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;593 Ok(())594 }595596 /// Switch permission for minting.597 ///598 /// @param mode Enable if "true".599 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {600 self.consume_store_reads_and_writes(1, 1)?;601602 let caller = T::CrossAccountId::from_eth(caller);603 let permissions = CollectionPermissions {604 mint_mode: Some(mode),605 ..Default::default()606 };607 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)608 }609610 /// Check that account is the owner or admin of the collection611 ///612 /// @param user account to verify613 /// @return "true" if account is the owner or admin614 #[solidity(hide, rename_selector = "isOwnerOrAdmin")]615 fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {616 let user = T::CrossAccountId::from_eth(user);617 Ok(self.is_owner_or_admin(&user))618 }619620 /// Check that account is the owner or admin of the collection621 ///622 /// @param user User cross account to verify623 /// @return "true" if account is the owner or admin624 fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {625 let user = user.into_sub_cross_account::<T>()?;626 Ok(self.is_owner_or_admin(&user))627 }628629 /// Returns collection type630 ///631 /// @return `Fungible` or `NFT` or `ReFungible`632 fn unique_collection_type(&self) -> Result<string> {633 let mode = match self.collection.mode {634 CollectionMode::Fungible(_) => "Fungible",635 CollectionMode::NFT => "NFT",636 CollectionMode::ReFungible => "ReFungible",637 };638 Ok(mode.into())639 }640641 /// Get collection owner.642 ///643 /// @return Tuble with sponsor address and his substrate mirror.644 /// If address is canonical then substrate mirror is zero and vice versa.645 fn collection_owner(&self) -> Result<eth::CrossAddress> {646 Ok(eth::CrossAddress::from_sub_cross_account::<T>(647 &T::CrossAccountId::from_sub(self.owner.clone()),648 ))649 }650651 /// Changes collection owner to another account652 ///653 /// @dev Owner can be changed only by current owner654 /// @param newOwner new owner account655 #[solidity(hide, rename_selector = "changeCollectionOwner")]656 fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {657 self.consume_store_writes(1)?;658659 let caller = T::CrossAccountId::from_eth(caller);660 let new_owner = T::CrossAccountId::from_eth(new_owner);661 self.change_owner(caller, new_owner)662 .map_err(dispatch_to_evm::<T>)663 }664665 /// Get collection administrators666 ///667 /// @return Vector of tuples with admins address and his substrate mirror.668 /// If address is canonical then substrate mirror is zero and vice versa.669 fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {670 let result = crate::IsAdmin::<T>::iter_prefix((self.id,))671 .map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))672 .collect();673 Ok(result)674 }675676 /// Changes collection owner to another account677 ///678 /// @dev Owner can be changed only by current owner679 /// @param newOwner new owner cross account680 fn change_collection_owner_cross(681 &mut self,682 caller: caller,683 new_owner: eth::CrossAddress,684 ) -> Result<void> {685 self.consume_store_writes(1)?;686687 let caller = T::CrossAccountId::from_eth(caller);688 let new_owner = new_owner.into_sub_cross_account::<T>()?;689 self.change_owner(caller, new_owner)690 .map_err(dispatch_to_evm::<T>)691 }692}693694/// Contains static property keys and values.695pub mod static_property {696 use evm_coder::{697 execution::{Result, Error},698 };699 use alloc::format;700701 const EXPECT_CONVERT_ERROR: &str = "length < limit";702703 /// Keys.704 pub mod key {705 use super::*;706707 /// Key "baseURI".708 pub fn base_uri() -> up_data_structs::PropertyKey {709 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)710 }711712 /// Key "url".713 pub fn url() -> up_data_structs::PropertyKey {714 property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)715 }716717 /// Key "suffix".718 pub fn suffix() -> up_data_structs::PropertyKey {719 property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)720 }721722 /// Key "parentNft".723 pub fn parent_nft() -> up_data_structs::PropertyKey {724 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)725 }726 }727728 /// Convert `byte` to [`PropertyKey`].729 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {730 bytes.to_vec().try_into().map_err(|_| {731 Error::Revert(format!(732 "Property key is too long. Max length is {}.",733 up_data_structs::PropertyKey::bound()734 ))735 })736 }737738 /// Convert `bytes` to [`PropertyValue`].739 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {740 bytes.to_vec().try_into().map_err(|_| {741 Error::Revert(format!(742 "Property key is too long. Max length is {}.",743 up_data_structs::PropertyKey::bound()744 ))745 })746 }747}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//! 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};3334use crate::{35 Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf, eth, weights::WeightInfo,36};3738/// Events for ethereum collection helper.39#[derive(ToLog)]40pub enum CollectionHelpersEvents {41 /// The collection has been created.42 CollectionCreated {43 /// Collection owner.44 #[indexed]45 owner: address,4647 /// Collection ID.48 #[indexed]49 collection_id: address,50 },51 /// The collection has been destroyed.52 CollectionDestroyed {53 /// Collection ID.54 #[indexed]55 collection_id: address,56 },57 /// The collection has been changed.58 CollectionChanged {59 /// Collection ID.60 #[indexed]61 collection_id: address,62 },6364 /// The token has been changed.65 TokenChanged {66 /// Collection ID.67 #[indexed]68 collection_id: address,69 /// Token ID.70 token_id: uint256,71 },72}7374/// Does not always represent a full collection, for RFT it is either75/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).76pub trait CommonEvmHandler {77 /// Raw compiled binary code of the contract stub78 const CODE: &'static [u8];7980 /// Call precompiled handle.81 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;82}8384/// @title A contract that allows you to work with collections.85#[solidity_interface(name = Collection)]86impl<T: Config> CollectionHandle<T>87where88 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,89{90 /// Set collection property.91 ///92 /// @param key Property key.93 /// @param value Propery value.94 #[solidity(hide)]95 #[weight(<SelfWeightOf<T>>::set_collection_properties(1))]96 fn set_collection_property(97 &mut self,98 caller: caller,99 key: string,100 value: bytes,101 ) -> Result<void> {102 let caller = T::CrossAccountId::from_eth(caller);103 let key = <Vec<u8>>::from(key)104 .try_into()105 .map_err(|_| "key too large")?;106 let value = value.0.try_into().map_err(|_| "value too large")?;107108 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })109 .map_err(dispatch_to_evm::<T>)110 }111112 /// Set collection properties.113 ///114 /// @param properties Vector of properties key/value pair.115 #[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]116 fn set_collection_properties(117 &mut self,118 caller: caller,119 properties: Vec<eth::Property>,120 ) -> Result<void> {121 let caller = T::CrossAccountId::from_eth(caller);122123 let properties = properties124 .into_iter()125 .map(eth::Property::try_into)126 .collect::<Result<Vec<_>>>()?;127128 <Pallet<T>>::set_collection_properties(self, &caller, properties.into_iter())129 .map_err(dispatch_to_evm::<T>)130 }131132 /// Delete collection property.133 ///134 /// @param key Property key.135 #[solidity(hide)]136 #[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]137 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {138 let caller = T::CrossAccountId::from_eth(caller);139 let key = <Vec<u8>>::from(key)140 .try_into()141 .map_err(|_| "key too large")?;142143 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)144 }145146 /// Delete collection properties.147 ///148 /// @param keys Properties keys.149 #[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]150 fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {151 let caller = T::CrossAccountId::from_eth(caller);152 let keys = keys153 .into_iter()154 .map(|key| {155 <Vec<u8>>::from(key)156 .try_into()157 .map_err(|_| Error::Revert("key too large".into()))158 })159 .collect::<Result<Vec<_>>>()?;160161 <Pallet<T>>::delete_collection_properties(self, &caller, keys.into_iter())162 .map_err(dispatch_to_evm::<T>)163 }164165 /// Get collection property.166 ///167 /// @dev Throws error if key not found.168 ///169 /// @param key Property key.170 /// @return bytes The property corresponding to the key.171 fn collection_property(&self, key: string) -> Result<bytes> {172 let key = <Vec<u8>>::from(key)173 .try_into()174 .map_err(|_| "key too large")?;175176 let props = CollectionProperties::<T>::get(self.id);177 let prop = props.get(&key).ok_or("key not found")?;178179 Ok(bytes(prop.to_vec()))180 }181182 /// Get collection properties.183 ///184 /// @param keys Properties keys. Empty keys for all propertyes.185 /// @return Vector of properties key/value pairs.186 fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<eth::Property>> {187 let keys = keys188 .into_iter()189 .map(|key| {190 <Vec<u8>>::from(key)191 .try_into()192 .map_err(|_| Error::Revert("key too large".into()))193 })194 .collect::<Result<Vec<_>>>()?;195196 let properties = Pallet::<T>::filter_collection_properties(197 self.id,198 if keys.is_empty() { None } else { Some(keys) },199 )200 .map_err(dispatch_to_evm::<T>)?;201202 let properties = properties203 .into_iter()204 .map(Property::try_into)205 .collect::<Result<Vec<_>>>()?;206 Ok(properties)207 }208209 /// Set the sponsor of the collection.210 ///211 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.212 ///213 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.214 #[solidity(hide)]215 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {216 self.consume_store_reads_and_writes(1, 1)?;217218 let caller = T::CrossAccountId::from_eth(caller);219220 let sponsor = T::CrossAccountId::from_eth(sponsor);221 self.set_sponsor(&caller, sponsor.as_sub().clone())222 .map_err(dispatch_to_evm::<T>)223 }224225 /// Set the sponsor of the collection.226 ///227 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.228 ///229 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.230 fn set_collection_sponsor_cross(231 &mut self,232 caller: caller,233 sponsor: eth::CrossAddress,234 ) -> Result<void> {235 self.consume_store_reads_and_writes(1, 1)?;236237 let caller = T::CrossAccountId::from_eth(caller);238239 let sponsor = sponsor.into_sub_cross_account::<T>()?;240 self.set_sponsor(&caller, sponsor.as_sub().clone())241 .map_err(dispatch_to_evm::<T>)242 }243244 /// Whether there is a pending sponsor.245 fn has_collection_pending_sponsor(&self) -> Result<bool> {246 Ok(matches!(247 self.collection.sponsorship,248 SponsorshipState::Unconfirmed(_)249 ))250 }251252 /// Collection sponsorship confirmation.253 ///254 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.255 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {256 self.consume_store_writes(1)?;257258 let caller = T::CrossAccountId::from_eth(caller);259 self.confirm_sponsorship(caller.as_sub())260 .map_err(dispatch_to_evm::<T>)261 }262263 /// Remove collection sponsor.264 fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {265 self.consume_store_reads_and_writes(1, 1)?;266 let caller = T::CrossAccountId::from_eth(caller);267 self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)268 }269270 /// Get current sponsor.271 ///272 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.273 fn collection_sponsor(&self) -> Result<eth::CrossAddress> {274 let sponsor = match self.collection.sponsorship.sponsor() {275 Some(sponsor) => sponsor,276 None => return Ok(Default::default()),277 };278279 Ok(eth::CrossAddress::from_sub::<T>(&sponsor))280 }281282 /// Get current collection limits.283 ///284 /// @return Array of collection limits285 fn collection_limits(&self) -> Result<Vec<eth::CollectionLimit>> {286 let limits = &self.collection.limits;287288 let convert_value_from_bool = |ob: Option<bool>| match ob {289 Some(b) => Some(b as u32),290 None => None,291 };292293 Ok(vec![294 eth::CollectionLimit::new(295 eth::CollectionLimitField::AccountTokenOwnership,296 limits.account_token_ownership_limit,297 ),298 eth::CollectionLimit::new(299 eth::CollectionLimitField::SponsoredDataSize,300 limits.sponsored_data_size,301 ),302 limits303 .sponsored_data_rate_limit304 .and_then(|limit| {305 if let SponsoringRateLimit::Blocks(blocks) = limit {306 Some(eth::CollectionLimit::new(307 eth::CollectionLimitField::SponsoredDataRateLimit,308 Some(blocks),309 ))310 } else {311 None312 }313 })314 .unwrap_or(eth::CollectionLimit::new(315 eth::CollectionLimitField::SponsoredDataRateLimit,316 Default::default(),317 )),318 eth::CollectionLimit::new(eth::CollectionLimitField::TokenLimit, limits.token_limit),319 eth::CollectionLimit::new(320 eth::CollectionLimitField::SponsorTransferTimeout,321 limits.sponsor_transfer_timeout,322 ),323 eth::CollectionLimit::new(324 eth::CollectionLimitField::SponsorApproveTimeout,325 limits.sponsor_approve_timeout,326 ),327 eth::CollectionLimit::new(328 eth::CollectionLimitField::OwnerCanTransfer,329 convert_value_from_bool(limits.owner_can_transfer),330 ),331 eth::CollectionLimit::new(332 eth::CollectionLimitField::OwnerCanDestroy,333 convert_value_from_bool(limits.owner_can_destroy),334 ),335 eth::CollectionLimit::new(336 eth::CollectionLimitField::TransferEnabled,337 convert_value_from_bool(limits.transfers_enabled),338 ),339 ])340 }341342 /// Set limits for the collection.343 /// @dev Throws error if limit not found.344 /// @param limit Some limit.345 #[solidity(rename_selector = "setCollectionLimit")]346 fn set_collection_limit(347 &mut self,348 caller: caller,349 limit: eth::CollectionLimit,350 ) -> Result<void> {351 self.consume_store_reads_and_writes(1, 1)?;352353 if !limit.has_value() {354 return Err(Error::Revert("user can't disable limits".into()));355 }356357 let caller = T::CrossAccountId::from_eth(caller);358 <Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)359 }360361 /// Get contract address.362 fn contract_address(&self) -> Result<address> {363 Ok(crate::eth::collection_id_to_address(self.id))364 }365366 /// Add collection admin.367 /// @param newAdmin Cross account administrator address.368 fn add_collection_admin_cross(369 &mut self,370 caller: caller,371 new_admin: eth::CrossAddress,372 ) -> Result<void> {373 self.consume_store_reads_and_writes(2, 2)?;374375 let caller = T::CrossAccountId::from_eth(caller);376 let new_admin = new_admin.into_sub_cross_account::<T>()?;377 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;378 Ok(())379 }380381 /// Remove collection admin.382 /// @param admin Cross account administrator address.383 fn remove_collection_admin_cross(384 &mut self,385 caller: caller,386 admin: eth::CrossAddress,387 ) -> Result<void> {388 self.consume_store_reads_and_writes(2, 2)?;389390 let caller = T::CrossAccountId::from_eth(caller);391 let admin = admin.into_sub_cross_account::<T>()?;392 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;393 Ok(())394 }395396 /// Add collection admin.397 /// @param newAdmin Address of the added administrator.398 #[solidity(hide)]399 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {400 self.consume_store_reads_and_writes(2, 2)?;401402 let caller = T::CrossAccountId::from_eth(caller);403 let new_admin = T::CrossAccountId::from_eth(new_admin);404 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;405 Ok(())406 }407408 /// Remove collection admin.409 ///410 /// @param admin Address of the removed administrator.411 #[solidity(hide)]412 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {413 self.consume_store_reads_and_writes(2, 2)?;414415 let caller = T::CrossAccountId::from_eth(caller);416 let admin = T::CrossAccountId::from_eth(admin);417 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;418 Ok(())419 }420421 /// Toggle accessibility of collection nesting.422 ///423 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'424 #[solidity(rename_selector = "setCollectionNesting")]425 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {426 self.consume_store_reads_and_writes(1, 1)?;427428 let caller = T::CrossAccountId::from_eth(caller);429430 let mut permissions = self.collection.permissions.clone();431 let mut nesting = permissions.nesting().clone();432 nesting.token_owner = enable;433 nesting.restricted = None;434 permissions.nesting = Some(nesting);435436 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)437 }438439 /// Toggle accessibility of collection nesting.440 ///441 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'442 /// @param collections Addresses of collections that will be available for nesting.443 #[solidity(rename_selector = "setCollectionNesting")]444 fn set_nesting(445 &mut self,446 caller: caller,447 enable: bool,448 collections: Vec<address>,449 ) -> Result<void> {450 self.consume_store_reads_and_writes(1, 1)?;451452 if collections.is_empty() {453 return Err("no addresses provided".into());454 }455 let caller = T::CrossAccountId::from_eth(caller);456457 let mut permissions = self.collection.permissions.clone();458 match enable {459 false => {460 let mut nesting = permissions.nesting().clone();461 nesting.token_owner = false;462 nesting.restricted = None;463 permissions.nesting = Some(nesting);464 }465 true => {466 let mut bv = OwnerRestrictedSet::new();467 for i in collections {468 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {469 Error::Revert("Can't convert address into collection id".into())470 })?)471 .map_err(|_| "too many collections")?;472 }473 let mut nesting = permissions.nesting().clone();474 nesting.token_owner = true;475 nesting.restricted = Some(bv);476 permissions.nesting = Some(nesting);477 }478 };479480 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)481 }482483 /// Returns nesting for a collection484 #[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]485 fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {486 let nesting = self.collection.permissions.nesting();487488 Ok(eth::CollectionNesting::new(489 nesting.token_owner,490 nesting491 .restricted492 .clone()493 .map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())494 .unwrap_or_default(),495 ))496 }497498 /// Returns permissions for a collection499 fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {500 let nesting = self.collection.permissions.nesting();501 Ok(vec![502 eth::CollectionNestingPermission::new(503 eth::CollectionPermissionField::CollectionAdmin,504 nesting.collection_admin,505 ),506 eth::CollectionNestingPermission::new(507 eth::CollectionPermissionField::TokenOwner,508 nesting.token_owner,509 ),510 ])511 }512 /// Set the collection access method.513 /// @param mode Access mode514 /// 0 for Normal515 /// 1 for AllowList516 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {517 self.consume_store_reads_and_writes(1, 1)?;518519 let caller = T::CrossAccountId::from_eth(caller);520 let permissions = CollectionPermissions {521 access: Some(match mode {522 0 => AccessMode::Normal,523 1 => AccessMode::AllowList,524 _ => return Err("not supported access mode".into()),525 }),526 ..Default::default()527 };528 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)529 }530531 /// Checks that user allowed to operate with collection.532 ///533 /// @param user User address to check.534 fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {535 let user = user.into_sub_cross_account::<T>()?;536 Ok(Pallet::<T>::allowed(self.id, user))537 }538539 /// Add the user to the allowed list.540 ///541 /// @param user Address of a trusted user.542 #[solidity(hide)]543 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {544 self.consume_store_writes(1)?;545546 let caller = T::CrossAccountId::from_eth(caller);547 let user = T::CrossAccountId::from_eth(user);548 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;549 Ok(())550 }551552 /// Add user to allowed list.553 ///554 /// @param user User cross account address.555 fn add_to_collection_allow_list_cross(556 &mut self,557 caller: caller,558 user: eth::CrossAddress,559 ) -> Result<void> {560 self.consume_store_writes(1)?;561562 let caller = T::CrossAccountId::from_eth(caller);563 let user = user.into_sub_cross_account::<T>()?;564 Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;565 Ok(())566 }567568 /// Remove the user from the allowed list.569 ///570 /// @param user Address of a removed user.571 #[solidity(hide)]572 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {573 self.consume_store_writes(1)?;574575 let caller = T::CrossAccountId::from_eth(caller);576 let user = T::CrossAccountId::from_eth(user);577 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;578 Ok(())579 }580581 /// Remove user from allowed list.582 ///583 /// @param user User cross account address.584 fn remove_from_collection_allow_list_cross(585 &mut self,586 caller: caller,587 user: eth::CrossAddress,588 ) -> Result<void> {589 self.consume_store_writes(1)?;590591 let caller = T::CrossAccountId::from_eth(caller);592 let user = user.into_sub_cross_account::<T>()?;593 Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;594 Ok(())595 }596597 /// Switch permission for minting.598 ///599 /// @param mode Enable if "true".600 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {601 self.consume_store_reads_and_writes(1, 1)?;602603 let caller = T::CrossAccountId::from_eth(caller);604 let permissions = CollectionPermissions {605 mint_mode: Some(mode),606 ..Default::default()607 };608 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)609 }610611 /// Check that account is the owner or admin of the collection612 ///613 /// @param user account to verify614 /// @return "true" if account is the owner or admin615 #[solidity(hide, rename_selector = "isOwnerOrAdmin")]616 fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {617 let user = T::CrossAccountId::from_eth(user);618 Ok(self.is_owner_or_admin(&user))619 }620621 /// Check that account is the owner or admin of the collection622 ///623 /// @param user User cross account to verify624 /// @return "true" if account is the owner or admin625 fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {626 let user = user.into_sub_cross_account::<T>()?;627 Ok(self.is_owner_or_admin(&user))628 }629630 /// Returns collection type631 ///632 /// @return `Fungible` or `NFT` or `ReFungible`633 fn unique_collection_type(&self) -> Result<string> {634 let mode = match self.collection.mode {635 CollectionMode::Fungible(_) => "Fungible",636 CollectionMode::NFT => "NFT",637 CollectionMode::ReFungible => "ReFungible",638 };639 Ok(mode.into())640 }641642 /// Get collection owner.643 ///644 /// @return Tuble with sponsor address and his substrate mirror.645 /// If address is canonical then substrate mirror is zero and vice versa.646 fn collection_owner(&self) -> Result<eth::CrossAddress> {647 Ok(eth::CrossAddress::from_sub_cross_account::<T>(648 &T::CrossAccountId::from_sub(self.owner.clone()),649 ))650 }651652 /// Changes collection owner to another account653 ///654 /// @dev Owner can be changed only by current owner655 /// @param newOwner new owner account656 #[solidity(hide, rename_selector = "changeCollectionOwner")]657 fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {658 self.consume_store_writes(1)?;659660 let caller = T::CrossAccountId::from_eth(caller);661 let new_owner = T::CrossAccountId::from_eth(new_owner);662 self.change_owner(caller, new_owner)663 .map_err(dispatch_to_evm::<T>)664 }665666 /// Get collection administrators667 ///668 /// @return Vector of tuples with admins address and his substrate mirror.669 /// If address is canonical then substrate mirror is zero and vice versa.670 fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {671 let result = crate::IsAdmin::<T>::iter_prefix((self.id,))672 .map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))673 .collect();674 Ok(result)675 }676677 /// Changes collection owner to another account678 ///679 /// @dev Owner can be changed only by current owner680 /// @param newOwner new owner cross account681 fn change_collection_owner_cross(682 &mut self,683 caller: caller,684 new_owner: eth::CrossAddress,685 ) -> Result<void> {686 self.consume_store_writes(1)?;687688 let caller = T::CrossAccountId::from_eth(caller);689 let new_owner = new_owner.into_sub_cross_account::<T>()?;690 self.change_owner(caller, new_owner)691 .map_err(dispatch_to_evm::<T>)692 }693}694695/// Contains static property keys and values.696pub mod static_property {697 use evm_coder::{698 execution::{Result, Error},699 };700 use alloc::format;701702 const EXPECT_CONVERT_ERROR: &str = "length < limit";703704 /// Keys.705 pub mod key {706 use super::*;707708 /// Key "baseURI".709 pub fn base_uri() -> up_data_structs::PropertyKey {710 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)711 }712713 /// Key "url".714 pub fn url() -> up_data_structs::PropertyKey {715 property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)716 }717718 /// Key "suffix".719 pub fn suffix() -> up_data_structs::PropertyKey {720 property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)721 }722723 /// Key "parentNft".724 pub fn parent_nft() -> up_data_structs::PropertyKey {725 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)726 }727 }728729 /// Convert `byte` to [`PropertyKey`].730 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {731 bytes.to_vec().try_into().map_err(|_| {732 Error::Revert(format!(733 "Property key is too long. Max length is {}.",734 up_data_structs::PropertyKey::bound()735 ))736 })737 }738739 /// Convert `bytes` to [`PropertyValue`].740 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {741 bytes.to_vec().try_into().map_err(|_| {742 Error::Revert(format!(743 "Property key is too long. Max length is {}.",744 up_data_structs::PropertyKey::bound()745 ))746 })747 }748}pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1198,6 +1198,58 @@
Ok(())
}
+ /// This function sets or removes a collection properties according to
+ /// `properties_updates` contents:
+ /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`
+ /// * removes a property under the <key> if the value is `None` `(<key>, None)`.
+ ///
+ /// This function fires an event for each property change.
+ /// In case of an error, all the changes (including the events) will be reverted
+ /// since the function is transactional.
+ #[transactional]
+ fn modify_collection_properties(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ ) -> DispatchResult {
+ collection.check_is_owner_or_admin(sender)?;
+
+ let mut stored_properties = <CollectionProperties<T>>::get(collection.id);
+
+ for (key, value) in properties_updates {
+ match value {
+ Some(value) => {
+ stored_properties
+ .try_set(key.clone(), value)
+ .map_err(<Error<T>>::from)?;
+
+ Self::deposit_event(Event::CollectionPropertySet(collection.id, key));
+ <PalletEvm<T>>::deposit_log(
+ erc::CollectionHelpersEvents::CollectionChanged {
+ collection_id: eth::collection_id_to_address(collection.id),
+ }
+ .to_log(T::ContractAddress::get()),
+ );
+ }
+ None => {
+ stored_properties.remove(&key).map_err(<Error<T>>::from)?;
+
+ Self::deposit_event(Event::CollectionPropertyDeleted(collection.id, key));
+ <PalletEvm<T>>::deposit_log(
+ erc::CollectionHelpersEvents::CollectionChanged {
+ collection_id: eth::collection_id_to_address(collection.id),
+ }
+ .to_log(T::ContractAddress::get()),
+ );
+ }
+ }
+ }
+
+ <CollectionProperties<T>>::set(collection.id, stored_properties);
+
+ Ok(())
+ }
+
/// Set collection property.
///
/// * `collection` - Collection handler.
@@ -1208,23 +1260,7 @@
sender: &T::CrossAccountId,
property: Property,
) -> DispatchResult {
- collection.check_is_owner_or_admin(sender)?;
-
- CollectionProperties::<T>::try_mutate(collection.id, |properties| {
- let property = property.clone();
- properties.try_set(property.key, property.value)
- })
- .map_err(<Error<T>>::from)?;
-
- Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));
- <PalletEvm<T>>::deposit_log(
- erc::CollectionHelpersEvents::CollectionChanged {
- collection_id: eth::collection_id_to_address(collection.id),
- }
- .to_log(T::ContractAddress::get()),
- );
-
- Ok(())
+ Self::set_collection_properties(collection, sender, [property].into_iter())
}
/// Set a scoped collection property, where the scope is a special prefix
@@ -1270,17 +1306,16 @@
/// * `collection` - Collection handler.
/// * `sender` - The owner or administrator of the collection.
/// * `properties` - The properties to set.
- #[transactional]
pub fn set_collection_properties(
collection: &CollectionHandle<T>,
sender: &T::CrossAccountId,
- properties: Vec<Property>,
+ properties: impl Iterator<Item = Property>,
) -> DispatchResult {
- for property in properties {
- Self::set_collection_property(collection, sender, property)?;
- }
-
- Ok(())
+ Self::modify_collection_properties(
+ collection,
+ sender,
+ properties.map(|property| (property.key, Some(property.value))),
+ )
}
/// Delete collection property.
@@ -1293,25 +1328,7 @@
sender: &T::CrossAccountId,
property_key: PropertyKey,
) -> DispatchResult {
- collection.check_is_owner_or_admin(sender)?;
-
- CollectionProperties::<T>::try_mutate(collection.id, |properties| {
- properties.remove(&property_key)
- })
- .map_err(<Error<T>>::from)?;
-
- Self::deposit_event(Event::CollectionPropertyDeleted(
- collection.id,
- property_key,
- ));
- <PalletEvm<T>>::deposit_log(
- erc::CollectionHelpersEvents::CollectionChanged {
- collection_id: eth::collection_id_to_address(collection.id),
- }
- .to_log(T::ContractAddress::get()),
- );
-
- Ok(())
+ Self::delete_collection_properties(collection, sender, [property_key].into_iter())
}
/// Delete collection properties.
@@ -1319,17 +1336,12 @@
/// * `collection` - Collection handler.
/// * `sender` - The owner or administrator of the collection.
/// * `properties` - The properties to delete.
- #[transactional]
pub fn delete_collection_properties(
collection: &CollectionHandle<T>,
sender: &T::CrossAccountId,
- property_keys: Vec<PropertyKey>,
+ property_keys: impl Iterator<Item = PropertyKey>,
) -> DispatchResult {
- for key in property_keys {
- Self::delete_collection_property(collection, sender, key)?;
- }
-
- Ok(())
+ Self::modify_collection_properties(collection, sender, property_keys.map(|key| (key, None)))
}
/// Set collection propetry permission without any checks.
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -266,7 +266,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- <PalletCommon<T>>::set_collection_properties(collection, sender, properties)
+ <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())
}
/// Delete properties of the collection, associated with the provided keys.
@@ -275,7 +275,11 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
+ <PalletCommon<T>>::delete_collection_properties(
+ collection,
+ sender,
+ property_keys.into_iter(),
+ )
}
/// Checks if collection has tokens. Return `true` if it has.
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -577,20 +577,29 @@
})
}
- /// Batch operation to add, edit or remove properties for the token
+ /// A batch operation to add, edit or remove properties for a token.
+ /// It sets or removes a token's properties according to
+ /// `properties_updates` contents:
+ /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`
+ /// * removes a property under the <key> if the value is `None` `(<key>, None)`.
///
- /// All affected properties should have mutable permission and sender should have
- /// permission to edit those properties.
- ///
- /// - `nesting_budget`: Limit for searching parents in depth to check ownership.
+ /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.
/// - `is_token_create`: Indicates that method is called during token initialization.
/// Allows to bypass ownership check.
+ ///
+ /// All affected properties should have `mutable` permission
+ /// to be **deleted** or to be **set more than once**,
+ /// and the sender should have permission to edit those properties.
+ ///
+ /// This function fires an event for each property change.
+ /// In case of an error, all the changes (including the events) will be reverted
+ /// since the function is transactional.
#[transactional]
fn modify_token_properties(
collection: &NonfungibleHandle<T>,
sender: &T::CrossAccountId,
token_id: TokenId,
- properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
is_token_create: bool,
nesting_budget: &dyn Budget,
) -> DispatchResult {
@@ -614,15 +623,16 @@
})
};
- for (key, value) in properties {
- let permission = <PalletCommon<T>>::property_permissions(collection.id)
+ let mut stored_properties = <TokenProperties<T>>::get((collection.id, token_id));
+ let permissions = <PalletCommon<T>>::property_permissions(collection.id);
+
+ for (key, value) in properties_updates {
+ let permission = permissions
.get(&key)
.cloned()
.unwrap_or_else(PropertyPermission::none);
- let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))
- .get(&key)
- .is_some();
+ let is_property_exists = stored_properties.get(&key).is_some();
match permission {
PropertyPermission { mutable: false, .. } if is_property_exists => {
@@ -649,10 +659,9 @@
match value {
Some(value) => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.try_set(key.clone(), value)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .try_set(key.clone(), value)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
collection.id,
@@ -661,10 +670,9 @@
));
}
None => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.remove(&key)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .remove(&key)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(
collection.id,
@@ -683,6 +691,8 @@
);
}
+ <TokenProperties<T>>::set((collection.id, token_id), stored_properties);
+
Ok(())
}
@@ -784,7 +794,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- <PalletCommon<T>>::set_collection_properties(collection, sender, properties)
+ <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())
}
/// Remove properties from the collection
@@ -793,7 +803,11 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
+ <PalletCommon<T>>::delete_collection_properties(
+ collection,
+ sender,
+ property_keys.into_iter(),
+ )
}
/// Set property permissions for the token.
pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -184,21 +184,21 @@
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_361_000 as u64)
- // Standard Error: 5_349_868
- .saturating_add(Weight::from_ref_time(637_246_356 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(31_850_484 as u64)
+ // Standard Error: 9_618
+ .saturating_add(Weight::from_ref_time(4_721_947 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_489_000 as u64)
- // Standard Error: 5_738_954
- .saturating_add(Weight::from_ref_time(689_912_822 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_795_000 as u64)
+ // Standard Error: 28_239
+ .saturating_add(Weight::from_ref_time(12_840_446 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
@@ -354,21 +354,21 @@
.saturating_add(RocksDbWeight::get().reads(1 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_361_000 as u64)
- // Standard Error: 5_349_868
- .saturating_add(Weight::from_ref_time(637_246_356 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(31_850_484 as u64)
+ // Standard Error: 9_618
+ .saturating_add(Weight::from_ref_time(4_721_947 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_489_000 as u64)
- // Standard Error: 5_738_954
- .saturating_add(Weight::from_ref_time(689_912_822 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_795_000 as u64)
+ // Standard Error: 28_239
+ .saturating_add(Weight::from_ref_time(12_840_446 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -515,12 +515,29 @@
Ok(())
}
+ /// A batch operation to add, edit or remove properties for a token.
+ /// It sets or removes a token's properties according to
+ /// `properties_updates` contents:
+ /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`
+ /// * removes a property under the <key> if the value is `None` `(<key>, None)`.
+ ///
+ /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.
+ /// - `is_token_create`: Indicates that method is called during token initialization.
+ /// Allows to bypass ownership check.
+ ///
+ /// All affected properties should have `mutable` permission
+ /// to be **deleted** or to be **set more than once**,
+ /// and the sender should have permission to edit those properties.
+ ///
+ /// This function fires an event for each property change.
+ /// In case of an error, all the changes (including the events) will be reverted
+ /// since the function is transactional.
#[transactional]
fn modify_token_properties(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
token_id: TokenId,
- properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
is_token_create: bool,
nesting_budget: &dyn Budget,
) -> DispatchResult {
@@ -544,15 +561,16 @@
Ok(is_bundle_owner)
};
- for (key, value) in properties {
- let permission = <PalletCommon<T>>::property_permissions(collection.id)
+ let mut stored_properties = <TokenProperties<T>>::get((collection.id, token_id));
+ let permissions = <PalletCommon<T>>::property_permissions(collection.id);
+
+ for (key, value) in properties_updates {
+ let permission = permissions
.get(&key)
.cloned()
.unwrap_or_else(PropertyPermission::none);
- let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))
- .get(&key)
- .is_some();
+ let is_property_exists = stored_properties.get(&key).is_some();
match permission {
PropertyPermission { mutable: false, .. } if is_property_exists => {
@@ -578,10 +596,9 @@
match value {
Some(value) => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.try_set(key.clone(), value)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .try_set(key.clone(), value)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
collection.id,
@@ -590,10 +607,9 @@
));
}
None => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.remove(&key)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .remove(&key)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(
collection.id,
@@ -612,6 +628,8 @@
);
}
+ <TokenProperties<T>>::set((collection.id, token_id), stored_properties);
+
Ok(())
}
@@ -1353,7 +1371,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- <PalletCommon<T>>::set_collection_properties(collection, sender, properties)
+ <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())
}
pub fn delete_collection_properties(
@@ -1361,7 +1379,11 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
+ <PalletCommon<T>>::delete_collection_properties(
+ collection,
+ sender,
+ property_keys.into_iter(),
+ )
}
pub fn set_token_property_permissions(
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -246,21 +246,21 @@
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Refungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Refungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_578_000 as u64)
- // Standard Error: 5_396_287
- .saturating_add(Weight::from_ref_time(633_314_546 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(25_518_267 as u64)
+ // Standard Error: 20_451
+ .saturating_add(Weight::from_ref_time(5_041_089 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Refungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Refungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_583_000 as u64)
- // Standard Error: 5_762_380
- .saturating_add(Weight::from_ref_time(696_007_076 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_715_000 as u64)
+ // Standard Error: 28_323
+ .saturating_add(Weight::from_ref_time(13_113_351 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
@@ -478,21 +478,21 @@
.saturating_add(RocksDbWeight::get().reads(1 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Refungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Refungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_578_000 as u64)
- // Standard Error: 5_396_287
- .saturating_add(Weight::from_ref_time(633_314_546 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(25_518_267 as u64)
+ // Standard Error: 20_451
+ .saturating_add(Weight::from_ref_time(5_041_089 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Refungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Refungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_583_000 as u64)
- // Standard Error: 5_762_380
- .saturating_add(Weight::from_ref_time(696_007_076 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_715_000 as u64)
+ // Standard Error: 28_323
+ .saturating_add(Weight::from_ref_time(13_113_351 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -33,7 +33,6 @@
};
use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};
-use sp_std::vec;
use up_data_structs::{
CollectionDescription, CollectionMode, CollectionName, CollectionTokenPrefix,
CreateCollectionData,
@@ -316,13 +315,14 @@
<PalletCommon<T>>::set_collection_properties(
&collection,
&caller,
- vec![up_data_structs::Property {
+ [up_data_structs::Property {
key: key::base_uri(),
value: base_uri
.into_bytes()
.try_into()
.map_err(|_| "base uri is too large")?,
- }],
+ }]
+ .into_iter(),
)
.map_err(dispatch_to_evm::<T>)?;
}
runtime/common/identity.rsdiffbeforeafterboth--- a/runtime/common/identity.rs
+++ b/runtime/common/identity.rs
@@ -24,6 +24,9 @@
transaction_validity::{TransactionValidity, ValidTransaction, TransactionValidityError},
};
+#[cfg(feature = "collator-selection")]
+use sp_runtime::transaction_validity::InvalidTransaction;
+
#[derive(Debug, Encode, Decode, PartialEq, Eq, Clone, TypeInfo)]
pub struct DisableIdentityCalls;
tests/src/util/playgrounds/unique.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -651,6 +651,9 @@
try {
result = await this.signTransaction(sender, this.constructApiCall(extrinsic, params), options, extrinsic) as ITransactionResult;
events = this.eventHelper.extractEvents(result.result.events);
+ const errorEvent = events.find((event) => event.method == 'ExecutedFailed' || event.method == 'CreatedFailed');
+ if (errorEvent)
+ throw Error(errorEvent.method + ': ' + extrinsic);
}
catch(e) {
if(!(e as object).hasOwnProperty('status')) throw e;