difftreelog
feature/setCollectionLimit Behavior of the `setCollectionLimit` method. Removed method overload: single signature `(string, uint256)` is used for both cases.
in: master
22 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5831,7 +5831,7 @@
[[package]]
name = "pallet-common"
-version = "0.1.10"
+version = "0.1.11"
dependencies = [
"ethereum",
"evm-coder",
pallets/common/CHANGELOG.mddiffbeforeafterboth--- a/pallets/common/CHANGELOG.md
+++ b/pallets/common/CHANGELOG.md
@@ -2,10 +2,22 @@
All notable changes to this project will be documented in this file.
+<!-- bureaucrate goes here -->
+
+## [0.1.11] - 2022-11-16
+
+### Changed
+
+- Behavior of the `setCollectionLimit` method.
+ Removed method overload: single signature `(string, uint256)`
+ is used for both cases.
+
## [0.1.10] - 2022-11-02
+
### Changed
- - Use named structure `EthCrossAccount` in eth functions.
+- Use named structure `EthCrossAccount` in eth functions.
+
## [0.1.9] - 2022-10-13
## Added
@@ -34,8 +46,6 @@
### Added
- New Ethereum API methods: changeOwner, changeOwner(Substrate) and verifyOwnerOrAdmin(Substrate).
-
-<!-- bureaucrate goes here -->
## [v0.1.5] 2022-08-16
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-common"
-version = "0.1.10"
+version = "0.1.11"
license = "GPLv3"
edition = "2021"
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -303,11 +303,29 @@
/// "tokenLimit",
/// "sponsorTransferTimeout",
/// "sponsorApproveTimeout"
+ /// "ownerCanTransfer",
+ /// "ownerCanDestroy",
+ /// "transfersEnabled"
/// @param value Value of the limit.
#[solidity(rename_selector = "setCollectionLimit")]
- fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {
+ fn set_int_limit(&mut self, caller: caller, limit: string, value: uint256) -> Result<void> {
self.consume_store_reads_and_writes(1, 1)?;
+ let value = value
+ .try_into()
+ .map_err(|_| Error::Revert(format!("can't convert value to u32 \"{}\"", value)))?;
+
+ let convert_value_to_bool = || match value {
+ 0 => Ok(false),
+ 1 => Ok(true),
+ _ => {
+ return Err(Error::Revert(format!(
+ "can't convert value to boolean \"{}\"",
+ value
+ )))
+ }
+ };
+
check_is_owner_or_admin(caller, self)?;
let mut limits = self.limits.clone();
@@ -330,48 +348,16 @@
"sponsorApproveTimeout" => {
limits.sponsor_approve_timeout = Some(value);
}
- _ => {
- return Err(Error::Revert(format!(
- "unknown integer limit \"{}\"",
- limit
- )))
- }
- }
- self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)
- .map_err(dispatch_to_evm::<T>)?;
- save(self)
- }
-
- /// Set limits for the collection.
- /// @dev Throws error if limit not found.
- /// @param limit Name of the limit. Valid names:
- /// "ownerCanTransfer",
- /// "ownerCanDestroy",
- /// "transfersEnabled"
- /// @param value Value of the limit.
- #[solidity(rename_selector = "setCollectionLimit")]
- fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {
- self.consume_store_reads_and_writes(1, 1)?;
-
- check_is_owner_or_admin(caller, self)?;
- let mut limits = self.limits.clone();
-
- match limit.as_str() {
"ownerCanTransfer" => {
- limits.owner_can_transfer = Some(value);
+ limits.owner_can_transfer = Some(convert_value_to_bool()?);
}
"ownerCanDestroy" => {
- limits.owner_can_destroy = Some(value);
+ limits.owner_can_destroy = Some(convert_value_to_bool()?);
}
"transfersEnabled" => {
- limits.transfers_enabled = Some(value);
- }
- _ => {
- return Err(Error::Revert(format!(
- "unknown boolean limit \"{}\"",
- limit
- )))
+ limits.transfers_enabled = Some(convert_value_to_bool()?);
}
+ _ => return Err(Error::Revert(format!("unknown limit \"{}\"", limit))),
}
self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)
.map_err(dispatch_to_evm::<T>)?;
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -18,7 +18,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
+/// @dev the ERC-165 identifier for this interface is 0x8b91d192
contract Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -167,26 +167,13 @@
/// "tokenLimit",
/// "sponsorTransferTimeout",
/// "sponsorApproveTimeout"
- /// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x6a3841db,
- /// or in textual repr: setCollectionLimit(string,uint32)
- function setCollectionLimit(string memory limit, uint32 value) public {
- require(false, stub_error);
- limit;
- value;
- dummy = 0;
- }
-
- /// Set limits for the collection.
- /// @dev Throws error if limit not found.
- /// @param limit Name of the limit. Valid names:
- /// "ownerCanTransfer",
+ /// "ownerCanTransfer",
/// "ownerCanDestroy",
/// "transfersEnabled"
/// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x993b7fba,
- /// or in textual repr: setCollectionLimit(string,bool)
- function setCollectionLimit(string memory limit, bool value) public {
+ /// @dev EVM selector for this function is: 0x4ad890a8,
+ /// or in textual repr: setCollectionLimit(string,uint256)
+ function setCollectionLimit(string memory limit, uint256 value) public {
require(false, stub_error);
limit;
value;
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 0x91a97a6822contract 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(32 string memory key,33 bool isMutable,34 bool collectionAdmin,35 bool tokenOwner36 ) public {37 require(false, stub_error);38 key;39 isMutable;40 collectionAdmin;41 tokenOwner;42 dummy = 0;43 }4445 // /// @notice Set token property value.46 // /// @dev Throws error if `msg.sender` has no permission to edit the property.47 // /// @param tokenId ID of the token.48 // /// @param key Property key.49 // /// @param value Property value.50 // /// @dev EVM selector for this function is: 0x1752d67b,51 // /// or in textual repr: setProperty(uint256,string,bytes)52 // function setProperty(uint256 tokenId, string memory key, bytes memory value) public {53 // require(false, stub_error);54 // tokenId;55 // key;56 // value;57 // dummy = 0;58 // }5960 /// @notice Set token properties value.61 /// @dev Throws error if `msg.sender` has no permission to edit the property.62 /// @param tokenId ID of the token.63 /// @param properties settable properties64 /// @dev EVM selector for this function is: 0x14ed3a6e,65 /// or in textual repr: setProperties(uint256,(string,bytes)[])66 function setProperties(uint256 tokenId, Property[] memory properties) public {67 require(false, stub_error);68 tokenId;69 properties;70 dummy = 0;71 }7273 // /// @notice Delete token property value.74 // /// @dev Throws error if `msg.sender` has no permission to edit the property.75 // /// @param tokenId ID of the token.76 // /// @param key Property key.77 // /// @dev EVM selector for this function is: 0x066111d1,78 // /// or in textual repr: deleteProperty(uint256,string)79 // function deleteProperty(uint256 tokenId, string memory key) public {80 // require(false, stub_error);81 // tokenId;82 // key;83 // dummy = 0;84 // }8586 /// @notice Delete token properties value.87 /// @dev Throws error if `msg.sender` has no permission to edit the property.88 /// @param tokenId ID of the token.89 /// @param keys Properties key.90 /// @dev EVM selector for this function is: 0xc472d371,91 /// or in textual repr: deleteProperties(uint256,string[])92 function deleteProperties(uint256 tokenId, string[] memory keys) public {93 require(false, stub_error);94 tokenId;95 keys;96 dummy = 0;97 }9899 /// @notice Get token property value.100 /// @dev Throws error if key not found101 /// @param tokenId ID of the token.102 /// @param key Property key.103 /// @return Property value bytes104 /// @dev EVM selector for this function is: 0x7228c327,105 /// or in textual repr: property(uint256,string)106 function property(uint256 tokenId, string memory key) public view returns (bytes memory) {107 require(false, stub_error);108 tokenId;109 key;110 dummy;111 return hex"";112 }113}114115/// @dev Property struct116struct Property {117 string key;118 bytes value;119}120121/// @title A contract that allows you to work with collections.122/// @dev the ERC-165 identifier for this interface is 0x8b91d192123contract Collection is Dummy, ERC165 {124 // /// Set collection property.125 // ///126 // /// @param key Property key.127 // /// @param value Propery value.128 // /// @dev EVM selector for this function is: 0x2f073f66,129 // /// or in textual repr: setCollectionProperty(string,bytes)130 // function setCollectionProperty(string memory key, bytes memory value) public {131 // require(false, stub_error);132 // key;133 // value;134 // dummy = 0;135 // }136137 /// Set collection properties.138 ///139 /// @param properties Vector of properties key/value pair.140 /// @dev EVM selector for this function is: 0x50b26b2a,141 /// or in textual repr: setCollectionProperties((string,bytes)[])142 function setCollectionProperties(Property[] memory properties) public {143 require(false, stub_error);144 properties;145 dummy = 0;146 }147148 // /// Delete collection property.149 // ///150 // /// @param key Property key.151 // /// @dev EVM selector for this function is: 0x7b7debce,152 // /// or in textual repr: deleteCollectionProperty(string)153 // function deleteCollectionProperty(string memory key) public {154 // require(false, stub_error);155 // key;156 // dummy = 0;157 // }158159 /// Delete collection properties.160 ///161 /// @param keys Properties keys.162 /// @dev EVM selector for this function is: 0xee206ee3,163 /// or in textual repr: deleteCollectionProperties(string[])164 function deleteCollectionProperties(string[] memory keys) public {165 require(false, stub_error);166 keys;167 dummy = 0;168 }169170 /// Get collection property.171 ///172 /// @dev Throws error if key not found.173 ///174 /// @param key Property key.175 /// @return bytes The property corresponding to the key.176 /// @dev EVM selector for this function is: 0xcf24fd6d,177 /// or in textual repr: collectionProperty(string)178 function collectionProperty(string memory key) public view returns (bytes memory) {179 require(false, stub_error);180 key;181 dummy;182 return hex"";183 }184185 /// Get collection properties.186 ///187 /// @param keys Properties keys. Empty keys for all propertyes.188 /// @return Vector of properties key/value pairs.189 /// @dev EVM selector for this function is: 0x285fb8e6,190 /// or in textual repr: collectionProperties(string[])191 function collectionProperties(string[] memory keys) public view returns (Tuple23[] memory) {192 require(false, stub_error);193 keys;194 dummy;195 return new Tuple23[](0);196 }197198 // /// Set the sponsor of the collection.199 // ///200 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.201 // ///202 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.203 // /// @dev EVM selector for this function is: 0x7623402e,204 // /// or in textual repr: setCollectionSponsor(address)205 // function setCollectionSponsor(address sponsor) public {206 // require(false, stub_error);207 // sponsor;208 // dummy = 0;209 // }210211 /// Set the sponsor of the collection.212 ///213 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.214 ///215 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.216 /// @dev EVM selector for this function is: 0x84a1d5a8,217 /// or in textual repr: setCollectionSponsorCross((address,uint256))218 function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {219 require(false, stub_error);220 sponsor;221 dummy = 0;222 }223224 /// Whether there is a pending sponsor.225 /// @dev EVM selector for this function is: 0x058ac185,226 /// or in textual repr: hasCollectionPendingSponsor()227 function hasCollectionPendingSponsor() public view returns (bool) {228 require(false, stub_error);229 dummy;230 return false;231 }232233 /// Collection sponsorship confirmation.234 ///235 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.236 /// @dev EVM selector for this function is: 0x3c50e97a,237 /// or in textual repr: confirmCollectionSponsorship()238 function confirmCollectionSponsorship() public {239 require(false, stub_error);240 dummy = 0;241 }242243 /// Remove collection sponsor.244 /// @dev EVM selector for this function is: 0x6e0326a3,245 /// or in textual repr: removeCollectionSponsor()246 function removeCollectionSponsor() public {247 require(false, stub_error);248 dummy = 0;249 }250251 /// Get current sponsor.252 ///253 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.254 /// @dev EVM selector for this function is: 0x6ec0a9f1,255 /// or in textual repr: collectionSponsor()256 function collectionSponsor() public view returns (Tuple26 memory) {257 require(false, stub_error);258 dummy;259 return Tuple26(0x0000000000000000000000000000000000000000, 0);260 }261262 /// Set limits for the collection.263 /// @dev Throws error if limit not found.264 /// @param limit Name of the limit. Valid names:265 /// "accountTokenOwnershipLimit",266 /// "sponsoredDataSize",267 /// "sponsoredDataRateLimit",268 /// "tokenLimit",269 /// "sponsorTransferTimeout",270 /// "sponsorApproveTimeout"271 /// "ownerCanTransfer",272 /// "ownerCanDestroy",273 /// "transfersEnabled"274 /// @param value Value of the limit.275 /// @dev EVM selector for this function is: 0x4ad890a8,276 /// or in textual repr: setCollectionLimit(string,uint256)277 function setCollectionLimit(string memory limit, uint256 value) public {278 require(false, stub_error);279 limit;280 value;281 dummy = 0;282 }283284 /// Get contract address.285 /// @dev EVM selector for this function is: 0xf6b4dfb4,286 /// or in textual repr: contractAddress()287 function contractAddress() public view returns (address) {288 require(false, stub_error);289 dummy;290 return 0x0000000000000000000000000000000000000000;291 }292293 /// Add collection admin.294 /// @param newAdmin Cross account administrator address.295 /// @dev EVM selector for this function is: 0x859aa7d6,296 /// or in textual repr: addCollectionAdminCross((address,uint256))297 function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {298 require(false, stub_error);299 newAdmin;300 dummy = 0;301 }302303 /// Remove collection admin.304 /// @param admin Cross account administrator address.305 /// @dev EVM selector for this function is: 0x6c0cd173,306 /// or in textual repr: removeCollectionAdminCross((address,uint256))307 function removeCollectionAdminCross(EthCrossAccount memory admin) public {308 require(false, stub_error);309 admin;310 dummy = 0;311 }312313 // /// Add collection admin.314 // /// @param newAdmin Address of the added administrator.315 // /// @dev EVM selector for this function is: 0x92e462c7,316 // /// or in textual repr: addCollectionAdmin(address)317 // function addCollectionAdmin(address newAdmin) public {318 // require(false, stub_error);319 // newAdmin;320 // dummy = 0;321 // }322323 // /// Remove collection admin.324 // ///325 // /// @param admin Address of the removed administrator.326 // /// @dev EVM selector for this function is: 0xfafd7b42,327 // /// or in textual repr: removeCollectionAdmin(address)328 // function removeCollectionAdmin(address admin) public {329 // require(false, stub_error);330 // admin;331 // dummy = 0;332 // }333334 /// Toggle accessibility of collection nesting.335 ///336 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'337 /// @dev EVM selector for this function is: 0x112d4586,338 /// or in textual repr: setCollectionNesting(bool)339 function setCollectionNesting(bool enable) public {340 require(false, stub_error);341 enable;342 dummy = 0;343 }344345 /// Toggle accessibility of collection nesting.346 ///347 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'348 /// @param collections Addresses of collections that will be available for nesting.349 /// @dev EVM selector for this function is: 0x64872396,350 /// or in textual repr: setCollectionNesting(bool,address[])351 function setCollectionNesting(bool enable, address[] memory collections) public {352 require(false, stub_error);353 enable;354 collections;355 dummy = 0;356 }357358 /// Set the collection access method.359 /// @param mode Access mode360 /// 0 for Normal361 /// 1 for AllowList362 /// @dev EVM selector for this function is: 0x41835d4c,363 /// or in textual repr: setCollectionAccess(uint8)364 function setCollectionAccess(uint8 mode) public {365 require(false, stub_error);366 mode;367 dummy = 0;368 }369370 /// Checks that user allowed to operate with collection.371 ///372 /// @param user User address to check.373 /// @dev EVM selector for this function is: 0xd63a8e11,374 /// or in textual repr: allowed(address)375 function allowed(address user) public view returns (bool) {376 require(false, stub_error);377 user;378 dummy;379 return false;380 }381382 // /// Add the user to the allowed list.383 // ///384 // /// @param user Address of a trusted user.385 // /// @dev EVM selector for this function is: 0x67844fe6,386 // /// or in textual repr: addToCollectionAllowList(address)387 // function addToCollectionAllowList(address user) public {388 // require(false, stub_error);389 // user;390 // dummy = 0;391 // }392393 /// Add user to allowed list.394 ///395 /// @param user User cross account address.396 /// @dev EVM selector for this function is: 0xa0184a3a,397 /// or in textual repr: addToCollectionAllowListCross((address,uint256))398 function addToCollectionAllowListCross(EthCrossAccount memory user) public {399 require(false, stub_error);400 user;401 dummy = 0;402 }403404 // /// Remove the user from the allowed list.405 // ///406 // /// @param user Address of a removed user.407 // /// @dev EVM selector for this function is: 0x85c51acb,408 // /// or in textual repr: removeFromCollectionAllowList(address)409 // function removeFromCollectionAllowList(address user) public {410 // require(false, stub_error);411 // user;412 // dummy = 0;413 // }414415 /// Remove user from allowed list.416 ///417 /// @param user User cross account address.418 /// @dev EVM selector for this function is: 0x09ba452a,419 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))420 function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {421 require(false, stub_error);422 user;423 dummy = 0;424 }425426 /// Switch permission for minting.427 ///428 /// @param mode Enable if "true".429 /// @dev EVM selector for this function is: 0x00018e84,430 /// or in textual repr: setCollectionMintMode(bool)431 function setCollectionMintMode(bool mode) public {432 require(false, stub_error);433 mode;434 dummy = 0;435 }436437 // /// Check that account is the owner or admin of the collection438 // ///439 // /// @param user account to verify440 // /// @return "true" if account is the owner or admin441 // /// @dev EVM selector for this function is: 0x9811b0c7,442 // /// or in textual repr: isOwnerOrAdmin(address)443 // function isOwnerOrAdmin(address user) public view returns (bool) {444 // require(false, stub_error);445 // user;446 // dummy;447 // return false;448 // }449450 /// Check that account is the owner or admin of the collection451 ///452 /// @param user User cross account to verify453 /// @return "true" if account is the owner or admin454 /// @dev EVM selector for this function is: 0x3e75a905,455 /// or in textual repr: isOwnerOrAdminCross((address,uint256))456 function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {457 require(false, stub_error);458 user;459 dummy;460 return false;461 }462463 /// Returns collection type464 ///465 /// @return `Fungible` or `NFT` or `ReFungible`466 /// @dev EVM selector for this function is: 0xd34b55b8,467 /// or in textual repr: uniqueCollectionType()468 function uniqueCollectionType() public view returns (string memory) {469 require(false, stub_error);470 dummy;471 return "";472 }473474 /// Get collection owner.475 ///476 /// @return Tuble with sponsor address and his substrate mirror.477 /// If address is canonical then substrate mirror is zero and vice versa.478 /// @dev EVM selector for this function is: 0xdf727d3b,479 /// or in textual repr: collectionOwner()480 function collectionOwner() public view returns (EthCrossAccount memory) {481 require(false, stub_error);482 dummy;483 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);484 }485486 // /// Changes collection owner to another account487 // ///488 // /// @dev Owner can be changed only by current owner489 // /// @param newOwner new owner account490 // /// @dev EVM selector for this function is: 0x4f53e226,491 // /// or in textual repr: changeCollectionOwner(address)492 // function changeCollectionOwner(address newOwner) public {493 // require(false, stub_error);494 // newOwner;495 // dummy = 0;496 // }497498 /// Get collection administrators499 ///500 /// @return Vector of tuples with admins address and his substrate mirror.501 /// If address is canonical then substrate mirror is zero and vice versa.502 /// @dev EVM selector for this function is: 0x5813216b,503 /// or in textual repr: collectionAdmins()504 function collectionAdmins() public view returns (EthCrossAccount[] memory) {505 require(false, stub_error);506 dummy;507 return new EthCrossAccount[](0);508 }509510 /// Changes collection owner to another account511 ///512 /// @dev Owner can be changed only by current owner513 /// @param newOwner new owner cross account514 /// @dev EVM selector for this function is: 0x6496c497,515 /// or in textual repr: changeCollectionOwnerCross((address,uint256))516 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {517 require(false, stub_error);518 newOwner;519 dummy = 0;520 }521}522523/// @dev Cross account struct524struct EthCrossAccount {525 address eth;526 uint256 sub;527}528529/// @dev anonymous struct530struct Tuple26 {531 address field_0;532 uint256 field_1;533}534535/// @dev anonymous struct536struct Tuple23 {537 string field_0;538 bytes field_1;539}540541/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension542/// @dev See https://eips.ethereum.org/EIPS/eip-721543/// @dev the ERC-165 identifier for this interface is 0x5b5e139f544contract ERC721Metadata is Dummy, ERC165 {545 // /// @notice A descriptive name for a collection of NFTs in this contract546 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`547 // /// @dev EVM selector for this function is: 0x06fdde03,548 // /// or in textual repr: name()549 // function name() public view returns (string memory) {550 // require(false, stub_error);551 // dummy;552 // return "";553 // }554555 // /// @notice An abbreviated name for NFTs in this contract556 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`557 // /// @dev EVM selector for this function is: 0x95d89b41,558 // /// or in textual repr: symbol()559 // function symbol() public view returns (string memory) {560 // require(false, stub_error);561 // dummy;562 // return "";563 // }564565 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.566 ///567 /// @dev If the token has a `url` property and it is not empty, it is returned.568 /// 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`.569 /// If the collection property `baseURI` is empty or absent, return "" (empty string)570 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix571 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).572 ///573 /// @return token's const_metadata574 /// @dev EVM selector for this function is: 0xc87b56dd,575 /// or in textual repr: tokenURI(uint256)576 function tokenURI(uint256 tokenId) public view returns (string memory) {577 require(false, stub_error);578 tokenId;579 dummy;580 return "";581 }582}583584/// @title ERC721 Token that can be irreversibly burned (destroyed).585/// @dev the ERC-165 identifier for this interface is 0x42966c68586contract ERC721Burnable is Dummy, ERC165 {587 /// @notice Burns a specific ERC721 token.588 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized589 /// operator of the current owner.590 /// @param tokenId The NFT to approve591 /// @dev EVM selector for this function is: 0x42966c68,592 /// or in textual repr: burn(uint256)593 function burn(uint256 tokenId) public {594 require(false, stub_error);595 tokenId;596 dummy = 0;597 }598}599600/// @dev inlined interface601contract ERC721UniqueMintableEvents {602 event MintingFinished();603}604605/// @title ERC721 minting logic.606/// @dev the ERC-165 identifier for this interface is 0x476ff149607contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {608 /// @dev EVM selector for this function is: 0x05d2035b,609 /// or in textual repr: mintingFinished()610 function mintingFinished() public view returns (bool) {611 require(false, stub_error);612 dummy;613 return false;614 }615616 /// @notice Function to mint token.617 /// @param to The new owner618 /// @return uint256 The id of the newly minted token619 /// @dev EVM selector for this function is: 0x6a627842,620 /// or in textual repr: mint(address)621 function mint(address to) public returns (uint256) {622 require(false, stub_error);623 to;624 dummy = 0;625 return 0;626 }627628 // /// @notice Function to mint token.629 // /// @dev `tokenId` should be obtained with `nextTokenId` method,630 // /// unlike standard, you can't specify it manually631 // /// @param to The new owner632 // /// @param tokenId ID of the minted NFT633 // /// @dev EVM selector for this function is: 0x40c10f19,634 // /// or in textual repr: mint(address,uint256)635 // function mint(address to, uint256 tokenId) public returns (bool) {636 // require(false, stub_error);637 // to;638 // tokenId;639 // dummy = 0;640 // return false;641 // }642643 /// @notice Function to mint token with the given tokenUri.644 /// @param to The new owner645 /// @param tokenUri Token URI that would be stored in the NFT properties646 /// @return uint256 The id of the newly minted token647 /// @dev EVM selector for this function is: 0x45c17782,648 /// or in textual repr: mintWithTokenURI(address,string)649 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {650 require(false, stub_error);651 to;652 tokenUri;653 dummy = 0;654 return 0;655 }656657 // /// @notice Function to mint token with the given tokenUri.658 // /// @dev `tokenId` should be obtained with `nextTokenId` method,659 // /// unlike standard, you can't specify it manually660 // /// @param to The new owner661 // /// @param tokenId ID of the minted NFT662 // /// @param tokenUri Token URI that would be stored in the NFT properties663 // /// @dev EVM selector for this function is: 0x50bb4e7f,664 // /// or in textual repr: mintWithTokenURI(address,uint256,string)665 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {666 // require(false, stub_error);667 // to;668 // tokenId;669 // tokenUri;670 // dummy = 0;671 // return false;672 // }673674 /// @dev Not implemented675 /// @dev EVM selector for this function is: 0x7d64bcb4,676 /// or in textual repr: finishMinting()677 function finishMinting() public returns (bool) {678 require(false, stub_error);679 dummy = 0;680 return false;681 }682}683684/// @title Unique extensions for ERC721.685/// @dev the ERC-165 identifier for this interface is 0x0e9fc611686contract ERC721UniqueExtensions is Dummy, ERC165 {687 /// @notice A descriptive name for a collection of NFTs in this contract688 /// @dev EVM selector for this function is: 0x06fdde03,689 /// or in textual repr: name()690 function name() public view returns (string memory) {691 require(false, stub_error);692 dummy;693 return "";694 }695696 /// @notice An abbreviated name for NFTs in this contract697 /// @dev EVM selector for this function is: 0x95d89b41,698 /// or in textual repr: symbol()699 function symbol() public view returns (string memory) {700 require(false, stub_error);701 dummy;702 return "";703 }704705 /// @notice Set or reaffirm the approved address for an NFT706 /// @dev The zero address indicates there is no approved address.707 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized708 /// operator of the current owner.709 /// @param approved The new substrate address approved NFT controller710 /// @param tokenId The NFT to approve711 /// @dev EVM selector for this function is: 0x0ecd0ab0,712 /// or in textual repr: approveCross((address,uint256),uint256)713 function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {714 require(false, stub_error);715 approved;716 tokenId;717 dummy = 0;718 }719720 /// @notice Transfer ownership of an NFT721 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`722 /// is the zero address. Throws if `tokenId` is not a valid NFT.723 /// @param to The new owner724 /// @param tokenId The NFT to transfer725 /// @dev EVM selector for this function is: 0xa9059cbb,726 /// or in textual repr: transfer(address,uint256)727 function transfer(address to, uint256 tokenId) public {728 require(false, stub_error);729 to;730 tokenId;731 dummy = 0;732 }733734 /// @notice Transfer ownership of an NFT735 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`736 /// is the zero address. Throws if `tokenId` is not a valid NFT.737 /// @param to The new owner738 /// @param tokenId The NFT to transfer739 /// @dev EVM selector for this function is: 0x2ada85ff,740 /// or in textual repr: transferCross((address,uint256),uint256)741 function transferCross(EthCrossAccount memory to, uint256 tokenId) public {742 require(false, stub_error);743 to;744 tokenId;745 dummy = 0;746 }747748 /// @notice Transfer ownership of an NFT from cross account address to cross account address749 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`750 /// is the zero address. Throws if `tokenId` is not a valid NFT.751 /// @param from Cross acccount address of current owner752 /// @param to Cross acccount address of new owner753 /// @param tokenId The NFT to transfer754 /// @dev EVM selector for this function is: 0xd5cf430b,755 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)756 function transferFromCross(757 EthCrossAccount memory from,758 EthCrossAccount memory to,759 uint256 tokenId760 ) public {761 require(false, stub_error);762 from;763 to;764 tokenId;765 dummy = 0;766 }767768 // /// @notice Burns a specific ERC721 token.769 // /// @dev Throws unless `msg.sender` is the current owner or an authorized770 // /// operator for this NFT. Throws if `from` is not the current owner. Throws771 // /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.772 // /// @param from The current owner of the NFT773 // /// @param tokenId The NFT to transfer774 // /// @dev EVM selector for this function is: 0x79cc6790,775 // /// or in textual repr: burnFrom(address,uint256)776 // function burnFrom(address from, uint256 tokenId) public {777 // require(false, stub_error);778 // from;779 // tokenId;780 // dummy = 0;781 // }782783 /// @notice Burns a specific ERC721 token.784 /// @dev Throws unless `msg.sender` is the current owner or an authorized785 /// operator for this NFT. Throws if `from` is not the current owner. Throws786 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.787 /// @param from The current owner of the NFT788 /// @param tokenId The NFT to transfer789 /// @dev EVM selector for this function is: 0xbb2f5a58,790 /// or in textual repr: burnFromCross((address,uint256),uint256)791 function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {792 require(false, stub_error);793 from;794 tokenId;795 dummy = 0;796 }797798 /// @notice Returns next free NFT ID.799 /// @dev EVM selector for this function is: 0x75794a3c,800 /// or in textual repr: nextTokenId()801 function nextTokenId() public view returns (uint256) {802 require(false, stub_error);803 dummy;804 return 0;805 }806 // /// @notice Function to mint multiple tokens.807 // /// @dev `tokenIds` should be an array of consecutive numbers and first number808 // /// should be obtained with `nextTokenId` method809 // /// @param to The new owner810 // /// @param tokenIds IDs of the minted NFTs811 // /// @dev EVM selector for this function is: 0x44a9945e,812 // /// or in textual repr: mintBulk(address,uint256[])813 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {814 // require(false, stub_error);815 // to;816 // tokenIds;817 // dummy = 0;818 // return false;819 // }820821 // /// @notice Function to mint multiple tokens with the given tokenUris.822 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive823 // /// numbers and first number should be obtained with `nextTokenId` method824 // /// @param to The new owner825 // /// @param tokens array of pairs of token ID and token URI for minted tokens826 // /// @dev EVM selector for this function is: 0x36543006,827 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])828 // function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) public returns (bool) {829 // require(false, stub_error);830 // to;831 // tokens;832 // dummy = 0;833 // return false;834 // }835836}837838/// @dev anonymous struct839struct Tuple11 {840 uint256 field_0;841 string field_1;842}843844/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension845/// @dev See https://eips.ethereum.org/EIPS/eip-721846/// @dev the ERC-165 identifier for this interface is 0x780e9d63847contract ERC721Enumerable is Dummy, ERC165 {848 /// @notice Enumerate valid NFTs849 /// @param index A counter less than `totalSupply()`850 /// @return The token identifier for the `index`th NFT,851 /// (sort order not specified)852 /// @dev EVM selector for this function is: 0x4f6ccce7,853 /// or in textual repr: tokenByIndex(uint256)854 function tokenByIndex(uint256 index) public view returns (uint256) {855 require(false, stub_error);856 index;857 dummy;858 return 0;859 }860861 /// @dev Not implemented862 /// @dev EVM selector for this function is: 0x2f745c59,863 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)864 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {865 require(false, stub_error);866 owner;867 index;868 dummy;869 return 0;870 }871872 /// @notice Count NFTs tracked by this contract873 /// @return A count of valid NFTs tracked by this contract, where each one of874 /// them has an assigned and queryable owner not equal to the zero address875 /// @dev EVM selector for this function is: 0x18160ddd,876 /// or in textual repr: totalSupply()877 function totalSupply() public view returns (uint256) {878 require(false, stub_error);879 dummy;880 return 0;881 }882}883884/// @dev inlined interface885contract ERC721Events {886 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);887 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);888 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);889}890891/// @title ERC-721 Non-Fungible Token Standard892/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md893/// @dev the ERC-165 identifier for this interface is 0x80ac58cd894contract ERC721 is Dummy, ERC165, ERC721Events {895 /// @notice Count all NFTs assigned to an owner896 /// @dev NFTs assigned to the zero address are considered invalid, and this897 /// function throws for queries about the zero address.898 /// @param owner An address for whom to query the balance899 /// @return The number of NFTs owned by `owner`, possibly zero900 /// @dev EVM selector for this function is: 0x70a08231,901 /// or in textual repr: balanceOf(address)902 function balanceOf(address owner) public view returns (uint256) {903 require(false, stub_error);904 owner;905 dummy;906 return 0;907 }908909 /// @notice Find the owner of an NFT910 /// @dev NFTs assigned to zero address are considered invalid, and queries911 /// about them do throw.912 /// @param tokenId The identifier for an NFT913 /// @return The address of the owner of the NFT914 /// @dev EVM selector for this function is: 0x6352211e,915 /// or in textual repr: ownerOf(uint256)916 function ownerOf(uint256 tokenId) public view returns (address) {917 require(false, stub_error);918 tokenId;919 dummy;920 return 0x0000000000000000000000000000000000000000;921 }922923 /// @dev Not implemented924 /// @dev EVM selector for this function is: 0xb88d4fde,925 /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)926 function safeTransferFrom(927 address from,928 address to,929 uint256 tokenId,930 bytes memory data931 ) public {932 require(false, stub_error);933 from;934 to;935 tokenId;936 data;937 dummy = 0;938 }939940 /// @dev Not implemented941 /// @dev EVM selector for this function is: 0x42842e0e,942 /// or in textual repr: safeTransferFrom(address,address,uint256)943 function safeTransferFrom(944 address from,945 address to,946 uint256 tokenId947 ) public {948 require(false, stub_error);949 from;950 to;951 tokenId;952 dummy = 0;953 }954955 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE956 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE957 /// THEY MAY BE PERMANENTLY LOST958 /// @dev Throws unless `msg.sender` is the current owner or an authorized959 /// operator for this NFT. Throws if `from` is not the current owner. Throws960 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.961 /// @param from The current owner of the NFT962 /// @param to The new owner963 /// @param tokenId The NFT to transfer964 /// @dev EVM selector for this function is: 0x23b872dd,965 /// or in textual repr: transferFrom(address,address,uint256)966 function transferFrom(967 address from,968 address to,969 uint256 tokenId970 ) public {971 require(false, stub_error);972 from;973 to;974 tokenId;975 dummy = 0;976 }977978 /// @notice Set or reaffirm the approved address for an NFT979 /// @dev The zero address indicates there is no approved address.980 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized981 /// operator of the current owner.982 /// @param approved The new approved NFT controller983 /// @param tokenId The NFT to approve984 /// @dev EVM selector for this function is: 0x095ea7b3,985 /// or in textual repr: approve(address,uint256)986 function approve(address approved, uint256 tokenId) public {987 require(false, stub_error);988 approved;989 tokenId;990 dummy = 0;991 }992993 /// @dev Not implemented994 /// @dev EVM selector for this function is: 0xa22cb465,995 /// or in textual repr: setApprovalForAll(address,bool)996 function setApprovalForAll(address operator, bool approved) public {997 require(false, stub_error);998 operator;999 approved;1000 dummy = 0;1001 }10021003 /// @dev Not implemented1004 /// @dev EVM selector for this function is: 0x081812fc,1005 /// or in textual repr: getApproved(uint256)1006 function getApproved(uint256 tokenId) public view returns (address) {1007 require(false, stub_error);1008 tokenId;1009 dummy;1010 return 0x0000000000000000000000000000000000000000;1011 }10121013 /// @dev Not implemented1014 /// @dev EVM selector for this function is: 0xe985e9c5,1015 /// or in textual repr: isApprovedForAll(address,address)1016 function isApprovedForAll(address owner, address operator) public view returns (address) {1017 require(false, stub_error);1018 owner;1019 operator;1020 dummy;1021 return 0x0000000000000000000000000000000000000000;1022 }1023}10241025contract UniqueNFT is1026 Dummy,1027 ERC165,1028 ERC721,1029 ERC721Enumerable,1030 ERC721UniqueExtensions,1031 ERC721UniqueMintable,1032 ERC721Burnable,1033 ERC721Metadata,1034 Collection,1035 TokenProperties1036{}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
@@ -119,7 +119,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
+/// @dev the ERC-165 identifier for this interface is 0x8b91d192
contract Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -268,26 +268,13 @@
/// "tokenLimit",
/// "sponsorTransferTimeout",
/// "sponsorApproveTimeout"
- /// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x6a3841db,
- /// or in textual repr: setCollectionLimit(string,uint32)
- function setCollectionLimit(string memory limit, uint32 value) public {
- require(false, stub_error);
- limit;
- value;
- dummy = 0;
- }
-
- /// Set limits for the collection.
- /// @dev Throws error if limit not found.
- /// @param limit Name of the limit. Valid names:
- /// "ownerCanTransfer",
+ /// "ownerCanTransfer",
/// "ownerCanDestroy",
/// "transfersEnabled"
/// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x993b7fba,
- /// or in textual repr: setCollectionLimit(string,bool)
- function setCollectionLimit(string memory limit, bool value) public {
+ /// @dev EVM selector for this function is: 0x4ad890a8,
+ /// or in textual repr: setCollectionLimit(string,uint256)
+ function setCollectionLimit(string memory limit, uint256 value) public {
require(false, stub_error);
limit;
value;
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -390,17 +390,7 @@
{
"inputs": [
{ "internalType": "string", "name": "limit", "type": "string" },
- { "internalType": "uint32", "name": "value", "type": "uint32" }
- ],
- "name": "setCollectionLimit",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "string", "name": "limit", "type": "string" },
- { "internalType": "bool", "name": "value", "type": "bool" }
+ { "internalType": "uint256", "name": "value", "type": "uint256" }
],
"name": "setCollectionLimit",
"outputs": [],
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -505,17 +505,7 @@
{
"inputs": [
{ "internalType": "string", "name": "limit", "type": "string" },
- { "internalType": "uint32", "name": "value", "type": "uint32" }
- ],
- "name": "setCollectionLimit",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "string", "name": "limit", "type": "string" },
- { "internalType": "bool", "name": "value", "type": "bool" }
+ { "internalType": "uint256", "name": "value", "type": "uint256" }
],
"name": "setCollectionLimit",
"outputs": [],
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -487,17 +487,7 @@
{
"inputs": [
{ "internalType": "string", "name": "limit", "type": "string" },
- { "internalType": "uint32", "name": "value", "type": "uint32" }
- ],
- "name": "setCollectionLimit",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "string", "name": "limit", "type": "string" },
- { "internalType": "bool", "name": "value", "type": "bool" }
+ { "internalType": "uint256", "name": "value", "type": "uint256" }
],
"name": "setCollectionLimit",
"outputs": [],
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -13,7 +13,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
+/// @dev the ERC-165 identifier for this interface is 0x8b91d192
interface Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -113,21 +113,13 @@
/// "tokenLimit",
/// "sponsorTransferTimeout",
/// "sponsorApproveTimeout"
- /// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x6a3841db,
- /// or in textual repr: setCollectionLimit(string,uint32)
- function setCollectionLimit(string memory limit, uint32 value) external;
-
- /// Set limits for the collection.
- /// @dev Throws error if limit not found.
- /// @param limit Name of the limit. Valid names:
- /// "ownerCanTransfer",
+ /// "ownerCanTransfer",
/// "ownerCanDestroy",
/// "transfersEnabled"
/// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x993b7fba,
- /// or in textual repr: setCollectionLimit(string,bool)
- function setCollectionLimit(string memory limit, bool value) external;
+ /// @dev EVM selector for this function is: 0x4ad890a8,
+ /// or in textual repr: setCollectionLimit(string,uint256)
+ function setCollectionLimit(string memory limit, uint256 value) external;
/// Get contract address.
/// @dev EVM selector for this function is: 0xf6b4dfb4,
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -80,7 +80,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
+/// @dev the ERC-165 identifier for this interface is 0x8b91d192
interface Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -180,21 +180,13 @@
/// "tokenLimit",
/// "sponsorTransferTimeout",
/// "sponsorApproveTimeout"
- /// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x6a3841db,
- /// or in textual repr: setCollectionLimit(string,uint32)
- function setCollectionLimit(string memory limit, uint32 value) external;
-
- /// Set limits for the collection.
- /// @dev Throws error if limit not found.
- /// @param limit Name of the limit. Valid names:
- /// "ownerCanTransfer",
+ /// "ownerCanTransfer",
/// "ownerCanDestroy",
/// "transfersEnabled"
/// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x993b7fba,
- /// or in textual repr: setCollectionLimit(string,bool)
- function setCollectionLimit(string memory limit, bool value) external;
+ /// @dev EVM selector for this function is: 0x4ad890a8,
+ /// or in textual repr: setCollectionLimit(string,uint256)
+ function setCollectionLimit(string memory limit, uint256 value) external;
/// Get contract address.
/// @dev EVM selector for this function is: 0xf6b4dfb4,
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -80,7 +80,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
+/// @dev the ERC-165 identifier for this interface is 0x8b91d192
interface Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -180,21 +180,13 @@
/// "tokenLimit",
/// "sponsorTransferTimeout",
/// "sponsorApproveTimeout"
- /// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x6a3841db,
- /// or in textual repr: setCollectionLimit(string,uint32)
- function setCollectionLimit(string memory limit, uint32 value) external;
-
- /// Set limits for the collection.
- /// @dev Throws error if limit not found.
- /// @param limit Name of the limit. Valid names:
- /// "ownerCanTransfer",
+ /// "ownerCanTransfer",
/// "ownerCanDestroy",
/// "transfersEnabled"
/// @param value Value of the limit.
- /// @dev EVM selector for this function is: 0x993b7fba,
- /// or in textual repr: setCollectionLimit(string,bool)
- function setCollectionLimit(string memory limit, bool value) external;
+ /// @dev EVM selector for this function is: 0x4ad890a8,
+ /// or in textual repr: setCollectionLimit(string,uint256)
+ function setCollectionLimit(string memory limit, uint256 value) external;
/// Get contract address.
/// @dev EVM selector for this function is: 0xf6b4dfb4,
tests/src/eth/createFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createFTCollection.test.ts
+++ b/tests/src/eth/createFTCollection.test.ts
@@ -85,32 +85,44 @@
tokenLimit: 1000000,
sponsorTransferTimeout: 6,
sponsorApproveTimeout: 6,
+ ownerCanTransfer: 0,
+ ownerCanDestroy: 0,
+ transfersEnabled: 0,
+ };
+
+ const expectedLimits = {
+ accountTokenOwnershipLimit: 1000,
+ sponsoredDataSize: 1024,
+ sponsoredDataRateLimit: 30,
+ tokenLimit: 1000000,
+ sponsorTransferTimeout: 6,
+ sponsorApproveTimeout: 6,
ownerCanTransfer: false,
ownerCanDestroy: false,
transfersEnabled: false,
};
-
+
const collection = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);
- await collection.methods['setCollectionLimit(string,uint32)']('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsoredDataSize', limits.sponsoredDataSize).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();
- await collection.methods['setCollectionLimit(string,uint32)']('tokenLimit', limits.tokenLimit).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();
- await collection.methods['setCollectionLimit(string,bool)']('ownerCanTransfer', limits.ownerCanTransfer).send();
- await collection.methods['setCollectionLimit(string,bool)']('ownerCanDestroy', limits.ownerCanDestroy).send();
- await collection.methods['setCollectionLimit(string,bool)']('transfersEnabled', limits.transfersEnabled).send();
+ await collection.methods.setCollectionLimit('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();
+ await collection.methods.setCollectionLimit('sponsoredDataSize', limits.sponsoredDataSize).send();
+ await collection.methods.setCollectionLimit('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();
+ await collection.methods.setCollectionLimit('tokenLimit', limits.tokenLimit).send();
+ await collection.methods.setCollectionLimit('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();
+ await collection.methods.setCollectionLimit('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();
+ await collection.methods.setCollectionLimit('ownerCanTransfer', limits.ownerCanTransfer).send();
+ await collection.methods.setCollectionLimit('ownerCanDestroy', limits.ownerCanDestroy).send();
+ await collection.methods.setCollectionLimit('transfersEnabled', limits.transfersEnabled).send();
const data = (await helper.rft.getData(collectionId))!;
- expect(data.raw.limits.accountTokenOwnershipLimit).to.be.eq(limits.accountTokenOwnershipLimit);
- expect(data.raw.limits.sponsoredDataSize).to.be.eq(limits.sponsoredDataSize);
- expect(data.raw.limits.sponsoredDataRateLimit.blocks).to.be.eq(limits.sponsoredDataRateLimit);
- expect(data.raw.limits.tokenLimit).to.be.eq(limits.tokenLimit);
- expect(data.raw.limits.sponsorTransferTimeout).to.be.eq(limits.sponsorTransferTimeout);
- expect(data.raw.limits.sponsorApproveTimeout).to.be.eq(limits.sponsorApproveTimeout);
- expect(data.raw.limits.ownerCanTransfer).to.be.eq(limits.ownerCanTransfer);
- expect(data.raw.limits.ownerCanDestroy).to.be.eq(limits.ownerCanDestroy);
- expect(data.raw.limits.transfersEnabled).to.be.eq(limits.transfersEnabled);
+ expect(data.raw.limits.accountTokenOwnershipLimit).to.be.eq(expectedLimits.accountTokenOwnershipLimit);
+ expect(data.raw.limits.sponsoredDataSize).to.be.eq(expectedLimits.sponsoredDataSize);
+ expect(data.raw.limits.sponsoredDataRateLimit.blocks).to.be.eq(expectedLimits.sponsoredDataRateLimit);
+ expect(data.raw.limits.tokenLimit).to.be.eq(expectedLimits.tokenLimit);
+ expect(data.raw.limits.sponsorTransferTimeout).to.be.eq(expectedLimits.sponsorTransferTimeout);
+ expect(data.raw.limits.sponsorApproveTimeout).to.be.eq(expectedLimits.sponsorApproveTimeout);
+ expect(data.raw.limits.ownerCanTransfer).to.be.eq(expectedLimits.ownerCanTransfer);
+ expect(data.raw.limits.ownerCanDestroy).to.be.eq(expectedLimits.ownerCanDestroy);
+ expect(data.raw.limits.transfersEnabled).to.be.eq(expectedLimits.transfersEnabled);
});
itEth('Collection address exist', async ({helper}) => {
@@ -257,11 +269,28 @@
});
itEth('(!negative test!) Set limits', async ({helper}) => {
+
+ const invalidLimits = {
+ accountTokenOwnershipLimit: BigInt(Number.MAX_SAFE_INTEGER),
+ transfersEnabled: 3,
+ };
+
const owner = await helper.eth.createAccountWithBalance(donor);
const {collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Limits', DECIMALS, 'absolutely anything', 'ISNI');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);
await expect(collectionEvm.methods
- .setCollectionLimit('badLimit', 'true')
- .call()).to.be.rejectedWith('unknown boolean limit "badLimit"');
+ .setCollectionLimit('badLimit', '1')
+ .call()).to.be.rejectedWith('unknown limit "badLimit"');
+
+ await expect(collectionEvm.methods
+ .setCollectionLimit(Object.keys(invalidLimits)[0], invalidLimits.accountTokenOwnershipLimit)
+ .call()).to.be.rejectedWith(`can't convert value to u32 "${invalidLimits.accountTokenOwnershipLimit}"`);
+
+ await expect(collectionEvm.methods
+ .setCollectionLimit(Object.keys(invalidLimits)[1], invalidLimits.transfersEnabled)
+ .call()).to.be.rejectedWith(`can't convert value to boolean "${invalidLimits.transfersEnabled}"`);
});
+
+
+
});
tests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -124,32 +124,44 @@
tokenLimit: 1000000,
sponsorTransferTimeout: 6,
sponsorApproveTimeout: 6,
+ ownerCanTransfer: 0,
+ ownerCanDestroy: 0,
+ transfersEnabled: 0,
+ };
+
+ const expectedLimits = {
+ accountTokenOwnershipLimit: 1000,
+ sponsoredDataSize: 1024,
+ sponsoredDataRateLimit: 30,
+ tokenLimit: 1000000,
+ sponsorTransferTimeout: 6,
+ sponsorApproveTimeout: 6,
ownerCanTransfer: false,
ownerCanDestroy: false,
transfersEnabled: false,
};
const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- await collection.methods['setCollectionLimit(string,uint32)']('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsoredDataSize', limits.sponsoredDataSize).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();
- await collection.methods['setCollectionLimit(string,uint32)']('tokenLimit', limits.tokenLimit).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();
- await collection.methods['setCollectionLimit(string,bool)']('ownerCanTransfer', limits.ownerCanTransfer).send();
- await collection.methods['setCollectionLimit(string,bool)']('ownerCanDestroy', limits.ownerCanDestroy).send();
- await collection.methods['setCollectionLimit(string,bool)']('transfersEnabled', limits.transfersEnabled).send();
+ await collection.methods.setCollectionLimit('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();
+ await collection.methods.setCollectionLimit('sponsoredDataSize', limits.sponsoredDataSize).send();
+ await collection.methods.setCollectionLimit('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();
+ await collection.methods.setCollectionLimit('tokenLimit', limits.tokenLimit).send();
+ await collection.methods.setCollectionLimit('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();
+ await collection.methods.setCollectionLimit('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();
+ await collection.methods.setCollectionLimit('ownerCanTransfer', limits.ownerCanTransfer).send();
+ await collection.methods.setCollectionLimit('ownerCanDestroy', limits.ownerCanDestroy).send();
+ await collection.methods.setCollectionLimit('transfersEnabled', limits.transfersEnabled).send();
- const data = (await helper.nft.getData(collectionId))!;
- expect(data.raw.limits.accountTokenOwnershipLimit).to.be.eq(limits.accountTokenOwnershipLimit);
- expect(data.raw.limits.sponsoredDataSize).to.be.eq(limits.sponsoredDataSize);
- expect(data.raw.limits.sponsoredDataRateLimit.blocks).to.be.eq(limits.sponsoredDataRateLimit);
- expect(data.raw.limits.tokenLimit).to.be.eq(limits.tokenLimit);
- expect(data.raw.limits.sponsorTransferTimeout).to.be.eq(limits.sponsorTransferTimeout);
- expect(data.raw.limits.sponsorApproveTimeout).to.be.eq(limits.sponsorApproveTimeout);
- expect(data.raw.limits.ownerCanTransfer).to.be.eq(limits.ownerCanTransfer);
- expect(data.raw.limits.ownerCanDestroy).to.be.eq(limits.ownerCanDestroy);
- expect(data.raw.limits.transfersEnabled).to.be.eq(limits.transfersEnabled);
+ const data = (await helper.rft.getData(collectionId))!;
+ expect(data.raw.limits.accountTokenOwnershipLimit).to.be.eq(expectedLimits.accountTokenOwnershipLimit);
+ expect(data.raw.limits.sponsoredDataSize).to.be.eq(expectedLimits.sponsoredDataSize);
+ expect(data.raw.limits.sponsoredDataRateLimit.blocks).to.be.eq(expectedLimits.sponsoredDataRateLimit);
+ expect(data.raw.limits.tokenLimit).to.be.eq(expectedLimits.tokenLimit);
+ expect(data.raw.limits.sponsorTransferTimeout).to.be.eq(expectedLimits.sponsorTransferTimeout);
+ expect(data.raw.limits.sponsorApproveTimeout).to.be.eq(expectedLimits.sponsorApproveTimeout);
+ expect(data.raw.limits.ownerCanTransfer).to.be.eq(expectedLimits.ownerCanTransfer);
+ expect(data.raw.limits.ownerCanDestroy).to.be.eq(expectedLimits.ownerCanDestroy);
+ expect(data.raw.limits.transfersEnabled).to.be.eq(expectedLimits.transfersEnabled);
});
itEth('Collection address exist', async ({helper}) => {
@@ -270,12 +282,22 @@
});
itEth('(!negative test!) Set limits', async ({helper}) => {
+ const invalidLimits = {
+ accountTokenOwnershipLimit: BigInt(Number.MAX_SAFE_INTEGER),
+ transfersEnabled: 3,
+ };
+
const owner = await helper.eth.createAccountWithBalance(donor);
const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Limits', 'absolutely anything', 'OLF');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+
+ await expect(collectionEvm.methods
+ .setCollectionLimit(Object.keys(invalidLimits)[0], invalidLimits.accountTokenOwnershipLimit)
+ .call()).to.be.rejectedWith(`can't convert value to u32 "${invalidLimits.accountTokenOwnershipLimit}"`);
+
await expect(collectionEvm.methods
- .setCollectionLimit('badLimit', 'true')
- .call()).to.be.rejectedWith('unknown boolean limit "badLimit"');
+ .setCollectionLimit(Object.keys(invalidLimits)[1], invalidLimits.transfersEnabled)
+ .call()).to.be.rejectedWith(`can't convert value to boolean "${invalidLimits.transfersEnabled}"`);
});
itEth('destroyCollection', async ({helper}) => {
tests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -159,32 +159,44 @@
tokenLimit: 1000000,
sponsorTransferTimeout: 6,
sponsorApproveTimeout: 6,
+ ownerCanTransfer: 0,
+ ownerCanDestroy: 0,
+ transfersEnabled: 0,
+ };
+
+ const expectedLimits = {
+ accountTokenOwnershipLimit: 1000,
+ sponsoredDataSize: 1024,
+ sponsoredDataRateLimit: 30,
+ tokenLimit: 1000000,
+ sponsorTransferTimeout: 6,
+ sponsorApproveTimeout: 6,
ownerCanTransfer: false,
ownerCanDestroy: false,
transfersEnabled: false,
};
-
+
const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
- await collection.methods['setCollectionLimit(string,uint32)']('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsoredDataSize', limits.sponsoredDataSize).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();
- await collection.methods['setCollectionLimit(string,uint32)']('tokenLimit', limits.tokenLimit).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();
- await collection.methods['setCollectionLimit(string,uint32)']('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();
- await collection.methods['setCollectionLimit(string,bool)']('ownerCanTransfer', limits.ownerCanTransfer).send();
- await collection.methods['setCollectionLimit(string,bool)']('ownerCanDestroy', limits.ownerCanDestroy).send();
- await collection.methods['setCollectionLimit(string,bool)']('transfersEnabled', limits.transfersEnabled).send();
+ await collection.methods.setCollectionLimit('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();
+ await collection.methods.setCollectionLimit('sponsoredDataSize', limits.sponsoredDataSize).send();
+ await collection.methods.setCollectionLimit('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();
+ await collection.methods.setCollectionLimit('tokenLimit', limits.tokenLimit).send();
+ await collection.methods.setCollectionLimit('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();
+ await collection.methods.setCollectionLimit('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();
+ await collection.methods.setCollectionLimit('ownerCanTransfer', limits.ownerCanTransfer).send();
+ await collection.methods.setCollectionLimit('ownerCanDestroy', limits.ownerCanDestroy).send();
+ await collection.methods.setCollectionLimit('transfersEnabled', limits.transfersEnabled).send();
const data = (await helper.rft.getData(collectionId))!;
- expect(data.raw.limits.accountTokenOwnershipLimit).to.be.eq(limits.accountTokenOwnershipLimit);
- expect(data.raw.limits.sponsoredDataSize).to.be.eq(limits.sponsoredDataSize);
- expect(data.raw.limits.sponsoredDataRateLimit.blocks).to.be.eq(limits.sponsoredDataRateLimit);
- expect(data.raw.limits.tokenLimit).to.be.eq(limits.tokenLimit);
- expect(data.raw.limits.sponsorTransferTimeout).to.be.eq(limits.sponsorTransferTimeout);
- expect(data.raw.limits.sponsorApproveTimeout).to.be.eq(limits.sponsorApproveTimeout);
- expect(data.raw.limits.ownerCanTransfer).to.be.eq(limits.ownerCanTransfer);
- expect(data.raw.limits.ownerCanDestroy).to.be.eq(limits.ownerCanDestroy);
- expect(data.raw.limits.transfersEnabled).to.be.eq(limits.transfersEnabled);
+ expect(data.raw.limits.accountTokenOwnershipLimit).to.be.eq(expectedLimits.accountTokenOwnershipLimit);
+ expect(data.raw.limits.sponsoredDataSize).to.be.eq(expectedLimits.sponsoredDataSize);
+ expect(data.raw.limits.sponsoredDataRateLimit.blocks).to.be.eq(expectedLimits.sponsoredDataRateLimit);
+ expect(data.raw.limits.tokenLimit).to.be.eq(expectedLimits.tokenLimit);
+ expect(data.raw.limits.sponsorTransferTimeout).to.be.eq(expectedLimits.sponsorTransferTimeout);
+ expect(data.raw.limits.sponsorApproveTimeout).to.be.eq(expectedLimits.sponsorApproveTimeout);
+ expect(data.raw.limits.ownerCanTransfer).to.be.eq(expectedLimits.ownerCanTransfer);
+ expect(data.raw.limits.ownerCanDestroy).to.be.eq(expectedLimits.ownerCanDestroy);
+ expect(data.raw.limits.transfersEnabled).to.be.eq(expectedLimits.transfersEnabled);
});
itEth('Collection address exist', async ({helper}) => {
@@ -305,12 +317,22 @@
});
itEth('(!negative test!) Set limits', async ({helper}) => {
+ const invalidLimits = {
+ accountTokenOwnershipLimit: BigInt(Number.MAX_SAFE_INTEGER),
+ transfersEnabled: 3,
+ };
+
const owner = await helper.eth.createAccountWithBalance(donor);
const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'ISNI');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
+
+ await expect(collectionEvm.methods
+ .setCollectionLimit(Object.keys(invalidLimits)[0], invalidLimits.accountTokenOwnershipLimit)
+ .call()).to.be.rejectedWith(`can't convert value to u32 "${invalidLimits.accountTokenOwnershipLimit}"`);
+
await expect(collectionEvm.methods
- .setCollectionLimit('badLimit', 'true')
- .call()).to.be.rejectedWith('unknown boolean limit "badLimit"');
+ .setCollectionLimit(Object.keys(invalidLimits)[1], invalidLimits.transfersEnabled)
+ .call()).to.be.rejectedWith(`can't convert value to boolean "${invalidLimits.transfersEnabled}"`);
});
itEth('destroyCollection', async ({helper}) => {