difftreelog
Merge remote-tracking branch 'origin/feature/add_collection_sponsor_substrate' into develop
in: master
32 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5510,7 +5510,7 @@
[[package]]
name = "pallet-common"
-version = "0.1.7"
+version = "0.1.8"
dependencies = [
"ethereum",
"evm-coder",
@@ -5748,7 +5748,7 @@
[[package]]
name = "pallet-fungible"
-version = "0.1.3"
+version = "0.1.4"
dependencies = [
"ethereum",
"evm-coder",
@@ -5990,7 +5990,7 @@
[[package]]
name = "pallet-nonfungible"
-version = "0.1.4"
+version = "0.1.5"
dependencies = [
"ethereum",
"evm-coder",
@@ -6112,7 +6112,7 @@
[[package]]
name = "pallet-refungible"
-version = "0.2.3"
+version = "0.2.4"
dependencies = [
"derivative",
"ethereum",
crates/evm-coder/CHANGELOG.mddiffbeforeafterboth--- a/crates/evm-coder/CHANGELOG.md
+++ b/crates/evm-coder/CHANGELOG.md
@@ -1,6 +1,8 @@
# Change Log
All notable changes to this project will be documented in this file.
+
+<!-- bureaucrate goes here -->
## [v0.1.2] 2022-08-19
### Added
crates/evm-coder/src/solidity.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -479,7 +479,7 @@
}
}
-#[impl_for_tuples(0, 24)]
+#[impl_for_tuples(0, 48)]
impl SolidityFunctions for Tuple {
for_tuples!( where #( Tuple: SolidityFunctions ),* );
pallets/common/CHANGELOG.mddiffbeforeafterboth--- a/pallets/common/CHANGELOG.md
+++ b/pallets/common/CHANGELOG.md
@@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file.
+## [0.1.8] - 2022-08-24
+
+## Added
+ - Eth methods for collection
+ + set_collection_sponsor_substrate
+ + has_collection_pending_sponsor
+ + remove_collection_sponsor
+ + get_collection_sponsor
+- Add convert function from `uint256` to `CrossAccountId`.
+
## [0.1.7] - 2022-08-19
### Added
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-common"
-version = "0.1.7"
+version = "0.1.8"
license = "GPLv3"
edition = "2021"
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.1819use evm_coder::{20 solidity_interface, solidity, ToLog,21 types::*,22 execution::{Result, Error},23};24pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};25use pallet_evm_coder_substrate::dispatch_to_evm;26use sp_std::vec::Vec;27use up_data_structs::{28 AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,29 SponsoringRateLimit,30};31use alloc::format;3233use crate::{34 Pallet, CollectionHandle, Config, CollectionProperties,35 eth::convert_substrate_address_to_cross_account_id,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}5253/// Does not always represent a full collection, for RFT it is either54/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).55pub trait CommonEvmHandler {56 const CODE: &'static [u8];5758 /// Call precompiled handle.59 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;60}6162/// @title A contract that allows you to work with collections.63#[solidity_interface(name = Collection)]64impl<T: Config> CollectionHandle<T>65where66 T::AccountId: From<[u8; 32]>,67{68 /// Set collection property.69 ///70 /// @param key Property key.71 /// @param value Propery value.72 fn set_collection_property(73 &mut self,74 caller: caller,75 key: string,76 value: bytes,77 ) -> Result<void> {78 let caller = T::CrossAccountId::from_eth(caller);79 let key = <Vec<u8>>::from(key)80 .try_into()81 .map_err(|_| "key too large")?;82 let value = value.try_into().map_err(|_| "value too large")?;8384 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })85 .map_err(dispatch_to_evm::<T>)86 }8788 /// Delete collection property.89 ///90 /// @param key Property key.91 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {92 let caller = T::CrossAccountId::from_eth(caller);93 let key = <Vec<u8>>::from(key)94 .try_into()95 .map_err(|_| "key too large")?;9697 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)98 }99100 /// Get collection property.101 ///102 /// @dev Throws error if key not found.103 ///104 /// @param key Property key.105 /// @return bytes The property corresponding to the key.106 fn collection_property(&self, key: string) -> Result<bytes> {107 let key = <Vec<u8>>::from(key)108 .try_into()109 .map_err(|_| "key too large")?;110111 let props = <CollectionProperties<T>>::get(self.id);112 let prop = props.get(&key).ok_or("key not found")?;113114 Ok(prop.to_vec())115 }116117 /// Set the sponsor of the collection.118 ///119 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.120 ///121 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.122 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {123 check_is_owner_or_admin(caller, self)?;124125 let sponsor = T::CrossAccountId::from_eth(sponsor);126 self.set_sponsor(sponsor.as_sub().clone())127 .map_err(dispatch_to_evm::<T>)?;128 save(self)129 }130131 /// Collection sponsorship confirmation.132 ///133 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.134 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {135 let caller = T::CrossAccountId::from_eth(caller);136 if !self137 .confirm_sponsorship(caller.as_sub())138 .map_err(dispatch_to_evm::<T>)?139 {140 return Err("caller is not set as sponsor".into());141 }142 save(self)143 }144145 /// Set limits for the collection.146 /// @dev Throws error if limit not found.147 /// @param limit Name of the limit. Valid names:148 /// "accountTokenOwnershipLimit",149 /// "sponsoredDataSize",150 /// "sponsoredDataRateLimit",151 /// "tokenLimit",152 /// "sponsorTransferTimeout",153 /// "sponsorApproveTimeout"154 /// @param value Value of the limit.155 #[solidity(rename_selector = "setCollectionLimit")]156 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {157 check_is_owner_or_admin(caller, self)?;158 let mut limits = self.limits.clone();159160 match limit.as_str() {161 "accountTokenOwnershipLimit" => {162 limits.account_token_ownership_limit = Some(value);163 }164 "sponsoredDataSize" => {165 limits.sponsored_data_size = Some(value);166 }167 "sponsoredDataRateLimit" => {168 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));169 }170 "tokenLimit" => {171 limits.token_limit = Some(value);172 }173 "sponsorTransferTimeout" => {174 limits.sponsor_transfer_timeout = Some(value);175 }176 "sponsorApproveTimeout" => {177 limits.sponsor_approve_timeout = Some(value);178 }179 _ => {180 return Err(Error::Revert(format!(181 "unknown integer limit \"{}\"",182 limit183 )))184 }185 }186 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)187 .map_err(dispatch_to_evm::<T>)?;188 save(self)189 }190191 /// Set limits for the collection.192 /// @dev Throws error if limit not found.193 /// @param limit Name of the limit. Valid names:194 /// "ownerCanTransfer",195 /// "ownerCanDestroy",196 /// "transfersEnabled"197 /// @param value Value of the limit.198 #[solidity(rename_selector = "setCollectionLimit")]199 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {200 check_is_owner_or_admin(caller, self)?;201 let mut limits = self.limits.clone();202203 match limit.as_str() {204 "ownerCanTransfer" => {205 limits.owner_can_transfer = Some(value);206 }207 "ownerCanDestroy" => {208 limits.owner_can_destroy = Some(value);209 }210 "transfersEnabled" => {211 limits.transfers_enabled = Some(value);212 }213 _ => {214 return Err(Error::Revert(format!(215 "unknown boolean limit \"{}\"",216 limit217 )))218 }219 }220 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)221 .map_err(dispatch_to_evm::<T>)?;222 save(self)223 }224225 /// Get contract address.226 fn contract_address(&self, _caller: caller) -> Result<address> {227 Ok(crate::eth::collection_id_to_address(self.id))228 }229230 /// Add collection admin by substrate address.231 /// @param newAdmin Substrate administrator address.232 fn add_collection_admin_substrate(233 &mut self,234 caller: caller,235 new_admin: uint256,236 ) -> Result<void> {237 let caller = T::CrossAccountId::from_eth(caller);238 let new_admin = convert_substrate_address_to_cross_account_id::<T>(new_admin);239 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;240 Ok(())241 }242243 /// Remove collection admin by substrate address.244 /// @param admin Substrate administrator address.245 fn remove_collection_admin_substrate(246 &mut self,247 caller: caller,248 admin: uint256,249 ) -> Result<void> {250 let caller = T::CrossAccountId::from_eth(caller);251 let admin = convert_substrate_address_to_cross_account_id::<T>(admin);252 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;253 Ok(())254 }255256 /// Add collection admin.257 /// @param newAdmin Address of the added administrator.258 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {259 let caller = T::CrossAccountId::from_eth(caller);260 let new_admin = T::CrossAccountId::from_eth(new_admin);261 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;262 Ok(())263 }264265 /// Remove collection admin.266 ///267 /// @param admin Address of the removed administrator.268 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {269 let caller = T::CrossAccountId::from_eth(caller);270 let admin = T::CrossAccountId::from_eth(admin);271 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;272 Ok(())273 }274275 /// Toggle accessibility of collection nesting.276 ///277 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'278 #[solidity(rename_selector = "setCollectionNesting")]279 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {280 check_is_owner_or_admin(caller, self)?;281282 let mut permissions = self.collection.permissions.clone();283 let mut nesting = permissions.nesting().clone();284 nesting.token_owner = enable;285 nesting.restricted = None;286 permissions.nesting = Some(nesting);287288 self.collection.permissions = <Pallet<T>>::clamp_permissions(289 self.collection.mode.clone(),290 &self.collection.permissions,291 permissions,292 )293 .map_err(dispatch_to_evm::<T>)?;294295 save(self)296 }297298 /// Toggle accessibility of collection nesting.299 ///300 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'301 /// @param collections Addresses of collections that will be available for nesting.302 #[solidity(rename_selector = "setCollectionNesting")]303 fn set_nesting(304 &mut self,305 caller: caller,306 enable: bool,307 collections: Vec<address>,308 ) -> Result<void> {309 if collections.is_empty() {310 return Err("no addresses provided".into());311 }312 check_is_owner_or_admin(caller, self)?;313314 let mut permissions = self.collection.permissions.clone();315 match enable {316 false => {317 let mut nesting = permissions.nesting().clone();318 nesting.token_owner = false;319 nesting.restricted = None;320 permissions.nesting = Some(nesting);321 }322 true => {323 let mut bv = OwnerRestrictedSet::new();324 for i in collections {325 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(326 "Can't convert address into collection id".into(),327 ))?)328 .map_err(|_| "too many collections")?;329 }330 let mut nesting = permissions.nesting().clone();331 nesting.token_owner = true;332 nesting.restricted = Some(bv);333 permissions.nesting = Some(nesting);334 }335 };336337 self.collection.permissions = <Pallet<T>>::clamp_permissions(338 self.collection.mode.clone(),339 &self.collection.permissions,340 permissions,341 )342 .map_err(dispatch_to_evm::<T>)?;343344 save(self)345 }346347 /// Set the collection access method.348 /// @param mode Access mode349 /// 0 for Normal350 /// 1 for AllowList351 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {352 check_is_owner_or_admin(caller, self)?;353 let permissions = CollectionPermissions {354 access: Some(match mode {355 0 => AccessMode::Normal,356 1 => AccessMode::AllowList,357 _ => return Err("not supported access mode".into()),358 }),359 ..Default::default()360 };361 self.collection.permissions = <Pallet<T>>::clamp_permissions(362 self.collection.mode.clone(),363 &self.collection.permissions,364 permissions,365 )366 .map_err(dispatch_to_evm::<T>)?;367368 save(self)369 }370371 /// Add the user to the allowed list.372 ///373 /// @param user Address of a trusted user.374 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {375 let caller = T::CrossAccountId::from_eth(caller);376 let user = T::CrossAccountId::from_eth(user);377 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;378 Ok(())379 }380381 /// Remove the user from the allowed list.382 ///383 /// @param user Address of a removed user.384 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {385 let caller = T::CrossAccountId::from_eth(caller);386 let user = T::CrossAccountId::from_eth(user);387 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;388 Ok(())389 }390391 /// Switch permission for minting.392 ///393 /// @param mode Enable if "true".394 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {395 check_is_owner_or_admin(caller, self)?;396 let permissions = CollectionPermissions {397 mint_mode: Some(mode),398 ..Default::default()399 };400 self.collection.permissions = <Pallet<T>>::clamp_permissions(401 self.collection.mode.clone(),402 &self.collection.permissions,403 permissions,404 )405 .map_err(dispatch_to_evm::<T>)?;406407 save(self)408 }409410 /// Check that account is the owner or admin of the collection411 ///412 /// @param user account to verify413 /// @return "true" if account is the owner or admin414 #[solidity(rename_selector = "isOwnerOrAdmin")]415 fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {416 let user = T::CrossAccountId::from_eth(user);417 Ok(self.is_owner_or_admin(&user))418 }419420 /// Check that substrate account is the owner or admin of the collection421 ///422 /// @param user account to verify423 /// @return "true" if account is the owner or admin424 fn is_owner_or_admin_substrate(&self, user: uint256) -> Result<bool> {425 let user = convert_substrate_address_to_cross_account_id::<T>(user);426 Ok(self.is_owner_or_admin(&user))427 }428429 /// Returns collection type430 ///431 /// @return `Fungible` or `NFT` or `ReFungible`432 fn unique_collection_type(&mut self) -> Result<string> {433 let mode = match self.collection.mode {434 CollectionMode::Fungible(_) => "Fungible",435 CollectionMode::NFT => "NFT",436 CollectionMode::ReFungible => "ReFungible",437 };438 Ok(mode.into())439 }440441 /// Changes collection owner to another account442 ///443 /// @dev Owner can be changed only by current owner444 /// @param newOwner new owner account445 fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {446 let caller = T::CrossAccountId::from_eth(caller);447 let new_owner = T::CrossAccountId::from_eth(new_owner);448 self.set_owner_internal(caller, new_owner)449 .map_err(dispatch_to_evm::<T>)450 }451452 /// Changes collection owner to another substrate account453 ///454 /// @dev Owner can be changed only by current owner455 /// @param newOwner new owner substrate account456 fn set_owner_substrate(&mut self, caller: caller, new_owner: uint256) -> Result<void> {457 let caller = T::CrossAccountId::from_eth(caller);458 let new_owner = convert_substrate_address_to_cross_account_id::<T>(new_owner);459 self.set_owner_internal(caller, new_owner)460 .map_err(dispatch_to_evm::<T>)461 }462}463464fn check_is_owner_or_admin<T: Config>(465 caller: caller,466 collection: &CollectionHandle<T>,467) -> Result<T::CrossAccountId> {468 let caller = T::CrossAccountId::from_eth(caller);469 collection470 .check_is_owner_or_admin(&caller)471 .map_err(dispatch_to_evm::<T>)?;472 Ok(caller)473}474475fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {476 // TODO possibly delete for the lack of transaction477 collection.consume_store_writes(1)?;478 collection479 .check_is_internal()480 .map_err(dispatch_to_evm::<T>)?;481 collection.save().map_err(dispatch_to_evm::<T>)?;482 Ok(())483}484485/// Contains static property keys and values.486pub mod static_property {487 use evm_coder::{488 execution::{Result, Error},489 };490 use alloc::format;491492 const EXPECT_CONVERT_ERROR: &str = "length < limit";493494 /// Keys.495 pub mod key {496 use super::*;497498 /// Key "schemaName".499 pub fn schema_name() -> up_data_structs::PropertyKey {500 property_key_from_bytes(b"schemaName").expect(EXPECT_CONVERT_ERROR)501 }502503 /// Key "baseURI".504 pub fn base_uri() -> up_data_structs::PropertyKey {505 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)506 }507508 /// Key "url".509 pub fn url() -> up_data_structs::PropertyKey {510 property_key_from_bytes(b"url").expect(EXPECT_CONVERT_ERROR)511 }512513 /// Key "suffix".514 pub fn suffix() -> up_data_structs::PropertyKey {515 property_key_from_bytes(b"suffix").expect(EXPECT_CONVERT_ERROR)516 }517518 /// Key "parentNft".519 pub fn parent_nft() -> up_data_structs::PropertyKey {520 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)521 }522 }523524 /// Values.525 pub mod value {526 use super::*;527528 /// Value "ERC721Metadata".529 pub const ERC721_METADATA: &[u8] = b"ERC721Metadata";530531 /// Value for [`ERC721_METADATA`].532 pub fn erc721() -> up_data_structs::PropertyValue {533 property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)534 }535 }536537 /// Convert `byte` to [`PropertyKey`].538 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {539 bytes.to_vec().try_into().map_err(|_| {540 Error::Revert(format!(541 "Property key is too long. Max length is {}.",542 up_data_structs::PropertyKey::bound()543 ))544 })545 }546547 /// Convert `bytes` to [`PropertyValue`].548 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {549 bytes.to_vec().try_into().map_err(|_| {550 Error::Revert(format!(551 "Property key is too long. Max length is {}.",552 up_data_structs::PropertyKey::bound()553 ))554 })555 }556}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.1819use evm_coder::{20 solidity_interface, solidity, ToLog,21 types::*,22 execution::{Result, Error},23};24pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};25use pallet_evm_coder_substrate::dispatch_to_evm;26use sp_std::vec::Vec;27use up_data_structs::{28 AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,29 SponsoringRateLimit, SponsorshipState,30};31use alloc::format;3233use crate::{34 Pallet, CollectionHandle, Config, CollectionProperties,35 eth::{convert_cross_account_to_uint256, convert_uint256_to_cross_account},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}5253/// Does not always represent a full collection, for RFT it is either54/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).55pub trait CommonEvmHandler {56 const CODE: &'static [u8];5758 /// Call precompiled handle.59 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;60}6162/// @title A contract that allows you to work with collections.63#[solidity_interface(name = Collection)]64impl<T: Config> CollectionHandle<T>65where66 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,67{68 /// Set collection property.69 ///70 /// @param key Property key.71 /// @param value Propery value.72 fn set_collection_property(73 &mut self,74 caller: caller,75 key: string,76 value: bytes,77 ) -> Result<void> {78 let caller = T::CrossAccountId::from_eth(caller);79 let key = <Vec<u8>>::from(key)80 .try_into()81 .map_err(|_| "key too large")?;82 let value = value.try_into().map_err(|_| "value too large")?;8384 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })85 .map_err(dispatch_to_evm::<T>)86 }8788 /// Delete collection property.89 ///90 /// @param key Property key.91 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {92 let caller = T::CrossAccountId::from_eth(caller);93 let key = <Vec<u8>>::from(key)94 .try_into()95 .map_err(|_| "key too large")?;9697 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)98 }99100 /// Get collection property.101 ///102 /// @dev Throws error if key not found.103 ///104 /// @param key Property key.105 /// @return bytes The property corresponding to the key.106 fn collection_property(&self, key: string) -> Result<bytes> {107 let key = <Vec<u8>>::from(key)108 .try_into()109 .map_err(|_| "key too large")?;110111 let props = <CollectionProperties<T>>::get(self.id);112 let prop = props.get(&key).ok_or("key not found")?;113114 Ok(prop.to_vec())115 }116117 /// Set the sponsor of the collection.118 ///119 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.120 ///121 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.122 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {123 check_is_owner_or_admin(caller, self)?;124125 let sponsor = T::CrossAccountId::from_eth(sponsor);126 self.set_sponsor(sponsor.as_sub().clone())127 .map_err(dispatch_to_evm::<T>)?;128 save(self)129 }130131 /// Set the substrate sponsor of the collection.132 ///133 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.134 ///135 /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.136 fn set_collection_sponsor_substrate(137 &mut self,138 caller: caller,139 sponsor: uint256,140 ) -> Result<void> {141 check_is_owner_or_admin(caller, self)?;142143 let sponsor = convert_uint256_to_cross_account::<T>(sponsor);144 self.set_sponsor(sponsor.as_sub().clone())145 .map_err(dispatch_to_evm::<T>)?;146 save(self)147 }148149 // /// Whether there is a pending sponsor.150 fn has_collection_pending_sponsor(&self) -> Result<bool> {151 Ok(matches!(152 self.collection.sponsorship,153 SponsorshipState::Unconfirmed(_)154 ))155 }156157 /// Collection sponsorship confirmation.158 ///159 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.160 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {161 let caller = T::CrossAccountId::from_eth(caller);162 if !self163 .confirm_sponsorship(caller.as_sub())164 .map_err(dispatch_to_evm::<T>)?165 {166 return Err("caller is not set as sponsor".into());167 }168 save(self)169 }170171 /// Remove collection sponsor.172 fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {173 check_is_owner_or_admin(caller, self)?;174 self.remove_sponsor().map_err(dispatch_to_evm::<T>)?;175 save(self)176 }177178 /// Get current sponsor.179 ///180 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.181 fn get_collection_sponsor(&self) -> Result<(address, uint256)> {182 let sponsor = match self.collection.sponsorship.sponsor() {183 Some(sponsor) => sponsor,184 None => return Ok(Default::default()),185 };186 let sponsor = T::CrossAccountId::from_sub(sponsor.clone());187 let result: (address, uint256) = if sponsor.is_canonical_substrate() {188 let sponsor = convert_cross_account_to_uint256::<T>(&sponsor);189 (Default::default(), sponsor)190 } else {191 let sponsor = *sponsor.as_eth();192 (sponsor, Default::default())193 };194 Ok(result)195 }196197 /// Set limits for the collection.198 /// @dev Throws error if limit not found.199 /// @param limit Name of the limit. Valid names:200 /// "accountTokenOwnershipLimit",201 /// "sponsoredDataSize",202 /// "sponsoredDataRateLimit",203 /// "tokenLimit",204 /// "sponsorTransferTimeout",205 /// "sponsorApproveTimeout"206 /// @param value Value of the limit.207 #[solidity(rename_selector = "setCollectionLimit")]208 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {209 check_is_owner_or_admin(caller, self)?;210 let mut limits = self.limits.clone();211212 match limit.as_str() {213 "accountTokenOwnershipLimit" => {214 limits.account_token_ownership_limit = Some(value);215 }216 "sponsoredDataSize" => {217 limits.sponsored_data_size = Some(value);218 }219 "sponsoredDataRateLimit" => {220 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));221 }222 "tokenLimit" => {223 limits.token_limit = Some(value);224 }225 "sponsorTransferTimeout" => {226 limits.sponsor_transfer_timeout = Some(value);227 }228 "sponsorApproveTimeout" => {229 limits.sponsor_approve_timeout = Some(value);230 }231 _ => {232 return Err(Error::Revert(format!(233 "unknown integer limit \"{}\"",234 limit235 )))236 }237 }238 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)239 .map_err(dispatch_to_evm::<T>)?;240 save(self)241 }242243 /// Set limits for the collection.244 /// @dev Throws error if limit not found.245 /// @param limit Name of the limit. Valid names:246 /// "ownerCanTransfer",247 /// "ownerCanDestroy",248 /// "transfersEnabled"249 /// @param value Value of the limit.250 #[solidity(rename_selector = "setCollectionLimit")]251 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {252 check_is_owner_or_admin(caller, self)?;253 let mut limits = self.limits.clone();254255 match limit.as_str() {256 "ownerCanTransfer" => {257 limits.owner_can_transfer = Some(value);258 }259 "ownerCanDestroy" => {260 limits.owner_can_destroy = Some(value);261 }262 "transfersEnabled" => {263 limits.transfers_enabled = Some(value);264 }265 _ => {266 return Err(Error::Revert(format!(267 "unknown boolean limit \"{}\"",268 limit269 )))270 }271 }272 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)273 .map_err(dispatch_to_evm::<T>)?;274 save(self)275 }276277 /// Get contract address.278 fn contract_address(&self, _caller: caller) -> Result<address> {279 Ok(crate::eth::collection_id_to_address(self.id))280 }281282 /// Add collection admin by substrate address.283 /// @param newAdmin Substrate administrator address.284 fn add_collection_admin_substrate(285 &mut self,286 caller: caller,287 new_admin: uint256,288 ) -> Result<void> {289 let caller = T::CrossAccountId::from_eth(caller);290 let new_admin = convert_uint256_to_cross_account::<T>(new_admin);291 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;292 Ok(())293 }294295 /// Remove collection admin by substrate address.296 /// @param admin Substrate administrator address.297 fn remove_collection_admin_substrate(298 &mut self,299 caller: caller,300 admin: uint256,301 ) -> Result<void> {302 let caller = T::CrossAccountId::from_eth(caller);303 let admin = convert_uint256_to_cross_account::<T>(admin);304 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;305 Ok(())306 }307308 /// Add collection admin.309 /// @param newAdmin Address of the added administrator.310 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {311 let caller = T::CrossAccountId::from_eth(caller);312 let new_admin = T::CrossAccountId::from_eth(new_admin);313 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;314 Ok(())315 }316317 /// Remove collection admin.318 ///319 /// @param admin Address of the removed administrator.320 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {321 let caller = T::CrossAccountId::from_eth(caller);322 let admin = T::CrossAccountId::from_eth(admin);323 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;324 Ok(())325 }326327 /// Toggle accessibility of collection nesting.328 ///329 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'330 #[solidity(rename_selector = "setCollectionNesting")]331 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {332 check_is_owner_or_admin(caller, self)?;333334 let mut permissions = self.collection.permissions.clone();335 let mut nesting = permissions.nesting().clone();336 nesting.token_owner = enable;337 nesting.restricted = None;338 permissions.nesting = Some(nesting);339340 self.collection.permissions = <Pallet<T>>::clamp_permissions(341 self.collection.mode.clone(),342 &self.collection.permissions,343 permissions,344 )345 .map_err(dispatch_to_evm::<T>)?;346347 save(self)348 }349350 /// Toggle accessibility of collection nesting.351 ///352 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'353 /// @param collections Addresses of collections that will be available for nesting.354 #[solidity(rename_selector = "setCollectionNesting")]355 fn set_nesting(356 &mut self,357 caller: caller,358 enable: bool,359 collections: Vec<address>,360 ) -> Result<void> {361 if collections.is_empty() {362 return Err("no addresses provided".into());363 }364 check_is_owner_or_admin(caller, self)?;365366 let mut permissions = self.collection.permissions.clone();367 match enable {368 false => {369 let mut nesting = permissions.nesting().clone();370 nesting.token_owner = false;371 nesting.restricted = None;372 permissions.nesting = Some(nesting);373 }374 true => {375 let mut bv = OwnerRestrictedSet::new();376 for i in collections {377 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(378 "Can't convert address into collection id".into(),379 ))?)380 .map_err(|_| "too many collections")?;381 }382 let mut nesting = permissions.nesting().clone();383 nesting.token_owner = true;384 nesting.restricted = Some(bv);385 permissions.nesting = Some(nesting);386 }387 };388389 self.collection.permissions = <Pallet<T>>::clamp_permissions(390 self.collection.mode.clone(),391 &self.collection.permissions,392 permissions,393 )394 .map_err(dispatch_to_evm::<T>)?;395396 save(self)397 }398399 /// Set the collection access method.400 /// @param mode Access mode401 /// 0 for Normal402 /// 1 for AllowList403 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {404 check_is_owner_or_admin(caller, self)?;405 let permissions = CollectionPermissions {406 access: Some(match mode {407 0 => AccessMode::Normal,408 1 => AccessMode::AllowList,409 _ => return Err("not supported access mode".into()),410 }),411 ..Default::default()412 };413 self.collection.permissions = <Pallet<T>>::clamp_permissions(414 self.collection.mode.clone(),415 &self.collection.permissions,416 permissions,417 )418 .map_err(dispatch_to_evm::<T>)?;419420 save(self)421 }422423 /// Add the user to the allowed list.424 ///425 /// @param user Address of a trusted user.426 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {427 let caller = T::CrossAccountId::from_eth(caller);428 let user = T::CrossAccountId::from_eth(user);429 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;430 Ok(())431 }432433 /// Remove the user from the allowed list.434 ///435 /// @param user Address of a removed user.436 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {437 let caller = T::CrossAccountId::from_eth(caller);438 let user = T::CrossAccountId::from_eth(user);439 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;440 Ok(())441 }442443 /// Switch permission for minting.444 ///445 /// @param mode Enable if "true".446 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {447 check_is_owner_or_admin(caller, self)?;448 let permissions = CollectionPermissions {449 mint_mode: Some(mode),450 ..Default::default()451 };452 self.collection.permissions = <Pallet<T>>::clamp_permissions(453 self.collection.mode.clone(),454 &self.collection.permissions,455 permissions,456 )457 .map_err(dispatch_to_evm::<T>)?;458459 save(self)460 }461462 /// Check that account is the owner or admin of the collection463 ///464 /// @param user account to verify465 /// @return "true" if account is the owner or admin466 #[solidity(rename_selector = "isOwnerOrAdmin")]467 fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {468 let user = T::CrossAccountId::from_eth(user);469 Ok(self.is_owner_or_admin(&user))470 }471472 /// Check that substrate account is the owner or admin of the collection473 ///474 /// @param user account to verify475 /// @return "true" if account is the owner or admin476 fn is_owner_or_admin_substrate(&self, user: uint256) -> Result<bool> {477 let user = convert_uint256_to_cross_account::<T>(user);478 Ok(self.is_owner_or_admin(&user))479 }480481 /// Returns collection type482 ///483 /// @return `Fungible` or `NFT` or `ReFungible`484 fn unique_collection_type(&mut self) -> Result<string> {485 let mode = match self.collection.mode {486 CollectionMode::Fungible(_) => "Fungible",487 CollectionMode::NFT => "NFT",488 CollectionMode::ReFungible => "ReFungible",489 };490 Ok(mode.into())491 }492493 /// Changes collection owner to another account494 ///495 /// @dev Owner can be changed only by current owner496 /// @param newOwner new owner account497 fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {498 let caller = T::CrossAccountId::from_eth(caller);499 let new_owner = T::CrossAccountId::from_eth(new_owner);500 self.set_owner_internal(caller, new_owner)501 .map_err(dispatch_to_evm::<T>)502 }503504 /// Changes collection owner to another substrate account505 ///506 /// @dev Owner can be changed only by current owner507 /// @param newOwner new owner substrate account508 fn set_owner_substrate(&mut self, caller: caller, new_owner: uint256) -> Result<void> {509 let caller = T::CrossAccountId::from_eth(caller);510 let new_owner = convert_uint256_to_cross_account::<T>(new_owner);511 self.set_owner_internal(caller, new_owner)512 .map_err(dispatch_to_evm::<T>)513 }514}515516fn check_is_owner_or_admin<T: Config>(517 caller: caller,518 collection: &CollectionHandle<T>,519) -> Result<T::CrossAccountId> {520 let caller = T::CrossAccountId::from_eth(caller);521 collection522 .check_is_owner_or_admin(&caller)523 .map_err(dispatch_to_evm::<T>)?;524 Ok(caller)525}526527fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {528 // TODO possibly delete for the lack of transaction529 collection.consume_store_writes(1)?;530 collection531 .check_is_internal()532 .map_err(dispatch_to_evm::<T>)?;533 collection.save().map_err(dispatch_to_evm::<T>)?;534 Ok(())535}536537/// Contains static property keys and values.538pub mod static_property {539 use evm_coder::{540 execution::{Result, Error},541 };542 use alloc::format;543544 const EXPECT_CONVERT_ERROR: &str = "length < limit";545546 /// Keys.547 pub mod key {548 use super::*;549550 /// Key "schemaName".551 pub fn schema_name() -> up_data_structs::PropertyKey {552 property_key_from_bytes(b"schemaName").expect(EXPECT_CONVERT_ERROR)553 }554555 /// Key "baseURI".556 pub fn base_uri() -> up_data_structs::PropertyKey {557 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)558 }559560 /// Key "url".561 pub fn url() -> up_data_structs::PropertyKey {562 property_key_from_bytes(b"url").expect(EXPECT_CONVERT_ERROR)563 }564565 /// Key "suffix".566 pub fn suffix() -> up_data_structs::PropertyKey {567 property_key_from_bytes(b"suffix").expect(EXPECT_CONVERT_ERROR)568 }569570 /// Key "parentNft".571 pub fn parent_nft() -> up_data_structs::PropertyKey {572 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)573 }574 }575576 /// Values.577 pub mod value {578 use super::*;579580 /// Value "ERC721Metadata".581 pub const ERC721_METADATA: &[u8] = b"ERC721Metadata";582583 /// Value for [`ERC721_METADATA`].584 pub fn erc721() -> up_data_structs::PropertyValue {585 property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)586 }587 }588589 /// Convert `byte` to [`PropertyKey`].590 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {591 bytes.to_vec().try_into().map_err(|_| {592 Error::Revert(format!(593 "Property key is too long. Max length is {}.",594 up_data_structs::PropertyKey::bound()595 ))596 })597 }598599 /// Convert `bytes` to [`PropertyValue`].600 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {601 bytes.to_vec().try_into().map_err(|_| {602 Error::Revert(format!(603 "Property key is too long. Max length is {}.",604 up_data_structs::PropertyKey::bound()605 ))606 })607 }608}pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -59,15 +59,13 @@
uint256::from_big_endian(slice)
}
-/// Converts Substrate address to CrossAccountId
-pub fn convert_substrate_address_to_cross_account_id<T: Config>(
- address: uint256,
-) -> T::CrossAccountId
+/// Convert `uint256` to `CrossAccountId`.
+pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId
where
T::AccountId: From<[u8; 32]>,
{
- let mut address_arr: [u8; 32] = Default::default();
- address.to_big_endian(&mut address_arr);
- let account_id = T::AccountId::from(address_arr);
+ let mut new_admin_arr = [0_u8; 32];
+ from.to_big_endian(&mut new_admin_arr);
+ let account_id = T::AccountId::from(new_admin_arr);
T::CrossAccountId::from_sub(account_id)
}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -231,6 +231,12 @@
Ok(true)
}
+ /// Remove collection sponsor.
+ pub fn remove_sponsor(&mut self) -> DispatchResult {
+ self.collection.sponsorship = SponsorshipState::Disabled;
+ Ok(())
+ }
+
/// Checks that the collection was created with, and must be operated upon through **Unique API**.
/// Now check only the `external_collection` flag and if it's **true**, then return [`Error::CollectionIsExternal`] error.
pub fn check_is_internal(&self) -> DispatchResult {
@@ -732,12 +738,7 @@
/// Get the effective limits for the collection.
pub fn effective_collection_limits(collection: CollectionId) -> Option<CollectionLimits> {
- let collection = <CollectionById<T>>::get(collection);
- if collection.is_none() {
- return None;
- }
-
- let collection = collection.unwrap();
+ let collection = <CollectionById<T>>::get(collection)?;
let limits = collection.limits;
let effective_limits = CollectionLimits {
account_token_ownership_limit: Some(limits.account_token_ownership_limit()),
pallets/fungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/fungible/CHANGELOG.md
+++ b/pallets/fungible/CHANGELOG.md
@@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
+## [v0.1.4] - 2022-08-24
+
+### Change
+ - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
+
<!-- bureaucrate goes here -->
## [v0.1.3] 2022-08-16
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-fungible"
-version = "0.1.3"
+version = "0.1.4"
license = "GPLv3"
edition = "2021"
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -154,14 +154,14 @@
Collection(common_mut, CollectionHandle<T>),
)
)]
-impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> {}
+impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}
generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);
generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);
impl<T: Config> CommonEvmHandler for FungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -22,7 +22,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xffe4da23
+/// @dev the ERC-165 identifier for this interface is 0xe54be640
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -82,6 +82,27 @@
dummy = 0;
}
+ /// Set the substrate sponsor of the collection.
+ ///
+ /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+ ///
+ /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+ /// @dev EVM selector for this function is: 0xc74d6751,
+ /// or in textual repr: setCollectionSponsorSubstrate(uint256)
+ function setCollectionSponsorSubstrate(uint256 sponsor) public {
+ require(false, stub_error);
+ sponsor;
+ dummy = 0;
+ }
+
+ /// @dev EVM selector for this function is: 0x058ac185,
+ /// or in textual repr: hasCollectionPendingSponsor()
+ function hasCollectionPendingSponsor() public view returns (bool) {
+ require(false, stub_error);
+ dummy;
+ return false;
+ }
+
/// Collection sponsorship confirmation.
///
/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
@@ -92,6 +113,25 @@
dummy = 0;
}
+ /// Remove collection sponsor.
+ /// @dev EVM selector for this function is: 0x6e0326a3,
+ /// or in textual repr: removeCollectionSponsor()
+ function removeCollectionSponsor() public {
+ require(false, stub_error);
+ dummy = 0;
+ }
+
+ /// Get current sponsor.
+ ///
+ /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+ /// @dev EVM selector for this function is: 0xb66bbc14,
+ /// or in textual repr: getCollectionSponsor()
+ function getCollectionSponsor() public view returns (Tuple6 memory) {
+ require(false, stub_error);
+ dummy;
+ return Tuple6(0x0000000000000000000000000000000000000000, 0);
+ }
+
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Name of the limit. Valid names:
@@ -310,6 +350,12 @@
}
}
+/// @dev anonymous struct
+struct Tuple6 {
+ address field_0;
+ uint256 field_1;
+}
+
/// @dev the ERC-165 identifier for this interface is 0x79cc6790
contract ERC20UniqueExtensions is Dummy, ERC165 {
/// @dev EVM selector for this function is: 0x79cc6790,
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
+## [v0.1.5] - 2022-08-24
+
+### Change
+ - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
+
<!-- bureaucrate goes here -->
## [v0.1.4] 2022-08-16
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-nonfungible"
-version = "0.1.4"
+version = "0.1.5"
license = "GPLv3"
edition = "2021"
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -740,7 +740,7 @@
TokenProperties,
)
)]
-impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> {}
+impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}
// Not a tests, but code generators
generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);
@@ -748,7 +748,7 @@
impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -99,7 +99,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xffe4da23
+/// @dev the ERC-165 identifier for this interface is 0xe54be640
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -159,6 +159,27 @@
dummy = 0;
}
+ /// Set the substrate sponsor of the collection.
+ ///
+ /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+ ///
+ /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+ /// @dev EVM selector for this function is: 0xc74d6751,
+ /// or in textual repr: setCollectionSponsorSubstrate(uint256)
+ function setCollectionSponsorSubstrate(uint256 sponsor) public {
+ require(false, stub_error);
+ sponsor;
+ dummy = 0;
+ }
+
+ /// @dev EVM selector for this function is: 0x058ac185,
+ /// or in textual repr: hasCollectionPendingSponsor()
+ function hasCollectionPendingSponsor() public view returns (bool) {
+ require(false, stub_error);
+ dummy;
+ return false;
+ }
+
/// Collection sponsorship confirmation.
///
/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
@@ -169,6 +190,25 @@
dummy = 0;
}
+ /// Remove collection sponsor.
+ /// @dev EVM selector for this function is: 0x6e0326a3,
+ /// or in textual repr: removeCollectionSponsor()
+ function removeCollectionSponsor() public {
+ require(false, stub_error);
+ dummy = 0;
+ }
+
+ /// Get current sponsor.
+ ///
+ /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+ /// @dev EVM selector for this function is: 0xb66bbc14,
+ /// or in textual repr: getCollectionSponsor()
+ function getCollectionSponsor() public view returns (Tuple17 memory) {
+ require(false, stub_error);
+ dummy;
+ return Tuple17(0x0000000000000000000000000000000000000000, 0);
+ }
+
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Name of the limit. Valid names:
@@ -387,6 +427,12 @@
}
}
+/// @dev anonymous struct
+struct Tuple17 {
+ address field_0;
+ uint256 field_1;
+}
+
/// @title ERC721 Token that can be irreversibly burned (destroyed).
/// @dev the ERC-165 identifier for this interface is 0x42966c68
contract ERC721Burnable is Dummy, ERC165 {
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
+## [v0.2.4] - 2022-08-24
+
+### Change
+ - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
+
<!-- bureaucrate goes here -->
## [v0.2.3] 2022-08-16
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-refungible"
-version = "0.2.3"
+version = "0.2.4"
license = "GPLv3"
edition = "2021"
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -789,7 +789,7 @@
TokenProperties,
)
)]
-impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> {}
+impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}
// Not a tests, but code generators
generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);
@@ -797,7 +797,7 @@
impl<T: Config> CommonEvmHandler for RefungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");
fn call(
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -99,7 +99,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xffe4da23
+/// @dev the ERC-165 identifier for this interface is 0xe54be640
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -159,6 +159,27 @@
dummy = 0;
}
+ /// Set the substrate sponsor of the collection.
+ ///
+ /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+ ///
+ /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+ /// @dev EVM selector for this function is: 0xc74d6751,
+ /// or in textual repr: setCollectionSponsorSubstrate(uint256)
+ function setCollectionSponsorSubstrate(uint256 sponsor) public {
+ require(false, stub_error);
+ sponsor;
+ dummy = 0;
+ }
+
+ /// @dev EVM selector for this function is: 0x058ac185,
+ /// or in textual repr: hasCollectionPendingSponsor()
+ function hasCollectionPendingSponsor() public view returns (bool) {
+ require(false, stub_error);
+ dummy;
+ return false;
+ }
+
/// Collection sponsorship confirmation.
///
/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
@@ -169,6 +190,25 @@
dummy = 0;
}
+ /// Remove collection sponsor.
+ /// @dev EVM selector for this function is: 0x6e0326a3,
+ /// or in textual repr: removeCollectionSponsor()
+ function removeCollectionSponsor() public {
+ require(false, stub_error);
+ dummy = 0;
+ }
+
+ /// Get current sponsor.
+ ///
+ /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+ /// @dev EVM selector for this function is: 0xb66bbc14,
+ /// or in textual repr: getCollectionSponsor()
+ function getCollectionSponsor() public view returns (Tuple17 memory) {
+ require(false, stub_error);
+ dummy;
+ return Tuple17(0x0000000000000000000000000000000000000000, 0);
+ }
+
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Name of the limit. Valid names:
@@ -387,6 +427,12 @@
}
}
+/// @dev anonymous struct
+struct Tuple17 {
+ address field_0;
+ uint256 field_1;
+}
+
/// @title ERC721 Token that can be irreversibly burned (destroyed).
/// @dev the ERC-165 identifier for this interface is 0x42966c68
contract ERC721Burnable is Dummy, ERC165 {
runtime/common/dispatch.rsdiffbeforeafterboth--- a/runtime/common/dispatch.rs
+++ b/runtime/common/dispatch.rs
@@ -124,7 +124,7 @@
+ pallet_fungible::Config
+ pallet_nonfungible::Config
+ pallet_refungible::Config,
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
fn is_reserved(target: &H160) -> bool {
map_eth_to_id(target).is_some()
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -13,7 +13,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xffe4da23
+/// @dev the ERC-165 identifier for this interface is 0xe54be640
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -53,6 +53,19 @@
/// or in textual repr: setCollectionSponsor(address)
function setCollectionSponsor(address sponsor) external;
+ /// Set the substrate sponsor of the collection.
+ ///
+ /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+ ///
+ /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+ /// @dev EVM selector for this function is: 0xc74d6751,
+ /// or in textual repr: setCollectionSponsorSubstrate(uint256)
+ function setCollectionSponsorSubstrate(uint256 sponsor) external;
+
+ /// @dev EVM selector for this function is: 0x058ac185,
+ /// or in textual repr: hasCollectionPendingSponsor()
+ function hasCollectionPendingSponsor() external view returns (bool);
+
/// Collection sponsorship confirmation.
///
/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
@@ -60,6 +73,18 @@
/// or in textual repr: confirmCollectionSponsorship()
function confirmCollectionSponsorship() external;
+ /// Remove collection sponsor.
+ /// @dev EVM selector for this function is: 0x6e0326a3,
+ /// or in textual repr: removeCollectionSponsor()
+ function removeCollectionSponsor() external;
+
+ /// Get current sponsor.
+ ///
+ /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+ /// @dev EVM selector for this function is: 0xb66bbc14,
+ /// or in textual repr: getCollectionSponsor()
+ function getCollectionSponsor() external view returns (Tuple6 memory);
+
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Name of the limit. Valid names:
@@ -200,6 +225,12 @@
function setOwnerSubstrate(uint256 newOwner) external;
}
+/// @dev anonymous struct
+struct Tuple6 {
+ address field_0;
+ uint256 field_1;
+}
+
/// @dev the ERC-165 identifier for this interface is 0x79cc6790
interface ERC20UniqueExtensions is Dummy, ERC165 {
/// @dev EVM selector for this function is: 0x79cc6790,
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -65,7 +65,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xffe4da23
+/// @dev the ERC-165 identifier for this interface is 0xe54be640
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -105,6 +105,19 @@
/// or in textual repr: setCollectionSponsor(address)
function setCollectionSponsor(address sponsor) external;
+ /// Set the substrate sponsor of the collection.
+ ///
+ /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+ ///
+ /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+ /// @dev EVM selector for this function is: 0xc74d6751,
+ /// or in textual repr: setCollectionSponsorSubstrate(uint256)
+ function setCollectionSponsorSubstrate(uint256 sponsor) external;
+
+ /// @dev EVM selector for this function is: 0x058ac185,
+ /// or in textual repr: hasCollectionPendingSponsor()
+ function hasCollectionPendingSponsor() external view returns (bool);
+
/// Collection sponsorship confirmation.
///
/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
@@ -112,6 +125,18 @@
/// or in textual repr: confirmCollectionSponsorship()
function confirmCollectionSponsorship() external;
+ /// Remove collection sponsor.
+ /// @dev EVM selector for this function is: 0x6e0326a3,
+ /// or in textual repr: removeCollectionSponsor()
+ function removeCollectionSponsor() external;
+
+ /// Get current sponsor.
+ ///
+ /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+ /// @dev EVM selector for this function is: 0xb66bbc14,
+ /// or in textual repr: getCollectionSponsor()
+ function getCollectionSponsor() external view returns (Tuple17 memory);
+
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Name of the limit. Valid names:
@@ -252,6 +277,12 @@
function setOwnerSubstrate(uint256 newOwner) external;
}
+/// @dev anonymous struct
+struct Tuple17 {
+ address field_0;
+ uint256 field_1;
+}
+
/// @title ERC721 Token that can be irreversibly burned (destroyed).
/// @dev the ERC-165 identifier for this interface is 0x42966c68
interface ERC721Burnable is Dummy, ERC165 {
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -65,7 +65,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xffe4da23
+/// @dev the ERC-165 identifier for this interface is 0xe54be640
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -105,6 +105,19 @@
/// or in textual repr: setCollectionSponsor(address)
function setCollectionSponsor(address sponsor) external;
+ /// Set the substrate sponsor of the collection.
+ ///
+ /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+ ///
+ /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+ /// @dev EVM selector for this function is: 0xc74d6751,
+ /// or in textual repr: setCollectionSponsorSubstrate(uint256)
+ function setCollectionSponsorSubstrate(uint256 sponsor) external;
+
+ /// @dev EVM selector for this function is: 0x058ac185,
+ /// or in textual repr: hasCollectionPendingSponsor()
+ function hasCollectionPendingSponsor() external view returns (bool);
+
/// Collection sponsorship confirmation.
///
/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
@@ -112,6 +125,18 @@
/// or in textual repr: confirmCollectionSponsorship()
function confirmCollectionSponsorship() external;
+ /// Remove collection sponsor.
+ /// @dev EVM selector for this function is: 0x6e0326a3,
+ /// or in textual repr: removeCollectionSponsor()
+ function removeCollectionSponsor() external;
+
+ /// Get current sponsor.
+ ///
+ /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+ /// @dev EVM selector for this function is: 0xb66bbc14,
+ /// or in textual repr: getCollectionSponsor()
+ function getCollectionSponsor() external view returns (Tuple17 memory);
+
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Name of the limit. Valid names:
@@ -252,6 +277,12 @@
function setOwnerSubstrate(uint256 newOwner) external;
}
+/// @dev anonymous struct
+struct Tuple17 {
+ address field_0;
+ uint256 field_1;
+}
+
/// @title ERC721 Token that can be irreversibly burned (destroyed).
/// @dev the ERC-165 identifier for this interface is 0x42966c68
interface ERC721Burnable is Dummy, ERC165 {
tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -1,8 +1,10 @@
-import {addToAllowListExpectSuccess, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, enablePublicMintingExpectSuccess, getDetailedCollectionInfo, setCollectionSponsorExpectSuccess} from '../util/helpers';
-import {itWeb3, createEthAccount, collectionIdToAddress, GAS_ARGS, normalizeEvents, createEthAccountWithBalance, evmCollectionHelpers, getCollectionAddressFromResult, evmCollection, ethBalanceViaSub} from './util/helpers';
+import {addToAllowListExpectSuccess, bigIntToSub, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, enablePublicMintingExpectSuccess, getDetailedCollectionInfo, setCollectionSponsorExpectSuccess} from '../util/helpers';
+import {itWeb3, createEthAccount, collectionIdToAddress, GAS_ARGS, normalizeEvents, createEthAccountWithBalance, evmCollectionHelpers, getCollectionAddressFromResult, evmCollection, ethBalanceViaSub, subToEth} from './util/helpers';
import nonFungibleAbi from './nonFungibleAbi.json';
import {expect} from 'chai';
import {evmToAddress} from '@polkadot/util-crypto';
+import {submitTransactionAsync} from '../substrate/substrate-api';
+import getBalance from '../substrate/get-balance';
describe('evm collection sponsoring', () => {
itWeb3('sponsors mint transactions', async ({web3, privateKeyWrapper}) => {
@@ -38,6 +40,47 @@
]);
});
+ itWeb3('Set substrate sponsor', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
+ let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+ const sponsor = privateKeyWrapper('//Alice');
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
+ result = await collectionEvm.methods.setCollectionSponsorSubstrate(sponsor.addressRaw).send({from: owner});
+ expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.true;
+
+ const confirmTx = await api.tx.unique.confirmSponsorship(collectionId);
+ await submitTransactionAsync(sponsor, confirmTx);
+ expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
+
+ const sponsorTuple = await collectionEvm.methods.getCollectionSponsor().call({from: owner});
+ expect(bigIntToSub(api, BigInt(sponsorTuple[1]))).to.be.eq(sponsor.address);
+ });
+
+ itWeb3('Remove sponsor', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
+ let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();
+ const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
+ const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
+ result = await collectionEvm.methods.setCollectionSponsor(sponsor).send({from: owner});
+ expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.true;
+
+ await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
+ expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
+
+ await collectionEvm.methods.removeCollectionSponsor().send({from: owner});
+
+ const sponsorTuple = await collectionEvm.methods.getCollectionSponsor().call({from: owner});
+ expect(sponsorTuple.field_0).to.be.eq('0x0000000000000000000000000000000000000000');
+ });
+
itWeb3('Sponsoring collection from evm address via access list', async ({api, web3, privateKeyWrapper}) => {
const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const collectionHelpers = evmCollectionHelpers(web3, owner);
@@ -107,6 +150,61 @@
}
});
+ itWeb3('Sponsoring collection from substrate address via access list', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();
+ const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+ const sponsor = privateKeyWrapper('//Alice');
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ await collectionEvm.methods.setCollectionSponsorSubstrate(sponsor.addressRaw).send({from: owner});
+
+ const confirmTx = await api.tx.unique.confirmSponsorship(collectionId);
+ await submitTransactionAsync(sponsor, confirmTx);
+
+ const user = createEthAccount(web3);
+ const nextTokenId = await collectionEvm.methods.nextTokenId().call();
+ expect(nextTokenId).to.be.equal('1');
+
+ await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});
+ await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});
+ await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});
+
+ const ownerBalanceBefore = await ethBalanceViaSub(api, owner);
+ const sponsorBalanceBefore = (await getBalance(api, [sponsor.address]))[0];
+
+ {
+ const nextTokenId = await collectionEvm.methods.nextTokenId().call();
+ expect(nextTokenId).to.be.equal('1');
+ const result = await collectionEvm.methods.mintWithTokenURI(
+ user,
+ nextTokenId,
+ 'Test URI',
+ ).send({from: user});
+ const events = normalizeEvents(result.events);
+
+ expect(events).to.be.deep.equal([
+ {
+ address: collectionIdAddress,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: user,
+ tokenId: nextTokenId,
+ },
+ },
+ ]);
+
+ const ownerBalanceAfter = await ethBalanceViaSub(api, owner);
+ const sponsorBalanceAfter = (await getBalance(api, [sponsor.address]))[0];
+
+ expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+ expect(ownerBalanceBefore).to.be.eq(ownerBalanceAfter);
+ expect(sponsorBalanceBefore > sponsorBalanceAfter).to.be.true;
+ }
+ });
+
itWeb3('Check that transaction via EVM spend money from sponsor address', async ({api, web3, privateKeyWrapper}) => {
const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const collectionHelpers = evmCollectionHelpers(web3, owner);
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -151,6 +151,30 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "getCollectionSponsor",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "field_0", "type": "address" },
+ { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ ],
+ "internalType": "struct Tuple6",
+ "name": "",
+ "type": "tuple"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "hasCollectionPendingSponsor",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
@@ -194,6 +218,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "removeCollectionSponsor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
@@ -278,6 +309,15 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+ ],
+ "name": "setCollectionSponsorSubstrate",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "newOwner", "type": "address" }
],
"name": "setOwner",
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -200,6 +200,30 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "getCollectionSponsor",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "field_0", "type": "address" },
+ { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ ],
+ "internalType": "struct Tuple17",
+ "name": "",
+ "type": "tuple"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "hasCollectionPendingSponsor",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "address", "name": "owner", "type": "address" },
{ "internalType": "address", "name": "operator", "type": "address" }
@@ -335,6 +359,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "removeCollectionSponsor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
@@ -452,6 +483,15 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+ ],
+ "name": "setCollectionSponsorSubstrate",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "newOwner", "type": "address" }
],
"name": "setOwner",
tests/src/eth/reFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -200,6 +200,30 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "getCollectionSponsor",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "field_0", "type": "address" },
+ { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ ],
+ "internalType": "struct Tuple17",
+ "name": "",
+ "type": "tuple"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "hasCollectionPendingSponsor",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "address", "name": "owner", "type": "address" },
{ "internalType": "address", "name": "operator", "type": "address" }
@@ -335,6 +359,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "removeCollectionSponsor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
@@ -452,6 +483,15 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+ ],
+ "name": "setCollectionSponsorSubstrate",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "newOwner", "type": "address" }
],
"name": "setOwner",
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -99,6 +99,10 @@
}
}
+export function bigIntToSub(api: ApiPromise, number: bigint) {
+ return api.registry.createType('AccountId', '0x' + number.toString(16).padStart(64, '0')).toJSON();
+}
+
export function normalizeAccountId(input: string | AccountId | CrossAccountId | IKeyringPair): CrossAccountId {
if (typeof input === 'string') {
if (input.length >= 47) {