difftreelog
name anonymous tuples
in: master
15 files changed
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -18,7 +18,10 @@
use alloc::format;
use sp_std::{vec, vec::Vec};
-use evm_coder::{AbiCoder, types::Address};
+use evm_coder::{
+ AbiCoder,
+ types::{Address, String},
+};
pub use pallet_evm::{Config, account::CrossAccountId};
use sp_core::{H160, U256};
use up_data_structs::CollectionId;
@@ -390,6 +393,16 @@
}
}
+/// Data for creation token with uri.
+#[derive(Debug, AbiCoder)]
+pub struct TokenUri {
+ /// Id of new token.
+ pub id: U256,
+
+ /// Uri of new token.
+ pub uri: String,
+}
+
/// Nested collections.
#[derive(Debug, Default, AbiCoder)]
pub struct CollectionNesting {
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -6,7 +6,7 @@
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-// Unique Network is distributed in the hope that it will be useful,
+// Unique Network is disaddress: tod in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
@@ -19,6 +19,7 @@
extern crate alloc;
use core::char::{REPLACEMENT_CHARACTER, decode_utf16};
use core::convert::TryInto;
+use evm_coder::AbiCoder;
use evm_coder::{
abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,
weight,
@@ -57,6 +58,12 @@
},
}
+#[derive(AbiCoder, Debug)]
+pub struct AmountForAddress {
+ to: Address,
+ amount: U256,
+}
+
#[solidity_interface(name = ERC20, events(ERC20Events), expect_selector = 0x942e8b22)]
impl<T: Config> FungibleHandle<T> {
fn name(&self) -> Result<String> {
@@ -264,14 +271,14 @@
/// Mint tokens for multiple accounts.
/// @param amounts array of pairs of account address and amount
#[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]
- fn mint_bulk(&mut self, caller: Caller, amounts: Vec<(Address, U256)>) -> Result<bool> {
+ fn mint_bulk(&mut self, caller: Caller, amounts: Vec<AmountForAddress>) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let budget = self
.recorder
.weight_calls_budget(<StructureWeight<T>>::find_parent());
let amounts = amounts
.into_iter()
- .map(|(to, amount)| {
+ .map(|AmountForAddress { to, amount }| {
Ok((
T::CrossAccountId::from_eth(to),
amount.try_into().map_err(|_| "amount overflow")?,
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
@@ -590,7 +590,7 @@
/// @param amounts array of pairs of account address and amount
/// @dev EVM selector for this function is: 0x1acf2d55,
/// or in textual repr: mintBulk((address,uint256)[])
- function mintBulk(Tuple11[] memory amounts) public returns (bool) {
+ function mintBulk(AmountForAddress[] memory amounts) public returns (bool) {
require(false, stub_error);
amounts;
dummy = 0;
@@ -632,10 +632,9 @@
}
}
-/// @dev anonymous struct
-struct Tuple11 {
- address field_0;
- uint256 field_1;
+struct AmountForAddress {
+ address to;
+ uint256 amount;
}
/// @dev the ERC-165 identifier for this interface is 0x40c10f19
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -38,7 +38,7 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
- eth,
+ eth::{self, TokenUri},
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::call;
@@ -948,7 +948,7 @@
&mut self,
caller: Caller,
to: Address,
- tokens: Vec<(U256, String)>,
+ tokens: Vec<TokenUri>,
) -> Result<bool> {
let key = key::url();
let caller = T::CrossAccountId::from_eth(caller);
@@ -961,7 +961,7 @@
.weight_calls_budget(<StructureWeight<T>>::find_parent());
let mut data = Vec::with_capacity(tokens.len());
- for (id, token_uri) in tokens {
+ for TokenUri { id, uri } in tokens {
let id: u32 = id.try_into().map_err(|_| "token id overflow")?;
if id != expected_index {
return Err("item id should be next".into());
@@ -972,7 +972,7 @@
properties
.try_push(Property {
key: key.clone(),
- value: token_uri
+ value: uri
.into_bytes()
.try_into()
.map_err(|_| "token uri is too long")?,
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7contract Dummy {8 uint8 dummy;9 string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13 function supportsInterface(bytes4 interfaceID) external view returns (bool) {14 require(false, stub_error);15 interfaceID;16 return true;17 }18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0xde0695c222contract TokenProperties is Dummy, ERC165 {23 // /// @notice Set permissions for token property.24 // /// @dev Throws error if `msg.sender` is not admin or owner of the collection.25 // /// @param key Property key.26 // /// @param isMutable Permission to mutate property.27 // /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28 // /// @param tokenOwner Permission to mutate property by token owner if property is mutable.29 // /// @dev EVM selector for this function is: 0x222d97fa,30 // /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31 // function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) public {32 // require(false, stub_error);33 // key;34 // isMutable;35 // collectionAdmin;36 // tokenOwner;37 // dummy = 0;38 // }3940 /// @notice Set permissions for token property.41 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.42 /// @param permissions Permissions for keys.43 /// @dev EVM selector for this function is: 0xbd92983a,44 /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])45 function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) public {46 require(false, stub_error);47 permissions;48 dummy = 0;49 }5051 /// @notice Get permissions for token properties.52 /// @dev EVM selector for this function is: 0xf23d7790,53 /// or in textual repr: tokenPropertyPermissions()54 function tokenPropertyPermissions() public view returns (TokenPropertyPermission[] memory) {55 require(false, stub_error);56 dummy;57 return new TokenPropertyPermission[](0);58 }5960 // /// @notice Set token property value.61 // /// @dev Throws error if `msg.sender` has no permission to edit the property.62 // /// @param tokenId ID of the token.63 // /// @param key Property key.64 // /// @param value Property value.65 // /// @dev EVM selector for this function is: 0x1752d67b,66 // /// or in textual repr: setProperty(uint256,string,bytes)67 // function setProperty(uint256 tokenId, string memory key, bytes memory value) public {68 // require(false, stub_error);69 // tokenId;70 // key;71 // value;72 // dummy = 0;73 // }7475 /// @notice Set token properties value.76 /// @dev Throws error if `msg.sender` has no permission to edit the property.77 /// @param tokenId ID of the token.78 /// @param properties settable properties79 /// @dev EVM selector for this function is: 0x14ed3a6e,80 /// or in textual repr: setProperties(uint256,(string,bytes)[])81 function setProperties(uint256 tokenId, Property[] memory properties) public {82 require(false, stub_error);83 tokenId;84 properties;85 dummy = 0;86 }8788 // /// @notice Delete token property value.89 // /// @dev Throws error if `msg.sender` has no permission to edit the property.90 // /// @param tokenId ID of the token.91 // /// @param key Property key.92 // /// @dev EVM selector for this function is: 0x066111d1,93 // /// or in textual repr: deleteProperty(uint256,string)94 // function deleteProperty(uint256 tokenId, string memory key) public {95 // require(false, stub_error);96 // tokenId;97 // key;98 // dummy = 0;99 // }100101 /// @notice Delete token properties value.102 /// @dev Throws error if `msg.sender` has no permission to edit the property.103 /// @param tokenId ID of the token.104 /// @param keys Properties key.105 /// @dev EVM selector for this function is: 0xc472d371,106 /// or in textual repr: deleteProperties(uint256,string[])107 function deleteProperties(uint256 tokenId, string[] memory keys) public {108 require(false, stub_error);109 tokenId;110 keys;111 dummy = 0;112 }113114 /// @notice Get token property value.115 /// @dev Throws error if key not found116 /// @param tokenId ID of the token.117 /// @param key Property key.118 /// @return Property value bytes119 /// @dev EVM selector for this function is: 0x7228c327,120 /// or in textual repr: property(uint256,string)121 function property(uint256 tokenId, string memory key) public view returns (bytes memory) {122 require(false, stub_error);123 tokenId;124 key;125 dummy;126 return hex"";127 }128}129130/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).131struct Property {132 string key;133 bytes value;134}135136/// Ethereum representation of Token Property Permissions.137struct TokenPropertyPermission {138 /// Token property key.139 string key;140 /// Token property permissions.141 PropertyPermission[] permissions;142}143144/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.145struct PropertyPermission {146 /// TokenPermission field.147 TokenPermissionField code;148 /// TokenPermission value.149 bool value;150}151152/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.153enum TokenPermissionField {154 /// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]155 Mutable,156 /// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]157 TokenOwner,158 /// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]159 CollectionAdmin160}161162/// @title A contract that allows you to work with collections.163/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1164contract Collection is Dummy, ERC165 {165 // /// Set collection property.166 // ///167 // /// @param key Property key.168 // /// @param value Propery value.169 // /// @dev EVM selector for this function is: 0x2f073f66,170 // /// or in textual repr: setCollectionProperty(string,bytes)171 // function setCollectionProperty(string memory key, bytes memory value) public {172 // require(false, stub_error);173 // key;174 // value;175 // dummy = 0;176 // }177178 /// Set collection properties.179 ///180 /// @param properties Vector of properties key/value pair.181 /// @dev EVM selector for this function is: 0x50b26b2a,182 /// or in textual repr: setCollectionProperties((string,bytes)[])183 function setCollectionProperties(Property[] memory properties) public {184 require(false, stub_error);185 properties;186 dummy = 0;187 }188189 // /// Delete collection property.190 // ///191 // /// @param key Property key.192 // /// @dev EVM selector for this function is: 0x7b7debce,193 // /// or in textual repr: deleteCollectionProperty(string)194 // function deleteCollectionProperty(string memory key) public {195 // require(false, stub_error);196 // key;197 // dummy = 0;198 // }199200 /// Delete collection properties.201 ///202 /// @param keys Properties keys.203 /// @dev EVM selector for this function is: 0xee206ee3,204 /// or in textual repr: deleteCollectionProperties(string[])205 function deleteCollectionProperties(string[] memory keys) public {206 require(false, stub_error);207 keys;208 dummy = 0;209 }210211 /// Get collection property.212 ///213 /// @dev Throws error if key not found.214 ///215 /// @param key Property key.216 /// @return bytes The property corresponding to the key.217 /// @dev EVM selector for this function is: 0xcf24fd6d,218 /// or in textual repr: collectionProperty(string)219 function collectionProperty(string memory key) public view returns (bytes memory) {220 require(false, stub_error);221 key;222 dummy;223 return hex"";224 }225226 /// Get collection properties.227 ///228 /// @param keys Properties keys. Empty keys for all propertyes.229 /// @return Vector of properties key/value pairs.230 /// @dev EVM selector for this function is: 0x285fb8e6,231 /// or in textual repr: collectionProperties(string[])232 function collectionProperties(string[] memory keys) public view returns (Property[] memory) {233 require(false, stub_error);234 keys;235 dummy;236 return new Property[](0);237 }238239 // /// Set the sponsor of the collection.240 // ///241 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.242 // ///243 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.244 // /// @dev EVM selector for this function is: 0x7623402e,245 // /// or in textual repr: setCollectionSponsor(address)246 // function setCollectionSponsor(address sponsor) public {247 // require(false, stub_error);248 // sponsor;249 // dummy = 0;250 // }251252 /// Set the sponsor of the collection.253 ///254 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.255 ///256 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.257 /// @dev EVM selector for this function is: 0x84a1d5a8,258 /// or in textual repr: setCollectionSponsorCross((address,uint256))259 function setCollectionSponsorCross(CrossAddress memory sponsor) public {260 require(false, stub_error);261 sponsor;262 dummy = 0;263 }264265 /// Whether there is a pending sponsor.266 /// @dev EVM selector for this function is: 0x058ac185,267 /// or in textual repr: hasCollectionPendingSponsor()268 function hasCollectionPendingSponsor() public view returns (bool) {269 require(false, stub_error);270 dummy;271 return false;272 }273274 /// Collection sponsorship confirmation.275 ///276 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.277 /// @dev EVM selector for this function is: 0x3c50e97a,278 /// or in textual repr: confirmCollectionSponsorship()279 function confirmCollectionSponsorship() public {280 require(false, stub_error);281 dummy = 0;282 }283284 /// Remove collection sponsor.285 /// @dev EVM selector for this function is: 0x6e0326a3,286 /// or in textual repr: removeCollectionSponsor()287 function removeCollectionSponsor() public {288 require(false, stub_error);289 dummy = 0;290 }291292 /// Get current sponsor.293 ///294 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.295 /// @dev EVM selector for this function is: 0x6ec0a9f1,296 /// or in textual repr: collectionSponsor()297 function collectionSponsor() public view returns (CrossAddress memory) {298 require(false, stub_error);299 dummy;300 return CrossAddress(0x0000000000000000000000000000000000000000, 0);301 }302303 /// Get current collection limits.304 ///305 /// @return Array of collection limits306 /// @dev EVM selector for this function is: 0xf63bc572,307 /// or in textual repr: collectionLimits()308 function collectionLimits() public view returns (CollectionLimit[] memory) {309 require(false, stub_error);310 dummy;311 return new CollectionLimit[](0);312 }313314 /// Set limits for the collection.315 /// @dev Throws error if limit not found.316 /// @param limit Some limit.317 /// @dev EVM selector for this function is: 0x2316ee74,318 /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))319 function setCollectionLimit(CollectionLimit memory limit) public {320 require(false, stub_error);321 limit;322 dummy = 0;323 }324325 /// Get contract address.326 /// @dev EVM selector for this function is: 0xf6b4dfb4,327 /// or in textual repr: contractAddress()328 function contractAddress() public view returns (address) {329 require(false, stub_error);330 dummy;331 return 0x0000000000000000000000000000000000000000;332 }333334 /// Add collection admin.335 /// @param newAdmin Cross account administrator address.336 /// @dev EVM selector for this function is: 0x859aa7d6,337 /// or in textual repr: addCollectionAdminCross((address,uint256))338 function addCollectionAdminCross(CrossAddress memory newAdmin) public {339 require(false, stub_error);340 newAdmin;341 dummy = 0;342 }343344 /// Remove collection admin.345 /// @param admin Cross account administrator address.346 /// @dev EVM selector for this function is: 0x6c0cd173,347 /// or in textual repr: removeCollectionAdminCross((address,uint256))348 function removeCollectionAdminCross(CrossAddress memory admin) public {349 require(false, stub_error);350 admin;351 dummy = 0;352 }353354 // /// Add collection admin.355 // /// @param newAdmin Address of the added administrator.356 // /// @dev EVM selector for this function is: 0x92e462c7,357 // /// or in textual repr: addCollectionAdmin(address)358 // function addCollectionAdmin(address newAdmin) public {359 // require(false, stub_error);360 // newAdmin;361 // dummy = 0;362 // }363364 // /// Remove collection admin.365 // ///366 // /// @param admin Address of the removed administrator.367 // /// @dev EVM selector for this function is: 0xfafd7b42,368 // /// or in textual repr: removeCollectionAdmin(address)369 // function removeCollectionAdmin(address admin) public {370 // require(false, stub_error);371 // admin;372 // dummy = 0;373 // }374375 /// Toggle accessibility of collection nesting.376 ///377 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'378 /// @dev EVM selector for this function is: 0x112d4586,379 /// or in textual repr: setCollectionNesting(bool)380 function setCollectionNesting(bool enable) public {381 require(false, stub_error);382 enable;383 dummy = 0;384 }385386 /// Toggle accessibility of collection nesting.387 ///388 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'389 /// @param collections Addresses of collections that will be available for nesting.390 /// @dev EVM selector for this function is: 0x64872396,391 /// or in textual repr: setCollectionNesting(bool,address[])392 function setCollectionNesting(bool enable, address[] memory collections) public {393 require(false, stub_error);394 enable;395 collections;396 dummy = 0;397 }398399 /// Returns nesting for a collection400 /// @dev EVM selector for this function is: 0x22d25bfe,401 /// or in textual repr: collectionNestingRestrictedCollectionIds()402 function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {403 require(false, stub_error);404 dummy;405 return CollectionNesting(false, new uint256[](0));406 }407408 /// Returns permissions for a collection409 /// @dev EVM selector for this function is: 0x5b2eaf4b,410 /// or in textual repr: collectionNestingPermissions()411 function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {412 require(false, stub_error);413 dummy;414 return new CollectionNestingPermission[](0);415 }416417 /// Set the collection access method.418 /// @param mode Access mode419 /// @dev EVM selector for this function is: 0x41835d4c,420 /// or in textual repr: setCollectionAccess(uint8)421 function setCollectionAccess(AccessMode mode) public {422 require(false, stub_error);423 mode;424 dummy = 0;425 }426427 /// Checks that user allowed to operate with collection.428 ///429 /// @param user User address to check.430 /// @dev EVM selector for this function is: 0x91b6df49,431 /// or in textual repr: allowlistedCross((address,uint256))432 function allowlistedCross(CrossAddress memory user) public view returns (bool) {433 require(false, stub_error);434 user;435 dummy;436 return false;437 }438439 // /// Add the user to the allowed list.440 // ///441 // /// @param user Address of a trusted user.442 // /// @dev EVM selector for this function is: 0x67844fe6,443 // /// or in textual repr: addToCollectionAllowList(address)444 // function addToCollectionAllowList(address user) public {445 // require(false, stub_error);446 // user;447 // dummy = 0;448 // }449450 /// Add user to allowed list.451 ///452 /// @param user User cross account address.453 /// @dev EVM selector for this function is: 0xa0184a3a,454 /// or in textual repr: addToCollectionAllowListCross((address,uint256))455 function addToCollectionAllowListCross(CrossAddress memory user) public {456 require(false, stub_error);457 user;458 dummy = 0;459 }460461 // /// Remove the user from the allowed list.462 // ///463 // /// @param user Address of a removed user.464 // /// @dev EVM selector for this function is: 0x85c51acb,465 // /// or in textual repr: removeFromCollectionAllowList(address)466 // function removeFromCollectionAllowList(address user) public {467 // require(false, stub_error);468 // user;469 // dummy = 0;470 // }471472 /// Remove user from allowed list.473 ///474 /// @param user User cross account address.475 /// @dev EVM selector for this function is: 0x09ba452a,476 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))477 function removeFromCollectionAllowListCross(CrossAddress memory user) public {478 require(false, stub_error);479 user;480 dummy = 0;481 }482483 /// Switch permission for minting.484 ///485 /// @param mode Enable if "true".486 /// @dev EVM selector for this function is: 0x00018e84,487 /// or in textual repr: setCollectionMintMode(bool)488 function setCollectionMintMode(bool mode) public {489 require(false, stub_error);490 mode;491 dummy = 0;492 }493494 // /// Check that account is the owner or admin of the collection495 // ///496 // /// @param user account to verify497 // /// @return "true" if account is the owner or admin498 // /// @dev EVM selector for this function is: 0x9811b0c7,499 // /// or in textual repr: isOwnerOrAdmin(address)500 // function isOwnerOrAdmin(address user) public view returns (bool) {501 // require(false, stub_error);502 // user;503 // dummy;504 // return false;505 // }506507 /// Check that account is the owner or admin of the collection508 ///509 /// @param user User cross account to verify510 /// @return "true" if account is the owner or admin511 /// @dev EVM selector for this function is: 0x3e75a905,512 /// or in textual repr: isOwnerOrAdminCross((address,uint256))513 function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {514 require(false, stub_error);515 user;516 dummy;517 return false;518 }519520 /// Returns collection type521 ///522 /// @return `Fungible` or `NFT` or `ReFungible`523 /// @dev EVM selector for this function is: 0xd34b55b8,524 /// or in textual repr: uniqueCollectionType()525 function uniqueCollectionType() public view returns (string memory) {526 require(false, stub_error);527 dummy;528 return "";529 }530531 /// Get collection owner.532 ///533 /// @return Tuble with sponsor address and his substrate mirror.534 /// If address is canonical then substrate mirror is zero and vice versa.535 /// @dev EVM selector for this function is: 0xdf727d3b,536 /// or in textual repr: collectionOwner()537 function collectionOwner() public view returns (CrossAddress memory) {538 require(false, stub_error);539 dummy;540 return CrossAddress(0x0000000000000000000000000000000000000000, 0);541 }542543 // /// Changes collection owner to another account544 // ///545 // /// @dev Owner can be changed only by current owner546 // /// @param newOwner new owner account547 // /// @dev EVM selector for this function is: 0x4f53e226,548 // /// or in textual repr: changeCollectionOwner(address)549 // function changeCollectionOwner(address newOwner) public {550 // require(false, stub_error);551 // newOwner;552 // dummy = 0;553 // }554555 /// Get collection administrators556 ///557 /// @return Vector of tuples with admins address and his substrate mirror.558 /// If address is canonical then substrate mirror is zero and vice versa.559 /// @dev EVM selector for this function is: 0x5813216b,560 /// or in textual repr: collectionAdmins()561 function collectionAdmins() public view returns (CrossAddress[] memory) {562 require(false, stub_error);563 dummy;564 return new CrossAddress[](0);565 }566567 /// Changes collection owner to another account568 ///569 /// @dev Owner can be changed only by current owner570 /// @param newOwner new owner cross account571 /// @dev EVM selector for this function is: 0x6496c497,572 /// or in textual repr: changeCollectionOwnerCross((address,uint256))573 function changeCollectionOwnerCross(CrossAddress memory newOwner) public {574 require(false, stub_error);575 newOwner;576 dummy = 0;577 }578}579580/// Cross account struct581struct CrossAddress {582 address eth;583 uint256 sub;584}585586/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).587enum AccessMode {588 /// Access grant for owner and admins. Used as default.589 Normal,590 /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.591 AllowList592}593594/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.595struct CollectionNestingPermission {596 CollectionPermissionField field;597 bool value;598}599600/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.601enum CollectionPermissionField {602 /// Owner of token can nest tokens under it.603 TokenOwner,604 /// Admin of token collection can nest tokens under token.605 CollectionAdmin606}607608/// Nested collections.609struct CollectionNesting {610 bool token_owner;611 uint256[] ids;612}613614/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.615struct CollectionLimit {616 CollectionLimitField field;617 OptionUint256 value;618}619620/// Optional value621struct OptionUint256 {622 /// Shows the status of accessibility of value623 bool status;624 /// Actual value if `status` is true625 uint256 value;626}627628/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.629enum CollectionLimitField {630 /// How many tokens can a user have on one account.631 AccountTokenOwnership,632 /// How many bytes of data are available for sponsorship.633 SponsoredDataSize,634 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]635 SponsoredDataRateLimit,636 /// How many tokens can be mined into this collection.637 TokenLimit,638 /// Timeouts for transfer sponsoring.639 SponsorTransferTimeout,640 /// Timeout for sponsoring an approval in passed blocks.641 SponsorApproveTimeout,642 /// Whether the collection owner of the collection can send tokens (which belong to other users).643 OwnerCanTransfer,644 /// Can the collection owner burn other people's tokens.645 OwnerCanDestroy,646 /// Is it possible to send tokens from this collection between users.647 TransferEnabled648}649650/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension651/// @dev See https://eips.ethereum.org/EIPS/eip-721652/// @dev the ERC-165 identifier for this interface is 0x5b5e139f653contract ERC721Metadata is Dummy, ERC165 {654 // /// @notice A descriptive name for a collection of NFTs in this contract655 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`656 // /// @dev EVM selector for this function is: 0x06fdde03,657 // /// or in textual repr: name()658 // function name() public view returns (string memory) {659 // require(false, stub_error);660 // dummy;661 // return "";662 // }663664 // /// @notice An abbreviated name for NFTs in this contract665 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`666 // /// @dev EVM selector for this function is: 0x95d89b41,667 // /// or in textual repr: symbol()668 // function symbol() public view returns (string memory) {669 // require(false, stub_error);670 // dummy;671 // return "";672 // }673674 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.675 ///676 /// @dev If the token has a `url` property and it is not empty, it is returned.677 /// 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`.678 /// If the collection property `baseURI` is empty or absent, return "" (empty string)679 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix680 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).681 ///682 /// @return token's const_metadata683 /// @dev EVM selector for this function is: 0xc87b56dd,684 /// or in textual repr: tokenURI(uint256)685 function tokenURI(uint256 tokenId) public view returns (string memory) {686 require(false, stub_error);687 tokenId;688 dummy;689 return "";690 }691}692693/// @title ERC721 Token that can be irreversibly burned (destroyed).694/// @dev the ERC-165 identifier for this interface is 0x42966c68695contract ERC721Burnable is Dummy, ERC165 {696 /// @notice Burns a specific ERC721 token.697 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized698 /// operator of the current owner.699 /// @param tokenId The NFT to approve700 /// @dev EVM selector for this function is: 0x42966c68,701 /// or in textual repr: burn(uint256)702 function burn(uint256 tokenId) public {703 require(false, stub_error);704 tokenId;705 dummy = 0;706 }707}708709/// @title ERC721 minting logic.710/// @dev the ERC-165 identifier for this interface is 0x3fd94ea6711contract ERC721UniqueMintable is Dummy, ERC165 {712 /// @notice Function to mint a token.713 /// @param to The new owner714 /// @return uint256 The id of the newly minted token715 /// @dev EVM selector for this function is: 0x6a627842,716 /// or in textual repr: mint(address)717 function mint(address to) public returns (uint256) {718 require(false, stub_error);719 to;720 dummy = 0;721 return 0;722 }723724 // /// @notice Function to mint a token.725 // /// @dev `tokenId` should be obtained with `nextTokenId` method,726 // /// unlike standard, you can't specify it manually727 // /// @param to The new owner728 // /// @param tokenId ID of the minted NFT729 // /// @dev EVM selector for this function is: 0x40c10f19,730 // /// or in textual repr: mint(address,uint256)731 // function mint(address to, uint256 tokenId) public returns (bool) {732 // require(false, stub_error);733 // to;734 // tokenId;735 // dummy = 0;736 // return false;737 // }738739 /// @notice Function to mint token with the given tokenUri.740 /// @param to The new owner741 /// @param tokenUri Token URI that would be stored in the NFT properties742 /// @return uint256 The id of the newly minted token743 /// @dev EVM selector for this function is: 0x45c17782,744 /// or in textual repr: mintWithTokenURI(address,string)745 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {746 require(false, stub_error);747 to;748 tokenUri;749 dummy = 0;750 return 0;751 }752 // /// @notice Function to mint token with the given tokenUri.753 // /// @dev `tokenId` should be obtained with `nextTokenId` method,754 // /// unlike standard, you can't specify it manually755 // /// @param to The new owner756 // /// @param tokenId ID of the minted NFT757 // /// @param tokenUri Token URI that would be stored in the NFT properties758 // /// @dev EVM selector for this function is: 0x50bb4e7f,759 // /// or in textual repr: mintWithTokenURI(address,uint256,string)760 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {761 // require(false, stub_error);762 // to;763 // tokenId;764 // tokenUri;765 // dummy = 0;766 // return false;767 // }768769}770771/// @title Unique extensions for ERC721.772/// @dev the ERC-165 identifier for this interface is 0x16de3152773contract ERC721UniqueExtensions is Dummy, ERC165 {774 /// @notice A descriptive name for a collection of NFTs in this contract775 /// @dev EVM selector for this function is: 0x06fdde03,776 /// or in textual repr: name()777 function name() public view returns (string memory) {778 require(false, stub_error);779 dummy;780 return "";781 }782783 /// @notice An abbreviated name for NFTs in this contract784 /// @dev EVM selector for this function is: 0x95d89b41,785 /// or in textual repr: symbol()786 function symbol() public view returns (string memory) {787 require(false, stub_error);788 dummy;789 return "";790 }791792 /// @notice A description for the collection.793 /// @dev EVM selector for this function is: 0x7284e416,794 /// or in textual repr: description()795 function description() public view returns (string memory) {796 require(false, stub_error);797 dummy;798 return "";799 }800801 /// Returns the owner (in cross format) of the token.802 ///803 /// @param tokenId Id for the token.804 /// @dev EVM selector for this function is: 0x2b29dace,805 /// or in textual repr: crossOwnerOf(uint256)806 function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {807 require(false, stub_error);808 tokenId;809 dummy;810 return CrossAddress(0x0000000000000000000000000000000000000000, 0);811 }812813 /// Returns the token properties.814 ///815 /// @param tokenId Id for the token.816 /// @param keys Properties keys. Empty keys for all propertyes.817 /// @return Vector of properties key/value pairs.818 /// @dev EVM selector for this function is: 0xe07ede7e,819 /// or in textual repr: properties(uint256,string[])820 function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {821 require(false, stub_error);822 tokenId;823 keys;824 dummy;825 return new Property[](0);826 }827828 /// @notice Set or reaffirm the approved address for an NFT829 /// @dev The zero address indicates there is no approved address.830 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized831 /// operator of the current owner.832 /// @param approved The new substrate address approved NFT controller833 /// @param tokenId The NFT to approve834 /// @dev EVM selector for this function is: 0x0ecd0ab0,835 /// or in textual repr: approveCross((address,uint256),uint256)836 function approveCross(CrossAddress memory approved, uint256 tokenId) public {837 require(false, stub_error);838 approved;839 tokenId;840 dummy = 0;841 }842843 /// @notice Transfer ownership of an NFT844 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`845 /// is the zero address. Throws if `tokenId` is not a valid NFT.846 /// @param to The new owner847 /// @param tokenId The NFT to transfer848 /// @dev EVM selector for this function is: 0xa9059cbb,849 /// or in textual repr: transfer(address,uint256)850 function transfer(address to, uint256 tokenId) public {851 require(false, stub_error);852 to;853 tokenId;854 dummy = 0;855 }856857 /// @notice Transfer ownership of an NFT858 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`859 /// is the zero address. Throws if `tokenId` is not a valid NFT.860 /// @param to The new owner861 /// @param tokenId The NFT to transfer862 /// @dev EVM selector for this function is: 0x2ada85ff,863 /// or in textual repr: transferCross((address,uint256),uint256)864 function transferCross(CrossAddress memory to, uint256 tokenId) public {865 require(false, stub_error);866 to;867 tokenId;868 dummy = 0;869 }870871 /// @notice Transfer ownership of an NFT from cross account address to cross account address872 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`873 /// is the zero address. Throws if `tokenId` is not a valid NFT.874 /// @param from Cross acccount address of current owner875 /// @param to Cross acccount address of new owner876 /// @param tokenId The NFT to transfer877 /// @dev EVM selector for this function is: 0xd5cf430b,878 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)879 function transferFromCross(880 CrossAddress memory from,881 CrossAddress memory to,882 uint256 tokenId883 ) public {884 require(false, stub_error);885 from;886 to;887 tokenId;888 dummy = 0;889 }890891 // /// @notice Burns a specific ERC721 token.892 // /// @dev Throws unless `msg.sender` is the current owner or an authorized893 // /// operator for this NFT. Throws if `from` is not the current owner. Throws894 // /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.895 // /// @param from The current owner of the NFT896 // /// @param tokenId The NFT to transfer897 // /// @dev EVM selector for this function is: 0x79cc6790,898 // /// or in textual repr: burnFrom(address,uint256)899 // function burnFrom(address from, uint256 tokenId) public {900 // require(false, stub_error);901 // from;902 // tokenId;903 // dummy = 0;904 // }905906 /// @notice Burns a specific ERC721 token.907 /// @dev Throws unless `msg.sender` is the current owner or an authorized908 /// operator for this NFT. Throws if `from` is not the current owner. Throws909 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.910 /// @param from The current owner of the NFT911 /// @param tokenId The NFT to transfer912 /// @dev EVM selector for this function is: 0xbb2f5a58,913 /// or in textual repr: burnFromCross((address,uint256),uint256)914 function burnFromCross(CrossAddress memory from, uint256 tokenId) public {915 require(false, stub_error);916 from;917 tokenId;918 dummy = 0;919 }920921 /// @notice Returns next free NFT ID.922 /// @dev EVM selector for this function is: 0x75794a3c,923 /// or in textual repr: nextTokenId()924 function nextTokenId() public view returns (uint256) {925 require(false, stub_error);926 dummy;927 return 0;928 }929930 // /// @notice Function to mint multiple tokens.931 // /// @dev `tokenIds` should be an array of consecutive numbers and first number932 // /// should be obtained with `nextTokenId` method933 // /// @param to The new owner934 // /// @param tokenIds IDs of the minted NFTs935 // /// @dev EVM selector for this function is: 0x44a9945e,936 // /// or in textual repr: mintBulk(address,uint256[])937 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {938 // require(false, stub_error);939 // to;940 // tokenIds;941 // dummy = 0;942 // return false;943 // }944945 // /// @notice Function to mint multiple tokens with the given tokenUris.946 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive947 // /// numbers and first number should be obtained with `nextTokenId` method948 // /// @param to The new owner949 // /// @param tokens array of pairs of token ID and token URI for minted tokens950 // /// @dev EVM selector for this function is: 0x36543006,951 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])952 // function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) public returns (bool) {953 // require(false, stub_error);954 // to;955 // tokens;956 // dummy = 0;957 // return false;958 // }959960 /// @notice Function to mint a token.961 /// @param to The new owner crossAccountId962 /// @param properties Properties of minted token963 /// @return uint256 The id of the newly minted token964 /// @dev EVM selector for this function is: 0xb904db03,965 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])966 function mintCross(CrossAddress memory to, Property[] memory properties) public returns (uint256) {967 require(false, stub_error);968 to;969 properties;970 dummy = 0;971 return 0;972 }973974 /// @notice Returns collection helper contract address975 /// @dev EVM selector for this function is: 0x1896cce6,976 /// or in textual repr: collectionHelperAddress()977 function collectionHelperAddress() public view returns (address) {978 require(false, stub_error);979 dummy;980 return 0x0000000000000000000000000000000000000000;981 }982}983984/// Data for creation token with uri.985struct TokenUri {986 /// Id of new token.987 uint256 id;988 /// Uri of new token.989 string uri;990}991992/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension993/// @dev See https://eips.ethereum.org/EIPS/eip-721994/// @dev the ERC-165 identifier for this interface is 0x780e9d63995contract ERC721Enumerable is Dummy, ERC165 {996 /// @notice Enumerate valid NFTs997 /// @param index A counter less than `totalSupply()`998 /// @return The token identifier for the `index`th NFT,999 /// (sort order not specified)1000 /// @dev EVM selector for this function is: 0x4f6ccce7,1001 /// or in textual repr: tokenByIndex(uint256)1002 function tokenByIndex(uint256 index) public view returns (uint256) {1003 require(false, stub_error);1004 index;1005 dummy;1006 return 0;1007 }10081009 /// @dev Not implemented1010 /// @dev EVM selector for this function is: 0x2f745c59,1011 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)1012 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1013 require(false, stub_error);1014 owner;1015 index;1016 dummy;1017 return 0;1018 }10191020 /// @notice Count NFTs tracked by this contract1021 /// @return A count of valid NFTs tracked by this contract, where each one of1022 /// them has an assigned and queryable owner not equal to the zero address1023 /// @dev EVM selector for this function is: 0x18160ddd,1024 /// or in textual repr: totalSupply()1025 function totalSupply() public view returns (uint256) {1026 require(false, stub_error);1027 dummy;1028 return 0;1029 }1030}10311032/// @dev inlined interface1033contract ERC721Events {1034 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1035 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1036 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1037}10381039/// @title ERC-721 Non-Fungible Token Standard1040/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1041/// @dev the ERC-165 identifier for this interface is 0x80ac58cd1042contract ERC721 is Dummy, ERC165, ERC721Events {1043 /// @notice Count all NFTs assigned to an owner1044 /// @dev NFTs assigned to the zero address are considered invalid, and this1045 /// function throws for queries about the zero address.1046 /// @param owner An address for whom to query the balance1047 /// @return The number of NFTs owned by `owner`, possibly zero1048 /// @dev EVM selector for this function is: 0x70a08231,1049 /// or in textual repr: balanceOf(address)1050 function balanceOf(address owner) public view returns (uint256) {1051 require(false, stub_error);1052 owner;1053 dummy;1054 return 0;1055 }10561057 /// @notice Find the owner of an NFT1058 /// @dev NFTs assigned to zero address are considered invalid, and queries1059 /// about them do throw.1060 /// @param tokenId The identifier for an NFT1061 /// @return The address of the owner of the NFT1062 /// @dev EVM selector for this function is: 0x6352211e,1063 /// or in textual repr: ownerOf(uint256)1064 function ownerOf(uint256 tokenId) public view returns (address) {1065 require(false, stub_error);1066 tokenId;1067 dummy;1068 return 0x0000000000000000000000000000000000000000;1069 }10701071 /// @dev Not implemented1072 /// @dev EVM selector for this function is: 0xb88d4fde,1073 /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)1074 function safeTransferFrom(1075 address from,1076 address to,1077 uint256 tokenId,1078 bytes memory data1079 ) public {1080 require(false, stub_error);1081 from;1082 to;1083 tokenId;1084 data;1085 dummy = 0;1086 }10871088 /// @dev Not implemented1089 /// @dev EVM selector for this function is: 0x42842e0e,1090 /// or in textual repr: safeTransferFrom(address,address,uint256)1091 function safeTransferFrom(1092 address from,1093 address to,1094 uint256 tokenId1095 ) public {1096 require(false, stub_error);1097 from;1098 to;1099 tokenId;1100 dummy = 0;1101 }11021103 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1104 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1105 /// THEY MAY BE PERMANENTLY LOST1106 /// @dev Throws unless `msg.sender` is the current owner or an authorized1107 /// operator for this NFT. Throws if `from` is not the current owner. Throws1108 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1109 /// @param from The current owner of the NFT1110 /// @param to The new owner1111 /// @param tokenId The NFT to transfer1112 /// @dev EVM selector for this function is: 0x23b872dd,1113 /// or in textual repr: transferFrom(address,address,uint256)1114 function transferFrom(1115 address from,1116 address to,1117 uint256 tokenId1118 ) public {1119 require(false, stub_error);1120 from;1121 to;1122 tokenId;1123 dummy = 0;1124 }11251126 /// @notice Set or reaffirm the approved address for an NFT1127 /// @dev The zero address indicates there is no approved address.1128 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1129 /// operator of the current owner.1130 /// @param approved The new approved NFT controller1131 /// @param tokenId The NFT to approve1132 /// @dev EVM selector for this function is: 0x095ea7b3,1133 /// or in textual repr: approve(address,uint256)1134 function approve(address approved, uint256 tokenId) public {1135 require(false, stub_error);1136 approved;1137 tokenId;1138 dummy = 0;1139 }11401141 /// @notice Sets or unsets the approval of a given operator.1142 /// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.1143 /// @param operator Operator1144 /// @param approved Should operator status be granted or revoked?1145 /// @dev EVM selector for this function is: 0xa22cb465,1146 /// or in textual repr: setApprovalForAll(address,bool)1147 function setApprovalForAll(address operator, bool approved) public {1148 require(false, stub_error);1149 operator;1150 approved;1151 dummy = 0;1152 }11531154 /// @dev Not implemented1155 /// @dev EVM selector for this function is: 0x081812fc,1156 /// or in textual repr: getApproved(uint256)1157 function getApproved(uint256 tokenId) public view returns (address) {1158 require(false, stub_error);1159 tokenId;1160 dummy;1161 return 0x0000000000000000000000000000000000000000;1162 }11631164 /// @notice Tells whether the given `owner` approves the `operator`.1165 /// @dev EVM selector for this function is: 0xe985e9c5,1166 /// or in textual repr: isApprovedForAll(address,address)1167 function isApprovedForAll(address owner, address operator) public view returns (bool) {1168 require(false, stub_error);1169 owner;1170 operator;1171 dummy;1172 return false;1173 }1174}11751176contract UniqueNFT is1177 Dummy,1178 ERC165,1179 ERC721,1180 ERC721Enumerable,1181 ERC721UniqueExtensions,1182 ERC721UniqueMintable,1183 ERC721Burnable,1184 ERC721Metadata,1185 Collection,1186 TokenProperties1187{}pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -34,7 +34,7 @@
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
Error as CommonError,
erc::{CommonEvmHandler, CollectionCall, static_property::key},
- eth,
+ eth::{self, TokenUri},
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
@@ -999,7 +999,7 @@
&mut self,
caller: Caller,
to: Address,
- tokens: Vec<(U256, String)>,
+ tokens: Vec<TokenUri>,
) -> Result<bool> {
let key = key::url();
let caller = T::CrossAccountId::from_eth(caller);
@@ -1017,7 +1017,7 @@
.collect::<BTreeMap<_, _>>()
.try_into()
.unwrap();
- for (id, token_uri) in tokens {
+ for TokenUri { id, uri } in tokens {
let id: u32 = id.try_into().map_err(|_| "token id overflow")?;
if id != expected_index {
return Err("item id should be next".into());
@@ -1028,7 +1028,7 @@
properties
.try_push(Property {
key: key.clone(),
- value: token_uri
+ value: uri
.into_bytes()
.try_into()
.map_err(|_| "token uri is too long")?,
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
@@ -938,7 +938,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, Tuple14[] memory tokens) public returns (bool) {
+ // function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) public returns (bool) {
// require(false, stub_error);
// to;
// tokens;
@@ -982,10 +982,12 @@
}
}
-/// @dev anonymous struct
-struct Tuple14 {
- uint256 field_0;
- string field_1;
+/// Data for creation token with uri.
+struct TokenUri {
+ /// Id of new token.
+ uint256 id;
+ /// Uri of new token.
+ string uri;
}
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -434,10 +434,10 @@
"inputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "to", "type": "address" },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
],
- "internalType": "struct Tuple11[]",
+ "internalType": "struct AmountForAddress[]",
"name": "amounts",
"type": "tuple[]"
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -398,7 +398,7 @@
/// @param amounts array of pairs of account address and amount
/// @dev EVM selector for this function is: 0x1acf2d55,
/// or in textual repr: mintBulk((address,uint256)[])
- function mintBulk(Tuple11[] memory amounts) external returns (bool);
+ function mintBulk(AmountForAddress[] memory amounts) external returns (bool);
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
@@ -418,10 +418,9 @@
function collectionHelperAddress() external view returns (address);
}
-/// @dev anonymous struct
-struct Tuple11 {
- address field_0;
- uint256 field_1;
+struct AmountForAddress {
+ address to;
+ uint256 amount;
}
/// @dev the ERC-165 identifier for this interface is 0x40c10f19
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -644,7 +644,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, Tuple13[] memory tokens) external returns (bool);
+ // function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) external returns (bool);
/// @notice Function to mint a token.
/// @param to The new owner crossAccountId
@@ -660,10 +660,12 @@
function collectionHelperAddress() external view returns (address);
}
-/// @dev anonymous struct
-struct Tuple13 {
- uint256 field_0;
- string field_1;
+/// Data for creation token with uri.
+struct TokenUri {
+ /// Id of new token.
+ uint256 id;
+ /// Uri of new token.
+ string uri;
}
/// @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
@@ -638,7 +638,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, Tuple12[] memory tokens) external returns (bool);
+ // function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) external returns (bool);
/// @notice Function to mint a token.
/// @param to The new owner crossAccountId
@@ -661,10 +661,12 @@
function collectionHelperAddress() external view returns (address);
}
-/// @dev anonymous struct
-struct Tuple12 {
- uint256 field_0;
- string field_1;
+/// Data for creation token with uri.
+struct TokenUri {
+ /// Id of new token.
+ uint256 id;
+ /// Uri of new token.
+ string uri;
}
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
tests/src/eth/proxy/UniqueNFTProxy.soldiffbeforeafterboth--- a/tests/src/eth/proxy/UniqueNFTProxy.sol
+++ b/tests/src/eth/proxy/UniqueNFTProxy.sol
@@ -168,7 +168,7 @@
return proxied.mintBulk(to, tokenIds);
}
- function mintBulkWithTokenURI(address to, Tuple6[] memory tokens)
+ function mintBulkWithTokenURI(address to, TokenUri[] memory tokens)
external
override
returns (bool)