difftreelog
Merge pull request #829 from UniqueNetwork/feature/remove_and_hide_some_minting_methods_and_events
in: master
24 files changed
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -291,12 +291,6 @@
},
}
-#[derive(ToLog)]
-pub enum ERC721UniqueMintableEvents {
- #[allow(dead_code)]
- MintingFinished {},
-}
-
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]
@@ -544,12 +538,8 @@
}
/// @title ERC721 minting logic.
-#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]
+#[solidity_interface(name = ERC721UniqueMintable)]
impl<T: Config> NonfungibleHandle<T> {
- fn minting_finished(&self) -> Result<bool> {
- Ok(false)
- }
-
/// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
@@ -678,11 +668,6 @@
)
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
- }
-
- /// @dev Not implemented
- fn finish_minting(&mut self, _caller: caller) -> Result<bool> {
- Err("not implementable".into())
}
}
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 /// 0 for Normal420 /// 1 for AllowList421 /// @dev EVM selector for this function is: 0x41835d4c,422 /// or in textual repr: setCollectionAccess(uint8)423 function setCollectionAccess(uint8 mode) public {424 require(false, stub_error);425 mode;426 dummy = 0;427 }428429 /// Checks that user allowed to operate with collection.430 ///431 /// @param user User address to check.432 /// @dev EVM selector for this function is: 0x91b6df49,433 /// or in textual repr: allowlistedCross((address,uint256))434 function allowlistedCross(CrossAddress memory user) public view returns (bool) {435 require(false, stub_error);436 user;437 dummy;438 return false;439 }440441 // /// Add the user to the allowed list.442 // ///443 // /// @param user Address of a trusted user.444 // /// @dev EVM selector for this function is: 0x67844fe6,445 // /// or in textual repr: addToCollectionAllowList(address)446 // function addToCollectionAllowList(address user) public {447 // require(false, stub_error);448 // user;449 // dummy = 0;450 // }451452 /// Add user to allowed list.453 ///454 /// @param user User cross account address.455 /// @dev EVM selector for this function is: 0xa0184a3a,456 /// or in textual repr: addToCollectionAllowListCross((address,uint256))457 function addToCollectionAllowListCross(CrossAddress memory user) public {458 require(false, stub_error);459 user;460 dummy = 0;461 }462463 // /// Remove the user from the allowed list.464 // ///465 // /// @param user Address of a removed user.466 // /// @dev EVM selector for this function is: 0x85c51acb,467 // /// or in textual repr: removeFromCollectionAllowList(address)468 // function removeFromCollectionAllowList(address user) public {469 // require(false, stub_error);470 // user;471 // dummy = 0;472 // }473474 /// Remove user from allowed list.475 ///476 /// @param user User cross account address.477 /// @dev EVM selector for this function is: 0x09ba452a,478 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))479 function removeFromCollectionAllowListCross(CrossAddress memory user) public {480 require(false, stub_error);481 user;482 dummy = 0;483 }484485 /// Switch permission for minting.486 ///487 /// @param mode Enable if "true".488 /// @dev EVM selector for this function is: 0x00018e84,489 /// or in textual repr: setCollectionMintMode(bool)490 function setCollectionMintMode(bool mode) public {491 require(false, stub_error);492 mode;493 dummy = 0;494 }495496 // /// Check that account is the owner or admin of the collection497 // ///498 // /// @param user account to verify499 // /// @return "true" if account is the owner or admin500 // /// @dev EVM selector for this function is: 0x9811b0c7,501 // /// or in textual repr: isOwnerOrAdmin(address)502 // function isOwnerOrAdmin(address user) public view returns (bool) {503 // require(false, stub_error);504 // user;505 // dummy;506 // return false;507 // }508509 /// Check that account is the owner or admin of the collection510 ///511 /// @param user User cross account to verify512 /// @return "true" if account is the owner or admin513 /// @dev EVM selector for this function is: 0x3e75a905,514 /// or in textual repr: isOwnerOrAdminCross((address,uint256))515 function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {516 require(false, stub_error);517 user;518 dummy;519 return false;520 }521522 /// Returns collection type523 ///524 /// @return `Fungible` or `NFT` or `ReFungible`525 /// @dev EVM selector for this function is: 0xd34b55b8,526 /// or in textual repr: uniqueCollectionType()527 function uniqueCollectionType() public view returns (string memory) {528 require(false, stub_error);529 dummy;530 return "";531 }532533 /// Get collection owner.534 ///535 /// @return Tuble with sponsor address and his substrate mirror.536 /// If address is canonical then substrate mirror is zero and vice versa.537 /// @dev EVM selector for this function is: 0xdf727d3b,538 /// or in textual repr: collectionOwner()539 function collectionOwner() public view returns (CrossAddress memory) {540 require(false, stub_error);541 dummy;542 return CrossAddress(0x0000000000000000000000000000000000000000, 0);543 }544545 // /// Changes collection owner to another account546 // ///547 // /// @dev Owner can be changed only by current owner548 // /// @param newOwner new owner account549 // /// @dev EVM selector for this function is: 0x4f53e226,550 // /// or in textual repr: changeCollectionOwner(address)551 // function changeCollectionOwner(address newOwner) public {552 // require(false, stub_error);553 // newOwner;554 // dummy = 0;555 // }556557 /// Get collection administrators558 ///559 /// @return Vector of tuples with admins address and his substrate mirror.560 /// If address is canonical then substrate mirror is zero and vice versa.561 /// @dev EVM selector for this function is: 0x5813216b,562 /// or in textual repr: collectionAdmins()563 function collectionAdmins() public view returns (CrossAddress[] memory) {564 require(false, stub_error);565 dummy;566 return new CrossAddress[](0);567 }568569 /// Changes collection owner to another account570 ///571 /// @dev Owner can be changed only by current owner572 /// @param newOwner new owner cross account573 /// @dev EVM selector for this function is: 0x6496c497,574 /// or in textual repr: changeCollectionOwnerCross((address,uint256))575 function changeCollectionOwnerCross(CrossAddress memory newOwner) public {576 require(false, stub_error);577 newOwner;578 dummy = 0;579 }580}581582/// Cross account struct583struct CrossAddress {584 address eth;585 uint256 sub;586}587588/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.589struct CollectionNestingPermission {590 CollectionPermissionField field;591 bool value;592}593594/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.595enum CollectionPermissionField {596 /// Owner of token can nest tokens under it.597 TokenOwner,598 /// Admin of token collection can nest tokens under token.599 CollectionAdmin600}601602/// Nested collections.603struct CollectionNesting {604 bool token_owner;605 uint256[] ids;606}607608/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.609struct CollectionLimit {610 CollectionLimitField field;611 OptionUint256 value;612}613614/// Optional value615struct OptionUint256 {616 /// Shows the status of accessibility of value617 bool status;618 /// Actual value if `status` is true619 uint256 value;620}621622/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.623enum CollectionLimitField {624 /// How many tokens can a user have on one account.625 AccountTokenOwnership,626 /// How many bytes of data are available for sponsorship.627 SponsoredDataSize,628 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]629 SponsoredDataRateLimit,630 /// How many tokens can be mined into this collection.631 TokenLimit,632 /// Timeouts for transfer sponsoring.633 SponsorTransferTimeout,634 /// Timeout for sponsoring an approval in passed blocks.635 SponsorApproveTimeout,636 /// Whether the collection owner of the collection can send tokens (which belong to other users).637 OwnerCanTransfer,638 /// Can the collection owner burn other people's tokens.639 OwnerCanDestroy,640 /// Is it possible to send tokens from this collection between users.641 TransferEnabled642}643644/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension645/// @dev See https://eips.ethereum.org/EIPS/eip-721646/// @dev the ERC-165 identifier for this interface is 0x5b5e139f647contract ERC721Metadata is Dummy, ERC165 {648 // /// @notice A descriptive name for a collection of NFTs in this contract649 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`650 // /// @dev EVM selector for this function is: 0x06fdde03,651 // /// or in textual repr: name()652 // function name() public view returns (string memory) {653 // require(false, stub_error);654 // dummy;655 // return "";656 // }657658 // /// @notice An abbreviated name for NFTs in this contract659 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`660 // /// @dev EVM selector for this function is: 0x95d89b41,661 // /// or in textual repr: symbol()662 // function symbol() public view returns (string memory) {663 // require(false, stub_error);664 // dummy;665 // return "";666 // }667668 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.669 ///670 /// @dev If the token has a `url` property and it is not empty, it is returned.671 /// 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`.672 /// If the collection property `baseURI` is empty or absent, return "" (empty string)673 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix674 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).675 ///676 /// @return token's const_metadata677 /// @dev EVM selector for this function is: 0xc87b56dd,678 /// or in textual repr: tokenURI(uint256)679 function tokenURI(uint256 tokenId) public view returns (string memory) {680 require(false, stub_error);681 tokenId;682 dummy;683 return "";684 }685}686687/// @title ERC721 Token that can be irreversibly burned (destroyed).688/// @dev the ERC-165 identifier for this interface is 0x42966c68689contract ERC721Burnable is Dummy, ERC165 {690 /// @notice Burns a specific ERC721 token.691 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized692 /// operator of the current owner.693 /// @param tokenId The NFT to approve694 /// @dev EVM selector for this function is: 0x42966c68,695 /// or in textual repr: burn(uint256)696 function burn(uint256 tokenId) public {697 require(false, stub_error);698 tokenId;699 dummy = 0;700 }701}702703/// @dev inlined interface704contract ERC721UniqueMintableEvents {705 event MintingFinished();706}707708/// @title ERC721 minting logic.709/// @dev the ERC-165 identifier for this interface is 0x476ff149710contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {711 /// @dev EVM selector for this function is: 0x05d2035b,712 /// or in textual repr: mintingFinished()713 function mintingFinished() public view returns (bool) {714 require(false, stub_error);715 dummy;716 return false;717 }718719 /// @notice Function to mint a token.720 /// @param to The new owner721 /// @return uint256 The id of the newly minted token722 /// @dev EVM selector for this function is: 0x6a627842,723 /// or in textual repr: mint(address)724 function mint(address to) public returns (uint256) {725 require(false, stub_error);726 to;727 dummy = 0;728 return 0;729 }730731 // /// @notice Function to mint a token.732 // /// @dev `tokenId` should be obtained with `nextTokenId` method,733 // /// unlike standard, you can't specify it manually734 // /// @param to The new owner735 // /// @param tokenId ID of the minted NFT736 // /// @dev EVM selector for this function is: 0x40c10f19,737 // /// or in textual repr: mint(address,uint256)738 // function mint(address to, uint256 tokenId) public returns (bool) {739 // require(false, stub_error);740 // to;741 // tokenId;742 // dummy = 0;743 // return false;744 // }745746 /// @notice Function to mint token with the given tokenUri.747 /// @param to The new owner748 /// @param tokenUri Token URI that would be stored in the NFT properties749 /// @return uint256 The id of the newly minted token750 /// @dev EVM selector for this function is: 0x45c17782,751 /// or in textual repr: mintWithTokenURI(address,string)752 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {753 require(false, stub_error);754 to;755 tokenUri;756 dummy = 0;757 return 0;758 }759760 // /// @notice Function to mint token with the given tokenUri.761 // /// @dev `tokenId` should be obtained with `nextTokenId` method,762 // /// unlike standard, you can't specify it manually763 // /// @param to The new owner764 // /// @param tokenId ID of the minted NFT765 // /// @param tokenUri Token URI that would be stored in the NFT properties766 // /// @dev EVM selector for this function is: 0x50bb4e7f,767 // /// or in textual repr: mintWithTokenURI(address,uint256,string)768 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {769 // require(false, stub_error);770 // to;771 // tokenId;772 // tokenUri;773 // dummy = 0;774 // return false;775 // }776777 /// @dev Not implemented778 /// @dev EVM selector for this function is: 0x7d64bcb4,779 /// or in textual repr: finishMinting()780 function finishMinting() public returns (bool) {781 require(false, stub_error);782 dummy = 0;783 return false;784 }785}786787/// @title Unique extensions for ERC721.788/// @dev the ERC-165 identifier for this interface is 0x16de3152789contract ERC721UniqueExtensions is Dummy, ERC165 {790 /// @notice A descriptive name for a collection of NFTs in this contract791 /// @dev EVM selector for this function is: 0x06fdde03,792 /// or in textual repr: name()793 function name() public view returns (string memory) {794 require(false, stub_error);795 dummy;796 return "";797 }798799 /// @notice An abbreviated name for NFTs in this contract800 /// @dev EVM selector for this function is: 0x95d89b41,801 /// or in textual repr: symbol()802 function symbol() public view returns (string memory) {803 require(false, stub_error);804 dummy;805 return "";806 }807808 /// @notice A description for the collection.809 /// @dev EVM selector for this function is: 0x7284e416,810 /// or in textual repr: description()811 function description() public view returns (string memory) {812 require(false, stub_error);813 dummy;814 return "";815 }816817 /// Returns the owner (in cross format) of the token.818 ///819 /// @param tokenId Id for the token.820 /// @dev EVM selector for this function is: 0x2b29dace,821 /// or in textual repr: crossOwnerOf(uint256)822 function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {823 require(false, stub_error);824 tokenId;825 dummy;826 return CrossAddress(0x0000000000000000000000000000000000000000, 0);827 }828829 /// Returns the token properties.830 ///831 /// @param tokenId Id for the token.832 /// @param keys Properties keys. Empty keys for all propertyes.833 /// @return Vector of properties key/value pairs.834 /// @dev EVM selector for this function is: 0xe07ede7e,835 /// or in textual repr: properties(uint256,string[])836 function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {837 require(false, stub_error);838 tokenId;839 keys;840 dummy;841 return new Property[](0);842 }843844 /// @notice Set or reaffirm the approved address for an NFT845 /// @dev The zero address indicates there is no approved address.846 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized847 /// operator of the current owner.848 /// @param approved The new substrate address approved NFT controller849 /// @param tokenId The NFT to approve850 /// @dev EVM selector for this function is: 0x0ecd0ab0,851 /// or in textual repr: approveCross((address,uint256),uint256)852 function approveCross(CrossAddress memory approved, uint256 tokenId) public {853 require(false, stub_error);854 approved;855 tokenId;856 dummy = 0;857 }858859 /// @notice Transfer ownership of an NFT860 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`861 /// is the zero address. Throws if `tokenId` is not a valid NFT.862 /// @param to The new owner863 /// @param tokenId The NFT to transfer864 /// @dev EVM selector for this function is: 0xa9059cbb,865 /// or in textual repr: transfer(address,uint256)866 function transfer(address to, uint256 tokenId) public {867 require(false, stub_error);868 to;869 tokenId;870 dummy = 0;871 }872873 /// @notice Transfer ownership of an NFT874 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`875 /// is the zero address. Throws if `tokenId` is not a valid NFT.876 /// @param to The new owner877 /// @param tokenId The NFT to transfer878 /// @dev EVM selector for this function is: 0x2ada85ff,879 /// or in textual repr: transferCross((address,uint256),uint256)880 function transferCross(CrossAddress memory to, uint256 tokenId) public {881 require(false, stub_error);882 to;883 tokenId;884 dummy = 0;885 }886887 /// @notice Transfer ownership of an NFT from cross account address to cross account address888 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`889 /// is the zero address. Throws if `tokenId` is not a valid NFT.890 /// @param from Cross acccount address of current owner891 /// @param to Cross acccount address of new owner892 /// @param tokenId The NFT to transfer893 /// @dev EVM selector for this function is: 0xd5cf430b,894 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)895 function transferFromCross(896 CrossAddress memory from,897 CrossAddress memory to,898 uint256 tokenId899 ) public {900 require(false, stub_error);901 from;902 to;903 tokenId;904 dummy = 0;905 }906907 // /// @notice Burns a specific ERC721 token.908 // /// @dev Throws unless `msg.sender` is the current owner or an authorized909 // /// operator for this NFT. Throws if `from` is not the current owner. Throws910 // /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.911 // /// @param from The current owner of the NFT912 // /// @param tokenId The NFT to transfer913 // /// @dev EVM selector for this function is: 0x79cc6790,914 // /// or in textual repr: burnFrom(address,uint256)915 // function burnFrom(address from, uint256 tokenId) public {916 // require(false, stub_error);917 // from;918 // tokenId;919 // dummy = 0;920 // }921922 /// @notice Burns a specific ERC721 token.923 /// @dev Throws unless `msg.sender` is the current owner or an authorized924 /// operator for this NFT. Throws if `from` is not the current owner. Throws925 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.926 /// @param from The current owner of the NFT927 /// @param tokenId The NFT to transfer928 /// @dev EVM selector for this function is: 0xbb2f5a58,929 /// or in textual repr: burnFromCross((address,uint256),uint256)930 function burnFromCross(CrossAddress memory from, uint256 tokenId) public {931 require(false, stub_error);932 from;933 tokenId;934 dummy = 0;935 }936937 /// @notice Returns next free NFT ID.938 /// @dev EVM selector for this function is: 0x75794a3c,939 /// or in textual repr: nextTokenId()940 function nextTokenId() public view returns (uint256) {941 require(false, stub_error);942 dummy;943 return 0;944 }945946 // /// @notice Function to mint multiple tokens.947 // /// @dev `tokenIds` should be an array of consecutive numbers and first number948 // /// should be obtained with `nextTokenId` method949 // /// @param to The new owner950 // /// @param tokenIds IDs of the minted NFTs951 // /// @dev EVM selector for this function is: 0x44a9945e,952 // /// or in textual repr: mintBulk(address,uint256[])953 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {954 // require(false, stub_error);955 // to;956 // tokenIds;957 // dummy = 0;958 // return false;959 // }960961 // /// @notice Function to mint multiple tokens with the given tokenUris.962 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive963 // /// numbers and first number should be obtained with `nextTokenId` method964 // /// @param to The new owner965 // /// @param tokens array of pairs of token ID and token URI for minted tokens966 // /// @dev EVM selector for this function is: 0x36543006,967 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])968 // function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {969 // require(false, stub_error);970 // to;971 // tokens;972 // dummy = 0;973 // return false;974 // }975976 /// @notice Function to mint a token.977 /// @param to The new owner crossAccountId978 /// @param properties Properties of minted token979 /// @return uint256 The id of the newly minted token980 /// @dev EVM selector for this function is: 0xb904db03,981 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])982 function mintCross(CrossAddress memory to, Property[] memory properties) public returns (uint256) {983 require(false, stub_error);984 to;985 properties;986 dummy = 0;987 return 0;988 }989990 /// @notice Returns collection helper contract address991 /// @dev EVM selector for this function is: 0x1896cce6,992 /// or in textual repr: collectionHelperAddress()993 function collectionHelperAddress() public view returns (address) {994 require(false, stub_error);995 dummy;996 return 0x0000000000000000000000000000000000000000;997 }998}9991000/// @dev anonymous struct1001struct Tuple15 {1002 uint256 field_0;1003 string field_1;1004}10051006/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension1007/// @dev See https://eips.ethereum.org/EIPS/eip-7211008/// @dev the ERC-165 identifier for this interface is 0x780e9d631009contract ERC721Enumerable is Dummy, ERC165 {1010 /// @notice Enumerate valid NFTs1011 /// @param index A counter less than `totalSupply()`1012 /// @return The token identifier for the `index`th NFT,1013 /// (sort order not specified)1014 /// @dev EVM selector for this function is: 0x4f6ccce7,1015 /// or in textual repr: tokenByIndex(uint256)1016 function tokenByIndex(uint256 index) public view returns (uint256) {1017 require(false, stub_error);1018 index;1019 dummy;1020 return 0;1021 }10221023 /// @dev Not implemented1024 /// @dev EVM selector for this function is: 0x2f745c59,1025 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)1026 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1027 require(false, stub_error);1028 owner;1029 index;1030 dummy;1031 return 0;1032 }10331034 /// @notice Count NFTs tracked by this contract1035 /// @return A count of valid NFTs tracked by this contract, where each one of1036 /// them has an assigned and queryable owner not equal to the zero address1037 /// @dev EVM selector for this function is: 0x18160ddd,1038 /// or in textual repr: totalSupply()1039 function totalSupply() public view returns (uint256) {1040 require(false, stub_error);1041 dummy;1042 return 0;1043 }1044}10451046/// @dev inlined interface1047contract ERC721Events {1048 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1049 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1050 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1051}10521053/// @title ERC-721 Non-Fungible Token Standard1054/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1055/// @dev the ERC-165 identifier for this interface is 0x80ac58cd1056contract ERC721 is Dummy, ERC165, ERC721Events {1057 /// @notice Count all NFTs assigned to an owner1058 /// @dev NFTs assigned to the zero address are considered invalid, and this1059 /// function throws for queries about the zero address.1060 /// @param owner An address for whom to query the balance1061 /// @return The number of NFTs owned by `owner`, possibly zero1062 /// @dev EVM selector for this function is: 0x70a08231,1063 /// or in textual repr: balanceOf(address)1064 function balanceOf(address owner) public view returns (uint256) {1065 require(false, stub_error);1066 owner;1067 dummy;1068 return 0;1069 }10701071 /// @notice Find the owner of an NFT1072 /// @dev NFTs assigned to zero address are considered invalid, and queries1073 /// about them do throw.1074 /// @param tokenId The identifier for an NFT1075 /// @return The address of the owner of the NFT1076 /// @dev EVM selector for this function is: 0x6352211e,1077 /// or in textual repr: ownerOf(uint256)1078 function ownerOf(uint256 tokenId) public view returns (address) {1079 require(false, stub_error);1080 tokenId;1081 dummy;1082 return 0x0000000000000000000000000000000000000000;1083 }10841085 /// @dev Not implemented1086 /// @dev EVM selector for this function is: 0xb88d4fde,1087 /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)1088 function safeTransferFrom(1089 address from,1090 address to,1091 uint256 tokenId,1092 bytes memory data1093 ) public {1094 require(false, stub_error);1095 from;1096 to;1097 tokenId;1098 data;1099 dummy = 0;1100 }11011102 /// @dev Not implemented1103 /// @dev EVM selector for this function is: 0x42842e0e,1104 /// or in textual repr: safeTransferFrom(address,address,uint256)1105 function safeTransferFrom(1106 address from,1107 address to,1108 uint256 tokenId1109 ) public {1110 require(false, stub_error);1111 from;1112 to;1113 tokenId;1114 dummy = 0;1115 }11161117 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1118 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1119 /// THEY MAY BE PERMANENTLY LOST1120 /// @dev Throws unless `msg.sender` is the current owner or an authorized1121 /// operator for this NFT. Throws if `from` is not the current owner. Throws1122 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1123 /// @param from The current owner of the NFT1124 /// @param to The new owner1125 /// @param tokenId The NFT to transfer1126 /// @dev EVM selector for this function is: 0x23b872dd,1127 /// or in textual repr: transferFrom(address,address,uint256)1128 function transferFrom(1129 address from,1130 address to,1131 uint256 tokenId1132 ) public {1133 require(false, stub_error);1134 from;1135 to;1136 tokenId;1137 dummy = 0;1138 }11391140 /// @notice Set or reaffirm the approved address for an NFT1141 /// @dev The zero address indicates there is no approved address.1142 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1143 /// operator of the current owner.1144 /// @param approved The new approved NFT controller1145 /// @param tokenId The NFT to approve1146 /// @dev EVM selector for this function is: 0x095ea7b3,1147 /// or in textual repr: approve(address,uint256)1148 function approve(address approved, uint256 tokenId) public {1149 require(false, stub_error);1150 approved;1151 tokenId;1152 dummy = 0;1153 }11541155 /// @notice Sets or unsets the approval of a given operator.1156 /// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.1157 /// @param operator Operator1158 /// @param approved Should operator status be granted or revoked?1159 /// @dev EVM selector for this function is: 0xa22cb465,1160 /// or in textual repr: setApprovalForAll(address,bool)1161 function setApprovalForAll(address operator, bool approved) public {1162 require(false, stub_error);1163 operator;1164 approved;1165 dummy = 0;1166 }11671168 /// @dev Not implemented1169 /// @dev EVM selector for this function is: 0x081812fc,1170 /// or in textual repr: getApproved(uint256)1171 function getApproved(uint256 tokenId) public view returns (address) {1172 require(false, stub_error);1173 tokenId;1174 dummy;1175 return 0x0000000000000000000000000000000000000000;1176 }11771178 /// @notice Tells whether the given `owner` approves the `operator`.1179 /// @dev EVM selector for this function is: 0xe985e9c5,1180 /// or in textual repr: isApprovedForAll(address,address)1181 function isApprovedForAll(address owner, address operator) public view returns (bool) {1182 require(false, stub_error);1183 owner;1184 operator;1185 dummy;1186 return false;1187 }1188}11891190contract UniqueNFT is1191 Dummy,1192 ERC165,1193 ERC721,1194 ERC721Enumerable,1195 ERC721UniqueExtensions,1196 ERC721UniqueMintable,1197 ERC721Burnable,1198 ERC721Metadata,1199 Collection,1200 TokenProperties1201{}pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -288,13 +288,6 @@
},
}
-#[derive(ToLog)]
-pub enum ERC721UniqueMintableEvents {
- /// @dev Not supported
- #[allow(dead_code)]
- MintingFinished {},
-}
-
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]
@@ -576,12 +569,8 @@
}
/// @title ERC721 minting logic.
-#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]
+#[solidity_interface(name = ERC721UniqueMintable)]
impl<T: Config> RefungibleHandle<T> {
- fn minting_finished(&self) -> Result<bool> {
- Ok(false)
- }
-
/// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
@@ -717,11 +706,6 @@
)
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
- }
-
- /// @dev Not implemented
- fn finish_minting(&mut self, _caller: caller) -> Result<bool> {
- Err("not implementable".into())
}
}
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -25,7 +25,8 @@
ops::Deref,
};
use evm_coder::{
- abi::AbiType, ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight,
+ abi::AbiType, ToLog, execution::*, generate_stubgen, solidity_interface, solidity, types::*,
+ weight,
};
use pallet_common::{
CommonWeightInfo,
@@ -206,6 +207,7 @@
/// @param from The account whose tokens will be burnt.
/// @param amount The amount that will be burnt.
#[weight(<SelfWeightOf<T>>::burn_from())]
+ #[solidity(hide)]
fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
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
@@ -700,22 +700,9 @@
}
}
-/// @dev inlined interface
-contract ERC721UniqueMintableEvents {
- event MintingFinished();
-}
-
/// @title ERC721 minting logic.
-/// @dev the ERC-165 identifier for this interface is 0x476ff149
-contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {
- /// @dev EVM selector for this function is: 0x05d2035b,
- /// or in textual repr: mintingFinished()
- function mintingFinished() public view returns (bool) {
- require(false, stub_error);
- dummy;
- return false;
- }
-
+/// @dev the ERC-165 identifier for this interface is 0x3fd94ea6
+contract ERC721UniqueMintable is Dummy, ERC165 {
/// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
@@ -756,7 +743,6 @@
dummy = 0;
return 0;
}
-
// /// @notice Function to mint token with the given tokenUri.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
@@ -774,14 +760,6 @@
// return false;
// }
- /// @dev Not implemented
- /// @dev EVM selector for this function is: 0x7d64bcb4,
- /// or in textual repr: finishMinting()
- function finishMinting() public returns (bool) {
- require(false, stub_error);
- dummy = 0;
- return false;
- }
}
/// @title Unique extensions for ERC721.
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungibleToken.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
@@ -38,19 +38,19 @@
/// @dev the ERC-165 identifier for this interface is 0xe17a7d2b
contract ERC20UniqueExtensions is Dummy, ERC165 {
- /// @dev Function that burns an amount of the token of a given account,
- /// deducting from the sender's allowance for said account.
- /// @param from The account whose tokens will be burnt.
- /// @param amount The amount that will be burnt.
- /// @dev EVM selector for this function is: 0x79cc6790,
- /// or in textual repr: burnFrom(address,uint256)
- function burnFrom(address from, uint256 amount) public returns (bool) {
- require(false, stub_error);
- from;
- amount;
- dummy = 0;
- return false;
- }
+ // /// @dev Function that burns an amount of the token of a given account,
+ // /// deducting from the sender's allowance for said account.
+ // /// @param from The account whose tokens will be burnt.
+ // /// @param amount The amount that will be burnt.
+ // /// @dev EVM selector for this function is: 0x79cc6790,
+ // /// or in textual repr: burnFrom(address,uint256)
+ // function burnFrom(address from, uint256 amount) public returns (bool) {
+ // require(false, stub_error);
+ // from;
+ // amount;
+ // dummy = 0;
+ // return false;
+ // }
/// @dev Function that burns an amount of the token of a given account,
/// deducting from the sender's allowance for said account.
runtime/common/ethereum/sponsoring/refungible.rsdiffbeforeafterboth--- a/runtime/common/ethereum/sponsoring/refungible.rs
+++ b/runtime/common/ethereum/sponsoring/refungible.rs
@@ -265,11 +265,9 @@
match call {
// Readonly
- ERC165Call(_, _) | MintingFinished => None,
+ ERC165Call(_, _) => None,
- // Not sponsored
- FinishMinting => None,
-
+ // Sponsored
Mint { .. }
| MintCheckId { .. }
| MintWithTokenUri { .. }
tests/src/check-event/burnItemEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/burnItemEvent.test.ts
+++ b/tests/src/check-event/burnItemEvent.test.ts
@@ -32,6 +32,7 @@
const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
const token = await collection.mintToken(alice, {Substrate: alice.address});
await token.burn(alice);
+ await helper.wait.newBlocks(1);
const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
const eventStrings = event.map(e => `${e.section}.${e.method}`);
tests/src/check-event/createCollectionEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createCollectionEvent.test.ts
+++ b/tests/src/check-event/createCollectionEvent.test.ts
@@ -29,6 +29,7 @@
});
itSub('Check event from createCollection(): ', async ({helper}) => {
await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
+ await helper.wait.newBlocks(1);
const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
const eventStrings = event.map(e => `${e.section}.${e.method}`);
tests/src/check-event/createItemEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createItemEvent.test.ts
+++ b/tests/src/check-event/createItemEvent.test.ts
@@ -30,6 +30,7 @@
itSub('Check event from createItem(): ', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
await collection.mintToken(alice, {Substrate: alice.address});
+ await helper.wait.newBlocks(1);
const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
const eventStrings = event.map(e => `${e.section}.${e.method}`);
tests/src/check-event/createMultipleItemsEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createMultipleItemsEvent.test.ts
+++ b/tests/src/check-event/createMultipleItemsEvent.test.ts
@@ -35,6 +35,7 @@
{owner: {Substrate: alice.address}},
]);
+ await helper.wait.newBlocks(1);
const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
const eventStrings = event.map(e => `${e.section}.${e.method}`);
tests/src/check-event/destroyCollectionEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/destroyCollectionEvent.test.ts
+++ b/tests/src/check-event/destroyCollectionEvent.test.ts
@@ -31,6 +31,7 @@
itSub('Check event from destroyCollection(): ', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
await collection.burn(alice);
+ await helper.wait.newBlocks(1);
const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
const eventStrings = event.map(e => `${e.section}.${e.method}`);
tests/src/check-event/transferEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/transferEvent.test.ts
+++ b/tests/src/check-event/transferEvent.test.ts
@@ -34,6 +34,7 @@
const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
const token = await collection.mintToken(alice, {Substrate: alice.address});
await token.transfer(alice, {Substrate: bob.address});
+ await helper.wait.newBlocks(1);
const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
const eventStrings = event.map(e => `${e.section}.${e.method}`);
tests/src/check-event/transferFromEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/transferFromEvent.test.ts
+++ b/tests/src/check-event/transferFromEvent.test.ts
@@ -33,6 +33,7 @@
const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
const token = await collection.mintToken(alice, {Substrate: alice.address});
await token.transferFrom(alice, {Substrate: alice.address}, {Substrate: bob.address});
+ await helper.wait.newBlocks(1);
const event = helper.chainLog[helper.chainLog.length - 1].events as IEvent[];
const eventStrings = event.map(e => `${e.section}.${e.method}`);
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -51,12 +51,6 @@
},
{
"anonymous": false,
- "inputs": [],
- "name": "MintingFinished",
- "type": "event"
- },
- {
- "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -420,13 +414,6 @@
"name": "description",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "finishMinting",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "nonpayable",
"type": "function"
},
{
@@ -513,13 +500,6 @@
"name": "mintWithTokenURI",
"outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
"stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "mintingFinished",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
"type": "function"
},
{
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -51,12 +51,6 @@
},
{
"anonymous": false,
- "inputs": [],
- "name": "MintingFinished",
- "type": "event"
- },
- {
- "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -402,13 +396,6 @@
"name": "description",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "finishMinting",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "nonpayable",
"type": "function"
},
{
@@ -495,13 +482,6 @@
"name": "mintWithTokenURI",
"outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
"stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "mintingFinished",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
"type": "function"
},
{
tests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -98,16 +98,6 @@
},
{
"inputs": [
- { "internalType": "address", "name": "from", "type": "address" },
- { "internalType": "uint256", "name": "amount", "type": "uint256" }
- ],
- "name": "burnFrom",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
{
"components": [
{ "internalType": "address", "name": "eth", "type": "address" },
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -483,18 +483,9 @@
function burn(uint256 tokenId) external;
}
-/// @dev inlined interface
-interface ERC721UniqueMintableEvents {
- event MintingFinished();
-}
-
/// @title ERC721 minting logic.
-/// @dev the ERC-165 identifier for this interface is 0x476ff149
-interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {
- /// @dev EVM selector for this function is: 0x05d2035b,
- /// or in textual repr: mintingFinished()
- function mintingFinished() external view returns (bool);
-
+/// @dev the ERC-165 identifier for this interface is 0x3fd94ea6
+interface ERC721UniqueMintable is Dummy, ERC165 {
/// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
@@ -518,7 +509,6 @@
/// @dev EVM selector for this function is: 0x45c17782,
/// or in textual repr: mintWithTokenURI(address,string)
function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);
-
// /// @notice Function to mint token with the given tokenUri.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
@@ -529,10 +519,6 @@
// /// or in textual repr: mintWithTokenURI(address,uint256,string)
// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);
- /// @dev Not implemented
- /// @dev EVM selector for this function is: 0x7d64bcb4,
- /// or in textual repr: finishMinting()
- function finishMinting() external returns (bool);
}
/// @title Unique extensions for ERC721.
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -483,18 +483,9 @@
function burn(uint256 tokenId) external;
}
-/// @dev inlined interface
-interface ERC721UniqueMintableEvents {
- event MintingFinished();
-}
-
/// @title ERC721 minting logic.
-/// @dev the ERC-165 identifier for this interface is 0x476ff149
-interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {
- /// @dev EVM selector for this function is: 0x05d2035b,
- /// or in textual repr: mintingFinished()
- function mintingFinished() external view returns (bool);
-
+/// @dev the ERC-165 identifier for this interface is 0x3fd94ea6
+interface ERC721UniqueMintable is Dummy, ERC165 {
/// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
@@ -518,7 +509,6 @@
/// @dev EVM selector for this function is: 0x45c17782,
/// or in textual repr: mintWithTokenURI(address,string)
function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);
-
// /// @notice Function to mint token with the given tokenUri.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
@@ -529,10 +519,6 @@
// /// or in textual repr: mintWithTokenURI(address,uint256,string)
// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);
- /// @dev Not implemented
- /// @dev EVM selector for this function is: 0x7d64bcb4,
- /// or in textual repr: finishMinting()
- function finishMinting() external returns (bool);
}
/// @title Unique extensions for ERC721.
tests/src/eth/api/UniqueRefungibleToken.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungibleToken.sol
+++ b/tests/src/eth/api/UniqueRefungibleToken.sol
@@ -25,13 +25,13 @@
/// @dev the ERC-165 identifier for this interface is 0xe17a7d2b
interface ERC20UniqueExtensions is Dummy, ERC165 {
- /// @dev Function that burns an amount of the token of a given account,
- /// deducting from the sender's allowance for said account.
- /// @param from The account whose tokens will be burnt.
- /// @param amount The amount that will be burnt.
- /// @dev EVM selector for this function is: 0x79cc6790,
- /// or in textual repr: burnFrom(address,uint256)
- function burnFrom(address from, uint256 amount) external returns (bool);
+ // /// @dev Function that burns an amount of the token of a given account,
+ // /// deducting from the sender's allowance for said account.
+ // /// @param from The account whose tokens will be burnt.
+ // /// @param amount The amount that will be burnt.
+ // /// @dev EVM selector for this function is: 0x79cc6790,
+ // /// or in textual repr: burnFrom(address,uint256)
+ // function burnFrom(address from, uint256 amount) external returns (bool);
/// @dev Function that burns an amount of the token of a given account,
/// deducting from the sender's allowance for said account.
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -108,10 +108,6 @@
await checkInterface(helper, '0x5b5e139f', false, true);
});
- itEth('ERC721UniqueMintable - 0x476ff149 - support', async ({helper}) => {
- await checkInterface(helper, '0x476ff149', true, true);
- });
-
itEth('ERC721Enumerable - 0x780e9d63 - support', async ({helper}) => {
await checkInterface(helper, '0x780e9d63', true, true);
});