git.delta.rocks / unique-network / refs/commits / 44771a5df696

difftreelog

feat updates for createERC721MetadataCompatibleCollections

Grigoriy Simonov2022-10-12parent: #876ef62.patch.diff
in: master

13 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -665,6 +665,11 @@
 			property_key_from_bytes(b"schemaName").expect(EXPECT_CONVERT_ERROR)
 		}
 
+		/// Key "schemaVersion".
+		pub fn schema_version() -> up_data_structs::PropertyKey {
+			property_key_from_bytes(b"schemaVersion").expect(EXPECT_CONVERT_ERROR)
+		}
+
 		/// Key "baseURI".
 		pub fn base_uri() -> up_data_structs::PropertyKey {
 			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)
@@ -672,12 +677,12 @@
 
 		/// Key "url".
 		pub fn url() -> up_data_structs::PropertyKey {
-			property_key_from_bytes(b"url").expect(EXPECT_CONVERT_ERROR)
+			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)
 		}
 
 		/// Key "suffix".
 		pub fn suffix() -> up_data_structs::PropertyKey {
-			property_key_from_bytes(b"suffix").expect(EXPECT_CONVERT_ERROR)
+			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)
 		}
 
 		/// Key "parentNft".
@@ -685,7 +690,7 @@
 			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)
 		}
 
-		/// Key "parentNft".
+		/// Key "ERC721Metadata".
 		pub fn erc721_metadata() -> up_data_structs::PropertyKey {
 			property_key_from_bytes(b"ERC721Metadata").expect(EXPECT_CONVERT_ERROR)
 		}
@@ -695,6 +700,9 @@
 	pub mod value {
 		use super::*;
 
+		/// Value "Schema version".
+		pub const SCHEMA_VERSION: &[u8] = b"1.0.0";
+
 		/// Value "ERC721Metadata".
 		pub const ERC721_METADATA: &[u8] = b"ERC721Metadata";
 
@@ -709,7 +717,12 @@
 			property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)
 		}
 
-		/// Value for [`ERC721_METADATA`].
+		/// Value for [`SCHEMA_VERSION`].
+		pub fn schema_version() -> up_data_structs::PropertyValue {
+			property_value_from_bytes(SCHEMA_VERSION).expect(EXPECT_CONVERT_ERROR)
+		}
+
+		/// Value for [`ERC721_METADATA_SUPPORTED`].
 		pub fn erc721_metadata_supported() -> up_data_structs::PropertyValue {
 			property_value_from_bytes(ERC721_METADATA_SUPPORTED).expect(EXPECT_CONVERT_ERROR)
 		}
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -116,7 +116,18 @@
 			.try_push(up_data_structs::PropertyKeyPermission {
 				key: key::suffix(),
 				permission: up_data_structs::PropertyPermission {
-					mutable: false,
+					mutable: true,
+					collection_admin: true,
+					token_owner: false,
+				},
+			})
+			.map_err(|e| Error::Revert(format!("{:?}", e)))?;
+
+		token_property_permissions
+			.try_push(up_data_structs::PropertyKeyPermission {
+				key: key::url(),
+				permission: up_data_structs::PropertyPermission {
+					mutable: true,
 					collection_admin: true,
 					token_owner: false,
 				},
@@ -129,6 +140,13 @@
 				value: property_value::erc721(),
 			})
 			.map_err(|e| Error::Revert(format!("{:?}", e)))?;
+			
+		properties
+			.try_push(up_data_structs::Property {
+				key: key::schema_version(),
+				value: property_value::schema_version(),
+			})
+			.map_err(|e| Error::Revert(format!("{:?}", e)))?;
 
 		properties
 			.try_push(up_data_structs::Property {
@@ -266,7 +284,7 @@
 	}
 
 	#[weight(<SelfWeightOf<T>>::create_collection())]
-	#[solidity(rename_selector = "createERC721MetadataNFTCollection")]
+	#[solidity(rename_selector = "createERC721MetadataCompatibleNFTCollection")]
 	fn create_nonfungible_collection_with_properties(
 		&mut self,
 		caller: caller,
@@ -339,7 +357,7 @@
 	}
 
 	#[weight(<SelfWeightOf<T>>::create_collection())]
-	#[solidity(rename_selector = "createERC721MetadataRFTCollection")]
+	#[solidity(rename_selector = "createERC721MetadataCompatibleRFTCollection")]
 	fn create_refungible_collection_with_properties(
 		&mut self,
 		caller: caller,
modifiedpallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth
--- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -23,7 +23,7 @@
 }
 
 /// @title Contract, which allows users to operate with collections
-/// @dev the ERC-165 identifier for this interface is 0xf62c7aa9
+/// @dev the ERC-165 identifier for this interface is 0x95eb98f4
 contract CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
 	/// Create an NFT collection
 	/// @param name Name of the collection
@@ -65,9 +65,9 @@
 		return 0x0000000000000000000000000000000000000000;
 	}
 
-	/// @dev EVM selector for this function is: 0xd1df968c,
-	///  or in textual repr: createERC721MetadataNFTCollection(string,string,string,string)
-	function createERC721MetadataNFTCollection(
+	/// @dev EVM selector for this function is: 0xa9e7b5c0,
+	///  or in textual repr: createERC721MetadataCompatibleNFTCollection(string,string,string,string)
+	function createERC721MetadataCompatibleNFTCollection(
 		string memory name,
 		string memory description,
 		string memory tokenPrefix,
@@ -112,9 +112,9 @@
 		return 0x0000000000000000000000000000000000000000;
 	}
 
-	/// @dev EVM selector for this function is: 0xbea6a299,
-	///  or in textual repr: createERC721MetadataRFTCollection(string,string,string,string)
-	function createERC721MetadataRFTCollection(
+	/// @dev EVM selector for this function is: 0xa5596388,
+	///  or in textual repr: createERC721MetadataCompatibleRFTCollection(string,string,string,string)
+	function createERC721MetadataCompatibleRFTCollection(
 		string memory name,
 		string memory description,
 		string memory tokenPrefix,
modifiedtests/src/eth/api/CollectionHelpers.soldiffbeforeafterboth
--- a/tests/src/eth/api/CollectionHelpers.sol
+++ b/tests/src/eth/api/CollectionHelpers.sol
@@ -18,7 +18,7 @@
 }
 
 /// @title Contract, which allows users to operate with collections
-/// @dev the ERC-165 identifier for this interface is 0xf62c7aa9
+/// @dev the ERC-165 identifier for this interface is 0x95eb98f4
 interface CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
 	/// Create an NFT collection
 	/// @param name Name of the collection
@@ -46,9 +46,9 @@
 		string memory tokenPrefix
 	) external payable returns (address);
 
-	/// @dev EVM selector for this function is: 0xd1df968c,
-	///  or in textual repr: createERC721MetadataNFTCollection(string,string,string,string)
-	function createERC721MetadataNFTCollection(
+	/// @dev EVM selector for this function is: 0xa9e7b5c0,
+	///  or in textual repr: createERC721MetadataCompatibleNFTCollection(string,string,string,string)
+	function createERC721MetadataCompatibleNFTCollection(
 		string memory name,
 		string memory description,
 		string memory tokenPrefix,
@@ -71,9 +71,9 @@
 		string memory tokenPrefix
 	) external payable returns (address);
 
-	/// @dev EVM selector for this function is: 0xbea6a299,
-	///  or in textual repr: createERC721MetadataRFTCollection(string,string,string,string)
-	function createERC721MetadataRFTCollection(
+	/// @dev EVM selector for this function is: 0xa5596388,
+	///  or in textual repr: createERC721MetadataCompatibleRFTCollection(string,string,string,string)
+	function createERC721MetadataCompatibleRFTCollection(
 		string memory name,
 		string memory description,
 		string memory tokenPrefix,
modifiedtests/src/eth/collectionHelpersAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/collectionHelpersAbi.json
+++ b/tests/src/eth/collectionHelpersAbi.json
@@ -32,7 +32,7 @@
       { "internalType": "string", "name": "tokenPrefix", "type": "string" },
       { "internalType": "string", "name": "baseUri", "type": "string" }
     ],
-    "name": "createERC721MetadataNFTCollection",
+    "name": "createERC721MetadataCompatibleNFTCollection",
     "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
     "stateMutability": "payable",
     "type": "function"
@@ -44,7 +44,7 @@
       { "internalType": "string", "name": "tokenPrefix", "type": "string" },
       { "internalType": "string", "name": "baseUri", "type": "string" }
     ],
-    "name": "createERC721MetadataRFTCollection",
+    "name": "createERC721MetadataCompatibleRFTCollection",
     "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
     "stateMutability": "payable",
     "type": "function"
modifiedtests/src/eth/collectionProperties.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -14,7 +14,7 @@
 
   itEth('Can be set', async({helper}) => {
     const caller = await helper.eth.createAccountWithBalance(donor);
-    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test'});
+    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: []});
     await collection.addAdmin(alice, {Ethereum: caller});
 
     const address = helper.ethAddress.fromCollectionId(collection.collectionId);
@@ -24,7 +24,7 @@
 
     const raw = (await collection.getData())?.raw;
 
-    expect(raw.properties[1].value).to.equal('testValue');
+    expect(raw.properties[0].value).to.equal('testValue');
   });
 
   itEth('Can be deleted', async({helper}) => {
modifiedtests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -97,7 +97,7 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
 
-    let result = await collectionHelpers.methods.createERC721MetadataNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
+    let result = await collectionHelpers.methods.createERC721MetadataCompatibleNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
     const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
     const collectionId = helper.ethAddress.extractCollectionId(collectionIdAddress);
     const collection = helper.nft.getCollectionObject(collectionId);
@@ -167,7 +167,7 @@
   // itWeb3('Sponsoring collection from substrate address via access list', async ({api, web3, privateKeyWrapper}) => {
   //   const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
   //   const collectionHelpers = evmCollectionHelpers(web3, owner);
-  //   const result = await collectionHelpers.methods.createERC721MetadataNFTCollection('Sponsor collection', '1', '1', '').send();
+  //   const result = await collectionHelpers.methods.createERC721MetadataCompatibleNFTCollection('Sponsor collection', '1', '1', '').send();
   //   const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
   //   const sponsor = privateKeyWrapper('//Alice');
   //   const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
@@ -223,7 +223,7 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
 
-    let result = await collectionHelpers.methods.createERC721MetadataNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
+    let result = await collectionHelpers.methods.createERC721MetadataCompatibleNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
     const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
     const collectionId = helper.ethAddress.extractCollectionId(collectionIdAddress);
     const collection = helper.nft.getCollectionObject(collectionId);
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -83,14 +83,12 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const receiver = helper.eth.createAccount();
 
-    const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);
-    let result = await collectionHelper.methods.createERC721MetadataNFTCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});
-    const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
+    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', 'a', 'b', tokenPrefix);
     const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
     
     const nextTokenId = await contract.methods.nextTokenId().call();
     expect(nextTokenId).to.be.equal('1');
-    result = await contract.methods.mint(
+    const result = await contract.methods.mint(
       receiver,
       nextTokenId,
     ).send();
@@ -115,7 +113,7 @@
   });
 
   itEth('TokenURI from url', async ({helper}) => {
-    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'url', 'Token URI');
+    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URI', 'Token URI');
     expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');
   });
 
@@ -126,7 +124,7 @@
 
   itEth('TokenURI from baseURI + suffix', async ({helper}) => {
     const suffix = '/some/suffix';
-    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'suffix', suffix);
+    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URISuffix', suffix);
     expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);
   });
 });
@@ -146,7 +144,7 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const receiver = helper.eth.createAccount();
 
-    const {collectionAddress} = await helper.eth.createERC721MetadataNFTCollection(owner, 'Mint collection', '6', '6', '');
+    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', '6', '6', '');
     const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
     const nextTokenId = await contract.methods.nextTokenId().call();
 
modifiedtests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth
--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -101,7 +101,7 @@
 
   itEth('Can perform mint()', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
-    const {collectionAddress} = await helper.eth.createERC721MetadataNFTCollection(owner, 'A', 'A', 'A', '');
+    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'A', 'A', 'A', '');
     const caller = await helper.eth.createAccountWithBalance(donor);
     const receiver = helper.eth.createAccount();
 
modifiedtests/src/eth/reFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -124,7 +124,7 @@
   itEth('Can perform mint()', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const receiver = helper.eth.createAccount();
-    const {collectionAddress} = await helper.eth.createERC721MetadataRFTCollection(owner, 'Minty', '6', '6', '');
+    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Minty', '6', '6', '');
     const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
     
     const nextTokenId = await contract.methods.nextTokenId().call();
@@ -147,7 +147,7 @@
   itEth('Can perform mintBulk()', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const receiver = helper.eth.createAccount();
-    const {collectionAddress} = await helper.eth.createERC721MetadataRFTCollection(owner, 'MintBulky', '6', '6', '');
+    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'MintBulky', '6', '6', '');
     const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
 
     {
modifiedtests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth
before · tests/src/eth/reFungibleToken.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 {Pallets, requirePalletsOrSkip} from '../util/playgrounds';18import {EthUniqueHelper, expect, itEth, usingEthPlaygrounds} from './util/playgrounds';19import {IKeyringPair} from '@polkadot/types/types';20import {Contract} from 'web3-eth-contract';212223describe('Refungible token: Information getting', () => {24  let donor: IKeyringPair;25  let alice: IKeyringPair;2627  before(async function() {28    await usingEthPlaygrounds(async (helper, privateKey) => {29      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);3031      donor = privateKey('//Alice');32      [alice] = await helper.arrange.createAccounts([20n], donor);33    });34  });3536  itEth('totalSupply', async ({helper}) => {37    const caller = await helper.eth.createAccountWithBalance(donor);38    const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'MUON'});39    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: caller});4041    const contract = helper.ethNativeContract.rftTokenById(collection.collectionId, tokenId, caller);42    const totalSupply = await contract.methods.totalSupply().call();43    expect(totalSupply).to.equal('200');44  });4546  itEth('balanceOf', async ({helper}) => {47    const caller = await helper.eth.createAccountWithBalance(donor);48    const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'MUON'});49    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: caller});5051    const contract = helper.ethNativeContract.rftTokenById(collection.collectionId, tokenId, caller);52    const balance = await contract.methods.balanceOf(caller).call();53    expect(balance).to.equal('200');54  });5556  itEth('decimals', async ({helper}) => {57    const caller = await helper.eth.createAccountWithBalance(donor);58    const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'MUON'});59    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: caller});6061    const contract = helper.ethNativeContract.rftTokenById(collection.collectionId, tokenId, caller);62    const decimals = await contract.methods.decimals().call();63    expect(decimals).to.equal('0');64  });65});6667// FIXME: Need erc721 for ReFubgible.68describe('Check ERC721 token URI for ReFungible', () => {69  let donor: IKeyringPair;7071  before(async function() {72    await usingEthPlaygrounds(async (helper, privateKey) => {73      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);7475      donor = privateKey('//Alice');76    });77  });7879  async function setup(helper: EthUniqueHelper, tokenPrefix: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {80    const owner = await helper.eth.createAccountWithBalance(donor);81    const receiver = helper.eth.createAccount();8283    const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);84    let result = await collectionHelper.methods.createERC721MetadataNFTCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});85    const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);86    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);87    88    const nextTokenId = await contract.methods.nextTokenId().call();89    expect(nextTokenId).to.be.equal('1');90    result = await contract.methods.mint(91      receiver,92      nextTokenId,93    ).send();9495    if (propertyKey && propertyValue) {96      // Set URL or suffix97      await contract.methods.setProperty(nextTokenId, propertyKey, Buffer.from(propertyValue)).send();98    }99100    const event = result.events.Transfer;101    expect(event.address).to.be.equal(collectionAddress);102    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');103    expect(event.returnValues.to).to.be.equal(receiver);104    expect(event.returnValues.tokenId).to.be.equal(nextTokenId);105106    return {contract, nextTokenId};107  }108109  itEth('Empty tokenURI', async ({helper}) => {110    const {contract, nextTokenId} = await setup(helper, '');111    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');112  });113114  itEth('TokenURI from url', async ({helper}) => {115    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'url', 'Token URI');116    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');117  });118119  itEth('TokenURI from baseURI + tokenId', async ({helper}) => {120    const {contract, nextTokenId} = await setup(helper, 'BaseURI_');121    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + nextTokenId);122  });123124  itEth('TokenURI from baseURI + suffix', async ({helper}) => {125    const suffix = '/some/suffix';126    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'suffix', suffix);127    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);128  });129});130131describe('Refungible: Plain calls', () => {132  let donor: IKeyringPair;133  let alice: IKeyringPair;134135  before(async function() {136    await usingEthPlaygrounds(async (helper, privateKey) => {137      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);138139      donor = privateKey('//Alice');140      [alice] = await helper.arrange.createAccounts([50n], donor);141    });142  });143144  itEth('Can perform approve()', async ({helper}) => {145    const owner = await helper.eth.createAccountWithBalance(donor);146    const spender = helper.eth.createAccount();147    const collection = await helper.rft.mintCollection(alice);148    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});149150    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);151    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);152153    {154      const result = await contract.methods.approve(spender, 100).send({from: owner});155      const event = result.events.Approval;156      expect(event.address).to.be.equal(tokenAddress);157      expect(event.returnValues.owner).to.be.equal(owner);158      expect(event.returnValues.spender).to.be.equal(spender);159      expect(event.returnValues.value).to.be.equal('100');160    }161162    {163      const allowance = await contract.methods.allowance(owner, spender).call();164      expect(+allowance).to.equal(100);165    }166  });167168  itEth('Can perform transferFrom()', async ({helper}) => {169    const owner = await helper.eth.createAccountWithBalance(donor);170    const spender = await helper.eth.createAccountWithBalance(donor);171    const receiver = helper.eth.createAccount();172    const collection = await helper.rft.mintCollection(alice);173    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});174175    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);176    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);177178    await contract.methods.approve(spender, 100).send();179180    {181      const result = await contract.methods.transferFrom(owner, receiver, 49).send({from: spender});182      let event = result.events.Transfer;183      expect(event.address).to.be.equal(tokenAddress);184      expect(event.returnValues.from).to.be.equal(owner);185      expect(event.returnValues.to).to.be.equal(receiver);186      expect(event.returnValues.value).to.be.equal('49');187188      event = result.events.Approval;189      expect(event.address).to.be.equal(tokenAddress);190      expect(event.returnValues.owner).to.be.equal(owner);191      expect(event.returnValues.spender).to.be.equal(spender);192      expect(event.returnValues.value).to.be.equal('51');193    }194195    {196      const balance = await contract.methods.balanceOf(receiver).call();197      expect(+balance).to.equal(49);198    }199200    {201      const balance = await contract.methods.balanceOf(owner).call();202      expect(+balance).to.equal(151);203    }204  });205206  itEth('Can perform transfer()', async ({helper}) => {207    const owner = await helper.eth.createAccountWithBalance(donor);208    const receiver = helper.eth.createAccount();209    const collection = await helper.rft.mintCollection(alice);210    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});211212    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);213    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);214215    {216      const result = await contract.methods.transfer(receiver, 50).send({from: owner});217      const event = result.events.Transfer;218      expect(event.address).to.be.equal(tokenAddress);219      expect(event.returnValues.from).to.be.equal(owner);220      expect(event.returnValues.to).to.be.equal(receiver);221      expect(event.returnValues.value).to.be.equal('50');222    }223224    {225      const balance = await contract.methods.balanceOf(owner).call();226      expect(+balance).to.equal(150);227    }228229    {230      const balance = await contract.methods.balanceOf(receiver).call();231      expect(+balance).to.equal(50);232    }233  });234235  itEth('Can perform repartition()', async ({helper}) => {236    const owner = await helper.eth.createAccountWithBalance(donor);237    const receiver = await helper.eth.createAccountWithBalance(donor);238    const collection = await helper.rft.mintCollection(alice);239    const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});240241    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);242    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);243244    await contract.methods.repartition(200).send({from: owner});245    expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(200);246    await contract.methods.transfer(receiver, 110).send({from: owner});247    expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(90);248    expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(110);249250    await expect(contract.methods.repartition(80).send({from: owner})).to.eventually.be.rejected; // Transaction is reverted251252    await contract.methods.transfer(receiver, 90).send({from: owner});253    expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(0);254    expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(200);255256    await contract.methods.repartition(150).send({from: receiver});257    await expect(contract.methods.transfer(owner, 160).send({from: receiver})).to.eventually.be.rejected; // Transaction is reverted258    expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(150);259  });260261  itEth('Can repartition with increased amount', async ({helper}) => {262    const owner = await helper.eth.createAccountWithBalance(donor);263    const collection = await helper.rft.mintCollection(alice);264    const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});265266    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);267    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);268269    const result = await contract.methods.repartition(200).send();270271    const event = result.events.Transfer;272    expect(event.address).to.be.equal(tokenAddress);273    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');274    expect(event.returnValues.to).to.be.equal(owner);275    expect(event.returnValues.value).to.be.equal('100');276  });277278  itEth('Can repartition with decreased amount', async ({helper}) => {279    const owner = await helper.eth.createAccountWithBalance(donor);280    const collection = await helper.rft.mintCollection(alice);281    const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});282283    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);284    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);285286    const result = await contract.methods.repartition(50).send();287    const event = result.events.Transfer;288    expect(event.address).to.be.equal(tokenAddress);289    expect(event.returnValues.from).to.be.equal(owner);290    expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');291    expect(event.returnValues.value).to.be.equal('50');292  });293294  itEth('Receiving Transfer event on burning into full ownership', async ({helper}) => {295    const caller = await helper.eth.createAccountWithBalance(donor);296    const receiver = await helper.eth.createAccountWithBalance(donor);297    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Devastation', '6', '6');298    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);299300    const tokenId = await contract.methods.nextTokenId().call();301    await contract.methods.mint(caller, tokenId).send();302    const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);303    const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, caller);304305    await tokenContract.methods.repartition(2).send();306    await tokenContract.methods.transfer(receiver, 1).send();307308    const events: any = [];309    contract.events.allEvents((_: any, event: any) => {310      events.push(event);311    });312    await tokenContract.methods.burnFrom(caller, 1).send();313314    const event = events[0];315    expect(event.address).to.be.equal(collectionAddress);316    expect(event.returnValues.from).to.be.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');317    expect(event.returnValues.to).to.be.equal(receiver);318    expect(event.returnValues.tokenId).to.be.equal(tokenId);319  });320});321322describe('Refungible: Fees', () => {323  let donor: IKeyringPair;324  let alice: IKeyringPair;325326  before(async function() {327    await usingEthPlaygrounds(async (helper, privateKey) => {328      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);329330      donor = privateKey('//Alice');331      [alice] = await helper.arrange.createAccounts([50n], donor);332    });333  });334335  itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {336    const owner = await helper.eth.createAccountWithBalance(donor);337    const spender = helper.eth.createAccount();338    const collection = await helper.rft.mintCollection(alice);339    const {tokenId} = await collection.mintToken(alice, 100n, {Ethereum: owner});340341    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);342    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);343344    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, 100).send({from: owner}));345    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));346  });347348  itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {349    const owner = await helper.eth.createAccountWithBalance(donor);350    const spender = await helper.eth.createAccountWithBalance(donor);351    const collection = await helper.rft.mintCollection(alice);352    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});353354    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);355    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);356357    await contract.methods.approve(spender, 100).send({from: owner});358359    const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, 100).send({from: spender}));360    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));361  });362363  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {364    const owner = await helper.eth.createAccountWithBalance(donor);365    const receiver = helper.eth.createAccount();366    const collection = await helper.rft.mintCollection(alice);367    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});368369    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);370    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);371372    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, 100).send({from: owner}));373    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));374  });375});376377describe('Refungible: Substrate calls', () => {378  let donor: IKeyringPair;379  let alice: IKeyringPair;380381  before(async function() {382    await usingEthPlaygrounds(async (helper, privateKey) => {383      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);384385      donor = privateKey('//Alice');386      [alice] = await helper.arrange.createAccounts([50n], donor);387    });388  });389390  itEth('Events emitted for approve()', async ({helper}) => {391    const receiver = helper.eth.createAccount();392    const collection = await helper.rft.mintCollection(alice);393    const token = await collection.mintToken(alice, 200n);394395    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, token.tokenId);396    const contract = helper.ethNativeContract.rftToken(tokenAddress);397398    const events: any = [];399    contract.events.allEvents((_: any, event: any) => {400      events.push(event);401    });402    expect(await token.approve(alice, {Ethereum: receiver}, 100n)).to.be.true;403404    const event = events[0];405    expect(event.event).to.be.equal('Approval');406    expect(event.address).to.be.equal(tokenAddress);407    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));408    expect(event.returnValues.spender).to.be.equal(receiver);409    expect(event.returnValues.value).to.be.equal('100');410  });411412  itEth('Events emitted for transferFrom()', async ({helper}) => {413    const [bob] = await helper.arrange.createAccounts([10n], donor);414    const receiver = helper.eth.createAccount();415    const collection = await helper.rft.mintCollection(alice);416    const token = await collection.mintToken(alice, 200n);417    await token.approve(alice, {Substrate: bob.address}, 100n);418419    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, token.tokenId);420    const contract = helper.ethNativeContract.rftToken(tokenAddress);421422    const events: any = [];423    contract.events.allEvents((_: any, event: any) => {424      events.push(event);425    });426427    expect(await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver},  51n)).to.be.true;428429    let event = events[0];430    expect(event.event).to.be.equal('Transfer');431    expect(event.address).to.be.equal(tokenAddress);432    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));433    expect(event.returnValues.to).to.be.equal(receiver);434    expect(event.returnValues.value).to.be.equal('51');435436    event = events[1];437    expect(event.event).to.be.equal('Approval');438    expect(event.address).to.be.equal(tokenAddress);439    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));440    expect(event.returnValues.spender).to.be.equal(helper.address.substrateToEth(bob.address));441    expect(event.returnValues.value).to.be.equal('49');442  });443444  itEth('Events emitted for transfer()', async ({helper}) => {445    const receiver = helper.eth.createAccount();446    const collection = await helper.rft.mintCollection(alice);447    const token = await collection.mintToken(alice, 200n);448449    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, token.tokenId);450    const contract = helper.ethNativeContract.rftToken(tokenAddress);451452    const events: any = [];453    contract.events.allEvents((_: any, event: any) => {454      events.push(event);455    });456457    expect(await token.transfer(alice, {Ethereum: receiver},  51n)).to.be.true;458459    const event = events[0];460    expect(event.event).to.be.equal('Transfer');461    expect(event.address).to.be.equal(tokenAddress);462    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));463    expect(event.returnValues.to).to.be.equal(receiver);464    expect(event.returnValues.value).to.be.equal('51');465  });466});467468describe('ERC 1633 implementation', () => {469  let donor: IKeyringPair;470471  before(async function() {472    await usingEthPlaygrounds(async (helper, privateKey) => {473      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);474475      donor = privateKey('//Alice');476    });477  });478479  itEth('Default parent token address and id', async ({helper}) => {480    const owner = await helper.eth.createAccountWithBalance(donor);481482    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Sands', '', 'GRAIN');483    const collectionContract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);484    485    const tokenId = await collectionContract.methods.nextTokenId().call();486    await collectionContract.methods.mint(owner, tokenId).send();487    const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);488    const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, owner);489490    expect(await tokenContract.methods.parentToken().call()).to.be.equal(collectionAddress);491    expect(await tokenContract.methods.parentTokenId().call()).to.be.equal(tokenId);492  });493});
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
@@ -186,11 +186,11 @@
     return {collectionId, collectionAddress};
   }
 
-  async createERC721MetadataNFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
+  async createERC721MetadataCompatibleNFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
     const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();
     const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
         
-    const result = await collectionHelper.methods.createERC721MetadataNFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
+    const result = await collectionHelper.methods.createERC721MetadataCompatibleNFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
 
     const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
     const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);
@@ -210,11 +210,11 @@
     return {collectionId, collectionAddress};
   }
 
-  async createERC721MetadataRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
+  async createERC721MetadataCompatibleRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
     const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();
     const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
         
-    const result = await collectionHelper.methods.createERC721MetadataRFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
+    const result = await collectionHelper.methods.createERC721MetadataCompatibleRFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
 
     const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
     const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);