git.delta.rocks / unique-network / refs/commits / 12fbdbdcf4df

difftreelog

tests(playgrounds): updates and revisions for older tests on playgrounds

Fahrrader2022-09-30parent: #e106ad4.patch.diff
in: master

9 files changed

modifiedtests/src/change-collection-owner.test.tsdiffbeforeafterboth
--- a/tests/src/change-collection-owner.test.ts
+++ b/tests/src/change-collection-owner.test.ts
@@ -31,11 +31,11 @@
   itSub('Changing owner changes owner address', async ({helper}) => {
     const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
     const beforeChanging = await helper.collection.getData(collection.collectionId);
-    expect(beforeChanging?.normalizedOwner).to.be.equal(helper.util.normalizeSubstrateAddress(alice.address));
+    expect(beforeChanging?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(alice.address));
 
     await collection.changeOwner(alice, bob.address);
     const afterChanging = await helper.collection.getData(collection.collectionId);
-    expect(afterChanging?.normalizedOwner).to.be.equal(helper.util.normalizeSubstrateAddress(bob.address));
+    expect(afterChanging?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(bob.address));
   });
 });
 
@@ -60,7 +60,7 @@
     await expect(changeOwnerTx()).to.be.rejectedWith(/common\.NoPermission/);
 
     const afterChanging = await helper.collection.getData(collection.collectionId);
-    expect(afterChanging?.normalizedOwner).to.be.equal(helper.util.normalizeSubstrateAddress(bob.address));
+    expect(afterChanging?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(bob.address));
   });
 
   itSub('New collectionOwner has access to sponsorship management operations in the collection', async ({helper}) => {
@@ -68,7 +68,7 @@
     await collection.changeOwner(alice, bob.address);
 
     const afterChanging = await helper.collection.getData(collection.collectionId);
-    expect(afterChanging?.normalizedOwner).to.be.equal(helper.util.normalizeSubstrateAddress(bob.address));
+    expect(afterChanging?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(bob.address));
 
     await collection.setSponsor(bob, charlie.address);
     await collection.confirmSponsorship(charlie);
@@ -97,7 +97,7 @@
     await collection.changeOwner(alice, bob.address);
     await collection.changeOwner(bob, charlie.address);
     const collectionData = await collection.getData();
-    expect(collectionData?.normalizedOwner).to.be.equal(helper.util.normalizeSubstrateAddress(charlie.address));
+    expect(collectionData?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(charlie.address));
   });
 });
 
@@ -140,7 +140,7 @@
     await expect(changeOwnerTx()).to.be.rejectedWith(/common\.NoPermission/);
 
     const afterChanging = await helper.collection.getData(collection.collectionId);
-    expect(afterChanging?.normalizedOwner).to.be.equal(helper.util.normalizeSubstrateAddress(bob.address));
+    expect(afterChanging?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(bob.address));
 
     const setSponsorTx = async () => collection.setSponsor(alice, charlie.address);
     const confirmSponsorshipTx = async () => collection.confirmSponsorship(alice);
modifiedtests/src/createCollection.test.tsdiffbeforeafterboth
--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -14,12 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
+import {IKeyringPair} from '@polkadot/types/types';
 import {usingPlaygrounds, expect, itSub, Pallets} from './util/playgrounds';
-import {IKeyringPair} from '@polkadot/types/types';
 import {ICollectionCreationOptions, IProperty} from './util/playgrounds/types';
-import {DevUniqueHelper} from './util/playgrounds/unique.dev';
+import {UniqueHelper} from './util/playgrounds/unique';
 
-async function mintCollectionHelper(helper: DevUniqueHelper, signer: IKeyringPair, options: ICollectionCreationOptions, type?: 'nft' | 'fungible' | 'refungible') {
+async function mintCollectionHelper(helper: UniqueHelper, signer: IKeyringPair, options: ICollectionCreationOptions, type?: 'nft' | 'fungible' | 'refungible') {
   let collection;
   if (type === 'nft') {
     collection = await helper.nft.mintCollection(signer, options);
@@ -29,7 +29,7 @@
     collection = await helper.rft.mintCollection(signer, options);
   }
   const data = await collection.getData();
-  expect(data?.normalizedOwner).to.be.equal(helper.util.normalizeSubstrateAddress(signer.address));
+  expect(data?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(signer.address));
   expect(data?.name).to.be.equal(options.name);
   expect(data?.description).to.be.equal(options.description);
   expect(data?.raw.tokenPrefix).to.be.equal(options.tokenPrefix);
@@ -54,32 +54,27 @@
     });
   });
   itSub('Create new NFT collection', async ({helper}) => {
-
     await mintCollectionHelper(helper, alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 'nft');
   });
   itSub('Create new NFT collection whith collection_name of maximum length (64 bytes)', async ({helper}) => {
-
     await mintCollectionHelper(helper, alice, {name: 'A'.repeat(64), description: 'descr', tokenPrefix: 'COL'}, 'nft');
   });
   itSub('Create new NFT collection whith collection_description of maximum length (256 bytes)', async ({helper}) => {
-
     await mintCollectionHelper(helper, alice, {name: 'name', description: 'A'.repeat(256), tokenPrefix: 'COL'}, 'nft');
   });
   itSub('Create new NFT collection whith token_prefix of maximum length (16 bytes)', async ({helper}) => {
-
     await mintCollectionHelper(helper, alice, {name: 'name', description: 'descr', tokenPrefix: 'A'.repeat(16)}, 'nft');
   });
+
   itSub('Create new Fungible collection', async ({helper}) => {
-
     await mintCollectionHelper(helper, alice, {name: 'name', description: 'descr', tokenPrefix: 'COL'}, 'fungible');
   });
+
   itSub.ifWithPallets('Create new ReFungible collection', [Pallets.ReFungible], async ({helper}) => {
-
     await mintCollectionHelper(helper, alice, {name: 'name', description: 'descr', tokenPrefix: 'COL'}, 'refungible');
   });
 
   itSub('create new collection with properties', async ({helper}) => {
-
     await mintCollectionHelper(helper, alice, {
       name: 'name', description: 'descr', tokenPrefix: 'COL',
       properties: [{key: 'key1', value: 'val1'}],
@@ -88,7 +83,6 @@
   });
 
   itSub('Create new collection with extra fields', async ({helper}) => {
-
     const collection = await mintCollectionHelper(helper, alice, {name: 'name', description: 'descr', tokenPrefix: 'COL'}, 'fungible');
     await collection.setPermissions(alice, {access: 'AllowList'});
     await collection.setLimits(alice, {accountTokenOwnershipLimit: 3});
@@ -96,7 +90,7 @@
     const limits = await collection.getEffectiveLimits();
     const raw = data?.raw;
 
-    expect(data?.normalizedOwner).to.be.equal(helper.util.normalizeSubstrateAddress(alice.address));
+    expect(data?.normalizedOwner).to.be.equal(helper.address.normalizeSubstrate(alice.address));
     expect(data?.name).to.be.equal('name');
     expect(data?.description).to.be.equal('descr');
     expect(raw.permissions.access).to.be.equal('AllowList');
@@ -105,7 +99,6 @@
   });
 
   itSub('New collection is not external', async ({helper}) => {
-
     const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'COL'});
     const data = await collection.getData();
     expect(data?.raw.readOnly).to.be.false;
@@ -131,12 +124,11 @@
     await expect(mintCollectionTx()).to.be.rejectedWith('Verification Error');
   });
   itSub('(!negative test!) create new NFT collection whith incorrect data (token_prefix)', async ({helper}) => {
-
     const mintCollectionTx = async () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'A'.repeat(17)});
     await expect(mintCollectionTx()).to.be.rejectedWith('Verification Error');
   });
+  
   itSub('(!negative test!) fails when bad limits are set', async ({helper}) => {
-
     const mintCollectionTx = async () => helper.nft.mintCollection(alice, {name: 'name', description: 'descr', tokenPrefix: 'COL', limits: {tokenLimit: 0}});
     await expect(mintCollectionTx()).to.be.rejectedWith(/common\.CollectionTokenLimitExceeded/);
   });
modifiedtests/src/createItem.test.tsdiffbeforeafterboth
--- a/tests/src/createItem.test.ts
+++ b/tests/src/createItem.test.ts
@@ -15,24 +15,14 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {IKeyringPair} from '@polkadot/types/types';
-
-import {
-  createCollection,
-  itApi,
-  normalizeAccountId,
-  getCreateItemResult,
-  CrossAccountId,
-} from './util/helpers';
-
 import {usingPlaygrounds, expect, itSub, Pallets} from './util/playgrounds';
-import {IProperty} from './util/playgrounds/types';
-import {executeTransaction} from './substrate/substrate-api';
-import {DevUniqueHelper} from './util/playgrounds/unique.dev';
+import {IProperty, ICrossAccountId} from './util/playgrounds/types';
+import {UniqueHelper} from './util/playgrounds/unique';
 
-async function mintTokenHelper(helper: DevUniqueHelper, collection: any, signer: IKeyringPair, owner: CrossAccountId, type: 'nft' | 'fungible' | 'refungible'='nft', properties?: IProperty[]) {
+async function mintTokenHelper(helper: UniqueHelper, collection: any, signer: IKeyringPair, owner: ICrossAccountId, type: 'nft' | 'fungible' | 'refungible'='nft', properties?: IProperty[]) {
   let token;
   const itemCountBefore = await helper.collection.getLastTokenId(collection.collectionId);
-  const itemBalanceBefore = (await helper.api!.rpc.unique.balance(collection.collectionId, owner, 0)).toBigInt();
+  const itemBalanceBefore = (await helper.callRpc('api.rpc.unique.balance', [collection.collectionId, owner, 0])).toBigInt();
   if (type === 'nft') {
     token = await collection.mintToken(signer, owner, properties);
   } else if (type === 'fungible') {
@@ -42,7 +32,7 @@
   }
 
   const itemCountAfter = await helper.collection.getLastTokenId(collection.collectionId);
-  const itemBalanceAfter = (await helper.api!.rpc.unique.balance(collection.collectionId, owner, 0)).toBigInt();
+  const itemBalanceAfter = (await helper.callRpc('api.rpc.unique.balance', [collection.collectionId, owner, 0])).toBigInt();
 
   if (type === 'fungible') {
     expect(itemBalanceAfter - itemBalanceBefore).to.be.equal(10n);
@@ -75,27 +65,22 @@
   });
   itSub('Check events on create new item in Fungible collection', async ({helper}) => {
     const {collectionId} = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'}, 0);
-    const api = helper.api!;
-
-
-    const to = normalizeAccountId(alice);
+    const to = {Substrate: alice.address};
     {
       const createData = {fungible: {value: 100}};
-      const tx = api.tx.unique.createItem(collectionId, to, createData as any);
-      const events = await executeTransaction(api, alice, tx);
-      const result = getCreateItemResult(events);
-      expect(result.amount).to.be.equal(100);
-      expect(result.collectionId).to.be.equal(collectionId);
-      expect(result.recipient).to.be.deep.equal(to);
+      const events = await helper.executeExtrinsic(alice, 'api.tx.unique.createItem', [collectionId, to, createData as any]);
+      const result = helper.util.extractTokensFromCreationResult(events);
+      expect(result.tokens[0].amount).to.be.equal(100n);
+      expect(result.tokens[0].collectionId).to.be.equal(collectionId);
+      expect(result.tokens[0].owner).to.be.deep.equal(to);
     }
     {
       const createData = {fungible: {value: 50}};
-      const tx = api.tx.unique.createItem(collectionId, to, createData as any);
-      const events = await executeTransaction(api, alice, tx);
-      const result = getCreateItemResult(events);
-      expect(result.amount).to.be.equal(50);
-      expect(result.collectionId).to.be.equal(collectionId);
-      expect(result.recipient).to.be.deep.equal(to);
+      const events = await helper.executeExtrinsic(alice, 'api.tx.unique.createItem', [collectionId, to, createData as any]);
+      const result = helper.util.extractTokensFromCreationResult(events);
+      expect(result.tokens[0].amount).to.be.equal(50n);
+      expect(result.tokens[0].collectionId).to.be.equal(collectionId);
+      expect(result.tokens[0].owner).to.be.deep.equal(to);
     }
   });
   itSub.ifWithPallets('Create new item in ReFungible collection', [Pallets.ReFungible], async ({helper}) =>  {
@@ -162,12 +147,12 @@
     const amount = 1n;
     const token = await mintTokenHelper(helper, collection, alice, {Substrate: bob.address});
     {
-      const totalPieces = await helper.api?.rpc.unique.totalPieces(collection.collectionId, token.tokenId);
+      const totalPieces = await helper.callRpc('api.rpc.unique.totalPieces', [collection.collectionId, token.tokenId]);
       expect(totalPieces?.unwrap().toBigInt()).to.be.equal(amount);
     }
     await token.transfer(bob, {Substrate: alice.address});
     {
-      const totalPieces = await helper.api?.rpc.unique.totalPieces(collection.collectionId, token.tokenId);
+      const totalPieces = await helper.callRpc('api.rpc.unique.totalPieces', [collection.collectionId, token.tokenId]);
       expect(totalPieces?.unwrap().toBigInt()).to.be.equal(amount);
     }
   });
@@ -267,21 +252,21 @@
   itSub('Check total pieces for invalid Fungible token', async ({helper}) => {
     const collection = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);
     const invalidTokenId = 1_000_000;
-    expect((await helper.api?.rpc.unique.totalPieces(collection.collectionId, invalidTokenId))?.isNone).to.be.true;
-    expect((await helper.api?.rpc.unique.tokenData(collection.collectionId, invalidTokenId))?.pieces.toBigInt()).to.be.equal(0n);
+    expect((await helper.callRpc('api.rpc.unique.totalPieces', [collection.collectionId, invalidTokenId]))?.isNone).to.be.true;
+    expect((await helper.callRpc('api.rpc.unique.tokenData', [collection.collectionId, invalidTokenId]))?.pieces.toBigInt()).to.be.equal(0n);
   });
 
   itSub('Check total pieces for invalid NFT token', async ({helper}) => {
     const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
     const invalidTokenId = 1_000_000;
-    expect((await helper.api?.rpc.unique.totalPieces(collection.collectionId, invalidTokenId))?.isNone).to.be.true;
-    expect((await helper.api?.rpc.unique.tokenData(collection.collectionId, invalidTokenId))?.pieces.toBigInt()).to.be.equal(0n);
+    expect((await helper.callRpc('api.rpc.unique.totalPieces', [collection.collectionId, invalidTokenId]))?.isNone).to.be.true;
+    expect((await helper.callRpc('api.rpc.unique.tokenData', [collection.collectionId, invalidTokenId]))?.pieces.toBigInt()).to.be.equal(0n);
   });
 
   itSub.ifWithPallets('Check total pieces for invalid Refungible token', [Pallets.ReFungible], async ({helper}) => {
     const collection = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
     const invalidTokenId = 1_000_000;
-    expect((await helper.api?.rpc.unique.totalPieces(collection.collectionId, invalidTokenId))?.isNone).to.be.true;
-    expect((await helper.api?.rpc.unique.tokenData(collection.collectionId, invalidTokenId))?.pieces.toBigInt()).to.be.equal(0n);
+    expect((await helper.callRpc('api.rpc.unique.totalPieces', [collection.collectionId, invalidTokenId]))?.isNone).to.be.true;
+    expect((await helper.callRpc('api.rpc.unique.tokenData', [collection.collectionId, invalidTokenId]))?.pieces.toBigInt()).to.be.equal(0n);
   });
 });
modifiedtests/src/createMultipleItems.test.tsdiffbeforeafterboth
--- a/tests/src/createMultipleItems.test.ts
+++ b/tests/src/createMultipleItems.test.ts
@@ -15,12 +15,8 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {IKeyringPair} from '@polkadot/types/types';
-import {
-  normalizeAccountId,
-} from './util/helpers';
 import {usingPlaygrounds, expect, Pallets, itSub} from './util/playgrounds';
 
-
 describe('Integration Test createMultipleItems(collection_id, owner, items_data):', () => {
   let alice: IKeyringPair;
 
@@ -48,7 +44,7 @@
     const tokens = await helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
     for (const [i, token] of tokens.entries()) {
       const tokenData = await token.getData();
-      expect(tokenData?.normalizedOwner).to.be.deep.equal({Substrate: helper.util.normalizeSubstrateAddress(alice.address)});
+      expect(tokenData?.normalizedOwner.Substrate).to.be.deep.equal(helper.address.normalizeSubstrate(alice.address));
       expect(tokenData?.properties[0].value).to.be.equal(args[i].properties[0].value);
     }
   });
@@ -116,7 +112,7 @@
     const tokens = await helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
     for (const [i, token] of tokens.entries()) {
       const tokenData = await token.getData();
-      expect(tokenData?.normalizedOwner).to.be.deep.equal({Substrate: helper.util.normalizeSubstrateAddress(alice.address)});
+      expect(tokenData?.normalizedOwner.Substrate).to.be.deep.equal(helper.address.normalizeSubstrate(alice.address));
       expect(tokenData?.properties[0].value).to.be.equal(args[i].properties[0].value);
     }
   });
@@ -138,7 +134,7 @@
     const tokens = await helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
     for (const [i, token] of tokens.entries()) {
       const tokenData = await token.getData();
-      expect(tokenData?.normalizedOwner).to.be.deep.equal({Substrate: helper.util.normalizeSubstrateAddress(alice.address)});
+      expect(tokenData?.normalizedOwner.Substrate).to.be.deep.equal(helper.address.normalizeSubstrate(alice.address));
       expect(tokenData?.properties[0].value).to.be.equal(args[i].properties[0].value);
     }
   });
@@ -160,7 +156,7 @@
     const tokens = await helper.nft.mintMultipleTokensWithOneOwner(alice, collection.collectionId, {Substrate: alice.address}, args);
     for (const [i, token] of tokens.entries()) {
       const tokenData = await token.getData();
-      expect(tokenData?.normalizedOwner).to.be.deep.equal({Substrate: helper.util.normalizeSubstrateAddress(alice.address)});
+      expect(tokenData?.normalizedOwner.Substrate).to.be.equal(helper.address.normalizeSubstrate(alice.address));
       expect(tokenData?.properties[0].value).to.be.equal(args[i].properties[0].value);
     }
   });
@@ -275,8 +271,11 @@
     });
 
     const types = ['NFT', 'Fungible', 'ReFungible'];
-    const mintTx = helper.api?.tx.unique.createMultipleItems(collectionId, normalizeAccountId(alice.address), types);
-    await expect(helper.signTransaction(alice, mintTx)).to.be.rejected;
+    await expect(helper.executeExtrinsic(
+      alice, 
+      'api.tx.unique.createMultipleItems', 
+      [collectionId, {Substrate: alice.address}, types],
+    )).to.be.rejectedWith(/nonfungible\.NotNonfungibleDataUsedToMintFungibleCollectionToken/);
   });
 
   itSub('Create tokens with different data limits <> maximum data limit', async ({helper}) => {
modifiedtests/src/creditFeesToTreasury.test.tsdiffbeforeafterboth
--- a/tests/src/creditFeesToTreasury.test.ts
+++ b/tests/src/creditFeesToTreasury.test.ts
@@ -16,11 +16,6 @@
 
 import './interfaces/augment-api-consts';
 import {IKeyringPair} from '@polkadot/types/types';
-import {
-  UNIQUE,
-} from './util/helpers';
-
-import {default as waitNewBlocks} from './substrate/wait-new-blocks';
 import {ApiPromise} from '@polkadot/api';
 import {usingPlaygrounds, expect, itSub} from './util/playgrounds';
 
@@ -63,7 +58,7 @@
   itSub('Total issuance does not change', async ({helper}) => {
     const api = helper.api!;
     await skipInflationBlock(api);
-    await waitNewBlocks(api, 1);
+    await helper.wait.newBlocks(1);
 
     const totalBefore = (await api.query.balances.totalIssuance()).toBigInt();
 
@@ -75,9 +70,8 @@
   });
 
   itSub('Sender balance decreased by fee+sent amount, Treasury balance increased by fee', async ({helper}) => {
-    const api = helper.api!;
-    await skipInflationBlock(api);
-    await waitNewBlocks(api, 1);
+    await skipInflationBlock(helper.api!);
+    await helper.wait.newBlocks(1);
 
     const treasuryBalanceBefore = await helper.balance.getSubstrate(TREASURY);
     const aliceBalanceBefore = await helper.balance.getSubstrate(alice.address);
@@ -96,7 +90,7 @@
 
   itSub('Treasury balance increased by failed tx fee', async ({helper}) => {
     const api = helper.api!;
-    await waitNewBlocks(api, 1);
+    await helper.wait.newBlocks(1);
 
     const treasuryBalanceBefore = await helper.balance.getSubstrate(TREASURY);
     const bobBalanceBefore = await helper.balance.getSubstrate(bob.address);
@@ -113,9 +107,8 @@
   });
 
   itSub('NFT Transactions also send fees to Treasury', async ({helper}) => {
-    const api = helper.api!;
-    await skipInflationBlock(api);
-    await waitNewBlocks(api, 1);
+    await skipInflationBlock(helper.api!);
+    await helper.wait.newBlocks(1);
 
     const treasuryBalanceBefore = await helper.balance.getSubstrate(TREASURY);
     const aliceBalanceBefore = await helper.balance.getSubstrate(alice.address);
@@ -131,9 +124,9 @@
   });
 
   itSub('Fees are sane', async ({helper}) => {
-    const api = helper.api!;
-    await skipInflationBlock(api);
-    await waitNewBlocks(api, 1);
+    const unique = helper.balance.getOneTokenNominal();
+    await skipInflationBlock(helper.api!);
+    await helper.wait.newBlocks(1);
 
     const aliceBalanceBefore = await helper.balance.getSubstrate(alice.address);
 
@@ -142,14 +135,13 @@
     const aliceBalanceAfter = await helper.balance.getSubstrate(alice.address);
     const fee = aliceBalanceBefore - aliceBalanceAfter;
 
-    expect(fee / UNIQUE < BigInt(Math.ceil(saneMaximumFee + createCollectionDeposit))).to.be.true;
-    expect(fee / UNIQUE < BigInt(Math.ceil(saneMinimumFee  + createCollectionDeposit))).to.be.true;
+    expect(fee / unique < BigInt(Math.ceil(saneMaximumFee + createCollectionDeposit))).to.be.true;
+    expect(fee / unique < BigInt(Math.ceil(saneMinimumFee  + createCollectionDeposit))).to.be.true;
   });
 
   itSub('NFT Transfer fee is close to 0.1 Unique', async ({helper}) => {
-    const api = helper.api!;
-    await skipInflationBlock(api);
-    await waitNewBlocks(api, 1);
+    await skipInflationBlock(helper.api!);
+    await helper.wait.newBlocks(1);
 
     const collection = await helper.nft.mintCollection(alice, {
       name: 'test',
@@ -163,7 +155,7 @@
     await token.transfer(alice, {Substrate: bob.address});
     const aliceBalanceAfter = await helper.balance.getSubstrate(alice.address);
 
-    const fee = Number(aliceBalanceBefore - aliceBalanceAfter) / Number(UNIQUE);
+    const fee = Number(aliceBalanceBefore - aliceBalanceAfter) / Number(helper.balance.getOneTokenNominal());
     const expectedTransferFee = 0.1;
     // fee drifts because of NextFeeMultiplier
     const tolerance = 0.001;
modifiedtests/src/destroyCollection.test.tsdiffbeforeafterboth
--- a/tests/src/destroyCollection.test.ts
+++ b/tests/src/destroyCollection.test.ts
@@ -15,10 +15,7 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {IKeyringPair} from '@polkadot/types/types';
-import {
-  Pallets,
-} from './util/helpers';
-import {itSub, expect, usingPlaygrounds} from './util/playgrounds';
+import {itSub, expect, usingPlaygrounds, Pallets} from './util/playgrounds';
 
 describe('integration test: ext. destroyCollection():', () => {
   let alice: IKeyringPair;
modifiedtests/src/nesting/properties.test.tsdiffbeforeafterboth
before · tests/src/nesting/properties.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 {IKeyringPair} from '@polkadot/types/types';18import {itSub, Pallets, requirePalletsOrSkip, usingPlaygrounds, expect} from '../util/playgrounds';19import {UniqueHelper, UniqueBaseCollection, UniqueNFTCollection, UniqueNFToken, UniqueRFTCollection, UniqueRFToken} from '../util/playgrounds/unique';2021// ---------- COLLECTION PROPERTIES2223describe('Integration Test: Collection Properties', () => {24  let alice: IKeyringPair;25  let bob: IKeyringPair;2627  before(async () => {28    await usingPlaygrounds(async (helper, privateKey) => {29      const donor = privateKey('//Alice');30      [alice, bob] = await helper.arrange.createAccounts([50n, 10n], donor);31    });32  });3334  itSub('Properties are initially empty', async ({helper}) => {35    const collection = await helper.nft.mintCollection(alice);36    expect(await collection.getProperties()).to.be.empty;37  });3839  async function testSetsPropertiesForCollection(collection: UniqueBaseCollection) {40    // As owner41    await expect(collection.setProperties(alice, [{key: 'electron', value: 'come bond'}])).to.be.fulfilled;4243    await collection.addAdmin(alice, {Substrate: bob.address});4445    // As administrator46    await expect(collection.setProperties(bob, [{key: 'black_hole'}])).to.be.fulfilled;4748    const properties = await collection.getProperties();49    expect(properties).to.include.deep.members([50      {key: 'electron', value: 'come bond'},51      {key: 'black_hole', value: ''},52    ]);53  }5455  itSub('Sets properties for a NFT collection', async ({helper}) =>  {56    await testSetsPropertiesForCollection(await helper.nft.mintCollection(alice));57  });5859  itSub.ifWithPallets('Sets properties for a ReFungible collection', [Pallets.ReFungible], async ({helper}) => {60    await testSetsPropertiesForCollection(await helper.rft.mintCollection(alice));61  });6263  async function testCheckValidNames(collection: UniqueBaseCollection) {64    // alpha symbols65    await expect(collection.setProperties(alice, [{key: 'answer'}])).to.be.fulfilled;6667    // numeric symbols68    await expect(collection.setProperties(alice, [{key: '451'}])).to.be.fulfilled;6970    // underscore symbol71    await expect(collection.setProperties(alice, [{key: 'black_hole'}])).to.be.fulfilled;7273    // dash symbol74    await expect(collection.setProperties(alice, [{key: '-'}])).to.be.fulfilled;7576    // dot symbol77    await expect(collection.setProperties(alice, [{key: 'once.in.a.long.long.while...', value: 'you get a little lost'}])).to.be.fulfilled;7879    const properties = await collection.getProperties();80    expect(properties).to.include.deep.members([81      {key: 'answer', value: ''},82      {key: '451', value: ''},83      {key: 'black_hole', value: ''},84      {key: '-', value: ''},85      {key: 'once.in.a.long.long.while...', value: 'you get a little lost'},86    ]);87  }8889  itSub('Check valid names for NFT collection properties keys', async ({helper}) =>  {90    await testCheckValidNames(await helper.nft.mintCollection(alice));91  });9293  itSub.ifWithPallets('Check valid names for ReFungible collection properties keys', [Pallets.ReFungible], async ({helper}) => {94    await testCheckValidNames(await helper.rft.mintCollection(alice));95  });9697  async function testChangesProperties(collection: UniqueBaseCollection) {98    await expect(collection.setProperties(alice, [{key: 'electron', value: 'come bond'}, {key: 'black_hole', value: ''}])).to.be.fulfilled;99100    // Mutate the properties101    await expect(collection.setProperties(alice, [{key: 'black_hole', value: 'LIGO'}])).to.be.fulfilled;102103    const properties = await collection.getProperties();104    expect(properties).to.include.deep.members([105      {key: 'electron', value: 'come bond'},106      {key: 'black_hole', value: 'LIGO'},107    ]);108  }109110  itSub('Changes properties of a NFT collection', async ({helper}) =>  {111    await testChangesProperties(await helper.nft.mintCollection(alice));112  });113114  itSub.ifWithPallets('Changes properties of a ReFungible collection', [Pallets.ReFungible], async ({helper}) => {115    await testChangesProperties(await helper.rft.mintCollection(alice));116  });117118  async function testDeleteProperties(collection: UniqueBaseCollection) {119    await expect(collection.setProperties(alice, [{key: 'electron', value: 'come bond'}, {key: 'black_hole', value: 'LIGO'}])).to.be.fulfilled;120121    await expect(collection.deleteProperties(alice, ['electron'])).to.be.fulfilled;122123    const properties = await collection.getProperties(['black_hole', 'electron']);124    expect(properties).to.be.deep.equal([125      {key: 'black_hole', value: 'LIGO'},126    ]);127  }128129  itSub('Deletes properties of a NFT collection', async ({helper}) =>  {130    await testDeleteProperties(await helper.nft.mintCollection(alice));131  });132133  itSub.ifWithPallets('Deletes properties of a ReFungible collection', [Pallets.ReFungible], async ({helper}) => {134    await testDeleteProperties(await helper.rft.mintCollection(alice));135  });136});137138describe('Negative Integration Test: Collection Properties', () => {139  let alice: IKeyringPair;140  let bob: IKeyringPair;141142  before(async () => {143    await usingPlaygrounds(async (helper, privateKey) => {144      const donor = privateKey('//Alice');145      [alice, bob] = await helper.arrange.createAccounts([100n, 10n], donor);146    });147  });148  149  async function testFailsSetPropertiesIfNotOwnerOrAdmin(collection: UniqueBaseCollection) {  150    await expect(collection.setProperties(bob, [{key: 'electron', value: 'come bond'}, {key: 'black_hole', value: 'LIGO'}]))151      .to.be.rejectedWith(/common\.NoPermission/);152153    expect(await collection.getProperties()).to.be.empty;154  }155156  itSub('Fails to set properties in a NFT collection if not its onwer/administrator', async ({helper}) =>  {157    await testFailsSetPropertiesIfNotOwnerOrAdmin(await helper.nft.mintCollection(alice));158  });159160  itSub.ifWithPallets('Fails to set properties in a ReFungible collection if not its onwer/administrator', [Pallets.ReFungible], async ({helper}) => {161    await testFailsSetPropertiesIfNotOwnerOrAdmin(await helper.rft.mintCollection(alice));162  });163  164  async function testFailsSetPropertiesThatExeedLimits(collection: UniqueBaseCollection) {165    const spaceLimit = (await (collection.helper!.api! as any).query.common.collectionProperties(collection.collectionId)).spaceLimit.toNumber();166  167    // Mute the general tx parsing error, too many bytes to process168    {169      console.error = () => {};170      await expect(collection.setProperties(alice, [171        {key: 'electron', value: 'low high '.repeat(Math.ceil(spaceLimit! / 9))},172      ])).to.be.rejected;173    }174175    expect(await collection.getProperties(['electron'])).to.be.empty;176177    await expect(collection.setProperties(alice, [178      {key: 'electron', value: 'low high '.repeat(Math.ceil(spaceLimit! / 18))}, 179      {key: 'black_hole', value: '0'.repeat(Math.ceil(spaceLimit! / 2))}, 180    ])).to.be.rejectedWith(/common\.NoSpaceForProperty/);181182    expect(await collection.getProperties(['electron', 'black_hole'])).to.be.empty;183  }184185  itSub('Fails to set properties that exceed the limits (NFT)', async ({helper}) =>  {186    await testFailsSetPropertiesThatExeedLimits(await helper.nft.mintCollection(alice));187  });188189  itSub.ifWithPallets('Fails to set properties that exceed the limits (ReFungible)', [Pallets.ReFungible], async ({helper}) => {190    await testFailsSetPropertiesThatExeedLimits(await helper.rft.mintCollection(alice));191  });192  193  async function testFailsSetMorePropertiesThanAllowed(collection: UniqueBaseCollection) {194    const propertiesToBeSet = [];195    for (let i = 0; i < 65; i++) {196      propertiesToBeSet.push({197        key: 'electron_' + i,198        value: Math.random() > 0.5 ? 'high' : 'low',199      });200    }201202    await expect(collection.setProperties(alice, propertiesToBeSet)).203      to.be.rejectedWith(/common\.PropertyLimitReached/);204205    expect(await collection.getProperties()).to.be.empty;206  }207208  itSub('Fails to set more properties than it is allowed (NFT)', async ({helper}) =>  {209    await testFailsSetMorePropertiesThanAllowed(await helper.nft.mintCollection(alice));210  });211212  itSub.ifWithPallets('Fails to set more properties than it is allowed (ReFungible)', [Pallets.ReFungible], async ({helper}) => {213    await testFailsSetMorePropertiesThanAllowed(await helper.rft.mintCollection(alice));214  });215  216  async function testFailsSetPropertiesWithInvalidNames(collection: UniqueBaseCollection) {217    const invalidProperties = [218      [{key: 'electron', value: 'negative'}, {key: 'string theory', value: 'understandable'}],219      [{key: 'Mr/Sandman', value: 'Bring me a gene'}],220      [{key: 'déjà vu', value: 'hmm...'}],221    ];222223    for (let i = 0; i < invalidProperties.length; i++) {224      await expect(225        collection.setProperties(alice, invalidProperties[i]), 226        `on rejecting the new badly-named property #${i}`,227      ).to.be.rejectedWith(/common\.InvalidCharacterInPropertyKey/);228    }229230    await expect(231      collection.setProperties(alice, [{key: '', value: 'nothing must not exist'}]), 232      'on rejecting an unnamed property',233    ).to.be.rejectedWith(/common\.EmptyPropertyKey/);234235    await expect(236      collection.setProperties(alice, [{key: 'CRISPR-Cas9', value: 'rewriting nature!'}]), 237      'on setting the correctly-but-still-badly-named property',238    ).to.be.fulfilled;239240    const keys = invalidProperties.flatMap(propertySet => propertySet.map(property => property.key)).concat('CRISPR-Cas9').concat('');241242    const properties = await collection.getProperties(keys);243    expect(properties).to.be.deep.equal([244      {key: 'CRISPR-Cas9', value: 'rewriting nature!'},245    ]);246247    for (let i = 0; i < invalidProperties.length; i++) {248      await expect(249        collection.deleteProperties(alice, invalidProperties[i].map(propertySet => propertySet.key)), 250        `on trying to delete the non-existent badly-named property #${i}`,251      ).to.be.rejectedWith(/common\.InvalidCharacterInPropertyKey/);252    }253  }254255  itSub('Fails to set properties with invalid names (NFT)', async ({helper}) =>  {256    await testFailsSetPropertiesWithInvalidNames(await helper.nft.mintCollection(alice));257  });258259  itSub.ifWithPallets('Fails to set properties with invalid names (ReFungible)', [Pallets.ReFungible], async ({helper}) => {260    await testFailsSetPropertiesWithInvalidNames(await helper.rft.mintCollection(alice));261  });262});263264// ---------- ACCESS RIGHTS265266describe('Integration Test: Access Rights to Token Properties', () => {267  let alice: IKeyringPair;268  let bob: IKeyringPair;269270  before(async () => {271    await usingPlaygrounds(async (helper, privateKey) => {272      const donor = privateKey('//Alice');273      [alice, bob] = await helper.arrange.createAccounts([100n, 10n], donor);274    });275  });276  277  itSub('Reads access rights to properties of a collection', async ({helper}) =>  {278    const collection = await helper.nft.mintCollection(alice);279    const propertyRights = (await helper.api!.query.common.collectionPropertyPermissions(collection.collectionId)).toJSON();280    expect(propertyRights).to.be.empty;281  });282  283  async function testSetsAccessRightsToProperties(collection: UniqueNFTCollection | UniqueRFTCollection) {  284    await expect(collection.setTokenPropertyPermissions(alice, [{key: 'skullduggery', permission: {mutable: true}}]))285      .to.be.fulfilled;286287    await collection.addAdmin(alice, {Substrate: bob.address});288289    await expect(collection.setTokenPropertyPermissions(bob, [{key: 'mindgame', permission: {collectionAdmin: true, tokenOwner: false}}]))290      .to.be.fulfilled;291292    const propertyRights = await collection.getPropertyPermissions(['skullduggery', 'mindgame']);293    expect(propertyRights).to.include.deep.members([294      {key: 'skullduggery', permission: {mutable: true, collectionAdmin: false, tokenOwner: false}},295      {key: 'mindgame', permission: {mutable: false, collectionAdmin: true, tokenOwner: false}},296    ]);297  }298299  itSub('Sets access rights to properties of a collection (NFT)', async ({helper}) =>  {300    await testSetsAccessRightsToProperties(await helper.nft.mintCollection(alice));301  });302303  itSub.ifWithPallets('Sets access rights to properties of a collection (ReFungible)', [Pallets.ReFungible], async ({helper}) => {304    await testSetsAccessRightsToProperties(await helper.rft.mintCollection(alice));305  });306  307  async function testChangesAccessRightsToProperty(collection: UniqueNFTCollection | UniqueRFTCollection) {308    await expect(collection.setTokenPropertyPermissions(alice, [{key: 'skullduggery', permission: {mutable: true, collectionAdmin: true}}]))309      .to.be.fulfilled;310311    await expect(collection.setTokenPropertyPermissions(alice, [{key: 'skullduggery', permission: {mutable: false, tokenOwner: true}}]))312      .to.be.fulfilled;313314    const propertyRights = await collection.getPropertyPermissions();315    expect(propertyRights).to.be.deep.equal([316      {key: 'skullduggery', permission: {'mutable': false, 'collectionAdmin': false, 'tokenOwner': true}},317    ]);318  }319320  itSub('Changes access rights to properties of a NFT collection', async ({helper}) =>  {321    await testChangesAccessRightsToProperty(await helper.nft.mintCollection(alice));322  });323324  itSub.ifWithPallets('Changes access rights to properties of a ReFungible collection', [Pallets.ReFungible], async ({helper}) => {325    await testChangesAccessRightsToProperty(await helper.rft.mintCollection(alice));326  });327});328329describe('Negative Integration Test: Access Rights to Token Properties', () => {330  let alice: IKeyringPair;331  let bob: IKeyringPair;332333  before(async () => {334    await usingPlaygrounds(async (helper, privateKey) => {335      const donor = privateKey('//Alice');336      [alice, bob] = await helper.arrange.createAccounts([50n, 10n], donor);337    });338  });339340  async function testPreventsFromSettingAccessRightsNotAdminOrOwner(collection: UniqueNFTCollection | UniqueRFTCollection) {341    await expect(collection.setTokenPropertyPermissions(bob, [{key: 'skullduggery', permission: {mutable: true, tokenOwner: true}}]))342      .to.be.rejectedWith(/common\.NoPermission/);343344    const propertyRights = await collection.getPropertyPermissions(['skullduggery']);345    expect(propertyRights).to.be.empty;346  }347348  itSub('Prevents from setting access rights to properties of a NFT collection if not an onwer/admin', async ({helper}) =>  {349    await testPreventsFromSettingAccessRightsNotAdminOrOwner(await helper.nft.mintCollection(alice));350  });351352  itSub.ifWithPallets('Prevents from setting access rights to properties of a ReFungible collection if not an onwer/admin', [Pallets.ReFungible], async ({helper}) => {353    await testPreventsFromSettingAccessRightsNotAdminOrOwner(await helper.rft.mintCollection(alice));354  });355356  async function testPreventFromAddingTooManyPossibleProperties(collection: UniqueNFTCollection | UniqueRFTCollection) {  357    const constitution = [];358    for (let i = 0; i < 65; i++) {359      constitution.push({360        key: 'property_' + i,361        permission: Math.random() > 0.5 ? {mutable: true, collectionAdmin: true, tokenOwner: true} : {},362      });363    }364365    await expect(collection.setTokenPropertyPermissions(alice, constitution))366      .to.be.rejectedWith(/common\.PropertyLimitReached/);367368    const propertyRights = await collection.getPropertyPermissions();369    expect(propertyRights).to.be.empty;370  }371372  itSub('Prevents from adding too many possible properties (NFT)', async ({helper}) =>  {373    await testPreventFromAddingTooManyPossibleProperties(await helper.nft.mintCollection(alice));374  });375376  itSub.ifWithPallets('Prevents from adding too many possible properties (ReFungible)', [Pallets.ReFungible], async ({helper}) => {377    await testPreventFromAddingTooManyPossibleProperties(await helper.rft.mintCollection(alice));378  });379380  async function testPreventAccessRightsModifiedIfConstant(collection: UniqueNFTCollection | UniqueRFTCollection) {381    await expect(collection.setTokenPropertyPermissions(alice, [{key: 'skullduggery', permission: {mutable: false, tokenOwner: true}}]))382      .to.be.fulfilled;383384    await expect(collection.setTokenPropertyPermissions(alice, [{key: 'skullduggery', permission: {collectionAdmin: true}}]))385      .to.be.rejectedWith(/common\.NoPermission/);386387    const propertyRights = await collection.getPropertyPermissions(['skullduggery']);388    expect(propertyRights).to.deep.equal([389      {key: 'skullduggery', permission: {'mutable': false, 'collectionAdmin': false, 'tokenOwner': true}},390    ]);391  }392393  itSub('Prevents access rights to be modified if constant (NFT)', async ({helper}) =>  {394    await testPreventAccessRightsModifiedIfConstant(await helper.nft.mintCollection(alice));395  });396397  itSub.ifWithPallets('Prevents access rights to be modified if constant (ReFungible)', [Pallets.ReFungible], async ({helper}) => {398    await testPreventAccessRightsModifiedIfConstant(await helper.rft.mintCollection(alice));399  });400401  async function testPreventsAddingPropertiesWithInvalidNames(collection: UniqueNFTCollection | UniqueRFTCollection) {402    const invalidProperties = [403      [{key: 'skullduggery', permission: {tokenOwner: true}}, {key: 'im possible', permission: {collectionAdmin: true}}],404      [{key: 'G#4', permission: {tokenOwner: true}}],405      [{key: 'HÆMILTON', permission: {mutable: false, collectionAdmin: true, tokenOwner: true}}],406    ];407408    for (let i = 0; i < invalidProperties.length; i++) {409      await expect(410        collection.setTokenPropertyPermissions(alice, invalidProperties[i]), 411        `on setting the new badly-named property #${i}`,412      ).to.be.rejectedWith(/common\.InvalidCharacterInPropertyKey/);413    }414415    await expect(416      collection.setTokenPropertyPermissions(alice, [{key: '', permission: {}}]), 417      'on rejecting an unnamed property',418    ).to.be.rejectedWith(/common\.EmptyPropertyKey/);419420    const correctKey = '--0x03116e387820CA05'; // PolkadotJS would parse this as an already encoded hex-string421    await expect(422      collection.setTokenPropertyPermissions(alice, [423        {key: correctKey, permission: {collectionAdmin: true}},424      ]), 425      'on setting the correctly-but-still-badly-named property',426    ).to.be.fulfilled;427428    const keys = invalidProperties.flatMap(propertySet => propertySet.map(property => property.key)).concat(correctKey).concat('');429430    const propertyRights = await collection.getPropertyPermissions(keys);431    expect(propertyRights).to.be.deep.equal([432      {key: correctKey, permission: {mutable: false, collectionAdmin: true, tokenOwner: false}},433    ]);434  }435436  itSub('Prevents adding properties with invalid names (NFT)', async ({helper}) =>  {437    await testPreventsAddingPropertiesWithInvalidNames(await helper.nft.mintCollection(alice));438  });439440  itSub.ifWithPallets('Prevents adding properties with invalid names (ReFungible)', [Pallets.ReFungible], async ({helper}) => {441    await testPreventsAddingPropertiesWithInvalidNames(await helper.rft.mintCollection(alice));442  });443});444445// ---------- TOKEN PROPERTIES446447describe('Integration Test: Token Properties', () => {448  let alice: IKeyringPair; // collection owner449  let bob: IKeyringPair; // collection admin450  let charlie: IKeyringPair; // token owner451452  let permissions: {permission: any, signers: IKeyringPair[]}[];453454  before(async () => {455    await usingPlaygrounds(async (helper, privateKey) => {456      const donor = privateKey('//Alice');457      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);458    });459460    // todo:playgrounds probably separate these tests later461    permissions = [462      {permission: {mutable: true, collectionAdmin: true}, signers: [alice, bob]},463      {permission: {mutable: false, collectionAdmin: true}, signers: [alice, bob]},464      {permission: {mutable: true, tokenOwner: true}, signers: [charlie]},465      {permission: {mutable: false, tokenOwner: true}, signers: [charlie]},466      {permission: {mutable: true, collectionAdmin: true, tokenOwner: true}, signers: [alice, bob, charlie]},467      {permission: {mutable: false, collectionAdmin: true, tokenOwner: true}, signers: [alice, bob, charlie]},468    ];469  });470  471  async function testReadsYetEmptyProperties(token: UniqueNFToken | UniqueRFToken) {472    const properties = await token.getProperties();473    expect(properties).to.be.empty;474475    const tokenData = await token.getData();476    expect(tokenData!.properties).to.be.empty;477  }478479  itSub('Reads yet empty properties of a token (NFT)', async ({helper}) => {480    const collection = await helper.nft.mintCollection(alice);481    const token = await collection.mintToken(alice);482    await testReadsYetEmptyProperties(token);483  });484485  itSub.ifWithPallets('Reads yet empty properties of a token (ReFungible)', [Pallets.ReFungible], async ({helper}) => {486    const collection = await helper.rft.mintCollection(alice);487    const token = await collection.mintToken(alice);488    await testReadsYetEmptyProperties(token);489  });490491  async function testAssignPropertiesAccordingToPermissions(token: UniqueNFToken | UniqueRFToken, pieces: bigint) {492    await token.collection.addAdmin(alice, {Substrate: bob.address});493    await token.transfer(alice, {Substrate: charlie.address}, pieces);494495    const propertyKeys: string[] = [];496    let i = 0;497    for (const permission of permissions) {498      i++;499      let j = 0;500      for (const signer of permission.signers) {501        j++;502        const key = i + '_' + signer.address;503        propertyKeys.push(key);504505        await expect(506          token.collection.setTokenPropertyPermissions(alice, [{key: key, permission: permission.permission}]), 507          `on setting permission #${i} by alice`,508        ).to.be.fulfilled;509510        await expect(511          token.setProperties(signer, [{key: key, value: 'Serotonin increase'}]), 512          `on adding property #${i} by signer #${j}`,513        ).to.be.fulfilled;514      }515    }516517    const properties = await token.getProperties(propertyKeys);518    const tokenData = await token.getData();519    for (let i = 0; i < properties.length; i++) {520      expect(properties[i].value).to.be.equal('Serotonin increase');521      expect(tokenData!.properties[i].value).to.be.equal('Serotonin increase');522    }523  }524525  itSub('Assigns properties to a token according to permissions (NFT)', async ({helper}) =>  {526    const collection = await helper.nft.mintCollection(alice);527    const token = await collection.mintToken(alice);528    await testAssignPropertiesAccordingToPermissions(token, 1n);529  });530531  itSub.ifWithPallets('Assigns properties to a token according to permissions (ReFungible)', [Pallets.ReFungible], async ({helper}) => {532    const collection = await helper.rft.mintCollection(alice);533    const token = await collection.mintToken(alice, 100n);534    await testAssignPropertiesAccordingToPermissions(token, 100n);535  });536537  async function testChangesPropertiesAccordingPermission(token: UniqueNFToken | UniqueRFToken, pieces: bigint) {538    await token.collection.addAdmin(alice, {Substrate: bob.address});539    await token.transfer(alice, {Substrate: charlie.address}, pieces);540541    const propertyKeys: string[] = [];542    let i = 0;543    for (const permission of permissions) {544      i++;545      if (!permission.permission.mutable) continue;546      547      let j = 0;548      for (const signer of permission.signers) {549        j++;550        const key = i + '_' + signer.address;551        propertyKeys.push(key);552553        await expect(554          token.collection.setTokenPropertyPermissions(alice, [{key: key, permission: permission.permission}]), 555          `on setting permission #${i} by alice`,556        ).to.be.fulfilled;557558        await expect(559          token.setProperties(signer, [{key, value: 'Serotonin increase'}]), 560          `on adding property #${i} by signer #${j}`,561        ).to.be.fulfilled;562563        await expect(564          token.setProperties(signer, [{key, value: 'Serotonin stable'}]), 565          `on changing property #${i} by signer #${j}`,566        ).to.be.fulfilled;567      }568    }569570    const properties = await token.getProperties(propertyKeys);571    const tokenData = await token.getData();572    for (let i = 0; i < properties.length; i++) {573      expect(properties[i].value).to.be.equal('Serotonin stable');574      expect(tokenData!.properties[i].value).to.be.equal('Serotonin stable');575    }576  }577578  itSub('Changes properties of a token according to permissions (NFT)', async ({helper}) =>  {579    const collection = await helper.nft.mintCollection(alice);580    const token = await collection.mintToken(alice);581    await testChangesPropertiesAccordingPermission(token, 1n);582  });583584  itSub.ifWithPallets('Changes properties of a token according to permissions (ReFungible)', [Pallets.ReFungible], async ({helper}) => {585    const collection = await helper.rft.mintCollection(alice);586    const token = await collection.mintToken(alice, 100n);587    await testChangesPropertiesAccordingPermission(token, 100n);588  });589590  async function testDeletePropertiesAccordingPermission(token: UniqueNFToken | UniqueRFToken, pieces: bigint) {591    await token.collection.addAdmin(alice, {Substrate: bob.address});592    await token.transfer(alice, {Substrate: charlie.address}, pieces);593594    const propertyKeys: string[] = [];595    let i = 0;596597    for (const permission of permissions) {598      i++;599      if (!permission.permission.mutable) continue;600      601      let j = 0;602      for (const signer of permission.signers) {603        j++;604        const key = i + '_' + signer.address;605        propertyKeys.push(key);606607        await expect(608          token.collection.setTokenPropertyPermissions(alice, [{key: key, permission: permission.permission}]), 609          `on setting permission #${i} by alice`,610        ).to.be.fulfilled;611612        await expect(613          token.setProperties(signer, [{key, value: 'Serotonin increase'}]), 614          `on adding property #${i} by signer #${j}`,615        ).to.be.fulfilled;616617        await expect(618          token.deleteProperties(signer, [key]), 619          `on deleting property #${i} by signer #${j}`,620        ).to.be.fulfilled;621      }622    }623624    expect(await token.getProperties(propertyKeys)).to.be.empty;625    expect((await token.getData())!.properties).to.be.empty;626  }627  628  itSub('Deletes properties of a token according to permissions (NFT)', async ({helper}) =>  {629    const collection = await helper.nft.mintCollection(alice);630    const token = await collection.mintToken(alice);631    await testDeletePropertiesAccordingPermission(token, 1n);632  });633634  itSub.ifWithPallets('Deletes properties of a token according to permissions (ReFungible)', [Pallets.ReFungible], async ({helper}) => {635    const collection = await helper.rft.mintCollection(alice);636    const token = await collection.mintToken(alice, 100n);637    await testDeletePropertiesAccordingPermission(token, 100n);638  });639640  itSub('Assigns properties to a nested token according to permissions', async ({helper}) =>  {641    const collectionA = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}});642    const collectionB = await helper.nft.mintCollection(alice);643    const targetToken = await collectionA.mintToken(alice);644    const nestedToken = await collectionB.mintToken(alice, targetToken.nestingAccount());645646    await collectionB.addAdmin(alice, {Substrate: bob.address});647    await targetToken.transfer(alice, {Substrate: charlie.address});648649    const propertyKeys: string[] = [];650    let i = 0;651    for (const permission of permissions) {652      i++;653      let j = 0;654      for (const signer of permission.signers) {655        j++;656        const key = i + '_' + signer.address;657        propertyKeys.push(key);658        659        await expect(660          nestedToken.collection.setTokenPropertyPermissions(alice, [{key: key, permission: permission.permission}]), 661          `on setting permission #${i} by alice`,662        ).to.be.fulfilled;663664        await expect(665          nestedToken.setProperties(signer, [{key, value: 'Serotonin increase'}]), 666          `on adding property #${i} by signer #${j}`,667        ).to.be.fulfilled;668      }669670    }671672    const properties = await nestedToken.getProperties(propertyKeys);673    const tokenData = await nestedToken.getData();674    for (let i = 0; i < properties.length; i++) {675      expect(properties[i].value).to.be.equal('Serotonin increase');676      expect(tokenData!.properties[i].value).to.be.equal('Serotonin increase');677    }678    expect(await targetToken.getProperties()).to.be.empty;679  });680681  itSub('Changes properties of a nested token according to permissions', async ({helper}) =>  {682    const collectionA = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}});683    const collectionB = await helper.nft.mintCollection(alice);684    const targetToken = await collectionA.mintToken(alice);685    const nestedToken = await collectionB.mintToken(alice, targetToken.nestingAccount());686687    await collectionB.addAdmin(alice, {Substrate: bob.address});688    await targetToken.transfer(alice, {Substrate: charlie.address});689690    const propertyKeys: string[] = [];691    let i = 0;692    for (const permission of permissions) {693      i++;694      if (!permission.permission.mutable) continue;695      696      let j = 0;697      for (const signer of permission.signers) {698        j++;699        const key = i + '_' + signer.address;700        propertyKeys.push(key);701702        await expect(703          nestedToken.collection.setTokenPropertyPermissions(alice, [{key: key, permission: permission.permission}]), 704          `on setting permission #${i} by alice`,705        ).to.be.fulfilled;706707        await expect(708          nestedToken.setProperties(signer, [{key, value: 'Serotonin increase'}]), 709          `on adding property #${i} by signer #${j}`,710        ).to.be.fulfilled;711712        await expect(713          nestedToken.setProperties(signer, [{key, value: 'Serotonin stable'}]), 714          `on changing property #${i} by signer #${j}`,715        ).to.be.fulfilled;716      }717    }718719    const properties = await nestedToken.getProperties(propertyKeys);720    const tokenData = await nestedToken.getData();721    for (let i = 0; i < properties.length; i++) {722      expect(properties[i].value).to.be.equal('Serotonin stable');723      expect(tokenData!.properties[i].value).to.be.equal('Serotonin stable');724    }725    expect(await targetToken.getProperties()).to.be.empty;726  });727728  itSub('Deletes properties of a nested token according to permissions', async ({helper}) =>  {729    const collectionA = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}});730    const collectionB = await helper.nft.mintCollection(alice);731    const targetToken = await collectionA.mintToken(alice);732    const nestedToken = await collectionB.mintToken(alice, targetToken.nestingAccount());733734    await collectionB.addAdmin(alice, {Substrate: bob.address});735    await targetToken.transfer(alice, {Substrate: charlie.address});736737    const propertyKeys: string[] = [];738    let i = 0;739    for (const permission of permissions) {740      i++;741      if (!permission.permission.mutable) continue;742      743      let j = 0;744      for (const signer of permission.signers) {745        j++;746        const key = i + '_' + signer.address;747        propertyKeys.push(key);748749        await expect(750          nestedToken.collection.setTokenPropertyPermissions(alice, [{key: key, permission: permission.permission}]), 751          `on setting permission #${i} by alice`,752        ).to.be.fulfilled;753754        await expect(755          nestedToken.setProperties(signer, [{key, value: 'Serotonin increase'}]), 756          `on adding property #${i} by signer #${j}`,757        ).to.be.fulfilled;758759        await expect(760          nestedToken.deleteProperties(signer, [key]), 761          `on deleting property #${i} by signer #${j}`,762        ).to.be.fulfilled;763      }764    }765766    expect(await nestedToken.getProperties(propertyKeys)).to.be.empty;767    expect((await nestedToken.getData())!.properties).to.be.empty;768    expect(await targetToken.getProperties()).to.be.empty;769  });770});771772describe('Negative Integration Test: Token Properties', () => {773  let alice: IKeyringPair; // collection owner774  let bob: IKeyringPair; // collection admin775  let charlie: IKeyringPair; // token owner776777  let constitution: {permission: any, signers: IKeyringPair[], sinner: IKeyringPair}[];778779  before(async () => {780    await usingPlaygrounds(async (helper, privateKey) => {781      const donor = privateKey('//Alice');782      let dave: IKeyringPair;783      [alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);784785      // todo:playgrounds probably separate these tests later786      constitution = [787        {permission: {mutable: true, collectionAdmin: true}, signers: [alice, bob], sinner: charlie},788        {permission: {mutable: false, collectionAdmin: true}, signers: [alice, bob], sinner: charlie},789        {permission: {mutable: true, tokenOwner: true}, signers: [charlie], sinner: alice},790        {permission: {mutable: false, tokenOwner: true}, signers: [charlie], sinner: alice},791        {permission: {mutable: true, collectionAdmin: true, tokenOwner: true}, signers: [alice, bob, charlie], sinner: dave},792        {permission: {mutable: false, collectionAdmin: true, tokenOwner: true}, signers: [alice, bob, charlie], sinner: dave},793      ];794    });795  });796797  async function getConsumedSpace(api: any, collectionId: number, tokenId: number, mode: 'NFT' | 'RFT'): Promise<number> {798    return (await (mode == 'NFT' ? api.query.nonfungible : api.query.refungible).tokenProperties(collectionId, tokenId)).toJSON().consumedSpace;799  }800801  async function prepare(token: UniqueNFToken | UniqueRFToken, pieces: bigint): Promise<number> {802    await token.collection.addAdmin(alice, {Substrate: bob.address});803    await token.transfer(alice, {Substrate: charlie.address}, pieces);804805    let i = 0;806    for (const passage of constitution) {807      i++;808      const signer = passage.signers[0];809      810      await expect(811        token.collection.setTokenPropertyPermissions(alice, [{key: `${i}`, permission: passage.permission}]), 812        `on setting permission ${i} by alice`,813      ).to.be.fulfilled;814815      await expect(816        token.setProperties(signer, [{key: `${i}`, value: 'Serotonin increase'}]), 817        `on adding property ${i} by ${signer.address}`,818      ).to.be.fulfilled;819    }820821    const originalSpace = await getConsumedSpace(token.collection.helper.api, token.collectionId, token.tokenId, pieces == 1n ? 'NFT' : 'RFT'); 822    return originalSpace;823  }824825  async function testForbidsChangingDeletingPropertiesUserOutsideOfPermissions(token: UniqueNFToken | UniqueRFToken, pieces: bigint) {826    const originalSpace = await prepare(token, pieces);827828    let i = 0;829    for (const forbiddance of constitution) {830      i++;831      if (!forbiddance.permission.mutable) continue;832833      await expect(834        token.setProperties(forbiddance.sinner, [{key: `${i}`, value: 'Serotonin down'}]), 835        `on failing to change property ${i} by the malefactor`,836      ).to.be.rejectedWith(/common\.NoPermission/);837838      await expect(839        token.deleteProperties(forbiddance.sinner, [`${i}`]), 840        `on failing to delete property ${i} by the malefactor`,841      ).to.be.rejectedWith(/common\.NoPermission/);842    }843844    const consumedSpace = await getConsumedSpace(token.collection.helper.api, token.collectionId, token.tokenId, pieces == 1n ? 'NFT' : 'RFT'); 845    expect(consumedSpace).to.be.equal(originalSpace);846  }847848  itSub('Forbids changing/deleting properties of a token if the user is outside of permissions (NFT)', async ({helper}) =>  {849    const collection = await helper.nft.mintCollection(alice);850    const token = await collection.mintToken(alice);851    await testForbidsChangingDeletingPropertiesUserOutsideOfPermissions(token, 1n);852  });853854  itSub.ifWithPallets('Forbids changing/deleting properties of a token if the user is outside of permissions (ReFungible)', [Pallets.ReFungible], async ({helper}) => {855    const collection = await helper.rft.mintCollection(alice);856    const token = await collection.mintToken(alice, 100n);857    await testForbidsChangingDeletingPropertiesUserOutsideOfPermissions(token, 100n);858  });859860  async function testForbidsChangingDeletingPropertiesIfPropertyImmutable(token: UniqueNFToken | UniqueRFToken, pieces: bigint) {861    const originalSpace = await prepare(token, pieces);862863    let i = 0;864    for (const permission of constitution) {865      i++;866      if (permission.permission.mutable) continue;867868      await expect(869        token.setProperties(permission.signers[0], [{key: `${i}`, value: 'Serotonin down'}]), 870        `on failing to change property ${i} by signer #0`,871      ).to.be.rejectedWith(/common\.NoPermission/);872873      await expect(874        token.deleteProperties(permission.signers[0], [i.toString()]), 875        `on failing to delete property ${i} by signer #0`,876      ).to.be.rejectedWith(/common\.NoPermission/);877    }878  879    const consumedSpace = await getConsumedSpace(token.collection.helper.api, token.collectionId, token.tokenId, pieces == 1n ? 'NFT' : 'RFT'); 880    expect(consumedSpace).to.be.equal(originalSpace);881  }882883  itSub('Forbids changing/deleting properties of a token if the property is permanent (immutable) (NFT)', async ({helper}) =>  {884    const collection = await helper.nft.mintCollection(alice);885    const token = await collection.mintToken(alice);886    await testForbidsChangingDeletingPropertiesIfPropertyImmutable(token, 1n);887  });888889  itSub.ifWithPallets('Forbids changing/deleting properties of a token if the property is permanent (immutable) (ReFungible)', [Pallets.ReFungible], async ({helper}) => {890    const collection = await helper.rft.mintCollection(alice);891    const token = await collection.mintToken(alice, 100n);892    await testForbidsChangingDeletingPropertiesIfPropertyImmutable(token, 100n);893  });894895  async function testForbidsAddingPropertiesIfPropertyNotDeclared(token: UniqueNFToken | UniqueRFToken, pieces: bigint) {896    const originalSpace = await prepare(token, pieces);897898    await expect(899      token.setProperties(alice, [{key: 'non-existent', value: 'I exist!'}]), 900      'on failing to add a previously non-existent property',901    ).to.be.rejectedWith(/common\.NoPermission/);902      903    await expect(904      token.collection.setTokenPropertyPermissions(alice, [{key: 'now-existent', permission: {}}]), 905      'on setting a new non-permitted property',906    ).to.be.fulfilled;907908    await expect(909      token.setProperties(alice, [{key: 'now-existent', value: 'I exist!'}]), 910      'on failing to add a property forbidden by the \'None\' permission',911    ).to.be.rejectedWith(/common\.NoPermission/);912913    expect(await token.getProperties(['non-existent', 'now-existent'])).to.be.empty;914      915    const consumedSpace = await getConsumedSpace(token.collection.helper.api, token.collectionId, token.tokenId, pieces == 1n ? 'NFT' : 'RFT'); 916    expect(consumedSpace).to.be.equal(originalSpace);917  }918919  itSub('Forbids adding properties to a token if the property is not declared / forbidden with the \'None\' permission (NFT)', async ({helper}) =>  {920    const collection = await helper.nft.mintCollection(alice);921    const token = await collection.mintToken(alice);922    await testForbidsAddingPropertiesIfPropertyNotDeclared(token, 1n);923  });924925  itSub.ifWithPallets('Forbids adding properties to a token if the property is not declared / forbidden with the \'None\' permission (ReFungible)', [Pallets.ReFungible], async ({helper}) => {926    const collection = await helper.rft.mintCollection(alice);927    const token = await collection.mintToken(alice, 100n);928    await testForbidsAddingPropertiesIfPropertyNotDeclared(token, 100n);929  });930931  async function testForbidsAddingTooManyProperties(token: UniqueNFToken | UniqueRFToken, pieces: bigint) {932    const originalSpace = await prepare(token, pieces);933934    await expect(935      token.collection.setTokenPropertyPermissions(alice, [936        {key: 'a_holy_book', permission: {collectionAdmin: true, tokenOwner: true}}, 937        {key: 'young_years', permission: {collectionAdmin: true, tokenOwner: true}},938      ]), 939      'on setting new permissions for properties',940    ).to.be.fulfilled;941942    // Mute the general tx parsing error943    {944      console.error = () => {};945      await expect(token.setProperties(alice, [{key: 'a_holy_book', value: 'word '.repeat(6554)}]))946        .to.be.rejected;947    }948949    await expect(token.setProperties(alice, [950      {key: 'a_holy_book', value: 'word '.repeat(3277)}, 951      {key: 'young_years', value: 'neverending'.repeat(1490)},952    ])).to.be.rejectedWith(/common\.NoSpaceForProperty/);953  954    expect(await token.getProperties(['a_holy_book', 'young_years'])).to.be.empty;955    const consumedSpace = await getConsumedSpace(token.collection.helper.api, token.collectionId, token.tokenId, pieces == 1n ? 'NFT' : 'RFT'); 956    expect(consumedSpace).to.be.equal(originalSpace);957  }958959  itSub('Forbids adding too many properties to a token (NFT)', async ({helper}) =>  {960    const collection = await helper.nft.mintCollection(alice);961    const token = await collection.mintToken(alice);962    await testForbidsAddingTooManyProperties(token, 1n);963  });964965  itSub.ifWithPallets('Forbids adding too many properties to a token (ReFungible)', [Pallets.ReFungible], async ({helper}) => {966    const collection = await helper.rft.mintCollection(alice);967    const token = await collection.mintToken(alice, 100n);968    await testForbidsAddingTooManyProperties(token, 100n);969  });970});971972describe('ReFungible token properties permissions tests', () => {973  let alice: IKeyringPair;974  let bob: IKeyringPair;975  let charlie: IKeyringPair;976977  before(async function() {978    await usingPlaygrounds(async (helper, privateKey) => {979      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);980981      const donor = privateKey('//Alice');982      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);983    });984  });985986  async function prepare(helper: UniqueHelper): Promise<UniqueRFToken> {987    const collection = await helper.rft.mintCollection(alice);988    const token = await collection.mintToken(alice, 100n);989    990    await collection.addAdmin(alice, {Substrate: bob.address});991    await collection.setTokenPropertyPermissions(alice, [{key: 'fractals', permission: {mutable: true, tokenOwner: true}}]);992    993    return token;994  }995996  itSub('Forbids adding token property with tokenOwner==true when signer doesn\'t have all pieces', async ({helper}) =>  {997    const token = await prepare(helper);998999    await token.transfer(alice, {Substrate: charlie.address}, 33n);10001001    await expect(token.setProperties(alice, [1002      {key: 'fractals', value: 'multiverse'}, 1003    ])).to.be.rejectedWith(/common\.NoPermission/);1004  });10051006  itSub('Forbids mutating token property with tokenOwher==true when signer doesn\'t have all pieces', async ({helper}) =>  {1007    const token = await prepare(helper);10081009    await expect(token.collection.setTokenPropertyPermissions(alice, [{key: 'fractals', permission: {mutable:true, tokenOwner: true}}]))1010      .to.be.fulfilled;10111012    await expect(token.setProperties(alice, [1013      {key: 'fractals', value: 'multiverse'}, 1014    ])).to.be.fulfilled;10151016    await token.transfer(alice, {Substrate: charlie.address}, 33n);10171018    await expect(token.setProperties(alice, [1019      {key: 'fractals', value: 'want to rule the world'}, 1020    ])).to.be.rejectedWith(/common\.NoPermission/);1021  });10221023  itSub('Forbids deleting token property with tokenOwner==true when signer doesn\'t have all pieces', async ({helper}) =>  {1024    const token = await prepare(helper);10251026    await expect(token.setProperties(alice, [1027      {key: 'fractals', value: 'one headline - why believe it'}, 1028    ])).to.be.fulfilled;10291030    await token.transfer(alice, {Substrate: charlie.address}, 33n);10311032    await expect(token.deleteProperties(alice, ['fractals'])).1033      to.be.rejectedWith(/common\.NoPermission/);1034  });10351036  itSub('Allows token property mutation with collectionOwner==true when admin doesn\'t have all pieces', async ({helper}) =>  {1037    const token = await prepare(helper);10381039    await token.transfer(alice, {Substrate: charlie.address}, 33n);10401041    await expect(token.collection.setTokenPropertyPermissions(alice, [{key: 'fractals', permission: {mutable:true, collectionAdmin: true}}]))1042      .to.be.fulfilled;10431044    await expect(token.setProperties(alice, [1045      {key: 'fractals', value: 'multiverse'}, 1046    ])).to.be.fulfilled;1047  });1048});
modifiedtests/src/refungible.test.tsdiffbeforeafterboth
--- a/tests/src/refungible.test.ts
+++ b/tests/src/refungible.test.ts
@@ -124,7 +124,7 @@
     const token = await collection.mintToken(alice, 100n);
     expect(await collection.isTokenExists(token.tokenId)).to.be.true;
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(100n);
-    expect((await token.burn(alice, 99n)).success).to.be.true;
+    expect(await token.burn(alice, 99n)).to.be.true;
     expect(await collection.isTokenExists(token.tokenId)).to.be.true;
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(1n);
   });
@@ -136,7 +136,7 @@
     expect(await collection.isTokenExists(token.tokenId)).to.be.true;
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(100n);
 
-    expect((await token.burn(alice, 100n)).success).to.be.true;
+    expect(await token.burn(alice, 100n)).to.be.true;
     expect(await collection.isTokenExists(token.tokenId)).to.be.false;
   });
 
@@ -152,17 +152,17 @@
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(40n);
     expect(await token.getBalance({Substrate: bob.address})).to.be.equal(60n);
 
-    expect((await token.burn(alice, 40n)).success).to.be.true;
+    expect(await token.burn(alice, 40n)).to.be.true;
 
     expect(await collection.isTokenExists(token.tokenId)).to.be.true;
     expect(await token.getBalance({Substrate: alice.address})).to.be.equal(0n);
 
-    expect((await token.burn(bob, 59n)).success).to.be.true;
+    expect(await token.burn(bob, 59n)).to.be.true;
 
     expect(await token.getBalance({Substrate: bob.address})).to.be.equal(1n);
     expect(await collection.isTokenExists(token.tokenId)).to.be.true;
 
-    expect((await token.burn(bob, 1n)).success).to.be.true;
+    expect(await token.burn(bob, 1n)).to.be.true;
 
     expect(await collection.isTokenExists(token.tokenId)).to.be.false;
   });
modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -120,7 +120,7 @@
     return keyring.addFromUri(seed);
   }
 
-  static extractCollectionIdFromCreationResult(creationResult: ITransactionResult) {
+  static extractCollectionIdFromCreationResult(creationResult: ITransactionResult): number {
     if (creationResult.status !== this.transactionStatus.SUCCESS) {
       throw Error('Unable to create collection!');
     }
@@ -139,12 +139,15 @@
     return collectionId;
   }
 
-  static extractTokensFromCreationResult(creationResult: ITransactionResult) {
+  static extractTokensFromCreationResult(creationResult: ITransactionResult): {
+    success: boolean, 
+    tokens: {collectionId: number, tokenId: number, owner: CrossAccountId, amount: bigint}[],
+  } {
     if (creationResult.status !== this.transactionStatus.SUCCESS) {
       throw Error('Unable to create tokens!');
     }
     let success = false;
-    const tokens = [] as any;
+    const tokens = [] as {collectionId: number, tokenId: number, owner: CrossAccountId, amount: bigint}[];
     creationResult.result.events.forEach(({event: {data, method, section}}) => {
       if (method === 'ExtrinsicSuccess') {
         success = true;
@@ -152,19 +155,23 @@
         tokens.push({
           collectionId: parseInt(data[0].toString(), 10),
           tokenId: parseInt(data[1].toString(), 10),
-          owner: data[2].toJSON(),
+          owner: data[2].toHuman(),
+          amount: data[3].toBigInt(),
         });
       }
     });
     return {success, tokens};
   }
 
-  static extractTokensFromBurnResult(burnResult: ITransactionResult) {
+  static extractTokensFromBurnResult(burnResult: ITransactionResult): {
+    success: boolean, 
+    tokens: {collectionId: number, tokenId: number, owner: CrossAccountId, amount: bigint}[],
+  } {
     if (burnResult.status !== this.transactionStatus.SUCCESS) {
       throw Error('Unable to burn tokens!');
     }
     let success = false;
-    const tokens = [] as any;
+    const tokens = [] as {collectionId: number, tokenId: number, owner: CrossAccountId, amount: bigint}[];
     burnResult.result.events.forEach(({event: {data, method, section}}) => {
       if (method === 'ExtrinsicSuccess') {
         success = true;
@@ -172,14 +179,15 @@
         tokens.push({
           collectionId: parseInt(data[0].toString(), 10),
           tokenId: parseInt(data[1].toString(), 10),
-          owner: data[2].toJSON(),
+          owner: data[2].toHuman(),
+          amount: data[3].toBigInt(),
         });
       }
     });
     return {success, tokens};
   }
 
-  static findCollectionInEvents(events: {event: IEvent}[], collectionId: number, expectedSection: string, expectedMethod: string) {
+  static findCollectionInEvents(events: {event: IEvent}[], collectionId: number, expectedSection: string, expectedMethod: string): boolean {
     let eventId = null;
     events.forEach(({event: {data, method, section}}) => {
       if ((section === expectedSection) && (method === expectedMethod)) {
@@ -1001,12 +1009,9 @@
    * @param tokenId ID of token
    * @param amount amount of tokens to be burned. For NFT must be set to 1n
    * @example burnToken(aliceKeyring, 10, 5);
-   * @returns ```true``` and burnt token number is extrinsic success. Otherwise ```false``` and ```null```
+   * @returns ```true``` if the extrinsic is successful, otherwise ```false```
    */
-  async burnToken(signer: TSigner, collectionId: number, tokenId: number, amount=1n): Promise<{
-    success: boolean,
-    token: number | null
-  }> {
+  async burnToken(signer: TSigner, collectionId: number, tokenId: number, amount=1n): Promise<boolean> {
     const burnResult = await this.helper.executeExtrinsic(
       signer,
       'api.tx.unique.burnItem', [collectionId, tokenId, amount],
@@ -1014,7 +1019,7 @@
     );
     const burnedTokens = this.helper.util.extractTokensFromBurnResult(burnResult);
     if (burnedTokens.tokens.length > 1) throw Error('Burned multiple tokens');
-    return {success: burnedTokens.success, token: burnedTokens.tokens.length > 0 ? burnedTokens.tokens[0] : null};
+    return burnedTokens.success;
   }
 
   /**
@@ -1140,7 +1145,9 @@
     if (tokenData === null || tokenData.owner === null) return null;
     const owner = {} as any;
     for (const key of Object.keys(tokenData.owner)) {
-      owner[key.toLocaleLowerCase()] = new CrossAccountId(tokenData.owner[key]).withNormalizedSubstrate();
+      owner[key.toLocaleLowerCase()] = key.toLocaleLowerCase() == 'substrate' 
+        ? CrossAccountId.normalizeSubstrateAddress(tokenData.owner[key]) 
+        : tokenData.owner[key];
     }
     tokenData.normalizedOwner = CrossAccountId.fromLowerCaseKeys(owner);
     return tokenData;
@@ -1690,9 +1697,9 @@
    * @param tokenId ID of token
    * @param amount number of pieces to be burnt
    * @example burnToken(aliceKeyring, 10, 5);
-   * @returns ```true``` and burnt token number, if extrinsic is successful. Otherwise ```false``` and ```null```
+   * @returns ```true``` if the extrinsic is successful, otherwise ```false```
    */
-  async burnToken(signer: IKeyringPair, collectionId: number, tokenId: number, amount=1n): Promise<{ success: boolean; token: number | null; }> {
+  async burnToken(signer: IKeyringPair, collectionId: number, tokenId: number, amount=1n): Promise<boolean> {
     return await super.burnToken(signer, collectionId, tokenId, amount);
   }
 
@@ -1898,7 +1905,7 @@
    * @returns ```true``` if extrinsic success, otherwise ```false```
    */
   async burnTokens(signer: IKeyringPair, collectionId: number, amount=1n): Promise<boolean> {
-    return (await super.burnToken(signer, collectionId, 0, amount)).success;
+    return await super.burnToken(signer, collectionId, 0, amount);
   }
 
   /**