difftreelog
CORE-386 Fix after rebase
in: master
9 files changed
pallets/common/src/erc.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use evm_coder::{18 solidity_interface, solidity, ToLog,19 types::*,20 execution::{Result, Error},21};22pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};23use pallet_evm_coder_substrate::dispatch_to_evm;24use sp_std::vec::Vec;25use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};26use alloc::format;2728use crate::{Pallet, CollectionHandle, Config, CollectionProperties};2930#[derive(ToLog)]31pub enum CollectionHelpersEvents {32 CollectionCreated {33 #[indexed]34 owner: address,35 #[indexed]36 collection_id: address,37 },38}3940/// Does not always represent a full collection, for RFT it is either41/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)42pub trait CommonEvmHandler {43 const CODE: &'static [u8];4445 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;46}4748#[solidity_interface(name = "Collection")]49impl<T: Config> CollectionHandle<T>50where51 T::AccountId: From<[u8; 32]>,52{53 fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {54 let caller = T::CrossAccountId::from_eth(caller);55 let key = <Vec<u8>>::from(key)56 .try_into()57 .map_err(|_| "key too large")?;58 let value = value.try_into().map_err(|_| "value too large")?;5960 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })61 .map_err(dispatch_to_evm::<T>)62 }6364 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {65 let caller = T::CrossAccountId::from_eth(caller);66 let key = <Vec<u8>>::from(key)67 .try_into()68 .map_err(|_| "key too large")?;6970 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)71 }7273 /// Throws error if key not found74 fn collection_property(&self, key: string) -> Result<bytes> {75 let key = <Vec<u8>>::from(key)76 .try_into()77 .map_err(|_| "key too large")?;7879 let props = <CollectionProperties<T>>::get(self.id);80 let prop = props.get(&key).ok_or("key not found")?;8182 Ok(prop.to_vec())83 }8485 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {86 check_is_owner_or_admin(caller, self)?;8788 let sponsor = T::CrossAccountId::from_eth(sponsor);89 self.set_sponsor(sponsor.as_sub().clone())90 .map_err(dispatch_to_evm::<T>)?;91 save(self)92 }9394 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {95 let caller = T::CrossAccountId::from_eth(caller);96 if !self97 .confirm_sponsorship(caller.as_sub())98 .map_err(dispatch_to_evm::<T>)?99 {100 return Err(Error::Revert("Caller is not set as sponsor".into()));101 }102 save(self)103 }104105 #[solidity(rename_selector = "setCollectionLimit")]106 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {107 check_is_owner_or_admin(caller, self)?;108 let mut limits = self.limits.clone();109110 match limit.as_str() {111 "accountTokenOwnershipLimit" => {112 limits.account_token_ownership_limit = Some(value);113 }114 "sponsoredDataSize" => {115 limits.sponsored_data_size = Some(value);116 }117 "sponsoredDataRateLimit" => {118 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));119 }120 "tokenLimit" => {121 limits.token_limit = Some(value);122 }123 "sponsorTransferTimeout" => {124 limits.sponsor_transfer_timeout = Some(value);125 }126 "sponsorApproveTimeout" => {127 limits.sponsor_approve_timeout = Some(value);128 }129 _ => {130 return Err(Error::Revert(format!(131 "Unknown integer limit \"{}\"",132 limit133 )))134 }135 }136 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)137 .map_err(dispatch_to_evm::<T>)?;138 save(self)139 }140141 #[solidity(rename_selector = "setCollectionLimit")]142 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {143 check_is_owner_or_admin(caller, self)?;144 let mut limits = self.limits.clone();145146 match limit.as_str() {147 "ownerCanTransfer" => {148 limits.owner_can_transfer = Some(value);149 }150 "ownerCanDestroy" => {151 limits.owner_can_destroy = Some(value);152 }153 "transfersEnabled" => {154 limits.transfers_enabled = Some(value);155 }156 _ => {157 return Err(Error::Revert(format!(158 "Unknown boolean limit \"{}\"",159 limit160 )))161 }162 }163 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)164 .map_err(dispatch_to_evm::<T>)?;165 save(self)166 }167168 fn contract_address(&self, _caller: caller) -> Result<address> {169 Ok(crate::eth::collection_id_to_address(self.id))170 }171172 fn add_collection_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {173 let caller = T::CrossAccountId::from_eth(caller);174 let mut new_admin_arr: [u8; 32] = Default::default();175 new_admin.to_big_endian(&mut new_admin_arr);176 let account_id = T::AccountId::from(new_admin_arr);177 let new_admin = T::CrossAccountId::from_sub(account_id);178 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;179 Ok(())180 }181182 fn remove_collection_admin_substrate(183 &self,184 caller: caller,185 new_admin: uint256,186 ) -> Result<void> {187 let caller = T::CrossAccountId::from_eth(caller);188 let mut new_admin_arr: [u8; 32] = Default::default();189 new_admin.to_big_endian(&mut new_admin_arr);190 let account_id = T::AccountId::from(new_admin_arr);191 let new_admin = T::CrossAccountId::from_sub(account_id);192 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, false)193 .map_err(dispatch_to_evm::<T>)?;194 Ok(())195 }196197 fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {198 let caller = T::CrossAccountId::from_eth(caller);199 let new_admin = T::CrossAccountId::from_eth(new_admin);200 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;201 Ok(())202 }203204 fn remove_admin(&self, caller: caller, admin: address) -> Result<void> {205 let caller = T::CrossAccountId::from_eth(caller);206 let admin = T::CrossAccountId::from_eth(admin);207 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;208 Ok(())209 }210211 #[solidity(rename_selector = "setNesting")]212 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {213 check_is_owner_or_admin(caller, self)?;214 self.collection.permissions.nesting = Some(match enable {215 false => NestingRule::Disabled,216 true => NestingRule::Owner,217 });218 save(self)?;219 Ok(())220 }221222 #[solidity(rename_selector = "setNesting")]223 fn set_nesting(&mut self, caller: caller, enable: bool, collections: Vec<address>) -> Result<void> {224 if collections.is_empty() {225 return Err("No addresses provided".into());226 }227 if collections.len() >= OwnerRestrictedSet::bound() {228 return Err(Error::Revert(format!("Out of bound: {} >= {}", collections.len(), OwnerRestrictedSet::bound())));229 }230 check_is_owner_or_admin(caller, self)?;231 self.collection.permissions.nesting = Some(match enable {232 false => NestingRule::Disabled,233 true => {234 let mut bv = OwnerRestrictedSet::new();235 for i in collections {236 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {237 Error::Revert("Can't convert address into collection id".into())238 })?)239 .map_err(|e| Error::Revert(format!("{:?}", e)))?;240 }241 NestingRule::OwnerRestricted (bv)242 }243 });244 save(self)?;245 Ok(())246 }247248 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {249 check_is_owner_or_admin(caller, self)?;250 self.collection.permissions.access = Some(match mode {251 0 => AccessMode::Normal,252 1 => AccessMode::AllowList,253 _ => return Err("Not supported access mode".into()),254 });255 save(self)?;256 Ok(())257 }258259 fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {260 let caller = T::CrossAccountId::from_eth(caller);261 let user = T::CrossAccountId::from_eth(user);262 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;263 Ok(())264 }265266 fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {267 let caller = T::CrossAccountId::from_eth(caller);268 let user = T::CrossAccountId::from_eth(user);269 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;270 Ok(())271 }272273 fn set_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {274 check_is_owner_or_admin(caller, self)?;275 self.collection.permissions.mint_mode = Some(mode);276 save(self)?;277 Ok(())278 }279}280281fn check_is_owner_or_admin<T: Config>(282 caller: caller,283 collection: &CollectionHandle<T>,284) -> Result<T::CrossAccountId> {285 let caller = T::CrossAccountId::from_eth(caller);286 collection287 .check_is_owner_or_admin(&caller)288 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;289 Ok(caller)290}291292fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {293 // TODO possibly delete for the lack of transaction294 collection295 .check_is_internal()296 .map_err(dispatch_to_evm::<T>)?;297 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());298 Ok(())299}300301pub fn token_uri_key() -> up_data_structs::PropertyKey {302 b"tokenURI"303 .to_vec()304 .try_into()305 .expect("length < limit; qed")306}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/>.1617use evm_coder::{18 solidity_interface, solidity, ToLog,19 types::*,20 execution::{Result, Error},21};22pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};23use pallet_evm_coder_substrate::dispatch_to_evm;24use sp_std::vec::Vec;25use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};26use alloc::format;2728use crate::{Pallet, CollectionHandle, Config, CollectionProperties};2930#[derive(ToLog)]31pub enum CollectionHelpersEvents {32 CollectionCreated {33 #[indexed]34 owner: address,35 #[indexed]36 collection_id: address,37 },38}3940/// Does not always represent a full collection, for RFT it is either41/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)42pub trait CommonEvmHandler {43 const CODE: &'static [u8];4445 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;46}4748#[solidity_interface(name = "Collection")]49impl<T: Config> CollectionHandle<T>50where51 T::AccountId: From<[u8; 32]>,52{53 fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {54 let caller = T::CrossAccountId::from_eth(caller);55 let key = <Vec<u8>>::from(key)56 .try_into()57 .map_err(|_| "key too large")?;58 let value = value.try_into().map_err(|_| "value too large")?;5960 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })61 .map_err(dispatch_to_evm::<T>)62 }6364 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {65 let caller = T::CrossAccountId::from_eth(caller);66 let key = <Vec<u8>>::from(key)67 .try_into()68 .map_err(|_| "key too large")?;6970 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)71 }7273 /// Throws error if key not found74 fn collection_property(&self, key: string) -> Result<bytes> {75 let key = <Vec<u8>>::from(key)76 .try_into()77 .map_err(|_| "key too large")?;7879 let props = <CollectionProperties<T>>::get(self.id);80 let prop = props.get(&key).ok_or("key not found")?;8182 Ok(prop.to_vec())83 }8485 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {86 check_is_owner_or_admin(caller, self)?;8788 let sponsor = T::CrossAccountId::from_eth(sponsor);89 self.set_sponsor(sponsor.as_sub().clone())90 .map_err(dispatch_to_evm::<T>)?;91 save(self)92 }9394 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {95 let caller = T::CrossAccountId::from_eth(caller);96 if !self97 .confirm_sponsorship(caller.as_sub())98 .map_err(dispatch_to_evm::<T>)?99 {100 return Err(Error::Revert("Caller is not set as sponsor".into()));101 }102 save(self)103 }104105 #[solidity(rename_selector = "setCollectionLimit")]106 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {107 check_is_owner_or_admin(caller, self)?;108 let mut limits = self.limits.clone();109110 match limit.as_str() {111 "accountTokenOwnershipLimit" => {112 limits.account_token_ownership_limit = Some(value);113 }114 "sponsoredDataSize" => {115 limits.sponsored_data_size = Some(value);116 }117 "sponsoredDataRateLimit" => {118 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));119 }120 "tokenLimit" => {121 limits.token_limit = Some(value);122 }123 "sponsorTransferTimeout" => {124 limits.sponsor_transfer_timeout = Some(value);125 }126 "sponsorApproveTimeout" => {127 limits.sponsor_approve_timeout = Some(value);128 }129 _ => {130 return Err(Error::Revert(format!(131 "Unknown integer limit \"{}\"",132 limit133 )))134 }135 }136 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)137 .map_err(dispatch_to_evm::<T>)?;138 save(self)139 }140141 #[solidity(rename_selector = "setCollectionLimit")]142 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {143 check_is_owner_or_admin(caller, self)?;144 let mut limits = self.limits.clone();145146 match limit.as_str() {147 "ownerCanTransfer" => {148 limits.owner_can_transfer = Some(value);149 }150 "ownerCanDestroy" => {151 limits.owner_can_destroy = Some(value);152 }153 "transfersEnabled" => {154 limits.transfers_enabled = Some(value);155 }156 _ => {157 return Err(Error::Revert(format!(158 "Unknown boolean limit \"{}\"",159 limit160 )))161 }162 }163 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)164 .map_err(dispatch_to_evm::<T>)?;165 save(self)166 }167168 fn contract_address(&self, _caller: caller) -> Result<address> {169 Ok(crate::eth::collection_id_to_address(self.id))170 }171172 fn add_collection_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {173 let caller = T::CrossAccountId::from_eth(caller);174 let mut new_admin_arr: [u8; 32] = Default::default();175 new_admin.to_big_endian(&mut new_admin_arr);176 let account_id = T::AccountId::from(new_admin_arr);177 let new_admin = T::CrossAccountId::from_sub(account_id);178 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;179 Ok(())180 }181182 fn remove_collection_admin_substrate(183 &self,184 caller: caller,185 new_admin: uint256,186 ) -> Result<void> {187 let caller = T::CrossAccountId::from_eth(caller);188 let mut new_admin_arr: [u8; 32] = Default::default();189 new_admin.to_big_endian(&mut new_admin_arr);190 let account_id = T::AccountId::from(new_admin_arr);191 let new_admin = T::CrossAccountId::from_sub(account_id);192 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, false)193 .map_err(dispatch_to_evm::<T>)?;194 Ok(())195 }196197 fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {198 let caller = T::CrossAccountId::from_eth(caller);199 let new_admin = T::CrossAccountId::from_eth(new_admin);200 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;201 Ok(())202 }203204 fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {205 let caller = T::CrossAccountId::from_eth(caller);206 let admin = T::CrossAccountId::from_eth(admin);207 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;208 Ok(())209 }210211 #[solidity(rename_selector = "setNesting")]212 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {213 check_is_owner_or_admin(caller, self)?;214 self.collection.permissions.nesting = Some(match enable {215 false => NestingRule::Disabled,216 true => NestingRule::Owner,217 });218 save(self)?;219 Ok(())220 }221222 #[solidity(rename_selector = "setNesting")]223 fn set_nesting(224 &mut self,225 caller: caller,226 enable: bool,227 collections: Vec<address>,228 ) -> Result<void> {229 if collections.is_empty() {230 return Err("No addresses provided".into());231 }232 if collections.len() >= OwnerRestrictedSet::bound() {233 return Err(Error::Revert(format!(234 "Out of bound: {} >= {}",235 collections.len(),236 OwnerRestrictedSet::bound()237 )));238 }239 check_is_owner_or_admin(caller, self)?;240 self.collection.permissions.nesting = Some(match enable {241 false => NestingRule::Disabled,242 true => {243 let mut bv = OwnerRestrictedSet::new();244 for i in collections {245 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {246 Error::Revert("Can't convert address into collection id".into())247 })?)248 .map_err(|e| Error::Revert(format!("{:?}", e)))?;249 }250 NestingRule::OwnerRestricted(bv)251 }252 });253 save(self)?;254 Ok(())255 }256257 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {258 check_is_owner_or_admin(caller, self)?;259 self.collection.permissions.access = Some(match mode {260 0 => AccessMode::Normal,261 1 => AccessMode::AllowList,262 _ => return Err("Not supported access mode".into()),263 });264 save(self)?;265 Ok(())266 }267268 fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {269 let caller = T::CrossAccountId::from_eth(caller);270 let user = T::CrossAccountId::from_eth(user);271 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;272 Ok(())273 }274275 fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {276 let caller = T::CrossAccountId::from_eth(caller);277 let user = T::CrossAccountId::from_eth(user);278 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;279 Ok(())280 }281282 fn set_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {283 check_is_owner_or_admin(caller, self)?;284 self.collection.permissions.mint_mode = Some(mode);285 save(self)?;286 Ok(())287 }288}289290fn check_is_owner_or_admin<T: Config>(291 caller: caller,292 collection: &CollectionHandle<T>,293) -> Result<T::CrossAccountId> {294 let caller = T::CrossAccountId::from_eth(caller);295 collection296 .check_is_owner_or_admin(&caller)297 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;298 Ok(caller)299}300301fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {302 // TODO possibly delete for the lack of transaction303 collection304 .check_is_internal()305 .map_err(dispatch_to_evm::<T>)?;306 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());307 Ok(())308}309310pub fn token_uri_key() -> up_data_structs::PropertyKey {311 b"tokenURI"312 .to_vec()313 .try_into()314 .expect("length < limit; qed")315}pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -148,7 +148,6 @@
.saturating_mul(writes),
))
}
-
pub fn save(self) -> DispatchResult {
<CollectionById<T>>::insert(self.id, self.collection);
Ok(())
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
@@ -51,147 +51,6 @@
event MintingFinished();
}
-// Selector: 2da6e59e
-contract Collection is Dummy, ERC165 {
- // Selector: setCollectionProperty(string,bytes) 2f073f66
- function setCollectionProperty(string memory key, bytes memory value)
- public
- {
- require(false, stub_error);
- key;
- value;
- dummy = 0;
- }
-
- // Selector: deleteCollectionProperty(string) 7b7debce
- function deleteCollectionProperty(string memory key) public {
- require(false, stub_error);
- key;
- dummy = 0;
- }
-
- // Throws error if key not found
- //
- // Selector: collectionProperty(string) cf24fd6d
- function collectionProperty(string memory key)
- public
- view
- returns (bytes memory)
- {
- require(false, stub_error);
- key;
- dummy;
- return hex"";
- }
-
- // Selector: setCollectionSponsor(address) 7623402e
- function setCollectionSponsor(address sponsor) public {
- require(false, stub_error);
- sponsor;
- dummy = 0;
- }
-
- // Selector: confirmCollectionSponsorship() 3c50e97a
- function confirmCollectionSponsorship() public {
- require(false, stub_error);
- dummy = 0;
- }
-
- // Selector: setCollectionLimit(string,uint32) 6a3841db
- function setCollectionLimit(string memory limit, uint32 value) public {
- require(false, stub_error);
- limit;
- value;
- dummy = 0;
- }
-
- // Selector: setCollectionLimit(string,bool) 993b7fba
- function setCollectionLimit(string memory limit, bool value) public {
- require(false, stub_error);
- limit;
- value;
- dummy = 0;
- }
-
- // Selector: contractAddress() f6b4dfb4
- function contractAddress() public view returns (address) {
- require(false, stub_error);
- dummy;
- return 0x0000000000000000000000000000000000000000;
- }
-
- // Selector: addCollectionAdminSubstrate(uint256) 5730062b
- function addCollectionAdminSubstrate(uint256 newAdmin) public view {
- require(false, stub_error);
- newAdmin;
- dummy;
- }
-
- // Selector: removeCollectionAdminSubstrate(uint256) 4048fcf9
- function removeCollectionAdminSubstrate(uint256 newAdmin) public view {
- require(false, stub_error);
- newAdmin;
- dummy;
- }
-
- // Selector: addCollectionAdmin(address) 92e462c7
- function addCollectionAdmin(address newAdmin) public view {
- require(false, stub_error);
- newAdmin;
- dummy;
- }
-
- // Selector: removeAdmin(address) 1785f53c
- function removeAdmin(address admin) public view {
- require(false, stub_error);
- admin;
- dummy;
- }
-
- // Selector: setNesting(bool) e8fc50dd
- function setNesting(bool enable) public {
- require(false, stub_error);
- enable;
- dummy = 0;
- }
-
- // Selector: setNesting(bool,address[]) 7df12a9a
- function setNesting(bool enable, address[] memory collections) public {
- require(false, stub_error);
- enable;
- collections;
- dummy = 0;
- }
-
- // Selector: setCollectionAccess(uint8) 41835d4c
- function setCollectionAccess(uint8 mode) public {
- require(false, stub_error);
- mode;
- dummy = 0;
- }
-
- // Selector: addToCollectionAllowList(address) 67844fe6
- function addToCollectionAllowList(address user) public view {
- require(false, stub_error);
- user;
- dummy;
- }
-
- // Selector: removeFromCollectionAllowList(address) 85c51acb
- function removeFromCollectionAllowList(address user) public view {
- require(false, stub_error);
- user;
- dummy;
- }
-
- // Selector: setMintMode(bool) 5dea9bd5
- function setMintMode(bool mode) public {
- require(false, stub_error);
- mode;
- dummy = 0;
- }
-}
-
// Selector: 41369377
contract TokenProperties is Dummy, ERC165 {
// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa
@@ -471,6 +330,147 @@
}
}
+// Selector: c0de6be0
+contract Collection is Dummy, ERC165 {
+ // Selector: setCollectionProperty(string,bytes) 2f073f66
+ function setCollectionProperty(string memory key, bytes memory value)
+ public
+ {
+ require(false, stub_error);
+ key;
+ value;
+ dummy = 0;
+ }
+
+ // Selector: deleteCollectionProperty(string) 7b7debce
+ function deleteCollectionProperty(string memory key) public {
+ require(false, stub_error);
+ key;
+ dummy = 0;
+ }
+
+ // Throws error if key not found
+ //
+ // Selector: collectionProperty(string) cf24fd6d
+ function collectionProperty(string memory key)
+ public
+ view
+ returns (bytes memory)
+ {
+ require(false, stub_error);
+ key;
+ dummy;
+ return hex"";
+ }
+
+ // Selector: setCollectionSponsor(address) 7623402e
+ function setCollectionSponsor(address sponsor) public {
+ require(false, stub_error);
+ sponsor;
+ dummy = 0;
+ }
+
+ // Selector: confirmCollectionSponsorship() 3c50e97a
+ function confirmCollectionSponsorship() public {
+ require(false, stub_error);
+ dummy = 0;
+ }
+
+ // Selector: setCollectionLimit(string,uint32) 6a3841db
+ function setCollectionLimit(string memory limit, uint32 value) public {
+ require(false, stub_error);
+ limit;
+ value;
+ dummy = 0;
+ }
+
+ // Selector: setCollectionLimit(string,bool) 993b7fba
+ function setCollectionLimit(string memory limit, bool value) public {
+ require(false, stub_error);
+ limit;
+ value;
+ dummy = 0;
+ }
+
+ // Selector: contractAddress() f6b4dfb4
+ function contractAddress() public view returns (address) {
+ require(false, stub_error);
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
+
+ // Selector: addCollectionAdminSubstrate(uint256) 5730062b
+ function addCollectionAdminSubstrate(uint256 newAdmin) public view {
+ require(false, stub_error);
+ newAdmin;
+ dummy;
+ }
+
+ // Selector: removeCollectionAdminSubstrate(uint256) 4048fcf9
+ function removeCollectionAdminSubstrate(uint256 newAdmin) public view {
+ require(false, stub_error);
+ newAdmin;
+ dummy;
+ }
+
+ // Selector: addCollectionAdmin(address) 92e462c7
+ function addCollectionAdmin(address newAdmin) public view {
+ require(false, stub_error);
+ newAdmin;
+ dummy;
+ }
+
+ // Selector: removeCollectionAdmin(address) fafd7b42
+ function removeCollectionAdmin(address admin) public view {
+ require(false, stub_error);
+ admin;
+ dummy;
+ }
+
+ // Selector: setNesting(bool) e8fc50dd
+ function setNesting(bool enable) public {
+ require(false, stub_error);
+ enable;
+ dummy = 0;
+ }
+
+ // Selector: setNesting(bool,address[]) 7df12a9a
+ function setNesting(bool enable, address[] memory collections) public {
+ require(false, stub_error);
+ enable;
+ collections;
+ dummy = 0;
+ }
+
+ // Selector: setCollectionAccess(uint8) 41835d4c
+ function setCollectionAccess(uint8 mode) public {
+ require(false, stub_error);
+ mode;
+ dummy = 0;
+ }
+
+ // Selector: addToCollectionAllowList(address) 67844fe6
+ function addToCollectionAllowList(address user) public view {
+ require(false, stub_error);
+ user;
+ dummy;
+ }
+
+ // Selector: removeFromCollectionAllowList(address) 85c51acb
+ function removeFromCollectionAllowList(address user) public view {
+ require(false, stub_error);
+ user;
+ dummy;
+ }
+
+ // Selector: setMintMode(bool) 5dea9bd5
+ function setMintMode(bool mode) public {
+ require(false, stub_error);
+ mode;
+ dummy = 0;
+ }
+}
+
// Selector: d74d154f
contract ERC721UniqueExtensions is Dummy, ERC165 {
// Selector: transfer(address,uint256) a9059cbb
runtime/tests/src/tests.rsdiffbeforeafterboth--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -1286,7 +1286,7 @@
account(3)
)));
- // remove admin 3
+ // remove admin 3
assert_ok!(Unique::remove_collection_admin(
origin1,
CollectionId(1),
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -42,69 +42,6 @@
event MintingFinished();
}
-// Selector: 2da6e59e
-interface Collection is Dummy, ERC165 {
- // Selector: setCollectionProperty(string,bytes) 2f073f66
- function setCollectionProperty(string memory key, bytes memory value)
- external;
-
- // Selector: deleteCollectionProperty(string) 7b7debce
- function deleteCollectionProperty(string memory key) external;
-
- // Throws error if key not found
- //
- // Selector: collectionProperty(string) cf24fd6d
- function collectionProperty(string memory key)
- external
- view
- returns (bytes memory);
-
- // Selector: setCollectionSponsor(address) 7623402e
- function setCollectionSponsor(address sponsor) external;
-
- // Selector: confirmCollectionSponsorship() 3c50e97a
- function confirmCollectionSponsorship() external;
-
- // Selector: setCollectionLimit(string,uint32) 6a3841db
- function setCollectionLimit(string memory limit, uint32 value) external;
-
- // Selector: setCollectionLimit(string,bool) 993b7fba
- function setCollectionLimit(string memory limit, bool value) external;
-
- // Selector: contractAddress() f6b4dfb4
- function contractAddress() external view returns (address);
-
- // Selector: addCollectionAdminSubstrate(uint256) 5730062b
- function addCollectionAdminSubstrate(uint256 newAdmin) external view;
-
- // Selector: removeCollectionAdminSubstrate(uint256) 4048fcf9
- function removeCollectionAdminSubstrate(uint256 newAdmin) external view;
-
- // Selector: addCollectionAdmin(address) 92e462c7
- function addCollectionAdmin(address newAdmin) external view;
-
- // Selector: removeAdmin(address) 1785f53c
- function removeAdmin(address admin) external view;
-
- // Selector: setNesting(bool) e8fc50dd
- function setNesting(bool enable) external;
-
- // Selector: setNesting(bool,address[]) 7df12a9a
- function setNesting(bool enable, address[] memory collections) external;
-
- // Selector: setCollectionAccess(uint8) 41835d4c
- function setCollectionAccess(uint8 mode) external;
-
- // Selector: addToCollectionAllowList(address) 67844fe6
- function addToCollectionAllowList(address user) external view;
-
- // Selector: removeFromCollectionAllowList(address) 85c51acb
- function removeFromCollectionAllowList(address user) external view;
-
- // Selector: setMintMode(bool) 5dea9bd5
- function setMintMode(bool mode) external;
-}
-
// Selector: 41369377
interface TokenProperties is Dummy, ERC165 {
// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa
@@ -254,6 +191,69 @@
function totalSupply() external view returns (uint256);
}
+// Selector: c0de6be0
+interface Collection is Dummy, ERC165 {
+ // Selector: setCollectionProperty(string,bytes) 2f073f66
+ function setCollectionProperty(string memory key, bytes memory value)
+ external;
+
+ // Selector: deleteCollectionProperty(string) 7b7debce
+ function deleteCollectionProperty(string memory key) external;
+
+ // Throws error if key not found
+ //
+ // Selector: collectionProperty(string) cf24fd6d
+ function collectionProperty(string memory key)
+ external
+ view
+ returns (bytes memory);
+
+ // Selector: setCollectionSponsor(address) 7623402e
+ function setCollectionSponsor(address sponsor) external;
+
+ // Selector: confirmCollectionSponsorship() 3c50e97a
+ function confirmCollectionSponsorship() external;
+
+ // Selector: setCollectionLimit(string,uint32) 6a3841db
+ function setCollectionLimit(string memory limit, uint32 value) external;
+
+ // Selector: setCollectionLimit(string,bool) 993b7fba
+ function setCollectionLimit(string memory limit, bool value) external;
+
+ // Selector: contractAddress() f6b4dfb4
+ function contractAddress() external view returns (address);
+
+ // Selector: addCollectionAdminSubstrate(uint256) 5730062b
+ function addCollectionAdminSubstrate(uint256 newAdmin) external view;
+
+ // Selector: removeCollectionAdminSubstrate(uint256) 4048fcf9
+ function removeCollectionAdminSubstrate(uint256 newAdmin) external view;
+
+ // Selector: addCollectionAdmin(address) 92e462c7
+ function addCollectionAdmin(address newAdmin) external view;
+
+ // Selector: removeCollectionAdmin(address) fafd7b42
+ function removeCollectionAdmin(address admin) external view;
+
+ // Selector: setNesting(bool) e8fc50dd
+ function setNesting(bool enable) external;
+
+ // Selector: setNesting(bool,address[]) 7df12a9a
+ function setNesting(bool enable, address[] memory collections) external;
+
+ // Selector: setCollectionAccess(uint8) 41835d4c
+ function setCollectionAccess(uint8 mode) external;
+
+ // Selector: addToCollectionAllowList(address) 67844fe6
+ function addToCollectionAllowList(address user) external view;
+
+ // Selector: removeFromCollectionAllowList(address) 85c51acb
+ function removeFromCollectionAllowList(address user) external view;
+
+ // Selector: setMintMode(bool) 5dea9bd5
+ function setMintMode(bool mode) external;
+}
+
// Selector: d74d154f
interface ERC721UniqueExtensions is Dummy, ERC165 {
// Selector: transfer(address,uint256) a9059cbb
tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -221,7 +221,6 @@
expect(await helpers.methods.getSponsoringRateLimit(flipper.options.address).call()).to.be.equals('7200');
});
- //TODO: CORE-302 add eth methods
itWeb3('Sponsoring collection from evm address via access list', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
const collectionHelpers = evmCollectionHelpers(web3, owner);
@@ -229,13 +228,13 @@
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
const sponsor = await createEthAccountWithBalance(api, web3);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
- result = await collectionEvm.methods.ethSetSponsor(sponsor).send({from: owner});
+ result = await collectionEvm.methods.setCollectionSponsor(sponsor).send({from: owner});
let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;
expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
- await collectionEvm.methods.ethConfirmSponsorship().send({from: sponsor});
+ await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.sponsorship.isConfirmed).to.be.true;
expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
@@ -248,15 +247,16 @@
expect(oldPermissions.mintMode).to.be.false;
expect(oldPermissions.access).to.be.equal('Normal');
- await collectionEvm.methods.setAccess('AllowList').send({from: owner});
- await collectionEvm.methods.addToAllowList(user).send({from: owner});
+ await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});
+ await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});
await collectionEvm.methods.setMintMode(true).send({from: owner});
const newPermissions = (await getDetailedCollectionInfo(api, collectionId))!.permissions.toHuman();
expect(newPermissions.mintMode).to.be.true;
expect(newPermissions.access).to.be.equal('AllowList');
- // const [alicesBalanceBefore] = await getBalance(api, [alicesPublicKey]);
+ const ownerBalanceBefore = await ethBalanceViaSub(api, owner);
+ const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);
{
const nextTokenId = await collectionEvm.methods.nextTokenId().call();
@@ -265,13 +265,12 @@
user,
nextTokenId,
'Test URI',
- ).call({from: user});
- console.log(result);
+ ).send({from: user});
const events = normalizeEvents(result.events);
expect(events).to.be.deep.equal([
{
- collectionIdAddress,
+ address: collectionIdAddress,
event: 'Transfer',
args: {
from: '0x0000000000000000000000000000000000000000',
@@ -281,7 +280,12 @@
},
]);
+ const ownerBalanceAfter = await ethBalanceViaSub(api, owner);
+ const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);
+
expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+ expect(ownerBalanceBefore).to.be.eq(ownerBalanceAfter);
+ expect(sponsorBalanceBefore > sponsorBalanceAfter).to.be.true;
}
});
@@ -292,19 +296,19 @@
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
const sponsor = await createEthAccountWithBalance(api, web3);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
- result = await collectionEvm.methods.ethSetSponsor(sponsor).send();
+ result = await collectionEvm.methods.setCollectionSponsor(sponsor).send();
let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;
expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
- await expect(collectionEvm.methods.ethConfirmSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
+ await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
- await sponsorCollection.methods.ethConfirmSponsorship().send();
+ await sponsorCollection.methods.confirmCollectionSponsorship().send();
collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.sponsorship.isConfirmed).to.be.true;
expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
const user = createEthAccount(web3);
- await collectionEvm.methods.addAdmin(user).send();
+ await collectionEvm.methods.addCollectionAdmin(user).send();
const ownerBalanceBefore = await ethBalanceViaSub(api, owner);
const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -302,7 +302,7 @@
"inputs": [
{ "internalType": "address", "name": "admin", "type": "address" }
],
- "name": "removeAdmin",
+ "name": "removeCollectionAdmin",
"outputs": [],
"stateMutability": "view",
"type": "function"
tests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -99,7 +99,7 @@
const collectionEvmOwned = evmCollection(web3, owner, collectionIdAddress);
const collectionEvm = evmCollection(web3, caller, collectionIdAddress);
const contract = await proxyWrap(api, web3, collectionEvm);
- await collectionEvmOwned.methods.addAdmin(contract.options.address).send();
+ await collectionEvmOwned.methods.addCollectionAdmin(contract.options.address).send();
{
const nextTokenId = await contract.methods.nextTokenId().call();