difftreelog
CORE-386 Implement eth methods
in: master
7 files changed
crates/evm-coder/src/solidity.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -455,7 +455,7 @@
}
}
-#[impl_for_tuples(0, 12)]
+#[impl_for_tuples(0, 24)]
impl SolidityFunctions for Tuple {
for_tuples!( where #( Tuple: SolidityFunctions ),* );
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, H256};25use sp_std::vec::Vec;26use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet};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> 51// where 52// T::AccountId: From<H256>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 eth_set_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {87 check_is_owner(caller, self)?;8889 let sponsor = T::CrossAccountId::from_eth(sponsor);90 self.set_sponsor(sponsor.as_sub().clone());91 save(self);92 Ok(())93 }9495 fn eth_confirm_sponsorship(&mut self, caller: caller) -> Result<void> {96 let caller = T::CrossAccountId::from_eth(caller);97 if !self.confirm_sponsorship(caller.as_sub()) {98 return Err(Error::Revert("Caller is not set as sponsor".into()));99 }100 save(self);101 Ok(())102 }103104 #[solidity(rename_selector = "setLimit")]105 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {106 check_is_owner(caller, self)?;107 let mut limits = self.limits.clone();108109 match limit.as_str() {110 "accountTokenOwnershipLimit" => {111 limits.account_token_ownership_limit = Some(value);112 }113 "sponsoredDataSize" => {114 limits.sponsored_data_size = Some(value);115 }116 "sponsoredDataRateLimit" => {117 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));118 }119 "tokenLimit" => {120 limits.token_limit = Some(value);121 }122 "sponsorTransferTimeout" => {123 limits.sponsor_transfer_timeout = Some(value);124 }125 "sponsorApproveTimeout" => {126 limits.sponsor_approve_timeout = Some(value);127 }128 _ => {129 return Err(Error::Revert(format!(130 "Unknown integer limit \"{}\"",131 limit132 )))133 }134 }135 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)136 .map_err(dispatch_to_evm::<T>)?;137 save(self);138 Ok(())139 }140141 #[solidity(rename_selector = "setLimit")]142 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {143 check_is_owner(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 Ok(())167 }168169 fn contract_address(&self, _caller: caller) -> Result<address> {170 Ok(crate::eth::collection_id_to_address(self.id))171 }172173 // fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {174 // let mut new_admin_h256 = H256::default();175 // new_admin.to_little_endian(&mut new_admin_h256.0);176 // let account_id = T::AccountId::from(new_admin_h256);177 // let caller = T::CrossAccountId::from_eth(caller);178 // let new_admin = T::CrossAccountId::from_sub(account_id);179 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)180 // .map_err(dispatch_to_evm::<T>)?;181 // Ok(())182 // }183184 // fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {185 // let mut new_admin_h256 = H256::default();186 // new_admin.to_little_endian(&mut new_admin_h256.0);187 // let account_id = T::AccountId::from(new_admin_h256);188 // let caller = T::CrossAccountId::from_eth(caller);189 // let new_admin = T::CrossAccountId::from_sub(account_id);190 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)191 // .map_err(dispatch_to_evm::<T>)?;192 // Ok(())193 // }194195 fn add_admin(&self, caller: caller, new_admin: address) -> Result<void> {196 let caller = T::CrossAccountId::from_eth(caller);197 self.check_is_owner_or_admin(&caller)198 .map_err(dispatch_to_evm::<T>)?;199 let new_admin = T::CrossAccountId::from_eth(new_admin);200 <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)201 .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 self.check_is_owner_or_admin(&caller)208 .map_err(dispatch_to_evm::<T>)?;209 let admin = T::CrossAccountId::from_eth(admin);210 <Pallet<T>>::toggle_admin(&self, &caller, &admin, false)211 .map_err(dispatch_to_evm::<T>)?;212 Ok(())213 }214215 #[solidity(rename_selector = "setNesting")]216 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {217 let caller = T::CrossAccountId::from_eth(caller);218 self.check_is_owner_or_admin(&caller)219 .map_err(dispatch_to_evm::<T>)?;220 self.collection.permissions.nesting = Some(match enable {221 false => NestingRule::Disabled,222 true => NestingRule::Owner,223 });224 save(self);225 Ok(())226 }227228 #[solidity(rename_selector = "setNesting")]229 fn set_nesting(&mut self, caller: caller, enable: bool, collections: Vec<address>) -> Result<void> {230 if collections.is_empty() {231 return Err("No addresses provided".into());232 }233 if collections.len() >= OwnerRestrictedSet::bound() {234 return Err(Error::Revert(format!("Out of bound: {} >= {}", collections.len(), OwnerRestrictedSet::bound())));235 }236 let caller = T::CrossAccountId::from_eth(caller);237 self.check_is_owner_or_admin(&caller)238 .map_err(dispatch_to_evm::<T>)?;239 self.collection.permissions.nesting = Some(match enable {240 false => NestingRule::Disabled,241 true => {242 let mut bv = OwnerRestrictedSet::new();243 for i in collections {244 bv.try_insert(245 crate::eth::map_eth_to_id(&i)246 .ok_or(Error::Revert("Can't convert address into collection id".into()))?247 ).map_err(|e| Error::Revert(format!("{:?}", e)))?;248 }249 NestingRule::OwnerRestricted (bv)250 }251 });252 save(self);253 Ok(())254 }255}256257fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<()> {258 let caller = T::CrossAccountId::from_eth(caller);259 collection260 .check_is_owner(&caller)261 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;262 Ok(())263}264265fn save<T: Config>(collection: &CollectionHandle<T>) {266 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());267}268269pub fn token_uri_key() -> up_data_structs::PropertyKey {270 b"tokenURI"271 .to_vec()272 .try_into()273 .expect("length < limit; qed")274}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_core::{H160, U256, H256};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> 51// where 52// T::AccountId: From<H256>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 eth_set_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {87 check_is_owner(caller, self)?;8889 let sponsor = T::CrossAccountId::from_eth(sponsor);90 self.set_sponsor(sponsor.as_sub().clone());91 save(self);92 Ok(())93 }9495 fn eth_confirm_sponsorship(&mut self, caller: caller) -> Result<void> {96 let caller = T::CrossAccountId::from_eth(caller);97 if !self.confirm_sponsorship(caller.as_sub()) {98 return Err(Error::Revert("Caller is not set as sponsor".into()));99 }100 save(self);101 Ok(())102 }103104 #[solidity(rename_selector = "setLimit")]105 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {106 check_is_owner(caller, self)?;107 let mut limits = self.limits.clone();108109 match limit.as_str() {110 "accountTokenOwnershipLimit" => {111 limits.account_token_ownership_limit = Some(value);112 }113 "sponsoredDataSize" => {114 limits.sponsored_data_size = Some(value);115 }116 "sponsoredDataRateLimit" => {117 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));118 }119 "tokenLimit" => {120 limits.token_limit = Some(value);121 }122 "sponsorTransferTimeout" => {123 limits.sponsor_transfer_timeout = Some(value);124 }125 "sponsorApproveTimeout" => {126 limits.sponsor_approve_timeout = Some(value);127 }128 _ => {129 return Err(Error::Revert(format!(130 "Unknown integer limit \"{}\"",131 limit132 )))133 }134 }135 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)136 .map_err(dispatch_to_evm::<T>)?;137 save(self);138 Ok(())139 }140141 #[solidity(rename_selector = "setLimit")]142 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {143 check_is_owner(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 Ok(())167 }168169 fn contract_address(&self, _caller: caller) -> Result<address> {170 Ok(crate::eth::collection_id_to_address(self.id))171 }172173 // fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {174 // let mut new_admin_h256 = H256::default();175 // new_admin.to_little_endian(&mut new_admin_h256.0);176 // let account_id = T::AccountId::from(new_admin_h256);177 // let caller = T::CrossAccountId::from_eth(caller);178 // let new_admin = T::CrossAccountId::from_sub(account_id);179 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)180 // .map_err(dispatch_to_evm::<T>)?;181 // Ok(())182 // }183184 // fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {185 // let mut new_admin_h256 = H256::default();186 // new_admin.to_little_endian(&mut new_admin_h256.0);187 // let account_id = T::AccountId::from(new_admin_h256);188 // let caller = T::CrossAccountId::from_eth(caller);189 // let new_admin = T::CrossAccountId::from_sub(account_id);190 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)191 // .map_err(dispatch_to_evm::<T>)?;192 // Ok(())193 // }194195 fn add_admin(&self, caller: caller, new_admin: address) -> Result<void> {196 let caller = T::CrossAccountId::from_eth(caller);197 self.check_is_owner_or_admin(&caller)198 .map_err(dispatch_to_evm::<T>)?;199 let new_admin = T::CrossAccountId::from_eth(new_admin);200 <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)201 .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 self.check_is_owner_or_admin(&caller)208 .map_err(dispatch_to_evm::<T>)?;209 let admin = T::CrossAccountId::from_eth(admin);210 <Pallet<T>>::toggle_admin(&self, &caller, &admin, false)211 .map_err(dispatch_to_evm::<T>)?;212 Ok(())213 }214215 #[solidity(rename_selector = "setNesting")]216 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {217 let caller = T::CrossAccountId::from_eth(caller);218 self.check_is_owner_or_admin(&caller)219 .map_err(dispatch_to_evm::<T>)?;220 self.collection.permissions.nesting = Some(match enable {221 false => NestingRule::Disabled,222 true => NestingRule::Owner,223 });224 save(self);225 Ok(())226 }227228 #[solidity(rename_selector = "setNesting")]229 fn set_nesting(&mut self, caller: caller, enable: bool, collections: Vec<address>) -> Result<void> {230 if collections.is_empty() {231 return Err("No addresses provided".into());232 }233 if collections.len() >= OwnerRestrictedSet::bound() {234 return Err(Error::Revert(format!("Out of bound: {} >= {}", collections.len(), OwnerRestrictedSet::bound())));235 }236 let caller = T::CrossAccountId::from_eth(caller);237 self.check_is_owner_or_admin(&caller)238 .map_err(dispatch_to_evm::<T>)?;239 self.collection.permissions.nesting = Some(match enable {240 false => NestingRule::Disabled,241 true => {242 let mut bv = OwnerRestrictedSet::new();243 for i in collections {244 bv.try_insert(245 crate::eth::map_eth_to_id(&i)246 .ok_or(Error::Revert("Can't convert address into collection id".into()))?247 ).map_err(|e| Error::Revert(format!("{:?}", e)))?;248 }249 NestingRule::OwnerRestricted (bv)250 }251 });252 save(self);253 Ok(())254 }255256 fn set_access(&mut self, caller: caller, mode: string) -> Result<void> {257 let caller = T::CrossAccountId::from_eth(caller);258 self.check_is_owner_or_admin(&caller)259 .map_err(dispatch_to_evm::<T>)?;260 self.collection.permissions.access = Some(match mode.as_str() {261 "Normal" => AccessMode::Normal,262 "AllowList" => AccessMode::AllowList,263 _ => return Err("Not supported access mode".into()),264 });265 save(self);266 Ok(())267 }268269 fn add_to_allow_list(&self, caller: caller, user: address) -> Result<void> {270 let caller = check_is_owner_or_admin(caller, self)?;271 let user = T::CrossAccountId::from_eth(user);272 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true)273 .map_err(dispatch_to_evm::<T>)?;274 Ok(())275 }276277 fn remove_from_allow_list(&self, caller: caller, user: address) -> Result<void> {278 let caller = check_is_owner_or_admin(caller, self)?;279 let user = T::CrossAccountId::from_eth(user);280 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false)281 .map_err(dispatch_to_evm::<T>)?;282 Ok(())283 }284285 fn set_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {286 check_is_owner_or_admin(caller, self)?;287 self.collection.permissions.mint_mode = Some(mode);288 save(self);289 Ok(())290 }291}292293fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<()> {294 let caller = T::CrossAccountId::from_eth(caller);295 collection296 .check_is_owner(&caller)297 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;298 Ok(())299}300301fn check_is_owner_or_admin<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<T::CrossAccountId> {302 let caller = T::CrossAccountId::from_eth(caller);303 collection304 .check_is_owner_or_admin(&caller)305 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;306 Ok(caller)307}308309fn save<T: Config>(collection: &CollectionHandle<T>) {310 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());311}312313pub fn token_uri_key() -> up_data_structs::PropertyKey {314 b"tokenURI"315 .to_vec()316 .try_into()317 .expect("length < limit; qed")318}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,105 +51,6 @@
event MintingFinished();
}
-// Selector: 3a54513b
-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: addAdmin(address) 70480275
- function addAdmin(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: 41369377
contract TokenProperties is Dummy, ERC165 {
// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa
@@ -479,6 +380,133 @@
}
}
+// Selector: f56cd7fa
+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: addAdmin(address) 70480275
+ function addAdmin(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;
+ }
+}
+
contract UniqueNFT is
Dummy,
ERC165,
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -42,51 +42,6 @@
event MintingFinished();
}
-// Selector: 3a54513b
-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: 41369377
interface TokenProperties is Dummy, ERC165 {
// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa
@@ -258,6 +213,63 @@
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
Dummy,
ERC165,
tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -31,6 +31,7 @@
evmCollectionHelpers,
getCollectionAddressFromResult,
evmCollection,
+ ethBalanceViaSub,
} from './util/helpers';
import {
addCollectionAdminExpectSuccess,
@@ -221,66 +222,51 @@
});
//TODO: CORE-302 add eth methods
- itWeb3.skip('Sponsoring evm address from substrate collection', async ({api, web3}) => {
+ itWeb3('Sponsoring collection from evm address via access list', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
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 = await createEthAccountWithBalance(api, web3);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
- result = await collectionEvm.methods.ethSetSponsor(sponsor).send();
+ result = await collectionEvm.methods.ethSetSponsor(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.ethConfirmSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
- const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
- await sponsorCollection.methods.ethConfirmSponsorship().send();
+ await collectionEvm.methods.ethConfirmSponsorship().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));
const user = createEthAccount(web3);
- const userContract = evmCollection(web3, user, collectionIdAddress);
- const nextTokenId = await userContract.methods.nextTokenId().call();
-
+ const nextTokenId = await collectionEvm.methods.nextTokenId().call();
expect(nextTokenId).to.be.equal('1');
- await expect(userContract.methods.mintWithTokenURI(
- user,
- nextTokenId,
- 'Test URI',
- ).call()).to.be.rejectedWith('PublicMintingNotAllowed');
-
- // TODO: add this methods to eth
- // {
- // const tx = api.tx.unique.setPublicAccessMode(collectionId, 'AllowList');
- // const events = await submitTransactionAsync(owner, tx);
- // const result = getCreateCollectionResult(events);
- // expect(result.success).to.be.true;
- // }
- // {
- // const tx = api.tx.unique.addToAllowList(collectionId, {Ethereum: userEth});
- // const events = await submitTransactionAsync(owner, tx);
- // const result = getCreateCollectionResult(events);
- // expect(result.success).to.be.true;
- // }
- // {
- // const tx = api.tx.unique.setMintPermission(collectionId, true);
- // const events = await submitTransactionAsync(owner, tx);
- // const result = getCreateCollectionResult(events);
- // expect(result.success).to.be.true;
- // }
+ const oldPermissions = (await getDetailedCollectionInfo(api, collectionId))!.permissions.toHuman();
+ 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.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 nextTokenId = await userContract.methods.nextTokenId().call();
+ const nextTokenId = await collectionEvm.methods.nextTokenId().call();
expect(nextTokenId).to.be.equal('1');
- const result = await userContract.methods.mintWithTokenURI(
+ const result = await collectionEvm.methods.mintWithTokenURI(
user,
nextTokenId,
'Test URI',
- ).send();
+ ).call({from: user});
+ console.log(result);
const events = normalizeEvents(result.events);
expect(events).to.be.deep.equal([
@@ -295,37 +281,63 @@
},
]);
- expect(await userContract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+ expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
}
});
- //TODO: CORE-302 add eth methods
- itWeb3.skip('Check that transaction via EVM spend money from substrate address', async ({api, web3, privateKeyWrapper}) => {
- const owner = privateKeyWrapper('//Alice');
- const user = privateKeyWrapper(`//User/${Date.now()}`);
- const userEth = subToEth(user.address);
- const collectionId = await createCollectionExpectSuccess();
- await addCollectionAdminExpectSuccess(owner, collectionId, {Ethereum: userEth});
- await transferBalanceTo(api, owner, user.address);
+ itWeb3('Check that transaction via EVM spend money from sponsor address', async ({api, web3}) => {
+ const owner = await createEthAccountWithBalance(api, web3);
+ 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 = await createEthAccountWithBalance(api, web3);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+ result = await collectionEvm.methods.ethSetSponsor(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');
+ const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
+ await sponsorCollection.methods.ethConfirmSponsorship().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();
+
+ const ownerBalanceBefore = await ethBalanceViaSub(api, owner);
+ const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);
+
+
+ const userCollectionEvm = evmCollection(web3, user, collectionIdAddress);
+ const nextTokenId = await userCollectionEvm.methods.nextTokenId().call();
+ expect(nextTokenId).to.be.equal('1');
+ result = await userCollectionEvm.methods.mintWithTokenURI(
+ user,
+ nextTokenId,
+ 'Test URI',
+ ).send();
+ const events = normalizeEvents(result.events);
const address = collectionIdToAddress(collectionId);
- const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: userEth, ...GAS_ARGS});
- const [userBalanceBefore] = await getBalance(api, [user.address]);
-
- {
- const nextTokenId = await contract.methods.nextTokenId().call();
- expect(nextTokenId).to.be.equal('1');
- await executeEthTxOnSub(web3, api, user, contract, m => m.mintWithTokenURI(
- userEth,
- nextTokenId,
- 'Test URI',
- ));
-
- expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
- }
-
- const [userBalanceAfter] = await getBalance(api, [user.address]);
- expect(userBalanceAfter < userBalanceBefore).to.be.true;
+ expect(events).to.be.deep.equal([
+ {
+ address,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: user,
+ tokenId: nextTokenId,
+ },
+ },
+ ]);
+ expect(await userCollectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+
+ const ownerBalanceAfter = await ethBalanceViaSub(api, owner);
+ expect(ownerBalanceAfter).to.be.eq(ownerBalanceBefore);
+ const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);
+ expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;
});
});
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -91,6 +91,15 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "user", "type": "address" }
+ ],
+ "name": "addToAllowList",
+ "outputs": [],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "approved", "type": "address" },
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -300,6 +309,15 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "user", "type": "address" }
+ ],
+ "name": "removeFromAllowList",
+ "outputs": [],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "from", "type": "address" },
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
@@ -322,6 +340,13 @@
"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" }
@@ -362,6 +387,13 @@
"type": "function"
},
{
+ "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],
+ "name": "setMintMode",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "bool", "name": "enable", "type": "bool" },
{