difftreelog
feat add eth methots for bulk properties
in: master
14 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -27,7 +27,7 @@
use sp_std::vec::Vec;
use up_data_structs::{
AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,
- SponsoringRateLimit, SponsorshipState,
+ SponsoringRateLimit, SponsorshipState, PropertyKey,
};
use alloc::format;
@@ -97,6 +97,21 @@
.map_err(dispatch_to_evm::<T>)
}
+ /// Set collection properties.
+ ///
+ /// @param properties Vector of properties key/value pair.
+ #[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]
+ fn set_collection_properties(
+ &mut self,
+ caller: caller,
+ properties: Vec<(string, bytes)>,
+ ) -> Result<void> {
+ for (key, value) in properties.into_iter() {
+ self.set_collection_property(caller, key, value)?;
+ }
+ Ok(())
+ }
+
/// Delete collection property.
///
/// @param key Property key.
@@ -123,12 +138,38 @@
.try_into()
.map_err(|_| "key too large")?;
- let props = <CollectionProperties<T>>::get(self.id);
+ let props = CollectionProperties::<T>::get(self.id);
let prop = props.get(&key).ok_or("key not found")?;
Ok(bytes(prop.to_vec()))
}
+ /// Get collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @return Vector of properties key/value pairs.
+ fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<(string, bytes)>> {
+ let mut keys_ = Vec::<PropertyKey>::with_capacity(keys.len());
+ for key in keys {
+ keys_.push(
+ <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| Error::Revert("key too large".into()))?,
+ )
+ }
+ let properties = Pallet::<T>::filter_collection_properties(self.id, Some(keys_))
+ .map_err(dispatch_to_evm::<T>)?;
+
+ let mut properties_ = Vec::<(string, bytes)>::with_capacity(properties.len());
+ for p in properties {
+ let key =
+ string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;
+ let value = bytes(p.value.to_vec());
+ properties_.push((key, value));
+ }
+ Ok(properties_)
+ }
+
/// Set the sponsor of the collection.
///
/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
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 0x25d897dc
+/// @dev the ERC-165 identifier for this interface is 0x5d354410
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -33,6 +33,17 @@
dummy = 0;
}
+ /// Set collection properties.
+ ///
+ /// @param properties Vector of properties key/value pair.
+ /// @dev EVM selector for this function is: 0x50b26b2a,
+ /// or in textual repr: setCollectionProperties((string,bytes)[])
+ function setCollectionProperties(Tuple10[] memory properties) public {
+ require(false, stub_error);
+ properties;
+ dummy = 0;
+ }
+
/// Delete collection property.
///
/// @param key Property key.
@@ -59,6 +70,19 @@
return hex"";
}
+ /// Get collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @return Vector of properties key/value pairs.
+ /// @dev EVM selector for this function is: 0x285fb8e6,
+ /// or in textual repr: collectionProperties(string[])
+ function collectionProperties(string[] memory keys) public view returns (Tuple10[] memory) {
+ require(false, stub_error);
+ keys;
+ dummy;
+ return new Tuple10[](0);
+ }
+
/// Set the sponsor of the collection.
///
/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
@@ -397,6 +421,12 @@
}
}
+/// @dev anonymous struct
+struct Tuple10 {
+ string field_0;
+ bytes field_1;
+}
+
/// @dev the ERC-165 identifier for this interface is 0x032e5926
contract ERC20UniqueExtensions is Dummy, ERC165 {
/// @dev EVM selector for this function is: 0x0ecd0ab0,
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
@@ -91,7 +91,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x25d897dc
+/// @dev the ERC-165 identifier for this interface is 0x5d354410
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -106,6 +106,17 @@
dummy = 0;
}
+ /// Set collection properties.
+ ///
+ /// @param properties Vector of properties key/value pair.
+ /// @dev EVM selector for this function is: 0x50b26b2a,
+ /// or in textual repr: setCollectionProperties((string,bytes)[])
+ function setCollectionProperties(Tuple19[] memory properties) public {
+ require(false, stub_error);
+ properties;
+ dummy = 0;
+ }
+
/// Delete collection property.
///
/// @param key Property key.
@@ -132,6 +143,19 @@
return hex"";
}
+ /// Get collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @return Vector of properties key/value pairs.
+ /// @dev EVM selector for this function is: 0x285fb8e6,
+ /// or in textual repr: collectionProperties(string[])
+ function collectionProperties(string[] memory keys) public view returns (Tuple19[] memory) {
+ require(false, stub_error);
+ keys;
+ dummy;
+ return new Tuple19[](0);
+ }
+
/// Set the sponsor of the collection.
///
/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
@@ -470,6 +494,12 @@
}
}
+/// @dev anonymous struct
+struct Tuple19 {
+ string field_0;
+ bytes field_1;
+}
+
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
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
@@ -91,7 +91,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x25d897dc
+/// @dev the ERC-165 identifier for this interface is 0x5d354410
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -106,6 +106,17 @@
dummy = 0;
}
+ /// Set collection properties.
+ ///
+ /// @param properties Vector of properties key/value pair.
+ /// @dev EVM selector for this function is: 0x50b26b2a,
+ /// or in textual repr: setCollectionProperties((string,bytes)[])
+ function setCollectionProperties(Tuple19[] memory properties) public {
+ require(false, stub_error);
+ properties;
+ dummy = 0;
+ }
+
/// Delete collection property.
///
/// @param key Property key.
@@ -132,6 +143,19 @@
return hex"";
}
+ /// Get collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @return Vector of properties key/value pairs.
+ /// @dev EVM selector for this function is: 0x285fb8e6,
+ /// or in textual repr: collectionProperties(string[])
+ function collectionProperties(string[] memory keys) public view returns (Tuple19[] memory) {
+ require(false, stub_error);
+ keys;
+ dummy;
+ return new Tuple19[](0);
+ }
+
/// Set the sponsor of the collection.
///
/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
@@ -470,6 +494,12 @@
}
}
+/// @dev anonymous struct
+struct Tuple19 {
+ string field_0;
+ bytes field_1;
+}
+
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
contract ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
tests/src/eth/api/UniqueFungible.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 you to work with collections.16/// @dev the ERC-165 identifier for this interface is 0x25d897dc17interface Collection is Dummy, ERC165 {18 /// Set collection property.19 ///20 /// @param key Property key.21 /// @param value Propery value.22 /// @dev EVM selector for this function is: 0x2f073f66,23 /// or in textual repr: setCollectionProperty(string,bytes)24 function setCollectionProperty(string memory key, bytes memory value) external;2526 /// Delete collection property.27 ///28 /// @param key Property key.29 /// @dev EVM selector for this function is: 0x7b7debce,30 /// or in textual repr: deleteCollectionProperty(string)31 function deleteCollectionProperty(string memory key) external;3233 /// Get collection property.34 ///35 /// @dev Throws error if key not found.36 ///37 /// @param key Property key.38 /// @return bytes The property corresponding to the key.39 /// @dev EVM selector for this function is: 0xcf24fd6d,40 /// or in textual repr: collectionProperty(string)41 function collectionProperty(string memory key) external view returns (bytes memory);4243 /// Set the sponsor of the collection.44 ///45 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.46 ///47 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.48 /// @dev EVM selector for this function is: 0x7623402e,49 /// or in textual repr: setCollectionSponsor(address)50 function setCollectionSponsor(address sponsor) external;5152 /// Set the sponsor of the collection.53 ///54 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.55 ///56 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.57 /// @dev EVM selector for this function is: 0x84a1d5a8,58 /// or in textual repr: setCollectionSponsorCross((address,uint256))59 function setCollectionSponsorCross(Tuple6 memory sponsor) external;6061 /// Whether there is a pending sponsor.62 /// @dev EVM selector for this function is: 0x058ac185,63 /// or in textual repr: hasCollectionPendingSponsor()64 function hasCollectionPendingSponsor() external view returns (bool);6566 /// Collection sponsorship confirmation.67 ///68 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.69 /// @dev EVM selector for this function is: 0x3c50e97a,70 /// or in textual repr: confirmCollectionSponsorship()71 function confirmCollectionSponsorship() external;7273 /// Remove collection sponsor.74 /// @dev EVM selector for this function is: 0x6e0326a3,75 /// or in textual repr: removeCollectionSponsor()76 function removeCollectionSponsor() external;7778 /// Get current sponsor.79 ///80 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.81 /// @dev EVM selector for this function is: 0x6ec0a9f1,82 /// or in textual repr: collectionSponsor()83 function collectionSponsor() external view returns (Tuple6 memory);8485 /// Set limits for the collection.86 /// @dev Throws error if limit not found.87 /// @param limit Name of the limit. Valid names:88 /// "accountTokenOwnershipLimit",89 /// "sponsoredDataSize",90 /// "sponsoredDataRateLimit",91 /// "tokenLimit",92 /// "sponsorTransferTimeout",93 /// "sponsorApproveTimeout"94 /// @param value Value of the limit.95 /// @dev EVM selector for this function is: 0x6a3841db,96 /// or in textual repr: setCollectionLimit(string,uint32)97 function setCollectionLimit(string memory limit, uint32 value) external;9899 /// Set limits for the collection.100 /// @dev Throws error if limit not found.101 /// @param limit Name of the limit. Valid names:102 /// "ownerCanTransfer",103 /// "ownerCanDestroy",104 /// "transfersEnabled"105 /// @param value Value of the limit.106 /// @dev EVM selector for this function is: 0x993b7fba,107 /// or in textual repr: setCollectionLimit(string,bool)108 function setCollectionLimit(string memory limit, bool value) external;109110 /// Get contract address.111 /// @dev EVM selector for this function is: 0xf6b4dfb4,112 /// or in textual repr: contractAddress()113 function contractAddress() external view returns (address);114115 /// Add collection admin.116 /// @param newAdmin Cross account administrator address.117 /// @dev EVM selector for this function is: 0x859aa7d6,118 /// or in textual repr: addCollectionAdminCross((address,uint256))119 function addCollectionAdminCross(Tuple6 memory newAdmin) external;120121 /// Remove collection admin.122 /// @param admin Cross account administrator address.123 /// @dev EVM selector for this function is: 0x6c0cd173,124 /// or in textual repr: removeCollectionAdminCross((address,uint256))125 function removeCollectionAdminCross(Tuple6 memory admin) external;126127 /// Add collection admin.128 /// @param newAdmin Address of the added administrator.129 /// @dev EVM selector for this function is: 0x92e462c7,130 /// or in textual repr: addCollectionAdmin(address)131 function addCollectionAdmin(address newAdmin) external;132133 /// Remove collection admin.134 ///135 /// @param admin Address of the removed administrator.136 /// @dev EVM selector for this function is: 0xfafd7b42,137 /// or in textual repr: removeCollectionAdmin(address)138 function removeCollectionAdmin(address admin) external;139140 /// Toggle accessibility of collection nesting.141 ///142 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'143 /// @dev EVM selector for this function is: 0x112d4586,144 /// or in textual repr: setCollectionNesting(bool)145 function setCollectionNesting(bool enable) external;146147 /// Toggle accessibility of collection nesting.148 ///149 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'150 /// @param collections Addresses of collections that will be available for nesting.151 /// @dev EVM selector for this function is: 0x64872396,152 /// or in textual repr: setCollectionNesting(bool,address[])153 function setCollectionNesting(bool enable, address[] memory collections) external;154155 /// Set the collection access method.156 /// @param mode Access mode157 /// 0 for Normal158 /// 1 for AllowList159 /// @dev EVM selector for this function is: 0x41835d4c,160 /// or in textual repr: setCollectionAccess(uint8)161 function setCollectionAccess(uint8 mode) external;162163 /// Checks that user allowed to operate with collection.164 ///165 /// @param user User address to check.166 /// @dev EVM selector for this function is: 0xd63a8e11,167 /// or in textual repr: allowed(address)168 function allowed(address user) external view returns (bool);169170 /// Add the user to the allowed list.171 ///172 /// @param user Address of a trusted user.173 /// @dev EVM selector for this function is: 0x67844fe6,174 /// or in textual repr: addToCollectionAllowList(address)175 function addToCollectionAllowList(address user) external;176177 /// Add user to allowed list.178 ///179 /// @param user User cross account address.180 /// @dev EVM selector for this function is: 0xa0184a3a,181 /// or in textual repr: addToCollectionAllowListCross((address,uint256))182 function addToCollectionAllowListCross(Tuple6 memory user) external;183184 /// Remove the user from the allowed list.185 ///186 /// @param user Address of a removed user.187 /// @dev EVM selector for this function is: 0x85c51acb,188 /// or in textual repr: removeFromCollectionAllowList(address)189 function removeFromCollectionAllowList(address user) external;190191 /// Remove user from allowed list.192 ///193 /// @param user User cross account address.194 /// @dev EVM selector for this function is: 0x09ba452a,195 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))196 function removeFromCollectionAllowListCross(Tuple6 memory user) external;197198 /// Switch permission for minting.199 ///200 /// @param mode Enable if "true".201 /// @dev EVM selector for this function is: 0x00018e84,202 /// or in textual repr: setCollectionMintMode(bool)203 function setCollectionMintMode(bool mode) external;204205 /// Check that account is the owner or admin of the collection206 ///207 /// @param user account to verify208 /// @return "true" if account is the owner or admin209 /// @dev EVM selector for this function is: 0x9811b0c7,210 /// or in textual repr: isOwnerOrAdmin(address)211 function isOwnerOrAdmin(address user) external view returns (bool);212213 /// Check that account is the owner or admin of the collection214 ///215 /// @param user User cross account to verify216 /// @return "true" if account is the owner or admin217 /// @dev EVM selector for this function is: 0x3e75a905,218 /// or in textual repr: isOwnerOrAdminCross((address,uint256))219 function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool);220221 /// Returns collection type222 ///223 /// @return `Fungible` or `NFT` or `ReFungible`224 /// @dev EVM selector for this function is: 0xd34b55b8,225 /// or in textual repr: uniqueCollectionType()226 function uniqueCollectionType() external view returns (string memory);227228 /// Get collection owner.229 ///230 /// @return Tuble with sponsor address and his substrate mirror.231 /// If address is canonical then substrate mirror is zero and vice versa.232 /// @dev EVM selector for this function is: 0xdf727d3b,233 /// or in textual repr: collectionOwner()234 function collectionOwner() external view returns (Tuple6 memory);235236 /// Changes collection owner to another account237 ///238 /// @dev Owner can be changed only by current owner239 /// @param newOwner new owner account240 /// @dev EVM selector for this function is: 0x4f53e226,241 /// or in textual repr: changeCollectionOwner(address)242 function changeCollectionOwner(address newOwner) external;243244 /// Get collection administrators245 ///246 /// @return Vector of tuples with admins address and his substrate mirror.247 /// If address is canonical then substrate mirror is zero and vice versa.248 /// @dev EVM selector for this function is: 0x5813216b,249 /// or in textual repr: collectionAdmins()250 function collectionAdmins() external view returns (Tuple6[] memory);251252 /// Changes collection owner to another account253 ///254 /// @dev Owner can be changed only by current owner255 /// @param newOwner new owner cross account256 /// @dev EVM selector for this function is: 0xe5c9913f,257 /// or in textual repr: setOwnerCross((address,uint256))258 function setOwnerCross(Tuple6 memory newOwner) external;259}260261/// @dev the ERC-165 identifier for this interface is 0x032e5926262interface ERC20UniqueExtensions is Dummy, ERC165 {263 /// @dev EVM selector for this function is: 0x0ecd0ab0,264 /// or in textual repr: approveCross((address,uint256),uint256)265 function approveCross(Tuple6 memory spender, uint256 amount) external returns (bool);266267 /// Burn tokens from account268 /// @dev Function that burns an `amount` of the tokens of a given account,269 /// deducting from the sender's allowance for said account.270 /// @param from The account whose tokens will be burnt.271 /// @param amount The amount that will be burnt.272 /// @dev EVM selector for this function is: 0x79cc6790,273 /// or in textual repr: burnFrom(address,uint256)274 function burnFrom(address from, uint256 amount) external returns (bool);275276 /// Burn tokens from account277 /// @dev Function that burns an `amount` of the tokens of a given account,278 /// deducting from the sender's allowance for said account.279 /// @param from The account whose tokens will be burnt.280 /// @param amount The amount that will be burnt.281 /// @dev EVM selector for this function is: 0xbb2f5a58,282 /// or in textual repr: burnFromCross((address,uint256),uint256)283 function burnFromCross(Tuple6 memory from, uint256 amount) external returns (bool);284285 /// Mint tokens for multiple accounts.286 /// @param amounts array of pairs of account address and amount287 /// @dev EVM selector for this function is: 0x1acf2d55,288 /// or in textual repr: mintBulk((address,uint256)[])289 function mintBulk(Tuple6[] memory amounts) external returns (bool);290291 /// @dev EVM selector for this function is: 0xd5cf430b,292 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)293 function transferFromCross(294 Tuple6 memory from,295 Tuple6 memory to,296 uint256 amount297 ) external returns (bool);298}299300/// @dev anonymous struct301struct Tuple6 {302 address field_0;303 uint256 field_1;304}305306/// @dev the ERC-165 identifier for this interface is 0x40c10f19307interface ERC20Mintable is Dummy, ERC165 {308 /// Mint tokens for `to` account.309 /// @param to account that will receive minted tokens310 /// @param amount amount of tokens to mint311 /// @dev EVM selector for this function is: 0x40c10f19,312 /// or in textual repr: mint(address,uint256)313 function mint(address to, uint256 amount) external returns (bool);314}315316/// @dev inlined interface317interface ERC20Events {318 event Transfer(address indexed from, address indexed to, uint256 value);319 event Approval(address indexed owner, address indexed spender, uint256 value);320}321322/// @dev the ERC-165 identifier for this interface is 0x942e8b22323interface ERC20 is Dummy, ERC165, ERC20Events {324 /// @dev EVM selector for this function is: 0x06fdde03,325 /// or in textual repr: name()326 function name() external view returns (string memory);327328 /// @dev EVM selector for this function is: 0x95d89b41,329 /// or in textual repr: symbol()330 function symbol() external view returns (string memory);331332 /// @dev EVM selector for this function is: 0x18160ddd,333 /// or in textual repr: totalSupply()334 function totalSupply() external view returns (uint256);335336 /// @dev EVM selector for this function is: 0x313ce567,337 /// or in textual repr: decimals()338 function decimals() external view returns (uint8);339340 /// @dev EVM selector for this function is: 0x70a08231,341 /// or in textual repr: balanceOf(address)342 function balanceOf(address owner) external view returns (uint256);343344 /// @dev EVM selector for this function is: 0xa9059cbb,345 /// or in textual repr: transfer(address,uint256)346 function transfer(address to, uint256 amount) external returns (bool);347348 /// @dev EVM selector for this function is: 0x23b872dd,349 /// or in textual repr: transferFrom(address,address,uint256)350 function transferFrom(351 address from,352 address to,353 uint256 amount354 ) external returns (bool);355356 /// @dev EVM selector for this function is: 0x095ea7b3,357 /// or in textual repr: approve(address,uint256)358 function approve(address spender, uint256 amount) external returns (bool);359360 /// @dev EVM selector for this function is: 0xdd62ed3e,361 /// or in textual repr: allowance(address,address)362 function allowance(address owner, address spender) external view returns (uint256);363}364365interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -62,7 +62,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x25d897dc
+/// @dev the ERC-165 identifier for this interface is 0x5d354410
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -72,6 +72,13 @@
/// or in textual repr: setCollectionProperty(string,bytes)
function setCollectionProperty(string memory key, bytes memory value) external;
+ /// Set collection properties.
+ ///
+ /// @param properties Vector of properties key/value pair.
+ /// @dev EVM selector for this function is: 0x50b26b2a,
+ /// or in textual repr: setCollectionProperties((string,bytes)[])
+ function setCollectionProperties(Tuple19[] memory properties) external;
+
/// Delete collection property.
///
/// @param key Property key.
@@ -89,6 +96,14 @@
/// or in textual repr: collectionProperty(string)
function collectionProperty(string memory key) external view returns (bytes memory);
+ /// Get collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @return Vector of properties key/value pairs.
+ /// @dev EVM selector for this function is: 0x285fb8e6,
+ /// or in textual repr: collectionProperties(string[])
+ function collectionProperties(string[] memory keys) external view returns (Tuple19[] memory);
+
/// Set the sponsor of the collection.
///
/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
@@ -307,6 +322,12 @@
function setOwnerCross(Tuple6 memory newOwner) external;
}
+/// @dev anonymous struct
+struct Tuple19 {
+ string field_0;
+ bytes field_1;
+}
+
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -62,7 +62,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x25d897dc
+/// @dev the ERC-165 identifier for this interface is 0x5d354410
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -72,6 +72,13 @@
/// or in textual repr: setCollectionProperty(string,bytes)
function setCollectionProperty(string memory key, bytes memory value) external;
+ /// Set collection properties.
+ ///
+ /// @param properties Vector of properties key/value pair.
+ /// @dev EVM selector for this function is: 0x50b26b2a,
+ /// or in textual repr: setCollectionProperties((string,bytes)[])
+ function setCollectionProperties(Tuple19[] memory properties) external;
+
/// Delete collection property.
///
/// @param key Property key.
@@ -89,6 +96,14 @@
/// or in textual repr: collectionProperty(string)
function collectionProperty(string memory key) external view returns (bytes memory);
+ /// Get collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @return Vector of properties key/value pairs.
+ /// @dev EVM selector for this function is: 0x285fb8e6,
+ /// or in textual repr: collectionProperties(string[])
+ function collectionProperties(string[] memory keys) external view returns (Tuple19[] memory);
+
/// Set the sponsor of the collection.
///
/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
@@ -307,6 +322,12 @@
function setOwnerCross(Tuple6 memory newOwner) external;
}
+/// @dev anonymous struct
+struct Tuple19 {
+ string field_0;
+ bytes field_1;
+}
+
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
interface ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
tests/src/eth/collectionProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -161,3 +161,31 @@
await checkERC721Metadata(helper, 'rft');
});
});
+
+describe('EVM collection property', () => {
+ itEth('Set/read properties', async ({helper, privateKey}) => {
+ const alice = await privateKey('//Alice');
+ const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
+
+ const sender = await helper.eth.createAccountWithBalance(alice, 100n);
+ await collection.addAdmin(alice, {Ethereum: sender});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', sender);
+
+ const key1 = 'key1';
+ const value1 = Buffer.from('value1');
+
+ const key2 = 'key2';
+ const value2 = Buffer.from('value2');
+
+ const writeProperties = [
+ [key1, '0x'+value1.toString('hex')],
+ [key2, '0x'+value2.toString('hex')],
+ ];
+
+ await contract.methods.setCollectionProperties(writeProperties).send();
+ const readProperties = await contract.methods.collectionProperties([key1, key2]).call();
+ expect(readProperties).to.be.like(writeProperties);
+ });
+});
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -229,6 +229,25 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "string[]", "name": "keys", "type": "string[]" }
+ ],
+ "name": "collectionProperties",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ ],
+ "internalType": "struct Tuple10[]",
+ "name": "",
+ "type": "tuple[]"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
"inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
"name": "collectionProperty",
"outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],
@@ -463,6 +482,23 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ ],
+ "internalType": "struct Tuple10[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "setCollectionProperties",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "string", "name": "key", "type": "string" },
{ "internalType": "bytes", "name": "value", "type": "bytes" }
],
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -259,6 +259,25 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "string[]", "name": "keys", "type": "string[]" }
+ ],
+ "name": "collectionProperties",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ ],
+ "internalType": "struct Tuple19[]",
+ "name": "",
+ "type": "tuple[]"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
"inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
"name": "collectionProperty",
"outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],
@@ -578,6 +597,23 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ ],
+ "internalType": "struct Tuple19[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "setCollectionProperties",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "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
@@ -241,6 +241,25 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "string[]", "name": "keys", "type": "string[]" }
+ ],
+ "name": "collectionProperties",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ ],
+ "internalType": "struct Tuple19[]",
+ "name": "",
+ "type": "tuple[]"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
"inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
"name": "collectionProperty",
"outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],
@@ -560,6 +579,23 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "string", "name": "field_0", "type": "string" },
+ { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ ],
+ "internalType": "struct Tuple19[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "setCollectionProperties",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "string", "name": "key", "type": "string" },
{ "internalType": "bytes", "name": "value", "type": "bytes" }
],