git.delta.rocks / unique-network / refs/commits / 49890775239a

difftreelog

test changed the privateKeyWrapper parameter from optional to mandatory

h3lpkey2022-06-03parent: #b1d3841.patch.diff
in: master

63 files changed

modifiedtests/src/addCollectionAdmin.test.tsdiffbeforeafterboth
--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -27,8 +27,8 @@
   it('Add collection admin.', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.equal(alice.address);
@@ -44,9 +44,9 @@
   it('Add admin using added collection admin.', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//CHARLIE');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//CHARLIE');
 
       const collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.equal(alice.address);
@@ -70,8 +70,8 @@
   it("Not owner can't add collection admin.", async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const nonOwner = privateKeyWrapper!('//Bob_stash');
+      const alice = privateKeyWrapper('//Alice');
+      const nonOwner = privateKeyWrapper('//Bob_stash');
 
       const changeAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(alice.address));
       await expect(submitTransactionExpectFailAsync(nonOwner, changeAdminTx)).to.be.rejected;
@@ -87,8 +87,8 @@
     await usingApi(async (api, privateKeyWrapper) => {
       // tslint:disable-next-line: no-bitwise
       const collectionId = (1 << 32) - 1;
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const changeOwnerTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
       await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
@@ -101,8 +101,8 @@
   it("Can't add an admin to a destroyed collection.", async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       await destroyCollectionExpectSuccess(collectionId);
       const changeOwnerTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
       await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
@@ -114,15 +114,15 @@
 
   it('Add an admin to a collection that has reached the maximum number of admins limit', async () => {
     await usingApi(async (api: ApiPromise, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const accounts = [
-        privateKeyWrapper!('//AdminTest/1').address,
-        privateKeyWrapper!('//AdminTest/2').address,
-        privateKeyWrapper!('//AdminTest/3').address,
-        privateKeyWrapper!('//AdminTest/4').address,
-        privateKeyWrapper!('//AdminTest/5').address,
-        privateKeyWrapper!('//AdminTest/6').address,
-        privateKeyWrapper!('//AdminTest/7').address,
+        privateKeyWrapper('//AdminTest/1').address,
+        privateKeyWrapper('//AdminTest/2').address,
+        privateKeyWrapper('//AdminTest/3').address,
+        privateKeyWrapper('//AdminTest/4').address,
+        privateKeyWrapper('//AdminTest/5').address,
+        privateKeyWrapper('//AdminTest/6').address,
+        privateKeyWrapper('//AdminTest/7').address,
       ];
       const collectionId = await createCollectionExpectSuccess();
 
modifiedtests/src/addToAllowList.test.tsdiffbeforeafterboth
--- a/tests/src/addToAllowList.test.ts
+++ b/tests/src/addToAllowList.test.ts
@@ -42,8 +42,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -67,7 +67,7 @@
     await usingApi(async (api, privateKeyWrapper) => {
       // tslint:disable-next-line: no-bitwise
       const collectionId = await getCreatedCollectionCount(api) + 1;
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
 
       const tx = api.tx.unique.addToAllowList(collectionId, normalizeAccountId(bob.address));
       await expect(submitTransactionExpectFailAsync(alice, tx)).to.be.rejected;
@@ -76,8 +76,8 @@
 
   it('Allow list an address in the collection that was destroyed', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       // tslint:disable-next-line: no-bitwise
       const collectionId = await createCollectionExpectSuccess();
       await destroyCollectionExpectSuccess(collectionId);
@@ -88,8 +88,8 @@
 
   it('Allow list an address in the collection that does not have allow list access enabled', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const ferdie = privateKeyWrapper!('//Ferdie');
+      const alice = privateKeyWrapper('//Alice');
+      const ferdie = privateKeyWrapper('//Ferdie');
       const collectionId = await createCollectionExpectSuccess();
       await enableAllowListExpectSuccess(alice, collectionId);
       await enablePublicMintingExpectSuccess(alice, collectionId);
@@ -104,9 +104,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
modifiedtests/src/addToContractAllowList.test.tsdiffbeforeafterboth
--- a/tests/src/addToContractAllowList.test.ts
+++ b/tests/src/addToContractAllowList.test.ts
@@ -31,7 +31,7 @@
 
   it('Add an address to a contract allow list', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
       const [contract, deployer] = await deployFlipper(api);
 
       const allowListedBefore = (await api.query.unique.contractAllowList(contract.address, bob.address)).toJSON();
@@ -47,7 +47,7 @@
 
   it('Adding same address to allow list repeatedly should not produce errors', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
       const [contract, deployer] = await deployFlipper(api);
 
       const allowListedBefore = (await api.query.unique.contractAllowList(contract.address, bob.address)).toJSON();
@@ -70,9 +70,9 @@
 
   it('Add an address to a allow list of a non-contract', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Bob');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlieGuineaPig = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Bob');
+      const bob = privateKeyWrapper('//Bob');
+      const charlieGuineaPig = privateKeyWrapper('//Charlie');
 
       const allowListedBefore = (await api.query.unique.contractAllowList(charlieGuineaPig.address, bob.address)).toJSON();
       const addTx = api.tx.unique.addToContractAllowList(charlieGuineaPig.address, bob.address);
@@ -86,7 +86,7 @@
 
   it('Add to a contract allow list using a non-owner address', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
       const [contract] = await deployFlipper(api);
 
       const allowListedBefore = (await api.query.unique.contractAllowList(contract.address, bob.address)).toJSON();
modifiedtests/src/allowLists.test.tsdiffbeforeafterboth
--- a/tests/src/allowLists.test.ts
+++ b/tests/src/allowLists.test.ts
@@ -50,9 +50,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
modifiedtests/src/approve.test.tsdiffbeforeafterboth
--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -43,9 +43,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
     });
   });
 
@@ -99,9 +99,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
     });
   });  
 
@@ -131,9 +131,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
     });
   });  
 
@@ -166,9 +166,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
     });
   });  
 
@@ -205,10 +205,10 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
-      dave =  privateKeyWrapper!('//Dave');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
+      dave =  privateKeyWrapper('//Dave');
     });
   });  
 
@@ -228,9 +228,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
     });
   });
 
@@ -267,9 +267,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
     });
   });
 
@@ -300,10 +300,10 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
-      dave =  privateKeyWrapper!('//Dave');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
+      dave =  privateKeyWrapper('//Dave');
     });
   });  
 
@@ -340,10 +340,10 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
-      dave =  privateKeyWrapper!('//Dave');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
+      dave =  privateKeyWrapper('//Dave');
     });
   });  
 
@@ -391,9 +391,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
     });
   });
 
@@ -413,9 +413,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice =  privateKeyWrapper!('//Alice');
-      bob =  privateKeyWrapper!('//Bob');
-      charlie =  privateKeyWrapper!('//Charlie');
+      alice =  privateKeyWrapper('//Alice');
+      bob =  privateKeyWrapper('//Bob');
+      charlie =  privateKeyWrapper('//Charlie');
     });
   });
 
modifiedtests/src/change-collection-owner.test.tsdiffbeforeafterboth
--- a/tests/src/change-collection-owner.test.ts
+++ b/tests/src/change-collection-owner.test.ts
@@ -42,8 +42,8 @@
   it('Changing owner changes owner address', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const collection =await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.deep.eq(alice.address);
@@ -61,8 +61,8 @@
   it('Changing the owner of the collection is not allowed for the former owner', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.deep.eq(alice.address);
@@ -81,9 +81,9 @@
   it('New collectionOwner has access to sponsorship management operations in the collection', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
 
       const collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.deep.eq(alice.address);
@@ -125,9 +125,9 @@
   it('New collectionOwner has access to changeCollectionOwner', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
 
       const collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.deep.eq(alice.address);
@@ -152,8 +152,8 @@
   it('Not owner can\'t change owner.', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const changeOwnerTx = api.tx.unique.changeCollectionOwner(collectionId, bob.address);
       await expect(submitTransactionExpectFailAsync(bob, changeOwnerTx)).to.be.rejected;
@@ -169,8 +169,8 @@
   it('Collection admin can\'t change owner.', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
 
@@ -188,8 +188,8 @@
   it('Can\'t change owner of a non-existing collection.', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = (1<<32) - 1;
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const changeOwnerTx = api.tx.unique.changeCollectionOwner(collectionId, bob.address);
       await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
@@ -202,9 +202,9 @@
   it('Former collectionOwner not allowed to sponsorship management operations in the collection', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
 
       const collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.deep.eq(alice.address);
modifiedtests/src/check-event/burnItemEvent.test.tsdiffbeforeafterboth
--- a/tests/src/check-event/burnItemEvent.test.ts
+++ b/tests/src/check-event/burnItemEvent.test.ts
@@ -32,7 +32,7 @@
   const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
   it('Check event from burnItem(): ', async () => {
modifiedtests/src/check-event/createCollectionEvent.test.tsdiffbeforeafterboth
--- a/tests/src/check-event/createCollectionEvent.test.ts
+++ b/tests/src/check-event/createCollectionEvent.test.ts
@@ -32,7 +32,7 @@
   const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
   it('Check event from createCollection(): ', async () => {
modifiedtests/src/check-event/createItemEvent.test.tsdiffbeforeafterboth
--- a/tests/src/check-event/createItemEvent.test.ts
+++ b/tests/src/check-event/createItemEvent.test.ts
@@ -32,7 +32,7 @@
   const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
   it('Check event from createItem(): ', async () => {
modifiedtests/src/check-event/createMultipleItemsEvent.test.tsdiffbeforeafterboth
--- a/tests/src/check-event/createMultipleItemsEvent.test.ts
+++ b/tests/src/check-event/createMultipleItemsEvent.test.ts
@@ -32,7 +32,7 @@
   const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
   it('Check event from createMultipleItems(): ', async () => {
modifiedtests/src/check-event/destroyCollectionEvent.test.tsdiffbeforeafterboth
--- a/tests/src/check-event/destroyCollectionEvent.test.ts
+++ b/tests/src/check-event/destroyCollectionEvent.test.ts
@@ -31,7 +31,7 @@
   const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
   it('Check event from destroyCollection(): ', async () => {
modifiedtests/src/check-event/transferEvent.test.tsdiffbeforeafterboth
--- a/tests/src/check-event/transferEvent.test.ts
+++ b/tests/src/check-event/transferEvent.test.ts
@@ -33,8 +33,8 @@
   const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
   it('Check event from transfer(): ', async () => {
modifiedtests/src/check-event/transferFromEvent.test.tsdiffbeforeafterboth
--- a/tests/src/check-event/transferFromEvent.test.ts
+++ b/tests/src/check-event/transferFromEvent.test.ts
@@ -33,8 +33,8 @@
   const checkSystem = 'ExtrinsicSuccess';
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
   it('Check event from transferFrom(): ', async () => {
modifiedtests/src/contracts.test.tsdiffbeforeafterboth
--- a/tests/src/contracts.test.ts
+++ b/tests/src/contracts.test.ts
@@ -19,7 +19,6 @@
 import usingApi, {submitTransactionAsync} from './substrate/substrate-api';
 import fs from 'fs';
 import {Abi, ContractPromise as Contract} from '@polkadot/api-contract';
-import privateKey from './substrate/privateKey';
 import {
   deployFlipper,
   getFlipValue,
@@ -54,7 +53,7 @@
       const [contract, deployer] = await deployFlipper(api);
       const initialGetResponse = await getFlipValue(contract, deployer);
 
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
       const flip = contract.tx.flip(value, gasLimit);
       await submitTransactionAsync(bob, flip);
 
@@ -77,8 +76,8 @@
 describe.skip('Chain extensions', () => {
   it('Transfer CE', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       // Prep work
       const collectionId = await createCollectionExpectSuccess();
@@ -101,8 +100,8 @@
 
   it('Mint CE', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const collectionId = await createCollectionExpectSuccess();
       const [contract] = await deployTransferContract(api);
@@ -128,8 +127,8 @@
 
   it('Bulk mint CE', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const collectionId = await createCollectionExpectSuccess();
       const [contract] = await deployTransferContract(api);
@@ -169,9 +168,9 @@
 
   it('Approve CE', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
 
       const collectionId = await createCollectionExpectSuccess();
       const [contract] = await deployTransferContract(api);
@@ -188,9 +187,9 @@
 
   it('TransferFrom CE', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
 
       const collectionId = await createCollectionExpectSuccess();
       const [contract] = await deployTransferContract(api);
@@ -209,8 +208,8 @@
 
   it('ToggleAllowList CE', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const collectionId = await createCollectionExpectSuccess();
       const [contract] = await deployTransferContract(api);
modifiedtests/src/createCollection.test.tsdiffbeforeafterboth
--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -58,8 +58,8 @@
 
   it('Create new collection with extra fields', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       const tx = api.tx.unique.createCollectionEx({
         mode: {Fungible: 8},
         permissions: {
@@ -101,7 +101,7 @@
   });
   it('fails when bad limits are set', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const tx = api.tx.unique.createCollectionEx({mode: 'NFT', limits: {tokenLimit: 0}});
       await expect(executeTransaction(api, alice, tx)).to.be.rejectedWith(/^common.CollectionTokenLimitExceeded$/);
     });
modifiedtests/src/createMultipleItems.test.tsdiffbeforeafterboth
--- a/tests/src/createMultipleItems.test.ts
+++ b/tests/src/createMultipleItems.test.ts
@@ -45,7 +45,7 @@
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
 
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       await submitTransactionAsync(
         alice, 
         api.tx.unique.setPropertyPermissions(collectionId, [{key: 'data', permission: {tokenOwner: true}}]),
@@ -76,7 +76,7 @@
       const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const args = [
         {Fungible: {value: 1}},
         {Fungible: {value: 2}},
@@ -96,7 +96,7 @@
       const collectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const args = [
         {ReFungible: {pieces: 1}},
         {ReFungible: {pieces: 2}},
@@ -116,7 +116,7 @@
 
   it('Can mint amount of items equals to collection limits', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
 
       const collectionId = await createCollectionExpectSuccess();
       await setCollectionLimitsExpectSuccess(alice, collectionId, {
@@ -138,7 +138,7 @@
       const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: false}}]});
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const args = [
         {NFT: {properties: [{key: 'k', value: 'v1'}]}},
         {NFT: {properties: [{key: 'k', value: 'v2'}]}},
@@ -164,8 +164,8 @@
       const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: false, collectionAdmin: true, tokenOwner: false}}]});
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
       const args = [
         {NFT: {properties: [{key: 'k', value: 'v1'}]}},
@@ -192,7 +192,7 @@
       const collectionId = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}]});
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);
       expect(itemsListIndexBefore).to.be.equal(0);
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const args = [
         {NFT: {properties: [{key: 'k', value: 'v1'}]}},
         {NFT: {properties: [{key: 'k', value: 'v2'}]}},
@@ -220,8 +220,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -302,8 +302,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -364,7 +364,7 @@
       const collectionId = await createCollectionWithPropsExpectSuccess({
         propPerm: [{key: 'key', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}],
       });
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const args = [
         {NFT: {properties: [{key: 'key', value: 'A'.repeat(32769)}]}},
         {NFT: {properties: [{key: 'key', value: 'B'.repeat(32769)}]}},
modifiedtests/src/createMultipleItemsEx.test.tsdiffbeforeafterboth
--- a/tests/src/createMultipleItemsEx.test.ts
+++ b/tests/src/createMultipleItemsEx.test.ts
@@ -22,9 +22,9 @@
   it('can initialize multiple NFT with different owners', async () => {
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       const data = [
         {
           owner: {substrate: alice.address},
@@ -47,9 +47,9 @@
   it('createMultipleItemsEx with property Admin', async () => {
     const collection = await createCollectionWithPropsExpectSuccess({mode: {type: 'NFT'}, propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: false}}]});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       const data = [
         {
           owner: {substrate: alice.address},
@@ -75,9 +75,9 @@
   it('createMultipleItemsEx with property AdminConst', async () => {
     const collection = await createCollectionWithPropsExpectSuccess({mode: {type: 'NFT'}, propPerm: [{key: 'k', permission: {mutable: false, collectionAdmin: true, tokenOwner: false}}]});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       const data = [
         {
           owner: {substrate: alice.address},
@@ -103,9 +103,9 @@
   it('createMultipleItemsEx with property itemOwnerOrAdmin', async () => {
     const collection = await createCollectionWithPropsExpectSuccess({mode: {type: 'NFT'}, propPerm: [{key: 'k', permission: {mutable: false, collectionAdmin: true, tokenOwner: true}}]});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       const data = [
         {
           owner: {substrate: alice.address},
@@ -132,9 +132,9 @@
     const collection = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}],
       propPerm:   [{key: 'key1', permission: {mutable: true, collectionAdmin: false, tokenOwner: false}}]});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       await addCollectionAdminExpectSuccess(alice, collection, bob.address);
       const data = [
         {
@@ -161,8 +161,8 @@
     const collection = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}],
       propPerm:   [{key: 'key1', permission: {mutable: false, collectionAdmin: false, tokenOwner: false}}]});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       await addCollectionAdminExpectSuccess(alice, collection, bob.address);
       const data = [
         {
@@ -188,9 +188,9 @@
   it('Adding property without access rights', async () => {
     const collection = await createCollectionWithPropsExpectSuccess({properties: [{key: 'key1', value: 'v'}]});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       await addCollectionAdminExpectSuccess(alice, collection, bob.address);
       const data = [
         {
@@ -221,7 +221,7 @@
 
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       await expect(executeTransaction(api, alice, api.tx.unique.setPropertyPermissions(collection, propPerms))).to.be.rejectedWith(/common\.PropertyLimitReached/);
     });
   });
@@ -229,9 +229,9 @@
   it('Trying to add bigger property than allowed', async () => {
     const collection = await createCollectionWithPropsExpectSuccess({propPerm: [{key: 'k', permission: {mutable: true, collectionAdmin: true, tokenOwner: true}}]});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       await addCollectionAdminExpectSuccess(alice, collection, bob.address);
       const data = [
         {
@@ -253,9 +253,9 @@
   it('can initialize multiple NFT with different owners', async () => {
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       const data = [
         {
           owner: {substrate: alice.address},
@@ -278,9 +278,9 @@
   it('can initialize multiple NFT with different owners', async () => {
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       const data = [
         {
           owner: {substrate: alice.address},
@@ -304,8 +304,8 @@
     const collection = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
     
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       // Polkadot requires map, and yet requires keys to be JSON encoded
       const users = new Map();
       users.set(JSON.stringify({substrate: alice.address}), 1);
modifiedtests/src/creditFeesToTreasury.test.tsdiffbeforeafterboth
--- a/tests/src/creditFeesToTreasury.test.ts
+++ b/tests/src/creditFeesToTreasury.test.ts
@@ -65,8 +65,8 @@
 describe('integration test: Fees must be credited to Treasury:', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -77,7 +77,7 @@
 
       const totalBefore = (await api.query.balances.totalIssuance()).toBigInt();
 
-      const alicePrivateKey = privateKeyWrapper!('//Alice');
+      const alicePrivateKey = privateKeyWrapper('//Alice');
       const amount = 1n;
       const transfer = api.tx.balances.transfer(bobsPublicKey, amount);
 
@@ -95,7 +95,7 @@
       await skipInflationBlock(api);
       await waitNewBlocks(api, 1);
 
-      const alicePrivateKey = privateKeyWrapper!('//Alice');
+      const alicePrivateKey = privateKeyWrapper('//Alice');
       const treasuryBalanceBefore: bigint = (await api.query.system.account(TREASURY)).data.free.toBigInt();
       const aliceBalanceBefore: bigint = (await api.query.system.account(alicesPublicKey)).data.free.toBigInt();
 
@@ -118,7 +118,7 @@
       //await skipInflationBlock(api);
       await waitNewBlocks(api, 1);
 
-      const bobPrivateKey = privateKeyWrapper!('//Bob');
+      const bobPrivateKey = privateKeyWrapper('//Bob');
       const treasuryBalanceBefore = (await api.query.system.account(TREASURY)).data.free.toBigInt();
       const bobBalanceBefore = (await api.query.system.account(bobsPublicKey)).data.free.toBigInt();
 
modifiedtests/src/destroyCollection.test.tsdiffbeforeafterboth
--- a/tests/src/destroyCollection.test.ts
+++ b/tests/src/destroyCollection.test.ts
@@ -50,8 +50,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
modifiedtests/src/enableContractSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/enableContractSponsoring.test.ts
+++ b/tests/src/enableContractSponsoring.test.ts
@@ -79,7 +79,7 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
 
modifiedtests/src/enableDisableTransfer.test.tsdiffbeforeafterboth
--- a/tests/src/enableDisableTransfer.test.ts
+++ b/tests/src/enableDisableTransfer.test.ts
@@ -31,8 +31,8 @@
 describe('Enable/Disable Transfers', () => {
   it('User can transfer token with enabled transfer flag', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       // nft
       const nftCollectionId = await createCollectionExpectSuccess();
       const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
@@ -46,8 +46,8 @@
 
   it('User can\'n transfer token with disabled transfer flag', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       // nft
       const nftCollectionId = await createCollectionExpectSuccess();
       const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
@@ -63,7 +63,7 @@
 describe('Negative Enable/Disable Transfers', () => {
   it('Non-owner cannot change transfer flag', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
       // nft
       const nftCollectionId = await createCollectionExpectSuccess();
 
modifiedtests/src/eth/base.test.tsdiffbeforeafterboth
--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -53,7 +53,7 @@
     const caller = await createEthAccountWithBalance(api, web3);
     const receiver = createEthAccount(web3);
 
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
modifiedtests/src/eth/collectionProperties.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -6,7 +6,7 @@
 
 describe('EVM collection properties', () => {
   itWeb3('Can be set', async({web3, api, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
 
@@ -21,7 +21,7 @@
     expect(value).to.equal('testValue');
   });
   itWeb3('Can be deleted', async({web3, api, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
 
@@ -38,7 +38,7 @@
     expect(result.length).to.equal(0);
   });
   itWeb3('Can be read', async({web3, api, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = createEthAccount(web3);
     const collection = await createCollectionExpectSuccess({mode: {type:'NFT'}});
 
modifiedtests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -5,7 +5,7 @@
 
 describe('evm collection sponsoring', () => {
   itWeb3('sponsors mint transactions', async ({web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const collection = await createCollectionExpectSuccess();
     await setCollectionSponsorExpectSuccess(collection, alice.address);
modifiedtests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -63,7 +63,7 @@
   });
 
   itWeb3('In generous mode, non-allowlisted user transaction will be sponsored', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const caller = await createEthAccountWithBalance(api, web3);
@@ -91,7 +91,7 @@
   });
 
   itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works. Sponsor balance should decrease (allowlisted)', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const caller = createEthAccount(web3);
@@ -121,7 +121,7 @@
   });
 
   itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works. Sponsor balance should not decrease (non-allowlisted)', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const caller = createEthAccount(web3);
@@ -149,7 +149,7 @@
   });
 
   itWeb3('Sponsoring is set, an address that has UNQ can send a transaction and it works. User balance should not change', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const caller = await createEthAccountWithBalance(api, web3);
@@ -178,7 +178,7 @@
   });
 
   itWeb3('Sponsoring is limited, with setContractRateLimit. The limitation is working if transactions are sent more often, the sender pays the commission.', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const caller = await createEthAccountWithBalance(api, web3);
@@ -301,8 +301,8 @@
 
   //TODO: CORE-302 add eth methods
   itWeb3.skip('Check that transaction via EVM spend money from substrate address', async ({api, web3, privateKeyWrapper}) => {
-    const owner = privateKeyWrapper!('//Alice');
-    const user = privateKeyWrapper!(`//User/${Date.now()}`);
+    const owner = privateKeyWrapper('//Alice');
+    const user = privateKeyWrapper(`//User/${Date.now()}`);
     const userEth = subToEth(user.address);
     const collectionId = await createCollectionExpectSuccess();
     await addCollectionAdminExpectSuccess(owner, collectionId, {Ethereum: userEth});
modifiedtests/src/eth/crossTransfer.test.tsdiffbeforeafterboth
--- a/tests/src/eth/crossTransfer.test.ts
+++ b/tests/src/eth/crossTransfer.test.ts
@@ -32,9 +32,9 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
-    const bob = privateKeyWrapper!('//Bob');
-    const charlie = privateKeyWrapper!('//Charlie');
+    const alice = privateKeyWrapper('//Alice');
+    const bob = privateKeyWrapper('//Bob');
+    const charlie = privateKeyWrapper('//Charlie');
     await createFungibleItemExpectSuccess(alice, collection, {Value: 200n}, {Substrate: alice.address});
     await transferExpectSuccess(collection, 0, alice, {Ethereum: subToEth(charlie.address)} , 200, 'Fungible');
     await transferFromExpectSuccess(collection, 0, alice, {Ethereum: subToEth(charlie.address)}, charlie, 50, 'Fungible');
@@ -46,8 +46,8 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
-    const bob = privateKeyWrapper!('//Bob');
+    const alice = privateKeyWrapper('//Alice');
+    const bob = privateKeyWrapper('//Bob');
     const bobProxy = await createEthAccountWithBalance(api, web3);
     const aliceProxy = await createEthAccountWithBalance(api, web3);
 
@@ -68,9 +68,9 @@
       name: 'token name',
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
-    const bob = privateKeyWrapper!('//Bob');
-    const charlie = privateKeyWrapper!('//Charlie');
+    const alice = privateKeyWrapper('//Alice');
+    const bob = privateKeyWrapper('//Bob');
+    const charlie = privateKeyWrapper('//Charlie');
     const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
     await transferExpectSuccess(collection, tokenId, alice, {Ethereum: subToEth(charlie.address)}, 1, 'NFT');
     await transferFromExpectSuccess(collection, tokenId, alice, {Ethereum: subToEth(charlie.address)}, charlie, 1, 'NFT');
@@ -82,9 +82,9 @@
       name: 'token name',
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
-    const bob = privateKeyWrapper!('//Bob');
-    const charlie = privateKeyWrapper!('//Charlie');
+    const alice = privateKeyWrapper('//Alice');
+    const bob = privateKeyWrapper('//Bob');
+    const charlie = privateKeyWrapper('//Charlie');
     const bobProxy = await createEthAccountWithBalance(api, web3);
     const aliceProxy = await createEthAccountWithBalance(api, web3);
     const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
modifiedtests/src/eth/fungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -25,7 +25,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const caller = await createEthAccountWithBalance(api, web3);
 
@@ -43,7 +43,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const caller = await createEthAccountWithBalance(api, web3);
 
@@ -63,7 +63,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
 
@@ -102,7 +102,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = createEthAccount(web3);
     await transferBalanceToEth(api, alice, owner);
@@ -160,7 +160,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = createEthAccount(web3);
     await transferBalanceToEth(api, alice, owner);
@@ -206,7 +206,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const spender = createEthAccount(web3);
@@ -224,7 +224,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const spender = await createEthAccountWithBalance(api, web3);
@@ -244,7 +244,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const receiver = createEthAccount(web3);
@@ -264,7 +264,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const receiver = createEthAccount(web3);
 
@@ -294,8 +294,8 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
-    const bob = privateKeyWrapper!('//Bob');
+    const alice = privateKeyWrapper('//Alice');
+    const bob = privateKeyWrapper('//Bob');
 
     const receiver = createEthAccount(web3);
 
@@ -335,7 +335,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const receiver = createEthAccount(web3);
 
modifiedtests/src/eth/marketplace/marketplace.test.tsdiffbeforeafterboth
--- a/tests/src/eth/marketplace/marketplace.test.ts
+++ b/tests/src/eth/marketplace/marketplace.test.ts
@@ -38,7 +38,7 @@
 
 describe('Matcher contract usage', () => {
   itWeb3('With UNQ', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const matcherOwner = await createEthAccountWithBalance(api, web3);
     const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
       from: matcherOwner,
@@ -60,7 +60,7 @@
     await helpers.methods.toggleAllowed(matcher.options.address, subToEth(alice.address), true).send({from: matcherOwner});
     await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(alice.address)));
 
-    const seller = privateKeyWrapper!(`//Seller/${Date.now()}`);
+    const seller = privateKeyWrapper(`//Seller/${Date.now()}`);
     await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});
 
     const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
@@ -99,7 +99,7 @@
 
 
   itWeb3('With escrow', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const matcherOwner = await createEthAccountWithBalance(api, web3);
     const escrow = await createEthAccountWithBalance(api, web3);
     const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
@@ -123,7 +123,7 @@
     await helpers.methods.toggleAllowed(matcher.options.address, subToEth(alice.address), true).send({from: matcherOwner});
     await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(alice.address)));
 
-    const seller = privateKeyWrapper!(`//Seller/${Date.now()}`);
+    const seller = privateKeyWrapper(`//Seller/${Date.now()}`);
     await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});
 
     const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
@@ -170,7 +170,7 @@
 
 
   itWeb3('Sell tokens from substrate user via EVM contract', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const matcherOwner = await createEthAccountWithBalance(api, web3);
     const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
       from: matcherOwner,
@@ -183,7 +183,7 @@
     await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});
     const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId), {from: matcherOwner});
 
-    const seller = privateKeyWrapper!(`//Seller/${Date.now()}`);
+    const seller = privateKeyWrapper(`//Seller/${Date.now()}`);
     await transferBalanceTo(api, alice, seller.address);
     
     const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
modifiedtests/src/eth/migration.test.tsdiffbeforeafterboth
--- a/tests/src/eth/migration.test.ts
+++ b/tests/src/eth/migration.test.ts
@@ -53,7 +53,7 @@
       ['0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643', '0x0000000000000000000000000000000000000000000000000000000000000004'],
     ];
 
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
 
     await submitTransactionAsync(alice, api.tx.sudo.sudo(api.tx.evmMigration.begin(ADDRESS) as any));
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -25,7 +25,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
 
     await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
@@ -41,7 +41,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const caller = await createEthAccountWithBalance(api, web3);
     await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum:caller});
@@ -59,7 +59,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const caller = await createEthAccountWithBalance(api, web3);
     const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});
@@ -117,7 +117,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const caller = await createEthAccountWithBalance(api, web3);
     const changeAdminTx = api.tx.unique.addCollectionAdmin(collection, {Ethereum: caller});
@@ -180,7 +180,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
 
@@ -211,7 +211,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = createEthAccount(web3);
     await transferBalanceToEth(api, alice, owner);
@@ -245,7 +245,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = createEthAccount(web3);
     await transferBalanceToEth(api, alice, owner);
@@ -293,7 +293,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = createEthAccount(web3);
     await transferBalanceToEth(api, alice, owner);
@@ -339,7 +339,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const spender = createEthAccount(web3);
@@ -357,7 +357,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const spender = await createEthAccountWithBalance(api, web3);
@@ -377,7 +377,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const receiver = createEthAccount(web3);
@@ -397,7 +397,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const address = collectionIdToAddress(collection);
     const contract = new web3.eth.Contract(nonFungibleAbi as any, address);
@@ -424,7 +424,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const address = collectionIdToAddress(collection);
     const contract = new web3.eth.Contract(nonFungibleAbi as any, address);
@@ -451,7 +451,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const receiver = createEthAccount(web3);
 
@@ -481,8 +481,8 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
-    const bob = privateKeyWrapper!('//Bob');
+    const alice = privateKeyWrapper('//Alice');
+    const bob = privateKeyWrapper('//Bob');
 
     const receiver = createEthAccount(web3);
 
@@ -513,7 +513,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const receiver = createEthAccount(web3);
 
modifiedtests/src/eth/payable.test.tsdiffbeforeafterboth
--- a/tests/src/eth/payable.test.ts
+++ b/tests/src/eth/payable.test.ts
@@ -34,7 +34,7 @@
   itWeb3('Evm contract can receive wei from substrate account', async ({api, web3, privateKeyWrapper}) => {
     const deployer = await createEthAccountWithBalance(api, web3);
     const contract = await deployCollector(web3, deployer);
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     // Transaction fee/value will be payed from subToEth(sender) evm balance,
     // which is backed by evmToAddress(subToEth(sender)) substrate balance
@@ -64,7 +64,7 @@
   itWeb3('Wei sent directly to backing storage of evm contract balance is unaccounted', async({api, web3, privateKeyWrapper}) => {
     const deployer = await createEthAccountWithBalance(api, web3);
     const contract = await deployCollector(web3, deployer);
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     await transferBalanceExpectSuccess(api, alice, evmToAddress(contract.options.address), '10000');
 
@@ -77,11 +77,11 @@
 
     const deployer = await createEthAccountWithBalance(api, web3);
     const contract = await deployCollector(web3, deployer);
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     await web3.eth.sendTransaction({from: deployer, to: contract.options.address, value: CONTRACT_BALANCE.toString(), ...GAS_ARGS});
 
-    const receiver = privateKeyWrapper!(`//Receiver${Date.now()}`);
+    const receiver = privateKeyWrapper(`//Receiver${Date.now()}`);
 
     // First receive balance on eth balance of bob
     {
modifiedtests/src/eth/proxy/fungibleProxy.test.tsdiffbeforeafterboth
--- a/tests/src/eth/proxy/fungibleProxy.test.ts
+++ b/tests/src/eth/proxy/fungibleProxy.test.ts
@@ -39,7 +39,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
 
     await createFungibleItemExpectSuccess(alice, collection, {Value: 200n}, {Substrate: alice.address});
@@ -56,7 +56,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
 
     await createFungibleItemExpectSuccess(alice, collection, {Value: 200n}, {Ethereum: caller});
@@ -75,7 +75,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const spender = createEthAccount(web3);
 
@@ -111,7 +111,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const owner = await createEthAccountWithBalance(api, web3);
 
@@ -166,7 +166,7 @@
       name: 'token name',
       mode: {type: 'Fungible', decimalPoints: 0},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const receiver = await createEthAccountWithBalance(api, web3);
 
modifiedtests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth
--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -39,7 +39,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
 
     await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
@@ -55,7 +55,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const caller = await createEthAccountWithBalance(api, web3);
     await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});
@@ -73,7 +73,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const caller = await createEthAccountWithBalance(api, web3);
     const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});
@@ -92,7 +92,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const receiver = createEthAccount(web3);
 
@@ -133,7 +133,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const caller = await createEthAccountWithBalance(api, web3);
     const receiver = createEthAccount(web3);
@@ -196,7 +196,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
 
     const address = collectionIdToAddress(collection);
@@ -228,7 +228,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const spender = createEthAccount(web3);
 
@@ -258,7 +258,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const owner = await createEthAccountWithBalance(api, web3);
 
@@ -302,7 +302,7 @@
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
     });
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const receiver = createEthAccount(web3);
 
modifiedtests/src/eth/sponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/sponsoring.test.ts
+++ b/tests/src/eth/sponsoring.test.ts
@@ -19,7 +19,7 @@
 
 describe('EVM sponsoring', () => {
   itWeb3('Fee is deducted from contract if sponsoring is enabled', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const caller = createEthAccount(web3);
@@ -50,7 +50,7 @@
     expect(await web3.eth.getBalance(flipper.options.address)).to.be.not.equals(originalFlipperBalance);
   });
   itWeb3('...but this doesn\'t applies to payable value', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3);
     const caller = await createEthAccountWithBalance(api, web3);
modifiedtests/src/eth/tokenProperties.test.tsdiffbeforeafterboth
--- a/tests/src/eth/tokenProperties.test.ts
+++ b/tests/src/eth/tokenProperties.test.ts
@@ -6,7 +6,7 @@
 
 describe('EVM token properties', () => {
   itWeb3('Can be reconfigured', async({web3, api, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     for(const [mutable,collectionAdmin, tokenOwner] of cartesian([], [false, true], [false, true], [false, true])) {
       const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
@@ -24,7 +24,7 @@
     }
   });
   itWeb3('Can be set', async({web3, api, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     const token = await createItemExpectSuccess(alice, collection, 'NFT');
@@ -47,7 +47,7 @@
     expect(value).to.equal('testValue');
   });
   itWeb3('Can be deleted', async({web3, api, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = await createEthAccountWithBalance(api, web3);
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     const token = await createItemExpectSuccess(alice, collection, 'NFT');
@@ -72,7 +72,7 @@
     expect(result.length).to.equal(0);
   });
   itWeb3('Can be read', async({web3, api, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const caller = createEthAccount(web3);
     const collection = await createCollectionExpectSuccess({mode: {type:'NFT'}});
     const token = await createItemExpectSuccess(alice, collection, 'NFT');
modifiedtests/src/eth/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/eth/util/helpers.ts
+++ b/tests/src/eth/util/helpers.ts
@@ -127,7 +127,7 @@
   expect(result.success).to.be.true;
 }
 
-export async function itWeb3(name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper?: (account: string) => IKeyringPair }) => any, opts: { only?: boolean, skip?: boolean } = {}) {
+export async function itWeb3(name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper: (account: string) => IKeyringPair }) => any, opts: { only?: boolean, skip?: boolean } = {}) {
   let i: any = it;
   if (opts.only) i = i.only;
   else if (opts.skip) i = i.skip;
@@ -139,8 +139,8 @@
     });
   });
 }
-itWeb3.only = (name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper?: (account: string) => IKeyringPair }) => any) => itWeb3(name, cb, {only: true});
-itWeb3.skip = (name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper?: (account: string) => IKeyringPair }) => any) => itWeb3(name, cb, {skip: true});
+itWeb3.only = (name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper: (account: string) => IKeyringPair }) => any) => itWeb3(name, cb, {only: true});
+itWeb3.skip = (name: string, cb: (apis: { web3: Web3, api: ApiPromise, privateKeyWrapper: (account: string) => IKeyringPair }) => any) => itWeb3(name, cb, {skip: true});
 
 export async function generateSubstrateEthPair(web3: Web3) {
   const account = web3.eth.accounts.create();
modifiedtests/src/inflation.test.tsdiffbeforeafterboth
--- a/tests/src/inflation.test.ts
+++ b/tests/src/inflation.test.ts
@@ -27,11 +27,11 @@
 
       // Make sure non-sudo can't start inflation
       const tx = api.tx.inflation.startInflation(1);
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
       await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.rejected;
 
       // Start inflation on relay block 1 (Alice is sudo)
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const sudoTx = api.tx.sudo.sudo(tx as any);
       await submitTransactionAsync(alice, sudoTx);
 
modifiedtests/src/limits.test.tsdiffbeforeafterboth
--- a/tests/src/limits.test.ts
+++ b/tests/src/limits.test.ts
@@ -35,7 +35,7 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
 
@@ -69,7 +69,7 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
 
@@ -103,9 +103,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
@@ -166,9 +166,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
@@ -233,9 +233,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
@@ -296,9 +296,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
@@ -337,9 +337,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
@@ -369,9 +369,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
modifiedtests/src/mintModes.test.tsdiffbeforeafterboth
--- a/tests/src/mintModes.test.ts
+++ b/tests/src/mintModes.test.ts
@@ -33,8 +33,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -112,8 +112,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
modifiedtests/src/nesting/graphs.test.tsdiffbeforeafterboth
--- a/tests/src/nesting/graphs.test.ts
+++ b/tests/src/nesting/graphs.test.ts
@@ -34,7 +34,7 @@
 describe('Graphs', () => {
   it('Ouroboros can\'t be created in a complex graph', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const collection = await buildComplexObjectGraph(api, alice);
 
       // to self
modifiedtests/src/nesting/migration-check.test.tsdiffbeforeafterboth
--- a/tests/src/nesting/migration-check.test.ts
+++ b/tests/src/nesting/migration-check.test.ts
@@ -13,7 +13,7 @@
 
   before(async() => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
 
modifiedtests/src/nesting/nest.test.tsdiffbeforeafterboth
before · tests/src/nesting/nest.test.ts
1import {expect} from 'chai';2import {tokenIdToAddress} from '../eth/util/helpers';3import usingApi, {executeTransaction} from '../substrate/substrate-api';4import {5  addToAllowListExpectSuccess,6  createCollectionExpectSuccess,7  createItemExpectSuccess,8  enableAllowListExpectSuccess,9  enablePublicMintingExpectSuccess,10  getTokenOwner,11  getTopmostTokenOwner,12  normalizeAccountId,13  setCollectionPermissionsExpectSuccess,14  transferExpectFailure,15  transferExpectSuccess,16  transferFromExpectSuccess,17} from '../util/helpers';18import {IKeyringPair} from '@polkadot/types/types';1920let alice: IKeyringPair;21let bob: IKeyringPair;2223describe('Integration Test: Nesting', () => {24  before(async () => {25    await usingApi(async (api, privateKeyWrapper) => {26      alice = privateKeyWrapper!('//Alice');27      bob = privateKeyWrapper!('//Bob');28    });29  });3031  it('Performs the full suite: bundles a token, transfers, and unnests', async () => {32    await usingApi(async api => {33      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});34      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});35      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');3637      // Create a nested token38      const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});39      expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});40      expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});4142      // Create a token to be nested43      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');4445      // Nest46      await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});47      expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});48      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});4950      // Move bundle to different user51      await transferExpectSuccess(collection, targetToken, alice, {Substrate: bob.address});52      expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: bob.address});53      expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});5455      // Unnest56      await transferFromExpectSuccess(collection, newToken, bob, {Ethereum: tokenIdToAddress(collection, targetToken)}, {Substrate: bob.address});57      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: bob.address});58    });59  });6061  it('Transfers an already bundled token', async () => {62    await usingApi(async api => {63      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});64      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});6566      const tokenA = await createItemExpectSuccess(alice, collection, 'NFT');67      const tokenB = await createItemExpectSuccess(alice, collection, 'NFT');6869      // Create a nested token70      const tokenC = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, tokenA)});71      expect(await getTopmostTokenOwner(api, collection, tokenC)).to.be.deep.equal({Substrate: alice.address});72      expect(await getTokenOwner(api, collection, tokenC)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, tokenA).toLowerCase()});7374      // Transfer the nested token to another token75      await expect(executeTransaction(76        api,77        alice,78        api.tx.unique.transferFrom(79          normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenA)}), 80          normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenB)}), 81          collection,82          tokenC,83          1,84        ),85      )).to.not.be.rejected;86      expect(await getTopmostTokenOwner(api, collection, tokenC)).to.be.deep.equal({Substrate: alice.address});87      expect(await getTokenOwner(api, collection, tokenC)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, tokenB).toLowerCase()});88    });89  });9091  // ---------- Non-Fungible ----------9293  it('NFT: allows an Owner to nest/unnest their token', async () => {94    await usingApi(async api => {95      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});96      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});97      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');9899      // Create a nested token100      const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});101      expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});102      expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});103104      // Create a token to be nested and nest105      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');106      await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});107      expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});108      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});109    });110  });111112  it('NFT: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {113    await usingApi(async api => {114      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});115      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {OwnerRestricted:[collection]}});116      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');117118      // Create a nested token119      const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});120      expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});121      expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});122123      // Create a token to be nested and nest124      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');125      await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});126      expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});127      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});128    });129  });130131  // ---------- Fungible ----------132133  it('Fungible: allows an Owner to nest/unnest their token', async () => {134    await usingApi(async api => {135      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});136      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});137      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});138      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};139140      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});141142      // Create a nested token143      await expect(executeTransaction(api, alice, api.tx.unique.createItem(144        collectionFT,145        targetAddress,146        {Fungible: {Value: 10}},147      ))).to.not.be.rejected;148149      // Nest a new token150      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');151      await transferExpectSuccess(collectionFT, newToken, alice, targetAddress, 1, 'Fungible');152    });153  });154155  it('Fungible: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {156    await usingApi(async api => {157      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});158      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});159      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};160161      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});162163      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted: [collectionFT]}});164165      // Create a nested token166      await expect(executeTransaction(api, alice, api.tx.unique.createItem(167        collectionFT,168        targetAddress,169        {Fungible: {Value: 10}},170      ))).to.not.be.rejected;171172      // Nest a new token173      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');174      await transferExpectSuccess(collectionFT, newToken, alice, targetAddress, 1, 'Fungible');175    });176  });177178  // ---------- Re-Fungible ----------179180  it('ReFungible: allows an Owner to nest/unnest their token', async () => {181    await usingApi(async api => {182      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});183      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});184      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});185      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};186187      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});188189      // Create a nested token190      await expect(executeTransaction(api, alice, api.tx.unique.createItem(191        collectionRFT,192        targetAddress,193        {ReFungible: {const_data: [], pieces: 100}},194      ))).to.not.be.rejected;195196      // Nest a new token197      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');198      await transferExpectSuccess(collectionRFT, newToken, alice, targetAddress, 100, 'ReFungible');199    });200  });201202  it('ReFungible: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {203    await usingApi(async api => {204      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});205      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});206      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};207208      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});209210      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[collectionRFT]}});211212      // Create a nested token213      await expect(executeTransaction(api, alice, api.tx.unique.createItem(214        collectionRFT,215        targetAddress,216        {ReFungible: {const_data: [], pieces: 100}},217      ))).to.not.be.rejected;218219      // Nest a new token220      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');221      await transferExpectSuccess(collectionRFT, newToken, alice, targetAddress, 100, 'ReFungible');222    });223  });224});225226describe('Negative Test: Nesting', async() => {227  before(async () => {228    await usingApi(async (api, privateKeyWrapper) => {229      alice = privateKeyWrapper!('//Alice');230      bob = privateKeyWrapper!('//Bob');231    });232  });233234  it('Disallows excessive token nesting', async () => {235    await usingApi(async api => {236      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});237      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});238      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');239240      const maxNestingLevel = 5;241      let prevToken = targetToken;242243      // Create a nested-token matryoshka244      for (let i = 0; i < maxNestingLevel; i++) {245        const nestedToken = await createItemExpectSuccess(246          alice,247          collection,248          'NFT',249          {Ethereum: tokenIdToAddress(collection, prevToken)},250        );251252        prevToken = nestedToken;253      }254255      // The nesting depth is limited by `maxNestingLevel`256      await expect(executeTransaction(api, alice, api.tx.unique.createItem(257        collection,258        {Ethereum: tokenIdToAddress(collection, prevToken)},259          {nft: {const_data: [], variable_data: []}} as any,260      )), 'while creating nested token').to.be.rejectedWith(/^structure\.DepthLimit$/);261262      expect(await getTopmostTokenOwner(api, collection, prevToken)).to.be.deep.equal({Substrate: alice.address});263    });264  });265266  // ---------- Non-Fungible ----------267268  it('NFT: disallows to nest token if nesting is disabled', async () => {269    await usingApi(async api => {270      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});271      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Disabled'});272      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');273274      // Try to create a nested token275      await expect(executeTransaction(api, alice, api.tx.unique.createItem(276        collection,277        {Ethereum: tokenIdToAddress(collection, targetToken)},278          {nft: {const_data: [], variable_data: []}} as any,279      )), 'while creating nested token').to.be.rejectedWith(/^common\.NestingIsDisabled$/);280281      // Create a token to be nested282      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');283      // Try to nest284      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.NestingIsDisabled/);285      expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});286      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});287    });288  });289290  it('NFT: disallows a non-Owner to nest someone else\'s token', async () => {291    await usingApi(async api => {292      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});293      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});294295      await addToAllowListExpectSuccess(alice, collection, bob.address);296      await enableAllowListExpectSuccess(alice, collection);297      await enablePublicMintingExpectSuccess(alice, collection);298299      // Create a token to attempt to be nested into300      const targetToken = await createItemExpectSuccess(bob, collection, 'NFT');301302      // Try to create a nested token in the wrong collection303      await expect(executeTransaction(api, alice, api.tx.unique.createItem(304        collection,305        {Ethereum: tokenIdToAddress(collection, targetToken)},306          {nft: {const_data: [], variable_data: []}} as any,307      )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);308309      // Try to create and nest a token in the wrong collection310      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');311      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.AddressNotInAllowlist/);312      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});313    });314  });315316  it('NFT: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {317    await usingApi(async api => {318      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});319      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {OwnerRestricted:[collection]}});320321      await addToAllowListExpectSuccess(alice, collection, bob.address);322      await enableAllowListExpectSuccess(alice, collection);323      await enablePublicMintingExpectSuccess(alice, collection);324325      // Create a token to attempt to be nested into326      const targetToken = await createItemExpectSuccess(bob, collection, 'NFT');327328      // Try to create a nested token in the wrong collection329      await expect(executeTransaction(api, alice, api.tx.unique.createItem(330        collection,331        {Ethereum: tokenIdToAddress(collection, targetToken)},332          {nft: {const_data: [], variable_data: []}} as any,333      )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);334335      // Try to create and nest a token in the wrong collection336      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');337      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.AddressNotInAllowlist/);338      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});339    });340  });341342  it('NFT: disallows to nest token in an unlisted collection', async () => {343    await usingApi(async api => {344      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});345      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {OwnerRestricted:[]}});346347      // Create a token to attempt to be nested into348      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');349350      // Try to create a nested token in the wrong collection351      await expect(executeTransaction(api, alice, api.tx.unique.createItem(352        collection,353        {Ethereum: tokenIdToAddress(collection, targetToken)},354          {nft: {const_data: [], variable_data: []}} as any,355      )), 'while creating nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);356357      // Try to create and nest a token in the wrong collection358      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');359      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);360      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});361    });362  });363364  // ---------- Fungible ----------365366  it('Fungible: disallows to nest token if nesting is disabled', async () => {367    await usingApi(async api => {368      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});369      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Disabled'});370      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');371      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};372373      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});374375      // Try to create a nested token376      await expect(executeTransaction(api, alice, api.tx.unique.createItem(377        collectionFT,378        targetAddress,379        {Fungible: {Value: 10}},380      )), 'while creating nested token').to.be.rejectedWith(/^common\.NestingIsDisabled$/);381382      // Create a token to be nested383      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');384      // Try to nest385      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.NestingIsDisabled/);386387      // Create another token to be nested388      const newToken2 = await createItemExpectSuccess(alice, collectionFT, 'Fungible');389      // Try to nest inside a fungible token390      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collectionFT, newToken)}, collectionFT, newToken2, 1)), 'while nesting new token inside fungible').to.be.rejectedWith(/fungible\.FungibleDisallowsNesting/);391    });392  });393394  it('Fungible: disallows a non-Owner to nest someone else\'s token', async () => {395    await usingApi(async api => {396      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});397      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});398399      await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);400      await enableAllowListExpectSuccess(alice, collectionNFT);401      await enablePublicMintingExpectSuccess(alice, collectionNFT);402403      // Create a token to attempt to be nested into404      const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');405      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};406407      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});408409      // Try to create a nested token in the wrong collection410      await expect(executeTransaction(api, alice, api.tx.unique.createItem(411        collectionFT,412        targetAddress,413        {Fungible: {Value: 10}},414      )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);415416      // Try to create and nest a token in the wrong collection417      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');418      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);419    });420  });421422  it('Fungible: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {423    await usingApi(async api => {424      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});425      await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);426      await enableAllowListExpectSuccess(alice, collectionNFT);427      await enablePublicMintingExpectSuccess(alice, collectionNFT);428429      // Create a token to attempt to be nested into430      const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');431      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};432433      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});434      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[collectionFT]}});435436      // Try to create a nested token in the wrong collection437      await expect(executeTransaction(api, alice, api.tx.unique.createItem(438        collectionFT,439        targetAddress,440        {Fungible: {Value: 10}},441      )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);442443      // Try to create and nest a token in the wrong collection444      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');445      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);446    });447  });448449  it('Fungible: disallows to nest token in an unlisted collection', async () => {450    await usingApi(async api => {451      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});452      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[]}});453454      // Create a token to attempt to be nested into455      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');456      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};457458      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});459460      // Try to create a nested token in the wrong collection461      await expect(executeTransaction(api, alice, api.tx.unique.createItem(462        collectionFT,463        targetAddress,464        {Fungible: {Value: 10}},465      )), 'while creating a nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);466467      // Try to create and nest a token in the wrong collection468      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');469      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);470    });471  });472473  // ---------- Re-Fungible ----------474475  it('ReFungible: disallows to nest token if nesting is disabled', async () => {476    await usingApi(async api => {477      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});478      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Disabled'});479      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');480      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};481482      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});483484      // Create a nested token485      await expect(executeTransaction(api, alice, api.tx.unique.createItem(486        collectionRFT,487        targetAddress,488        {ReFungible: {const_data: [], pieces: 100}},489      )), 'while creating a nested token').to.be.rejectedWith(/^common\.NestingIsDisabled$/);490491      // Create a token to be nested492      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');493      // Try to nest494      await transferExpectFailure(collectionRFT, newToken, alice, targetAddress, 100);495      // Try to nest496      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.NestingIsDisabled/);497498      // Create another token to be nested499      const newToken2 = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');500      // Try to nest inside a fungible token501      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collectionRFT, newToken)}, collectionRFT, newToken2, 1)), 'while nesting new token inside refungible').to.be.rejectedWith(/refungible\.RefungibleDisallowsNesting/);502    });503  });504505  it('ReFungible: disallows a non-Owner to nest someone else\'s token', async () => {506    await usingApi(async api => {507      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});508      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});509510      await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);511      await enableAllowListExpectSuccess(alice, collectionNFT);512      await enablePublicMintingExpectSuccess(alice, collectionNFT);513514      // Create a token to attempt to be nested into515      const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');516      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};517518      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});519520      // Try to create a nested token in the wrong collection521      await expect(executeTransaction(api, alice, api.tx.unique.createItem(522        collectionRFT,523        targetAddress,524        {ReFungible: {const_data: [], pieces: 100}},525      )), 'while creating a nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);526527      // Try to create and nest a token in the wrong collection528      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');529      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);530    });531  });532533  it('ReFungible: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {534    await usingApi(async api => {535      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});536      await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);537      await enableAllowListExpectSuccess(alice, collectionNFT);538      await enablePublicMintingExpectSuccess(alice, collectionNFT);539540      // Create a token to attempt to be nested into541      const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');542      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};543544      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});545      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[collectionRFT]}});546547      // Try to create a nested token in the wrong collection548      await expect(executeTransaction(api, alice, api.tx.unique.createItem(549        collectionRFT,550        targetAddress,551        {ReFungible: {const_data: [], pieces: 100}},552      )), 'while creating a nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);553554      // Try to create and nest a token in the wrong collection555      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');556      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);557    });558  });559560  it('ReFungible: disallows to nest token to an unlisted collection', async () => {561    await usingApi(async api => {562      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});563      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[]}});564565      // Create a token to attempt to be nested into566      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');567      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};568569      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});570571      // Try to create a nested token in the wrong collection572      await expect(executeTransaction(api, alice, api.tx.unique.createItem(573        collectionRFT,574        targetAddress,575        {ReFungible: {const_data: [], pieces: 100}},576      )), 'while creating a nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);577578      // Try to create and nest a token in the wrong collection579      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');580      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);581    });582  });583});
after · tests/src/nesting/nest.test.ts
1import {expect} from 'chai';2import {tokenIdToAddress} from '../eth/util/helpers';3import usingApi, {executeTransaction} from '../substrate/substrate-api';4import {5  addToAllowListExpectSuccess,6  createCollectionExpectSuccess,7  createItemExpectSuccess,8  enableAllowListExpectSuccess,9  enablePublicMintingExpectSuccess,10  getTokenOwner,11  getTopmostTokenOwner,12  normalizeAccountId,13  setCollectionPermissionsExpectSuccess,14  transferExpectFailure,15  transferExpectSuccess,16  transferFromExpectSuccess,17} from '../util/helpers';18import {IKeyringPair} from '@polkadot/types/types';1920let alice: IKeyringPair;21let bob: IKeyringPair;2223describe('Integration Test: Nesting', () => {24  before(async () => {25    await usingApi(async (api, privateKeyWrapper) => {26      alice = privateKeyWrapper('//Alice');27      bob = privateKeyWrapper('//Bob');28    });29  });3031  it('Performs the full suite: bundles a token, transfers, and unnests', async () => {32    await usingApi(async api => {33      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});34      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});35      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');3637      // Create a nested token38      const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});39      expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});40      expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});4142      // Create a token to be nested43      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');4445      // Nest46      await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});47      expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});48      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});4950      // Move bundle to different user51      await transferExpectSuccess(collection, targetToken, alice, {Substrate: bob.address});52      expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: bob.address});53      expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});5455      // Unnest56      await transferFromExpectSuccess(collection, newToken, bob, {Ethereum: tokenIdToAddress(collection, targetToken)}, {Substrate: bob.address});57      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: bob.address});58    });59  });6061  it('Transfers an already bundled token', async () => {62    await usingApi(async api => {63      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});64      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});6566      const tokenA = await createItemExpectSuccess(alice, collection, 'NFT');67      const tokenB = await createItemExpectSuccess(alice, collection, 'NFT');6869      // Create a nested token70      const tokenC = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, tokenA)});71      expect(await getTopmostTokenOwner(api, collection, tokenC)).to.be.deep.equal({Substrate: alice.address});72      expect(await getTokenOwner(api, collection, tokenC)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, tokenA).toLowerCase()});7374      // Transfer the nested token to another token75      await expect(executeTransaction(76        api,77        alice,78        api.tx.unique.transferFrom(79          normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenA)}), 80          normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenB)}), 81          collection,82          tokenC,83          1,84        ),85      )).to.not.be.rejected;86      expect(await getTopmostTokenOwner(api, collection, tokenC)).to.be.deep.equal({Substrate: alice.address});87      expect(await getTokenOwner(api, collection, tokenC)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, tokenB).toLowerCase()});88    });89  });9091  // ---------- Non-Fungible ----------9293  it('NFT: allows an Owner to nest/unnest their token', async () => {94    await usingApi(async api => {95      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});96      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});97      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');9899      // Create a nested token100      const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});101      expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});102      expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});103104      // Create a token to be nested and nest105      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');106      await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});107      expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});108      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});109    });110  });111112  it('NFT: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {113    await usingApi(async api => {114      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});115      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {OwnerRestricted:[collection]}});116      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');117118      // Create a nested token119      const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});120      expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});121      expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});122123      // Create a token to be nested and nest124      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');125      await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});126      expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});127      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});128    });129  });130131  // ---------- Fungible ----------132133  it('Fungible: allows an Owner to nest/unnest their token', async () => {134    await usingApi(async api => {135      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});136      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});137      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});138      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};139140      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});141142      // Create a nested token143      await expect(executeTransaction(api, alice, api.tx.unique.createItem(144        collectionFT,145        targetAddress,146        {Fungible: {Value: 10}},147      ))).to.not.be.rejected;148149      // Nest a new token150      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');151      await transferExpectSuccess(collectionFT, newToken, alice, targetAddress, 1, 'Fungible');152    });153  });154155  it('Fungible: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {156    await usingApi(async api => {157      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});158      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});159      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};160161      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});162163      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted: [collectionFT]}});164165      // Create a nested token166      await expect(executeTransaction(api, alice, api.tx.unique.createItem(167        collectionFT,168        targetAddress,169        {Fungible: {Value: 10}},170      ))).to.not.be.rejected;171172      // Nest a new token173      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');174      await transferExpectSuccess(collectionFT, newToken, alice, targetAddress, 1, 'Fungible');175    });176  });177178  // ---------- Re-Fungible ----------179180  it('ReFungible: allows an Owner to nest/unnest their token', async () => {181    await usingApi(async api => {182      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});183      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});184      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});185      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};186187      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});188189      // Create a nested token190      await expect(executeTransaction(api, alice, api.tx.unique.createItem(191        collectionRFT,192        targetAddress,193        {ReFungible: {const_data: [], pieces: 100}},194      ))).to.not.be.rejected;195196      // Nest a new token197      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');198      await transferExpectSuccess(collectionRFT, newToken, alice, targetAddress, 100, 'ReFungible');199    });200  });201202  it('ReFungible: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {203    await usingApi(async api => {204      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});205      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});206      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};207208      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});209210      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[collectionRFT]}});211212      // Create a nested token213      await expect(executeTransaction(api, alice, api.tx.unique.createItem(214        collectionRFT,215        targetAddress,216        {ReFungible: {const_data: [], pieces: 100}},217      ))).to.not.be.rejected;218219      // Nest a new token220      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');221      await transferExpectSuccess(collectionRFT, newToken, alice, targetAddress, 100, 'ReFungible');222    });223  });224});225226describe('Negative Test: Nesting', async() => {227  before(async () => {228    await usingApi(async (api, privateKeyWrapper) => {229      alice = privateKeyWrapper('//Alice');230      bob = privateKeyWrapper('//Bob');231    });232  });233234  it('Disallows excessive token nesting', async () => {235    await usingApi(async api => {236      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});237      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});238      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');239240      const maxNestingLevel = 5;241      let prevToken = targetToken;242243      // Create a nested-token matryoshka244      for (let i = 0; i < maxNestingLevel; i++) {245        const nestedToken = await createItemExpectSuccess(246          alice,247          collection,248          'NFT',249          {Ethereum: tokenIdToAddress(collection, prevToken)},250        );251252        prevToken = nestedToken;253      }254255      // The nesting depth is limited by `maxNestingLevel`256      await expect(executeTransaction(api, alice, api.tx.unique.createItem(257        collection,258        {Ethereum: tokenIdToAddress(collection, prevToken)},259          {nft: {const_data: [], variable_data: []}} as any,260      )), 'while creating nested token').to.be.rejectedWith(/^structure\.DepthLimit$/);261262      expect(await getTopmostTokenOwner(api, collection, prevToken)).to.be.deep.equal({Substrate: alice.address});263    });264  });265266  // ---------- Non-Fungible ----------267268  it('NFT: disallows to nest token if nesting is disabled', async () => {269    await usingApi(async api => {270      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});271      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Disabled'});272      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');273274      // Try to create a nested token275      await expect(executeTransaction(api, alice, api.tx.unique.createItem(276        collection,277        {Ethereum: tokenIdToAddress(collection, targetToken)},278          {nft: {const_data: [], variable_data: []}} as any,279      )), 'while creating nested token').to.be.rejectedWith(/^common\.NestingIsDisabled$/);280281      // Create a token to be nested282      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');283      // Try to nest284      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.NestingIsDisabled/);285      expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});286      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});287    });288  });289290  it('NFT: disallows a non-Owner to nest someone else\'s token', async () => {291    await usingApi(async api => {292      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});293      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});294295      await addToAllowListExpectSuccess(alice, collection, bob.address);296      await enableAllowListExpectSuccess(alice, collection);297      await enablePublicMintingExpectSuccess(alice, collection);298299      // Create a token to attempt to be nested into300      const targetToken = await createItemExpectSuccess(bob, collection, 'NFT');301302      // Try to create a nested token in the wrong collection303      await expect(executeTransaction(api, alice, api.tx.unique.createItem(304        collection,305        {Ethereum: tokenIdToAddress(collection, targetToken)},306          {nft: {const_data: [], variable_data: []}} as any,307      )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);308309      // Try to create and nest a token in the wrong collection310      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');311      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.AddressNotInAllowlist/);312      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});313    });314  });315316  it('NFT: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {317    await usingApi(async api => {318      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});319      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {OwnerRestricted:[collection]}});320321      await addToAllowListExpectSuccess(alice, collection, bob.address);322      await enableAllowListExpectSuccess(alice, collection);323      await enablePublicMintingExpectSuccess(alice, collection);324325      // Create a token to attempt to be nested into326      const targetToken = await createItemExpectSuccess(bob, collection, 'NFT');327328      // Try to create a nested token in the wrong collection329      await expect(executeTransaction(api, alice, api.tx.unique.createItem(330        collection,331        {Ethereum: tokenIdToAddress(collection, targetToken)},332          {nft: {const_data: [], variable_data: []}} as any,333      )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);334335      // Try to create and nest a token in the wrong collection336      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');337      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.AddressNotInAllowlist/);338      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});339    });340  });341342  it('NFT: disallows to nest token in an unlisted collection', async () => {343    await usingApi(async api => {344      const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});345      await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {OwnerRestricted:[]}});346347      // Create a token to attempt to be nested into348      const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');349350      // Try to create a nested token in the wrong collection351      await expect(executeTransaction(api, alice, api.tx.unique.createItem(352        collection,353        {Ethereum: tokenIdToAddress(collection, targetToken)},354          {nft: {const_data: [], variable_data: []}} as any,355      )), 'while creating nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);356357      // Try to create and nest a token in the wrong collection358      const newToken = await createItemExpectSuccess(alice, collection, 'NFT');359      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);360      expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});361    });362  });363364  // ---------- Fungible ----------365366  it('Fungible: disallows to nest token if nesting is disabled', async () => {367    await usingApi(async api => {368      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});369      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Disabled'});370      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');371      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};372373      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});374375      // Try to create a nested token376      await expect(executeTransaction(api, alice, api.tx.unique.createItem(377        collectionFT,378        targetAddress,379        {Fungible: {Value: 10}},380      )), 'while creating nested token').to.be.rejectedWith(/^common\.NestingIsDisabled$/);381382      // Create a token to be nested383      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');384      // Try to nest385      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.NestingIsDisabled/);386387      // Create another token to be nested388      const newToken2 = await createItemExpectSuccess(alice, collectionFT, 'Fungible');389      // Try to nest inside a fungible token390      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collectionFT, newToken)}, collectionFT, newToken2, 1)), 'while nesting new token inside fungible').to.be.rejectedWith(/fungible\.FungibleDisallowsNesting/);391    });392  });393394  it('Fungible: disallows a non-Owner to nest someone else\'s token', async () => {395    await usingApi(async api => {396      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});397      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});398399      await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);400      await enableAllowListExpectSuccess(alice, collectionNFT);401      await enablePublicMintingExpectSuccess(alice, collectionNFT);402403      // Create a token to attempt to be nested into404      const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');405      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};406407      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});408409      // Try to create a nested token in the wrong collection410      await expect(executeTransaction(api, alice, api.tx.unique.createItem(411        collectionFT,412        targetAddress,413        {Fungible: {Value: 10}},414      )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);415416      // Try to create and nest a token in the wrong collection417      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');418      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);419    });420  });421422  it('Fungible: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {423    await usingApi(async api => {424      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});425      await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);426      await enableAllowListExpectSuccess(alice, collectionNFT);427      await enablePublicMintingExpectSuccess(alice, collectionNFT);428429      // Create a token to attempt to be nested into430      const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');431      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};432433      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});434      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[collectionFT]}});435436      // Try to create a nested token in the wrong collection437      await expect(executeTransaction(api, alice, api.tx.unique.createItem(438        collectionFT,439        targetAddress,440        {Fungible: {Value: 10}},441      )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);442443      // Try to create and nest a token in the wrong collection444      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');445      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);446    });447  });448449  it('Fungible: disallows to nest token in an unlisted collection', async () => {450    await usingApi(async api => {451      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});452      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[]}});453454      // Create a token to attempt to be nested into455      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');456      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};457458      const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});459460      // Try to create a nested token in the wrong collection461      await expect(executeTransaction(api, alice, api.tx.unique.createItem(462        collectionFT,463        targetAddress,464        {Fungible: {Value: 10}},465      )), 'while creating a nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);466467      // Try to create and nest a token in the wrong collection468      const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');469      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);470    });471  });472473  // ---------- Re-Fungible ----------474475  it('ReFungible: disallows to nest token if nesting is disabled', async () => {476    await usingApi(async api => {477      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});478      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Disabled'});479      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');480      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};481482      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});483484      // Create a nested token485      await expect(executeTransaction(api, alice, api.tx.unique.createItem(486        collectionRFT,487        targetAddress,488        {ReFungible: {const_data: [], pieces: 100}},489      )), 'while creating a nested token').to.be.rejectedWith(/^common\.NestingIsDisabled$/);490491      // Create a token to be nested492      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');493      // Try to nest494      await transferExpectFailure(collectionRFT, newToken, alice, targetAddress, 100);495      // Try to nest496      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.NestingIsDisabled/);497498      // Create another token to be nested499      const newToken2 = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');500      // Try to nest inside a fungible token501      await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collectionRFT, newToken)}, collectionRFT, newToken2, 1)), 'while nesting new token inside refungible').to.be.rejectedWith(/refungible\.RefungibleDisallowsNesting/);502    });503  });504505  it('ReFungible: disallows a non-Owner to nest someone else\'s token', async () => {506    await usingApi(async api => {507      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});508      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});509510      await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);511      await enableAllowListExpectSuccess(alice, collectionNFT);512      await enablePublicMintingExpectSuccess(alice, collectionNFT);513514      // Create a token to attempt to be nested into515      const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');516      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};517518      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});519520      // Try to create a nested token in the wrong collection521      await expect(executeTransaction(api, alice, api.tx.unique.createItem(522        collectionRFT,523        targetAddress,524        {ReFungible: {const_data: [], pieces: 100}},525      )), 'while creating a nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);526527      // Try to create and nest a token in the wrong collection528      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');529      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);530    });531  });532533  it('ReFungible: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {534    await usingApi(async api => {535      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});536      await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);537      await enableAllowListExpectSuccess(alice, collectionNFT);538      await enablePublicMintingExpectSuccess(alice, collectionNFT);539540      // Create a token to attempt to be nested into541      const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');542      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};543544      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});545      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[collectionRFT]}});546547      // Try to create a nested token in the wrong collection548      await expect(executeTransaction(api, alice, api.tx.unique.createItem(549        collectionRFT,550        targetAddress,551        {ReFungible: {const_data: [], pieces: 100}},552      )), 'while creating a nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);553554      // Try to create and nest a token in the wrong collection555      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');556      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);557    });558  });559560  it('ReFungible: disallows to nest token to an unlisted collection', async () => {561    await usingApi(async api => {562      const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});563      await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[]}});564565      // Create a token to attempt to be nested into566      const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');567      const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};568569      const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});570571      // Try to create a nested token in the wrong collection572      await expect(executeTransaction(api, alice, api.tx.unique.createItem(573        collectionRFT,574        targetAddress,575        {ReFungible: {const_data: [], pieces: 100}},576      )), 'while creating a nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);577578      // Try to create and nest a token in the wrong collection579      const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');580      await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);581    });582  });583});
modifiedtests/src/nesting/properties.test.tsdiffbeforeafterboth
--- a/tests/src/nesting/properties.test.ts
+++ b/tests/src/nesting/properties.test.ts
@@ -16,8 +16,8 @@
 describe('Composite Properties Test', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -63,8 +63,8 @@
 describe('Integration Test: Collection Properties', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -158,8 +158,8 @@
 describe('Negative Integration Test: Collection Properties', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
   
@@ -290,8 +290,8 @@
 describe('Integration Test: Access Rights to Token Properties', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
   
@@ -356,8 +356,8 @@
 describe('Negative Integration Test: Access Rights to Token Properties', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -474,9 +474,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
 
       permissions = [
         {permission: {mutable: true, collectionAdmin: true}, signers: [alice, bob]},
@@ -639,10 +639,10 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
-      const dave = privateKeyWrapper!('//Dave');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
+      const dave = privateKeyWrapper('//Dave');
 
       constitution = [
         {permission: {mutable: true, collectionAdmin: true}, signers: [alice, bob], sinner: charlie},
modifiedtests/src/nesting/rules-smoke.test.tsdiffbeforeafterboth
--- a/tests/src/nesting/rules-smoke.test.ts
+++ b/tests/src/nesting/rules-smoke.test.ts
@@ -9,8 +9,8 @@
   let nestTarget!: CrossAccountId;
   before(async() => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       const events = await executeTransaction(api, alice, api.tx.unique.createCollectionEx({
         mode: 'NFT',
         permissions: {
modifiedtests/src/nesting/unnest.test.tsdiffbeforeafterboth
--- a/tests/src/nesting/unnest.test.ts
+++ b/tests/src/nesting/unnest.test.ts
@@ -19,8 +19,8 @@
 describe('Integration Test: Unnesting', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -110,8 +110,8 @@
 describe('Negative Test: Unnesting', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
modifiedtests/src/nextSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/nextSponsoring.test.ts
+++ b/tests/src/nextSponsoring.test.ts
@@ -40,8 +40,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
modifiedtests/src/overflow.test.tsdiffbeforeafterboth
--- a/tests/src/overflow.test.ts
+++ b/tests/src/overflow.test.ts
@@ -30,9 +30,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
modifiedtests/src/removeCollectionAdmin.test.tsdiffbeforeafterboth
--- a/tests/src/removeCollectionAdmin.test.ts
+++ b/tests/src/removeCollectionAdmin.test.ts
@@ -26,8 +26,8 @@
   it('Remove collection admin.', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       const collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.deep.eq(alice.address);
       // first - add collection admin Bob
@@ -49,9 +49,9 @@
   it('Remove collection admin by admin.', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
       const collection = await queryCollectionExpectSuccess(api, collectionId);
       expect(collection.owner.toString()).to.be.eq(alice.address);
       // first - add collection admin Bob
@@ -75,7 +75,7 @@
 
   it('Remove admin from collection that has no admins', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
+      const alice = privateKeyWrapper('//Alice');
       const collectionId = await createCollectionExpectSuccess();
 
       const adminListBeforeAddAdmin = await getAdminList(api, collectionId);
@@ -92,8 +92,8 @@
     await usingApi(async (api, privateKeyWrapper) => {
       // tslint:disable-next-line: no-bitwise
       const collectionId = (1 << 32) - 1;
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       const changeOwnerTx = api.tx.unique.removeCollectionAdmin(collectionId, normalizeAccountId(bob.address));
       await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
@@ -107,8 +107,8 @@
     await usingApi(async (api, privateKeyWrapper) => {
       // tslint:disable-next-line: no-bitwise
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
 
       await destroyCollectionExpectSuccess(collectionId);
 
@@ -123,9 +123,9 @@
   it('Regular user Can\'t remove collection admin', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
       const collectionId = await createCollectionExpectSuccess();
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
 
       const addAdminTx = api.tx.unique.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
       await submitTransactionAsync(alice, addAdminTx);
modifiedtests/src/removeFromAllowList.test.tsdiffbeforeafterboth
--- a/tests/src/removeFromAllowList.test.ts
+++ b/tests/src/removeFromAllowList.test.ts
@@ -41,8 +41,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -75,8 +75,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -107,9 +107,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
modifiedtests/src/removeFromContractAllowList.test.tsdiffbeforeafterboth
--- a/tests/src/removeFromContractAllowList.test.ts
+++ b/tests/src/removeFromContractAllowList.test.ts
@@ -25,7 +25,7 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      bob = privateKeyWrapper!('//Bob');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -70,8 +70,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
modifiedtests/src/rpc.load.tsdiffbeforeafterboth
--- a/tests/src/rpc.load.ts
+++ b/tests/src/rpc.load.ts
@@ -126,7 +126,7 @@
       const [contract, deployer] = await deployLoadTester(api);
 
       // Fill smart contract up with data
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
       const tx = contract.tx.bloat(value, gasLimit, 200);
       await submitTransactionAsync(bob, tx);
 
modifiedtests/src/scheduler.test.tsdiffbeforeafterboth
--- a/tests/src/scheduler.test.ts
+++ b/tests/src/scheduler.test.ts
@@ -30,8 +30,8 @@
 describe.skip('Integration Test scheduler base transaction', () => {
   it('User can transfer owned token with delay (scheduler)', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       // nft
       const nftCollectionId = await createCollectionExpectSuccess();
       const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
modifiedtests/src/setChainLimits.test.tsdiffbeforeafterboth
--- a/tests/src/setChainLimits.test.ts
+++ b/tests/src/setChainLimits.test.ts
@@ -31,9 +31,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      dave = privateKeyWrapper!('//Dave');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      dave = privateKeyWrapper('//Dave');
       limits = {
         collectionNumbersLimit : 1,
         accountTokenOwnershipLimit: 1,
modifiedtests/src/setContractSponsoringRateLimit.test.tsdiffbeforeafterboth
--- a/tests/src/setContractSponsoringRateLimit.test.ts
+++ b/tests/src/setContractSponsoringRateLimit.test.ts
@@ -57,7 +57,7 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
   });
 
modifiedtests/src/setMintPermission.test.tsdiffbeforeafterboth
--- a/tests/src/setMintPermission.test.ts
+++ b/tests/src/setMintPermission.test.ts
@@ -35,8 +35,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -75,8 +75,8 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
modifiedtests/src/setPublicAccessMode.test.tsdiffbeforeafterboth
--- a/tests/src/setPublicAccessMode.test.ts
+++ b/tests/src/setPublicAccessMode.test.ts
@@ -41,8 +41,8 @@
 describe('Integration Test setPublicAccessMode(): ', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -108,8 +108,8 @@
 describe('Negative Integration Test ext. collection admin setPublicAccessMode(): ', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
   it('setPublicAccessMode by collection admin', async () => {
modifiedtests/src/substrate/substrate-api.tsdiffbeforeafterboth
--- a/tests/src/substrate/substrate-api.ts
+++ b/tests/src/substrate/substrate-api.ts
@@ -59,7 +59,7 @@
   };
 }
 
-export default async function usingApi<T = void>(action: (api: ApiPromise, privateKeyWrapper?: (account: string) => IKeyringPair) => Promise<T>, settings: ApiOptions | undefined = undefined): Promise<T> {
+export default async function usingApi<T = void>(action: (api: ApiPromise, privateKeyWrapper: (account: string) => IKeyringPair) => Promise<T>, settings: ApiOptions | undefined = undefined): Promise<T> {
   settings = settings || defaultApiOptions();
   const api: ApiPromise = new ApiPromise(settings);
   let result: T = null as unknown as T;
modifiedtests/src/toggleContractAllowList.test.tsdiffbeforeafterboth
--- a/tests/src/toggleContractAllowList.test.ts
+++ b/tests/src/toggleContractAllowList.test.ts
@@ -50,7 +50,7 @@
 
   it('Only allowlisted account can call contract', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
 
       const [contract, deployer] = await deployFlipper(api);
 
@@ -135,8 +135,8 @@
 
   it('Enable allow list for a non-contract', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bobGuineaPig = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bobGuineaPig = privateKeyWrapper('//Bob');
 
       const enabledBefore = (await api.query.unique.contractAllowListEnabled(bobGuineaPig.address)).toJSON();
       const enableAllowListTx = api.tx.unique.toggleContractAllowList(bobGuineaPig.address, true);
@@ -150,7 +150,7 @@
 
   it('Enable allow list using a non-owner address', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const bob = privateKeyWrapper!('//Bob');
+      const bob = privateKeyWrapper('//Bob');
       const [contract] = await deployFlipper(api);
 
       const enabledBefore = (await api.query.unique.contractAllowListEnabled(contract.address)).toJSON();
modifiedtests/src/transfer.nload.tsdiffbeforeafterboth
--- a/tests/src/transfer.nload.ts
+++ b/tests/src/transfer.nload.ts
@@ -95,10 +95,10 @@
   const waiting: Promise<void>[] = [];
   console.log(`Starting ${os.cpus().length} workers`);
   usingApi(async (api, privateKeyWrapper) => {
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     for (const id in os.cpus()) {
       const WORKER_NAME = `//LoadWorker${id}_${Date.now()}`;
-      const workerAccount = privateKeyWrapper!(WORKER_NAME);
+      const workerAccount = privateKeyWrapper(WORKER_NAME);
       const tx = api.tx.balances.transfer(workerAccount.address, 400n * 10n ** 23n);
       await submitTransactionAsync(alice, tx);
 
@@ -119,7 +119,7 @@
 } else {
   increaseCounter('startedWorkers', 1);
   usingApi(async (api, privateKeyWrapper) => {
-    await distributeBalance(privateKeyWrapper!(process.env.WORKER_NAME as string), api, 400n * 10n ** 22n, 10);
+    await distributeBalance(privateKeyWrapper(process.env.WORKER_NAME as string), api, 400n * 10n ** 22n, 10);
   });
   const interval = setInterval(() => {
     flushCounterToMaster();
modifiedtests/src/transfer.test.tsdiffbeforeafterboth
--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -51,7 +51,7 @@
     await usingApi(async (api, privateKeyWrapper) => {
       const [alicesBalanceBefore, bobsBalanceBefore] = await getBalance(api, [alicesPublicKey, bobsPublicKey]);
 
-      const alicePrivateKey = privateKeyWrapper!('//Alice');
+      const alicePrivateKey = privateKeyWrapper('//Alice');
 
       const transfer = api.tx.balances.transfer(bobsPublicKey, 1n);
       const events = await submitTransactionAsync(alicePrivateKey, transfer);
@@ -87,8 +87,8 @@
 
   it('User can transfer owned token', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       // nft
       const nftCollectionId = await createCollectionExpectSuccess();
       const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
@@ -114,8 +114,8 @@
 
   it('Collection admin can transfer owned token', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
       // nft
       const nftCollectionId = await createCollectionExpectSuccess();
       await addCollectionAdminExpectSuccess(alice, nftCollectionId, bob.address);
@@ -145,9 +145,9 @@
 describe('Negative Integration Test Transfer(recipient, collection_id, item_id, value)', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
   it('Transfer with not existed collection_id', async () => {
@@ -258,8 +258,8 @@
 describe('Zero value transfer(From)', () => {
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
     });
   });
 
@@ -316,7 +316,7 @@
 describe('Transfers to self (potentially over substrate-evm boundary)', () => {
   itWeb3('Transfers to self. In case of same frontend', async ({api, privateKeyWrapper}) => {
     const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const aliceProxy = subToEth(alice.address);
     const tokenId = await createItemExpectSuccess(alice, collectionId, 'Fungible', {Substrate: alice.address});
     await transferExpectSuccess(collectionId, tokenId, alice, {Ethereum: aliceProxy}, 10, 'Fungible');
@@ -328,7 +328,7 @@
 
   itWeb3('Transfers to self. In case of substrate-evm boundary', async ({api, privateKeyWrapper}) => {
     const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const aliceProxy = subToEth(alice.address);
     const tokenId = await createItemExpectSuccess(alice, collectionId, 'Fungible', {Substrate: alice.address});
     const balanceAliceBefore = await getTokenBalance(api, collectionId, normalizeAccountId(alice), tokenId);
@@ -340,7 +340,7 @@
 
   itWeb3('Transfers to self. In case of inside substrate-evm', async ({api, privateKeyWrapper}) => {
     const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const tokenId = await createItemExpectSuccess(alice, collectionId, 'Fungible', {Substrate: alice.address});
     const balanceAliceBefore = await getTokenBalance(api, collectionId, normalizeAccountId(alice), tokenId);
     await transferExpectSuccess(collectionId, tokenId, alice, alice , 10, 'Fungible');
@@ -351,7 +351,7 @@
 
   itWeb3('Transfers to self. In case of inside substrate-evm when not enought "Fungibles"', async ({api, privateKeyWrapper}) => {
     const collectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
-    const alice = privateKeyWrapper!('//Alice');
+    const alice = privateKeyWrapper('//Alice');
     const tokenId = await createItemExpectSuccess(alice, collectionId, 'Fungible', {Substrate: alice.address});
     const balanceAliceBefore = await getTokenBalance(api, collectionId, normalizeAccountId(alice), tokenId);
     await transferExpectFailure(collectionId, tokenId, alice, alice , 11);
modifiedtests/src/transferFrom.test.tsdiffbeforeafterboth
--- a/tests/src/transferFrom.test.ts
+++ b/tests/src/transferFrom.test.ts
@@ -43,9 +43,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
@@ -83,9 +83,9 @@
 
   it('Should reduce allowance if value is big', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const alice = privateKeyWrapper!('//Alice');
-      const bob = privateKeyWrapper!('//Bob');
-      const charlie = privateKeyWrapper!('//Charlie');
+      const alice = privateKeyWrapper('//Alice');
+      const bob = privateKeyWrapper('//Bob');
+      const charlie = privateKeyWrapper('//Charlie');
 
       // fungible
       const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
@@ -112,9 +112,9 @@
 
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
-      bob = privateKeyWrapper!('//Bob');
-      charlie = privateKeyWrapper!('//Charlie');
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
     });
   });
 
@@ -216,7 +216,7 @@
 
   it('execute transferFrom from account that is not owner of collection', async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      const dave = privateKeyWrapper!('//Dave');
+      const dave = privateKeyWrapper('//Dave');
       // nft
       const nftCollectionId = await createCollectionExpectSuccess();
       const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -329,7 +329,7 @@
     const collectionCountBefore = await getCreatedCollectionCount(api);
 
     // Run the CreateCollection transaction
-    const alicePrivateKey = privateKeyWrapper!('//Alice');
+    const alicePrivateKey = privateKeyWrapper('//Alice');
 
     let modeprm = {};
     if (mode.type === 'NFT') {
@@ -382,7 +382,7 @@
     const collectionCountBefore = await getCreatedCollectionCount(api);
 
     // Run the CreateCollection transaction
-    const alicePrivateKey = privateKeyWrapper!('//Alice');
+    const alicePrivateKey = privateKeyWrapper('//Alice');
 
     let modeprm = {};
     if (mode.type === 'NFT') {
@@ -430,7 +430,7 @@
     const collectionCountBefore = await getCreatedCollectionCount(api);
 
     // Run the CreateCollection transaction
-    const alicePrivateKey = privateKeyWrapper!('//Alice');
+    const alicePrivateKey = privateKeyWrapper('//Alice');
 
     let modeprm = {};
     if (mode.type === 'NFT') {
@@ -469,7 +469,7 @@
     const collectionCountBefore = await getCreatedCollectionCount(api);
 
     // Run the CreateCollection transaction
-    const alicePrivateKey = privateKeyWrapper!('//Alice');
+    const alicePrivateKey = privateKeyWrapper('//Alice');
     const tx = api.tx.unique.createCollectionEx({name: strToUTF16(name), description: strToUTF16(description), tokenPrefix: strToUTF16(tokenPrefix), mode: modeprm as any});
     await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
 
@@ -520,7 +520,7 @@
 export async function destroyCollectionExpectFailure(collectionId: number, senderSeed = '//Alice') {
   await usingApi(async (api, privateKeyWrapper) => {
     // Run the DestroyCollection transaction
-    const alicePrivateKey = privateKeyWrapper!(senderSeed);
+    const alicePrivateKey = privateKeyWrapper(senderSeed);
     const tx = api.tx.unique.destroyCollection(collectionId);
     await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
   });
@@ -529,7 +529,7 @@
 export async function destroyCollectionExpectSuccess(collectionId: number, senderSeed = '//Alice') {
   await usingApi(async (api, privateKeyWrapper) => {
     // Run the DestroyCollection transaction
-    const alicePrivateKey = privateKeyWrapper!(senderSeed);
+    const alicePrivateKey = privateKeyWrapper(senderSeed);
     const tx = api.tx.unique.destroyCollection(collectionId);
     const events = await submitTransactionAsync(alicePrivateKey, tx);
     const result = getDestroyResult(events);
@@ -574,7 +574,7 @@
   await usingApi(async (api, privateKeyWrapper) => {
 
     // Run the transaction
-    const senderPrivateKey = privateKeyWrapper!(sender);
+    const senderPrivateKey = privateKeyWrapper(sender);
     const tx = api.tx.unique.setCollectionSponsor(collectionId, sponsor);
     const events = await submitTransactionAsync(senderPrivateKey, tx);
     const result = getGenericResult(events);
@@ -594,7 +594,7 @@
   await usingApi(async (api, privateKeyWrapper) => {
 
     // Run the transaction
-    const alicePrivateKey = privateKeyWrapper!(sender);
+    const alicePrivateKey = privateKeyWrapper(sender);
     const tx = api.tx.unique.removeCollectionSponsor(collectionId);
     const events = await submitTransactionAsync(alicePrivateKey, tx);
     const result = getGenericResult(events);
@@ -612,7 +612,7 @@
   await usingApi(async (api, privateKeyWrapper) => {
 
     // Run the transaction
-    const alicePrivateKey = privateKeyWrapper!(senderSeed);
+    const alicePrivateKey = privateKeyWrapper(senderSeed);
     const tx = api.tx.unique.removeCollectionSponsor(collectionId);
     await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
   });
@@ -622,7 +622,7 @@
   await usingApi(async (api, privateKeyWrapper) => {
 
     // Run the transaction
-    const alicePrivateKey = privateKeyWrapper!(senderSeed);
+    const alicePrivateKey = privateKeyWrapper(senderSeed);
     const tx = api.tx.unique.setCollectionSponsor(collectionId, sponsor);
     await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
   });
@@ -632,7 +632,7 @@
   await usingApi(async (api, privateKeyWrapper) => {
 
     // Run the transaction
-    const sender = privateKeyWrapper!(senderSeed);
+    const sender = privateKeyWrapper(senderSeed);
     const tx = api.tx.unique.confirmSponsorship(collectionId);
     const events = await submitTransactionAsync(sender, tx);
     const result = getGenericResult(events);
@@ -653,7 +653,7 @@
   await usingApi(async (api, privateKeyWrapper) => {
 
     // Run the transaction
-    const sender = privateKeyWrapper!(senderSeed);
+    const sender = privateKeyWrapper(senderSeed);
     const tx = api.tx.unique.confirmSponsorship(collectionId);
     await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
   });
modifiedtests/src/xcmTransfer.test.tsdiffbeforeafterboth
--- a/tests/src/xcmTransfer.test.ts
+++ b/tests/src/xcmTransfer.test.ts
@@ -38,7 +38,7 @@
   
   before(async () => {
     await usingApi(async (api, privateKeyWrapper) => {
-      alice = privateKeyWrapper!('//Alice');
+      alice = privateKeyWrapper('//Alice');
     });
 
     const karuraApiOptions: ApiOptions = {