difftreelog
feat add delete properties
in: master
17 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -117,8 +117,6 @@
/// @param key Property key.
#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]
fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {
- self.consume_store_reads_and_writes(1, 1)?;
-
let caller = T::CrossAccountId::from_eth(caller);
let key = <Vec<u8>>::from(key)
.try_into()
@@ -127,6 +125,24 @@
<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)
}
+ /// Delete collection properties.
+ ///
+ /// @param keys Properties keys.
+ #[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]
+ fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let keys = keys
+ .into_iter()
+ .map(|key| {
+ <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| Error::Revert("key too large".into()))
+ })
+ .collect::<Result<Vec<_>>>()?;
+
+ <Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)
+ }
+
/// Get collection property.
///
/// @dev Throws error if key not found.
@@ -146,28 +162,34 @@
/// Get collection properties.
///
- /// @param keys Properties keys.
+ /// @param keys Properties keys. Empty keys for all propertyes.
/// @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(
+ let keys = keys
+ .into_iter()
+ .map(|key| {
<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>)?;
+ .map_err(|_| Error::Revert("key too large".into()))
+ })
+ .collect::<Result<Vec<_>>>()?;
- 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_)
+ let properties = Pallet::<T>::filter_collection_properties(
+ self.id,
+ if keys.is_empty() { None } else { Some(keys) },
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ let properties = properties
+ .into_iter()
+ .map(|p| {
+ let key =
+ string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;
+ let value = bytes(p.value.to_vec());
+ Ok((key, value))
+ })
+ .collect::<Result<Vec<_>>>()?;
+ Ok(properties)
}
/// Set the sponsor of the collection.
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.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 you to work with collections.21/// @dev the ERC-165 identifier for this interface is 0x5d35441022contract Collection is Dummy, ERC165 {23 /// Set collection property.24 ///25 /// @param key Property key.26 /// @param value Propery value.27 /// @dev EVM selector for this function is: 0x2f073f66,28 /// or in textual repr: setCollectionProperty(string,bytes)29 function setCollectionProperty(string memory key, bytes memory value) public {30 require(false, stub_error);31 key;32 value;33 dummy = 0;34 }3536 /// Set collection properties.37 ///38 /// @param properties Vector of properties key/value pair.39 /// @dev EVM selector for this function is: 0x50b26b2a,40 /// or in textual repr: setCollectionProperties((string,bytes)[])41 function setCollectionProperties(Tuple10[] memory properties) public {42 require(false, stub_error);43 properties;44 dummy = 0;45 }4647 /// Delete collection property.48 ///49 /// @param key Property key.50 /// @dev EVM selector for this function is: 0x7b7debce,51 /// or in textual repr: deleteCollectionProperty(string)52 function deleteCollectionProperty(string memory key) public {53 require(false, stub_error);54 key;55 dummy = 0;56 }5758 /// Get collection property.59 ///60 /// @dev Throws error if key not found.61 ///62 /// @param key Property key.63 /// @return bytes The property corresponding to the key.64 /// @dev EVM selector for this function is: 0xcf24fd6d,65 /// or in textual repr: collectionProperty(string)66 function collectionProperty(string memory key) public view returns (bytes memory) {67 require(false, stub_error);68 key;69 dummy;70 return hex"";71 }7273 /// Get collection properties.74 ///75 /// @param keys Properties keys.76 /// @return Vector of properties key/value pairs.77 /// @dev EVM selector for this function is: 0x285fb8e6,78 /// or in textual repr: collectionProperties(string[])79 function collectionProperties(string[] memory keys) public view returns (Tuple10[] memory) {80 require(false, stub_error);81 keys;82 dummy;83 return new Tuple10[](0);84 }8586 /// Set the sponsor of the collection.87 ///88 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.89 ///90 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.91 /// @dev EVM selector for this function is: 0x7623402e,92 /// or in textual repr: setCollectionSponsor(address)93 function setCollectionSponsor(address sponsor) public {94 require(false, stub_error);95 sponsor;96 dummy = 0;97 }9899 /// Set the sponsor of the collection.100 ///101 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.102 ///103 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.104 /// @dev EVM selector for this function is: 0x84a1d5a8,105 /// or in textual repr: setCollectionSponsorCross((address,uint256))106 function setCollectionSponsorCross(Tuple6 memory sponsor) public {107 require(false, stub_error);108 sponsor;109 dummy = 0;110 }111112 /// Whether there is a pending sponsor.113 /// @dev EVM selector for this function is: 0x058ac185,114 /// or in textual repr: hasCollectionPendingSponsor()115 function hasCollectionPendingSponsor() public view returns (bool) {116 require(false, stub_error);117 dummy;118 return false;119 }120121 /// Collection sponsorship confirmation.122 ///123 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.124 /// @dev EVM selector for this function is: 0x3c50e97a,125 /// or in textual repr: confirmCollectionSponsorship()126 function confirmCollectionSponsorship() public {127 require(false, stub_error);128 dummy = 0;129 }130131 /// Remove collection sponsor.132 /// @dev EVM selector for this function is: 0x6e0326a3,133 /// or in textual repr: removeCollectionSponsor()134 function removeCollectionSponsor() public {135 require(false, stub_error);136 dummy = 0;137 }138139 /// Get current sponsor.140 ///141 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.142 /// @dev EVM selector for this function is: 0x6ec0a9f1,143 /// or in textual repr: collectionSponsor()144 function collectionSponsor() public view returns (Tuple6 memory) {145 require(false, stub_error);146 dummy;147 return Tuple6(0x0000000000000000000000000000000000000000, 0);148 }149150 /// Set limits for the collection.151 /// @dev Throws error if limit not found.152 /// @param limit Name of the limit. Valid names:153 /// "accountTokenOwnershipLimit",154 /// "sponsoredDataSize",155 /// "sponsoredDataRateLimit",156 /// "tokenLimit",157 /// "sponsorTransferTimeout",158 /// "sponsorApproveTimeout"159 /// @param value Value of the limit.160 /// @dev EVM selector for this function is: 0x6a3841db,161 /// or in textual repr: setCollectionLimit(string,uint32)162 function setCollectionLimit(string memory limit, uint32 value) public {163 require(false, stub_error);164 limit;165 value;166 dummy = 0;167 }168169 /// Set limits for the collection.170 /// @dev Throws error if limit not found.171 /// @param limit Name of the limit. Valid names:172 /// "ownerCanTransfer",173 /// "ownerCanDestroy",174 /// "transfersEnabled"175 /// @param value Value of the limit.176 /// @dev EVM selector for this function is: 0x993b7fba,177 /// or in textual repr: setCollectionLimit(string,bool)178 function setCollectionLimit(string memory limit, bool value) public {179 require(false, stub_error);180 limit;181 value;182 dummy = 0;183 }184185 /// Get contract address.186 /// @dev EVM selector for this function is: 0xf6b4dfb4,187 /// or in textual repr: contractAddress()188 function contractAddress() public view returns (address) {189 require(false, stub_error);190 dummy;191 return 0x0000000000000000000000000000000000000000;192 }193194 /// Add collection admin.195 /// @param newAdmin Cross account administrator address.196 /// @dev EVM selector for this function is: 0x859aa7d6,197 /// or in textual repr: addCollectionAdminCross((address,uint256))198 function addCollectionAdminCross(Tuple6 memory newAdmin) public {199 require(false, stub_error);200 newAdmin;201 dummy = 0;202 }203204 /// Remove collection admin.205 /// @param admin Cross account administrator address.206 /// @dev EVM selector for this function is: 0x6c0cd173,207 /// or in textual repr: removeCollectionAdminCross((address,uint256))208 function removeCollectionAdminCross(Tuple6 memory admin) public {209 require(false, stub_error);210 admin;211 dummy = 0;212 }213214 /// Add collection admin.215 /// @param newAdmin Address of the added administrator.216 /// @dev EVM selector for this function is: 0x92e462c7,217 /// or in textual repr: addCollectionAdmin(address)218 function addCollectionAdmin(address newAdmin) public {219 require(false, stub_error);220 newAdmin;221 dummy = 0;222 }223224 /// Remove collection admin.225 ///226 /// @param admin Address of the removed administrator.227 /// @dev EVM selector for this function is: 0xfafd7b42,228 /// or in textual repr: removeCollectionAdmin(address)229 function removeCollectionAdmin(address admin) public {230 require(false, stub_error);231 admin;232 dummy = 0;233 }234235 /// Toggle accessibility of collection nesting.236 ///237 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'238 /// @dev EVM selector for this function is: 0x112d4586,239 /// or in textual repr: setCollectionNesting(bool)240 function setCollectionNesting(bool enable) public {241 require(false, stub_error);242 enable;243 dummy = 0;244 }245246 /// Toggle accessibility of collection nesting.247 ///248 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'249 /// @param collections Addresses of collections that will be available for nesting.250 /// @dev EVM selector for this function is: 0x64872396,251 /// or in textual repr: setCollectionNesting(bool,address[])252 function setCollectionNesting(bool enable, address[] memory collections) public {253 require(false, stub_error);254 enable;255 collections;256 dummy = 0;257 }258259 /// Set the collection access method.260 /// @param mode Access mode261 /// 0 for Normal262 /// 1 for AllowList263 /// @dev EVM selector for this function is: 0x41835d4c,264 /// or in textual repr: setCollectionAccess(uint8)265 function setCollectionAccess(uint8 mode) public {266 require(false, stub_error);267 mode;268 dummy = 0;269 }270271 /// Checks that user allowed to operate with collection.272 ///273 /// @param user User address to check.274 /// @dev EVM selector for this function is: 0xd63a8e11,275 /// or in textual repr: allowed(address)276 function allowed(address user) public view returns (bool) {277 require(false, stub_error);278 user;279 dummy;280 return false;281 }282283 /// Add the user to the allowed list.284 ///285 /// @param user Address of a trusted user.286 /// @dev EVM selector for this function is: 0x67844fe6,287 /// or in textual repr: addToCollectionAllowList(address)288 function addToCollectionAllowList(address user) public {289 require(false, stub_error);290 user;291 dummy = 0;292 }293294 /// Add user to allowed list.295 ///296 /// @param user User cross account address.297 /// @dev EVM selector for this function is: 0xa0184a3a,298 /// or in textual repr: addToCollectionAllowListCross((address,uint256))299 function addToCollectionAllowListCross(Tuple6 memory user) public {300 require(false, stub_error);301 user;302 dummy = 0;303 }304305 /// Remove the user from the allowed list.306 ///307 /// @param user Address of a removed user.308 /// @dev EVM selector for this function is: 0x85c51acb,309 /// or in textual repr: removeFromCollectionAllowList(address)310 function removeFromCollectionAllowList(address user) public {311 require(false, stub_error);312 user;313 dummy = 0;314 }315316 /// Remove user from allowed list.317 ///318 /// @param user User cross account address.319 /// @dev EVM selector for this function is: 0x09ba452a,320 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))321 function removeFromCollectionAllowListCross(Tuple6 memory user) public {322 require(false, stub_error);323 user;324 dummy = 0;325 }326327 /// Switch permission for minting.328 ///329 /// @param mode Enable if "true".330 /// @dev EVM selector for this function is: 0x00018e84,331 /// or in textual repr: setCollectionMintMode(bool)332 function setCollectionMintMode(bool mode) public {333 require(false, stub_error);334 mode;335 dummy = 0;336 }337338 /// Check that account is the owner or admin of the collection339 ///340 /// @param user account to verify341 /// @return "true" if account is the owner or admin342 /// @dev EVM selector for this function is: 0x9811b0c7,343 /// or in textual repr: isOwnerOrAdmin(address)344 function isOwnerOrAdmin(address user) public view returns (bool) {345 require(false, stub_error);346 user;347 dummy;348 return false;349 }350351 /// Check that account is the owner or admin of the collection352 ///353 /// @param user User cross account to verify354 /// @return "true" if account is the owner or admin355 /// @dev EVM selector for this function is: 0x3e75a905,356 /// or in textual repr: isOwnerOrAdminCross((address,uint256))357 function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) {358 require(false, stub_error);359 user;360 dummy;361 return false;362 }363364 /// Returns collection type365 ///366 /// @return `Fungible` or `NFT` or `ReFungible`367 /// @dev EVM selector for this function is: 0xd34b55b8,368 /// or in textual repr: uniqueCollectionType()369 function uniqueCollectionType() public view returns (string memory) {370 require(false, stub_error);371 dummy;372 return "";373 }374375 /// Get collection owner.376 ///377 /// @return Tuble with sponsor address and his substrate mirror.378 /// If address is canonical then substrate mirror is zero and vice versa.379 /// @dev EVM selector for this function is: 0xdf727d3b,380 /// or in textual repr: collectionOwner()381 function collectionOwner() public view returns (Tuple6 memory) {382 require(false, stub_error);383 dummy;384 return Tuple6(0x0000000000000000000000000000000000000000, 0);385 }386387 /// Changes collection owner to another account388 ///389 /// @dev Owner can be changed only by current owner390 /// @param newOwner new owner account391 /// @dev EVM selector for this function is: 0x4f53e226,392 /// or in textual repr: changeCollectionOwner(address)393 function changeCollectionOwner(address newOwner) public {394 require(false, stub_error);395 newOwner;396 dummy = 0;397 }398399 /// Get collection administrators400 ///401 /// @return Vector of tuples with admins address and his substrate mirror.402 /// If address is canonical then substrate mirror is zero and vice versa.403 /// @dev EVM selector for this function is: 0x5813216b,404 /// or in textual repr: collectionAdmins()405 function collectionAdmins() public view returns (Tuple6[] memory) {406 require(false, stub_error);407 dummy;408 return new Tuple6[](0);409 }410411 /// Changes collection owner to another account412 ///413 /// @dev Owner can be changed only by current owner414 /// @param newOwner new owner cross account415 /// @dev EVM selector for this function is: 0xe5c9913f,416 /// or in textual repr: setOwnerCross((address,uint256))417 function setOwnerCross(Tuple6 memory newOwner) public {418 require(false, stub_error);419 newOwner;420 dummy = 0;421 }422}423424/// @dev anonymous struct425struct Tuple10 {426 string field_0;427 bytes field_1;428}429430/// @dev the ERC-165 identifier for this interface is 0x032e5926431contract ERC20UniqueExtensions is Dummy, ERC165 {432 /// @dev EVM selector for this function is: 0x0ecd0ab0,433 /// or in textual repr: approveCross((address,uint256),uint256)434 function approveCross(Tuple6 memory spender, uint256 amount) public returns (bool) {435 require(false, stub_error);436 spender;437 amount;438 dummy = 0;439 return false;440 }441442 /// Burn tokens from account443 /// @dev Function that burns an `amount` of the tokens of a given account,444 /// deducting from the sender's allowance for said account.445 /// @param from The account whose tokens will be burnt.446 /// @param amount The amount that will be burnt.447 /// @dev EVM selector for this function is: 0x79cc6790,448 /// or in textual repr: burnFrom(address,uint256)449 function burnFrom(address from, uint256 amount) public returns (bool) {450 require(false, stub_error);451 from;452 amount;453 dummy = 0;454 return false;455 }456457 /// Burn tokens from account458 /// @dev Function that burns an `amount` of the tokens of a given account,459 /// deducting from the sender's allowance for said account.460 /// @param from The account whose tokens will be burnt.461 /// @param amount The amount that will be burnt.462 /// @dev EVM selector for this function is: 0xbb2f5a58,463 /// or in textual repr: burnFromCross((address,uint256),uint256)464 function burnFromCross(Tuple6 memory from, uint256 amount) public returns (bool) {465 require(false, stub_error);466 from;467 amount;468 dummy = 0;469 return false;470 }471472 /// Mint tokens for multiple accounts.473 /// @param amounts array of pairs of account address and amount474 /// @dev EVM selector for this function is: 0x1acf2d55,475 /// or in textual repr: mintBulk((address,uint256)[])476 function mintBulk(Tuple6[] memory amounts) public returns (bool) {477 require(false, stub_error);478 amounts;479 dummy = 0;480 return false;481 }482483 /// @dev EVM selector for this function is: 0xd5cf430b,484 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)485 function transferFromCross(486 Tuple6 memory from,487 Tuple6 memory to,488 uint256 amount489 ) public returns (bool) {490 require(false, stub_error);491 from;492 to;493 amount;494 dummy = 0;495 return false;496 }497}498499/// @dev anonymous struct500struct Tuple6 {501 address field_0;502 uint256 field_1;503}504505/// @dev the ERC-165 identifier for this interface is 0x40c10f19506contract ERC20Mintable is Dummy, ERC165 {507 /// Mint tokens for `to` account.508 /// @param to account that will receive minted tokens509 /// @param amount amount of tokens to mint510 /// @dev EVM selector for this function is: 0x40c10f19,511 /// or in textual repr: mint(address,uint256)512 function mint(address to, uint256 amount) public returns (bool) {513 require(false, stub_error);514 to;515 amount;516 dummy = 0;517 return false;518 }519}520521/// @dev inlined interface522contract ERC20Events {523 event Transfer(address indexed from, address indexed to, uint256 value);524 event Approval(address indexed owner, address indexed spender, uint256 value);525}526527/// @dev the ERC-165 identifier for this interface is 0x942e8b22528contract ERC20 is Dummy, ERC165, ERC20Events {529 /// @dev EVM selector for this function is: 0x06fdde03,530 /// or in textual repr: name()531 function name() public view returns (string memory) {532 require(false, stub_error);533 dummy;534 return "";535 }536537 /// @dev EVM selector for this function is: 0x95d89b41,538 /// or in textual repr: symbol()539 function symbol() public view returns (string memory) {540 require(false, stub_error);541 dummy;542 return "";543 }544545 /// @dev EVM selector for this function is: 0x18160ddd,546 /// or in textual repr: totalSupply()547 function totalSupply() public view returns (uint256) {548 require(false, stub_error);549 dummy;550 return 0;551 }552553 /// @dev EVM selector for this function is: 0x313ce567,554 /// or in textual repr: decimals()555 function decimals() public view returns (uint8) {556 require(false, stub_error);557 dummy;558 return 0;559 }560561 /// @dev EVM selector for this function is: 0x70a08231,562 /// or in textual repr: balanceOf(address)563 function balanceOf(address owner) public view returns (uint256) {564 require(false, stub_error);565 owner;566 dummy;567 return 0;568 }569570 /// @dev EVM selector for this function is: 0xa9059cbb,571 /// or in textual repr: transfer(address,uint256)572 function transfer(address to, uint256 amount) public returns (bool) {573 require(false, stub_error);574 to;575 amount;576 dummy = 0;577 return false;578 }579580 /// @dev EVM selector for this function is: 0x23b872dd,581 /// or in textual repr: transferFrom(address,address,uint256)582 function transferFrom(583 address from,584 address to,585 uint256 amount586 ) public returns (bool) {587 require(false, stub_error);588 from;589 to;590 amount;591 dummy = 0;592 return false;593 }594595 /// @dev EVM selector for this function is: 0x095ea7b3,596 /// or in textual repr: approve(address,uint256)597 function approve(address spender, uint256 amount) public returns (bool) {598 require(false, stub_error);599 spender;600 amount;601 dummy = 0;602 return false;603 }604605 /// @dev EVM selector for this function is: 0xdd62ed3e,606 /// or in textual repr: allowance(address,address)607 function allowance(address owner, address spender) public view returns (uint256) {608 require(false, stub_error);609 owner;610 spender;611 dummy;612 return 0;613 }614}615616contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}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 0x5d354410
+/// @dev the ERC-165 identifier for this interface is 0xb3152af3
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -128,6 +128,17 @@
dummy = 0;
}
+ /// Delete collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @dev EVM selector for this function is: 0xee206ee3,
+ /// or in textual repr: deleteCollectionProperties(string[])
+ function deleteCollectionProperties(string[] memory keys) public {
+ require(false, stub_error);
+ keys;
+ dummy = 0;
+ }
+
/// Get collection property.
///
/// @dev Throws error if key not found.
@@ -145,7 +156,7 @@
/// Get collection properties.
///
- /// @param keys Properties keys.
+ /// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
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 0x5d354410
+/// @dev the ERC-165 identifier for this interface is 0xb3152af3
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -128,6 +128,17 @@
dummy = 0;
}
+ /// Delete collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @dev EVM selector for this function is: 0xee206ee3,
+ /// or in textual repr: deleteCollectionProperties(string[])
+ function deleteCollectionProperties(string[] memory keys) public {
+ require(false, stub_error);
+ keys;
+ dummy = 0;
+ }
+
/// Get collection property.
///
/// @dev Throws error if key not found.
@@ -145,7 +156,7 @@
/// Get collection properties.
///
- /// @param keys Properties keys.
+ /// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
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 0x5d354410
+/// @dev the ERC-165 identifier for this interface is 0xb3152af3
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -37,6 +37,13 @@
/// or in textual repr: deleteCollectionProperty(string)
function deleteCollectionProperty(string memory key) external;
+ /// Delete collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @dev EVM selector for this function is: 0xee206ee3,
+ /// or in textual repr: deleteCollectionProperties(string[])
+ function deleteCollectionProperties(string[] memory keys) external;
+
/// Get collection property.
///
/// @dev Throws error if key not found.
@@ -49,7 +56,7 @@
/// Get collection properties.
///
- /// @param keys Properties keys.
+ /// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
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 0x5d354410
+/// @dev the ERC-165 identifier for this interface is 0xb3152af3
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -86,6 +86,13 @@
/// or in textual repr: deleteCollectionProperty(string)
function deleteCollectionProperty(string memory key) external;
+ /// Delete collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @dev EVM selector for this function is: 0xee206ee3,
+ /// or in textual repr: deleteCollectionProperties(string[])
+ function deleteCollectionProperties(string[] memory keys) external;
+
/// Get collection property.
///
/// @dev Throws error if key not found.
@@ -98,7 +105,7 @@
/// Get collection properties.
///
- /// @param keys Properties keys.
+ /// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
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 0x5d354410
+/// @dev the ERC-165 identifier for this interface is 0xb3152af3
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -86,6 +86,13 @@
/// or in textual repr: deleteCollectionProperty(string)
function deleteCollectionProperty(string memory key) external;
+ /// Delete collection properties.
+ ///
+ /// @param keys Properties keys.
+ /// @dev EVM selector for this function is: 0xee206ee3,
+ /// or in textual repr: deleteCollectionProperties(string[])
+ function deleteCollectionProperties(string[] memory keys) external;
+
/// Get collection property.
///
/// @dev Throws error if key not found.
@@ -98,7 +105,7 @@
/// Get collection properties.
///
- /// @param keys Properties keys.
+ /// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
tests/src/eth/collectionProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -16,7 +16,7 @@
import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
import {Pallets} from '../util';
-import {IProperty, ITokenPropertyPermission} from '../util/playgrounds/types';
+import {IProperty, ITokenPropertyPermission, TCollectionMode} from '../util/playgrounds/types';
import {IKeyringPair} from '@polkadot/types/types';
describe('EVM collection properties', () => {
@@ -163,29 +163,89 @@
});
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'});
+ let alice: IKeyringPair;
+
+ before(() => {
+ usingEthPlaygrounds(async (_helper, privateKey) => {
+ alice = await privateKey('//Alice');
+ });
+ });
+
+ async function testSetReadProperties(helper: EthUniqueHelper, mode: TCollectionMode) {
+ const collection = await helper[mode].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 contract = helper.ethNativeContract.collection(collectionAddress, mode, sender);
- const key1 = 'key1';
- const value1 = Buffer.from('value1');
-
- const key2 = 'key2';
- const value2 = Buffer.from('value2');
+ const keys = ['key0', 'key1'];
const writeProperties = [
- [key1, '0x'+value1.toString('hex')],
- [key2, '0x'+value2.toString('hex')],
+ helper.ethProperty.property(keys[0], 'value0'),
+ helper.ethProperty.property(keys[1], 'value1'),
];
await contract.methods.setCollectionProperties(writeProperties).send();
- const readProperties = await contract.methods.collectionProperties([key1, key2]).call();
+ const readProperties = await contract.methods.collectionProperties([keys[0], keys[1]]).call();
expect(readProperties).to.be.like(writeProperties);
+ }
+
+ itEth('Set/read properties ft', async ({helper}) => {
+ await testSetReadProperties(helper, 'ft');
+ });
+ itEth('Set/read properties rft', async ({helper}) => {
+ await testSetReadProperties(helper, 'rft');
+ });
+ itEth('Set/read properties nft', async ({helper}) => {
+ await testSetReadProperties(helper, 'nft');
+ });
+
+ async function testDeleteProperties(helper: EthUniqueHelper, mode: TCollectionMode) {
+ const collection = await helper[mode].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, mode, sender);
+
+ const keys = ['key0', 'key1', 'key2', 'key3'];
+
+ {
+ const writeProperties = [
+ helper.ethProperty.property(keys[0], 'value0'),
+ helper.ethProperty.property(keys[1], 'value1'),
+ helper.ethProperty.property(keys[2], 'value2'),
+ helper.ethProperty.property(keys[3], 'value3'),
+ ];
+
+ await contract.methods.setCollectionProperties(writeProperties).send();
+ const readProperties = await contract.methods.collectionProperties([keys[0], keys[1], keys[2], keys[3]]).call();
+ expect(readProperties).to.be.like(writeProperties);
+ }
+
+ {
+ const expectProperties = [
+ helper.ethProperty.property(keys[0], 'value0'),
+ helper.ethProperty.property(keys[1], 'value1'),
+ ];
+
+ await contract.methods.deleteCollectionProperties([keys[2], keys[3]]).send();
+ const readProperties = await contract.methods.collectionProperties([]).call();
+ expect(readProperties).to.be.like(expectProperties);
+ }
+ }
+
+ itEth('Delete properties ft', async ({helper}) => {
+ await testDeleteProperties(helper, 'ft');
+ });
+ itEth('Delete properties rft', async ({helper}) => {
+ await testDeleteProperties(helper, 'rft');
});
+ itEth('Delete properties nft', async ({helper}) => {
+ await testDeleteProperties(helper, 'nft');
+ });
+
});
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -293,6 +293,15 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "string[]", "name": "keys", "type": "string[]" }
+ ],
+ "name": "deleteCollectionProperties",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
"name": "deleteCollectionProperty",
"outputs": [],
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -316,6 +316,15 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "string[]", "name": "keys", "type": "string[]" }
+ ],
+ "name": "deleteCollectionProperties",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
"name": "deleteCollectionProperty",
"outputs": [],
tests/src/eth/reFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -298,6 +298,15 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "string[]", "name": "keys", "type": "string[]" }
+ ],
+ "name": "deleteCollectionProperties",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
"name": "deleteCollectionProperty",
"outputs": [],
tests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/types.ts
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -19,3 +19,6 @@
readonly field_0: string,
readonly field_1: string | Uint8Array,
}
+
+export type EthProperty = string[];
+
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -18,7 +18,7 @@
import {DevUniqueHelper} from '../../../util/playgrounds/unique.dev';
-import {ContractImports, CompiledContract, TEthCrossAccount, NormalizedEvent} from './types';
+import {ContractImports, CompiledContract, TEthCrossAccount, NormalizedEvent, EthProperty} from './types';
// Native contracts ABI
import collectionHelpersAbi from '../../collectionHelpersAbi.json';
@@ -28,6 +28,7 @@
import refungibleTokenAbi from '../../reFungibleTokenAbi.json';
import contractHelpersAbi from './../contractHelpersAbi.json';
import {ICrossAccountId, TEthereumAccount} from '../../../util/playgrounds/types';
+import {TCollectionMode} from '../../../util/playgrounds/types';
class EthGroupBase {
helper: EthUniqueHelper;
@@ -107,7 +108,7 @@
return new web3.eth.Contract(collectionHelpersAbi as any, '0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f', {from: caller, gas: this.helper.eth.DEFAULT_GAS});
}
- collection(address: string, mode: 'nft' | 'rft' | 'ft', caller?: string): Contract {
+ collection(address: string, mode: TCollectionMode, caller?: string): Contract {
const abi = {
'nft': nonFungibleAbi,
'rft': refungibleAbi,
@@ -336,8 +337,16 @@
normalizeAddress(address: string): string {
return '0x' + address.substring(address.length - 40);
}
-}
+}
+export class EthPropertyGroup extends EthGroupBase {
+ property(key: string, value: string): EthProperty {
+ return [
+ key,
+ '0x'+Buffer.from(value).toString('hex'),
+ ];
+ }
+}
export type EthUniqueHelperConstructor = new (...args: any[]) => EthUniqueHelper;
export class EthCrossAccountGroup extends EthGroupBase {
@@ -369,6 +378,7 @@
ethNativeContract: NativeContractGroup;
ethContract: ContractGroup;
ethCrossAccount: EthCrossAccountGroup;
+ ethProperty: EthPropertyGroup;
constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {
options.helperBase = options.helperBase ?? EthUniqueHelper;
@@ -379,6 +389,7 @@
this.ethCrossAccount = new EthCrossAccountGroup(this);
this.ethNativeContract = new NativeContractGroup(this);
this.ethContract = new ContractGroup(this);
+ this.ethProperty = new EthPropertyGroup(this);
}
getWeb3(): Web3 {
tests/src/util/playgrounds/types.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/types.ts
+++ b/tests/src/util/playgrounds/types.ts
@@ -224,3 +224,4 @@
export type TRelayNetworks = 'rococo' | 'westend';
export type TNetworks = TUniqueNetworks | TSiblingNetworkds | TRelayNetworks;
export type TSigner = IKeyringPair; // | 'string'
+export type TCollectionMode = 'nft' | 'rft' | 'ft';