difftreelog
genetate evm stubs & fix abiWriter for struct
in: master
13 files changed
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -184,8 +184,7 @@
impl AbiWrite for Property {
fn abi_write(&self, writer: &mut AbiWriter) {
- self.key.abi_write(writer);
- self.value.abi_write(writer);
+ (&self.key, &self.value).abi_write(writer);
}
}
crates/evm-coder/src/abi/traits.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/traits.rs
+++ b/crates/evm-coder/src/abi/traits.rs
@@ -49,3 +49,9 @@
Ok(writer.into())
}
}
+
+impl<T: AbiWrite> AbiWrite for &T {
+ fn abi_write(&self, writer: &mut AbiWriter) {
+ T::abi_write(self, writer);
+ }
+}
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -437,7 +437,7 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x29f4dcd9
+/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
contract ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -725,7 +725,7 @@
&self,
token_id: uint256,
keys: Vec<string>,
- ) -> Result<Vec<(string, bytes)>> {
+ ) -> Result<Vec<PropertyStruct>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -745,7 +745,7 @@
let key = string::from_utf8(p.key.to_vec())
.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok((key, value))
+ Ok(PropertyStruct { key, value })
})
.collect::<Result<Vec<_>>>()
}
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -188,11 +188,11 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) public view returns (Tuple23[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Tuple27[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple23[](0);
+ return new Tuple27[](0);
}
// /// Set the sponsor of the collection.
@@ -253,10 +253,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple26 memory) {
+ function collectionSponsor() public view returns (Tuple30 memory) {
require(false, stub_error);
dummy;
- return Tuple26(0x0000000000000000000000000000000000000000, 0);
+ return Tuple30(0x0000000000000000000000000000000000000000, 0);
}
/// Set limits for the collection.
@@ -527,13 +527,13 @@
}
/// @dev anonymous struct
-struct Tuple26 {
+struct Tuple30 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple23 {
+struct Tuple27 {
string field_0;
bytes field_1;
}
@@ -682,7 +682,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x0e9fc611
+/// @dev the ERC-165 identifier for this interface is 0xb8f094a0
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -730,12 +730,12 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0xefc26c69,
/// or in textual repr: tokenProperties(uint256,string[])
- function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Tuple8[] memory) {
+ function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {
require(false, stub_error);
tokenId;
keys;
dummy;
- return new Tuple8[](0);
+ return new Property[](0);
}
/// @notice Set or reaffirm the approved address for an NFT
@@ -861,7 +861,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) public returns (bool) {
+ // function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {
// require(false, stub_error);
// to;
// tokens;
@@ -872,15 +872,9 @@
}
/// @dev anonymous struct
-struct Tuple11 {
+struct Tuple15 {
uint256 field_0;
string field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple8 {
- string field_0;
- bytes field_1;
}
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
pallets/refungible/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//! # Refungible Pallet EVM API for tokens18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Refungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Refungible Pallet methods.2122extern crate alloc;2324use core::{25 char::{REPLACEMENT_CHARACTER, decode_utf16},26 convert::TryInto,27};28use evm_coder::{29 abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,30 types::Property as PropertyStruct, weight,31};32use frame_support::{BoundedBTreeMap, BoundedVec};33use pallet_common::{34 CollectionHandle, CollectionPropertyPermissions,35 erc::{CommonEvmHandler, CollectionCall, static_property::key},36 CommonCollectionOperations,37};38use pallet_evm::{account::CrossAccountId, PrecompileHandle};39use pallet_evm_coder_substrate::{call, dispatch_to_evm};40use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};41use sp_core::H160;42use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};43use up_data_structs::{44 CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,45 PropertyKeyPermission, PropertyPermission, TokenId,46};4748use crate::{49 AccountBalance, Balance, Config, CreateItemData, Pallet, RefungibleHandle, SelfWeightOf,50 TokenProperties, TokensMinted, TotalSupply, weights::WeightInfo,51};5253pub const ADDRESS_FOR_PARTIALLY_OWNED_TOKENS: H160 = H160::repeat_byte(0xff);5455/// @title A contract that allows to set and delete token properties and change token property permissions.56#[solidity_interface(name = TokenProperties)]57impl<T: Config> RefungibleHandle<T> {58 /// @notice Set permissions for token property.59 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.60 /// @param key Property key.61 /// @param isMutable Permission to mutate property.62 /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.63 /// @param tokenOwner Permission to mutate property by token owner if property is mutable.64 fn set_token_property_permission(65 &mut self,66 caller: caller,67 key: string,68 is_mutable: bool,69 collection_admin: bool,70 token_owner: bool,71 ) -> Result<()> {72 let caller = T::CrossAccountId::from_eth(caller);73 <Pallet<T>>::set_token_property_permissions(74 self,75 &caller,76 vec![PropertyKeyPermission {77 key: <Vec<u8>>::from(key)78 .try_into()79 .map_err(|_| "too long key")?,80 permission: PropertyPermission {81 mutable: is_mutable,82 collection_admin,83 token_owner,84 },85 }],86 )87 .map_err(dispatch_to_evm::<T>)88 }8990 /// @notice Set token property value.91 /// @dev Throws error if `msg.sender` has no permission to edit the property.92 /// @param tokenId ID of the token.93 /// @param key Property key.94 /// @param value Property value.95 #[solidity(hide)]96 fn set_property(97 &mut self,98 caller: caller,99 token_id: uint256,100 key: string,101 value: bytes,102 ) -> Result<()> {103 let caller = T::CrossAccountId::from_eth(caller);104 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;105 let key = <Vec<u8>>::from(key)106 .try_into()107 .map_err(|_| "key too long")?;108 let value = value.0.try_into().map_err(|_| "value too long")?;109110 let nesting_budget = self111 .recorder112 .weight_calls_budget(<StructureWeight<T>>::find_parent());113114 <Pallet<T>>::set_token_property(115 self,116 &caller,117 TokenId(token_id),118 Property { key, value },119 &nesting_budget,120 )121 .map_err(dispatch_to_evm::<T>)122 }123124 /// @notice Set token properties value.125 /// @dev Throws error if `msg.sender` has no permission to edit the property.126 /// @param tokenId ID of the token.127 /// @param properties settable properties128 fn set_properties(129 &mut self,130 caller: caller,131 token_id: uint256,132 properties: Vec<PropertyStruct>,133 ) -> Result<()> {134 let caller = T::CrossAccountId::from_eth(caller);135 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;136137 let nesting_budget = self138 .recorder139 .weight_calls_budget(<StructureWeight<T>>::find_parent());140141 let properties = properties142 .into_iter()143 .map(|PropertyStruct { key, value }| {144 let key = <Vec<u8>>::from(key)145 .try_into()146 .map_err(|_| "key too large")?;147148 let value = value.0.try_into().map_err(|_| "value too large")?;149150 Ok(Property { key, value })151 })152 .collect::<Result<Vec<_>>>()?;153154 <Pallet<T>>::set_token_properties(155 self,156 &caller,157 TokenId(token_id),158 properties.into_iter(),159 <Pallet<T>>::token_exists(&self, TokenId(token_id)),160 &nesting_budget,161 )162 .map_err(dispatch_to_evm::<T>)163 }164165 /// @notice Delete token property value.166 /// @dev Throws error if `msg.sender` has no permission to edit the property.167 /// @param tokenId ID of the token.168 /// @param key Property key.169 #[solidity(hide)]170 fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {171 let caller = T::CrossAccountId::from_eth(caller);172 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;173 let key = <Vec<u8>>::from(key)174 .try_into()175 .map_err(|_| "key too long")?;176177 let nesting_budget = self178 .recorder179 .weight_calls_budget(<StructureWeight<T>>::find_parent());180181 <Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)182 .map_err(dispatch_to_evm::<T>)183 }184185 /// @notice Delete token properties value.186 /// @dev Throws error if `msg.sender` has no permission to edit the property.187 /// @param tokenId ID of the token.188 /// @param keys Properties key.189 fn delete_properties(190 &mut self,191 token_id: uint256,192 caller: caller,193 keys: Vec<string>,194 ) -> Result<()> {195 let caller = T::CrossAccountId::from_eth(caller);196 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;197 let keys = keys198 .into_iter()199 .map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))200 .collect::<Result<Vec<_>>>()?;201202 let nesting_budget = self203 .recorder204 .weight_calls_budget(<StructureWeight<T>>::find_parent());205206 <Pallet<T>>::delete_token_properties(207 self,208 &caller,209 TokenId(token_id),210 keys.into_iter(),211 &nesting_budget,212 )213 .map_err(dispatch_to_evm::<T>)214 }215216 /// @notice Get token property value.217 /// @dev Throws error if key not found218 /// @param tokenId ID of the token.219 /// @param key Property key.220 /// @return Property value bytes221 fn property(&self, token_id: uint256, key: string) -> Result<bytes> {222 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;223 let key = <Vec<u8>>::from(key)224 .try_into()225 .map_err(|_| "key too long")?;226227 let props = <TokenProperties<T>>::get((self.id, token_id));228 let prop = props.get(&key).ok_or("key not found")?;229230 Ok(prop.to_vec().into())231 }232}233234#[derive(ToLog)]235pub enum ERC721Events {236 /// @dev This event emits when NFTs are created (`from` == 0) and destroyed237 /// (`to` == 0). Exception: during contract creation, any number of RFTs238 /// may be created and assigned without emitting Transfer.239 Transfer {240 #[indexed]241 from: address,242 #[indexed]243 to: address,244 #[indexed]245 token_id: uint256,246 },247 /// @dev Not supported248 Approval {249 #[indexed]250 owner: address,251 #[indexed]252 approved: address,253 #[indexed]254 token_id: uint256,255 },256 /// @dev Not supported257 #[allow(dead_code)]258 ApprovalForAll {259 #[indexed]260 owner: address,261 #[indexed]262 operator: address,263 approved: bool,264 },265}266267#[derive(ToLog)]268pub enum ERC721UniqueMintableEvents {269 /// @dev Not supported270 #[allow(dead_code)]271 MintingFinished {},272}273274#[solidity_interface(name = ERC721Metadata)]275impl<T: Config> RefungibleHandle<T>276where277 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,278{279 /// @notice A descriptive name for a collection of NFTs in this contract280 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`281 #[solidity(hide, rename_selector = "name")]282 fn name_proxy(&self) -> Result<string> {283 self.name()284 }285286 /// @notice An abbreviated name for NFTs in this contract287 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`288 #[solidity(hide, rename_selector = "symbol")]289 fn symbol_proxy(&self) -> Result<string> {290 self.symbol()291 }292293 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.294 ///295 /// @dev If the token has a `url` property and it is not empty, it is returned.296 /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.297 /// If the collection property `baseURI` is empty or absent, return "" (empty string)298 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix299 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).300 ///301 /// @return token's const_metadata302 #[solidity(rename_selector = "tokenURI")]303 fn token_uri(&self, token_id: uint256) -> Result<string> {304 let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;305306 match get_token_property(self, token_id_u32, &key::url()).as_deref() {307 Err(_) | Ok("") => (),308 Ok(url) => {309 return Ok(url.into());310 }311 };312313 let base_uri =314 pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())315 .map(BoundedVec::into_inner)316 .map(string::from_utf8)317 .transpose()318 .map_err(|e| {319 Error::Revert(alloc::format!(320 "Can not convert value \"baseURI\" to string with error \"{}\"",321 e322 ))323 })?;324325 let base_uri = match base_uri.as_deref() {326 None | Some("") => {327 return Ok("".into());328 }329 Some(base_uri) => base_uri.into(),330 };331332 Ok(333 match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {334 Err(_) | Ok("") => base_uri,335 Ok(suffix) => base_uri + suffix,336 },337 )338 }339}340341/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension342/// @dev See https://eips.ethereum.org/EIPS/eip-721343#[solidity_interface(name = ERC721Enumerable)]344impl<T: Config> RefungibleHandle<T> {345 /// @notice Enumerate valid RFTs346 /// @param index A counter less than `totalSupply()`347 /// @return The token identifier for the `index`th NFT,348 /// (sort order not specified)349 fn token_by_index(&self, index: uint256) -> Result<uint256> {350 Ok(index)351 }352353 /// Not implemented354 fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {355 // TODO: Not implemetable356 Err("not implemented".into())357 }358359 /// @notice Count RFTs tracked by this contract360 /// @return A count of valid RFTs tracked by this contract, where each one of361 /// them has an assigned and queryable owner not equal to the zero address362 fn total_supply(&self) -> Result<uint256> {363 self.consume_store_reads(1)?;364 Ok(<Pallet<T>>::total_supply(self).into())365 }366}367368/// @title ERC-721 Non-Fungible Token Standard369/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md370#[solidity_interface(name = ERC721, events(ERC721Events))]371impl<T: Config> RefungibleHandle<T> {372 /// @notice Count all RFTs assigned to an owner373 /// @dev RFTs assigned to the zero address are considered invalid, and this374 /// function throws for queries about the zero address.375 /// @param owner An address for whom to query the balance376 /// @return The number of RFTs owned by `owner`, possibly zero377 fn balance_of(&self, owner: address) -> Result<uint256> {378 self.consume_store_reads(1)?;379 let owner = T::CrossAccountId::from_eth(owner);380 let balance = <AccountBalance<T>>::get((self.id, owner));381 Ok(balance.into())382 }383384 /// @notice Find the owner of an RFT385 /// @dev RFTs assigned to zero address are considered invalid, and queries386 /// about them do throw.387 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for388 /// the tokens that are partially owned.389 /// @param tokenId The identifier for an RFT390 /// @return The address of the owner of the RFT391 fn owner_of(&self, token_id: uint256) -> Result<address> {392 self.consume_store_reads(2)?;393 let token = token_id.try_into()?;394 let owner = <Pallet<T>>::token_owner(self.id, token);395 Ok(owner396 .map(|address| *address.as_eth())397 .unwrap_or_else(|| ADDRESS_FOR_PARTIALLY_OWNED_TOKENS))398 }399400 /// @dev Not implemented401 fn safe_transfer_from_with_data(402 &mut self,403 _from: address,404 _to: address,405 _token_id: uint256,406 _data: bytes,407 ) -> Result<void> {408 // TODO: Not implemetable409 Err("not implemented".into())410 }411412 /// @dev Not implemented413 fn safe_transfer_from(414 &mut self,415 _from: address,416 _to: address,417 _token_id: uint256,418 ) -> Result<void> {419 // TODO: Not implemetable420 Err("not implemented".into())421 }422423 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE424 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE425 /// THEY MAY BE PERMANENTLY LOST426 /// @dev Throws unless `msg.sender` is the current owner or an authorized427 /// operator for this RFT. Throws if `from` is not the current owner. Throws428 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.429 /// Throws if RFT pieces have multiple owners.430 /// @param from The current owner of the NFT431 /// @param to The new owner432 /// @param tokenId The NFT to transfer433 #[weight(<SelfWeightOf<T>>::transfer_from_creating_removing())]434 fn transfer_from(435 &mut self,436 caller: caller,437 from: address,438 to: address,439 token_id: uint256,440 ) -> Result<void> {441 let caller = T::CrossAccountId::from_eth(caller);442 let from = T::CrossAccountId::from_eth(from);443 let to = T::CrossAccountId::from_eth(to);444 let token = token_id.try_into()?;445 let budget = self446 .recorder447 .weight_calls_budget(<StructureWeight<T>>::find_parent());448449 let balance = balance(&self, token, &from)?;450 ensure_single_owner(&self, token, balance)?;451452 <Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)453 .map_err(dispatch_to_evm::<T>)?;454455 Ok(())456 }457458 /// @dev Not implemented459 fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<void> {460 Err("not implemented".into())461 }462463 /// @dev Not implemented464 fn set_approval_for_all(465 &mut self,466 _caller: caller,467 _operator: address,468 _approved: bool,469 ) -> Result<void> {470 // TODO: Not implemetable471 Err("not implemented".into())472 }473474 /// @dev Not implemented475 fn get_approved(&self, _token_id: uint256) -> Result<address> {476 // TODO: Not implemetable477 Err("not implemented".into())478 }479480 /// @dev Not implemented481 fn is_approved_for_all(&self, _owner: address, _operator: address) -> Result<address> {482 // TODO: Not implemetable483 Err("not implemented".into())484 }485}486487/// Returns amount of pieces of `token` that `owner` have488pub fn balance<T: Config>(489 collection: &RefungibleHandle<T>,490 token: TokenId,491 owner: &T::CrossAccountId,492) -> Result<u128> {493 collection.consume_store_reads(1)?;494 let balance = <Balance<T>>::get((collection.id, token, &owner));495 Ok(balance)496}497498/// Throws if `owner_balance` is lower than total amount of `token` pieces499pub fn ensure_single_owner<T: Config>(500 collection: &RefungibleHandle<T>,501 token: TokenId,502 owner_balance: u128,503) -> Result<()> {504 collection.consume_store_reads(1)?;505 let total_supply = <TotalSupply<T>>::get((collection.id, token));506 if total_supply != owner_balance {507 return Err("token has multiple owners".into());508 }509 Ok(())510}511512/// @title ERC721 Token that can be irreversibly burned (destroyed).513#[solidity_interface(name = ERC721Burnable)]514impl<T: Config> RefungibleHandle<T> {515 /// @notice Burns a specific ERC721 token.516 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized517 /// operator of the current owner.518 /// @param tokenId The RFT to approve519 #[weight(<SelfWeightOf<T>>::burn_item_fully())]520 fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {521 let caller = T::CrossAccountId::from_eth(caller);522 let token = token_id.try_into()?;523524 let balance = balance(&self, token, &caller)?;525 ensure_single_owner(&self, token, balance)?;526527 <Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;528 Ok(())529 }530}531532/// @title ERC721 minting logic.533#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]534impl<T: Config> RefungibleHandle<T> {535 fn minting_finished(&self) -> Result<bool> {536 Ok(false)537 }538539 /// @notice Function to mint token.540 /// @param to The new owner541 /// @return uint256 The id of the newly minted token542 #[weight(<SelfWeightOf<T>>::create_item())]543 fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {544 let token_id: uint256 = <TokensMinted<T>>::get(self.id)545 .checked_add(1)546 .ok_or("item id overflow")?547 .into();548 self.mint_check_id(caller, to, token_id)?;549 Ok(token_id)550 }551552 /// @notice Function to mint token.553 /// @dev `tokenId` should be obtained with `nextTokenId` method,554 /// unlike standard, you can't specify it manually555 /// @param to The new owner556 /// @param tokenId ID of the minted RFT557 #[solidity(hide, rename_selector = "mint")]558 #[weight(<SelfWeightOf<T>>::create_item())]559 fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {560 let caller = T::CrossAccountId::from_eth(caller);561 let to = T::CrossAccountId::from_eth(to);562 let token_id: u32 = token_id.try_into()?;563 let budget = self564 .recorder565 .weight_calls_budget(<StructureWeight<T>>::find_parent());566567 if <TokensMinted<T>>::get(self.id)568 .checked_add(1)569 .ok_or("item id overflow")?570 != token_id571 {572 return Err("item id should be next".into());573 }574575 let users = [(to.clone(), 1)]576 .into_iter()577 .collect::<BTreeMap<_, _>>()578 .try_into()579 .unwrap();580 <Pallet<T>>::create_item(581 self,582 &caller,583 CreateItemData::<T::CrossAccountId> {584 users,585 properties: CollectionPropertiesVec::default(),586 },587 &budget,588 )589 .map_err(dispatch_to_evm::<T>)?;590591 Ok(true)592 }593594 /// @notice Function to mint token with the given tokenUri.595 /// @param to The new owner596 /// @param tokenUri Token URI that would be stored in the NFT properties597 /// @return uint256 The id of the newly minted token598 #[solidity(rename_selector = "mintWithTokenURI")]599 #[weight(<SelfWeightOf<T>>::create_item())]600 fn mint_with_token_uri(601 &mut self,602 caller: caller,603 to: address,604 token_uri: string,605 ) -> Result<uint256> {606 let token_id: uint256 = <TokensMinted<T>>::get(self.id)607 .checked_add(1)608 .ok_or("item id overflow")?609 .into();610 self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;611 Ok(token_id)612 }613614 /// @notice Function to mint token with the given tokenUri.615 /// @dev `tokenId` should be obtained with `nextTokenId` method,616 /// unlike standard, you can't specify it manually617 /// @param to The new owner618 /// @param tokenId ID of the minted RFT619 /// @param tokenUri Token URI that would be stored in the RFT properties620 #[solidity(hide, rename_selector = "mintWithTokenURI")]621 #[weight(<SelfWeightOf<T>>::create_item())]622 fn mint_with_token_uri_check_id(623 &mut self,624 caller: caller,625 to: address,626 token_id: uint256,627 token_uri: string,628 ) -> Result<bool> {629 let key = key::url();630 let permission = get_token_permission::<T>(self.id, &key)?;631 if !permission.collection_admin {632 return Err("Operation is not allowed".into());633 }634635 let caller = T::CrossAccountId::from_eth(caller);636 let to = T::CrossAccountId::from_eth(to);637 let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;638 let budget = self639 .recorder640 .weight_calls_budget(<StructureWeight<T>>::find_parent());641642 if <TokensMinted<T>>::get(self.id)643 .checked_add(1)644 .ok_or("item id overflow")?645 != token_id646 {647 return Err("item id should be next".into());648 }649650 let mut properties = CollectionPropertiesVec::default();651 properties652 .try_push(Property {653 key,654 value: token_uri655 .into_bytes()656 .try_into()657 .map_err(|_| "token uri is too long")?,658 })659 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;660661 let users = [(to.clone(), 1)]662 .into_iter()663 .collect::<BTreeMap<_, _>>()664 .try_into()665 .unwrap();666 <Pallet<T>>::create_item(667 self,668 &caller,669 CreateItemData::<T::CrossAccountId> { users, properties },670 &budget,671 )672 .map_err(dispatch_to_evm::<T>)?;673 Ok(true)674 }675676 /// @dev Not implemented677 fn finish_minting(&mut self, _caller: caller) -> Result<bool> {678 Err("not implementable".into())679 }680}681682fn get_token_property<T: Config>(683 collection: &CollectionHandle<T>,684 token_id: u32,685 key: &up_data_structs::PropertyKey,686) -> Result<string> {687 collection.consume_store_reads(1)?;688 let properties = <TokenProperties<T>>::try_get((collection.id, token_id))689 .map_err(|_| Error::Revert("Token properties not found".into()))?;690 if let Some(property) = properties.get(key) {691 return Ok(string::from_utf8_lossy(property).into());692 }693694 Err("Property tokenURI not found".into())695}696697fn get_token_permission<T: Config>(698 collection_id: CollectionId,699 key: &PropertyKey,700) -> Result<PropertyPermission> {701 let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)702 .map_err(|_| Error::Revert("No permissions for collection".into()))?;703 let a = token_property_permissions704 .get(key)705 .map(Clone::clone)706 .ok_or_else(|| {707 let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();708 Error::Revert(alloc::format!("No permission for key {}", key))709 })?;710 Ok(a)711}712713/// @title Unique extensions for ERC721.714#[solidity_interface(name = ERC721UniqueExtensions)]715impl<T: Config> RefungibleHandle<T>716where717 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,718{719 /// @notice A descriptive name for a collection of NFTs in this contract720 fn name(&self) -> Result<string> {721 Ok(decode_utf16(self.name.iter().copied())722 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))723 .collect::<string>())724 }725726 /// @notice An abbreviated name for NFTs in this contract727 fn symbol(&self) -> Result<string> {728 Ok(string::from_utf8_lossy(&self.token_prefix).into())729 }730731 /// @notice A description for the collection.732 fn description(&self) -> Result<string> {733 Ok(decode_utf16(self.description.iter().copied())734 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))735 .collect::<string>())736 }737738 /// Returns the owner (in cross format) of the token.739 ///740 /// @param tokenId Id for the token.741 fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {742 Self::token_owner(&self, token_id.try_into()?)743 .map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))744 .ok_or(Error::Revert("key too large".into()))745 }746747 /// Returns the token properties.748 ///749 /// @param tokenId Id for the token.750 /// @param keys Properties keys. Empty keys for all propertyes.751 /// @return Vector of properties key/value pairs.752 fn token_properties(753 &self,754 token_id: uint256,755 keys: Vec<string>,756 ) -> Result<Vec<(string, bytes)>> {757 let keys = keys758 .into_iter()759 .map(|key| {760 <Vec<u8>>::from(key)761 .try_into()762 .map_err(|_| Error::Revert("key too large".into()))763 })764 .collect::<Result<Vec<_>>>()?;765766 <Self as CommonCollectionOperations<T>>::token_properties(767 &self,768 token_id.try_into()?,769 if keys.is_empty() { None } else { Some(keys) },770 )771 .into_iter()772 .map(|p| {773 let key = string::from_utf8(p.key.to_vec())774 .map_err(|e| Error::Revert(alloc::format!("{}", e)))?;775 let value = bytes(p.value.to_vec());776 Ok((key, value))777 })778 .collect::<Result<Vec<_>>>()779 }780 /// @notice Transfer ownership of an RFT781 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`782 /// is the zero address. Throws if `tokenId` is not a valid RFT.783 /// Throws if RFT pieces have multiple owners.784 /// @param to The new owner785 /// @param tokenId The RFT to transfer786 #[weight(<SelfWeightOf<T>>::transfer_creating_removing())]787 fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {788 let caller = T::CrossAccountId::from_eth(caller);789 let to = T::CrossAccountId::from_eth(to);790 let token = token_id.try_into()?;791 let budget = self792 .recorder793 .weight_calls_budget(<StructureWeight<T>>::find_parent());794795 let balance = balance(self, token, &caller)?;796 ensure_single_owner(self, token, balance)?;797798 <Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)799 .map_err(dispatch_to_evm::<T>)?;800 Ok(())801 }802803 /// @notice Transfer ownership of an RFT804 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`805 /// is the zero address. Throws if `tokenId` is not a valid RFT.806 /// Throws if RFT pieces have multiple owners.807 /// @param to The new owner808 /// @param tokenId The RFT to transfer809 #[weight(<SelfWeightOf<T>>::transfer_creating_removing())]810 fn transfer_cross(811 &mut self,812 caller: caller,813 to: EthCrossAccount,814 token_id: uint256,815 ) -> Result<void> {816 let caller = T::CrossAccountId::from_eth(caller);817 let to = to.into_sub_cross_account::<T>()?;818 let token = token_id.try_into()?;819 let budget = self820 .recorder821 .weight_calls_budget(<StructureWeight<T>>::find_parent());822823 let balance = balance(self, token, &caller)?;824 ensure_single_owner(self, token, balance)?;825826 <Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)827 .map_err(dispatch_to_evm::<T>)?;828 Ok(())829 }830831 /// @notice Transfer ownership of an RFT832 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`833 /// is the zero address. Throws if `tokenId` is not a valid RFT.834 /// Throws if RFT pieces have multiple owners.835 /// @param to The new owner836 /// @param tokenId The RFT to transfer837 #[weight(<SelfWeightOf<T>>::transfer_creating_removing())]838 fn transfer_from_cross(839 &mut self,840 caller: caller,841 from: EthCrossAccount,842 to: EthCrossAccount,843 token_id: uint256,844 ) -> Result<void> {845 let caller = T::CrossAccountId::from_eth(caller);846 let from = from.into_sub_cross_account::<T>()?;847 let to = to.into_sub_cross_account::<T>()?;848 let token_id = token_id.try_into()?;849 let budget = self850 .recorder851 .weight_calls_budget(<StructureWeight<T>>::find_parent());852853 let balance = balance(self, token_id, &from)?;854 ensure_single_owner(self, token_id, balance)?;855856 Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)857 .map_err(dispatch_to_evm::<T>)?;858 Ok(())859 }860861 /// @notice Burns a specific ERC721 token.862 /// @dev Throws unless `msg.sender` is the current owner or an authorized863 /// operator for this RFT. Throws if `from` is not the current owner. Throws864 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.865 /// Throws if RFT pieces have multiple owners.866 /// @param from The current owner of the RFT867 /// @param tokenId The RFT to transfer868 #[solidity(hide)]869 #[weight(<SelfWeightOf<T>>::burn_from())]870 fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {871 let caller = T::CrossAccountId::from_eth(caller);872 let from = T::CrossAccountId::from_eth(from);873 let token = token_id.try_into()?;874 let budget = self875 .recorder876 .weight_calls_budget(<StructureWeight<T>>::find_parent());877878 let balance = balance(self, token, &from)?;879 ensure_single_owner(self, token, balance)?;880881 <Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)882 .map_err(dispatch_to_evm::<T>)?;883 Ok(())884 }885886 /// @notice Burns a specific ERC721 token.887 /// @dev Throws unless `msg.sender` is the current owner or an authorized888 /// operator for this RFT. Throws if `from` is not the current owner. Throws889 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.890 /// Throws if RFT pieces have multiple owners.891 /// @param from The current owner of the RFT892 /// @param tokenId The RFT to transfer893 #[weight(<SelfWeightOf<T>>::burn_from())]894 fn burn_from_cross(895 &mut self,896 caller: caller,897 from: EthCrossAccount,898 token_id: uint256,899 ) -> Result<void> {900 let caller = T::CrossAccountId::from_eth(caller);901 let from = from.into_sub_cross_account::<T>()?;902 let token = token_id.try_into()?;903 let budget = self904 .recorder905 .weight_calls_budget(<StructureWeight<T>>::find_parent());906907 let balance = balance(self, token, &from)?;908 ensure_single_owner(self, token, balance)?;909910 <Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)911 .map_err(dispatch_to_evm::<T>)?;912 Ok(())913 }914915 /// @notice Returns next free RFT ID.916 fn next_token_id(&self) -> Result<uint256> {917 self.consume_store_reads(1)?;918 Ok(<TokensMinted<T>>::get(self.id)919 .checked_add(1)920 .ok_or("item id overflow")?921 .into())922 }923924 /// @notice Function to mint multiple tokens.925 /// @dev `tokenIds` should be an array of consecutive numbers and first number926 /// should be obtained with `nextTokenId` method927 /// @param to The new owner928 /// @param tokenIds IDs of the minted RFTs929 #[solidity(hide)]930 #[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]931 fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {932 let caller = T::CrossAccountId::from_eth(caller);933 let to = T::CrossAccountId::from_eth(to);934 let mut expected_index = <TokensMinted<T>>::get(self.id)935 .checked_add(1)936 .ok_or("item id overflow")?;937 let budget = self938 .recorder939 .weight_calls_budget(<StructureWeight<T>>::find_parent());940941 let total_tokens = token_ids.len();942 for id in token_ids.into_iter() {943 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;944 if id != expected_index {945 return Err("item id should be next".into());946 }947 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;948 }949 let users = [(to.clone(), 1)]950 .into_iter()951 .collect::<BTreeMap<_, _>>()952 .try_into()953 .unwrap();954 let create_item_data = CreateItemData::<T::CrossAccountId> {955 users,956 properties: CollectionPropertiesVec::default(),957 };958 let data = (0..total_tokens)959 .map(|_| create_item_data.clone())960 .collect();961962 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)963 .map_err(dispatch_to_evm::<T>)?;964 Ok(true)965 }966967 /// @notice Function to mint multiple tokens with the given tokenUris.968 /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive969 /// numbers and first number should be obtained with `nextTokenId` method970 /// @param to The new owner971 /// @param tokens array of pairs of token ID and token URI for minted tokens972 #[solidity(hide, rename_selector = "mintBulkWithTokenURI")]973 #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]974 fn mint_bulk_with_token_uri(975 &mut self,976 caller: caller,977 to: address,978 tokens: Vec<(uint256, string)>,979 ) -> Result<bool> {980 let key = key::url();981 let caller = T::CrossAccountId::from_eth(caller);982 let to = T::CrossAccountId::from_eth(to);983 let mut expected_index = <TokensMinted<T>>::get(self.id)984 .checked_add(1)985 .ok_or("item id overflow")?;986 let budget = self987 .recorder988 .weight_calls_budget(<StructureWeight<T>>::find_parent());989990 let mut data = Vec::with_capacity(tokens.len());991 let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]992 .into_iter()993 .collect::<BTreeMap<_, _>>()994 .try_into()995 .unwrap();996 for (id, token_uri) in tokens {997 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;998 if id != expected_index {999 return Err("item id should be next".into());1000 }1001 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10021003 let mut properties = CollectionPropertiesVec::default();1004 properties1005 .try_push(Property {1006 key: key.clone(),1007 value: token_uri1008 .into_bytes()1009 .try_into()1010 .map_err(|_| "token uri is too long")?,1011 })1012 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10131014 let create_item_data = CreateItemData::<T::CrossAccountId> {1015 users: users.clone(),1016 properties,1017 };1018 data.push(create_item_data);1019 }10201021 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1022 .map_err(dispatch_to_evm::<T>)?;1023 Ok(true)1024 }10251026 /// Returns EVM address for refungible token1027 ///1028 /// @param token ID of the token1029 fn token_contract_address(&self, token: uint256) -> Result<address> {1030 Ok(T::EvmTokenAddressMapping::token_to_address(1031 self.id,1032 token.try_into().map_err(|_| "token id overflow")?,1033 ))1034 }1035}10361037#[solidity_interface(1038 name = UniqueRefungible,1039 is(1040 ERC721,1041 ERC721Enumerable,1042 ERC721UniqueExtensions,1043 ERC721UniqueMintable,1044 ERC721Burnable,1045 ERC721Metadata(if(this.flags.erc721metadata)),1046 Collection(via(common_mut returns CollectionHandle<T>)),1047 TokenProperties,1048 )1049)]1050impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}10511052// Not a tests, but code generators1053generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);1054generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);10551056impl<T: Config> CommonEvmHandler for RefungibleHandle<T>1057where1058 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1059{1060 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");1061 fn call(1062 self,1063 handle: &mut impl PrecompileHandle,1064 ) -> Option<pallet_common::erc::PrecompileResult> {1065 call::<T, UniqueRefungibleCall<T>, _, _>(handle, self)1066 }1067}pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -188,11 +188,11 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) public view returns (Tuple22[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Tuple26[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple22[](0);
+ return new Tuple26[](0);
}
// /// Set the sponsor of the collection.
@@ -253,10 +253,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple25 memory) {
+ function collectionSponsor() public view returns (Tuple29 memory) {
require(false, stub_error);
dummy;
- return Tuple25(0x0000000000000000000000000000000000000000, 0);
+ return Tuple29(0x0000000000000000000000000000000000000000, 0);
}
/// Set limits for the collection.
@@ -527,13 +527,13 @@
}
/// @dev anonymous struct
-struct Tuple25 {
+struct Tuple29 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple22 {
+struct Tuple26 {
string field_0;
bytes field_1;
}
@@ -680,7 +680,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xab243667
+/// @dev the ERC-165 identifier for this interface is 0x1d4b64d6
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -728,12 +728,12 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0xefc26c69,
/// or in textual repr: tokenProperties(uint256,string[])
- function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Tuple8[] memory) {
+ function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {
require(false, stub_error);
tokenId;
keys;
dummy;
- return new Tuple8[](0);
+ return new Property[](0);
}
/// @notice Transfer ownership of an RFT
@@ -849,7 +849,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) public returns (bool) {
+ // function mintBulkWithTokenURI(address to, Tuple14[] memory tokens) public returns (bool) {
// require(false, stub_error);
// to;
// tokens;
@@ -871,15 +871,9 @@
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple14 {
uint256 field_0;
string field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple8 {
- string field_0;
- bytes field_1;
}
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -249,7 +249,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple23[]",
+ "internalType": "struct Tuple27[]",
"name": "",
"type": "tuple[]"
}
@@ -273,7 +273,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple26",
+ "internalType": "struct Tuple30",
"name": "",
"type": "tuple"
}
@@ -674,10 +674,10 @@
"outputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
- { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
],
- "internalType": "struct Tuple8[]",
+ "internalType": "struct Property[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -231,7 +231,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple22[]",
+ "internalType": "struct Tuple26[]",
"name": "",
"type": "tuple[]"
}
@@ -255,7 +255,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple25",
+ "internalType": "struct Tuple29",
"name": "",
"type": "tuple"
}
@@ -665,10 +665,10 @@
"outputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
- { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
],
- "internalType": "struct Tuple8[]",
+ "internalType": "struct Property[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -290,7 +290,7 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x29f4dcd9
+/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
interface ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -45,7 +45,7 @@
/// @param properties settable properties
/// @dev EVM selector for this function is: 0x14ed3a6e,
/// or in textual repr: setProperties(uint256,(string,bytes)[])
- function setProperties(uint256 tokenId, Tuple21[] memory properties) external;
+ function setProperties(uint256 tokenId, Property[] memory properties) external;
// /// @notice Delete token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -95,7 +95,7 @@
/// @param properties Vector of properties key/value pair.
/// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
- function setCollectionProperties(Tuple21[] memory properties) external;
+ function setCollectionProperties(Property[] memory properties) external;
// /// Delete collection property.
// ///
@@ -127,7 +127,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) external view returns (Tuple21[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Tuple25[] memory);
// /// Set the sponsor of the collection.
// ///
@@ -169,7 +169,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple24 memory);
+ function collectionSponsor() external view returns (Tuple28 memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -346,13 +346,13 @@
}
/// @dev anonymous struct
-struct Tuple24 {
+struct Tuple28 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple21 {
+struct Tuple25 {
string field_0;
bytes field_1;
}
@@ -452,7 +452,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x244543ee
+/// @dev the ERC-165 identifier for this interface is 0xb8f094a0
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -483,7 +483,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0xefc26c69,
/// or in textual repr: tokenProperties(uint256,string[])
- function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Tuple7[] memory);
+ function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);
/// @notice Set or reaffirm the approved address for an NFT
/// @dev The zero address indicates there is no approved address.
@@ -567,20 +567,14 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) external returns (bool);
+ // function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple13 {
uint256 field_0;
string field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple7 {
- string field_0;
- bytes field_1;
}
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -127,7 +127,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) external view returns (Tuple22[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Tuple24[] memory);
// /// Set the sponsor of the collection.
// ///
@@ -169,7 +169,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple25 memory);
+ function collectionSponsor() external view returns (Tuple27 memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -346,13 +346,13 @@
}
/// @dev anonymous struct
-struct Tuple25 {
+struct Tuple27 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple22 {
+struct Tuple24 {
string field_0;
bytes field_1;
}
@@ -450,7 +450,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xab243667
+/// @dev the ERC-165 identifier for this interface is 0x1d4b64d6
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -481,7 +481,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0xefc26c69,
/// or in textual repr: tokenProperties(uint256,string[])
- function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Tuple7[] memory);
+ function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);
/// @notice Transfer ownership of an RFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -560,7 +560,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) external returns (bool);
+ // function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
/// Returns EVM address for refungible token
///
@@ -571,15 +571,9 @@
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple12 {
uint256 field_0;
string field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple7 {
- string field_0;
- bytes field_1;
}
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -117,7 +117,7 @@
});
itEth('ERC721UniqueExtensions support', async ({helper}) => {
- await checkInterface(helper, '0x922a115f', true, true);
+ await checkInterface(helper, '0xb8f094a0', true, true);
});
itEth('ERC721Burnable - 0x42966c68 - support', async ({helper}) => {