git.delta.rocks / unique-network / refs/commits / 48f959311e08

difftreelog

chore code review requests

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

8 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -709,9 +709,6 @@
 		/// Value "1" ERC721 metadata supported.
 		pub const ERC721_METADATA_SUPPORTED: &[u8] = b"1";
 
-		/// Value "0" ERC721 metadata supported.
-		pub const ERC721_METADATA_UNSUPPORTED: &[u8] = b"0";
-
 		/// Value for [`ERC721_METADATA`].
 		pub fn erc721() -> up_data_structs::PropertyValue {
 			property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -104,7 +104,7 @@
 		.try_push(up_data_structs::PropertyKeyPermission {
 			key: key::url(),
 			permission: up_data_structs::PropertyPermission {
-				mutable: false,
+				mutable: true,
 				collection_admin: true,
 				token_owner: false,
 			},
@@ -115,17 +115,6 @@
 		token_property_permissions
 			.try_push(up_data_structs::PropertyKeyPermission {
 				key: key::suffix(),
-				permission: up_data_structs::PropertyPermission {
-					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,
modifiedtests/src/deprecated-helpers/helpers.tsdiffbeforeafterboth
--- a/tests/src/deprecated-helpers/helpers.ts
+++ b/tests/src/deprecated-helpers/helpers.ts
@@ -433,7 +433,6 @@
   mode: {type: 'NFT'},
   name: 'name',
   tokenPrefix: 'prefix',
-  properties: [{key: 'ERC721Metadata', value: '1'}],
 };
 
 export async function
modifiedtests/src/eth/base.test.tsdiffbeforeafterboth
--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -80,7 +80,7 @@
     await usingEthPlaygrounds(async (helper, privateKey) => {
       const donor = privateKey('//Alice');
       const [alice] = await helper.arrange.createAccounts([10n], donor);
-      ({collectionId: collection} = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'}));
+      ({collectionId: collection} = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test', properties: [{key: 'ERC721Metadata', value: '1'}]}));
       minter = helper.eth.createAccount();
     });
   });
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -501,7 +501,7 @@
 
   itEth('Returns collection name', async ({helper}) => {
     const caller = await helper.eth.createAccountWithBalance(donor);
-    const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});
+    const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE', properties: [{key: 'ERC721Metadata', value: '1'}]});
 
     const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);
     const name = await contract.methods.name().call();
@@ -510,7 +510,7 @@
 
   itEth('Returns symbol name', async ({helper}) => {
     const caller = await helper.eth.createAccountWithBalance(donor);
-    const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});
+    const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE', properties: [{key: 'ERC721Metadata', value: '1'}]});
 
     const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);
     const symbol = await contract.methods.symbol().call();
modifiedtests/src/eth/reFungible.test.tsdiffbeforeafterboth
before · tests/src/eth/reFungible.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 {expect, itEth, usingEthPlaygrounds} from './util/playgrounds';19import {IKeyringPair} from '@polkadot/types/types';2021describe('Refungible: Information getting', () => {22  let donor: IKeyringPair;2324  before(async function() {25    await usingEthPlaygrounds(async (helper, privateKey) => {26      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);2728      donor = privateKey('//Alice');29    });30  });3132  itEth('totalSupply', async ({helper}) => {33    const caller = await helper.eth.createAccountWithBalance(donor);34    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'TotalSupply', '6', '6');35    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);36    const nextTokenId = await contract.methods.nextTokenId().call();37    await contract.methods.mint(caller, nextTokenId).send();38    const totalSupply = await contract.methods.totalSupply().call();39    expect(totalSupply).to.equal('1');40  });4142  itEth('balanceOf', async ({helper}) => {43    const caller = await helper.eth.createAccountWithBalance(donor);44    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'BalanceOf', '6', '6');45    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);4647    {48      const nextTokenId = await contract.methods.nextTokenId().call();49      await contract.methods.mint(caller, nextTokenId).send();50    }51    {52      const nextTokenId = await contract.methods.nextTokenId().call();53      await contract.methods.mint(caller, nextTokenId).send();54    }55    {56      const nextTokenId = await contract.methods.nextTokenId().call();57      await contract.methods.mint(caller, nextTokenId).send();58    }5960    const balance = await contract.methods.balanceOf(caller).call();61    expect(balance).to.equal('3');62  });6364  itEth('ownerOf', async ({helper}) => {65    const caller = await helper.eth.createAccountWithBalance(donor);66    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf', '6', '6');67    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);6869    const tokenId = await contract.methods.nextTokenId().call();70    await contract.methods.mint(caller, tokenId).send();7172    const owner = await contract.methods.ownerOf(tokenId).call();73    expect(owner).to.equal(caller);74  });7576  itEth('ownerOf after burn', async ({helper}) => {77    const caller = await helper.eth.createAccountWithBalance(donor);78    const receiver = helper.eth.createAccount();79    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf-AfterBurn', '6', '6');80    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);8182    const tokenId = await contract.methods.nextTokenId().call();83    await contract.methods.mint(caller, tokenId).send();84    const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);8586    await tokenContract.methods.repartition(2).send();87    await tokenContract.methods.transfer(receiver, 1).send();8889    await tokenContract.methods.burnFrom(caller, 1).send();9091    const owner = await contract.methods.ownerOf(tokenId).call();92    expect(owner).to.equal(receiver);93  });9495  itEth('ownerOf for partial ownership', async ({helper}) => {96    const caller = await helper.eth.createAccountWithBalance(donor);97    const receiver = helper.eth.createAccount();98    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Partial-OwnerOf', '6', '6');99    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);100101    const tokenId = await contract.methods.nextTokenId().call();102    await contract.methods.mint(caller, tokenId).send();103    const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);104105    await tokenContract.methods.repartition(2).send();106    await tokenContract.methods.transfer(receiver, 1).send();107108    const owner = await contract.methods.ownerOf(tokenId).call();109    expect(owner).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');110  });111});112113describe('Refungible: Plain calls', () => {114  let donor: IKeyringPair;115116  before(async function() {117    await usingEthPlaygrounds(async (helper, privateKey) => {118      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);119120      donor = privateKey('//Alice');121    });122  });123124  itEth('Can perform mint()', async ({helper}) => {125    const owner = await helper.eth.createAccountWithBalance(donor);126    const receiver = helper.eth.createAccount();127    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Minty', '6', '6', '');128    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);129    130    const nextTokenId = await contract.methods.nextTokenId().call();131    expect(nextTokenId).to.be.equal('1');132    const result = await contract.methods.mintWithTokenURI(133      receiver,134      nextTokenId,135      'Test URI',136    ).send();137138    const event = result.events.Transfer;139    expect(event.address).to.equal(collectionAddress);140    expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');141    expect(event.returnValues.to).to.equal(receiver);142    expect(event.returnValues.tokenId).to.equal(nextTokenId);143144    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');145  });146147  itEth('Can perform mintBulk()', async ({helper}) => {148    const owner = await helper.eth.createAccountWithBalance(donor);149    const receiver = helper.eth.createAccount();150    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'MintBulky', '6', '6', '');151    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);152153    {154      const nextTokenId = await contract.methods.nextTokenId().call();155      expect(nextTokenId).to.be.equal('1');156      const result = await contract.methods.mintBulkWithTokenURI(157        receiver,158        [159          [nextTokenId, 'Test URI 0'],160          [+nextTokenId + 1, 'Test URI 1'],161          [+nextTokenId + 2, 'Test URI 2'],162        ],163      ).send();164165      const events = result.events.Transfer;166      for (let i = 0; i < 2; i++) {167        const event = events[i];168        expect(event.address).to.equal(collectionAddress);169        expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');170        expect(event.returnValues.to).to.equal(receiver);171        expect(event.returnValues.tokenId).to.equal(String(+nextTokenId + i));172      }173174      expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI 0');175      expect(await contract.methods.tokenURI(+nextTokenId + 1).call()).to.be.equal('Test URI 1');176      expect(await contract.methods.tokenURI(+nextTokenId + 2).call()).to.be.equal('Test URI 2');177    }178  });179180  itEth('Can perform burn()', async ({helper}) => {181    const caller = await helper.eth.createAccountWithBalance(donor);182    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Burny', '6', '6');183    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);184185    const tokenId = await contract.methods.nextTokenId().call();186    await contract.methods.mint(caller, tokenId).send();187    {188      const result = await contract.methods.burn(tokenId).send();189      const event = result.events.Transfer;190      expect(event.address).to.equal(collectionAddress);191      expect(event.returnValues.from).to.equal(caller);192      expect(event.returnValues.to).to.equal('0x0000000000000000000000000000000000000000');193      expect(event.returnValues.tokenId).to.equal(tokenId.toString());194    }195  });196197  itEth('Can perform transferFrom()', async ({helper}) => {198    const caller = await helper.eth.createAccountWithBalance(donor);199    const receiver = helper.eth.createAccount();200    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'TransferFromy', '6', '6');201    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);202203    const tokenId = await contract.methods.nextTokenId().call();204    const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);205    await contract.methods.mint(caller, tokenId).send();206207    const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, caller);208    await tokenContract.methods.repartition(15).send();209210    {211      const tokenEvents: any = [];212      tokenContract.events.allEvents((_: any, event: any) => {213        tokenEvents.push(event);214      });215      const result = await contract.methods.transferFrom(caller, receiver, tokenId).send();216217      let event = result.events.Transfer;218      expect(event.address).to.equal(collectionAddress);219      expect(event.returnValues.from).to.equal(caller);220      expect(event.returnValues.to).to.equal(receiver);221      expect(event.returnValues.tokenId).to.equal(tokenId.toString());222223      event = tokenEvents[0];224      expect(event.address).to.equal(tokenAddress);225      expect(event.returnValues.from).to.equal(caller);226      expect(event.returnValues.to).to.equal(receiver);227      expect(event.returnValues.value).to.equal('15');228    }229230    {231      const balance = await contract.methods.balanceOf(receiver).call();232      expect(+balance).to.equal(1);233    }234235    {236      const balance = await contract.methods.balanceOf(caller).call();237      expect(+balance).to.equal(0);238    }239  });240241  itEth('Can perform transfer()', async ({helper}) => {242    const caller = await helper.eth.createAccountWithBalance(donor);243    const receiver = helper.eth.createAccount();244    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry', '6', '6');245    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);246247    const tokenId = await contract.methods.nextTokenId().call();248    await contract.methods.mint(caller, tokenId).send();249250    {251      const result = await contract.methods.transfer(receiver, tokenId).send();252      253      const event = result.events.Transfer;254      expect(event.address).to.equal(collectionAddress);255      expect(event.returnValues.from).to.equal(caller);256      expect(event.returnValues.to).to.equal(receiver);257      expect(event.returnValues.tokenId).to.equal(tokenId.toString());258    }259260    {261      const balance = await contract.methods.balanceOf(caller).call();262      expect(+balance).to.equal(0);263    }264265    {266      const balance = await contract.methods.balanceOf(receiver).call();267      expect(+balance).to.equal(1);268    }269  });270271  itEth('transfer event on transfer from partial ownership to full ownership', async ({helper}) => {272    const caller = await helper.eth.createAccountWithBalance(donor);273    const receiver = helper.eth.createAccount();274    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Partial-to-Full', '6', '6');275    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);276277    const tokenId = await contract.methods.nextTokenId().call();278    await contract.methods.mint(caller, tokenId).send();279280    const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);281282    await tokenContract.methods.repartition(2).send();283    await tokenContract.methods.transfer(receiver, 1).send();284285    const events: any = [];286    contract.events.allEvents((_: any, event: any) => {287      events.push(event);288    });289    await tokenContract.methods.transfer(receiver, 1).send();290291    const event = events[0];292    expect(event.address).to.equal(collectionAddress);293    expect(event.returnValues.from).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');294    expect(event.returnValues.to).to.equal(receiver);295    expect(event.returnValues.tokenId).to.equal(tokenId.toString());296  });297298  itEth('transfer event on transfer from full ownership to partial ownership', async ({helper}) => {299    const caller = await helper.eth.createAccountWithBalance(donor);300    const receiver = helper.eth.createAccount();301    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Full-to-Partial', '6', '6');302    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);303304    const tokenId = await contract.methods.nextTokenId().call();305    await contract.methods.mint(caller, tokenId).send();306307    const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);308309    await tokenContract.methods.repartition(2).send();310311    const events: any = [];312    contract.events.allEvents((_: any, event: any) => {313      events.push(event);314    });315    await tokenContract.methods.transfer(receiver, 1).send();316317    const event = events[0];318    expect(event.address).to.equal(collectionAddress);319    expect(event.returnValues.from).to.equal(caller);320    expect(event.returnValues.to).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');321    expect(event.returnValues.tokenId).to.equal(tokenId.toString());322  });323});324325describe('RFT: Fees', () => {326  let donor: IKeyringPair;327328  before(async function() {329    await usingEthPlaygrounds(async (helper, privateKey) => {330      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);331332      donor = privateKey('//Alice');333    });334  });335336  itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {337    const caller = await helper.eth.createAccountWithBalance(donor);338    const receiver = helper.eth.createAccount();339    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer-From', '6', '6');340    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);341342    const tokenId = await contract.methods.nextTokenId().call();343    await contract.methods.mint(caller, tokenId).send();344345    const cost = await helper.eth.recordCallFee(caller, () => contract.methods.transferFrom(caller, receiver, tokenId).send());346    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));347    expect(cost > 0n);348  });349350  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {351    const caller = await helper.eth.createAccountWithBalance(donor);352    const receiver = helper.eth.createAccount();353    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer', '6', '6');354    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);355356    const tokenId = await contract.methods.nextTokenId().call();357    await contract.methods.mint(caller, tokenId).send();358359    const cost = await helper.eth.recordCallFee(caller, () => contract.methods.transfer(receiver, tokenId).send());360    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));361    expect(cost > 0n);362  });363});364365describe('Common metadata', () => {366  let donor: IKeyringPair;367  let alice: IKeyringPair;368369  before(async function() {370    await usingEthPlaygrounds(async (helper, privateKey) => {371      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);372373      donor = privateKey('//Alice');374      [alice] = await helper.arrange.createAccounts([20n], donor);375    });376  });377378  itEth('Returns collection name', async ({helper}) => {379    const caller = helper.eth.createAccount();380    const collection = await helper.rft.mintCollection(alice, {name: 'Leviathan', tokenPrefix: '11'});381    382    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'rft', caller);383    const name = await contract.methods.name().call();384    expect(name).to.equal('Leviathan');385  });386387  itEth('Returns symbol name', async ({helper}) => {388    const caller = await helper.eth.createAccountWithBalance(donor);389    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'Leviathan', tokenPrefix: '12'});390    const contract = helper.ethNativeContract.collectionById(collectionId, 'rft', caller);391    const symbol = await contract.methods.symbol().call();392    expect(symbol).to.equal('12');393  });394});
after · tests/src/eth/reFungible.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 {expect, itEth, usingEthPlaygrounds} from './util/playgrounds';19import {IKeyringPair} from '@polkadot/types/types';2021describe('Refungible: Information getting', () => {22  let donor: IKeyringPair;2324  before(async function() {25    await usingEthPlaygrounds(async (helper, privateKey) => {26      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);2728      donor = privateKey('//Alice');29    });30  });3132  itEth('totalSupply', async ({helper}) => {33    const caller = await helper.eth.createAccountWithBalance(donor);34    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'TotalSupply', '6', '6');35    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);36    const nextTokenId = await contract.methods.nextTokenId().call();37    await contract.methods.mint(caller, nextTokenId).send();38    const totalSupply = await contract.methods.totalSupply().call();39    expect(totalSupply).to.equal('1');40  });4142  itEth('balanceOf', async ({helper}) => {43    const caller = await helper.eth.createAccountWithBalance(donor);44    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'BalanceOf', '6', '6');45    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);4647    {48      const nextTokenId = await contract.methods.nextTokenId().call();49      await contract.methods.mint(caller, nextTokenId).send();50    }51    {52      const nextTokenId = await contract.methods.nextTokenId().call();53      await contract.methods.mint(caller, nextTokenId).send();54    }55    {56      const nextTokenId = await contract.methods.nextTokenId().call();57      await contract.methods.mint(caller, nextTokenId).send();58    }5960    const balance = await contract.methods.balanceOf(caller).call();61    expect(balance).to.equal('3');62  });6364  itEth('ownerOf', async ({helper}) => {65    const caller = await helper.eth.createAccountWithBalance(donor);66    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf', '6', '6');67    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);6869    const tokenId = await contract.methods.nextTokenId().call();70    await contract.methods.mint(caller, tokenId).send();7172    const owner = await contract.methods.ownerOf(tokenId).call();73    expect(owner).to.equal(caller);74  });7576  itEth('ownerOf after burn', async ({helper}) => {77    const caller = await helper.eth.createAccountWithBalance(donor);78    const receiver = helper.eth.createAccount();79    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf-AfterBurn', '6', '6');80    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);8182    const tokenId = await contract.methods.nextTokenId().call();83    await contract.methods.mint(caller, tokenId).send();84    const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);8586    await tokenContract.methods.repartition(2).send();87    await tokenContract.methods.transfer(receiver, 1).send();8889    await tokenContract.methods.burnFrom(caller, 1).send();9091    const owner = await contract.methods.ownerOf(tokenId).call();92    expect(owner).to.equal(receiver);93  });9495  itEth('ownerOf for partial ownership', async ({helper}) => {96    const caller = await helper.eth.createAccountWithBalance(donor);97    const receiver = helper.eth.createAccount();98    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Partial-OwnerOf', '6', '6');99    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);100101    const tokenId = await contract.methods.nextTokenId().call();102    await contract.methods.mint(caller, tokenId).send();103    const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);104105    await tokenContract.methods.repartition(2).send();106    await tokenContract.methods.transfer(receiver, 1).send();107108    const owner = await contract.methods.ownerOf(tokenId).call();109    expect(owner).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');110  });111});112113describe('Refungible: Plain calls', () => {114  let donor: IKeyringPair;115116  before(async function() {117    await usingEthPlaygrounds(async (helper, privateKey) => {118      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);119120      donor = privateKey('//Alice');121    });122  });123124  itEth('Can perform mint()', async ({helper}) => {125    const owner = await helper.eth.createAccountWithBalance(donor);126    const receiver = helper.eth.createAccount();127    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Minty', '6', '6', '');128    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);129    130    const nextTokenId = await contract.methods.nextTokenId().call();131    expect(nextTokenId).to.be.equal('1');132    const result = await contract.methods.mintWithTokenURI(133      receiver,134      nextTokenId,135      'Test URI',136    ).send();137138    const event = result.events.Transfer;139    expect(event.address).to.equal(collectionAddress);140    expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');141    expect(event.returnValues.to).to.equal(receiver);142    expect(event.returnValues.tokenId).to.equal(nextTokenId);143144    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');145  });146147  itEth('Can perform mintBulk()', async ({helper}) => {148    const owner = await helper.eth.createAccountWithBalance(donor);149    const receiver = helper.eth.createAccount();150    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'MintBulky', '6', '6', '');151    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);152153    {154      const nextTokenId = await contract.methods.nextTokenId().call();155      expect(nextTokenId).to.be.equal('1');156      const result = await contract.methods.mintBulkWithTokenURI(157        receiver,158        [159          [nextTokenId, 'Test URI 0'],160          [+nextTokenId + 1, 'Test URI 1'],161          [+nextTokenId + 2, 'Test URI 2'],162        ],163      ).send();164165      const events = result.events.Transfer;166      for (let i = 0; i < 2; i++) {167        const event = events[i];168        expect(event.address).to.equal(collectionAddress);169        expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');170        expect(event.returnValues.to).to.equal(receiver);171        expect(event.returnValues.tokenId).to.equal(String(+nextTokenId + i));172      }173174      expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI 0');175      expect(await contract.methods.tokenURI(+nextTokenId + 1).call()).to.be.equal('Test URI 1');176      expect(await contract.methods.tokenURI(+nextTokenId + 2).call()).to.be.equal('Test URI 2');177    }178  });179180  itEth('Can perform burn()', async ({helper}) => {181    const caller = await helper.eth.createAccountWithBalance(donor);182    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Burny', '6', '6');183    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);184185    const tokenId = await contract.methods.nextTokenId().call();186    await contract.methods.mint(caller, tokenId).send();187    {188      const result = await contract.methods.burn(tokenId).send();189      const event = result.events.Transfer;190      expect(event.address).to.equal(collectionAddress);191      expect(event.returnValues.from).to.equal(caller);192      expect(event.returnValues.to).to.equal('0x0000000000000000000000000000000000000000');193      expect(event.returnValues.tokenId).to.equal(tokenId.toString());194    }195  });196197  itEth('Can perform transferFrom()', async ({helper}) => {198    const caller = await helper.eth.createAccountWithBalance(donor);199    const receiver = helper.eth.createAccount();200    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'TransferFromy', '6', '6');201    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);202203    const tokenId = await contract.methods.nextTokenId().call();204    const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);205    await contract.methods.mint(caller, tokenId).send();206207    const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, caller);208    await tokenContract.methods.repartition(15).send();209210    {211      const tokenEvents: any = [];212      tokenContract.events.allEvents((_: any, event: any) => {213        tokenEvents.push(event);214      });215      const result = await contract.methods.transferFrom(caller, receiver, tokenId).send();216217      let event = result.events.Transfer;218      expect(event.address).to.equal(collectionAddress);219      expect(event.returnValues.from).to.equal(caller);220      expect(event.returnValues.to).to.equal(receiver);221      expect(event.returnValues.tokenId).to.equal(tokenId.toString());222223      event = tokenEvents[0];224      expect(event.address).to.equal(tokenAddress);225      expect(event.returnValues.from).to.equal(caller);226      expect(event.returnValues.to).to.equal(receiver);227      expect(event.returnValues.value).to.equal('15');228    }229230    {231      const balance = await contract.methods.balanceOf(receiver).call();232      expect(+balance).to.equal(1);233    }234235    {236      const balance = await contract.methods.balanceOf(caller).call();237      expect(+balance).to.equal(0);238    }239  });240241  itEth('Can perform transfer()', async ({helper}) => {242    const caller = await helper.eth.createAccountWithBalance(donor);243    const receiver = helper.eth.createAccount();244    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry', '6', '6');245    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);246247    const tokenId = await contract.methods.nextTokenId().call();248    await contract.methods.mint(caller, tokenId).send();249250    {251      const result = await contract.methods.transfer(receiver, tokenId).send();252      253      const event = result.events.Transfer;254      expect(event.address).to.equal(collectionAddress);255      expect(event.returnValues.from).to.equal(caller);256      expect(event.returnValues.to).to.equal(receiver);257      expect(event.returnValues.tokenId).to.equal(tokenId.toString());258    }259260    {261      const balance = await contract.methods.balanceOf(caller).call();262      expect(+balance).to.equal(0);263    }264265    {266      const balance = await contract.methods.balanceOf(receiver).call();267      expect(+balance).to.equal(1);268    }269  });270271  itEth('transfer event on transfer from partial ownership to full ownership', async ({helper}) => {272    const caller = await helper.eth.createAccountWithBalance(donor);273    const receiver = helper.eth.createAccount();274    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Partial-to-Full', '6', '6');275    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);276277    const tokenId = await contract.methods.nextTokenId().call();278    await contract.methods.mint(caller, tokenId).send();279280    const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);281282    await tokenContract.methods.repartition(2).send();283    await tokenContract.methods.transfer(receiver, 1).send();284285    const events: any = [];286    contract.events.allEvents((_: any, event: any) => {287      events.push(event);288    });289    await tokenContract.methods.transfer(receiver, 1).send();290291    const event = events[0];292    expect(event.address).to.equal(collectionAddress);293    expect(event.returnValues.from).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');294    expect(event.returnValues.to).to.equal(receiver);295    expect(event.returnValues.tokenId).to.equal(tokenId.toString());296  });297298  itEth('transfer event on transfer from full ownership to partial ownership', async ({helper}) => {299    const caller = await helper.eth.createAccountWithBalance(donor);300    const receiver = helper.eth.createAccount();301    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Full-to-Partial', '6', '6');302    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);303304    const tokenId = await contract.methods.nextTokenId().call();305    await contract.methods.mint(caller, tokenId).send();306307    const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);308309    await tokenContract.methods.repartition(2).send();310311    const events: any = [];312    contract.events.allEvents((_: any, event: any) => {313      events.push(event);314    });315    await tokenContract.methods.transfer(receiver, 1).send();316317    const event = events[0];318    expect(event.address).to.equal(collectionAddress);319    expect(event.returnValues.from).to.equal(caller);320    expect(event.returnValues.to).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');321    expect(event.returnValues.tokenId).to.equal(tokenId.toString());322  });323});324325describe('RFT: Fees', () => {326  let donor: IKeyringPair;327328  before(async function() {329    await usingEthPlaygrounds(async (helper, privateKey) => {330      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);331332      donor = privateKey('//Alice');333    });334  });335336  itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {337    const caller = await helper.eth.createAccountWithBalance(donor);338    const receiver = helper.eth.createAccount();339    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer-From', '6', '6');340    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);341342    const tokenId = await contract.methods.nextTokenId().call();343    await contract.methods.mint(caller, tokenId).send();344345    const cost = await helper.eth.recordCallFee(caller, () => contract.methods.transferFrom(caller, receiver, tokenId).send());346    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));347    expect(cost > 0n);348  });349350  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {351    const caller = await helper.eth.createAccountWithBalance(donor);352    const receiver = helper.eth.createAccount();353    const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer', '6', '6');354    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);355356    const tokenId = await contract.methods.nextTokenId().call();357    await contract.methods.mint(caller, tokenId).send();358359    const cost = await helper.eth.recordCallFee(caller, () => contract.methods.transfer(receiver, tokenId).send());360    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));361    expect(cost > 0n);362  });363});364365describe('Common metadata', () => {366  let donor: IKeyringPair;367  let alice: IKeyringPair;368369  before(async function() {370    await usingEthPlaygrounds(async (helper, privateKey) => {371      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);372373      donor = privateKey('//Alice');374      [alice] = await helper.arrange.createAccounts([20n], donor);375    });376  });377378  itEth('Returns collection name', async ({helper}) => {379    const caller = helper.eth.createAccount();380    const collection = await helper.rft.mintCollection(alice, {name: 'Leviathan', tokenPrefix: '11', properties: [{key: 'ERC721Metadata', value: '1'}]});381    382    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'rft', caller);383    const name = await contract.methods.name().call();384    expect(name).to.equal('Leviathan');385  });386387  itEth('Returns symbol name', async ({helper}) => {388    const caller = await helper.eth.createAccountWithBalance(donor);389    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'Leviathan', tokenPrefix: '12', properties: [{key: 'ERC721Metadata', value: '1'}]});390    const contract = helper.ethNativeContract.collectionById(collectionId, 'rft', caller);391    const symbol = await contract.methods.symbol().call();392    expect(symbol).to.equal('12');393  });394});
modifiedtests/src/nesting/properties.test.tsdiffbeforeafterboth
--- a/tests/src/nesting/properties.test.ts
+++ b/tests/src/nesting/properties.test.ts
@@ -35,7 +35,7 @@
     expect(collectionOption).is.not.null;
     let collection = collectionOption;
     expect(collection.tokenPropertyPermissions).to.be.empty;
-    expect(collection.properties).to.be.deep.equal([{key: 'ERC721Metadata', value: '1'}]);
+    expect(collection.properties).to.be.empty;
 
     const propertyPermissions = [
       {key: 'mindgame', permission: {collectionAdmin: true, mutable: false, tokenOwner: true}},
@@ -44,7 +44,6 @@
     await expect(await baseCollection.setTokenPropertyPermissions(alice, propertyPermissions)).to.be.true;
 
     const collectionProperties = [
-      {key: 'ERC721Metadata', value: '1'}, 
       {key: 'black_hole', value: 'LIGO'},
       {key: 'electron', value: 'come bond'}, 
     ];
@@ -80,10 +79,7 @@
   itSub('Properties are initially empty', async ({helper}) => {
     const collection = await helper.nft.mintCollection(alice);
     const properties = await collection.getProperties();
-    expect(properties).to.be.deep.equal([{
-      'key': 'ERC721Metadata',
-      'value': '1',
-    }]);
+    expect(properties).to.be.empty;
   });
 
   async function testSetsPropertiesForCollection(collection: UniqueBaseCollection) {
@@ -201,10 +197,7 @@
       .to.be.rejectedWith(/common\.NoPermission/);
 
     const properties = await collection.getProperties();
-    expect(properties).to.be.deep.equal([{
-      'key': 'ERC721Metadata',
-      'value': '1',
-    }]);
+    expect(properties).to.be.empty;
   }
 
   itSub('Fails to set properties in a NFT collection if not its onwer/administrator', async ({helper}) =>  {
@@ -257,10 +250,7 @@
       to.be.rejectedWith(/common\.PropertyLimitReached/);
 
     const properties = await collection.getProperties();
-    expect(properties).to.be.deep.equal([{
-      'key': 'ERC721Metadata',
-      'value': '1',
-    }]);
+    expect(properties).to.be.empty;
   }
 
   itSub('Fails to set more properties than it is allowed (NFT)', async ({helper}) =>  {
modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -1297,7 +1297,6 @@
   async mintCollection(signer: TSigner, collectionOptions: ICollectionCreationOptions, mode: 'NFT' | 'RFT'): Promise<UniqueBaseCollection> {
     collectionOptions = JSON.parse(JSON.stringify(collectionOptions)) as ICollectionCreationOptions; // Clone object
     collectionOptions.mode = (mode === 'NFT') ? {nft: null} : {refungible: null};
-    collectionOptions.properties = collectionOptions.properties || [{key: 'ERC721Metadata', value: '1'}];
     for (const key of ['name', 'description', 'tokenPrefix']) {
       if (typeof collectionOptions[key as 'name' | 'description' | 'tokenPrefix'] === 'string') collectionOptions[key as 'name' | 'description' | 'tokenPrefix'] = this.helper.util.str2vec(collectionOptions[key as 'name' | 'description' | 'tokenPrefix'] as string);
     }