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.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.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/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.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 0x324a7f5b123contract 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 (Tuple22[] memory) {192 require(false, stub_error);193 keys;194 dummy;195 return new Tuple22[](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 (Tuple25 memory) {257 require(false, stub_error);258 dummy;259 return Tuple25(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 /// @param value Value of the limit.272 /// @dev EVM selector for this function is: 0x6a3841db,273 /// or in textual repr: setCollectionLimit(string,uint32)274 function setCollectionLimit(string memory limit, uint32 value) public {275 require(false, stub_error);276 limit;277 value;278 dummy = 0;279 }280281 /// Set limits for the collection.282 /// @dev Throws error if limit not found.283 /// @param limit Name of the limit. Valid names:284 /// "ownerCanTransfer",285 /// "ownerCanDestroy",286 /// "transfersEnabled"287 /// @param value Value of the limit.288 /// @dev EVM selector for this function is: 0x993b7fba,289 /// or in textual repr: setCollectionLimit(string,bool)290 function setCollectionLimit(string memory limit, bool value) public {291 require(false, stub_error);292 limit;293 value;294 dummy = 0;295 }296297 /// Get contract address.298 /// @dev EVM selector for this function is: 0xf6b4dfb4,299 /// or in textual repr: contractAddress()300 function contractAddress() public view returns (address) {301 require(false, stub_error);302 dummy;303 return 0x0000000000000000000000000000000000000000;304 }305306 /// Add collection admin.307 /// @param newAdmin Cross account administrator address.308 /// @dev EVM selector for this function is: 0x859aa7d6,309 /// or in textual repr: addCollectionAdminCross((address,uint256))310 function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {311 require(false, stub_error);312 newAdmin;313 dummy = 0;314 }315316 /// Remove collection admin.317 /// @param admin Cross account administrator address.318 /// @dev EVM selector for this function is: 0x6c0cd173,319 /// or in textual repr: removeCollectionAdminCross((address,uint256))320 function removeCollectionAdminCross(EthCrossAccount memory admin) public {321 require(false, stub_error);322 admin;323 dummy = 0;324 }325326 // /// Add collection admin.327 // /// @param newAdmin Address of the added administrator.328 // /// @dev EVM selector for this function is: 0x92e462c7,329 // /// or in textual repr: addCollectionAdmin(address)330 // function addCollectionAdmin(address newAdmin) public {331 // require(false, stub_error);332 // newAdmin;333 // dummy = 0;334 // }335336 // /// Remove collection admin.337 // ///338 // /// @param admin Address of the removed administrator.339 // /// @dev EVM selector for this function is: 0xfafd7b42,340 // /// or in textual repr: removeCollectionAdmin(address)341 // function removeCollectionAdmin(address admin) public {342 // require(false, stub_error);343 // admin;344 // dummy = 0;345 // }346347 /// Toggle accessibility of collection nesting.348 ///349 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'350 /// @dev EVM selector for this function is: 0x112d4586,351 /// or in textual repr: setCollectionNesting(bool)352 function setCollectionNesting(bool enable) public {353 require(false, stub_error);354 enable;355 dummy = 0;356 }357358 /// Toggle accessibility of collection nesting.359 ///360 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'361 /// @param collections Addresses of collections that will be available for nesting.362 /// @dev EVM selector for this function is: 0x64872396,363 /// or in textual repr: setCollectionNesting(bool,address[])364 function setCollectionNesting(bool enable, address[] memory collections) public {365 require(false, stub_error);366 enable;367 collections;368 dummy = 0;369 }370371 /// Set the collection access method.372 /// @param mode Access mode373 /// 0 for Normal374 /// 1 for AllowList375 /// @dev EVM selector for this function is: 0x41835d4c,376 /// or in textual repr: setCollectionAccess(uint8)377 function setCollectionAccess(uint8 mode) public {378 require(false, stub_error);379 mode;380 dummy = 0;381 }382383 /// Checks that user allowed to operate with collection.384 ///385 /// @param user User address to check.386 /// @dev EVM selector for this function is: 0xd63a8e11,387 /// or in textual repr: allowed(address)388 function allowed(address user) public view returns (bool) {389 require(false, stub_error);390 user;391 dummy;392 return false;393 }394395 // /// Add the user to the allowed list.396 // ///397 // /// @param user Address of a trusted user.398 // /// @dev EVM selector for this function is: 0x67844fe6,399 // /// or in textual repr: addToCollectionAllowList(address)400 // function addToCollectionAllowList(address user) public {401 // require(false, stub_error);402 // user;403 // dummy = 0;404 // }405406 /// Add user to allowed list.407 ///408 /// @param user User cross account address.409 /// @dev EVM selector for this function is: 0xa0184a3a,410 /// or in textual repr: addToCollectionAllowListCross((address,uint256))411 function addToCollectionAllowListCross(EthCrossAccount memory user) public {412 require(false, stub_error);413 user;414 dummy = 0;415 }416417 // /// Remove the user from the allowed list.418 // ///419 // /// @param user Address of a removed user.420 // /// @dev EVM selector for this function is: 0x85c51acb,421 // /// or in textual repr: removeFromCollectionAllowList(address)422 // function removeFromCollectionAllowList(address user) public {423 // require(false, stub_error);424 // user;425 // dummy = 0;426 // }427428 /// Remove user from allowed list.429 ///430 /// @param user User cross account address.431 /// @dev EVM selector for this function is: 0x09ba452a,432 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))433 function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {434 require(false, stub_error);435 user;436 dummy = 0;437 }438439 /// Switch permission for minting.440 ///441 /// @param mode Enable if "true".442 /// @dev EVM selector for this function is: 0x00018e84,443 /// or in textual repr: setCollectionMintMode(bool)444 function setCollectionMintMode(bool mode) public {445 require(false, stub_error);446 mode;447 dummy = 0;448 }449450 // /// Check that account is the owner or admin of the collection451 // ///452 // /// @param user account to verify453 // /// @return "true" if account is the owner or admin454 // /// @dev EVM selector for this function is: 0x9811b0c7,455 // /// or in textual repr: isOwnerOrAdmin(address)456 // function isOwnerOrAdmin(address user) public view returns (bool) {457 // require(false, stub_error);458 // user;459 // dummy;460 // return false;461 // }462463 /// Check that account is the owner or admin of the collection464 ///465 /// @param user User cross account to verify466 /// @return "true" if account is the owner or admin467 /// @dev EVM selector for this function is: 0x3e75a905,468 /// or in textual repr: isOwnerOrAdminCross((address,uint256))469 function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {470 require(false, stub_error);471 user;472 dummy;473 return false;474 }475476 /// Returns collection type477 ///478 /// @return `Fungible` or `NFT` or `ReFungible`479 /// @dev EVM selector for this function is: 0xd34b55b8,480 /// or in textual repr: uniqueCollectionType()481 function uniqueCollectionType() public view returns (string memory) {482 require(false, stub_error);483 dummy;484 return "";485 }486487 /// Get collection owner.488 ///489 /// @return Tuble with sponsor address and his substrate mirror.490 /// If address is canonical then substrate mirror is zero and vice versa.491 /// @dev EVM selector for this function is: 0xdf727d3b,492 /// or in textual repr: collectionOwner()493 function collectionOwner() public view returns (EthCrossAccount memory) {494 require(false, stub_error);495 dummy;496 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);497 }498499 // /// Changes collection owner to another account500 // ///501 // /// @dev Owner can be changed only by current owner502 // /// @param newOwner new owner account503 // /// @dev EVM selector for this function is: 0x4f53e226,504 // /// or in textual repr: changeCollectionOwner(address)505 // function changeCollectionOwner(address newOwner) public {506 // require(false, stub_error);507 // newOwner;508 // dummy = 0;509 // }510511 /// Get collection administrators512 ///513 /// @return Vector of tuples with admins address and his substrate mirror.514 /// If address is canonical then substrate mirror is zero and vice versa.515 /// @dev EVM selector for this function is: 0x5813216b,516 /// or in textual repr: collectionAdmins()517 function collectionAdmins() public view returns (EthCrossAccount[] memory) {518 require(false, stub_error);519 dummy;520 return new EthCrossAccount[](0);521 }522523 /// Changes collection owner to another account524 ///525 /// @dev Owner can be changed only by current owner526 /// @param newOwner new owner cross account527 /// @dev EVM selector for this function is: 0x6496c497,528 /// or in textual repr: changeCollectionOwnerCross((address,uint256))529 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {530 require(false, stub_error);531 newOwner;532 dummy = 0;533 }534}535536/// @dev Cross account struct537struct EthCrossAccount {538 address eth;539 uint256 sub;540}541542/// @dev anonymous struct543struct Tuple25 {544 address field_0;545 uint256 field_1;546}547548/// @dev anonymous struct549struct Tuple22 {550 string field_0;551 bytes field_1;552}553554/// @dev the ERC-165 identifier for this interface is 0x5b5e139f555contract ERC721Metadata is Dummy, ERC165 {556 // /// @notice A descriptive name for a collection of NFTs in this contract557 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`558 // /// @dev EVM selector for this function is: 0x06fdde03,559 // /// or in textual repr: name()560 // function name() public view returns (string memory) {561 // require(false, stub_error);562 // dummy;563 // return "";564 // }565566 // /// @notice An abbreviated name for NFTs in this contract567 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`568 // /// @dev EVM selector for this function is: 0x95d89b41,569 // /// or in textual repr: symbol()570 // function symbol() public view returns (string memory) {571 // require(false, stub_error);572 // dummy;573 // return "";574 // }575576 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.577 ///578 /// @dev If the token has a `url` property and it is not empty, it is returned.579 /// 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`.580 /// If the collection property `baseURI` is empty or absent, return "" (empty string)581 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix582 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).583 ///584 /// @return token's const_metadata585 /// @dev EVM selector for this function is: 0xc87b56dd,586 /// or in textual repr: tokenURI(uint256)587 function tokenURI(uint256 tokenId) public view returns (string memory) {588 require(false, stub_error);589 tokenId;590 dummy;591 return "";592 }593}594595/// @title ERC721 Token that can be irreversibly burned (destroyed).596/// @dev the ERC-165 identifier for this interface is 0x42966c68597contract ERC721Burnable is Dummy, ERC165 {598 /// @notice Burns a specific ERC721 token.599 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized600 /// operator of the current owner.601 /// @param tokenId The RFT to approve602 /// @dev EVM selector for this function is: 0x42966c68,603 /// or in textual repr: burn(uint256)604 function burn(uint256 tokenId) public {605 require(false, stub_error);606 tokenId;607 dummy = 0;608 }609}610611/// @dev inlined interface612contract ERC721UniqueMintableEvents {613 event MintingFinished();614}615616/// @title ERC721 minting logic.617/// @dev the ERC-165 identifier for this interface is 0x476ff149618contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {619 /// @dev EVM selector for this function is: 0x05d2035b,620 /// or in textual repr: mintingFinished()621 function mintingFinished() public view returns (bool) {622 require(false, stub_error);623 dummy;624 return false;625 }626627 /// @notice Function to mint token.628 /// @param to The new owner629 /// @return uint256 The id of the newly minted token630 /// @dev EVM selector for this function is: 0x6a627842,631 /// or in textual repr: mint(address)632 function mint(address to) public returns (uint256) {633 require(false, stub_error);634 to;635 dummy = 0;636 return 0;637 }638639 // /// @notice Function to mint token.640 // /// @dev `tokenId` should be obtained with `nextTokenId` method,641 // /// unlike standard, you can't specify it manually642 // /// @param to The new owner643 // /// @param tokenId ID of the minted RFT644 // /// @dev EVM selector for this function is: 0x40c10f19,645 // /// or in textual repr: mint(address,uint256)646 // function mint(address to, uint256 tokenId) public returns (bool) {647 // require(false, stub_error);648 // to;649 // tokenId;650 // dummy = 0;651 // return false;652 // }653654 /// @notice Function to mint token with the given tokenUri.655 /// @param to The new owner656 /// @param tokenUri Token URI that would be stored in the NFT properties657 /// @return uint256 The id of the newly minted token658 /// @dev EVM selector for this function is: 0x45c17782,659 /// or in textual repr: mintWithTokenURI(address,string)660 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {661 require(false, stub_error);662 to;663 tokenUri;664 dummy = 0;665 return 0;666 }667668 // /// @notice Function to mint token with the given tokenUri.669 // /// @dev `tokenId` should be obtained with `nextTokenId` method,670 // /// unlike standard, you can't specify it manually671 // /// @param to The new owner672 // /// @param tokenId ID of the minted RFT673 // /// @param tokenUri Token URI that would be stored in the RFT properties674 // /// @dev EVM selector for this function is: 0x50bb4e7f,675 // /// or in textual repr: mintWithTokenURI(address,uint256,string)676 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {677 // require(false, stub_error);678 // to;679 // tokenId;680 // tokenUri;681 // dummy = 0;682 // return false;683 // }684685 /// @dev Not implemented686 /// @dev EVM selector for this function is: 0x7d64bcb4,687 /// or in textual repr: finishMinting()688 function finishMinting() public returns (bool) {689 require(false, stub_error);690 dummy = 0;691 return false;692 }693}694695/// @title Unique extensions for ERC721.696/// @dev the ERC-165 identifier for this interface is 0xab243667697contract ERC721UniqueExtensions is Dummy, ERC165 {698 /// @notice A descriptive name for a collection of NFTs in this contract699 /// @dev EVM selector for this function is: 0x06fdde03,700 /// or in textual repr: name()701 function name() public view returns (string memory) {702 require(false, stub_error);703 dummy;704 return "";705 }706707 /// @notice An abbreviated name for NFTs in this contract708 /// @dev EVM selector for this function is: 0x95d89b41,709 /// or in textual repr: symbol()710 function symbol() public view returns (string memory) {711 require(false, stub_error);712 dummy;713 return "";714 }715716 /// @notice Transfer ownership of an RFT717 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`718 /// is the zero address. Throws if `tokenId` is not a valid RFT.719 /// Throws if RFT pieces have multiple owners.720 /// @param to The new owner721 /// @param tokenId The RFT to transfer722 /// @dev EVM selector for this function is: 0xa9059cbb,723 /// or in textual repr: transfer(address,uint256)724 function transfer(address to, uint256 tokenId) public {725 require(false, stub_error);726 to;727 tokenId;728 dummy = 0;729 }730731 /// @notice Transfer ownership of an RFT732 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`733 /// is the zero address. Throws if `tokenId` is not a valid RFT.734 /// Throws if RFT pieces have multiple owners.735 /// @param to The new owner736 /// @param tokenId The RFT to transfer737 /// @dev EVM selector for this function is: 0x2ada85ff,738 /// or in textual repr: transferCross((address,uint256),uint256)739 function transferCross(EthCrossAccount memory to, uint256 tokenId) public {740 require(false, stub_error);741 to;742 tokenId;743 dummy = 0;744 }745746 /// @notice Transfer ownership of an RFT747 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`748 /// is the zero address. Throws if `tokenId` is not a valid RFT.749 /// Throws if RFT pieces have multiple owners.750 /// @param to The new owner751 /// @param tokenId The RFT to transfer752 /// @dev EVM selector for this function is: 0xd5cf430b,753 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)754 function transferFromCross(755 EthCrossAccount memory from,756 EthCrossAccount memory to,757 uint256 tokenId758 ) public {759 require(false, stub_error);760 from;761 to;762 tokenId;763 dummy = 0;764 }765766 // /// @notice Burns a specific ERC721 token.767 // /// @dev Throws unless `msg.sender` is the current owner or an authorized768 // /// operator for this RFT. Throws if `from` is not the current owner. Throws769 // /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.770 // /// Throws if RFT pieces have multiple owners.771 // /// @param from The current owner of the RFT772 // /// @param tokenId The RFT to transfer773 // /// @dev EVM selector for this function is: 0x79cc6790,774 // /// or in textual repr: burnFrom(address,uint256)775 // function burnFrom(address from, uint256 tokenId) public {776 // require(false, stub_error);777 // from;778 // tokenId;779 // dummy = 0;780 // }781782 /// @notice Burns a specific ERC721 token.783 /// @dev Throws unless `msg.sender` is the current owner or an authorized784 /// operator for this RFT. Throws if `from` is not the current owner. Throws785 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.786 /// Throws if RFT pieces have multiple owners.787 /// @param from The current owner of the RFT788 /// @param tokenId The RFT 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 RFT 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 }806807 // /// @notice Function to mint multiple tokens.808 // /// @dev `tokenIds` should be an array of consecutive numbers and first number809 // /// should be obtained with `nextTokenId` method810 // /// @param to The new owner811 // /// @param tokenIds IDs of the minted RFTs812 // /// @dev EVM selector for this function is: 0x44a9945e,813 // /// or in textual repr: mintBulk(address,uint256[])814 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {815 // require(false, stub_error);816 // to;817 // tokenIds;818 // dummy = 0;819 // return false;820 // }821822 // /// @notice Function to mint multiple tokens with the given tokenUris.823 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive824 // /// numbers and first number should be obtained with `nextTokenId` method825 // /// @param to The new owner826 // /// @param tokens array of pairs of token ID and token URI for minted tokens827 // /// @dev EVM selector for this function is: 0x36543006,828 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])829 // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) public returns (bool) {830 // require(false, stub_error);831 // to;832 // tokens;833 // dummy = 0;834 // return false;835 // }836837 /// Returns EVM address for refungible token838 ///839 /// @param token ID of the token840 /// @dev EVM selector for this function is: 0xab76fac6,841 /// or in textual repr: tokenContractAddress(uint256)842 function tokenContractAddress(uint256 token) public view returns (address) {843 require(false, stub_error);844 token;845 dummy;846 return 0x0000000000000000000000000000000000000000;847 }848}849850/// @dev anonymous struct851struct Tuple10 {852 uint256 field_0;853 string field_1;854}855856/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension857/// @dev See https://eips.ethereum.org/EIPS/eip-721858/// @dev the ERC-165 identifier for this interface is 0x780e9d63859contract ERC721Enumerable is Dummy, ERC165 {860 /// @notice Enumerate valid RFTs861 /// @param index A counter less than `totalSupply()`862 /// @return The token identifier for the `index`th NFT,863 /// (sort order not specified)864 /// @dev EVM selector for this function is: 0x4f6ccce7,865 /// or in textual repr: tokenByIndex(uint256)866 function tokenByIndex(uint256 index) public view returns (uint256) {867 require(false, stub_error);868 index;869 dummy;870 return 0;871 }872873 /// Not implemented874 /// @dev EVM selector for this function is: 0x2f745c59,875 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)876 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {877 require(false, stub_error);878 owner;879 index;880 dummy;881 return 0;882 }883884 /// @notice Count RFTs tracked by this contract885 /// @return A count of valid RFTs tracked by this contract, where each one of886 /// them has an assigned and queryable owner not equal to the zero address887 /// @dev EVM selector for this function is: 0x18160ddd,888 /// or in textual repr: totalSupply()889 function totalSupply() public view returns (uint256) {890 require(false, stub_error);891 dummy;892 return 0;893 }894}895896/// @dev inlined interface897contract ERC721Events {898 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);899 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);900 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);901}902903/// @title ERC-721 Non-Fungible Token Standard904/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md905/// @dev the ERC-165 identifier for this interface is 0x58800161906contract ERC721 is Dummy, ERC165, ERC721Events {907 /// @notice Count all RFTs assigned to an owner908 /// @dev RFTs assigned to the zero address are considered invalid, and this909 /// function throws for queries about the zero address.910 /// @param owner An address for whom to query the balance911 /// @return The number of RFTs owned by `owner`, possibly zero912 /// @dev EVM selector for this function is: 0x70a08231,913 /// or in textual repr: balanceOf(address)914 function balanceOf(address owner) public view returns (uint256) {915 require(false, stub_error);916 owner;917 dummy;918 return 0;919 }920921 /// @notice Find the owner of an RFT922 /// @dev RFTs assigned to zero address are considered invalid, and queries923 /// about them do throw.924 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for925 /// the tokens that are partially owned.926 /// @param tokenId The identifier for an RFT927 /// @return The address of the owner of the RFT928 /// @dev EVM selector for this function is: 0x6352211e,929 /// or in textual repr: ownerOf(uint256)930 function ownerOf(uint256 tokenId) public view returns (address) {931 require(false, stub_error);932 tokenId;933 dummy;934 return 0x0000000000000000000000000000000000000000;935 }936937 /// @dev Not implemented938 /// @dev EVM selector for this function is: 0x60a11672,939 /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)940 function safeTransferFromWithData(941 address from,942 address to,943 uint256 tokenId,944 bytes memory data945 ) public {946 require(false, stub_error);947 from;948 to;949 tokenId;950 data;951 dummy = 0;952 }953954 /// @dev Not implemented955 /// @dev EVM selector for this function is: 0x42842e0e,956 /// or in textual repr: safeTransferFrom(address,address,uint256)957 function safeTransferFrom(958 address from,959 address to,960 uint256 tokenId961 ) public {962 require(false, stub_error);963 from;964 to;965 tokenId;966 dummy = 0;967 }968969 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE970 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE971 /// THEY MAY BE PERMANENTLY LOST972 /// @dev Throws unless `msg.sender` is the current owner or an authorized973 /// operator for this RFT. Throws if `from` is not the current owner. Throws974 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.975 /// Throws if RFT pieces have multiple owners.976 /// @param from The current owner of the NFT977 /// @param to The new owner978 /// @param tokenId The NFT to transfer979 /// @dev EVM selector for this function is: 0x23b872dd,980 /// or in textual repr: transferFrom(address,address,uint256)981 function transferFrom(982 address from,983 address to,984 uint256 tokenId985 ) public {986 require(false, stub_error);987 from;988 to;989 tokenId;990 dummy = 0;991 }992993 /// @dev Not implemented994 /// @dev EVM selector for this function is: 0x095ea7b3,995 /// or in textual repr: approve(address,uint256)996 function approve(address approved, uint256 tokenId) public {997 require(false, stub_error);998 approved;999 tokenId;1000 dummy = 0;1001 }10021003 /// @dev Not implemented1004 /// @dev EVM selector for this function is: 0xa22cb465,1005 /// or in textual repr: setApprovalForAll(address,bool)1006 function setApprovalForAll(address operator, bool approved) public {1007 require(false, stub_error);1008 operator;1009 approved;1010 dummy = 0;1011 }10121013 /// @dev Not implemented1014 /// @dev EVM selector for this function is: 0x081812fc,1015 /// or in textual repr: getApproved(uint256)1016 function getApproved(uint256 tokenId) public view returns (address) {1017 require(false, stub_error);1018 tokenId;1019 dummy;1020 return 0x0000000000000000000000000000000000000000;1021 }10221023 /// @dev Not implemented1024 /// @dev EVM selector for this function is: 0xe985e9c5,1025 /// or in textual repr: isApprovedForAll(address,address)1026 function isApprovedForAll(address owner, address operator) public view returns (address) {1027 require(false, stub_error);1028 owner;1029 operator;1030 dummy;1031 return 0x0000000000000000000000000000000000000000;1032 }1033}10341035contract UniqueRefungible is1036 Dummy,1037 ERC165,1038 ERC721,1039 ERC721Enumerable,1040 ERC721UniqueExtensions,1041 ERC721UniqueMintable,1042 ERC721Burnable,1043 ERC721Metadata,1044 Collection,1045 TokenProperties1046{}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}) => {