difftreelog
Added `set_properties` method for `TokenProperties` interface.
in: master
19 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6358,7 +6358,7 @@
[[package]]
name = "pallet-nonfungible"
-version = "0.1.5"
+version = "0.1.6"
dependencies = [
"ethereum",
"evm-coder",
@@ -6480,7 +6480,7 @@
[[package]]
name = "pallet-refungible"
-version = "0.2.4"
+version = "0.2.5"
dependencies = [
"derivative",
"ethereum",
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
@@ -385,7 +385,7 @@
/// Get collection owner.
///
- /// @return Tuble with sponsor address and his substrate mirror.
+ /// @return Tuple with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -2,12 +2,20 @@
All notable changes to this project will be documented in this file.
+<!-- bureaucrate goes here -->
+
+## [v0.1.6] - 2022-20-10
+
+### Change
+
+- Added `set_properties` method for `TokenProperties` interface.
+
## [v0.1.5] - 2022-08-24
### Change
- - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
-<!-- bureaucrate goes here -->
+- Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
+
## [v0.1.4] 2022-08-16
### Other changes
@@ -28,7 +36,9 @@
- build: Upgrade polkadot to v0.9.25 cdfb9bdc7b205ff1b5134f034ef9973d769e5e6b
## [0.1.2] - 2022-07-25
+
### Changed
+
- New `token_uri` retrieval logic:
If the collection has a `url` property and it is not empty, it is returned.
@@ -39,8 +49,9 @@
otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).
## [0.1.1] - 2022-07-14
+
### Added
- Implementation of RPC method `token_owners`.
- For reasons of compatibility with this pallet, returns only one owner if token exists.
- This was an internal request to improve the web interface and support fractionalization event.
+ For reasons of compatibility with this pallet, returns only one owner if token exists.
+ This was an internal request to improve the web interface and support fractionalization event.
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-nonfungible"
-version = "0.1.5"
+version = "0.1.6"
license = "GPLv3"
edition = "2021"
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -114,6 +114,47 @@
.map_err(dispatch_to_evm::<T>)
}
+ /// @notice Set token properties value.
+ /// @dev Throws error if `msg.sender` has no permission to edit the property.
+ /// @param tokenId ID of the token.
+ /// @param properties settable properties
+ fn set_properties(
+ &mut self,
+ caller: caller,
+ token_id: uint256,
+ properties: Vec<(string, bytes)>,
+ ) -> Result<()> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
+
+ let nesting_budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ let properties = properties
+ .into_iter()
+ .map(|(key, value)| {
+ let key = <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(Property { key, value })
+ })
+ .collect::<Result<Vec<_>>>()?;
+
+ <Pallet<T>>::set_token_properties(
+ self,
+ &caller,
+ TokenId(token_id),
+ properties.into_iter(),
+ <Pallet<T>>::token_exists(&self, TokenId(token_id)),
+ &nesting_budget,
+ )
+ .map_err(dispatch_to_evm::<T>)
+ }
+
/// @notice Delete token property value.
/// @dev Throws error if `msg.sender` has no permission to edit the property.
/// @param tokenId ID of the token.
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
@@ -18,7 +18,7 @@
}
/// @title A contract that allows to set and delete token properties and change token property permissions.
-/// @dev the ERC-165 identifier for this interface is 0x41369377
+/// @dev the ERC-165 identifier for this interface is 0x55dba919
contract TokenProperties is Dummy, ERC165 {
/// @notice Set permissions for token property.
/// @dev Throws error if `msg.sender` is not admin or owner of the collection.
@@ -61,6 +61,19 @@
dummy = 0;
}
+ /// @notice Set token properties value.
+ /// @dev Throws error if `msg.sender` has no permission to edit the property.
+ /// @param tokenId ID of the token.
+ /// @param properties settable properties
+ /// @dev EVM selector for this function is: 0x14ed3a6e,
+ /// or in textual repr: setProperties(uint256,(string,bytes)[])
+ function setProperties(uint256 tokenId, Tuple19[] memory properties) public {
+ require(false, stub_error);
+ tokenId;
+ properties;
+ dummy = 0;
+ }
+
/// @notice Delete token property value.
/// @dev Throws error if `msg.sender` has no permission to edit the property.
/// @param tokenId ID of the token.
@@ -458,7 +471,7 @@
/// Get collection owner.
///
- /// @return Tuble with sponsor address and his substrate mirror.
+ /// @return Tuple with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -2,12 +2,20 @@
All notable changes to this project will be documented in this file.
+## [v0.2.5] - 2022-20-10
+
+### Change
+
+- Added `set_properties` method for `TokenProperties` interface.
+
## [v0.2.4] - 2022-08-24
### Change
- - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
+- Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
+
<!-- bureaucrate goes here -->
+
## [v0.2.3] 2022-08-16
### Other changes
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-refungible"
-version = "0.2.4"
+version = "0.2.5"
license = "GPLv3"
edition = "2021"
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -117,6 +117,47 @@
.map_err(dispatch_to_evm::<T>)
}
+ /// @notice Set token properties value.
+ /// @dev Throws error if `msg.sender` has no permission to edit the property.
+ /// @param tokenId ID of the token.
+ /// @param properties settable properties
+ fn set_properties(
+ &mut self,
+ caller: caller,
+ token_id: uint256,
+ properties: Vec<(string, bytes)>,
+ ) -> Result<()> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
+
+ let nesting_budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ let properties = properties
+ .into_iter()
+ .map(|(key, value)| {
+ let key = <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(Property { key, value })
+ })
+ .collect::<Result<Vec<_>>>()?;
+
+ <Pallet<T>>::set_token_properties(
+ self,
+ &caller,
+ TokenId(token_id),
+ properties.into_iter(),
+ <Pallet<T>>::token_exists(&self, TokenId(token_id)),
+ &nesting_budget,
+ )
+ .map_err(dispatch_to_evm::<T>)
+ }
+
/// @notice Delete token property value.
/// @dev Throws error if `msg.sender` has no permission to edit the property.
/// @param tokenId ID of the token.
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
@@ -18,7 +18,7 @@
}
/// @title A contract that allows to set and delete token properties and change token property permissions.
-/// @dev the ERC-165 identifier for this interface is 0x41369377
+/// @dev the ERC-165 identifier for this interface is 0x55dba919
contract TokenProperties is Dummy, ERC165 {
/// @notice Set permissions for token property.
/// @dev Throws error if `msg.sender` is not admin or owner of the collection.
@@ -61,6 +61,19 @@
dummy = 0;
}
+ /// @notice Set token properties value.
+ /// @dev Throws error if `msg.sender` has no permission to edit the property.
+ /// @param tokenId ID of the token.
+ /// @param properties settable properties
+ /// @dev EVM selector for this function is: 0x14ed3a6e,
+ /// or in textual repr: setProperties(uint256,(string,bytes)[])
+ function setProperties(uint256 tokenId, Tuple19[] memory properties) public {
+ require(false, stub_error);
+ tokenId;
+ properties;
+ dummy = 0;
+ }
+
/// @notice Delete token property value.
/// @dev Throws error if `msg.sender` has no permission to edit the property.
/// @param tokenId ID of the token.
@@ -458,7 +471,7 @@
/// Get collection owner.
///
- /// @return Tuble with sponsor address and his substrate mirror.
+ /// @return Tuple with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -249,7 +249,7 @@
/// Get collection owner.
///
- /// @return Tuble with sponsor address and his substrate mirror.
+ /// @return Tuple with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -13,7 +13,7 @@
}
/// @title A contract that allows to set and delete token properties and change token property permissions.
-/// @dev the ERC-165 identifier for this interface is 0x41369377
+/// @dev the ERC-165 identifier for this interface is 0x55dba919
interface TokenProperties is Dummy, ERC165 {
/// @notice Set permissions for token property.
/// @dev Throws error if `msg.sender` is not admin or owner of the collection.
@@ -43,6 +43,14 @@
bytes memory value
) external;
+ /// @notice Set token properties value.
+ /// @dev Throws error if `msg.sender` has no permission to edit the property.
+ /// @param tokenId ID of the token.
+ /// @param properties settable properties
+ /// @dev EVM selector for this function is: 0x14ed3a6e,
+ /// or in textual repr: setProperties(uint256,(string,bytes)[])
+ function setProperties(uint256 tokenId, Tuple19[] memory properties) external;
+
/// @notice Delete token property value.
/// @dev Throws error if `msg.sender` has no permission to edit the property.
/// @param tokenId ID of the token.
@@ -298,7 +306,7 @@
/// Get collection owner.
///
- /// @return Tuble with sponsor address and his substrate mirror.
+ /// @return Tuple with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows to set and delete token properties and change token property permissions.16/// @dev the ERC-165 identifier for this interface is 0x4136937717interface TokenProperties is Dummy, ERC165 {18 /// @notice Set permissions for token property.19 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.20 /// @param key Property key.21 /// @param isMutable Permission to mutate property.22 /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.23 /// @param tokenOwner Permission to mutate property by token owner if property is mutable.24 /// @dev EVM selector for this function is: 0x222d97fa,25 /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)26 function setTokenPropertyPermission(27 string memory key,28 bool isMutable,29 bool collectionAdmin,30 bool tokenOwner31 ) external;3233 /// @notice Set token property value.34 /// @dev Throws error if `msg.sender` has no permission to edit the property.35 /// @param tokenId ID of the token.36 /// @param key Property key.37 /// @param value Property value.38 /// @dev EVM selector for this function is: 0x1752d67b,39 /// or in textual repr: setProperty(uint256,string,bytes)40 function setProperty(41 uint256 tokenId,42 string memory key,43 bytes memory value44 ) external;4546 /// @notice Delete token property value.47 /// @dev Throws error if `msg.sender` has no permission to edit the property.48 /// @param tokenId ID of the token.49 /// @param key Property key.50 /// @dev EVM selector for this function is: 0x066111d1,51 /// or in textual repr: deleteProperty(uint256,string)52 function deleteProperty(uint256 tokenId, string memory key) external;5354 /// @notice Get token property value.55 /// @dev Throws error if key not found56 /// @param tokenId ID of the token.57 /// @param key Property key.58 /// @return Property value bytes59 /// @dev EVM selector for this function is: 0x7228c327,60 /// or in textual repr: property(uint256,string)61 function property(uint256 tokenId, string memory key) external view returns (bytes memory);62}6364/// @title A contract that allows you to work with collections.65/// @dev the ERC-165 identifier for this interface is 0xb3152af366interface Collection is Dummy, ERC165 {67 /// Set collection property.68 ///69 /// @param key Property key.70 /// @param value Propery value.71 /// @dev EVM selector for this function is: 0x2f073f66,72 /// or in textual repr: setCollectionProperty(string,bytes)73 function setCollectionProperty(string memory key, bytes memory value) external;7475 /// Set collection properties.76 ///77 /// @param properties Vector of properties key/value pair.78 /// @dev EVM selector for this function is: 0x50b26b2a,79 /// or in textual repr: setCollectionProperties((string,bytes)[])80 function setCollectionProperties(Tuple19[] memory properties) external;8182 /// Delete collection property.83 ///84 /// @param key Property key.85 /// @dev EVM selector for this function is: 0x7b7debce,86 /// or in textual repr: deleteCollectionProperty(string)87 function deleteCollectionProperty(string memory key) external;8889 /// Delete collection properties.90 ///91 /// @param keys Properties keys.92 /// @dev EVM selector for this function is: 0xee206ee3,93 /// or in textual repr: deleteCollectionProperties(string[])94 function deleteCollectionProperties(string[] memory keys) external;9596 /// Get collection property.97 ///98 /// @dev Throws error if key not found.99 ///100 /// @param key Property key.101 /// @return bytes The property corresponding to the key.102 /// @dev EVM selector for this function is: 0xcf24fd6d,103 /// or in textual repr: collectionProperty(string)104 function collectionProperty(string memory key) external view returns (bytes memory);105106 /// Get collection properties.107 ///108 /// @param keys Properties keys. Empty keys for all propertyes.109 /// @return Vector of properties key/value pairs.110 /// @dev EVM selector for this function is: 0x285fb8e6,111 /// or in textual repr: collectionProperties(string[])112 function collectionProperties(string[] memory keys) external view returns (Tuple19[] memory);113114 /// Set the sponsor of the collection.115 ///116 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.117 ///118 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.119 /// @dev EVM selector for this function is: 0x7623402e,120 /// or in textual repr: setCollectionSponsor(address)121 function setCollectionSponsor(address sponsor) external;122123 /// Set the sponsor of the collection.124 ///125 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.126 ///127 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.128 /// @dev EVM selector for this function is: 0x84a1d5a8,129 /// or in textual repr: setCollectionSponsorCross((address,uint256))130 function setCollectionSponsorCross(Tuple6 memory sponsor) external;131132 /// Whether there is a pending sponsor.133 /// @dev EVM selector for this function is: 0x058ac185,134 /// or in textual repr: hasCollectionPendingSponsor()135 function hasCollectionPendingSponsor() external view returns (bool);136137 /// Collection sponsorship confirmation.138 ///139 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.140 /// @dev EVM selector for this function is: 0x3c50e97a,141 /// or in textual repr: confirmCollectionSponsorship()142 function confirmCollectionSponsorship() external;143144 /// Remove collection sponsor.145 /// @dev EVM selector for this function is: 0x6e0326a3,146 /// or in textual repr: removeCollectionSponsor()147 function removeCollectionSponsor() external;148149 /// Get current sponsor.150 ///151 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.152 /// @dev EVM selector for this function is: 0x6ec0a9f1,153 /// or in textual repr: collectionSponsor()154 function collectionSponsor() external view returns (Tuple6 memory);155156 /// Set limits for the collection.157 /// @dev Throws error if limit not found.158 /// @param limit Name of the limit. Valid names:159 /// "accountTokenOwnershipLimit",160 /// "sponsoredDataSize",161 /// "sponsoredDataRateLimit",162 /// "tokenLimit",163 /// "sponsorTransferTimeout",164 /// "sponsorApproveTimeout"165 /// @param value Value of the limit.166 /// @dev EVM selector for this function is: 0x6a3841db,167 /// or in textual repr: setCollectionLimit(string,uint32)168 function setCollectionLimit(string memory limit, uint32 value) external;169170 /// Set limits for the collection.171 /// @dev Throws error if limit not found.172 /// @param limit Name of the limit. Valid names:173 /// "ownerCanTransfer",174 /// "ownerCanDestroy",175 /// "transfersEnabled"176 /// @param value Value of the limit.177 /// @dev EVM selector for this function is: 0x993b7fba,178 /// or in textual repr: setCollectionLimit(string,bool)179 function setCollectionLimit(string memory limit, bool value) external;180181 /// Get contract address.182 /// @dev EVM selector for this function is: 0xf6b4dfb4,183 /// or in textual repr: contractAddress()184 function contractAddress() external view returns (address);185186 /// Add collection admin.187 /// @param newAdmin Cross account administrator address.188 /// @dev EVM selector for this function is: 0x859aa7d6,189 /// or in textual repr: addCollectionAdminCross((address,uint256))190 function addCollectionAdminCross(Tuple6 memory newAdmin) external;191192 /// Remove collection admin.193 /// @param admin Cross account administrator address.194 /// @dev EVM selector for this function is: 0x6c0cd173,195 /// or in textual repr: removeCollectionAdminCross((address,uint256))196 function removeCollectionAdminCross(Tuple6 memory admin) external;197198 /// Add collection admin.199 /// @param newAdmin Address of the added administrator.200 /// @dev EVM selector for this function is: 0x92e462c7,201 /// or in textual repr: addCollectionAdmin(address)202 function addCollectionAdmin(address newAdmin) external;203204 /// Remove collection admin.205 ///206 /// @param admin Address of the removed administrator.207 /// @dev EVM selector for this function is: 0xfafd7b42,208 /// or in textual repr: removeCollectionAdmin(address)209 function removeCollectionAdmin(address admin) external;210211 /// Toggle accessibility of collection nesting.212 ///213 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'214 /// @dev EVM selector for this function is: 0x112d4586,215 /// or in textual repr: setCollectionNesting(bool)216 function setCollectionNesting(bool enable) external;217218 /// Toggle accessibility of collection nesting.219 ///220 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'221 /// @param collections Addresses of collections that will be available for nesting.222 /// @dev EVM selector for this function is: 0x64872396,223 /// or in textual repr: setCollectionNesting(bool,address[])224 function setCollectionNesting(bool enable, address[] memory collections) external;225226 /// Set the collection access method.227 /// @param mode Access mode228 /// 0 for Normal229 /// 1 for AllowList230 /// @dev EVM selector for this function is: 0x41835d4c,231 /// or in textual repr: setCollectionAccess(uint8)232 function setCollectionAccess(uint8 mode) external;233234 /// Checks that user allowed to operate with collection.235 ///236 /// @param user User address to check.237 /// @dev EVM selector for this function is: 0xd63a8e11,238 /// or in textual repr: allowed(address)239 function allowed(address user) external view returns (bool);240241 /// Add the user to the allowed list.242 ///243 /// @param user Address of a trusted user.244 /// @dev EVM selector for this function is: 0x67844fe6,245 /// or in textual repr: addToCollectionAllowList(address)246 function addToCollectionAllowList(address user) external;247248 /// Add user to allowed list.249 ///250 /// @param user User cross account address.251 /// @dev EVM selector for this function is: 0xa0184a3a,252 /// or in textual repr: addToCollectionAllowListCross((address,uint256))253 function addToCollectionAllowListCross(Tuple6 memory user) external;254255 /// Remove the user from the allowed list.256 ///257 /// @param user Address of a removed user.258 /// @dev EVM selector for this function is: 0x85c51acb,259 /// or in textual repr: removeFromCollectionAllowList(address)260 function removeFromCollectionAllowList(address user) external;261262 /// Remove user from allowed list.263 ///264 /// @param user User cross account address.265 /// @dev EVM selector for this function is: 0x09ba452a,266 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))267 function removeFromCollectionAllowListCross(Tuple6 memory user) external;268269 /// Switch permission for minting.270 ///271 /// @param mode Enable if "true".272 /// @dev EVM selector for this function is: 0x00018e84,273 /// or in textual repr: setCollectionMintMode(bool)274 function setCollectionMintMode(bool mode) external;275276 /// Check that account is the owner or admin of the collection277 ///278 /// @param user account to verify279 /// @return "true" if account is the owner or admin280 /// @dev EVM selector for this function is: 0x9811b0c7,281 /// or in textual repr: isOwnerOrAdmin(address)282 function isOwnerOrAdmin(address user) external view returns (bool);283284 /// Check that account is the owner or admin of the collection285 ///286 /// @param user User cross account to verify287 /// @return "true" if account is the owner or admin288 /// @dev EVM selector for this function is: 0x3e75a905,289 /// or in textual repr: isOwnerOrAdminCross((address,uint256))290 function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool);291292 /// Returns collection type293 ///294 /// @return `Fungible` or `NFT` or `ReFungible`295 /// @dev EVM selector for this function is: 0xd34b55b8,296 /// or in textual repr: uniqueCollectionType()297 function uniqueCollectionType() external view returns (string memory);298299 /// Get collection owner.300 ///301 /// @return Tuble with sponsor address and his substrate mirror.302 /// If address is canonical then substrate mirror is zero and vice versa.303 /// @dev EVM selector for this function is: 0xdf727d3b,304 /// or in textual repr: collectionOwner()305 function collectionOwner() external view returns (Tuple6 memory);306307 /// Changes collection owner to another account308 ///309 /// @dev Owner can be changed only by current owner310 /// @param newOwner new owner account311 /// @dev EVM selector for this function is: 0x4f53e226,312 /// or in textual repr: changeCollectionOwner(address)313 function changeCollectionOwner(address newOwner) external;314315 /// Get collection administrators316 ///317 /// @return Vector of tuples with admins address and his substrate mirror.318 /// If address is canonical then substrate mirror is zero and vice versa.319 /// @dev EVM selector for this function is: 0x5813216b,320 /// or in textual repr: collectionAdmins()321 function collectionAdmins() external view returns (Tuple6[] memory);322323 /// Changes collection owner to another account324 ///325 /// @dev Owner can be changed only by current owner326 /// @param newOwner new owner cross account327 /// @dev EVM selector for this function is: 0xe5c9913f,328 /// or in textual repr: setOwnerCross((address,uint256))329 function setOwnerCross(Tuple6 memory newOwner) external;330}331332/// @dev anonymous struct333struct Tuple19 {334 string field_0;335 bytes field_1;336}337338/// @dev the ERC-165 identifier for this interface is 0x5b5e139f339interface ERC721Metadata is Dummy, ERC165 {340 // /// @notice A descriptive name for a collection of NFTs in this contract341 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`342 // /// @dev EVM selector for this function is: 0x06fdde03,343 // /// or in textual repr: name()344 // function name() external view returns (string memory);345346 // /// @notice An abbreviated name for NFTs in this contract347 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`348 // /// @dev EVM selector for this function is: 0x95d89b41,349 // /// or in textual repr: symbol()350 // function symbol() external view returns (string memory);351352 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.353 ///354 /// @dev If the token has a `url` property and it is not empty, it is returned.355 /// 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`.356 /// If the collection property `baseURI` is empty or absent, return "" (empty string)357 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix358 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).359 ///360 /// @return token's const_metadata361 /// @dev EVM selector for this function is: 0xc87b56dd,362 /// or in textual repr: tokenURI(uint256)363 function tokenURI(uint256 tokenId) external view returns (string memory);364}365366/// @title ERC721 Token that can be irreversibly burned (destroyed).367/// @dev the ERC-165 identifier for this interface is 0x42966c68368interface ERC721Burnable is Dummy, ERC165 {369 /// @notice Burns a specific ERC721 token.370 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized371 /// operator of the current owner.372 /// @param tokenId The RFT to approve373 /// @dev EVM selector for this function is: 0x42966c68,374 /// or in textual repr: burn(uint256)375 function burn(uint256 tokenId) external;376}377378/// @dev inlined interface379interface ERC721UniqueMintableEvents {380 event MintingFinished();381}382383/// @title ERC721 minting logic.384/// @dev the ERC-165 identifier for this interface is 0x476ff149385interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {386 /// @dev EVM selector for this function is: 0x05d2035b,387 /// or in textual repr: mintingFinished()388 function mintingFinished() external view returns (bool);389390 /// @notice Function to mint token.391 /// @param to The new owner392 /// @return uint256 The id of the newly minted token393 /// @dev EVM selector for this function is: 0x6a627842,394 /// or in textual repr: mint(address)395 function mint(address to) external returns (uint256);396397 // /// @notice Function to mint token.398 // /// @dev `tokenId` should be obtained with `nextTokenId` method,399 // /// unlike standard, you can't specify it manually400 // /// @param to The new owner401 // /// @param tokenId ID of the minted RFT402 // /// @dev EVM selector for this function is: 0x40c10f19,403 // /// or in textual repr: mint(address,uint256)404 // function mint(address to, uint256 tokenId) external returns (bool);405406 /// @notice Function to mint token with the given tokenUri.407 /// @param to The new owner408 /// @param tokenUri Token URI that would be stored in the NFT properties409 /// @return uint256 The id of the newly minted token410 /// @dev EVM selector for this function is: 0x45c17782,411 /// or in textual repr: mintWithTokenURI(address,string)412 function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);413414 // /// @notice Function to mint token with the given tokenUri.415 // /// @dev `tokenId` should be obtained with `nextTokenId` method,416 // /// unlike standard, you can't specify it manually417 // /// @param to The new owner418 // /// @param tokenId ID of the minted RFT419 // /// @param tokenUri Token URI that would be stored in the RFT properties420 // /// @dev EVM selector for this function is: 0x50bb4e7f,421 // /// or in textual repr: mintWithTokenURI(address,uint256,string)422 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);423424 /// @dev Not implemented425 /// @dev EVM selector for this function is: 0x7d64bcb4,426 /// or in textual repr: finishMinting()427 function finishMinting() external returns (bool);428}429430/// @title Unique extensions for ERC721.431/// @dev the ERC-165 identifier for this interface is 0x81feb398432interface ERC721UniqueExtensions is Dummy, ERC165 {433 /// @notice A descriptive name for a collection of NFTs in this contract434 /// @dev EVM selector for this function is: 0x06fdde03,435 /// or in textual repr: name()436 function name() external view returns (string memory);437438 /// @notice An abbreviated name for NFTs in this contract439 /// @dev EVM selector for this function is: 0x95d89b41,440 /// or in textual repr: symbol()441 function symbol() external view returns (string memory);442443 /// @notice Transfer ownership of an RFT444 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`445 /// is the zero address. Throws if `tokenId` is not a valid RFT.446 /// Throws if RFT pieces have multiple owners.447 /// @param to The new owner448 /// @param tokenId The RFT to transfer449 /// @dev EVM selector for this function is: 0xa9059cbb,450 /// or in textual repr: transfer(address,uint256)451 function transfer(address to, uint256 tokenId) external;452453 /// @notice Transfer ownership of an RFT454 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`455 /// is the zero address. Throws if `tokenId` is not a valid RFT.456 /// Throws if RFT pieces have multiple owners.457 /// @param to The new owner458 /// @param tokenId The RFT to transfer459 /// @dev EVM selector for this function is: 0xd5cf430b,460 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)461 function transferFromCross(462 Tuple6 memory from,463 Tuple6 memory to,464 uint256 tokenId465 ) external;466467 /// @notice Burns a specific ERC721 token.468 /// @dev Throws unless `msg.sender` is the current owner or an authorized469 /// operator for this RFT. Throws if `from` is not the current owner. Throws470 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.471 /// Throws if RFT pieces have multiple owners.472 /// @param from The current owner of the RFT473 /// @param tokenId The RFT to transfer474 /// @dev EVM selector for this function is: 0x79cc6790,475 /// or in textual repr: burnFrom(address,uint256)476 function burnFrom(address from, uint256 tokenId) external;477478 /// @notice Burns a specific ERC721 token.479 /// @dev Throws unless `msg.sender` is the current owner or an authorized480 /// operator for this RFT. Throws if `from` is not the current owner. Throws481 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.482 /// Throws if RFT pieces have multiple owners.483 /// @param from The current owner of the RFT484 /// @param tokenId The RFT to transfer485 /// @dev EVM selector for this function is: 0xbb2f5a58,486 /// or in textual repr: burnFromCross((address,uint256),uint256)487 function burnFromCross(Tuple6 memory from, uint256 tokenId) external;488489 /// @notice Returns next free RFT ID.490 /// @dev EVM selector for this function is: 0x75794a3c,491 /// or in textual repr: nextTokenId()492 function nextTokenId() external view returns (uint256);493494 // /// @notice Function to mint multiple tokens.495 // /// @dev `tokenIds` should be an array of consecutive numbers and first number496 // /// should be obtained with `nextTokenId` method497 // /// @param to The new owner498 // /// @param tokenIds IDs of the minted RFTs499 // /// @dev EVM selector for this function is: 0x44a9945e,500 // /// or in textual repr: mintBulk(address,uint256[])501 // function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);502503 // /// @notice Function to mint multiple tokens with the given tokenUris.504 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive505 // /// numbers and first number should be obtained with `nextTokenId` method506 // /// @param to The new owner507 // /// @param tokens array of pairs of token ID and token URI for minted tokens508 // /// @dev EVM selector for this function is: 0x36543006,509 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])510 // function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) external returns (bool);511512 /// Returns EVM address for refungible token513 ///514 /// @param token ID of the token515 /// @dev EVM selector for this function is: 0xab76fac6,516 /// or in textual repr: tokenContractAddress(uint256)517 function tokenContractAddress(uint256 token) external view returns (address);518}519520/// @dev anonymous struct521struct Tuple8 {522 uint256 field_0;523 string field_1;524}525526/// @dev anonymous struct527struct Tuple6 {528 address field_0;529 uint256 field_1;530}531532/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension533/// @dev See https://eips.ethereum.org/EIPS/eip-721534/// @dev the ERC-165 identifier for this interface is 0x780e9d63535interface ERC721Enumerable is Dummy, ERC165 {536 /// @notice Enumerate valid RFTs537 /// @param index A counter less than `totalSupply()`538 /// @return The token identifier for the `index`th NFT,539 /// (sort order not specified)540 /// @dev EVM selector for this function is: 0x4f6ccce7,541 /// or in textual repr: tokenByIndex(uint256)542 function tokenByIndex(uint256 index) external view returns (uint256);543544 /// Not implemented545 /// @dev EVM selector for this function is: 0x2f745c59,546 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)547 function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);548549 /// @notice Count RFTs tracked by this contract550 /// @return A count of valid RFTs tracked by this contract, where each one of551 /// them has an assigned and queryable owner not equal to the zero address552 /// @dev EVM selector for this function is: 0x18160ddd,553 /// or in textual repr: totalSupply()554 function totalSupply() external view returns (uint256);555}556557/// @dev inlined interface558interface ERC721Events {559 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);560 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);561 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);562}563564/// @title ERC-721 Non-Fungible Token Standard565/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md566/// @dev the ERC-165 identifier for this interface is 0x58800161567interface ERC721 is Dummy, ERC165, ERC721Events {568 /// @notice Count all RFTs assigned to an owner569 /// @dev RFTs assigned to the zero address are considered invalid, and this570 /// function throws for queries about the zero address.571 /// @param owner An address for whom to query the balance572 /// @return The number of RFTs owned by `owner`, possibly zero573 /// @dev EVM selector for this function is: 0x70a08231,574 /// or in textual repr: balanceOf(address)575 function balanceOf(address owner) external view returns (uint256);576577 /// @notice Find the owner of an RFT578 /// @dev RFTs assigned to zero address are considered invalid, and queries579 /// about them do throw.580 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for581 /// the tokens that are partially owned.582 /// @param tokenId The identifier for an RFT583 /// @return The address of the owner of the RFT584 /// @dev EVM selector for this function is: 0x6352211e,585 /// or in textual repr: ownerOf(uint256)586 function ownerOf(uint256 tokenId) external view returns (address);587588 /// @dev Not implemented589 /// @dev EVM selector for this function is: 0x60a11672,590 /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)591 function safeTransferFromWithData(592 address from,593 address to,594 uint256 tokenId,595 bytes memory data596 ) external;597598 /// @dev Not implemented599 /// @dev EVM selector for this function is: 0x42842e0e,600 /// or in textual repr: safeTransferFrom(address,address,uint256)601 function safeTransferFrom(602 address from,603 address to,604 uint256 tokenId605 ) external;606607 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE608 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE609 /// THEY MAY BE PERMANENTLY LOST610 /// @dev Throws unless `msg.sender` is the current owner or an authorized611 /// operator for this RFT. Throws if `from` is not the current owner. Throws612 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.613 /// Throws if RFT pieces have multiple owners.614 /// @param from The current owner of the NFT615 /// @param to The new owner616 /// @param tokenId The NFT to transfer617 /// @dev EVM selector for this function is: 0x23b872dd,618 /// or in textual repr: transferFrom(address,address,uint256)619 function transferFrom(620 address from,621 address to,622 uint256 tokenId623 ) external;624625 /// @dev Not implemented626 /// @dev EVM selector for this function is: 0x095ea7b3,627 /// or in textual repr: approve(address,uint256)628 function approve(address approved, uint256 tokenId) external;629630 /// @dev Not implemented631 /// @dev EVM selector for this function is: 0xa22cb465,632 /// or in textual repr: setApprovalForAll(address,bool)633 function setApprovalForAll(address operator, bool approved) external;634635 /// @dev Not implemented636 /// @dev EVM selector for this function is: 0x081812fc,637 /// or in textual repr: getApproved(uint256)638 function getApproved(uint256 tokenId) external view returns (address);639640 /// @dev Not implemented641 /// @dev EVM selector for this function is: 0xe985e9c5,642 /// or in textual repr: isApprovedForAll(address,address)643 function isApprovedForAll(address owner, address operator) external view returns (address);644}645646interface UniqueRefungible is647 Dummy,648 ERC165,649 ERC721,650 ERC721Enumerable,651 ERC721UniqueExtensions,652 ERC721UniqueMintable,653 ERC721Burnable,654 ERC721Metadata,655 Collection,656 TokenProperties657{}tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -677,6 +677,24 @@
{
"inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" },
+ {
+ "components": [
+ { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ ],
+ "internalType": "struct Tuple19[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "setProperties",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
{ "internalType": "string", "name": "key", "type": "string" },
{ "internalType": "bytes", "name": "value", "type": "bytes" }
],
tests/src/eth/reFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -659,6 +659,24 @@
{
"inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" },
+ {
+ "components": [
+ { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ ],
+ "internalType": "struct Tuple19[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "setProperties",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
{ "internalType": "string", "name": "key", "type": "string" },
{ "internalType": "bytes", "name": "value", "type": "bytes" }
],
tests/src/eth/tokenProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/tokenProperties.test.ts
+++ b/tests/src/eth/tokenProperties.test.ts
@@ -16,6 +16,7 @@
import {itEth, usingEthPlaygrounds, expect} from './util';
import {IKeyringPair} from '@polkadot/types/types';
+import {ITokenPropertyPermission} from '../util/playgrounds/types';
describe('EVM token properties', () => {
let donor: IKeyringPair;
@@ -68,6 +69,64 @@
const [{value}] = await token.getProperties(['testKey']);
expect(value).to.equal('testValue');
});
+
+ itEth('Can be multiple set for NFT ', async({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+
+ const properties = Array(5).fill(0).map((_, i) => { return {field_0: `key_${i}`, field_1: Buffer.from(`value_${i}`)}; });
+ const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.field_0, permission: {tokenOwner: true,
+ collectionAdmin: true,
+ mutable: true}}; });
+
+ const collection = await helper.nft.mintCollection(alice, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+
+ const token = await collection.mintToken(alice);
+
+ const valuesBefore = await token.getProperties(properties.map(p => p.field_0));
+ expect(valuesBefore).to.be.deep.equal([]);
+
+ await collection.addAdmin(alice, {Ethereum: caller});
+
+ const address = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(address, 'nft', caller);
+
+ await contract.methods.setProperties(token.tokenId, properties).send({from: caller});
+
+ const values = await token.getProperties(properties.map(p => p.field_0));
+ expect(values).to.be.deep.equal(properties.map(p => { return {key: p.field_0, value: p.field_1.toString()}; }));
+ });
+
+ itEth('Can be multiple set for RFT ', async({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+
+ const properties = Array(5).fill(0).map((_, i) => { return {field_0: `key_${i}`, field_1: Buffer.from(`value_${i}`)}; });
+ const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.field_0, permission: {tokenOwner: true,
+ collectionAdmin: true,
+ mutable: true}}; });
+
+ const collection = await helper.rft.mintCollection(alice, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+
+ const token = await collection.mintToken(alice);
+
+ const valuesBefore = await token.getProperties(properties.map(p => p.field_0));
+ expect(valuesBefore).to.be.deep.equal([]);
+
+ await collection.addAdmin(alice, {Ethereum: caller});
+
+ const address = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(address, 'rft', caller);
+
+ await contract.methods.setProperties(token.tokenId, properties).send({from: caller});
+
+ const values = await token.getProperties(properties.map(p => p.field_0));
+ expect(values).to.be.deep.equal(properties.map(p => { return {key: p.field_0, value: p.field_1.toString()}; }));
+ });
itEth('Can be deleted', async({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);