git.delta.rocks / unique-network / refs/commits / 36fc5abfd9d0

difftreelog

feat add delete properties

Trubnikov Sergey2022-10-24parent: #ec90529.patch.diff
in: master

17 files changed

modifiedpallets/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.
modifiedpallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/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 0x5d354410
+/// @dev the ERC-165 identifier for this interface is 0xb3152af3
 contract Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
@@ -55,6 +55,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.
@@ -72,7 +83,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[])
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/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[])
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/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[])
modifiedtests/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[])
modifiedtests/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[])
modifiedtests/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[])
modifiedtests/src/eth/collectionProperties.test.tsdiffbeforeafterboth
before · tests/src/eth/collectionProperties.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';18import {Pallets} from '../util';19import {IProperty, ITokenPropertyPermission} from '../util/playgrounds/types';20import {IKeyringPair} from '@polkadot/types/types';2122describe('EVM collection properties', () => {23  let donor: IKeyringPair;24  let alice: IKeyringPair;2526  before(async function() {27    await usingEthPlaygrounds(async (_helper, privateKey) => {28      donor = await privateKey({filename: __filename});29      [alice] = await _helper.arrange.createAccounts([10n], donor);30    });31  });3233  itEth('Can be set', async({helper}) => {34    const caller = await helper.eth.createAccountWithBalance(donor);35    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: []});36    await collection.addAdmin(alice, {Ethereum: caller});3738    const address = helper.ethAddress.fromCollectionId(collection.collectionId);39    const contract = helper.ethNativeContract.collection(address, 'nft', caller);4041    await contract.methods.setCollectionProperty('testKey', Buffer.from('testValue')).send({from: caller});4243    const raw = (await collection.getData())?.raw;4445    expect(raw.properties[0].value).to.equal('testValue');46  });4748  itEth('Can be deleted', async({helper}) => {49    const caller = await helper.eth.createAccountWithBalance(donor);50    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: [{key: 'testKey', value: 'testValue'}]});5152    await collection.addAdmin(alice, {Ethereum: caller});5354    const address = helper.ethAddress.fromCollectionId(collection.collectionId);55    const contract = helper.ethNativeContract.collection(address, 'nft', caller);5657    await contract.methods.deleteCollectionProperty('testKey').send({from: caller});5859    const raw = (await collection.getData())?.raw;6061    expect(raw.properties.length).to.equal(0);62  });6364  itEth('Can be read', async({helper}) => {65    const caller = helper.eth.createAccount();66    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: [{key: 'testKey', value: 'testValue'}]});6768    const address = helper.ethAddress.fromCollectionId(collection.collectionId);69    const contract = helper.ethNativeContract.collection(address, 'nft', caller);7071    const value = await contract.methods.collectionProperty('testKey').call();72    expect(value).to.equal(helper.getWeb3().utils.toHex('testValue'));73  });74});7576describe('Supports ERC721Metadata', () => {77  let donor: IKeyringPair;7879  before(async function() {80    await usingEthPlaygrounds(async (_helper, privateKey) => {81      donor = await privateKey({filename: __filename});82    });83  });8485  const checkERC721Metadata = async (helper: EthUniqueHelper, mode: 'nft' | 'rft') => {86    const caller = await helper.eth.createAccountWithBalance(donor);87    const bruh = await helper.eth.createAccountWithBalance(donor);8889    const BASE_URI = 'base/';90    const SUFFIX = 'suffix1';91    const URI = 'uri1';9293    const collectionHelpers = helper.ethNativeContract.collectionHelpers(caller);94    const creatorMethod = mode === 'rft' ? 'createRFTCollection' : 'createNFTCollection';9596    const {collectionId, collectionAddress} = await helper.eth[creatorMethod](caller, 'n', 'd', 'p');9798    const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller);99    await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too100101    const collection1 = helper.nft.getCollectionObject(collectionId);102    const data1 = await collection1.getData();103    expect(data1?.raw.flags.erc721metadata).to.be.false;104    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;105106    await collectionHelpers.methods.makeCollectionERC721MetadataCompatible(collectionAddress, BASE_URI)107      .send({from: bruh});108109    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;110111    const collection2 = helper.nft.getCollectionObject(collectionId);112    const data2 = await collection2.getData();113    expect(data2?.raw.flags.erc721metadata).to.be.true;114115    const propertyPermissions = data2?.raw.tokenPropertyPermissions;116    expect(propertyPermissions?.length).to.equal(2);117118    expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {119      return tpp.key === 'URI' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;120    })).to.be.not.null;121122    expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {123      return tpp.key === 'URISuffix' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;124    })).to.be.not.null;125126    expect(data2?.raw.properties?.find((property: IProperty) => {127      return property.key === 'baseURI' && property.value === BASE_URI;128    })).to.be.not.null;129130    const token1Result = await contract.methods.mint(bruh).send();131    const tokenId1 = token1Result.events.Transfer.returnValues.tokenId;132133    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI);134135    await contract.methods.setProperty(tokenId1, 'URISuffix', Buffer.from(SUFFIX)).send();136    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);137138    await contract.methods.setProperty(tokenId1, 'URI', Buffer.from(URI)).send();139    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(URI);140141    await contract.methods.deleteProperty(tokenId1, 'URI').send();142    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);143144    const token2Result = await contract.methods.mintWithTokenURI(bruh, URI).send();145    const tokenId2 = token2Result.events.Transfer.returnValues.tokenId;146147    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(URI);148149    await contract.methods.deleteProperty(tokenId2, 'URI').send();150    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI);151152    await contract.methods.setProperty(tokenId2, 'URISuffix', Buffer.from(SUFFIX)).send();153    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI + SUFFIX);154  };155156  itEth('ERC721Metadata property can be set for NFT collection', async({helper}) => {157    await checkERC721Metadata(helper, 'nft');158  });159160  itEth.ifWithPallets('ERC721Metadata property can be set for RFT collection', [Pallets.ReFungible], async({helper}) => {161    await checkERC721Metadata(helper, 'rft');162  });163});164165describe('EVM collection property', () => {166  itEth('Set/read properties', async ({helper, privateKey}) => {167    const alice = await privateKey('//Alice');168    const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});169170    const sender = await helper.eth.createAccountWithBalance(alice, 100n);171    await collection.addAdmin(alice, {Ethereum: sender});172173    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);174    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', sender);175176    const key1 = 'key1';177    const value1 = Buffer.from('value1');178    179    const key2 = 'key2';180    const value2 = Buffer.from('value2');181182    const writeProperties = [183      [key1, '0x'+value1.toString('hex')],184      [key2, '0x'+value2.toString('hex')],185    ];186187    await contract.methods.setCollectionProperties(writeProperties).send();188    const readProperties = await contract.methods.collectionProperties([key1, key2]).call();189    expect(readProperties).to.be.like(writeProperties);190  });191});
after · tests/src/eth/collectionProperties.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';18import {Pallets} from '../util';19import {IProperty, ITokenPropertyPermission, TCollectionMode} from '../util/playgrounds/types';20import {IKeyringPair} from '@polkadot/types/types';2122describe('EVM collection properties', () => {23  let donor: IKeyringPair;24  let alice: IKeyringPair;2526  before(async function() {27    await usingEthPlaygrounds(async (_helper, privateKey) => {28      donor = await privateKey({filename: __filename});29      [alice] = await _helper.arrange.createAccounts([10n], donor);30    });31  });3233  itEth('Can be set', async({helper}) => {34    const caller = await helper.eth.createAccountWithBalance(donor);35    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: []});36    await collection.addAdmin(alice, {Ethereum: caller});3738    const address = helper.ethAddress.fromCollectionId(collection.collectionId);39    const contract = helper.ethNativeContract.collection(address, 'nft', caller);4041    await contract.methods.setCollectionProperty('testKey', Buffer.from('testValue')).send({from: caller});4243    const raw = (await collection.getData())?.raw;4445    expect(raw.properties[0].value).to.equal('testValue');46  });4748  itEth('Can be deleted', async({helper}) => {49    const caller = await helper.eth.createAccountWithBalance(donor);50    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: [{key: 'testKey', value: 'testValue'}]});5152    await collection.addAdmin(alice, {Ethereum: caller});5354    const address = helper.ethAddress.fromCollectionId(collection.collectionId);55    const contract = helper.ethNativeContract.collection(address, 'nft', caller);5657    await contract.methods.deleteCollectionProperty('testKey').send({from: caller});5859    const raw = (await collection.getData())?.raw;6061    expect(raw.properties.length).to.equal(0);62  });6364  itEth('Can be read', async({helper}) => {65    const caller = helper.eth.createAccount();66    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: [{key: 'testKey', value: 'testValue'}]});6768    const address = helper.ethAddress.fromCollectionId(collection.collectionId);69    const contract = helper.ethNativeContract.collection(address, 'nft', caller);7071    const value = await contract.methods.collectionProperty('testKey').call();72    expect(value).to.equal(helper.getWeb3().utils.toHex('testValue'));73  });74});7576describe('Supports ERC721Metadata', () => {77  let donor: IKeyringPair;7879  before(async function() {80    await usingEthPlaygrounds(async (_helper, privateKey) => {81      donor = await privateKey({filename: __filename});82    });83  });8485  const checkERC721Metadata = async (helper: EthUniqueHelper, mode: 'nft' | 'rft') => {86    const caller = await helper.eth.createAccountWithBalance(donor);87    const bruh = await helper.eth.createAccountWithBalance(donor);8889    const BASE_URI = 'base/';90    const SUFFIX = 'suffix1';91    const URI = 'uri1';9293    const collectionHelpers = helper.ethNativeContract.collectionHelpers(caller);94    const creatorMethod = mode === 'rft' ? 'createRFTCollection' : 'createNFTCollection';9596    const {collectionId, collectionAddress} = await helper.eth[creatorMethod](caller, 'n', 'd', 'p');9798    const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller);99    await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too100101    const collection1 = helper.nft.getCollectionObject(collectionId);102    const data1 = await collection1.getData();103    expect(data1?.raw.flags.erc721metadata).to.be.false;104    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;105106    await collectionHelpers.methods.makeCollectionERC721MetadataCompatible(collectionAddress, BASE_URI)107      .send({from: bruh});108109    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;110111    const collection2 = helper.nft.getCollectionObject(collectionId);112    const data2 = await collection2.getData();113    expect(data2?.raw.flags.erc721metadata).to.be.true;114115    const propertyPermissions = data2?.raw.tokenPropertyPermissions;116    expect(propertyPermissions?.length).to.equal(2);117118    expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {119      return tpp.key === 'URI' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;120    })).to.be.not.null;121122    expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {123      return tpp.key === 'URISuffix' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;124    })).to.be.not.null;125126    expect(data2?.raw.properties?.find((property: IProperty) => {127      return property.key === 'baseURI' && property.value === BASE_URI;128    })).to.be.not.null;129130    const token1Result = await contract.methods.mint(bruh).send();131    const tokenId1 = token1Result.events.Transfer.returnValues.tokenId;132133    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI);134135    await contract.methods.setProperty(tokenId1, 'URISuffix', Buffer.from(SUFFIX)).send();136    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);137138    await contract.methods.setProperty(tokenId1, 'URI', Buffer.from(URI)).send();139    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(URI);140141    await contract.methods.deleteProperty(tokenId1, 'URI').send();142    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);143144    const token2Result = await contract.methods.mintWithTokenURI(bruh, URI).send();145    const tokenId2 = token2Result.events.Transfer.returnValues.tokenId;146147    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(URI);148149    await contract.methods.deleteProperty(tokenId2, 'URI').send();150    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI);151152    await contract.methods.setProperty(tokenId2, 'URISuffix', Buffer.from(SUFFIX)).send();153    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI + SUFFIX);154  };155156  itEth('ERC721Metadata property can be set for NFT collection', async({helper}) => {157    await checkERC721Metadata(helper, 'nft');158  });159160  itEth.ifWithPallets('ERC721Metadata property can be set for RFT collection', [Pallets.ReFungible], async({helper}) => {161    await checkERC721Metadata(helper, 'rft');162  });163});164165describe('EVM collection property', () => {166  let alice: IKeyringPair;167168  before(() => {169    usingEthPlaygrounds(async (_helper, privateKey) => {170      alice = await privateKey('//Alice');171    });172  });173174  async function testSetReadProperties(helper: EthUniqueHelper, mode: TCollectionMode) {175    const collection = await helper[mode].mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});176177    const sender = await helper.eth.createAccountWithBalance(alice, 100n);178    await collection.addAdmin(alice, {Ethereum: sender});179180    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);181    const contract = helper.ethNativeContract.collection(collectionAddress, mode, sender);182183    const keys = ['key0', 'key1'];184185    const writeProperties = [186      helper.ethProperty.property(keys[0], 'value0'),187      helper.ethProperty.property(keys[1], 'value1'),188    ];189190    await contract.methods.setCollectionProperties(writeProperties).send();191    const readProperties = await contract.methods.collectionProperties([keys[0], keys[1]]).call();192    expect(readProperties).to.be.like(writeProperties);193  }194195  itEth('Set/read properties ft', async ({helper}) => {196    await testSetReadProperties(helper, 'ft');197  });198  itEth('Set/read properties rft', async ({helper}) => {199    await testSetReadProperties(helper, 'rft');200  });201  itEth('Set/read properties nft', async ({helper}) => {202    await testSetReadProperties(helper, 'nft');203  });204205  async function testDeleteProperties(helper: EthUniqueHelper, mode: TCollectionMode) {206    const collection = await helper[mode].mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});207208    const sender = await helper.eth.createAccountWithBalance(alice, 100n);209    await collection.addAdmin(alice, {Ethereum: sender});210211    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);212    const contract = helper.ethNativeContract.collection(collectionAddress, mode, sender);213214    const keys = ['key0', 'key1', 'key2', 'key3'];215216    {217      const writeProperties = [218        helper.ethProperty.property(keys[0], 'value0'),219        helper.ethProperty.property(keys[1], 'value1'),220        helper.ethProperty.property(keys[2], 'value2'),221        helper.ethProperty.property(keys[3], 'value3'),222      ];223224      await contract.methods.setCollectionProperties(writeProperties).send();225      const readProperties = await contract.methods.collectionProperties([keys[0], keys[1], keys[2], keys[3]]).call();226      expect(readProperties).to.be.like(writeProperties);227    }228229    {230      const expectProperties = [231        helper.ethProperty.property(keys[0], 'value0'),232        helper.ethProperty.property(keys[1], 'value1'),233      ];234235      await contract.methods.deleteCollectionProperties([keys[2], keys[3]]).send();236      const readProperties = await contract.methods.collectionProperties([]).call();237      expect(readProperties).to.be.like(expectProperties);238    }239  }240  241  itEth('Delete properties ft', async ({helper}) => {242    await testDeleteProperties(helper, 'ft');243  });244  itEth('Delete properties rft', async ({helper}) => {245    await testDeleteProperties(helper, 'rft');246  });247  itEth('Delete properties nft', async ({helper}) => {248    await testDeleteProperties(helper, 'nft');249  });250    251});
modifiedtests/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": [],
modifiedtests/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": [],
modifiedtests/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": [],
modifiedtests/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[];
+
modifiedtests/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 {
modifiedtests/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';