difftreelog
fix PR
in: master
10 files changed
crates/evm-coder/procedural/src/abi_derive/derive_enum.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs
+++ b/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs
@@ -47,11 +47,10 @@
)
}
-pub fn impl_enum_abi_type(name: &syn::Ident, option_count: usize) -> proc_macro2::TokenStream {
+pub fn impl_enum_abi_type(name: &syn::Ident) -> proc_macro2::TokenStream {
quote! {
impl ::evm_coder::abi::AbiType for #name {
const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = <u8 as ::evm_coder::abi::AbiType>::SIGNATURE;
- const FIELDS_COUNT: usize = #option_count;
fn is_dynamic() -> bool {
<u8 as ::evm_coder::abi::AbiType>::is_dynamic()
crates/evm-coder/procedural/src/abi_derive/derive_struct.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/abi_derive/derive_struct.rs
+++ b/crates/evm-coder/procedural/src/abi_derive/derive_struct.rs
@@ -100,12 +100,10 @@
pub fn impl_struct_abi_type(
name: &syn::Ident,
tuple_type: proc_macro2::TokenStream,
- fields_count: usize,
) -> proc_macro2::TokenStream {
quote! {
impl ::evm_coder::abi::AbiType for #name {
const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = <#tuple_type as ::evm_coder::abi::AbiType>::SIGNATURE;
- const FIELDS_COUNT: usize = #fields_count;
fn is_dynamic() -> bool {
<#tuple_type as ::evm_coder::abi::AbiType>::is_dynamic()
}
crates/evm-coder/procedural/src/abi_derive/mod.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/abi_derive/mod.rs
+++ b/crates/evm-coder/procedural/src/abi_derive/mod.rs
@@ -49,7 +49,7 @@
let struct_from_tuple = struct_from_tuple(name, is_named_fields, field_names.clone());
let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);
- let abi_type = impl_struct_abi_type(name, tuple_type.clone(), params_count);
+ let abi_type = impl_struct_abi_type(name, tuple_type.clone());
let abi_read = impl_struct_abi_read(name, tuple_type, tuple_names, struct_from_tuple);
let abi_write = impl_struct_abi_write(name, is_named_fields, tuple_ref_type, tuple_data);
let solidity_type = impl_struct_solidity_type(name, field_types.clone(), params_count);
@@ -83,7 +83,7 @@
let from = impl_enum_from_u8(name, enum_options.clone());
let solidity_option = impl_solidity_option(name, enum_options.clone());
let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);
- let abi_type = impl_enum_abi_type(name, option_count);
+ let abi_type = impl_enum_abi_type(name);
let abi_read = impl_enum_abi_read(name);
let abi_write = impl_enum_abi_write(name);
let solidity_type = impl_enum_solidity_type(name);
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -16,7 +16,6 @@
impl AbiType for $ty {
const SIGNATURE: SignatureUnit = make_signature!(new fixed(stringify!($name)));
- const FIELDS_COUNT: usize = 1;
fn is_dynamic() -> bool {
$dynamic
@@ -97,7 +96,6 @@
impl<T: AbiType> AbiType for &T {
const SIGNATURE: SignatureUnit = T::SIGNATURE;
- const FIELDS_COUNT: usize = T::FIELDS_COUNT;
fn is_dynamic() -> bool {
T::is_dynamic()
@@ -127,7 +125,6 @@
impl<T: AbiType> AbiType for Vec<T> {
const SIGNATURE: SignatureUnit = make_signature!(new nameof(T::SIGNATURE) fixed("[]"));
- const FIELDS_COUNT: usize = 1;
fn is_dynamic() -> bool {
true
@@ -203,7 +200,6 @@
shift_left(1)
fixed(")")
);
- const FIELDS_COUNT: usize = count!($($ident)*);
fn is_dynamic() -> bool {
false
crates/evm-coder/src/abi/traits.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/traits.rs
+++ b/crates/evm-coder/src/abi/traits.rs
@@ -10,9 +10,6 @@
/// Signature for Etherium ABI.
const SIGNATURE: SignatureUnit;
- /// Count of enum variants or struct fields.
- const FIELDS_COUNT: usize;
-
/// Signature as str.
fn as_str() -> &'static str {
from_utf8(&Self::SIGNATURE.data[..Self::SIGNATURE.len]).expect("bad utf-8")
crates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/abi_derive_generation.rs
+++ b/crates/evm-coder/tests/abi_derive_generation.rs
@@ -173,50 +173,6 @@
}
#[test]
- fn impl_abi_type_fields_count() {
- assert_eq!(
- <TypeStruct1SimpleParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 1
- );
- assert_eq!(
- <TypeStruct1DynamicParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 1
- );
- assert_eq!(
- <TypeStruct2SimpleParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct2DynamicParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct2MixedParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 1
- );
- assert_eq!(
- <TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 1
- );
- assert_eq!(
- <TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 2
- );
- assert_eq!(
- <TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::FIELDS_COUNT,
- 3
- );
- }
-
- #[test]
fn impl_abi_type_is_dynamic() {
assert_eq!(
<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),
pallets/common/src/erc.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 Ok(vec![288 eth::CollectionLimit::from_opt_int(289 eth::CollectionLimitField::AccountTokenOwnership,290 limits.account_token_ownership_limit,291 ),292 eth::CollectionLimit::from_opt_int(293 eth::CollectionLimitField::SponsoredDataSize,294 limits.sponsored_data_size,295 ),296 limits297 .sponsored_data_rate_limit298 .and_then(|limit| {299 if let SponsoringRateLimit::Blocks(blocks) = limit {300 Some(eth::CollectionLimit::from_int(301 eth::CollectionLimitField::SponsoredDataRateLimit,302 blocks,303 ))304 } else {305 None306 }307 })308 .unwrap_or(eth::CollectionLimit::from_int(309 eth::CollectionLimitField::SponsoredDataRateLimit,310 Default::default(),311 )),312 eth::CollectionLimit::from_opt_int(313 eth::CollectionLimitField::TokenLimit,314 limits.token_limit,315 ),316 eth::CollectionLimit::from_opt_int(317 eth::CollectionLimitField::SponsorTransferTimeout,318 limits.sponsor_transfer_timeout,319 ),320 eth::CollectionLimit::from_opt_int(321 eth::CollectionLimitField::SponsorApproveTimeout,322 limits.sponsor_approve_timeout,323 ),324 eth::CollectionLimit::from_opt_bool(325 eth::CollectionLimitField::OwnerCanTransfer,326 limits.owner_can_transfer,327 ),328 eth::CollectionLimit::from_opt_bool(329 eth::CollectionLimitField::OwnerCanDestroy,330 limits.owner_can_destroy,331 ),332 eth::CollectionLimit::from_opt_bool(333 eth::CollectionLimitField::TransferEnabled,334 limits.transfers_enabled,335 ),336 ])337 }338339 /// Set limits for the collection.340 /// @dev Throws error if limit not found.341 /// @param limit Some limit.342 #[solidity(rename_selector = "setCollectionLimit")]343 fn set_collection_limit(344 &mut self,345 caller: caller,346 limit: eth::CollectionLimit,347 ) -> Result<void> {348 self.consume_store_reads_and_writes(1, 1)?;349350 let caller = T::CrossAccountId::from_eth(caller);351 <Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)352 }353354 /// Get contract address.355 fn contract_address(&self) -> Result<address> {356 Ok(crate::eth::collection_id_to_address(self.id))357 }358359 /// Add collection admin.360 /// @param newAdmin Cross account administrator address.361 fn add_collection_admin_cross(362 &mut self,363 caller: caller,364 new_admin: eth::CrossAddress,365 ) -> Result<void> {366 self.consume_store_reads_and_writes(2, 2)?;367368 let caller = T::CrossAccountId::from_eth(caller);369 let new_admin = new_admin.into_sub_cross_account::<T>()?;370 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;371 Ok(())372 }373374 /// Remove collection admin.375 /// @param admin Cross account administrator address.376 fn remove_collection_admin_cross(377 &mut self,378 caller: caller,379 admin: eth::CrossAddress,380 ) -> Result<void> {381 self.consume_store_reads_and_writes(2, 2)?;382383 let caller = T::CrossAccountId::from_eth(caller);384 let admin = admin.into_sub_cross_account::<T>()?;385 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;386 Ok(())387 }388389 /// Add collection admin.390 /// @param newAdmin Address of the added administrator.391 #[solidity(hide)]392 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {393 self.consume_store_reads_and_writes(2, 2)?;394395 let caller = T::CrossAccountId::from_eth(caller);396 let new_admin = T::CrossAccountId::from_eth(new_admin);397 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;398 Ok(())399 }400401 /// Remove collection admin.402 ///403 /// @param admin Address of the removed administrator.404 #[solidity(hide)]405 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {406 self.consume_store_reads_and_writes(2, 2)?;407408 let caller = T::CrossAccountId::from_eth(caller);409 let admin = T::CrossAccountId::from_eth(admin);410 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;411 Ok(())412 }413414 /// Toggle accessibility of collection nesting.415 ///416 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'417 #[solidity(rename_selector = "setCollectionNesting")]418 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {419 self.consume_store_reads_and_writes(1, 1)?;420421 let caller = T::CrossAccountId::from_eth(caller);422423 let mut permissions = self.collection.permissions.clone();424 let mut nesting = permissions.nesting().clone();425 nesting.token_owner = enable;426 nesting.restricted = None;427 permissions.nesting = Some(nesting);428429 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)430 }431432 /// Toggle accessibility of collection nesting.433 ///434 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'435 /// @param collections Addresses of collections that will be available for nesting.436 #[solidity(rename_selector = "setCollectionNesting")]437 fn set_nesting(438 &mut self,439 caller: caller,440 enable: bool,441 collections: Vec<address>,442 ) -> Result<void> {443 self.consume_store_reads_and_writes(1, 1)?;444445 if collections.is_empty() {446 return Err("no addresses provided".into());447 }448 let caller = T::CrossAccountId::from_eth(caller);449450 let mut permissions = self.collection.permissions.clone();451 match enable {452 false => {453 let mut nesting = permissions.nesting().clone();454 nesting.token_owner = false;455 nesting.restricted = None;456 permissions.nesting = Some(nesting);457 }458 true => {459 let mut bv = OwnerRestrictedSet::new();460 for i in collections {461 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {462 Error::Revert("Can't convert address into collection id".into())463 })?)464 .map_err(|_| "too many collections")?;465 }466 let mut nesting = permissions.nesting().clone();467 nesting.token_owner = true;468 nesting.restricted = Some(bv);469 permissions.nesting = Some(nesting);470 }471 };472473 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)474 }475476 /// Returns nesting for a collection477 #[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]478 fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {479 let nesting = self.collection.permissions.nesting();480481 Ok(eth::CollectionNesting::new(482 nesting.token_owner,483 nesting484 .restricted485 .clone()486 .map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())487 .unwrap_or_default(),488 ))489 }490491 /// Returns permissions for a collection492 fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {493 let nesting = self.collection.permissions.nesting();494 Ok(vec![495 eth::CollectionNestingPermission::new(496 eth::CollectionPermissionField::CollectionAdmin,497 nesting.collection_admin,498 ),499 eth::CollectionNestingPermission::new(500 eth::CollectionPermissionField::TokenOwner,501 nesting.token_owner,502 ),503 ])504 }505 /// Set the collection access method.506 /// @param mode Access mode507 /// 0 for Normal508 /// 1 for AllowList509 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {510 self.consume_store_reads_and_writes(1, 1)?;511512 let caller = T::CrossAccountId::from_eth(caller);513 let permissions = CollectionPermissions {514 access: Some(match mode {515 0 => AccessMode::Normal,516 1 => AccessMode::AllowList,517 _ => return Err("not supported access mode".into()),518 }),519 ..Default::default()520 };521 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)522 }523524 /// Checks that user allowed to operate with collection.525 ///526 /// @param user User address to check.527 fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {528 let user = user.into_sub_cross_account::<T>()?;529 Ok(Pallet::<T>::allowed(self.id, user))530 }531532 /// Add the user to the allowed list.533 ///534 /// @param user Address of a trusted user.535 #[solidity(hide)]536 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {537 self.consume_store_writes(1)?;538539 let caller = T::CrossAccountId::from_eth(caller);540 let user = T::CrossAccountId::from_eth(user);541 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;542 Ok(())543 }544545 /// Add user to allowed list.546 ///547 /// @param user User cross account address.548 fn add_to_collection_allow_list_cross(549 &mut self,550 caller: caller,551 user: eth::CrossAddress,552 ) -> Result<void> {553 self.consume_store_writes(1)?;554555 let caller = T::CrossAccountId::from_eth(caller);556 let user = user.into_sub_cross_account::<T>()?;557 Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;558 Ok(())559 }560561 /// Remove the user from the allowed list.562 ///563 /// @param user Address of a removed user.564 #[solidity(hide)]565 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {566 self.consume_store_writes(1)?;567568 let caller = T::CrossAccountId::from_eth(caller);569 let user = T::CrossAccountId::from_eth(user);570 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;571 Ok(())572 }573574 /// Remove user from allowed list.575 ///576 /// @param user User cross account address.577 fn remove_from_collection_allow_list_cross(578 &mut self,579 caller: caller,580 user: eth::CrossAddress,581 ) -> Result<void> {582 self.consume_store_writes(1)?;583584 let caller = T::CrossAccountId::from_eth(caller);585 let user = user.into_sub_cross_account::<T>()?;586 Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;587 Ok(())588 }589590 /// Switch permission for minting.591 ///592 /// @param mode Enable if "true".593 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {594 self.consume_store_reads_and_writes(1, 1)?;595596 let caller = T::CrossAccountId::from_eth(caller);597 let permissions = CollectionPermissions {598 mint_mode: Some(mode),599 ..Default::default()600 };601 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)602 }603604 /// Check that account is the owner or admin of the collection605 ///606 /// @param user account to verify607 /// @return "true" if account is the owner or admin608 #[solidity(hide, rename_selector = "isOwnerOrAdmin")]609 fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {610 let user = T::CrossAccountId::from_eth(user);611 Ok(self.is_owner_or_admin(&user))612 }613614 /// Check that account is the owner or admin of the collection615 ///616 /// @param user User cross account to verify617 /// @return "true" if account is the owner or admin618 fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {619 let user = user.into_sub_cross_account::<T>()?;620 Ok(self.is_owner_or_admin(&user))621 }622623 /// Returns collection type624 ///625 /// @return `Fungible` or `NFT` or `ReFungible`626 fn unique_collection_type(&self) -> Result<string> {627 let mode = match self.collection.mode {628 CollectionMode::Fungible(_) => "Fungible",629 CollectionMode::NFT => "NFT",630 CollectionMode::ReFungible => "ReFungible",631 };632 Ok(mode.into())633 }634635 /// Get collection owner.636 ///637 /// @return Tuble with sponsor address and his substrate mirror.638 /// If address is canonical then substrate mirror is zero and vice versa.639 fn collection_owner(&self) -> Result<eth::CrossAddress> {640 Ok(eth::CrossAddress::from_sub_cross_account::<T>(641 &T::CrossAccountId::from_sub(self.owner.clone()),642 ))643 }644645 /// Changes collection owner to another account646 ///647 /// @dev Owner can be changed only by current owner648 /// @param newOwner new owner account649 #[solidity(hide, rename_selector = "changeCollectionOwner")]650 fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {651 self.consume_store_writes(1)?;652653 let caller = T::CrossAccountId::from_eth(caller);654 let new_owner = T::CrossAccountId::from_eth(new_owner);655 self.change_owner(caller, new_owner)656 .map_err(dispatch_to_evm::<T>)657 }658659 /// Get collection administrators660 ///661 /// @return Vector of tuples with admins address and his substrate mirror.662 /// If address is canonical then substrate mirror is zero and vice versa.663 fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {664 let result = crate::IsAdmin::<T>::iter_prefix((self.id,))665 .map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))666 .collect();667 Ok(result)668 }669670 /// Changes collection owner to another account671 ///672 /// @dev Owner can be changed only by current owner673 /// @param newOwner new owner cross account674 fn change_collection_owner_cross(675 &mut self,676 caller: caller,677 new_owner: eth::CrossAddress,678 ) -> Result<void> {679 self.consume_store_writes(1)?;680681 let caller = T::CrossAccountId::from_eth(caller);682 let new_owner = new_owner.into_sub_cross_account::<T>()?;683 self.change_owner(caller, new_owner)684 .map_err(dispatch_to_evm::<T>)685 }686}687688/// Contains static property keys and values.689pub mod static_property {690 use evm_coder::{691 execution::{Result, Error},692 };693 use alloc::format;694695 const EXPECT_CONVERT_ERROR: &str = "length < limit";696697 /// Keys.698 pub mod key {699 use super::*;700701 /// Key "baseURI".702 pub fn base_uri() -> up_data_structs::PropertyKey {703 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)704 }705706 /// Key "url".707 pub fn url() -> up_data_structs::PropertyKey {708 property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)709 }710711 /// Key "suffix".712 pub fn suffix() -> up_data_structs::PropertyKey {713 property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)714 }715716 /// Key "parentNft".717 pub fn parent_nft() -> up_data_structs::PropertyKey {718 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)719 }720 }721722 /// Convert `byte` to [`PropertyKey`].723 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {724 bytes.to_vec().try_into().map_err(|_| {725 Error::Revert(format!(726 "Property key is too long. Max length is {}.",727 up_data_structs::PropertyKey::bound()728 ))729 })730 }731732 /// Convert `bytes` to [`PropertyValue`].733 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {734 bytes.to_vec().try_into().map_err(|_| {735 Error::Revert(format!(736 "Property key is too long. Max length is {}.",737 up_data_structs::PropertyKey::bound()738 ))739 })740 }741}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)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 Ok(vec![288 eth::CollectionLimit::from_opt_int(289 eth::CollectionLimitField::AccountTokenOwnership,290 limits.account_token_ownership_limit,291 ),292 eth::CollectionLimit::from_opt_int(293 eth::CollectionLimitField::SponsoredDataSize,294 limits.sponsored_data_size,295 ),296 limits297 .sponsored_data_rate_limit298 .and_then(|limit| {299 if let SponsoringRateLimit::Blocks(blocks) = limit {300 Some(eth::CollectionLimit::from_int(301 eth::CollectionLimitField::SponsoredDataRateLimit,302 blocks,303 ))304 } else {305 None306 }307 })308 .unwrap_or(eth::CollectionLimit::from_int(309 eth::CollectionLimitField::SponsoredDataRateLimit,310 Default::default(),311 )),312 eth::CollectionLimit::from_opt_int(313 eth::CollectionLimitField::TokenLimit,314 limits.token_limit,315 ),316 eth::CollectionLimit::from_opt_int(317 eth::CollectionLimitField::SponsorTransferTimeout,318 limits.sponsor_transfer_timeout,319 ),320 eth::CollectionLimit::from_opt_int(321 eth::CollectionLimitField::SponsorApproveTimeout,322 limits.sponsor_approve_timeout,323 ),324 eth::CollectionLimit::from_opt_bool(325 eth::CollectionLimitField::OwnerCanTransfer,326 limits.owner_can_transfer,327 ),328 eth::CollectionLimit::from_opt_bool(329 eth::CollectionLimitField::OwnerCanDestroy,330 limits.owner_can_destroy,331 ),332 eth::CollectionLimit::from_opt_bool(333 eth::CollectionLimitField::TransferEnabled,334 limits.transfers_enabled,335 ),336 ])337 }338339 /// Set limits for the collection.340 /// @dev Throws error if limit not found.341 /// @param limit Some limit.342 #[solidity(rename_selector = "setCollectionLimit")]343 fn set_collection_limit(344 &mut self,345 caller: caller,346 limit: eth::CollectionLimit,347 ) -> Result<void> {348 self.consume_store_reads_and_writes(1, 1)?;349350 if !limit.has_value() {351 return Err(Error::Revert("user can't disable limits".into()));352 }353354 let caller = T::CrossAccountId::from_eth(caller);355 <Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)356 }357358 /// Get contract address.359 fn contract_address(&self) -> Result<address> {360 Ok(crate::eth::collection_id_to_address(self.id))361 }362363 /// Add collection admin.364 /// @param newAdmin Cross account administrator address.365 fn add_collection_admin_cross(366 &mut self,367 caller: caller,368 new_admin: eth::CrossAddress,369 ) -> Result<void> {370 self.consume_store_reads_and_writes(2, 2)?;371372 let caller = T::CrossAccountId::from_eth(caller);373 let new_admin = new_admin.into_sub_cross_account::<T>()?;374 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;375 Ok(())376 }377378 /// Remove collection admin.379 /// @param admin Cross account administrator address.380 fn remove_collection_admin_cross(381 &mut self,382 caller: caller,383 admin: eth::CrossAddress,384 ) -> Result<void> {385 self.consume_store_reads_and_writes(2, 2)?;386387 let caller = T::CrossAccountId::from_eth(caller);388 let admin = admin.into_sub_cross_account::<T>()?;389 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;390 Ok(())391 }392393 /// Add collection admin.394 /// @param newAdmin Address of the added administrator.395 #[solidity(hide)]396 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {397 self.consume_store_reads_and_writes(2, 2)?;398399 let caller = T::CrossAccountId::from_eth(caller);400 let new_admin = T::CrossAccountId::from_eth(new_admin);401 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;402 Ok(())403 }404405 /// Remove collection admin.406 ///407 /// @param admin Address of the removed administrator.408 #[solidity(hide)]409 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {410 self.consume_store_reads_and_writes(2, 2)?;411412 let caller = T::CrossAccountId::from_eth(caller);413 let admin = T::CrossAccountId::from_eth(admin);414 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;415 Ok(())416 }417418 /// Toggle accessibility of collection nesting.419 ///420 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'421 #[solidity(rename_selector = "setCollectionNesting")]422 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {423 self.consume_store_reads_and_writes(1, 1)?;424425 let caller = T::CrossAccountId::from_eth(caller);426427 let mut permissions = self.collection.permissions.clone();428 let mut nesting = permissions.nesting().clone();429 nesting.token_owner = enable;430 nesting.restricted = None;431 permissions.nesting = Some(nesting);432433 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)434 }435436 /// Toggle accessibility of collection nesting.437 ///438 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'439 /// @param collections Addresses of collections that will be available for nesting.440 #[solidity(rename_selector = "setCollectionNesting")]441 fn set_nesting(442 &mut self,443 caller: caller,444 enable: bool,445 collections: Vec<address>,446 ) -> Result<void> {447 self.consume_store_reads_and_writes(1, 1)?;448449 if collections.is_empty() {450 return Err("no addresses provided".into());451 }452 let caller = T::CrossAccountId::from_eth(caller);453454 let mut permissions = self.collection.permissions.clone();455 match enable {456 false => {457 let mut nesting = permissions.nesting().clone();458 nesting.token_owner = false;459 nesting.restricted = None;460 permissions.nesting = Some(nesting);461 }462 true => {463 let mut bv = OwnerRestrictedSet::new();464 for i in collections {465 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {466 Error::Revert("Can't convert address into collection id".into())467 })?)468 .map_err(|_| "too many collections")?;469 }470 let mut nesting = permissions.nesting().clone();471 nesting.token_owner = true;472 nesting.restricted = Some(bv);473 permissions.nesting = Some(nesting);474 }475 };476477 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)478 }479480 /// Returns nesting for a collection481 #[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]482 fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {483 let nesting = self.collection.permissions.nesting();484485 Ok(eth::CollectionNesting::new(486 nesting.token_owner,487 nesting488 .restricted489 .clone()490 .map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())491 .unwrap_or_default(),492 ))493 }494495 /// Returns permissions for a collection496 fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {497 let nesting = self.collection.permissions.nesting();498 Ok(vec![499 eth::CollectionNestingPermission::new(500 eth::CollectionPermissionField::CollectionAdmin,501 nesting.collection_admin,502 ),503 eth::CollectionNestingPermission::new(504 eth::CollectionPermissionField::TokenOwner,505 nesting.token_owner,506 ),507 ])508 }509 /// Set the collection access method.510 /// @param mode Access mode511 /// 0 for Normal512 /// 1 for AllowList513 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {514 self.consume_store_reads_and_writes(1, 1)?;515516 let caller = T::CrossAccountId::from_eth(caller);517 let permissions = CollectionPermissions {518 access: Some(match mode {519 0 => AccessMode::Normal,520 1 => AccessMode::AllowList,521 _ => return Err("not supported access mode".into()),522 }),523 ..Default::default()524 };525 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)526 }527528 /// Checks that user allowed to operate with collection.529 ///530 /// @param user User address to check.531 fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {532 let user = user.into_sub_cross_account::<T>()?;533 Ok(Pallet::<T>::allowed(self.id, user))534 }535536 /// Add the user to the allowed list.537 ///538 /// @param user Address of a trusted user.539 #[solidity(hide)]540 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {541 self.consume_store_writes(1)?;542543 let caller = T::CrossAccountId::from_eth(caller);544 let user = T::CrossAccountId::from_eth(user);545 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;546 Ok(())547 }548549 /// Add user to allowed list.550 ///551 /// @param user User cross account address.552 fn add_to_collection_allow_list_cross(553 &mut self,554 caller: caller,555 user: eth::CrossAddress,556 ) -> Result<void> {557 self.consume_store_writes(1)?;558559 let caller = T::CrossAccountId::from_eth(caller);560 let user = user.into_sub_cross_account::<T>()?;561 Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;562 Ok(())563 }564565 /// Remove the user from the allowed list.566 ///567 /// @param user Address of a removed user.568 #[solidity(hide)]569 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {570 self.consume_store_writes(1)?;571572 let caller = T::CrossAccountId::from_eth(caller);573 let user = T::CrossAccountId::from_eth(user);574 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;575 Ok(())576 }577578 /// Remove user from allowed list.579 ///580 /// @param user User cross account address.581 fn remove_from_collection_allow_list_cross(582 &mut self,583 caller: caller,584 user: eth::CrossAddress,585 ) -> Result<void> {586 self.consume_store_writes(1)?;587588 let caller = T::CrossAccountId::from_eth(caller);589 let user = user.into_sub_cross_account::<T>()?;590 Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;591 Ok(())592 }593594 /// Switch permission for minting.595 ///596 /// @param mode Enable if "true".597 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {598 self.consume_store_reads_and_writes(1, 1)?;599600 let caller = T::CrossAccountId::from_eth(caller);601 let permissions = CollectionPermissions {602 mint_mode: Some(mode),603 ..Default::default()604 };605 <Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)606 }607608 /// Check that account is the owner or admin of the collection609 ///610 /// @param user account to verify611 /// @return "true" if account is the owner or admin612 #[solidity(hide, rename_selector = "isOwnerOrAdmin")]613 fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {614 let user = T::CrossAccountId::from_eth(user);615 Ok(self.is_owner_or_admin(&user))616 }617618 /// Check that account is the owner or admin of the collection619 ///620 /// @param user User cross account to verify621 /// @return "true" if account is the owner or admin622 fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {623 let user = user.into_sub_cross_account::<T>()?;624 Ok(self.is_owner_or_admin(&user))625 }626627 /// Returns collection type628 ///629 /// @return `Fungible` or `NFT` or `ReFungible`630 fn unique_collection_type(&self) -> Result<string> {631 let mode = match self.collection.mode {632 CollectionMode::Fungible(_) => "Fungible",633 CollectionMode::NFT => "NFT",634 CollectionMode::ReFungible => "ReFungible",635 };636 Ok(mode.into())637 }638639 /// Get collection owner.640 ///641 /// @return Tuble with sponsor address and his substrate mirror.642 /// If address is canonical then substrate mirror is zero and vice versa.643 fn collection_owner(&self) -> Result<eth::CrossAddress> {644 Ok(eth::CrossAddress::from_sub_cross_account::<T>(645 &T::CrossAccountId::from_sub(self.owner.clone()),646 ))647 }648649 /// Changes collection owner to another account650 ///651 /// @dev Owner can be changed only by current owner652 /// @param newOwner new owner account653 #[solidity(hide, rename_selector = "changeCollectionOwner")]654 fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {655 self.consume_store_writes(1)?;656657 let caller = T::CrossAccountId::from_eth(caller);658 let new_owner = T::CrossAccountId::from_eth(new_owner);659 self.change_owner(caller, new_owner)660 .map_err(dispatch_to_evm::<T>)661 }662663 /// Get collection administrators664 ///665 /// @return Vector of tuples with admins address and his substrate mirror.666 /// If address is canonical then substrate mirror is zero and vice versa.667 fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {668 let result = crate::IsAdmin::<T>::iter_prefix((self.id,))669 .map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))670 .collect();671 Ok(result)672 }673674 /// Changes collection owner to another account675 ///676 /// @dev Owner can be changed only by current owner677 /// @param newOwner new owner cross account678 fn change_collection_owner_cross(679 &mut self,680 caller: caller,681 new_owner: eth::CrossAddress,682 ) -> Result<void> {683 self.consume_store_writes(1)?;684685 let caller = T::CrossAccountId::from_eth(caller);686 let new_owner = new_owner.into_sub_cross_account::<T>()?;687 self.change_owner(caller, new_owner)688 .map_err(dispatch_to_evm::<T>)689 }690}691692/// Contains static property keys and values.693pub mod static_property {694 use evm_coder::{695 execution::{Result, Error},696 };697 use alloc::format;698699 const EXPECT_CONVERT_ERROR: &str = "length < limit";700701 /// Keys.702 pub mod key {703 use super::*;704705 /// Key "baseURI".706 pub fn base_uri() -> up_data_structs::PropertyKey {707 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)708 }709710 /// Key "url".711 pub fn url() -> up_data_structs::PropertyKey {712 property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)713 }714715 /// Key "suffix".716 pub fn suffix() -> up_data_structs::PropertyKey {717 property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)718 }719720 /// Key "parentNft".721 pub fn parent_nft() -> up_data_structs::PropertyKey {722 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)723 }724 }725726 /// Convert `byte` to [`PropertyKey`].727 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {728 bytes.to_vec().try_into().map_err(|_| {729 Error::Revert(format!(730 "Property key is too long. Max length is {}.",731 up_data_structs::PropertyKey::bound()732 ))733 })734 }735736 /// Convert `bytes` to [`PropertyValue`].737 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {738 bytes.to_vec().try_into().map_err(|_| {739 Error::Revert(format!(740 "Property key is too long. Max length is {}.",741 up_data_structs::PropertyKey::bound()742 ))743 })744 }745}pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -264,16 +264,17 @@
value: value.into(),
}
}
+
+ /// Whether the field contains a value.
+ pub fn has_value(&self) -> bool {
+ self.value.status
+ }
}
impl TryInto<up_data_structs::CollectionLimits> for CollectionLimit {
type Error = evm_coder::execution::Error;
fn try_into(self) -> Result<up_data_structs::CollectionLimits, Self::Error> {
- if !self.value.status {
- return Err(Self::Error::Revert("user can't disable limits".into()));
- }
-
let value = self.value.value.try_into().map_err(|error| {
Self::Error::Revert(format!(
"can't convert value to u32 \"{}\" because: \"{error}\"",
@@ -433,17 +434,6 @@
let mut perms = Vec::new();
for TokenPropertyPermission { key, permissions } in permissions {
- if permissions.len() > <TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT {
- return Err(alloc::format!(
- "Actual number of fields {} for {}, which exceeds the maximum value of {}",
- permissions.len(),
- stringify!(EthTokenPermissions),
- <TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT
- )
- .as_str()
- .into());
- }
-
let token_permission = PropertyPermission::from_vec(permissions);
perms.push(up_data_structs::PropertyKeyPermission {
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -38,6 +38,7 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
+ eth,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::call;
@@ -93,25 +94,21 @@
fn set_token_property_permissions(
&mut self,
caller: caller,
- permissions: Vec<pallet_common::eth::TokenPropertyPermission>,
+ permissions: Vec<eth::TokenPropertyPermission>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
- let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(
- permissions,
- )?;
+ let perms = eth::TokenPropertyPermission::into_property_key_permissions(permissions)?;
<Pallet<T>>::set_token_property_permissions(self, &caller, perms)
.map_err(dispatch_to_evm::<T>)
}
/// @notice Get permissions for token properties.
- fn token_property_permissions(
- &self,
- ) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {
+ fn token_property_permissions(&self) -> Result<Vec<eth::TokenPropertyPermission>> {
let perms = <Pallet<T>>::token_property_permission(self.id);
Ok(perms
.into_iter()
- .map(pallet_common::eth::TokenPropertyPermission::from)
+ .map(eth::TokenPropertyPermission::from)
.collect())
}
@@ -159,7 +156,7 @@
&mut self,
caller: caller,
token_id: uint256,
- properties: Vec<pallet_common::eth::Property>,
+ properties: Vec<eth::Property>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -170,7 +167,7 @@
let properties = properties
.into_iter()
- .map(pallet_common::eth::Property::try_into)
+ .map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?;
<Pallet<T>>::set_token_properties(
@@ -753,9 +750,9 @@
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
- fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAddress> {
+ fn cross_owner_of(&self, token_id: uint256) -> Result<eth::CrossAddress> {
Self::token_owner(&self, token_id.try_into()?)
- .map(|o| pallet_common::eth::CrossAddress::from_sub_cross_account::<T>(&o))
+ .map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
}
@@ -764,11 +761,7 @@
/// @param tokenId Id for the token.
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn properties(
- &self,
- token_id: uint256,
- keys: Vec<string>,
- ) -> Result<Vec<pallet_common::eth::Property>> {
+ fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -784,7 +777,7 @@
if keys.is_empty() { None } else { Some(keys) },
)
.into_iter()
- .map(pallet_common::eth::Property::try_from)
+ .map(eth::Property::try_from)
.collect::<Result<Vec<_>>>()
}
@@ -798,7 +791,7 @@
fn approve_cross(
&mut self,
caller: caller,
- approved: pallet_common::eth::CrossAddress,
+ approved: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -837,7 +830,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAddress,
+ to: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -861,8 +854,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAddress,
- to: pallet_common::eth::CrossAddress,
+ from: eth::CrossAddress,
+ to: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -908,7 +901,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAddress,
+ from: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -1030,8 +1023,8 @@
fn mint_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAddress,
- properties: Vec<pallet_common::eth::Property>,
+ to: eth::CrossAddress,
+ properties: Vec<eth::Property>,
) -> Result<uint256> {
let token_id = <TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -1041,7 +1034,7 @@
let properties = properties
.into_iter()
- .map(pallet_common::eth::Property::try_into)
+ .map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?
.try_into()
.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -32,8 +32,9 @@
use frame_support::{BoundedBTreeMap, BoundedVec};
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
+ Error as CommonError,
erc::{CommonEvmHandler, CollectionCall, static_property::key},
- Error as CommonError,
+ eth,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
@@ -96,25 +97,21 @@
fn set_token_property_permissions(
&mut self,
caller: caller,
- permissions: Vec<pallet_common::eth::TokenPropertyPermission>,
+ permissions: Vec<eth::TokenPropertyPermission>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
- let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(
- permissions,
- )?;
+ let perms = eth::TokenPropertyPermission::into_property_key_permissions(permissions)?;
<Pallet<T>>::set_token_property_permissions(self, &caller, perms)
.map_err(dispatch_to_evm::<T>)
}
/// @notice Get permissions for token properties.
- fn token_property_permissions(
- &self,
- ) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {
+ fn token_property_permissions(&self) -> Result<Vec<eth::TokenPropertyPermission>> {
let perms = <Pallet<T>>::token_property_permission(self.id);
Ok(perms
.into_iter()
- .map(pallet_common::eth::TokenPropertyPermission::from)
+ .map(eth::TokenPropertyPermission::from)
.collect())
}
@@ -162,7 +159,7 @@
&mut self,
caller: caller,
token_id: uint256,
- properties: Vec<pallet_common::eth::Property>,
+ properties: Vec<eth::Property>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -173,7 +170,7 @@
let properties = properties
.into_iter()
- .map(pallet_common::eth::Property::try_into)
+ .map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?;
<Pallet<T>>::set_token_properties(
@@ -788,9 +785,9 @@
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
- fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAddress> {
+ fn cross_owner_of(&self, token_id: uint256) -> Result<eth::CrossAddress> {
Self::token_owner(&self, token_id.try_into()?)
- .map(|o| pallet_common::eth::CrossAddress::from_sub_cross_account::<T>(&o))
+ .map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
}
@@ -799,11 +796,7 @@
/// @param tokenId Id for the token.
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn properties(
- &self,
- token_id: uint256,
- keys: Vec<string>,
- ) -> Result<Vec<pallet_common::eth::Property>> {
+ fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -819,7 +812,7 @@
if keys.is_empty() { None } else { Some(keys) },
)
.into_iter()
- .map(pallet_common::eth::Property::try_from)
+ .map(eth::Property::try_from)
.collect::<Result<Vec<_>>>()
}
/// @notice Transfer ownership of an RFT
@@ -855,7 +848,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAddress,
+ to: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -883,8 +876,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAddress,
- to: pallet_common::eth::CrossAddress,
+ from: eth::CrossAddress,
+ to: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -939,7 +932,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAddress,
+ from: eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -1076,8 +1069,8 @@
fn mint_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAddress,
- properties: Vec<pallet_common::eth::Property>,
+ to: eth::CrossAddress,
+ properties: Vec<eth::Property>,
) -> Result<uint256> {
let token_id = <TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -1087,7 +1080,7 @@
let properties = properties
.into_iter()
- .map(pallet_common::eth::Property::try_into)
+ .map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?
.try_into()
.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;