difftreelog
CORE-386 Fix after rebase
in: master
6 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_core::{H160, U256};25use sp_std::vec::Vec;26use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};27use alloc::format;2829use crate::{Pallet, CollectionHandle, Config, CollectionProperties};3031#[derive(ToLog)]32pub enum CollectionHelpersEvents {33 CollectionCreated {34 #[indexed]35 owner: address,36 #[indexed]37 collection_id: address,38 },39}4041/// Does not always represent a full collection, for RFT it is either42/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)43pub trait CommonEvmHandler {44 const CODE: &'static [u8];4546 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;47}4849#[solidity_interface(name = "Collection")]50impl<T: Config> CollectionHandle<T>51where52 T::AccountId: From<[u8; 32]>,53{54 fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {55 let caller = T::CrossAccountId::from_eth(caller);56 let key = <Vec<u8>>::from(key)57 .try_into()58 .map_err(|_| "key too large")?;59 let value = value.try_into().map_err(|_| "value too large")?;6061 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })62 .map_err(dispatch_to_evm::<T>)63 }6465 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {66 let caller = T::CrossAccountId::from_eth(caller);67 let key = <Vec<u8>>::from(key)68 .try_into()69 .map_err(|_| "key too large")?;7071 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)72 }7374 /// Throws error if key not found75 fn collection_property(&self, key: string) -> Result<bytes> {76 let key = <Vec<u8>>::from(key)77 .try_into()78 .map_err(|_| "key too large")?;7980 let props = <CollectionProperties<T>>::get(self.id);81 let prop = props.get(&key).ok_or("key not found")?;8283 Ok(prop.to_vec())84 }8586 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {87 check_is_owner_or_admin(caller, self)?;8889 let sponsor = T::CrossAccountId::from_eth(sponsor);90 self.set_sponsor(sponsor.as_sub().clone())91 .map_err(dispatch_to_evm::<T>)?;92 save(self)93 }9495 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {96 let caller = T::CrossAccountId::from_eth(caller);97 if !self98 .confirm_sponsorship(caller.as_sub())99 .map_err(dispatch_to_evm::<T>)?100 {101 return Err(Error::Revert("Caller is not set as sponsor".into()));102 }103 save(self)104 }105106 #[solidity(rename_selector = "setCollectionLimit")]107 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {108 check_is_owner_or_admin(caller, self)?;109 let mut limits = self.limits.clone();110111 match limit.as_str() {112 "accountTokenOwnershipLimit" => {113 limits.account_token_ownership_limit = Some(value);114 }115 "sponsoredDataSize" => {116 limits.sponsored_data_size = Some(value);117 }118 "sponsoredDataRateLimit" => {119 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));120 }121 "tokenLimit" => {122 limits.token_limit = Some(value);123 }124 "sponsorTransferTimeout" => {125 limits.sponsor_transfer_timeout = Some(value);126 }127 "sponsorApproveTimeout" => {128 limits.sponsor_approve_timeout = Some(value);129 }130 _ => {131 return Err(Error::Revert(format!(132 "Unknown integer limit \"{}\"",133 limit134 )))135 }136 }137 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)138 .map_err(dispatch_to_evm::<T>)?;139 save(self)140 }141142 #[solidity(rename_selector = "setCollectionLimit")]143 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {144 check_is_owner_or_admin(caller, self)?;145 let mut limits = self.limits.clone();146147 match limit.as_str() {148 "ownerCanTransfer" => {149 limits.owner_can_transfer = Some(value);150 }151 "ownerCanDestroy" => {152 limits.owner_can_destroy = Some(value);153 }154 "transfersEnabled" => {155 limits.transfers_enabled = Some(value);156 }157 _ => {158 return Err(Error::Revert(format!(159 "Unknown boolean limit \"{}\"",160 limit161 )))162 }163 }164 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)165 .map_err(dispatch_to_evm::<T>)?;166 save(self)167 }168169 fn contract_address(&self, _caller: caller) -> Result<address> {170 Ok(crate::eth::collection_id_to_address(self.id))171 }172173 fn add_collection_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {174 let caller = T::CrossAccountId::from_eth(caller);175 let mut new_admin_arr: [u8; 32] = Default::default();176 new_admin.to_big_endian(&mut new_admin_arr);177 let account_id = T::AccountId::from(new_admin_arr);178 let new_admin = T::CrossAccountId::from_sub(account_id);179 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;180 Ok(())181 }182183 fn remove_collection_admin_substrate(184 &self,185 caller: caller,186 new_admin: uint256,187 ) -> Result<void> {188 let caller = T::CrossAccountId::from_eth(caller);189 let mut new_admin_arr: [u8; 32] = Default::default();190 new_admin.to_big_endian(&mut new_admin_arr);191 let account_id = T::AccountId::from(new_admin_arr);192 let new_admin = T::CrossAccountId::from_sub(account_id);193 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, false)194 .map_err(dispatch_to_evm::<T>)?;195 Ok(())196 }197198 fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {199 let caller = T::CrossAccountId::from_eth(caller);200 let new_admin = T::CrossAccountId::from_eth(new_admin);201 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;202 Ok(())203 }204205 fn remove_admin(&self, caller: caller, admin: address) -> Result<void> {206 let caller = T::CrossAccountId::from_eth(caller);207 let admin = T::CrossAccountId::from_eth(admin);208 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;209 Ok(())210 }211212 #[solidity(rename_selector = "setNesting")]213 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {214 check_is_owner_or_admin(caller, self)?;215 self.collection.permissions.nesting = Some(match enable {216 false => NestingRule::Disabled,217 true => NestingRule::Owner,218 });219 save(self)?;220 Ok(())221 }222223 #[solidity(rename_selector = "setNesting")]224 fn set_nesting(&mut self, caller: caller, enable: bool, collections: Vec<address>) -> Result<void> {225 if collections.is_empty() {226 return Err("No addresses provided".into());227 }228 if collections.len() >= OwnerRestrictedSet::bound() {229 return Err(Error::Revert(format!("Out of bound: {} >= {}", collections.len(), OwnerRestrictedSet::bound())));230 }231 check_is_owner_or_admin(caller, self)?;232 self.collection.permissions.nesting = Some(match enable {233 false => NestingRule::Disabled,234 true => {235 let mut bv = OwnerRestrictedSet::new();236 for i in collections {237 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {238 Error::Revert("Can't convert address into collection id".into())239 })?)240 .map_err(|e| Error::Revert(format!("{:?}", e)))?;241 }242 NestingRule::OwnerRestricted (bv)243 }244 });245 save(self)?;246 Ok(())247 }248249 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {250 check_is_owner_or_admin(caller, self)?;251 self.collection.permissions.access = Some(match mode {252 0 => AccessMode::Normal,253 1 => AccessMode::AllowList,254 _ => return Err("Not supported access mode".into()),255 });256 save(self)?;257 Ok(())258 }259260 fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {261 let caller = T::CrossAccountId::from_eth(caller);262 let user = T::CrossAccountId::from_eth(user);263 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;264 Ok(())265 }266267 fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {268 let caller = T::CrossAccountId::from_eth(caller);269 let user = T::CrossAccountId::from_eth(user);270 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;271 Ok(())272 }273274 fn set_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {275 check_is_owner_or_admin(caller, self)?;276 self.collection.permissions.mint_mode = Some(mode);277 save(self)?;278 Ok(())279 }280}281282fn check_is_owner_or_admin<T: Config>(283 caller: caller,284 collection: &CollectionHandle<T>,285) -> Result<T::CrossAccountId> {286 let caller = T::CrossAccountId::from_eth(caller);287 collection288 .check_is_owner_or_admin(&caller)289 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;290 Ok(caller)291}292293fn save<T: Config>(collection: &CollectionHandle<T>) {294 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());295 Ok(())296}297298pub fn token_uri_key() -> up_data_structs::PropertyKey {299 b"tokenURI"300 .to_vec()301 .try_into()302 .expect("length < limit; qed")303}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_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}pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1133,7 +1133,6 @@
user: &T::CrossAccountId,
admin: bool,
) -> DispatchResult {
- collection.check_is_mutable()?;
collection.check_is_owner(sender)?;
let was_admin = <IsAdmin<T>>::get((collection.id, user));
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,6 +51,147 @@
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
@@ -327,147 +468,6 @@
require(false, stub_error);
dummy;
return 0;
- }
-}
-
-// Selector: 7d9262e6
-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: ethSetSponsor(address) 8f9af356
- function ethSetSponsor(address sponsor) public {
- require(false, stub_error);
- sponsor;
- dummy = 0;
- }
-
- // Selector: ethConfirmSponsorship() a8580d1a
- function ethConfirmSponsorship() public {
- require(false, stub_error);
- dummy = 0;
- }
-
- // Selector: setLimit(string,uint32) 68db30ca
- function setLimit(string memory limit, uint32 value) public {
- require(false, stub_error);
- limit;
- value;
- dummy = 0;
- }
-
- // Selector: setLimit(string,bool) ea67e4c2
- function setLimit(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: setAccess(string) 488f56aa
- function setAccess(string memory mode) public {
- require(false, stub_error);
- mode;
- dummy = 0;
- }
-
- // Selector: addToAllowList(address) 31f59102
- function addToAllowList(address user) public view {
- require(false, stub_error);
- user;
- dummy;
- }
-
- // Selector: removeFromAllowList(address) eba8dabc
- function removeFromAllowList(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;
}
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -42,6 +42,69 @@
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
@@ -189,70 +252,6 @@
// Selector: totalSupply() 18160ddd
function totalSupply() external view returns (uint256);
-}
-
-// Selector: 7d9262e6
-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: setCollectionNesting(bool) 112d4586
- function setCollectionNesting(bool enable) external;
-
- // Selector: setCollectionNesting(bool,address[]) 64872396
- function setCollectionNesting(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: setCollectionMintMode(bool) 00018e84
- function setCollectionMintMode(bool mode) external;
}
// Selector: d74d154f
@@ -275,63 +274,6 @@
function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
external
returns (bool);
-}
-
-// Selector: f56cd7fa
-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: ethSetSponsor(address) 8f9af356
- function ethSetSponsor(address sponsor) external;
-
- // Selector: ethConfirmSponsorship() a8580d1a
- function ethConfirmSponsorship() external;
-
- // Selector: setLimit(string,uint32) 68db30ca
- function setLimit(string memory limit, uint32 value) external;
-
- // Selector: setLimit(string,bool) ea67e4c2
- function setLimit(string memory limit, bool value) external;
-
- // Selector: contractAddress() f6b4dfb4
- function contractAddress() external view returns (address);
-
- // Selector: addAdmin(address) 70480275
- function addAdmin(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: setAccess(string) 488f56aa
- function setAccess(string memory mode) external;
-
- // Selector: addToAllowList(address) 31f59102
- function addToAllowList(address user) external view;
-
- // Selector: removeFromAllowList(address) eba8dabc
- function removeFromAllowList(address user) external view;
-
- // Selector: setMintMode(bool) 5dea9bd5
- function setMintMode(bool mode) external;
}
interface UniqueNFT is
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -84,7 +84,7 @@
"inputs": [
{ "internalType": "address", "name": "newAdmin", "type": "address" }
],
- "name": "addAdmin",
+ "name": "addCollectionAdmin",
"outputs": [],
"stateMutability": "view",
"type": "function"
@@ -102,7 +102,7 @@
"inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
- "name": "addToAllowList",
+ "name": "addToCollectionAllowList",
"outputs": [],
"stateMutability": "view",
"type": "function"
@@ -320,7 +320,7 @@
"inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
- "name": "removeFromAllowList",
+ "name": "removeFromCollectionAllowList",
"outputs": [],
"stateMutability": "view",
"type": "function"
@@ -349,13 +349,6 @@
"type": "function"
},
{
- "inputs": [{ "internalType": "string", "name": "mode", "type": "string" }],
- "name": "setAccess",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
"inputs": [
{ "internalType": "address", "name": "operator", "type": "address" },
{ "internalType": "bool", "name": "approved", "type": "bool" }
@@ -388,34 +381,6 @@
{ "internalType": "bool", "name": "value", "type": "bool" }
],
"name": "setCollectionLimit",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],
- "name": "setCollectionMintMode",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],
- "name": "setCollectionNesting",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "bool", "name": "enable", "type": "bool" },
- {
- "internalType": "address[]",
- "name": "collections",
- "type": "address[]"
- }
- ],
- "name": "setCollectionNesting",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"