difftreelog
Merge branch 'develop' into test/move-to-playgrounds
in: master
28 files changed
.docker/forkless-config/launch-config-forkless-data.j2diffbeforeafterboth--- a/.docker/forkless-config/launch-config-forkless-data.j2
+++ b/.docker/forkless-config/launch-config-forkless-data.j2
@@ -86,7 +86,7 @@
},
"parachains": [
{
- "bin": "/unique-chain/target/release/unique-collator",
+ "bin": "/unique-chain/current/release/unique-collator",
"upgradeBin": "/unique-chain/target/release/unique-collator",
"upgradeWasm": "/unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",
"id": "1000",
.github/workflows/nodes-only-update.ymldiffbeforeafterboth--- a/.github/workflows/nodes-only-update.yml
+++ b/.github/workflows/nodes-only-update.yml
@@ -196,7 +196,6 @@
yarn install
yarn add mochawesome
echo "Ready to start tests"
- node scripts/readyness.js
NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
env:
RPC_URL: http://127.0.0.1:9933/
@@ -272,7 +271,6 @@
yarn install
yarn add mochawesome
echo "Ready to start tests"
- node scripts/readyness.js
NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
env:
RPC_URL: http://127.0.0.1:9933/
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5552,7 +5552,7 @@
[[package]]
name = "pallet-common"
-version = "0.1.5"
+version = "0.1.6"
dependencies = [
"ethereum",
"evm-coder",
@@ -12473,7 +12473,7 @@
[[package]]
name = "up-common"
-version = "0.9.25"
+version = "0.9.27"
dependencies = [
"fp-rpc",
"frame-support",
pallets/common/CHANGELOG.mddiffbeforeafterboth--- a/pallets/common/CHANGELOG.md
+++ b/pallets/common/CHANGELOG.md
@@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
+## [0.1.6] - 2022-08-16
+
+### Added
+- New Ethereum API methods: changeOwner, changeOwner(Substrate) and verifyOwnerOrAdmin(Substrate).
+
<!-- bureaucrate goes here -->
## [v0.1.5] 2022-08-16
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-common"
-version = "0.1.5"
+version = "0.1.6"
license = "GPLv3"
edition = "2021"
pallets/common/src/erc.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! This module contains the implementation of pallet methods for evm.1819use evm_coder::{20 solidity_interface, solidity, ToLog,21 types::*,22 execution::{Result, Error},23};24pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};25use pallet_evm_coder_substrate::dispatch_to_evm;26use sp_std::vec::Vec;27use up_data_structs::{28 AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,29 SponsoringRateLimit,30};31use alloc::format;3233use crate::{Pallet, CollectionHandle, Config, CollectionProperties};3435/// Events for ethereum collection helper.36#[derive(ToLog)]37pub enum CollectionHelpersEvents {38 /// The collection has been created.39 CollectionCreated {40 /// Collection owner.41 #[indexed]42 owner: address,4344 /// Collection ID.45 #[indexed]46 collection_id: address,47 },48}4950/// Does not always represent a full collection, for RFT it is either51/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).52pub trait CommonEvmHandler {53 const CODE: &'static [u8];5455 /// Call precompiled handle.56 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;57}5859/// @title A contract that allows you to work with collections.60#[solidity_interface(name = "Collection")]61impl<T: Config> CollectionHandle<T>62where63 T::AccountId: From<[u8; 32]>,64{65 /// Set collection property.66 ///67 /// @param key Property key.68 /// @param value Propery value.69 fn set_collection_property(70 &mut self,71 caller: caller,72 key: string,73 value: bytes,74 ) -> Result<void> {75 let caller = T::CrossAccountId::from_eth(caller);76 let key = <Vec<u8>>::from(key)77 .try_into()78 .map_err(|_| "key too large")?;79 let value = value.try_into().map_err(|_| "value too large")?;8081 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })82 .map_err(dispatch_to_evm::<T>)83 }8485 /// Delete collection property.86 ///87 /// @param key Property key.88 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {89 let caller = T::CrossAccountId::from_eth(caller);90 let key = <Vec<u8>>::from(key)91 .try_into()92 .map_err(|_| "key too large")?;9394 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)95 }9697 /// Get collection property.98 ///99 /// @dev Throws error if key not found.100 ///101 /// @param key Property key.102 /// @return bytes The property corresponding to the key.103 fn collection_property(&self, key: string) -> Result<bytes> {104 let key = <Vec<u8>>::from(key)105 .try_into()106 .map_err(|_| "key too large")?;107108 let props = <CollectionProperties<T>>::get(self.id);109 let prop = props.get(&key).ok_or("key not found")?;110111 Ok(prop.to_vec())112 }113114 /// Set the sponsor of the collection.115 ///116 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.117 ///118 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.119 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {120 check_is_owner_or_admin(caller, self)?;121122 let sponsor = T::CrossAccountId::from_eth(sponsor);123 self.set_sponsor(sponsor.as_sub().clone())124 .map_err(dispatch_to_evm::<T>)?;125 save(self)126 }127128 /// Collection sponsorship confirmation.129 ///130 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.131 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {132 let caller = T::CrossAccountId::from_eth(caller);133 if !self134 .confirm_sponsorship(caller.as_sub())135 .map_err(dispatch_to_evm::<T>)?136 {137 return Err("caller is not set as sponsor".into());138 }139 save(self)140 }141142 /// Set limits for the collection.143 /// @dev Throws error if limit not found.144 /// @param limit Name of the limit. Valid names:145 /// "accountTokenOwnershipLimit",146 /// "sponsoredDataSize",147 /// "sponsoredDataRateLimit",148 /// "tokenLimit",149 /// "sponsorTransferTimeout",150 /// "sponsorApproveTimeout"151 /// @param value Value of the limit.152 #[solidity(rename_selector = "setCollectionLimit")]153 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {154 check_is_owner_or_admin(caller, self)?;155 let mut limits = self.limits.clone();156157 match limit.as_str() {158 "accountTokenOwnershipLimit" => {159 limits.account_token_ownership_limit = Some(value);160 }161 "sponsoredDataSize" => {162 limits.sponsored_data_size = Some(value);163 }164 "sponsoredDataRateLimit" => {165 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));166 }167 "tokenLimit" => {168 limits.token_limit = Some(value);169 }170 "sponsorTransferTimeout" => {171 limits.sponsor_transfer_timeout = Some(value);172 }173 "sponsorApproveTimeout" => {174 limits.sponsor_approve_timeout = Some(value);175 }176 _ => {177 return Err(Error::Revert(format!(178 "unknown integer limit \"{}\"",179 limit180 )))181 }182 }183 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)184 .map_err(dispatch_to_evm::<T>)?;185 save(self)186 }187188 /// Set limits for the collection.189 /// @dev Throws error if limit not found.190 /// @param limit Name of the limit. Valid names:191 /// "ownerCanTransfer",192 /// "ownerCanDestroy",193 /// "transfersEnabled"194 /// @param value Value of the limit.195 #[solidity(rename_selector = "setCollectionLimit")]196 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {197 check_is_owner_or_admin(caller, self)?;198 let mut limits = self.limits.clone();199200 match limit.as_str() {201 "ownerCanTransfer" => {202 limits.owner_can_transfer = Some(value);203 }204 "ownerCanDestroy" => {205 limits.owner_can_destroy = Some(value);206 }207 "transfersEnabled" => {208 limits.transfers_enabled = Some(value);209 }210 _ => {211 return Err(Error::Revert(format!(212 "unknown boolean limit \"{}\"",213 limit214 )))215 }216 }217 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)218 .map_err(dispatch_to_evm::<T>)?;219 save(self)220 }221222 /// Get contract address.223 fn contract_address(&self, _caller: caller) -> Result<address> {224 Ok(crate::eth::collection_id_to_address(self.id))225 }226227 /// Add collection admin by substrate address.228 /// @param new_admin Substrate administrator address.229 fn add_collection_admin_substrate(230 &mut self,231 caller: caller,232 new_admin: uint256,233 ) -> Result<void> {234 let caller = T::CrossAccountId::from_eth(caller);235 let mut new_admin_arr: [u8; 32] = Default::default();236 new_admin.to_big_endian(&mut new_admin_arr);237 let account_id = T::AccountId::from(new_admin_arr);238 let new_admin = T::CrossAccountId::from_sub(account_id);239 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;240 Ok(())241 }242243 /// Remove collection admin by substrate address.244 /// @param admin Substrate administrator address.245 fn remove_collection_admin_substrate(246 &mut self,247 caller: caller,248 admin: uint256,249 ) -> Result<void> {250 let caller = T::CrossAccountId::from_eth(caller);251 let mut admin_arr: [u8; 32] = Default::default();252 admin.to_big_endian(&mut admin_arr);253 let account_id = T::AccountId::from(admin_arr);254 let admin = T::CrossAccountId::from_sub(account_id);255 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;256 Ok(())257 }258259 /// Add collection admin.260 /// @param new_admin Address of the added administrator.261 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {262 let caller = T::CrossAccountId::from_eth(caller);263 let new_admin = T::CrossAccountId::from_eth(new_admin);264 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;265 Ok(())266 }267268 /// Remove collection admin.269 ///270 /// @param new_admin Address of the removed administrator.271 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {272 let caller = T::CrossAccountId::from_eth(caller);273 let admin = T::CrossAccountId::from_eth(admin);274 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;275 Ok(())276 }277278 /// Toggle accessibility of collection nesting.279 ///280 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'281 #[solidity(rename_selector = "setCollectionNesting")]282 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {283 check_is_owner_or_admin(caller, self)?;284285 let mut permissions = self.collection.permissions.clone();286 let mut nesting = permissions.nesting().clone();287 nesting.token_owner = enable;288 nesting.restricted = None;289 permissions.nesting = Some(nesting);290291 self.collection.permissions = <Pallet<T>>::clamp_permissions(292 self.collection.mode.clone(),293 &self.collection.permissions,294 permissions,295 )296 .map_err(dispatch_to_evm::<T>)?;297298 save(self)299 }300301 /// Toggle accessibility of collection nesting.302 ///303 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'304 /// @param collections Addresses of collections that will be available for nesting.305 #[solidity(rename_selector = "setCollectionNesting")]306 fn set_nesting(307 &mut self,308 caller: caller,309 enable: bool,310 collections: Vec<address>,311 ) -> Result<void> {312 if collections.is_empty() {313 return Err("no addresses provided".into());314 }315 check_is_owner_or_admin(caller, self)?;316317 let mut permissions = self.collection.permissions.clone();318 match enable {319 false => {320 let mut nesting = permissions.nesting().clone();321 nesting.token_owner = false;322 nesting.restricted = None;323 permissions.nesting = Some(nesting);324 }325 true => {326 let mut bv = OwnerRestrictedSet::new();327 for i in collections {328 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(329 "Can't convert address into collection id".into(),330 ))?)331 .map_err(|_| "too many collections")?;332 }333 let mut nesting = permissions.nesting().clone();334 nesting.token_owner = true;335 nesting.restricted = Some(bv);336 permissions.nesting = Some(nesting);337 }338 };339340 self.collection.permissions = <Pallet<T>>::clamp_permissions(341 self.collection.mode.clone(),342 &self.collection.permissions,343 permissions,344 )345 .map_err(dispatch_to_evm::<T>)?;346347 save(self)348 }349350 /// Set the collection access method.351 /// @param mode Access mode352 /// 0 for Normal353 /// 1 for AllowList354 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {355 check_is_owner_or_admin(caller, self)?;356 let permissions = CollectionPermissions {357 access: Some(match mode {358 0 => AccessMode::Normal,359 1 => AccessMode::AllowList,360 _ => return Err("not supported access mode".into()),361 }),362 ..Default::default()363 };364 self.collection.permissions = <Pallet<T>>::clamp_permissions(365 self.collection.mode.clone(),366 &self.collection.permissions,367 permissions,368 )369 .map_err(dispatch_to_evm::<T>)?;370371 save(self)372 }373374 /// Add the user to the allowed list.375 ///376 /// @param user Address of a trusted user.377 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {378 let caller = T::CrossAccountId::from_eth(caller);379 let user = T::CrossAccountId::from_eth(user);380 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;381 Ok(())382 }383384 /// Remove the user from the allowed list.385 ///386 /// @param user Address of a removed user.387 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {388 let caller = T::CrossAccountId::from_eth(caller);389 let user = T::CrossAccountId::from_eth(user);390 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;391 Ok(())392 }393394 /// Switch permission for minting.395 ///396 /// @param mode Enable if "true".397 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {398 check_is_owner_or_admin(caller, self)?;399 let permissions = CollectionPermissions {400 mint_mode: Some(mode),401 ..Default::default()402 };403 self.collection.permissions = <Pallet<T>>::clamp_permissions(404 self.collection.mode.clone(),405 &self.collection.permissions,406 permissions,407 )408 .map_err(dispatch_to_evm::<T>)?;409410 save(self)411 }412413 /// Check that account is the owner or admin of the collection414 ///415 /// @param user account to verify416 /// @return "true" if account is the owner or admin417 fn verify_owner_or_admin(&self, user: address) -> Result<bool> {418 Ok(check_is_owner_or_admin(user, self)419 .map(|_| true)420 .unwrap_or(false))421 }422423 /// Returns collection type424 ///425 /// @return `Fungible` or `NFT` or `ReFungible`426 fn unique_collection_type(&mut self) -> Result<string> {427 let mode = match self.collection.mode {428 CollectionMode::Fungible(_) => "Fungible",429 CollectionMode::NFT => "NFT",430 CollectionMode::ReFungible => "ReFungible",431 };432 Ok(mode.into())433 }434}435436fn check_is_owner_or_admin<T: Config>(437 caller: caller,438 collection: &CollectionHandle<T>,439) -> Result<T::CrossAccountId> {440 let caller = T::CrossAccountId::from_eth(caller);441 collection442 .check_is_owner_or_admin(&caller)443 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;444 Ok(caller)445}446447fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {448 // TODO possibly delete for the lack of transaction449 collection450 .check_is_internal()451 .map_err(dispatch_to_evm::<T>)?;452 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());453 Ok(())454}455456/// Contains static property keys and values.457pub mod static_property {458 use evm_coder::{459 execution::{Result, Error},460 };461 use alloc::format;462463 const EXPECT_CONVERT_ERROR: &str = "length < limit";464465 /// Keys.466 pub mod key {467 use super::*;468469 /// Key "schemaName".470 pub fn schema_name() -> up_data_structs::PropertyKey {471 property_key_from_bytes(b"schemaName").expect(EXPECT_CONVERT_ERROR)472 }473474 /// Key "baseURI".475 pub fn base_uri() -> up_data_structs::PropertyKey {476 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)477 }478479 /// Key "url".480 pub fn url() -> up_data_structs::PropertyKey {481 property_key_from_bytes(b"url").expect(EXPECT_CONVERT_ERROR)482 }483484 /// Key "suffix".485 pub fn suffix() -> up_data_structs::PropertyKey {486 property_key_from_bytes(b"suffix").expect(EXPECT_CONVERT_ERROR)487 }488489 /// Key "parentNft".490 pub fn parent_nft() -> up_data_structs::PropertyKey {491 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)492 }493 }494495 /// Values.496 pub mod value {497 use super::*;498499 /// Value "ERC721Metadata".500 pub const ERC721_METADATA: &[u8] = b"ERC721Metadata";501502 /// Value for [`ERC721_METADATA`].503 pub fn erc721() -> up_data_structs::PropertyValue {504 property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)505 }506 }507508 /// Convert `byte` to [`PropertyKey`].509 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {510 bytes.to_vec().try_into().map_err(|_| {511 Error::Revert(format!(512 "Property key is too long. Max length is {}.",513 up_data_structs::PropertyKey::bound()514 ))515 })516 }517518 /// Convert `bytes` to [`PropertyValue`].519 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {520 bytes.to_vec().try_into().map_err(|_| {521 Error::Revert(format!(522 "Property key is too long. Max length is {}.",523 up_data_structs::PropertyKey::bound()524 ))525 })526 }527}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! This module contains the implementation of pallet methods for evm.1819use evm_coder::{20 solidity_interface, solidity, ToLog,21 types::*,22 execution::{Result, Error},23};24pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};25use pallet_evm_coder_substrate::dispatch_to_evm;26use sp_std::vec::Vec;27use up_data_structs::{28 AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,29 SponsoringRateLimit,30};31use alloc::format;3233use crate::{34 Pallet, CollectionHandle, Config, CollectionProperties,35 eth::convert_substrate_address_to_cross_account_id,36};3738/// Events for ethereum collection helper.39#[derive(ToLog)]40pub enum CollectionHelpersEvents {41 /// The collection has been created.42 CollectionCreated {43 /// Collection owner.44 #[indexed]45 owner: address,4647 /// Collection ID.48 #[indexed]49 collection_id: address,50 },51}5253/// Does not always represent a full collection, for RFT it is either54/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).55pub trait CommonEvmHandler {56 const CODE: &'static [u8];5758 /// Call precompiled handle.59 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;60}6162/// @title A contract that allows you to work with collections.63#[solidity_interface(name = "Collection")]64impl<T: Config> CollectionHandle<T>65where66 T::AccountId: From<[u8; 32]>,67{68 /// Set collection property.69 ///70 /// @param key Property key.71 /// @param value Propery value.72 fn set_collection_property(73 &mut self,74 caller: caller,75 key: string,76 value: bytes,77 ) -> Result<void> {78 let caller = T::CrossAccountId::from_eth(caller);79 let key = <Vec<u8>>::from(key)80 .try_into()81 .map_err(|_| "key too large")?;82 let value = value.try_into().map_err(|_| "value too large")?;8384 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })85 .map_err(dispatch_to_evm::<T>)86 }8788 /// Delete collection property.89 ///90 /// @param key Property key.91 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {92 let caller = T::CrossAccountId::from_eth(caller);93 let key = <Vec<u8>>::from(key)94 .try_into()95 .map_err(|_| "key too large")?;9697 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)98 }99100 /// Get collection property.101 ///102 /// @dev Throws error if key not found.103 ///104 /// @param key Property key.105 /// @return bytes The property corresponding to the key.106 fn collection_property(&self, key: string) -> Result<bytes> {107 let key = <Vec<u8>>::from(key)108 .try_into()109 .map_err(|_| "key too large")?;110111 let props = <CollectionProperties<T>>::get(self.id);112 let prop = props.get(&key).ok_or("key not found")?;113114 Ok(prop.to_vec())115 }116117 /// Set the sponsor of the collection.118 ///119 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.120 ///121 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.122 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {123 check_is_owner_or_admin(caller, self)?;124125 let sponsor = T::CrossAccountId::from_eth(sponsor);126 self.set_sponsor(sponsor.as_sub().clone())127 .map_err(dispatch_to_evm::<T>)?;128 save(self)129 }130131 /// Collection sponsorship confirmation.132 ///133 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.134 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {135 let caller = T::CrossAccountId::from_eth(caller);136 if !self137 .confirm_sponsorship(caller.as_sub())138 .map_err(dispatch_to_evm::<T>)?139 {140 return Err("caller is not set as sponsor".into());141 }142 save(self)143 }144145 /// Set limits for the collection.146 /// @dev Throws error if limit not found.147 /// @param limit Name of the limit. Valid names:148 /// "accountTokenOwnershipLimit",149 /// "sponsoredDataSize",150 /// "sponsoredDataRateLimit",151 /// "tokenLimit",152 /// "sponsorTransferTimeout",153 /// "sponsorApproveTimeout"154 /// @param value Value of the limit.155 #[solidity(rename_selector = "setCollectionLimit")]156 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {157 check_is_owner_or_admin(caller, self)?;158 let mut limits = self.limits.clone();159160 match limit.as_str() {161 "accountTokenOwnershipLimit" => {162 limits.account_token_ownership_limit = Some(value);163 }164 "sponsoredDataSize" => {165 limits.sponsored_data_size = Some(value);166 }167 "sponsoredDataRateLimit" => {168 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));169 }170 "tokenLimit" => {171 limits.token_limit = Some(value);172 }173 "sponsorTransferTimeout" => {174 limits.sponsor_transfer_timeout = Some(value);175 }176 "sponsorApproveTimeout" => {177 limits.sponsor_approve_timeout = Some(value);178 }179 _ => {180 return Err(Error::Revert(format!(181 "unknown integer limit \"{}\"",182 limit183 )))184 }185 }186 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)187 .map_err(dispatch_to_evm::<T>)?;188 save(self)189 }190191 /// Set limits for the collection.192 /// @dev Throws error if limit not found.193 /// @param limit Name of the limit. Valid names:194 /// "ownerCanTransfer",195 /// "ownerCanDestroy",196 /// "transfersEnabled"197 /// @param value Value of the limit.198 #[solidity(rename_selector = "setCollectionLimit")]199 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {200 check_is_owner_or_admin(caller, self)?;201 let mut limits = self.limits.clone();202203 match limit.as_str() {204 "ownerCanTransfer" => {205 limits.owner_can_transfer = Some(value);206 }207 "ownerCanDestroy" => {208 limits.owner_can_destroy = Some(value);209 }210 "transfersEnabled" => {211 limits.transfers_enabled = Some(value);212 }213 _ => {214 return Err(Error::Revert(format!(215 "unknown boolean limit \"{}\"",216 limit217 )))218 }219 }220 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)221 .map_err(dispatch_to_evm::<T>)?;222 save(self)223 }224225 /// Get contract address.226 fn contract_address(&self, _caller: caller) -> Result<address> {227 Ok(crate::eth::collection_id_to_address(self.id))228 }229230 /// Add collection admin by substrate address.231 /// @param new_admin Substrate administrator address.232 fn add_collection_admin_substrate(233 &mut self,234 caller: caller,235 new_admin: uint256,236 ) -> Result<void> {237 let caller = T::CrossAccountId::from_eth(caller);238 let new_admin = convert_substrate_address_to_cross_account_id::<T>(new_admin);239 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;240 Ok(())241 }242243 /// Remove collection admin by substrate address.244 /// @param admin Substrate administrator address.245 fn remove_collection_admin_substrate(246 &mut self,247 caller: caller,248 admin: uint256,249 ) -> Result<void> {250 let caller = T::CrossAccountId::from_eth(caller);251 let admin = convert_substrate_address_to_cross_account_id::<T>(admin);252 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;253 Ok(())254 }255256 /// Add collection admin.257 /// @param new_admin Address of the added administrator.258 fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {259 let caller = T::CrossAccountId::from_eth(caller);260 let new_admin = T::CrossAccountId::from_eth(new_admin);261 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;262 Ok(())263 }264265 /// Remove collection admin.266 ///267 /// @param new_admin Address of the removed administrator.268 fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {269 let caller = T::CrossAccountId::from_eth(caller);270 let admin = T::CrossAccountId::from_eth(admin);271 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;272 Ok(())273 }274275 /// Toggle accessibility of collection nesting.276 ///277 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'278 #[solidity(rename_selector = "setCollectionNesting")]279 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {280 check_is_owner_or_admin(caller, self)?;281282 let mut permissions = self.collection.permissions.clone();283 let mut nesting = permissions.nesting().clone();284 nesting.token_owner = enable;285 nesting.restricted = None;286 permissions.nesting = Some(nesting);287288 self.collection.permissions = <Pallet<T>>::clamp_permissions(289 self.collection.mode.clone(),290 &self.collection.permissions,291 permissions,292 )293 .map_err(dispatch_to_evm::<T>)?;294295 save(self)296 }297298 /// Toggle accessibility of collection nesting.299 ///300 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'301 /// @param collections Addresses of collections that will be available for nesting.302 #[solidity(rename_selector = "setCollectionNesting")]303 fn set_nesting(304 &mut self,305 caller: caller,306 enable: bool,307 collections: Vec<address>,308 ) -> Result<void> {309 if collections.is_empty() {310 return Err("no addresses provided".into());311 }312 check_is_owner_or_admin(caller, self)?;313314 let mut permissions = self.collection.permissions.clone();315 match enable {316 false => {317 let mut nesting = permissions.nesting().clone();318 nesting.token_owner = false;319 nesting.restricted = None;320 permissions.nesting = Some(nesting);321 }322 true => {323 let mut bv = OwnerRestrictedSet::new();324 for i in collections {325 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(326 "Can't convert address into collection id".into(),327 ))?)328 .map_err(|_| "too many collections")?;329 }330 let mut nesting = permissions.nesting().clone();331 nesting.token_owner = true;332 nesting.restricted = Some(bv);333 permissions.nesting = Some(nesting);334 }335 };336337 self.collection.permissions = <Pallet<T>>::clamp_permissions(338 self.collection.mode.clone(),339 &self.collection.permissions,340 permissions,341 )342 .map_err(dispatch_to_evm::<T>)?;343344 save(self)345 }346347 /// Set the collection access method.348 /// @param mode Access mode349 /// 0 for Normal350 /// 1 for AllowList351 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {352 check_is_owner_or_admin(caller, self)?;353 let permissions = CollectionPermissions {354 access: Some(match mode {355 0 => AccessMode::Normal,356 1 => AccessMode::AllowList,357 _ => return Err("not supported access mode".into()),358 }),359 ..Default::default()360 };361 self.collection.permissions = <Pallet<T>>::clamp_permissions(362 self.collection.mode.clone(),363 &self.collection.permissions,364 permissions,365 )366 .map_err(dispatch_to_evm::<T>)?;367368 save(self)369 }370371 /// Add the user to the allowed list.372 ///373 /// @param user Address of a trusted user.374 fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {375 let caller = T::CrossAccountId::from_eth(caller);376 let user = T::CrossAccountId::from_eth(user);377 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;378 Ok(())379 }380381 /// Remove the user from the allowed list.382 ///383 /// @param user Address of a removed user.384 fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {385 let caller = T::CrossAccountId::from_eth(caller);386 let user = T::CrossAccountId::from_eth(user);387 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;388 Ok(())389 }390391 /// Switch permission for minting.392 ///393 /// @param mode Enable if "true".394 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {395 check_is_owner_or_admin(caller, self)?;396 let permissions = CollectionPermissions {397 mint_mode: Some(mode),398 ..Default::default()399 };400 self.collection.permissions = <Pallet<T>>::clamp_permissions(401 self.collection.mode.clone(),402 &self.collection.permissions,403 permissions,404 )405 .map_err(dispatch_to_evm::<T>)?;406407 save(self)408 }409410 /// Check that account is the owner or admin of the collection411 ///412 /// @param user account to verify413 /// @return "true" if account is the owner or admin414 #[solidity(rename_selector = "isOwnerOrAdmin")]415 fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {416 let user = T::CrossAccountId::from_eth(user);417 Ok(self.is_owner_or_admin(&user))418 }419420 /// Check that substrate account is the owner or admin of the collection421 ///422 /// @param user account to verify423 /// @return "true" if account is the owner or admin424 fn is_owner_or_admin_substrate(&self, user: uint256) -> Result<bool> {425 let user = convert_substrate_address_to_cross_account_id::<T>(user);426 Ok(self.is_owner_or_admin(&user))427 }428429 /// Returns collection type430 ///431 /// @return `Fungible` or `NFT` or `ReFungible`432 fn unique_collection_type(&mut self) -> Result<string> {433 let mode = match self.collection.mode {434 CollectionMode::Fungible(_) => "Fungible",435 CollectionMode::NFT => "NFT",436 CollectionMode::ReFungible => "ReFungible",437 };438 Ok(mode.into())439 }440441 /// Changes collection owner to another account442 ///443 /// @dev Owner can be changed only by current owner444 /// @param newOwner new owner account445 fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {446 let caller = T::CrossAccountId::from_eth(caller);447 let new_owner = T::CrossAccountId::from_eth(new_owner);448 self.set_owner_internal(caller, new_owner)449 .map_err(dispatch_to_evm::<T>)450 }451452 /// Changes collection owner to another substrate account453 ///454 /// @dev Owner can be changed only by current owner455 /// @param newOwner new owner substrate account456 fn set_owner_substrate(&mut self, caller: caller, new_owner: uint256) -> Result<void> {457 let caller = T::CrossAccountId::from_eth(caller);458 let new_owner = convert_substrate_address_to_cross_account_id::<T>(new_owner);459 self.set_owner_internal(caller, new_owner)460 .map_err(dispatch_to_evm::<T>)461 }462}463464fn check_is_owner_or_admin<T: Config>(465 caller: caller,466 collection: &CollectionHandle<T>,467) -> Result<T::CrossAccountId> {468 let caller = T::CrossAccountId::from_eth(caller);469 collection470 .check_is_owner_or_admin(&caller)471 .map_err(dispatch_to_evm::<T>)?;472 Ok(caller)473}474475fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {476 // TODO possibly delete for the lack of transaction477 collection.consume_store_writes(1)?;478 collection479 .check_is_internal()480 .map_err(dispatch_to_evm::<T>)?;481 collection.save().map_err(dispatch_to_evm::<T>)?;482 Ok(())483}484485/// Contains static property keys and values.486pub mod static_property {487 use evm_coder::{488 execution::{Result, Error},489 };490 use alloc::format;491492 const EXPECT_CONVERT_ERROR: &str = "length < limit";493494 /// Keys.495 pub mod key {496 use super::*;497498 /// Key "schemaName".499 pub fn schema_name() -> up_data_structs::PropertyKey {500 property_key_from_bytes(b"schemaName").expect(EXPECT_CONVERT_ERROR)501 }502503 /// Key "baseURI".504 pub fn base_uri() -> up_data_structs::PropertyKey {505 property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)506 }507508 /// Key "url".509 pub fn url() -> up_data_structs::PropertyKey {510 property_key_from_bytes(b"url").expect(EXPECT_CONVERT_ERROR)511 }512513 /// Key "suffix".514 pub fn suffix() -> up_data_structs::PropertyKey {515 property_key_from_bytes(b"suffix").expect(EXPECT_CONVERT_ERROR)516 }517518 /// Key "parentNft".519 pub fn parent_nft() -> up_data_structs::PropertyKey {520 property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)521 }522 }523524 /// Values.525 pub mod value {526 use super::*;527528 /// Value "ERC721Metadata".529 pub const ERC721_METADATA: &[u8] = b"ERC721Metadata";530531 /// Value for [`ERC721_METADATA`].532 pub fn erc721() -> up_data_structs::PropertyValue {533 property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)534 }535 }536537 /// Convert `byte` to [`PropertyKey`].538 pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {539 bytes.to_vec().try_into().map_err(|_| {540 Error::Revert(format!(541 "Property key is too long. Max length is {}.",542 up_data_structs::PropertyKey::bound()543 ))544 })545 }546547 /// Convert `bytes` to [`PropertyValue`].548 pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {549 bytes.to_vec().try_into().map_err(|_| {550 Error::Revert(format!(551 "Property key is too long. Max length is {}.",552 up_data_structs::PropertyKey::bound()553 ))554 })555 }556}pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -16,9 +16,13 @@
//! The module contains a number of functions for converting and checking ethereum identifiers.
+use evm_coder::{types::*};
+pub use pallet_evm::account::CrossAccountId;
+use sp_core::H160;
use up_data_structs::CollectionId;
-use sp_core::H160;
+use crate::Config;
+
// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 1
// TODO: Unhardcode prefix
const ETH_COLLECTION_PREFIX: [u8; 16] = [
@@ -47,3 +51,16 @@
pub fn is_collection(address: &H160) -> bool {
address[0..16] == ETH_COLLECTION_PREFIX
}
+
+/// Converts Substrate address to CrossAccountId
+pub fn convert_substrate_address_to_cross_account_id<T: Config>(
+ address: uint256,
+) -> T::CrossAccountId
+where
+ T::AccountId: From<[u8; 32]>,
+{
+ let mut address_arr: [u8; 32] = Default::default();
+ address.to_big_endian(&mut address_arr);
+ let account_id = T::AccountId::from(address_arr);
+ T::CrossAccountId::from_sub(account_id)
+}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -203,8 +203,8 @@
}
/// Save collection to storage.
- pub fn save(self) -> DispatchResult {
- <CollectionById<T>>::insert(self.id, self.collection);
+ pub fn save(&self) -> DispatchResult {
+ <CollectionById<T>>::insert(self.id, &self.collection);
Ok(())
}
@@ -302,6 +302,17 @@
);
Ok(())
}
+
+ /// Changes collection owner to another account
+ fn set_owner_internal(
+ &mut self,
+ caller: T::CrossAccountId,
+ new_owner: T::CrossAccountId,
+ ) -> DispatchResult {
+ self.check_is_owner(&caller)?;
+ self.collection.owner = new_owner.as_sub().clone();
+ self.save()
+ }
}
#[frame_support::pallet]
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -31,7 +31,103 @@
);
}
-// Selector: 6cf113cd
+// Selector: 79cc6790
+contract ERC20UniqueExtensions is Dummy, ERC165 {
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ from;
+ amount;
+ dummy = 0;
+ return false;
+ }
+}
+
+// Selector: 942e8b22
+contract ERC20 is Dummy, ERC165, ERC20Events {
+ // Selector: name() 06fdde03
+ function name() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
+ // Selector: symbol() 95d89b41
+ function symbol() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+
+ // Selector: decimals() 313ce567
+ function decimals() public view returns (uint8) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+
+ // Selector: balanceOf(address) 70a08231
+ function balanceOf(address owner) public view returns (uint256) {
+ require(false, stub_error);
+ owner;
+ dummy;
+ return 0;
+ }
+
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ to;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
+ // Selector: transferFrom(address,address,uint256) 23b872dd
+ function transferFrom(
+ address from,
+ address to,
+ uint256 amount
+ ) public returns (bool) {
+ require(false, stub_error);
+ from;
+ to;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
+ // Selector: approve(address,uint256) 095ea7b3
+ function approve(address spender, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ spender;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
+ // Selector: allowance(address,address) dd62ed3e
+ function allowance(address owner, address spender)
+ public
+ view
+ returns (uint256)
+ {
+ require(false, stub_error);
+ owner;
+ spender;
+ dummy;
+ return 0;
+ }
+}
+
+// Selector: ffe4da23
contract Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -262,119 +358,60 @@
// @param user account to verify
// @return "true" if account is the owner or admin
//
- // Selector: verifyOwnerOrAdmin(address) c2282493
- function verifyOwnerOrAdmin(address user) public view returns (bool) {
+ // Selector: isOwnerOrAdmin(address) 9811b0c7
+ function isOwnerOrAdmin(address user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
return false;
}
+ // Check that substrate account is the owner or admin of the collection
+ //
+ // @param user account to verify
+ // @return "true" if account is the owner or admin
+ //
+ // Selector: isOwnerOrAdminSubstrate(uint256) 68910e00
+ function isOwnerOrAdminSubstrate(uint256 user) public view returns (bool) {
+ require(false, stub_error);
+ user;
+ dummy;
+ return false;
+ }
+
// Returns collection type
//
// @return `Fungible` or `NFT` or `ReFungible`
//
// Selector: uniqueCollectionType() d34b55b8
function uniqueCollectionType() public returns (string memory) {
- require(false, stub_error);
- dummy = 0;
- return "";
- }
-}
-
-// Selector: 79cc6790
-contract ERC20UniqueExtensions is Dummy, ERC165 {
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 amount) public returns (bool) {
require(false, stub_error);
- from;
- amount;
dummy = 0;
- return false;
- }
-}
-
-// Selector: 942e8b22
-contract ERC20 is Dummy, ERC165, ERC20Events {
- // Selector: name() 06fdde03
- function name() public view returns (string memory) {
- require(false, stub_error);
- dummy;
return "";
}
- // Selector: symbol() 95d89b41
- function symbol() public view returns (string memory) {
- require(false, stub_error);
- dummy;
- return "";
- }
-
- // Selector: totalSupply() 18160ddd
- function totalSupply() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- // Selector: decimals() 313ce567
- function decimals() public view returns (uint8) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- // Selector: balanceOf(address) 70a08231
- function balanceOf(address owner) public view returns (uint256) {
- require(false, stub_error);
- owner;
- dummy;
- return 0;
- }
-
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 amount) public returns (bool) {
+ // Changes collection owner to another account
+ //
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner account
+ //
+ // Selector: setOwner(address) 13af4035
+ function setOwner(address newOwner) public {
require(false, stub_error);
- to;
- amount;
+ newOwner;
dummy = 0;
- return false;
}
- // Selector: transferFrom(address,address,uint256) 23b872dd
- function transferFrom(
- address from,
- address to,
- uint256 amount
- ) public returns (bool) {
+ // Changes collection owner to another substrate account
+ //
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner substrate account
+ //
+ // Selector: setOwnerSubstrate(uint256) b212138f
+ function setOwnerSubstrate(uint256 newOwner) public {
require(false, stub_error);
- from;
- to;
- amount;
- dummy = 0;
- return false;
- }
-
- // Selector: approve(address,uint256) 095ea7b3
- function approve(address spender, uint256 amount) public returns (bool) {
- require(false, stub_error);
- spender;
- amount;
+ newOwner;
dummy = 0;
- return false;
- }
-
- // Selector: allowance(address,address) dd62ed3e
- function allowance(address owner, address spender)
- public
- view
- returns (uint256)
- {
- require(false, stub_error);
- owner;
- spender;
- dummy;
- return 0;
}
}
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
@@ -373,7 +373,128 @@
}
}
-// Selector: 6cf113cd
+// Selector: 780e9d63
+contract ERC721Enumerable is Dummy, ERC165 {
+ // @notice Enumerate valid NFTs
+ // @param index A counter less than `totalSupply()`
+ // @return The token identifier for the `index`th NFT,
+ // (sort order not specified)
+ //
+ // Selector: tokenByIndex(uint256) 4f6ccce7
+ function tokenByIndex(uint256 index) public view returns (uint256) {
+ require(false, stub_error);
+ index;
+ dummy;
+ return 0;
+ }
+
+ // @dev Not implemented
+ //
+ // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
+ function tokenOfOwnerByIndex(address owner, uint256 index)
+ public
+ view
+ returns (uint256)
+ {
+ require(false, stub_error);
+ owner;
+ index;
+ dummy;
+ return 0;
+ }
+
+ // @notice Count NFTs tracked by this contract
+ // @return A count of valid NFTs tracked by this contract, where each one of
+ // them has an assigned and queryable owner not equal to the zero address
+ //
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+}
+
+// Selector: d74d154f
+contract ERC721UniqueExtensions is Dummy, ERC165 {
+ // @notice Transfer ownership of an NFT
+ // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ // is the zero address. Throws if `tokenId` is not a valid NFT.
+ // @param to The new owner
+ // @param tokenId The NFT to transfer
+ // @param _value Not used for an NFT
+ //
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 tokenId) public {
+ require(false, stub_error);
+ to;
+ tokenId;
+ dummy = 0;
+ }
+
+ // @notice Burns a specific ERC721 token.
+ // @dev Throws unless `msg.sender` is the current owner or an authorized
+ // operator for this NFT. Throws if `from` is not the current owner. Throws
+ // if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
+ // @param from The current owner of the NFT
+ // @param tokenId The NFT to transfer
+ // @param _value Not used for an NFT
+ //
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 tokenId) public {
+ require(false, stub_error);
+ from;
+ tokenId;
+ dummy = 0;
+ }
+
+ // @notice Returns next free NFT ID.
+ //
+ // Selector: nextTokenId() 75794a3c
+ function nextTokenId() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+
+ // @notice Function to mint multiple tokens.
+ // @dev `tokenIds` should be an array of consecutive numbers and first number
+ // should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokenIds IDs of the minted NFTs
+ //
+ // Selector: mintBulk(address,uint256[]) 44a9945e
+ function mintBulk(address to, uint256[] memory tokenIds)
+ public
+ returns (bool)
+ {
+ require(false, stub_error);
+ to;
+ tokenIds;
+ dummy = 0;
+ return false;
+ }
+
+ // @notice Function to mint multiple tokens with the given tokenUris.
+ // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+ // numbers and first number should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokens array of pairs of token ID and token URI for minted tokens
+ //
+ // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
+ function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
+ public
+ returns (bool)
+ {
+ require(false, stub_error);
+ to;
+ tokens;
+ dummy = 0;
+ return false;
+ }
+}
+
+// Selector: ffe4da23
contract Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -604,144 +725,60 @@
// @param user account to verify
// @return "true" if account is the owner or admin
//
- // Selector: verifyOwnerOrAdmin(address) c2282493
- function verifyOwnerOrAdmin(address user) public view returns (bool) {
+ // Selector: isOwnerOrAdmin(address) 9811b0c7
+ function isOwnerOrAdmin(address user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
return false;
}
- // Returns collection type
- //
- // @return `Fungible` or `NFT` or `ReFungible`
- //
- // Selector: uniqueCollectionType() d34b55b8
- function uniqueCollectionType() public returns (string memory) {
- require(false, stub_error);
- dummy = 0;
- return "";
- }
-}
-
-// Selector: 780e9d63
-contract ERC721Enumerable is Dummy, ERC165 {
- // @notice Enumerate valid NFTs
- // @param index A counter less than `totalSupply()`
- // @return The token identifier for the `index`th NFT,
- // (sort order not specified)
+ // Check that substrate account is the owner or admin of the collection
//
- // Selector: tokenByIndex(uint256) 4f6ccce7
- function tokenByIndex(uint256 index) public view returns (uint256) {
- require(false, stub_error);
- index;
- dummy;
- return 0;
- }
-
- // @dev Not implemented
+ // @param user account to verify
+ // @return "true" if account is the owner or admin
//
- // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
- function tokenOfOwnerByIndex(address owner, uint256 index)
- public
- view
- returns (uint256)
- {
+ // Selector: isOwnerOrAdminSubstrate(uint256) 68910e00
+ function isOwnerOrAdminSubstrate(uint256 user) public view returns (bool) {
require(false, stub_error);
- owner;
- index;
+ user;
dummy;
- return 0;
+ return false;
}
- // @notice Count NFTs tracked by this contract
- // @return A count of valid NFTs tracked by this contract, where each one of
- // them has an assigned and queryable owner not equal to the zero address
+ // Returns collection type
//
- // Selector: totalSupply() 18160ddd
- function totalSupply() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-}
-
-// Selector: d74d154f
-contract ERC721UniqueExtensions is Dummy, ERC165 {
- // @notice Transfer ownership of an NFT
- // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
- // is the zero address. Throws if `tokenId` is not a valid NFT.
- // @param to The new owner
- // @param tokenId The NFT to transfer
- // @param _value Not used for an NFT
+ // @return `Fungible` or `NFT` or `ReFungible`
//
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 tokenId) public {
- require(false, stub_error);
- to;
- tokenId;
- dummy = 0;
- }
-
- // @notice Burns a specific ERC721 token.
- // @dev Throws unless `msg.sender` is the current owner or an authorized
- // operator for this NFT. Throws if `from` is not the current owner. Throws
- // if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
- // @param from The current owner of the NFT
- // @param tokenId The NFT to transfer
- // @param _value Not used for an NFT
- //
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 tokenId) public {
+ // Selector: uniqueCollectionType() d34b55b8
+ function uniqueCollectionType() public returns (string memory) {
require(false, stub_error);
- from;
- tokenId;
dummy = 0;
+ return "";
}
- // @notice Returns next free NFT ID.
+ // Changes collection owner to another account
//
- // Selector: nextTokenId() 75794a3c
- function nextTokenId() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- // @notice Function to mint multiple tokens.
- // @dev `tokenIds` should be an array of consecutive numbers and first number
- // should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokenIds IDs of the minted NFTs
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner account
//
- // Selector: mintBulk(address,uint256[]) 44a9945e
- function mintBulk(address to, uint256[] memory tokenIds)
- public
- returns (bool)
- {
+ // Selector: setOwner(address) 13af4035
+ function setOwner(address newOwner) public {
require(false, stub_error);
- to;
- tokenIds;
+ newOwner;
dummy = 0;
- return false;
}
- // @notice Function to mint multiple tokens with the given tokenUris.
- // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
- // numbers and first number should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokens array of pairs of token ID and token URI for minted tokens
+ // Changes collection owner to another substrate account
+ //
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner substrate account
//
- // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
- function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
- public
- returns (bool)
- {
+ // Selector: setOwnerSubstrate(uint256) b212138f
+ function setOwnerSubstrate(uint256 newOwner) public {
require(false, stub_error);
- to;
- tokens;
+ newOwner;
dummy = 0;
- return false;
}
}
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -371,7 +371,142 @@
}
}
-// Selector: 6cf113cd
+// Selector: 780e9d63
+contract ERC721Enumerable is Dummy, ERC165 {
+ // @notice Enumerate valid RFTs
+ // @param index A counter less than `totalSupply()`
+ // @return The token identifier for the `index`th NFT,
+ // (sort order not specified)
+ //
+ // Selector: tokenByIndex(uint256) 4f6ccce7
+ function tokenByIndex(uint256 index) public view returns (uint256) {
+ require(false, stub_error);
+ index;
+ dummy;
+ return 0;
+ }
+
+ // Not implemented
+ //
+ // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
+ function tokenOfOwnerByIndex(address owner, uint256 index)
+ public
+ view
+ returns (uint256)
+ {
+ require(false, stub_error);
+ owner;
+ index;
+ dummy;
+ return 0;
+ }
+
+ // @notice Count RFTs tracked by this contract
+ // @return A count of valid RFTs tracked by this contract, where each one of
+ // them has an assigned and queryable owner not equal to the zero address
+ //
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+}
+
+// Selector: 7c3bef89
+contract ERC721UniqueExtensions is Dummy, ERC165 {
+ // @notice Transfer ownership of an RFT
+ // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ // is the zero address. Throws if `tokenId` is not a valid RFT.
+ // Throws if RFT pieces have multiple owners.
+ // @param to The new owner
+ // @param tokenId The RFT to transfer
+ // @param _value Not used for an RFT
+ //
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 tokenId) public {
+ require(false, stub_error);
+ to;
+ tokenId;
+ dummy = 0;
+ }
+
+ // @notice Burns a specific ERC721 token.
+ // @dev Throws unless `msg.sender` is the current owner or an authorized
+ // operator for this RFT. Throws if `from` is not the current owner. Throws
+ // if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
+ // Throws if RFT pieces have multiple owners.
+ // @param from The current owner of the RFT
+ // @param tokenId The RFT to transfer
+ // @param _value Not used for an RFT
+ //
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 tokenId) public {
+ require(false, stub_error);
+ from;
+ tokenId;
+ dummy = 0;
+ }
+
+ // @notice Returns next free RFT ID.
+ //
+ // Selector: nextTokenId() 75794a3c
+ function nextTokenId() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+
+ // @notice Function to mint multiple tokens.
+ // @dev `tokenIds` should be an array of consecutive numbers and first number
+ // should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokenIds IDs of the minted RFTs
+ //
+ // Selector: mintBulk(address,uint256[]) 44a9945e
+ function mintBulk(address to, uint256[] memory tokenIds)
+ public
+ returns (bool)
+ {
+ require(false, stub_error);
+ to;
+ tokenIds;
+ dummy = 0;
+ return false;
+ }
+
+ // @notice Function to mint multiple tokens with the given tokenUris.
+ // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+ // numbers and first number should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokens array of pairs of token ID and token URI for minted tokens
+ //
+ // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
+ function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
+ public
+ returns (bool)
+ {
+ require(false, stub_error);
+ to;
+ tokens;
+ dummy = 0;
+ return false;
+ }
+
+ // Returns EVM address for refungible token
+ //
+ // @param token ID of the token
+ //
+ // Selector: tokenContractAddress(uint256) ab76fac6
+ function tokenContractAddress(uint256 token) public view returns (address) {
+ require(false, stub_error);
+ token;
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
+}
+
+// Selector: ffe4da23
contract Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -602,158 +737,60 @@
// @param user account to verify
// @return "true" if account is the owner or admin
//
- // Selector: verifyOwnerOrAdmin(address) c2282493
- function verifyOwnerOrAdmin(address user) public view returns (bool) {
+ // Selector: isOwnerOrAdmin(address) 9811b0c7
+ function isOwnerOrAdmin(address user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
return false;
}
- // Returns collection type
- //
- // @return `Fungible` or `NFT` or `ReFungible`
- //
- // Selector: uniqueCollectionType() d34b55b8
- function uniqueCollectionType() public returns (string memory) {
- require(false, stub_error);
- dummy = 0;
- return "";
- }
-}
-
-// Selector: 780e9d63
-contract ERC721Enumerable is Dummy, ERC165 {
- // @notice Enumerate valid RFTs
- // @param index A counter less than `totalSupply()`
- // @return The token identifier for the `index`th NFT,
- // (sort order not specified)
+ // Check that substrate account is the owner or admin of the collection
//
- // Selector: tokenByIndex(uint256) 4f6ccce7
- function tokenByIndex(uint256 index) public view returns (uint256) {
- require(false, stub_error);
- index;
- dummy;
- return 0;
- }
-
- // Not implemented
+ // @param user account to verify
+ // @return "true" if account is the owner or admin
//
- // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
- function tokenOfOwnerByIndex(address owner, uint256 index)
- public
- view
- returns (uint256)
- {
+ // Selector: isOwnerOrAdminSubstrate(uint256) 68910e00
+ function isOwnerOrAdminSubstrate(uint256 user) public view returns (bool) {
require(false, stub_error);
- owner;
- index;
+ user;
dummy;
- return 0;
+ return false;
}
- // @notice Count RFTs tracked by this contract
- // @return A count of valid RFTs tracked by this contract, where each one of
- // them has an assigned and queryable owner not equal to the zero address
+ // Returns collection type
//
- // Selector: totalSupply() 18160ddd
- function totalSupply() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-}
-
-// Selector: 7c3bef89
-contract ERC721UniqueExtensions is Dummy, ERC165 {
- // @notice Transfer ownership of an RFT
- // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
- // is the zero address. Throws if `tokenId` is not a valid RFT.
- // Throws if RFT pieces have multiple owners.
- // @param to The new owner
- // @param tokenId The RFT to transfer
- // @param _value Not used for an RFT
+ // @return `Fungible` or `NFT` or `ReFungible`
//
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 tokenId) public {
+ // Selector: uniqueCollectionType() d34b55b8
+ function uniqueCollectionType() public returns (string memory) {
require(false, stub_error);
- to;
- tokenId;
dummy = 0;
+ return "";
}
- // @notice Burns a specific ERC721 token.
- // @dev Throws unless `msg.sender` is the current owner or an authorized
- // operator for this RFT. Throws if `from` is not the current owner. Throws
- // if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
- // Throws if RFT pieces have multiple owners.
- // @param from The current owner of the RFT
- // @param tokenId The RFT to transfer
- // @param _value Not used for an RFT
+ // Changes collection owner to another account
+ //
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner account
//
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 tokenId) public {
+ // Selector: setOwner(address) 13af4035
+ function setOwner(address newOwner) public {
require(false, stub_error);
- from;
- tokenId;
+ newOwner;
dummy = 0;
}
- // @notice Returns next free RFT ID.
+ // Changes collection owner to another substrate account
//
- // Selector: nextTokenId() 75794a3c
- function nextTokenId() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- // @notice Function to mint multiple tokens.
- // @dev `tokenIds` should be an array of consecutive numbers and first number
- // should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokenIds IDs of the minted RFTs
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner substrate account
//
- // Selector: mintBulk(address,uint256[]) 44a9945e
- function mintBulk(address to, uint256[] memory tokenIds)
- public
- returns (bool)
- {
+ // Selector: setOwnerSubstrate(uint256) b212138f
+ function setOwnerSubstrate(uint256 newOwner) public {
require(false, stub_error);
- to;
- tokenIds;
- dummy = 0;
- return false;
- }
-
- // @notice Function to mint multiple tokens with the given tokenUris.
- // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
- // numbers and first number should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokens array of pairs of token ID and token URI for minted tokens
- //
- // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
- function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
- public
- returns (bool)
- {
- require(false, stub_error);
- to;
- tokens;
+ newOwner;
dummy = 0;
- return false;
- }
-
- // Returns EVM address for refungible token
- //
- // @param token ID of the token
- //
- // Selector: tokenContractAddress(uint256) ab76fac6
- function tokenContractAddress(uint256 token) public view returns (address) {
- require(false, stub_error);
- token;
- dummy;
- return 0x0000000000000000000000000000000000000000;
}
}
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -22,7 +22,50 @@
);
}
-// Selector: 6cf113cd
+// Selector: 79cc6790
+interface ERC20UniqueExtensions is Dummy, ERC165 {
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 amount) external returns (bool);
+}
+
+// Selector: 942e8b22
+interface ERC20 is Dummy, ERC165, ERC20Events {
+ // Selector: name() 06fdde03
+ function name() external view returns (string memory);
+
+ // Selector: symbol() 95d89b41
+ function symbol() external view returns (string memory);
+
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() external view returns (uint256);
+
+ // Selector: decimals() 313ce567
+ function decimals() external view returns (uint8);
+
+ // Selector: balanceOf(address) 70a08231
+ function balanceOf(address owner) external view returns (uint256);
+
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 amount) external returns (bool);
+
+ // Selector: transferFrom(address,address,uint256) 23b872dd
+ function transferFrom(
+ address from,
+ address to,
+ uint256 amount
+ ) external returns (bool);
+
+ // Selector: approve(address,uint256) 095ea7b3
+ function approve(address spender, uint256 amount) external returns (bool);
+
+ // Selector: allowance(address,address) dd62ed3e
+ function allowance(address owner, address spender)
+ external
+ view
+ returns (uint256);
+}
+
+// Selector: ffe4da23
interface Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -174,8 +217,16 @@
// @param user account to verify
// @return "true" if account is the owner or admin
//
- // Selector: verifyOwnerOrAdmin(address) c2282493
- function verifyOwnerOrAdmin(address user) external view returns (bool);
+ // Selector: isOwnerOrAdmin(address) 9811b0c7
+ function isOwnerOrAdmin(address user) external view returns (bool);
+
+ // Check that substrate account is the owner or admin of the collection
+ //
+ // @param user account to verify
+ // @return "true" if account is the owner or admin
+ //
+ // Selector: isOwnerOrAdminSubstrate(uint256) 68910e00
+ function isOwnerOrAdminSubstrate(uint256 user) external view returns (bool);
// Returns collection type
//
@@ -183,49 +234,22 @@
//
// Selector: uniqueCollectionType() d34b55b8
function uniqueCollectionType() external returns (string memory);
-}
-// Selector: 79cc6790
-interface ERC20UniqueExtensions is Dummy, ERC165 {
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 amount) external returns (bool);
-}
+ // Changes collection owner to another account
+ //
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner account
+ //
+ // Selector: setOwner(address) 13af4035
+ function setOwner(address newOwner) external;
-// Selector: 942e8b22
-interface ERC20 is Dummy, ERC165, ERC20Events {
- // Selector: name() 06fdde03
- function name() external view returns (string memory);
-
- // Selector: symbol() 95d89b41
- function symbol() external view returns (string memory);
-
- // Selector: totalSupply() 18160ddd
- function totalSupply() external view returns (uint256);
-
- // Selector: decimals() 313ce567
- function decimals() external view returns (uint8);
-
- // Selector: balanceOf(address) 70a08231
- function balanceOf(address owner) external view returns (uint256);
-
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 amount) external returns (bool);
-
- // Selector: transferFrom(address,address,uint256) 23b872dd
- function transferFrom(
- address from,
- address to,
- uint256 amount
- ) external returns (bool);
-
- // Selector: approve(address,uint256) 095ea7b3
- function approve(address spender, uint256 amount) external returns (bool);
-
- // Selector: allowance(address,address) dd62ed3e
- function allowance(address owner, address spender)
- external
- view
- returns (uint256);
+ // Changes collection owner to another substrate account
+ //
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner substrate account
+ //
+ // Selector: setOwnerSubstrate(uint256) b212138f
+ function setOwnerSubstrate(uint256 newOwner) external;
}
interface UniqueFungible is
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -250,7 +250,84 @@
function finishMinting() external returns (bool);
}
-// Selector: 6cf113cd
+// Selector: 780e9d63
+interface ERC721Enumerable is Dummy, ERC165 {
+ // @notice Enumerate valid NFTs
+ // @param index A counter less than `totalSupply()`
+ // @return The token identifier for the `index`th NFT,
+ // (sort order not specified)
+ //
+ // Selector: tokenByIndex(uint256) 4f6ccce7
+ function tokenByIndex(uint256 index) external view returns (uint256);
+
+ // @dev Not implemented
+ //
+ // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
+ function tokenOfOwnerByIndex(address owner, uint256 index)
+ external
+ view
+ returns (uint256);
+
+ // @notice Count NFTs tracked by this contract
+ // @return A count of valid NFTs tracked by this contract, where each one of
+ // them has an assigned and queryable owner not equal to the zero address
+ //
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() external view returns (uint256);
+}
+
+// Selector: d74d154f
+interface ERC721UniqueExtensions is Dummy, ERC165 {
+ // @notice Transfer ownership of an NFT
+ // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ // is the zero address. Throws if `tokenId` is not a valid NFT.
+ // @param to The new owner
+ // @param tokenId The NFT to transfer
+ // @param _value Not used for an NFT
+ //
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 tokenId) external;
+
+ // @notice Burns a specific ERC721 token.
+ // @dev Throws unless `msg.sender` is the current owner or an authorized
+ // operator for this NFT. Throws if `from` is not the current owner. Throws
+ // if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
+ // @param from The current owner of the NFT
+ // @param tokenId The NFT to transfer
+ // @param _value Not used for an NFT
+ //
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 tokenId) external;
+
+ // @notice Returns next free NFT ID.
+ //
+ // Selector: nextTokenId() 75794a3c
+ function nextTokenId() external view returns (uint256);
+
+ // @notice Function to mint multiple tokens.
+ // @dev `tokenIds` should be an array of consecutive numbers and first number
+ // should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokenIds IDs of the minted NFTs
+ //
+ // Selector: mintBulk(address,uint256[]) 44a9945e
+ function mintBulk(address to, uint256[] memory tokenIds)
+ external
+ returns (bool);
+
+ // @notice Function to mint multiple tokens with the given tokenUris.
+ // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+ // numbers and first number should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokens array of pairs of token ID and token URI for minted tokens
+ //
+ // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
+ function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
+ external
+ returns (bool);
+}
+
+// Selector: ffe4da23
interface Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -402,8 +479,16 @@
// @param user account to verify
// @return "true" if account is the owner or admin
//
- // Selector: verifyOwnerOrAdmin(address) c2282493
- function verifyOwnerOrAdmin(address user) external view returns (bool);
+ // Selector: isOwnerOrAdmin(address) 9811b0c7
+ function isOwnerOrAdmin(address user) external view returns (bool);
+
+ // Check that substrate account is the owner or admin of the collection
+ //
+ // @param user account to verify
+ // @return "true" if account is the owner or admin
+ //
+ // Selector: isOwnerOrAdminSubstrate(uint256) 68910e00
+ function isOwnerOrAdminSubstrate(uint256 user) external view returns (bool);
// Returns collection type
//
@@ -411,83 +496,22 @@
//
// Selector: uniqueCollectionType() d34b55b8
function uniqueCollectionType() external returns (string memory);
-}
-// Selector: 780e9d63
-interface ERC721Enumerable is Dummy, ERC165 {
- // @notice Enumerate valid NFTs
- // @param index A counter less than `totalSupply()`
- // @return The token identifier for the `index`th NFT,
- // (sort order not specified)
+ // Changes collection owner to another account
//
- // Selector: tokenByIndex(uint256) 4f6ccce7
- function tokenByIndex(uint256 index) external view returns (uint256);
-
- // @dev Not implemented
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner account
//
- // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
- function tokenOfOwnerByIndex(address owner, uint256 index)
- external
- view
- returns (uint256);
+ // Selector: setOwner(address) 13af4035
+ function setOwner(address newOwner) external;
- // @notice Count NFTs tracked by this contract
- // @return A count of valid NFTs tracked by this contract, where each one of
- // them has an assigned and queryable owner not equal to the zero address
+ // Changes collection owner to another substrate account
//
- // Selector: totalSupply() 18160ddd
- function totalSupply() external view returns (uint256);
-}
-
-// Selector: d74d154f
-interface ERC721UniqueExtensions is Dummy, ERC165 {
- // @notice Transfer ownership of an NFT
- // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
- // is the zero address. Throws if `tokenId` is not a valid NFT.
- // @param to The new owner
- // @param tokenId The NFT to transfer
- // @param _value Not used for an NFT
- //
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 tokenId) external;
-
- // @notice Burns a specific ERC721 token.
- // @dev Throws unless `msg.sender` is the current owner or an authorized
- // operator for this NFT. Throws if `from` is not the current owner. Throws
- // if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
- // @param from The current owner of the NFT
- // @param tokenId The NFT to transfer
- // @param _value Not used for an NFT
- //
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 tokenId) external;
-
- // @notice Returns next free NFT ID.
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner substrate account
//
- // Selector: nextTokenId() 75794a3c
- function nextTokenId() external view returns (uint256);
-
- // @notice Function to mint multiple tokens.
- // @dev `tokenIds` should be an array of consecutive numbers and first number
- // should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokenIds IDs of the minted NFTs
- //
- // Selector: mintBulk(address,uint256[]) 44a9945e
- function mintBulk(address to, uint256[] memory tokenIds)
- external
- returns (bool);
-
- // @notice Function to mint multiple tokens with the given tokenUris.
- // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
- // numbers and first number should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokens array of pairs of token ID and token URI for minted tokens
- //
- // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
- function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
- external
- returns (bool);
+ // Selector: setOwnerSubstrate(uint256) b212138f
+ function setOwnerSubstrate(uint256 newOwner) external;
}
interface UniqueNFT is
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -248,7 +248,96 @@
function finishMinting() external returns (bool);
}
-// Selector: 6cf113cd
+// Selector: 780e9d63
+interface ERC721Enumerable is Dummy, ERC165 {
+ // @notice Enumerate valid RFTs
+ // @param index A counter less than `totalSupply()`
+ // @return The token identifier for the `index`th NFT,
+ // (sort order not specified)
+ //
+ // Selector: tokenByIndex(uint256) 4f6ccce7
+ function tokenByIndex(uint256 index) external view returns (uint256);
+
+ // Not implemented
+ //
+ // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
+ function tokenOfOwnerByIndex(address owner, uint256 index)
+ external
+ view
+ returns (uint256);
+
+ // @notice Count RFTs tracked by this contract
+ // @return A count of valid RFTs tracked by this contract, where each one of
+ // them has an assigned and queryable owner not equal to the zero address
+ //
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() external view returns (uint256);
+}
+
+// Selector: 7c3bef89
+interface ERC721UniqueExtensions is Dummy, ERC165 {
+ // @notice Transfer ownership of an RFT
+ // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ // is the zero address. Throws if `tokenId` is not a valid RFT.
+ // Throws if RFT pieces have multiple owners.
+ // @param to The new owner
+ // @param tokenId The RFT to transfer
+ // @param _value Not used for an RFT
+ //
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 tokenId) external;
+
+ // @notice Burns a specific ERC721 token.
+ // @dev Throws unless `msg.sender` is the current owner or an authorized
+ // operator for this RFT. Throws if `from` is not the current owner. Throws
+ // if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
+ // Throws if RFT pieces have multiple owners.
+ // @param from The current owner of the RFT
+ // @param tokenId The RFT to transfer
+ // @param _value Not used for an RFT
+ //
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 tokenId) external;
+
+ // @notice Returns next free RFT ID.
+ //
+ // Selector: nextTokenId() 75794a3c
+ function nextTokenId() external view returns (uint256);
+
+ // @notice Function to mint multiple tokens.
+ // @dev `tokenIds` should be an array of consecutive numbers and first number
+ // should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokenIds IDs of the minted RFTs
+ //
+ // Selector: mintBulk(address,uint256[]) 44a9945e
+ function mintBulk(address to, uint256[] memory tokenIds)
+ external
+ returns (bool);
+
+ // @notice Function to mint multiple tokens with the given tokenUris.
+ // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+ // numbers and first number should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokens array of pairs of token ID and token URI for minted tokens
+ //
+ // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
+ function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
+ external
+ returns (bool);
+
+ // Returns EVM address for refungible token
+ //
+ // @param token ID of the token
+ //
+ // Selector: tokenContractAddress(uint256) ab76fac6
+ function tokenContractAddress(uint256 token)
+ external
+ view
+ returns (address);
+}
+
+// Selector: ffe4da23
interface Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -400,8 +489,16 @@
// @param user account to verify
// @return "true" if account is the owner or admin
//
- // Selector: verifyOwnerOrAdmin(address) c2282493
- function verifyOwnerOrAdmin(address user) external view returns (bool);
+ // Selector: isOwnerOrAdmin(address) 9811b0c7
+ function isOwnerOrAdmin(address user) external view returns (bool);
+
+ // Check that substrate account is the owner or admin of the collection
+ //
+ // @param user account to verify
+ // @return "true" if account is the owner or admin
+ //
+ // Selector: isOwnerOrAdminSubstrate(uint256) 68910e00
+ function isOwnerOrAdminSubstrate(uint256 user) external view returns (bool);
// Returns collection type
//
@@ -409,95 +506,22 @@
//
// Selector: uniqueCollectionType() d34b55b8
function uniqueCollectionType() external returns (string memory);
-}
-// Selector: 780e9d63
-interface ERC721Enumerable is Dummy, ERC165 {
- // @notice Enumerate valid RFTs
- // @param index A counter less than `totalSupply()`
- // @return The token identifier for the `index`th NFT,
- // (sort order not specified)
+ // Changes collection owner to another account
//
- // Selector: tokenByIndex(uint256) 4f6ccce7
- function tokenByIndex(uint256 index) external view returns (uint256);
-
- // Not implemented
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner account
//
- // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
- function tokenOfOwnerByIndex(address owner, uint256 index)
- external
- view
- returns (uint256);
+ // Selector: setOwner(address) 13af4035
+ function setOwner(address newOwner) external;
- // @notice Count RFTs tracked by this contract
- // @return A count of valid RFTs tracked by this contract, where each one of
- // them has an assigned and queryable owner not equal to the zero address
+ // Changes collection owner to another substrate account
//
- // Selector: totalSupply() 18160ddd
- function totalSupply() external view returns (uint256);
-}
-
-// Selector: 7c3bef89
-interface ERC721UniqueExtensions is Dummy, ERC165 {
- // @notice Transfer ownership of an RFT
- // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
- // is the zero address. Throws if `tokenId` is not a valid RFT.
- // Throws if RFT pieces have multiple owners.
- // @param to The new owner
- // @param tokenId The RFT to transfer
- // @param _value Not used for an RFT
+ // @dev Owner can be changed only by current owner
+ // @param newOwner new owner substrate account
//
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 tokenId) external;
-
- // @notice Burns a specific ERC721 token.
- // @dev Throws unless `msg.sender` is the current owner or an authorized
- // operator for this RFT. Throws if `from` is not the current owner. Throws
- // if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
- // Throws if RFT pieces have multiple owners.
- // @param from The current owner of the RFT
- // @param tokenId The RFT to transfer
- // @param _value Not used for an RFT
- //
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 tokenId) external;
-
- // @notice Returns next free RFT ID.
- //
- // Selector: nextTokenId() 75794a3c
- function nextTokenId() external view returns (uint256);
-
- // @notice Function to mint multiple tokens.
- // @dev `tokenIds` should be an array of consecutive numbers and first number
- // should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokenIds IDs of the minted RFTs
- //
- // Selector: mintBulk(address,uint256[]) 44a9945e
- function mintBulk(address to, uint256[] memory tokenIds)
- external
- returns (bool);
-
- // @notice Function to mint multiple tokens with the given tokenUris.
- // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
- // numbers and first number should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokens array of pairs of token ID and token URI for minted tokens
- //
- // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
- function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
- external
- returns (bool);
-
- // Returns EVM address for refungible token
- //
- // @param token ID of the token
- //
- // Selector: tokenContractAddress(uint256) ab76fac6
- function tokenContractAddress(uint256 token)
- external
- view
- returns (address);
+ // Selector: setOwnerSubstrate(uint256) b212138f
+ function setOwnerSubstrate(uint256 newOwner) external;
}
interface UniqueRefungible is
tests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -15,6 +15,7 @@
import {expect} from 'chai';
import privateKey from '../substrate/privateKey';
+import { UNIQUE } from '../util/helpers';
import {
createEthAccount,
createEthAccountWithBalance,
@@ -22,6 +23,8 @@
evmCollectionHelpers,
getCollectionAddressFromResult,
itWeb3,
+ recordEthFee,
+ subToEth,
} from './util/helpers';
describe('Add collection admins', () => {
@@ -71,9 +74,9 @@
const newAdmin = createEthAccount(web3);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
- expect(await collectionEvm.methods.verifyOwnerOrAdmin(newAdmin).call()).to.be.false;
+ expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.false;
await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
- expect(await collectionEvm.methods.verifyOwnerOrAdmin(newAdmin).call()).to.be.true;
+ expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.true;
});
itWeb3('(!negative tests!) Add admin by ADMIN is not allowed', async ({api, web3, privateKeyWrapper}) => {
@@ -309,4 +312,102 @@
expect(adminList[0].asSubstrate.toString().toLocaleLowerCase())
.to.be.eq(adminSub.address.toLocaleLowerCase());
});
+});
+
+describe('Change owner tests', () => {
+ itWeb3('Change owner', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const newOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ await collectionEvm.methods.setOwner(newOwner).send();
+
+ expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.false;
+ expect(await collectionEvm.methods.isOwnerOrAdmin(newOwner).call()).to.be.true;
+ });
+
+ itWeb3('change owner call fee', async ({web3, api, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const newOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ const cost = await recordEthFee(api, owner, () => collectionEvm.methods.setOwner(newOwner).send());
+ expect(cost < BigInt(0.2 * Number(UNIQUE)));
+ expect(cost > 0);
+ });
+
+ itWeb3('(!negative tests!) call setOwner by non owner', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const newOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ await expect(collectionEvm.methods.setOwner(newOwner).send({from: newOwner})).to.be.rejected;
+ expect(await collectionEvm.methods.isOwnerOrAdmin(newOwner).call()).to.be.false;
+ });
+});
+
+describe('Change substrate owner tests', () => {
+ itWeb3('Change owner', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const newOwner = privateKeyWrapper('//Alice');
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.true;
+ expect(await collectionEvm.methods.isOwnerOrAdminSubstrate(newOwner.addressRaw).call()).to.be.false;
+
+ await collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send();
+
+ expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.false;
+ expect(await collectionEvm.methods.isOwnerOrAdminSubstrate(newOwner.addressRaw).call()).to.be.true;
+ });
+
+ itWeb3('change owner call fee', async ({web3, api, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const newOwner = privateKeyWrapper('//Alice');
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ const cost = await recordEthFee(api, owner, () => collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send());
+ expect(cost < BigInt(0.2 * Number(UNIQUE)));
+ expect(cost > 0);
+ });
+
+ itWeb3('(!negative tests!) call setOwner by non owner', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const otherReceiver = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const newOwner = privateKeyWrapper('//Alice');
+ const collectionHelper = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelper.methods
+ .createNonfungibleCollection('A', 'B', 'C')
+ .send();
+ const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
+ const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+
+ await expect(collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send({from: otherReceiver})).to.be.rejected;
+ expect(await collectionEvm.methods.isOwnerOrAdminSubstrate(newOwner.addressRaw).call()).to.be.false;
+ });
});
\ No newline at end of file
tests/src/eth/fractionalizer/Fractionalizer.bindiffbeforeafterboth--- a/tests/src/eth/fractionalizer/Fractionalizer.bin
+++ /dev/null
@@ -1 +0,0 @@
-60c0604052600a60805269526546756e6769626c6560b01b60a0527fcdb72fd4e1d0d6d4eebd7ab142113ec2b4b06ddb24324db5c287ef01ab484d6b60055534801561004a57600080fd5b50600480546001600160a01b0319163317905561137a8061006c6000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c8063115091401461005c5780631b191ea214610071578063d470e60f14610084578063dbc38ad214610097578063eb292412146100aa575b600080fd5b61006f61006a366004610f85565b6100bd565b005b61006f61007f366004610ff2565b61035b565b61006f61009236600461108c565b6104c0565b61006f6100a53660046110b8565b61089d565b61006f6100b8366004611114565b610ee0565b6004546001600160a01b031633146100f05760405162461bcd60e51b81526004016100e79061114d565b60405180910390fd5b6000546001600160a01b0316156101495760405162461bcd60e51b815260206004820152601d60248201527f52465420636f6c6c656374696f6e20697320616c72656164792073657400000060448201526064016100e7565b60008190506000816001600160a01b031663d34b55b86040518163ffffffff1660e01b81526004016000604051808303816000875af1158015610190573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526101b8919081019061118b565b905060055481805190602001201461022f5760405162461bcd60e51b815260206004820152603460248201527f57726f6e6720636f6c6c656374696f6e20747970652e20436f6c6c656374696f604482015273371034b9903737ba103932b33ab733b4b136329760611b60648201526084016100e7565b816001600160a01b03166304a460536040518163ffffffff1660e01b81526004016020604051808303816000875af115801561026f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610293919061125b565b6103055760405162461bcd60e51b815260206004820152603c60248201527f4672616374696f6e616c697a657220636f6e74726163742073686f756c64206260448201527f6520616e2061646d696e206f662074686520636f6c6c656374696f6e0000000060648201526084016100e7565b600080546001600160a01b0319166001600160a01b0385169081179091556040519081527f7186a599bf2297b1f4c8957d30b0965291eee0021a5f9a0aeb54dcbd1ffdceef9060200160405180910390a1505050565b6004546001600160a01b031633146103855760405162461bcd60e51b81526004016100e79061114d565b6000546001600160a01b0316156103de5760405162461bcd60e51b815260206004820152601d60248201527f52465420636f6c6c656374696f6e20697320616c72656164792073657400000060448201526064016100e7565b6040516344a68ad560e01b8152736c4e9fe1ae37a41e93cee429e8e1881abdcbb54f9081906344a68ad590610421908a908a908a908a908a908a906004016112a1565b6020604051808303816000875af1158015610440573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061046491906112ea565b600080546001600160a01b0319166001600160a01b039290921691821790556040519081527f7186a599bf2297b1f4c8957d30b0965291eee0021a5f9a0aeb54dcbd1ffdceef906020015b60405180910390a150505050505050565b6000546001600160a01b03166105145760405162461bcd60e51b81526020600482015260196024820152781491950818dbdb1b1958dd1a5bdb881a5cc81b9bdd081cd95d603a1b60448201526064016100e7565b6000546001600160a01b038381169116146105685760405162461bcd60e51b81526020600482015260146024820152732bb937b7339029232a1031b7b63632b1ba34b7b760611b60448201526064016100e7565b600080546040516355bb7d6360e11b8152600481018490526001600160a01b039091169190829063ab76fac690602401602060405180830381865afa1580156105b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d991906112ea565b6001600160a01b03808216600090815260036020908152604091829020825180840190935280549093168083526001909301549082015291925061065f5760405162461bcd60e51b815260206004820181905260248201527f4e6f20636f72726573706f6e64696e67204e465420746f6b656e20666f756e6460448201526064016100e7565b6000829050806001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156106a2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106c69190611307565b6040516370a0823160e01b81523360048201526001600160a01b038316906370a0823190602401602060405180830381865afa15801561070a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061072e9190611307565b1461078a5760405162461bcd60e51b815260206004820152602660248201527f4e6f7420616c6c2070696563657320617265206f776e6564206279207468652060448201526531b0b63632b960d11b60648201526084016100e7565b6040516323b872dd60e01b81526001600160a01b038516906323b872dd906107ba90339030908a90600401611320565b600060405180830381600087803b1580156107d457600080fd5b505af11580156107e8573d6000803e3d6000fd5b5050835160208501516040516323b872dd60e01b81526001600160a01b0390921693506323b872dd92506108229130913391600401611320565b600060405180830381600087803b15801561083c57600080fd5b505af1158015610850573d6000803e3d6000fd5b5050835160208501516040517fe9e9808d24ff79ccc3b1ecf48be7b2d11591adccc452150d0d7947cb48eb0d53945061088d935087929190611320565b60405180910390a1505050505050565b6000546001600160a01b03166108f15760405162461bcd60e51b81526020600482015260196024820152781491950818dbdb1b1958dd1a5bdb881a5cc81b9bdd081cd95d603a1b60448201526064016100e7565b600080546001600160a01b0385811683526001602081905260409093205491169160ff90911615151461098c5760405162461bcd60e51b815260206004820152603c60248201527f4672616374696f6e616c697a6174696f6e206f66207468697320636f6c6c656360448201527f74696f6e206973206e6f7420616c6c6f7765642062792061646d696e0000000060648201526084016100e7565b6040516331a9108f60e11b81526004810184905233906001600160a01b03861690636352211e90602401602060405180830381865afa1580156109d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f791906112ea565b6001600160a01b031614610a5d5760405162461bcd60e51b815260206004820152602760248201527f4f6e6c7920746f6b656e206f776e657220636f756c64206672616374696f6e616044820152661b1a5e99481a5d60ca1b60648201526084016100e7565b6040516323b872dd60e01b81526001600160a01b038516906323b872dd90610a8d90339030908890600401611320565b600060405180830381600087803b158015610aa757600080fd5b505af1158015610abb573d6000803e3d6000fd5b505050506001600160a01b0384166000908152600260209081526040808320868452909152812054819081908103610d0757836001600160a01b03166375794a3c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b2b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b4f9190611307565b6040516340c10f1960e01b8152306004820152602481018290529093506001600160a01b038516906340c10f19906044016020604051808303816000875af1158015610b9f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bc3919061125b565b506040516355bb7d6360e11b8152600481018490526001600160a01b0385169063ab76fac690602401602060405180830381865afa158015610c09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c2d91906112ea565b6001600160a01b0388811660008181526002602090815260408083208c84528252808320899055805180820182528481528083018d8152878716808652600390945293829020905181546001600160a01b0319169616959095178555915160019094019390935551630217888360e11b81526004810191909152602481018990529193508392509063042f1106906044016020604051808303816000875af1158015610cdd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d01919061125b565b50610d98565b6001600160a01b0387811660009081526002602090815260408083208a8452909152908190205490516355bb7d6360e11b8152600481018290529094509085169063ab76fac690602401602060405180830381865afa158015610d6e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d9291906112ea565b91508190505b60405163d2418ca760e01b81526001600160801b03861660048201526001600160a01b0382169063d2418ca7906024016020604051808303816000875af1158015610de7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0b919061125b565b5060405163a9059cbb60e01b81523360048201526001600160801b03861660248201526001600160a01b0382169063a9059cbb906044016020604051808303816000875af1158015610e61573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e85919061125b565b50604080516001600160a01b03808a168252602082018990528416918101919091526001600160801b03861660608201527f29f372538523984f33874da1b50e596ce0f180a6eb04d7ff22bb2ce80e1576b6906080016104af565b6004546001600160a01b03163314610f0a5760405162461bcd60e51b81526004016100e79061114d565b6001600160a01b038216600081815260016020908152604091829020805460ff19168515159081179091558251938452908301527f6dad0aed33f4b7f07095619b668698e17943fd9f4c83e7cfcc7f6dd880a11588910160405180910390a15050565b6001600160a01b0381168114610f8257600080fd5b50565b600060208284031215610f9757600080fd5b8135610fa281610f6d565b9392505050565b60008083601f840112610fbb57600080fd5b50813567ffffffffffffffff811115610fd357600080fd5b602083019150836020828501011115610feb57600080fd5b9250929050565b6000806000806000806060878903121561100b57600080fd5b863567ffffffffffffffff8082111561102357600080fd5b61102f8a838b01610fa9565b9098509650602089013591508082111561104857600080fd5b6110548a838b01610fa9565b9096509450604089013591508082111561106d57600080fd5b5061107a89828a01610fa9565b979a9699509497509295939492505050565b6000806040838503121561109f57600080fd5b82356110aa81610f6d565b946020939093013593505050565b6000806000606084860312156110cd57600080fd5b83356110d881610f6d565b92506020840135915060408401356001600160801b03811681146110fb57600080fd5b809150509250925092565b8015158114610f8257600080fd5b6000806040838503121561112757600080fd5b823561113281610f6d565b9150602083013561114281611106565b809150509250929050565b6020808252600e908201526d27b7363c9037bbb732b91031b0b760911b604082015260600190565b634e487b7160e01b600052604160045260246000fd5b6000602080838503121561119e57600080fd5b825167ffffffffffffffff808211156111b657600080fd5b818501915085601f8301126111ca57600080fd5b8151818111156111dc576111dc611175565b604051601f8201601f19908116603f0116810190838211818310171561120457611204611175565b81604052828152888684870101111561121c57600080fd5b600093505b8284101561123e5784840186015181850187015292850192611221565b8284111561124f5760008684830101525b98975050505050505050565b60006020828403121561126d57600080fd5b8151610fa281611106565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6060815260006112b560608301888a611278565b82810360208401526112c8818789611278565b905082810360408401526112dd818587611278565b9998505050505050505050565b6000602082840312156112fc57600080fd5b8151610fa281610f6d565b60006020828403121561131957600080fd5b5051919050565b6001600160a01b03938416815291909216602082015260408101919091526060019056fea2646970667358221220a118fe8c3b83b3933baa7bfe084ed165a014ec509367252e5c99e1a3332d000364736f6c634300080f0033
\ No newline at end of file
tests/src/eth/fractionalizer/Fractionalizer.soldiffbeforeafterboth--- a/tests/src/eth/fractionalizer/Fractionalizer.sol
+++ b/tests/src/eth/fractionalizer/Fractionalizer.sol
@@ -64,7 +64,7 @@
"Wrong collection type. Collection is not refungible."
);
require(
- refungibleContract.verifyOwnerOrAdmin(address(this)),
+ refungibleContract.isOwnerOrAdmin(address(this)),
"Fractionalizer contract should be an admin of the collection"
);
rftCollection = _collection;
tests/src/eth/fractionalizer/FractionalizerAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fractionalizer/FractionalizerAbi.json
+++ /dev/null
@@ -1,142 +0,0 @@
-[
- { "inputs": [], "stateMutability": "nonpayable", "type": "constructor" },
- {
- "anonymous": false,
- "inputs": [
- {
- "indexed": false,
- "internalType": "address",
- "name": "_collection",
- "type": "address"
- },
- {
- "indexed": false,
- "internalType": "bool",
- "name": "_status",
- "type": "bool"
- }
- ],
- "name": "AllowListSet",
- "type": "event"
- },
- {
- "anonymous": false,
- "inputs": [
- {
- "indexed": false,
- "internalType": "address",
- "name": "_rftToken",
- "type": "address"
- },
- {
- "indexed": false,
- "internalType": "address",
- "name": "_nftCollection",
- "type": "address"
- },
- {
- "indexed": false,
- "internalType": "uint256",
- "name": "_nftTokenId",
- "type": "uint256"
- }
- ],
- "name": "Defractionalized",
- "type": "event"
- },
- {
- "anonymous": false,
- "inputs": [
- {
- "indexed": false,
- "internalType": "address",
- "name": "_collection",
- "type": "address"
- },
- {
- "indexed": false,
- "internalType": "uint256",
- "name": "_tokenId",
- "type": "uint256"
- },
- {
- "indexed": false,
- "internalType": "address",
- "name": "_rftToken",
- "type": "address"
- },
- {
- "indexed": false,
- "internalType": "uint128",
- "name": "_amount",
- "type": "uint128"
- }
- ],
- "name": "Fractionalized",
- "type": "event"
- },
- {
- "anonymous": false,
- "inputs": [
- {
- "indexed": false,
- "internalType": "address",
- "name": "_collection",
- "type": "address"
- }
- ],
- "name": "RFTCollectionSet",
- "type": "event"
- },
- {
- "inputs": [
- { "internalType": "string", "name": "_name", "type": "string" },
- { "internalType": "string", "name": "_description", "type": "string" },
- { "internalType": "string", "name": "_tokenPrefix", "type": "string" }
- ],
- "name": "createAndSetRFTCollection",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "_collection", "type": "address" },
- { "internalType": "uint256", "name": "_token", "type": "uint256" },
- { "internalType": "uint128", "name": "_pieces", "type": "uint128" }
- ],
- "name": "nft2rft",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "_collection", "type": "address" },
- { "internalType": "uint256", "name": "_token", "type": "uint256" }
- ],
- "name": "rft2nft",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "collection", "type": "address" },
- { "internalType": "bool", "name": "status", "type": "bool" }
- ],
- "name": "setNftCollectionIsAllowed",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "_collection", "type": "address" }
- ],
- "name": "setRFTCollection",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- }
-]
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -151,6 +151,24 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "address", "name": "user", "type": "address" }
+ ],
+ "name": "isOwnerOrAdmin",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "uint256", "name": "user", "type": "uint256" }
+ ],
+ "name": "isOwnerOrAdminSubstrate",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
@@ -260,6 +278,24 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "newOwner", "type": "address" }
+ ],
+ "name": "setOwner",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
+ ],
+ "name": "setOwnerSubstrate",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }
],
"name": "supportsInterface",
@@ -307,15 +343,6 @@
"name": "uniqueCollectionType",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "user", "type": "address" }
- ],
- "name": "verifyOwnerOrAdmin",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
"type": "function"
}
]
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -211,6 +211,24 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "user", "type": "address" }
+ ],
+ "name": "isOwnerOrAdmin",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "uint256", "name": "user", "type": "uint256" }
+ ],
+ "name": "isOwnerOrAdminSubstrate",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -434,6 +452,24 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "newOwner", "type": "address" }
+ ],
+ "name": "setOwner",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
+ ],
+ "name": "setOwnerSubstrate",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" },
{ "internalType": "string", "name": "key", "type": "string" },
{ "internalType": "bytes", "name": "value", "type": "bytes" }
@@ -532,15 +568,6 @@
"name": "uniqueCollectionType",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "user", "type": "address" }
- ],
- "name": "verifyOwnerOrAdmin",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
"type": "function"
}
]
tests/src/eth/reFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -211,6 +211,24 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "user", "type": "address" }
+ ],
+ "name": "isOwnerOrAdmin",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "uint256", "name": "user", "type": "uint256" }
+ ],
+ "name": "isOwnerOrAdminSubstrate",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -434,6 +452,24 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "newOwner", "type": "address" }
+ ],
+ "name": "setOwner",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
+ ],
+ "name": "setOwnerSubstrate",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" },
{ "internalType": "string", "name": "key", "type": "string" },
{ "internalType": "bytes", "name": "value", "type": "bytes" }
@@ -541,15 +577,6 @@
"name": "uniqueCollectionType",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "user", "type": "address" }
- ],
- "name": "verifyOwnerOrAdmin",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
"type": "function"
}
]
tests/src/eth/refungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/refungibleAbi.json
+++ /dev/null
@@ -1,167 +0,0 @@
-[
- {
- "inputs": [
- { "internalType": "address", "name": "newAdmin", "type": "address" }
- ],
- "name": "addCollectionAdmin",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "uint256", "name": "newAdmin", "type": "uint256" }
- ],
- "name": "addCollectionAdminSubstrate",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "user", "type": "address" }
- ],
- "name": "addToCollectionAllowList",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
- "name": "collectionProperty",
- "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "confirmCollectionSponsorship",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "contractAddress",
- "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
- "name": "deleteCollectionProperty",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "admin", "type": "address" }
- ],
- "name": "removeCollectionAdmin",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "uint256", "name": "admin", "type": "uint256" }
- ],
- "name": "removeCollectionAdminSubstrate",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "user", "type": "address" }
- ],
- "name": "removeFromCollectionAllowList",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],
- "name": "setCollectionAccess",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "string", "name": "limit", "type": "string" },
- { "internalType": "uint32", "name": "value", "type": "uint32" }
- ],
- "name": "setCollectionLimit",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "string", "name": "limit", "type": "string" },
- { "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"
- },
- {
- "inputs": [
- { "internalType": "string", "name": "key", "type": "string" },
- { "internalType": "bytes", "name": "value", "type": "bytes" }
- ],
- "name": "setCollectionProperty",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "sponsor", "type": "address" }
- ],
- "name": "setCollectionSponsor",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }
- ],
- "name": "supportsInterface",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
- "type": "function"
- }
-]