difftreelog
misk: remove simple type aliases
in: master
9 files changed
crates/evm-coder/src/events.rsdiffbeforeafterboth--- a/crates/evm-coder/src/events.rs
+++ b/crates/evm-coder/src/events.rs
@@ -61,7 +61,7 @@
}
}
-impl ToTopic for uint32 {
+impl ToTopic for u32 {
fn to_topic(&self) -> H256 {
let mut out = [0u8; 32];
out[28..32].copy_from_slice(&self.to_be_bytes());
crates/evm-coder/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -132,11 +132,6 @@
use primitive_types::{U256, H160, H256};
pub type address = H160;
- pub type uint8 = u8;
- pub type uint16 = u16;
- pub type uint32 = u32;
- pub type uint64 = u64;
- pub type uint128 = u128;
pub type uint256 = U256;
pub type bytes4 = [u8; 4];
pub type topic = H256;
@@ -148,10 +143,6 @@
#[derive(Default, Debug, PartialEq, Eq, Clone)]
pub struct bytes(pub Vec<u8>);
-
- /// Solidity doesn't have `void` type, however we have special implementation
- /// for empty tuple return type
- pub type void = ();
//#region Special types
/// Makes function payable
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(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {97 let caller = T::CrossAccountId::from_eth(caller);98 let key = <Vec<u8>>::from(key)99 .try_into()100 .map_err(|_| "key too large")?;101 let value = value.0.try_into().map_err(|_| "value too large")?;102103 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })104 .map_err(dispatch_to_evm::<T>)105 }106107 /// Set collection properties.108 ///109 /// @param properties Vector of properties key/value pair.110 #[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]111 fn set_collection_properties(112 &mut self,113 caller: caller,114 properties: Vec<eth::Property>,115 ) -> Result<()> {116 let caller = T::CrossAccountId::from_eth(caller);117118 let properties = properties119 .into_iter()120 .map(eth::Property::try_into)121 .collect::<Result<Vec<_>>>()?;122123 <Pallet<T>>::set_collection_properties(self, &caller, properties.into_iter())124 .map_err(dispatch_to_evm::<T>)125 }126127 /// Delete collection property.128 ///129 /// @param key Property key.130 #[solidity(hide)]131 #[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]132 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {133 let caller = T::CrossAccountId::from_eth(caller);134 let key = <Vec<u8>>::from(key)135 .try_into()136 .map_err(|_| "key too large")?;137138 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)139 }140141 /// Delete collection properties.142 ///143 /// @param keys Properties keys.144 #[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]145 fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {146 let caller = T::CrossAccountId::from_eth(caller);147 let keys = keys148 .into_iter()149 .map(|key| {150 <Vec<u8>>::from(key)151 .try_into()152 .map_err(|_| Error::Revert("key too large".into()))153 })154 .collect::<Result<Vec<_>>>()?;155156 <Pallet<T>>::delete_collection_properties(self, &caller, keys.into_iter())157 .map_err(dispatch_to_evm::<T>)158 }159160 /// Get collection property.161 ///162 /// @dev Throws error if key not found.163 ///164 /// @param key Property key.165 /// @return bytes The property corresponding to the key.166 fn collection_property(&self, key: string) -> Result<bytes> {167 let key = <Vec<u8>>::from(key)168 .try_into()169 .map_err(|_| "key too large")?;170171 let props = CollectionProperties::<T>::get(self.id);172 let prop = props.get(&key).ok_or("key not found")?;173174 Ok(bytes(prop.to_vec()))175 }176177 /// Get collection properties.178 ///179 /// @param keys Properties keys. Empty keys for all propertyes.180 /// @return Vector of properties key/value pairs.181 fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<eth::Property>> {182 let keys = keys183 .into_iter()184 .map(|key| {185 <Vec<u8>>::from(key)186 .try_into()187 .map_err(|_| Error::Revert("key too large".into()))188 })189 .collect::<Result<Vec<_>>>()?;190191 let properties = Pallet::<T>::filter_collection_properties(192 self.id,193 if keys.is_empty() { None } else { Some(keys) },194 )195 .map_err(dispatch_to_evm::<T>)?;196197 let properties = properties198 .into_iter()199 .map(Property::try_into)200 .collect::<Result<Vec<_>>>()?;201 Ok(properties)202 }203204 /// Set the sponsor of the collection.205 ///206 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.207 ///208 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.209 #[solidity(hide)]210 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<()> {211 self.consume_store_reads_and_writes(1, 1)?;212213 let caller = T::CrossAccountId::from_eth(caller);214215 let sponsor = T::CrossAccountId::from_eth(sponsor);216 self.set_sponsor(&caller, sponsor.as_sub().clone())217 .map_err(dispatch_to_evm::<T>)218 }219220 /// Set the sponsor of the collection.221 ///222 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.223 ///224 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.225 fn set_collection_sponsor_cross(226 &mut self,227 caller: caller,228 sponsor: eth::CrossAddress,229 ) -> Result<()> {230 self.consume_store_reads_and_writes(1, 1)?;231232 let caller = T::CrossAccountId::from_eth(caller);233234 let sponsor = sponsor.into_sub_cross_account::<T>()?;235 self.set_sponsor(&caller, sponsor.as_sub().clone())236 .map_err(dispatch_to_evm::<T>)237 }238239 /// Whether there is a pending sponsor.240 fn has_collection_pending_sponsor(&self) -> Result<bool> {241 Ok(matches!(242 self.collection.sponsorship,243 SponsorshipState::Unconfirmed(_)244 ))245 }246247 /// Collection sponsorship confirmation.248 ///249 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.250 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<()> {251 self.consume_store_writes(1)?;252253 let caller = T::CrossAccountId::from_eth(caller);254 self.confirm_sponsorship(caller.as_sub())255 .map_err(dispatch_to_evm::<T>)256 }257258 /// Remove collection sponsor.259 fn remove_collection_sponsor(&mut self, caller: caller) -> Result<()> {260 self.consume_store_reads_and_writes(1, 1)?;261 let caller = T::CrossAccountId::from_eth(caller);262 self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)263 }264265 /// Get current sponsor.266 ///267 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.268 fn collection_sponsor(&self) -> Result<eth::CrossAddress> {269 let sponsor = match self.collection.sponsorship.sponsor() {270 Some(sponsor) => sponsor,271 None => return Ok(Default::default()),272 };273274 Ok(eth::CrossAddress::from_sub::<T>(&sponsor))275 }276277 /// Get current collection limits.278 ///279 /// @return Array of collection limits280 fn collection_limits(&self) -> Result<Vec<eth::CollectionLimit>> {281 let limits = &self.collection.limits;282283 let convert_value_from_bool = |ob: Option<bool>| match ob {284 Some(b) => Some(b as u32),285 None => None,286 };287288 Ok(vec![289 eth::CollectionLimit::new(290 eth::CollectionLimitField::AccountTokenOwnership,291 limits.account_token_ownership_limit,292 ),293 eth::CollectionLimit::new(294 eth::CollectionLimitField::SponsoredDataSize,295 limits.sponsored_data_size,296 ),297 limits298 .sponsored_data_rate_limit299 .and_then(|limit| {300 if let SponsoringRateLimit::Blocks(blocks) = limit {301 Some(eth::CollectionLimit::new(302 eth::CollectionLimitField::SponsoredDataRateLimit,303 Some(blocks),304 ))305 } else {306 None307 }308 })309 .unwrap_or(eth::CollectionLimit::new(310 eth::CollectionLimitField::SponsoredDataRateLimit,311 Default::default(),312 )),313 eth::CollectionLimit::new(eth::CollectionLimitField::TokenLimit, limits.token_limit),314 eth::CollectionLimit::new(315 eth::CollectionLimitField::SponsorTransferTimeout,316 limits.sponsor_transfer_timeout,317 ),318 eth::CollectionLimit::new(319 eth::CollectionLimitField::SponsorApproveTimeout,320 limits.sponsor_approve_timeout,321 ),322 eth::CollectionLimit::new(323 eth::CollectionLimitField::OwnerCanTransfer,324 convert_value_from_bool(limits.owner_can_transfer),325 ),326 eth::CollectionLimit::new(327 eth::CollectionLimitField::OwnerCanDestroy,328 convert_value_from_bool(limits.owner_can_destroy),329 ),330 eth::CollectionLimit::new(331 eth::CollectionLimitField::TransferEnabled,332 convert_value_from_bool(limits.transfers_enabled),333 ),334 ])335 }336337 /// Set limits for the collection.338 /// @dev Throws error if limit not found.339 /// @param limit Some limit.340 #[solidity(rename_selector = "setCollectionLimit")]341 fn set_collection_limit(&mut self, caller: caller, limit: eth::CollectionLimit) -> Result<()> {342 self.consume_store_reads_and_writes(1, 1)?;343344 if !limit.has_value() {345 return Err(Error::Revert("user can't disable limits".into()));346 }347348 let caller = T::CrossAccountId::from_eth(caller);349 <Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)350 }351352 /// Get contract address.353 fn contract_address(&self) -> Result<address> {354 Ok(crate::eth::collection_id_to_address(self.id))355 }356357 /// Add collection admin.358 /// @param newAdmin Cross account administrator address.359 fn add_collection_admin_cross(360 &mut self,361 caller: caller,362 new_admin: eth::CrossAddress,363 ) -> Result<()> {364 self.consume_store_reads_and_writes(2, 2)?;365366 let caller = T::CrossAccountId::from_eth(caller);367 let new_admin = new_admin.into_sub_cross_account::<T>()?;368 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;369 Ok(())370 }371372 /// Remove collection admin.373 /// @param admin Cross account administrator address.374 fn remove_collection_admin_cross(375 &mut self,376 caller: caller,377 admin: eth::CrossAddress,378 ) -> Result<()> {379 self.consume_store_reads_and_writes(2, 2)?;380381 let caller = T::CrossAccountId::from_eth(caller);382 let admin = admin.into_sub_cross_account::<T>()?;383 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;384 Ok(())385 }386387 /// Add collection admin.388 /// @param newAdmin Address of the added administrator.389 #[solidity(hide)]390 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<()> {391 self.consume_store_reads_and_writes(2, 2)?;392393 let caller = T::CrossAccountId::from_eth(caller);394 let new_admin = T::CrossAccountId::from_eth(new_admin);395 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;396 Ok(())397 }398399 /// Remove collection admin.400 ///401 /// @param admin Address of the removed administrator.402 #[solidity(hide)]403 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<()> {404 self.consume_store_reads_and_writes(2, 2)?;405406 let caller = T::CrossAccountId::from_eth(caller);407 let admin = T::CrossAccountId::from_eth(admin);408 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;409 Ok(())410 }411412 /// Toggle accessibility of collection nesting.413 ///414 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'415 #[solidity(rename_selector = "setCollectionNesting")]416 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<()> {417 self.consume_store_reads_and_writes(1, 1)?;418419 let caller = T::CrossAccountId::from_eth(caller);420421 let mut permissions = self.collection.permissions.clone();422 let mut nesting = permissions.nesting().clone();423 nesting.token_owner = enable;424 nesting.restricted = None;425 permissions.nesting = Some(nesting);426427 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)428 }429430 /// Toggle accessibility of collection nesting.431 ///432 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'433 /// @param collections Addresses of collections that will be available for nesting.434 #[solidity(rename_selector = "setCollectionNesting")]435 fn set_nesting(436 &mut self,437 caller: caller,438 enable: bool,439 collections: Vec<address>,440 ) -> Result<()> {441 self.consume_store_reads_and_writes(1, 1)?;442443 if collections.is_empty() {444 return Err("no addresses provided".into());445 }446 let caller = T::CrossAccountId::from_eth(caller);447448 let mut permissions = self.collection.permissions.clone();449 match enable {450 false => {451 let mut nesting = permissions.nesting().clone();452 nesting.token_owner = false;453 nesting.restricted = None;454 permissions.nesting = Some(nesting);455 }456 true => {457 let mut bv = OwnerRestrictedSet::new();458 for i in collections {459 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {460 Error::Revert("Can't convert address into collection id".into())461 })?)462 .map_err(|_| "too many collections")?;463 }464 let mut nesting = permissions.nesting().clone();465 nesting.token_owner = true;466 nesting.restricted = Some(bv);467 permissions.nesting = Some(nesting);468 }469 };470471 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)472 }473474 /// Returns nesting for a collection475 #[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]476 fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {477 let nesting = self.collection.permissions.nesting();478479 Ok(eth::CollectionNesting::new(480 nesting.token_owner,481 nesting482 .restricted483 .clone()484 .map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())485 .unwrap_or_default(),486 ))487 }488489 /// Returns permissions for a collection490 fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {491 let nesting = self.collection.permissions.nesting();492 Ok(vec![493 eth::CollectionNestingPermission::new(494 eth::CollectionPermissionField::CollectionAdmin,495 nesting.collection_admin,496 ),497 eth::CollectionNestingPermission::new(498 eth::CollectionPermissionField::TokenOwner,499 nesting.token_owner,500 ),501 ])502 }503 /// Set the collection access method.504 /// @param mode Access mode505 /// 0 for Normal506 /// 1 for AllowList507 fn set_collection_access(&mut self, caller: caller, mode: u8) -> Result<()> {508 self.consume_store_reads_and_writes(1, 1)?;509510 let caller = T::CrossAccountId::from_eth(caller);511 let permissions = CollectionPermissions {512 access: Some(match mode {513 0 => AccessMode::Normal,514 1 => AccessMode::AllowList,515 _ => return Err("not supported access mode".into()),516 }),517 ..Default::default()518 };519 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)520 }521522 /// Checks that user allowed to operate with collection.523 ///524 /// @param user User address to check.525 fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {526 let user = user.into_sub_cross_account::<T>()?;527 Ok(Pallet::<T>::allowed(self.id, user))528 }529530 /// Add the user to the allowed list.531 ///532 /// @param user Address of a trusted user.533 #[solidity(hide)]534 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> {535 self.consume_store_writes(1)?;536537 let caller = T::CrossAccountId::from_eth(caller);538 let user = T::CrossAccountId::from_eth(user);539 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;540 Ok(())541 }542543 /// Add user to allowed list.544 ///545 /// @param user User cross account address.546 fn add_to_collection_allow_list_cross(547 &mut self,548 caller: caller,549 user: eth::CrossAddress,550 ) -> Result<()> {551 self.consume_store_writes(1)?;552553 let caller = T::CrossAccountId::from_eth(caller);554 let user = user.into_sub_cross_account::<T>()?;555 Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;556 Ok(())557 }558559 /// Remove the user from the allowed list.560 ///561 /// @param user Address of a removed user.562 #[solidity(hide)]563 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> {564 self.consume_store_writes(1)?;565566 let caller = T::CrossAccountId::from_eth(caller);567 let user = T::CrossAccountId::from_eth(user);568 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;569 Ok(())570 }571572 /// Remove user from allowed list.573 ///574 /// @param user User cross account address.575 fn remove_from_collection_allow_list_cross(576 &mut self,577 caller: caller,578 user: eth::CrossAddress,579 ) -> Result<()> {580 self.consume_store_writes(1)?;581582 let caller = T::CrossAccountId::from_eth(caller);583 let user = user.into_sub_cross_account::<T>()?;584 Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;585 Ok(())586 }587588 /// Switch permission for minting.589 ///590 /// @param mode Enable if "true".591 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<()> {592 self.consume_store_reads_and_writes(1, 1)?;593594 let caller = T::CrossAccountId::from_eth(caller);595 let permissions = CollectionPermissions {596 mint_mode: Some(mode),597 ..Default::default()598 };599 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)600 }601602 /// Check that account is the owner or admin of the collection603 ///604 /// @param user account to verify605 /// @return "true" if account is the owner or admin606 #[solidity(hide, rename_selector = "isOwnerOrAdmin")]607 fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {608 let user = T::CrossAccountId::from_eth(user);609 Ok(self.is_owner_or_admin(&user))610 }611612 /// Check that account is the owner or admin of the collection613 ///614 /// @param user User cross account to verify615 /// @return "true" if account is the owner or admin616 fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {617 let user = user.into_sub_cross_account::<T>()?;618 Ok(self.is_owner_or_admin(&user))619 }620621 /// Returns collection type622 ///623 /// @return `Fungible` or `NFT` or `ReFungible`624 fn unique_collection_type(&self) -> Result<string> {625 let mode = match self.collection.mode {626 CollectionMode::Fungible(_) => "Fungible",627 CollectionMode::NFT => "NFT",628 CollectionMode::ReFungible => "ReFungible",629 };630 Ok(mode.into())631 }632633 /// Get collection owner.634 ///635 /// @return Tuble with sponsor address and his substrate mirror.636 /// If address is canonical then substrate mirror is zero and vice versa.637 fn collection_owner(&self) -> Result<eth::CrossAddress> {638 Ok(eth::CrossAddress::from_sub_cross_account::<T>(639 &T::CrossAccountId::from_sub(self.owner.clone()),640 ))641 }642643 /// Changes collection owner to another account644 ///645 /// @dev Owner can be changed only by current owner646 /// @param newOwner new owner account647 #[solidity(hide, rename_selector = "changeCollectionOwner")]648 fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<()> {649 self.consume_store_writes(1)?;650651 let caller = T::CrossAccountId::from_eth(caller);652 let new_owner = T::CrossAccountId::from_eth(new_owner);653 self.change_owner(caller, new_owner)654 .map_err(dispatch_to_evm::<T>)655 }656657 /// Get collection administrators658 ///659 /// @return Vector of tuples with admins address and his substrate mirror.660 /// If address is canonical then substrate mirror is zero and vice versa.661 fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {662 let result = crate::IsAdmin::<T>::iter_prefix((self.id,))663 .map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))664 .collect();665 Ok(result)666 }667668 /// Changes collection owner to another account669 ///670 /// @dev Owner can be changed only by current owner671 /// @param newOwner new owner cross account672 fn change_collection_owner_cross(673 &mut self,674 caller: caller,675 new_owner: eth::CrossAddress,676 ) -> Result<()> {677 self.consume_store_writes(1)?;678679 let caller = T::CrossAccountId::from_eth(caller);680 let new_owner = new_owner.into_sub_cross_account::<T>()?;681 self.change_owner(caller, new_owner)682 .map_err(dispatch_to_evm::<T>)683 }684}685686/// Contains static property keys and values.687pub mod static_property {688 use evm_coder::{689 execution::{Result, Error},690 };691 use alloc::format;692693 const EXPECT_CONVERT_ERROR: &str = "length < limit";694695 /// Keys.696 pub mod key {697 use super::*;698699 /// Key "baseURI".700 pub fn base_uri() -> up_data_structs::PropertyKey {701 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)702 }703704 /// Key "url".705 pub fn url() -> up_data_structs::PropertyKey {706 property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)707 }708709 /// Key "suffix".710 pub fn suffix() -> up_data_structs::PropertyKey {711 property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)712 }713714 /// Key "parentNft".715 pub fn parent_nft() -> up_data_structs::PropertyKey {716 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)717 }718 }719720 /// Convert `byte` to [`PropertyKey`].721 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {722 bytes.to_vec().try_into().map_err(|_| {723 Error::Revert(format!(724 "Property key is too long. Max length is {}.",725 up_data_structs::PropertyKey::bound()726 ))727 })728 }729730 /// Convert `bytes` to [`PropertyValue`].731 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {732 bytes.to_vec().try_into().map_err(|_| {733 Error::Revert(format!(734 "Property key is too long. Max length is {}.",735 up_data_structs::PropertyKey::bound()736 ))737 })738 }739}pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -108,7 +108,7 @@
caller: caller,
contract_address: address,
sponsor: address,
- ) -> Result<void> {
+ ) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
@@ -125,7 +125,7 @@
/// Set contract as self sponsored.
///
/// @param contractAddress Contract for which a self sponsoring is being enabled.
- fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {
+ fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
@@ -146,7 +146,7 @@
/// Remove sponsor.
///
/// @param contractAddress Contract for which a sponsorship is being removed.
- fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {
+ fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
@@ -161,7 +161,7 @@
/// @dev Caller must be same that set via [`setSponsor`].
///
/// @param contractAddress Сontract for which need to confirm sponsorship.
- fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {
+ fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
@@ -210,7 +210,7 @@
caller: caller,
contract_address: address,
mode: SponsoringModeT,
- ) -> Result<void> {
+ ) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
@@ -223,7 +223,7 @@
/// Get current contract sponsoring rate limit
/// @param contractAddress Contract to get sponsoring rate limit of
/// @return uint32 Amount of blocks between two sponsored transactions
- fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {
+ fn sponsoring_rate_limit(&self, contract_address: address) -> Result<u32> {
self.recorder().consume_sload()?;
Ok(<SponsoringRateLimit<T>>::get(contract_address)
@@ -241,8 +241,8 @@
&mut self,
caller: caller,
contract_address: address,
- rate_limit: uint32,
- ) -> Result<void> {
+ rate_limit: u32,
+ ) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
@@ -262,7 +262,7 @@
caller: caller,
contract_address: address,
fee_limit: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
@@ -304,7 +304,7 @@
contract_address: address,
user: address,
is_allowed: bool,
- ) -> Result<void> {
+ ) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
@@ -332,7 +332,7 @@
caller: caller,
contract_address: address,
enabled: bool,
- ) -> Result<void> {
+ ) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -72,7 +72,7 @@
Ok(<TotalSupply<T>>::get(self.id).into())
}
- fn decimals(&self) -> Result<uint8> {
+ fn decimals(&self) -> Result<u8> {
Ok(if let CollectionMode::Fungible(decimals) = &self.mode {
*decimals
} else {
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -423,7 +423,7 @@
_to: address,
_token_id: uint256,
_data: bytes,
- ) -> Result<void> {
+ ) -> Result<()> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -433,7 +433,7 @@
_from: address,
_to: address,
_token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -454,7 +454,7 @@
from: address,
to: address,
token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let to = T::CrossAccountId::from_eth(to);
@@ -475,7 +475,7 @@
/// @param approved The new approved NFT controller
/// @param tokenId The NFT to approve
#[weight(<SelfWeightOf<T>>::approve())]
- fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<void> {
+ fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let approved = T::CrossAccountId::from_eth(approved);
let token = token_id.try_into()?;
@@ -495,7 +495,7 @@
caller: caller,
operator: address,
approved: bool,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let operator = T::CrossAccountId::from_eth(operator);
@@ -528,7 +528,7 @@
/// operator of the current owner.
/// @param tokenId The NFT to approve
#[weight(<SelfWeightOf<T>>::burn_item())]
- fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {
+ fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token = token_id.try_into()?;
@@ -773,7 +773,7 @@
caller: caller,
approved: eth::CrossAddress,
token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let approved = approved.into_sub_cross_account::<T>()?;
let token = token_id.try_into()?;
@@ -789,7 +789,7 @@
/// @param to The new owner
/// @param tokenId The NFT to transfer
#[weight(<SelfWeightOf<T>>::transfer())]
- fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {
+ fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token = token_id.try_into()?;
@@ -812,7 +812,7 @@
caller: caller,
to: eth::CrossAddress,
token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
let token = token_id.try_into()?;
@@ -837,7 +837,7 @@
from: eth::CrossAddress,
to: eth::CrossAddress,
token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
let to = to.into_sub_cross_account::<T>()?;
@@ -858,7 +858,7 @@
/// @param tokenId The NFT to transfer
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::burn_from())]
- fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {
+ fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let token = token_id.try_into()?;
@@ -883,7 +883,7 @@
caller: caller,
from: eth::CrossAddress,
token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
let token = token_id.try_into()?;
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -424,7 +424,7 @@
_to: address,
_token_id: uint256,
_data: bytes,
- ) -> Result<void> {
+ ) -> Result<()> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -436,7 +436,7 @@
_from: address,
_to: address,
_token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -458,7 +458,7 @@
from: address,
to: address,
token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let to = T::CrossAccountId::from_eth(to);
@@ -477,7 +477,7 @@
}
/// @dev Not implemented
- fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<void> {
+ fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<()> {
Err("not implemented".into())
}
@@ -491,7 +491,7 @@
caller: caller,
operator: address,
approved: bool,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let operator = T::CrossAccountId::from_eth(operator);
@@ -556,7 +556,7 @@
/// operator of the current owner.
/// @param tokenId The RFT to approve
#[weight(<SelfWeightOf<T>>::burn_item_fully())]
- fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {
+ fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token = token_id.try_into()?;
@@ -805,7 +805,7 @@
/// @param to The new owner
/// @param tokenId The RFT to transfer
#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]
- fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {
+ fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token = token_id.try_into()?;
@@ -833,7 +833,7 @@
caller: caller,
to: eth::CrossAddress,
token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
let token = token_id.try_into()?;
@@ -862,7 +862,7 @@
from: eth::CrossAddress,
to: eth::CrossAddress,
token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
let to = to.into_sub_cross_account::<T>()?;
@@ -888,7 +888,7 @@
/// @param tokenId The RFT to transfer
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::burn_from())]
- fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {
+ fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let token = token_id.try_into()?;
@@ -917,7 +917,7 @@
caller: caller,
from: eth::CrossAddress,
token_id: uint256,
- ) -> Result<void> {
+ ) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
let token = token_id.try_into()?;
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -109,7 +109,7 @@
}
/// @dev Not supported
- fn decimals(&self) -> Result<uint8> {
+ fn decimals(&self) -> Result<u8> {
// Decimals aren't supported for refungible tokens
Ok(0)
}
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -231,7 +231,7 @@
caller: caller,
value: value,
name: string,
- decimals: uint8,
+ decimals: u8,
description: string,
token_prefix: string,
) -> Result<address> {
@@ -334,7 +334,7 @@
}
#[weight(<SelfWeightOf<T>>::destroy_collection())]
- fn destroy_collection(&mut self, caller: caller, collection_address: address) -> Result<void> {
+ fn destroy_collection(&mut self, caller: caller, collection_address: address) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)
@@ -366,14 +366,14 @@
/// Returns address of a collection.
/// @param collectionId - CollectionId of the collection
/// @return eth mirror address of the collection
- fn collection_address(&self, collection_id: uint32) -> Result<address> {
+ fn collection_address(&self, collection_id: u32) -> Result<address> {
Ok(collection_id_to_address(collection_id.into()))
}
/// Returns collectionId of a collection.
/// @param collectionAddress - Eth address of the collection
/// @return collectionId of the collection
- fn collection_id(&self, collection_address: address) -> Result<uint32> {
+ fn collection_id(&self, collection_address: address) -> Result<u32> {
map_eth_to_id(&collection_address)
.map(|id| id.0)
.ok_or(Error::Revert(format!(