git.delta.rocks / unique-network / refs/commits / 7f526e168d3e

difftreelog

Merge develop and remove unneeded usingApi

Greg Zaitsev2021-02-11parent: #1d6108d.patch.diff
in: master
(cherry picked from commit 0ccf6006f00210f190eb9d8393d86a6f68778bae)

6 files changed

modifiedtests/src/approve.test.tsdiffbeforeafterboth
--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -12,8 +12,11 @@
   approveExpectFail,
   approveExpectSuccess,
   createCollectionExpectSuccess,
+  createFungibleItemExpectSuccess,
   createItemExpectSuccess,
   destroyCollectionExpectSuccess,
+  transferFromExpectSuccess,
+  U128_MAX,
 } from './util/helpers';
 
 chai.use(chaiAsPromised);
modifiedtests/src/overflow.test.tsdiffbeforeafterboth
--- a/tests/src/overflow.test.ts
+++ b/tests/src/overflow.test.ts
@@ -1,3 +1,8 @@
+//
+// This file is subject to the terms and conditions defined in
+// file 'LICENSE', which is part of this source code package.
+//
+
 import { IKeyringPair } from "@polkadot/types/types";
 import chai from 'chai';
 import chaiAsPromised from "chai-as-promised";
@@ -22,47 +27,41 @@
     });
 
     it('fails when overflows on transfer', async () => {
-        await usingApi(async () => {
-            const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
+        const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
-            await transferExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX, 'Fungible');
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
+        await transferExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX, 'Fungible');
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: 1n });
-            await transferExpectFail(fungibleCollectionId, 0, alice, bob, 1, 'Fungible');
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: 1n });
+        await transferExpectFail(fungibleCollectionId, 0, alice, bob, 1, 'Fungible');
 
-            expect(await getFungibleBalance(fungibleCollectionId, alice.address)).to.equal(1n);
-            expect(await getFungibleBalance(fungibleCollectionId, bob.address)).to.equal(U128_MAX);
-        });
+        expect(await getFungibleBalance(fungibleCollectionId, alice.address)).to.equal(1n);
+        expect(await getFungibleBalance(fungibleCollectionId, bob.address)).to.equal(U128_MAX);
     });
 
     it('fails on allowance overflow', async () => {
-        await usingApi(async () => {
-            const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
+        const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
-            await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX);
-            await approveExpectFail(fungibleCollectionId, 0, alice, bob, U128_MAX);
-        });
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
+        await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX);
+        await approveExpectFail(fungibleCollectionId, 0, alice, bob, U128_MAX);
     });
 
     it('fails when overflows on transferFrom', async () => {
-        await usingApi(async () => {
-            const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
+        const fungibleCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
-            await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX);
-            await transferFromExpectSuccess(fungibleCollectionId, 0, bob, alice, charlie, U128_MAX, 'Fungible');
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
+        await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX);
+        await transferFromExpectSuccess(fungibleCollectionId, 0, bob, alice, charlie, U128_MAX, 'Fungible');
 
-            expect(await getFungibleBalance(fungibleCollectionId, charlie.address)).to.equal(U128_MAX);
-            expect(await getAllowance(fungibleCollectionId, 0, alice.address, bob.address)).to.equal(0n);
+        expect(await getFungibleBalance(fungibleCollectionId, charlie.address)).to.equal(U128_MAX);
+        expect(await getAllowance(fungibleCollectionId, 0, alice.address, bob.address)).to.equal(0n);
 
-            await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
-            await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, 1n);
-            await transferFromExpectFail(fungibleCollectionId, 0, bob, alice, charlie, 1);
+        await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: U128_MAX });
+        await approveExpectSuccess(fungibleCollectionId, 0, alice, bob, 1n);
+        await transferFromExpectFail(fungibleCollectionId, 0, bob, alice, charlie, 1);
 
-            expect(await getFungibleBalance(fungibleCollectionId, charlie.address)).to.equal(U128_MAX);
-            expect(await getAllowance(fungibleCollectionId, 0, alice.address, bob.address)).to.equal(0n);
-        });
+        expect(await getFungibleBalance(fungibleCollectionId, charlie.address)).to.equal(U128_MAX);
+        expect(await getAllowance(fungibleCollectionId, 0, alice.address, bob.address)).to.equal(0n);
     });
 });
modifiedtests/src/removeFromContractWhiteList.test.tsdiffbeforeafterboth
--- a/tests/src/removeFromContractWhiteList.test.ts
+++ b/tests/src/removeFromContractWhiteList.test.ts
@@ -1,3 +1,8 @@
+//
+// This file is subject to the terms and conditions defined in
+// file 'LICENSE', which is part of this source code package.
+//
+
 import privateKey from "./substrate/privateKey";
 import usingApi from "./substrate/substrate-api";
 import { deployFlipper, toggleFlipValueExpectFailure, toggleFlipValueExpectSuccess } from "./util/contracthelpers";
modifiedtests/src/transferFrom.test.tsdiffbeforeafterboth
--- a/tests/src/transferFrom.test.ts
+++ b/tests/src/transferFrom.test.ts
@@ -11,8 +11,10 @@
   approveExpectFail,
   approveExpectSuccess,
   createCollectionExpectSuccess,
+  createFungibleItemExpectSuccess,
   createItemExpectSuccess,
   destroyCollectionExpectSuccess,
+  getAllowance,
   transferFromExpectFail,
   transferFromExpectSuccess,
   burnItemExpectSuccess,
@@ -48,6 +50,22 @@
         newReFungibleTokenId, Bob, Alice, Charlie, 100, 'ReFungible');
     });
   });
+
+  it('Should reduce allowance if value is big', async () => {
+    await usingApi(async () => {
+      const alice = privateKey('//Alice');
+      const bob = privateKey('//Bob');
+      const charlie = privateKey('//Charlie');
+
+      // fungible
+      const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
+      const newFungibleTokenId = await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: 500000n });
+
+      await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob, 500000n);
+      await transferFromExpectSuccess(fungibleCollectionId, newFungibleTokenId, bob, alice, charlie, 500000n, 'Fungible');
+      expect((await getAllowance(fungibleCollectionId, newFungibleTokenId, alice.address, bob.address)).toString()).to.equal('0');
+    });
+  });
 });
 
 describe('Negative Integration Test transferFrom(from, recipient, collection_id, item_id, value):', () => {
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
before · tests/src/util/helpers.ts
1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56import { ApiPromise, Keyring } from '@polkadot/api';7import { Enum, Struct } from '@polkadot/types/codec';8import type { AccountId, EventRecord } from '@polkadot/types/interfaces';9import { u128 } from '@polkadot/types/primitive';10import { IKeyringPair } from '@polkadot/types/types';11import { BigNumber } from 'bignumber.js';12import BN from 'bn.js';13import chai from 'chai';14import chaiAsPromised from 'chai-as-promised';15import { alicesPublicKey, nullPublicKey } from '../accounts';16import privateKey from '../substrate/privateKey';17import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from '../substrate/substrate-api';18import { ICollectionInterface } from '../types';19import { hexToStr, strToUTF16, utf16ToStr } from './util';2021chai.use(chaiAsPromised);22const expect = chai.expect;2324export const U128_MAX = (1n << 128n) - 1n;2526type GenericResult = {27  success: boolean,28};2930interface CreateCollectionResult {31  success: boolean;32  collectionId: number;33}3435interface CreateItemResult {36  success: boolean;37  collectionId: number;38  itemId: number;39}4041interface IReFungibleOwner {42  Fraction: BN;43  Owner: number[];44}4546interface ITokenDataType {47  Owner: number[];48  ConstData: number[];49  VariableData: number[];50}5152interface IFungibleTokenDataType {53  Value: BN;54}5556export interface IReFungibleTokenDataType {57  Owner: IReFungibleOwner[];58  ConstData: number[];59  VariableData: number[];60}6162export function getGenericResult(events: EventRecord[]): GenericResult {63  const result: GenericResult = {64    success: false,65  };66  events.forEach(({ phase, event: { data, method, section } }) => {67    // console.log(`    ${phase}: ${section}.${method}:: ${data}`);68    if (method === 'ExtrinsicSuccess') {69      result.success = true;70    }71  });72  return result;73}7475export function getCreateCollectionResult(events: EventRecord[]): CreateCollectionResult {76  let success = false;77  let collectionId: number = 0;78  events.forEach(({ phase, event: { data, method, section } }) => {79    // console.log(`    ${phase}: ${section}.${method}:: ${data}`);80    if (method == 'ExtrinsicSuccess') {81      success = true;82    } else if ((section == 'nft') && (method == 'Created')) {83      collectionId = parseInt(data[0].toString());84    }85  });86  const result: CreateCollectionResult = {87    success,88    collectionId,89  };90  return result;91}9293export function getCreateItemResult(events: EventRecord[]): CreateItemResult {94  let success = false;95  let collectionId: number = 0;96  let itemId: number = 0;97  events.forEach(({ phase, event: { data, method, section } }) => {98    // console.log(`    ${phase}: ${section}.${method}:: ${data}`);99    if (method == 'ExtrinsicSuccess') {100      success = true;101    } else if ((section == 'nft') && (method == 'ItemCreated')) {102      collectionId = parseInt(data[0].toString());103      itemId = parseInt(data[1].toString());104    }105  });106  const result: CreateItemResult = {107    success,108    collectionId,109    itemId,110  };111  return result;112}113114interface Invalid {115  type: 'Invalid';116}117118interface Nft {119  type: 'NFT';120}121122interface Fungible {123  type: 'Fungible';124  decimalPoints: number;125}126127interface ReFungible {128  type: 'ReFungible';129}130131type CollectionMode = Nft | Fungible | ReFungible | Invalid;132133export type CreateCollectionParams = {134  mode: CollectionMode,135  name: string,136  description: string,137  tokenPrefix: string,138};139140const defaultCreateCollectionParams: CreateCollectionParams = {141  description: 'description',142  mode: { type: 'NFT' },143  name: 'name',144  tokenPrefix: 'prefix',145}146147export async function createCollectionExpectSuccess(params: Partial<CreateCollectionParams> = {}): Promise<number> {148  const {name, description, mode, tokenPrefix } = {...defaultCreateCollectionParams, ...params};149150  let collectionId: number = 0;151  await usingApi(async (api) => {152    // Get number of collections before the transaction153    const AcollectionCount = parseInt((await api.query.nft.createdCollectionCount()).toString(), 10);154155    // Run the CreateCollection transaction156    const alicePrivateKey = privateKey('//Alice');157158    let modeprm = {};159    if (mode.type === 'NFT') {160      modeprm = {nft: null};161    } else if (mode.type === 'Fungible') {162      modeprm = {fungible: mode.decimalPoints};163    } else if (mode.type === 'ReFungible') {164      modeprm = {refungible: null};165    } else if (mode.type === 'Invalid') {166      modeprm = {invalid: null};167    }168169    const tx = api.tx.nft.createCollection(strToUTF16(name), strToUTF16(description), strToUTF16(tokenPrefix), modeprm);170    const events = await submitTransactionAsync(alicePrivateKey, tx);171    const result = getCreateCollectionResult(events);172173    // Get number of collections after the transaction174    const BcollectionCount = parseInt((await api.query.nft.createdCollectionCount()).toString(), 10);175176    // Get the collection177    const collection: any = (await api.query.nft.collection(result.collectionId)).toJSON();178179    // What to expect180    // tslint:disable-next-line:no-unused-expression181    expect(result.success).to.be.true;182    expect(result.collectionId).to.be.equal(BcollectionCount);183    // tslint:disable-next-line:no-unused-expression184    expect(collection).to.be.not.null;185    expect(BcollectionCount).to.be.equal(AcollectionCount + 1, 'Error: NFT collection NOT created.');186    expect(collection.Owner).to.be.equal(alicesPublicKey);187    expect(utf16ToStr(collection.Name)).to.be.equal(name);188    expect(utf16ToStr(collection.Description)).to.be.equal(description);189    expect(hexToStr(collection.TokenPrefix)).to.be.equal(tokenPrefix);190191    collectionId = result.collectionId;192  });193194  return collectionId;195}196197export async function createCollectionExpectFailure(params: Partial<CreateCollectionParams> = {}) {198  const {name, description, mode, tokenPrefix } = {...defaultCreateCollectionParams, ...params};199200  let modeprm = {};201  if (mode.type === 'NFT') {202    modeprm = {nft: null};203  } else if (mode.type === 'Fungible') {204    modeprm = {fungible: mode.decimalPoints};205  } else if (mode.type === 'ReFungible') {206    modeprm = {refungible: null};207  } else if (mode.type === 'Invalid') {208    modeprm = {invalid: null};209  }210211  await usingApi(async (api) => {212    // Get number of collections before the transaction213    const AcollectionCount = parseInt((await api.query.nft.createdCollectionCount()).toString());214215    // Run the CreateCollection transaction216    const alicePrivateKey = privateKey('//Alice');217    const tx = api.tx.nft.createCollection(strToUTF16(name), strToUTF16(description), strToUTF16(tokenPrefix), modeprm);218    const events = await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;219    const result = getCreateCollectionResult(events);220221    // Get number of collections after the transaction222    const BcollectionCount = parseInt((await api.query.nft.createdCollectionCount()).toString());223224    // What to expect225    // tslint:disable-next-line:no-unused-expression226    expect(result.success).to.be.false;227    expect(BcollectionCount).to.be.equal(AcollectionCount, 'Error: Collection with incorrect data created.');228  });229}230231export async function findUnusedAddress(api: ApiPromise): Promise<IKeyringPair> {232  let bal = new BigNumber(0);233  let unused;234  do {235    const randomSeed = 'seed' +  Math.floor(Math.random() * Math.floor(10000));236    const keyring = new Keyring({ type: 'sr25519' });237    unused = keyring.addFromUri(`//${randomSeed}`);238    bal = new BigNumber((await api.query.system.account(unused.address)).data.free.toString());239  } while (bal.toFixed() != '0');240  return unused;241}242243export async function getAllowance(collectionId: number, tokenId: number, owner: string, approved: string) {244  return await usingApi(async (api) => {245    const bn = await api.query.nft.allowances(collectionId, [tokenId, owner, approved]) as unknown as BN;246    return BigInt(bn.toString());247  });248}249250export async function findNotExistingCollection(api: ApiPromise): Promise<number> {251  const totalNumber = parseInt((await api.query.nft.createdCollectionCount()).toString(), 10) as unknown as number;252  const newCollection: number = totalNumber + 1;253  return newCollection;254}255256function getDestroyResult(events: EventRecord[]): boolean {257  let success: boolean = false;258  events.forEach(({ phase, event: { data, method, section } }) => {259    // console.log(`    ${phase}: ${section}.${method}:: ${data}`);260    if (method == 'ExtrinsicSuccess') {261      success = true;262    }263  });264  return success;265}266267export async function destroyCollectionExpectFailure(collectionId: number, senderSeed: string = '//Alice') {268  await usingApi(async (api) => {269    // Run the DestroyCollection transaction270    const alicePrivateKey = privateKey(senderSeed);271    const tx = api.tx.nft.destroyCollection(collectionId);272    await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;273  });274}275276export async function destroyCollectionExpectSuccess(collectionId: number, senderSeed: string = '//Alice') {277  await usingApi(async (api) => {278    // Run the DestroyCollection transaction279    const alicePrivateKey = privateKey(senderSeed);280    const tx = api.tx.nft.destroyCollection(collectionId);281    const events = await submitTransactionAsync(alicePrivateKey, tx);282    const result = getDestroyResult(events);283284    // Get the collection285    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();286287    // What to expect288    expect(result).to.be.true;289    expect(collection).to.be.not.null;290    expect(collection.Owner).to.be.equal(nullPublicKey);291  });292}293294export async function setCollectionSponsorExpectSuccess(collectionId: number, sponsor: string) {295  await usingApi(async (api) => {296297    // Run the transaction298    const alicePrivateKey = privateKey('//Alice');299    const tx = api.tx.nft.setCollectionSponsor(collectionId, sponsor);300    const events = await submitTransactionAsync(alicePrivateKey, tx);301    const result = getGenericResult(events);302303    // Get the collection304    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();305306    // What to expect307    expect(result.success).to.be.true;308    expect(collection.Sponsor.toString()).to.be.equal(sponsor.toString());309    expect(collection.SponsorConfirmed).to.be.false;310  });311}312313export async function removeCollectionSponsorExpectSuccess(collectionId: number) {314  await usingApi(async (api) => {315316    // Run the transaction317    const alicePrivateKey = privateKey('//Alice');318    const tx = api.tx.nft.removeCollectionSponsor(collectionId);319    const events = await submitTransactionAsync(alicePrivateKey, tx);320    const result = getGenericResult(events);321322    // Get the collection323    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();324325    // What to expect326    expect(result.success).to.be.true;327    expect(collection.Sponsor).to.be.equal(nullPublicKey);328    expect(collection.SponsorConfirmed).to.be.false;329  });330}331332export async function removeCollectionSponsorExpectFailure(collectionId: number) {333  await usingApi(async (api) => {334335    // Run the transaction336    const alicePrivateKey = privateKey('//Alice');337    const tx = api.tx.nft.removeCollectionSponsor(collectionId);338    await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;339  });340}341342export async function setCollectionSponsorExpectFailure(collectionId: number, sponsor: string, senderSeed: string = '//Alice') {343  await usingApi(async (api) => {344345    // Run the transaction346    const alicePrivateKey = privateKey(senderSeed);347    const tx = api.tx.nft.setCollectionSponsor(collectionId, sponsor);348    await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;349  });350}351352export async function confirmSponsorshipExpectSuccess(collectionId: number, senderSeed: string = '//Alice') {353  await usingApi(async (api) => {354355    // Run the transaction356    const sender = privateKey(senderSeed);357    const tx = api.tx.nft.confirmSponsorship(collectionId);358    const events = await submitTransactionAsync(sender, tx);359    const result = getGenericResult(events);360361    // Get the collection362    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();363364    // What to expect365    expect(result.success).to.be.true;366    expect(collection.Sponsor).to.be.equal(sender.address);367    expect(collection.SponsorConfirmed).to.be.true;368  });369}370371372export async function confirmSponsorshipExpectFailure(collectionId: number, senderSeed: string = '//Alice') {373  await usingApi(async (api) => {374375    // Run the transaction376    const sender = privateKey(senderSeed);377    const tx = api.tx.nft.confirmSponsorship(collectionId);378    await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;379  });380}381382export async function enableContractSponsoringExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, enable: boolean) {383  await usingApi(async (api) => {384    const tx = api.tx.nft.enableContractSponsoring(contractAddress, enable);385    const events = await submitTransactionAsync(sender, tx);386    const result = getGenericResult(events);387388    expect(result.success).to.be.true;389  });390}391392export async function enableContractSponsoringExpectFailure(sender: IKeyringPair, contractAddress: AccountId | string, enable: boolean) {393  await usingApi(async (api) => {394    const tx = api.tx.nft.enableContractSponsoring(contractAddress, enable);395    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;396    const result = getGenericResult(events);397398    expect(result.success).to.be.false;399  });400}401402export async function setContractSponsoringRateLimitExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, rateLimit: number) {403  await usingApi(async (api) => {404    const tx = api.tx.nft.setContractSponsoringRateLimit(contractAddress, rateLimit);405    const events = await submitTransactionAsync(sender, tx);406    const result = getGenericResult(events);407408    expect(result.success).to.be.true;409  });410}411412export async function setContractSponsoringRateLimitExpectFailure(sender: IKeyringPair, contractAddress: AccountId | string, rateLimit: number) {413  await usingApi(async (api) => {414    const tx = api.tx.nft.setContractSponsoringRateLimit(contractAddress, rateLimit);415    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;416    const result = getGenericResult(events);417418    expect(result.success).to.be.false;419  });420}421422export async function toggleContractWhitelistExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, enabled: boolean) {423  await usingApi(async (api) => {424    const tx = api.tx.nft.toggleContractWhiteList(contractAddress, true);425    const events = await submitTransactionAsync(sender, tx);426    const result = getGenericResult(events);427428    expect(result.success).to.be.true;429  });430}431432export async function isWhitelistedInContract(contractAddress: AccountId | string, user: string) {433  let whitelisted: boolean = false;434  await usingApi(async (api) => {435    whitelisted = (await api.query.nft.contractWhiteList(contractAddress, user)).toJSON() as boolean;436  });437  return whitelisted;438}439440export async function addToContractWhiteListExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, user: string) {441  await usingApi(async (api) => {442    const tx = api.tx.nft.addToContractWhiteList(contractAddress, user);443    const events = await submitTransactionAsync(sender, tx);444    const result = getGenericResult(events);445446    expect(result.success).to.be.true;447  });448}449450export async function removeFromContractWhiteListExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, user: string) {451  await usingApi(async (api) => {452    const tx = api.tx.nft.removeFromContractWhiteList(contractAddress, user);453    const events = await submitTransactionAsync(sender, tx);454    const result = getGenericResult(events);455456    expect(result.success).to.be.true;457  });458}459460export async function removeFromContractWhiteListExpectFailure(sender: IKeyringPair, contractAddress: AccountId | string, user: string) {461  await usingApi(async (api) => {462    const tx = api.tx.nft.removeFromContractWhiteList(contractAddress, user);463    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;464    const result = getGenericResult(events);465466    expect(result.success).to.be.false;467  });468}469470export async function setVariableMetaDataExpectSuccess(sender: IKeyringPair, collectionId: number, itemId: number, data: number[]) {471  await usingApi(async (api) => {472    const tx = api.tx.nft.setVariableMetaData(collectionId, itemId, '0x' + Buffer.from(data).toString('hex'));473    const events = await submitTransactionAsync(sender, tx);474    const result = getGenericResult(events);475476    expect(result.success).to.be.true;477  });478}479480export async function setVariableMetaDataExpectFailure(sender: IKeyringPair, collectionId: number, itemId: number, data: number[]) {481  await usingApi(async (api) => {482    const tx = api.tx.nft.setVariableMetaData(collectionId, itemId, '0x' + Buffer.from(data).toString('hex'));483    await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;484  });485}486487export interface CreateFungibleData {488  readonly Value: bigint;489}490491export interface CreateReFungibleData { }492export interface CreateNftData { }493494export type CreateItemData = {495  NFT: CreateNftData;496} | {497  Fungible: CreateFungibleData;498} | {499  ReFungible: CreateReFungibleData;500};501502export async function burnItemExpectSuccess(owner: IKeyringPair, collectionId: number, tokenId: number, value = 0) {503  await usingApi(async (api) => {504    const tx = api.tx.nft.burnItem(collectionId, tokenId, value);505    const events = await submitTransactionAsync(owner, tx);506    const result = getGenericResult(events);507    // Get the item508    const item: any = (await api.query.nft.nftItemList(collectionId, tokenId)).toJSON();509    // What to expect510    // tslint:disable-next-line:no-unused-expression511    expect(result.success).to.be.true;512    // tslint:disable-next-line:no-unused-expression513    expect(item).to.be.not.null;514    expect(item.Owner).to.be.equal(nullPublicKey);515  });516}517518export async function519approveExpectSuccess(collectionId: number,520                     tokenId: number, owner: IKeyringPair, approved: IKeyringPair, amount: number | bigint = 1) { //alice,bob521  await usingApi(async (api: ApiPromise) => {522    const allowanceBefore =523      await api.query.nft.allowances(collectionId, [tokenId, owner.address, approved.address]) as unknown as BN;524    const approveNftTx = await api.tx.nft.approve(approved.address, collectionId, tokenId, amount);525    const events = await submitTransactionAsync(owner, approveNftTx);526    const result = getCreateItemResult(events);527    // tslint:disable-next-line:no-unused-expression528    expect(result.success).to.be.true;529    const allowanceAfter =530      await api.query.nft.allowances(collectionId, [tokenId, owner.address, approved.address]) as unknown as BN;531    expect(allowanceAfter.sub(allowanceBefore).toString()).to.be.equal(amount.toString());532  });533}534535export async function536transferFromExpectSuccess(collectionId: number,537                          tokenId: number,538                          accountApproved: IKeyringPair, //bob539                          accountFrom: IKeyringPair, //alice540                          accountTo: IKeyringPair, //charlie541                          value: number | bigint = 1,542                          type: string = 'NFT') {543  await usingApi(async (api: ApiPromise) => {544    let balanceBefore = new BN(0);545    if (type === 'Fungible') {546      balanceBefore = await api.query.nft.balance(collectionId, accountTo.address) as unknown as BN;547    }548    const transferFromTx = await api.tx.nft.transferFrom(549      accountFrom.address, accountTo.address, collectionId, tokenId, value);550    const events = await submitTransactionAsync(accountApproved, transferFromTx);551    const result = getCreateItemResult(events);552    // tslint:disable-next-line:no-unused-expression553    expect(result.success).to.be.true;554    if (type === 'NFT') {555      const nftItemData = await api.query.nft.nftItemList(collectionId, tokenId) as unknown as ITokenDataType;556      expect(nftItemData.Owner.toString()).to.be.equal(accountTo.address);557    }558    if (type === 'Fungible') {559      const balanceAfter = await api.query.nft.balance(collectionId, accountTo.address) as unknown as BN;560      expect(balanceAfter.sub(balanceBefore).toString()).to.be.equal(value.toString());561    }562    if (type === 'ReFungible') {563      const nftItemData =564        await api.query.nft.reFungibleItemList(collectionId, tokenId) as unknown as IReFungibleTokenDataType;565      expect(nftItemData.Owner[0].Owner.toString()).to.be.equal(accountTo.address);566      expect(nftItemData.Owner[0].Fraction.toNumber()).to.be.equal(value);567    }568  });569}570571export async function572transferFromExpectFail(collectionId: number,573                       tokenId: number,574                       accountApproved: IKeyringPair,575                       accountFrom: IKeyringPair,576                       accountTo: IKeyringPair,577                       value: number | bigint = 1) {578  await usingApi(async (api: ApiPromise) => {579    const transferFromTx = await api.tx.nft.transferFrom(580      accountFrom.address, accountTo.address, collectionId, tokenId, value);581    const events = await expect(submitTransactionExpectFailAsync(accountApproved, transferFromTx)).to.be.rejected;582    const result = getCreateCollectionResult(events);583    // tslint:disable-next-line:no-unused-expression584    expect(result.success).to.be.false;585  });586}587588export async function589transferExpectSuccess(collectionId: number,590                      tokenId: number,591                      sender: IKeyringPair,592                      recipient: IKeyringPair,593                      value: number | bigint = 1,594                      type: string = 'NFT') {595  await usingApi(async (api: ApiPromise) => {596    let balanceBefore = new BN(0);597    if (type === 'Fungible') {598      balanceBefore = await api.query.nft.balance(collectionId, recipient.address) as unknown as BN;599    }600    const transferTx = await api.tx.nft.transfer(recipient.address, collectionId, tokenId, value);601    const events = await submitTransactionAsync(sender, transferTx);602    const result = getCreateItemResult(events);603    // tslint:disable-next-line:no-unused-expression604    expect(result.success).to.be.true;605    if (type === 'NFT') {606      const nftItemData = await api.query.nft.nftItemList(collectionId, tokenId) as unknown as ITokenDataType;607      expect(nftItemData.Owner.toString()).to.be.equal(recipient.address);608    }609    if (type === 'Fungible') {610      const balanceAfter = await api.query.nft.balance(collectionId, recipient.address) as unknown as BN;611      expect(balanceAfter.sub(balanceBefore).toString()).to.be.equal(value.toString());612    }613    if (type === 'ReFungible') {614      const nftItemData =615        await api.query.nft.reFungibleItemList(collectionId, tokenId) as unknown as IReFungibleTokenDataType;616      expect(nftItemData.Owner[0].Owner.toString()).to.be.equal(recipient.address);617      expect(nftItemData.Owner[0].Fraction.toNumber()).to.be.equal(value);618    }619  });620}621622export async function623transferExpectFail(collectionId: number,624                   tokenId: number,625                   sender: IKeyringPair,626                   recipient: IKeyringPair,627                   value: number | bigint = 1,628                   type: string = 'NFT') {629  await usingApi(async (api: ApiPromise) => {630    const transferTx = await api.tx.nft.transfer(recipient.address, collectionId, tokenId, value);631    const events = await expect(submitTransactionExpectFailAsync(sender, transferTx)).to.be.rejected;632    if (events && Array.isArray(events)) {633      const result = getCreateCollectionResult(events);634      // tslint:disable-next-line:no-unused-expression635      expect(result.success).to.be.false;636    }637  });638}639640export async function641approveExpectFail(collectionId: number,642                  tokenId: number, owner: IKeyringPair, approved: IKeyringPair, amount: number | bigint = 1) {643  await usingApi(async (api: ApiPromise) => {644    const approveNftTx = await api.tx.nft.approve(approved.address, collectionId, tokenId, amount);645    const events = await expect(submitTransactionExpectFailAsync(owner, approveNftTx)).to.be.rejected;646    const result = getCreateCollectionResult(events);647    // tslint:disable-next-line:no-unused-expression648    expect(result.success).to.be.false;649  });650}651652export async function getFungibleBalance(653  collectionId: number,654  owner: string,655) {656  return await usingApi(async (api) => {657    const response = (await api.query.nft.fungibleItemList(collectionId, owner)).toJSON() as unknown as {Value: string};658    return BigInt(response.Value);659  });660}661662export async function createFungibleItemExpectSuccess(663  sender: IKeyringPair,664  collectionId: number,665  data: CreateFungibleData,666  owner: string = sender.address,667) {668  return await usingApi(async (api) => {669    const tx = api.tx.nft.createItem(collectionId, owner, { Fungible: data });670671    const events = await submitTransactionAsync(sender, tx);672    const result = getCreateItemResult(events);673674    expect(result.success).to.be.true;675    return result.itemId;676  });677}678679export async function createItemExpectSuccess(680  sender: IKeyringPair, collectionId: number, createMode: string, owner: string = '') {681  let newItemId: number = 0;682  await usingApi(async (api) => {683    const AItemCount = parseInt((await api.query.nft.itemListIndex(collectionId)).toString(), 10);684    const Aitem: any = (await api.query.nft.fungibleItemList(collectionId, owner)).toJSON();685    const AItemBalance = new BigNumber(Aitem.Value);686687    if (owner === '') {688      owner = sender.address;689    }690691    let tx;692    if (createMode === 'Fungible') {693      const createData = {fungible: {value: 10}};694      tx = api.tx.nft.createItem(collectionId, owner, createData);695    } else if (createMode === 'ReFungible') {696      const createData = {refungible: {const_data: [], variable_data: [], pieces: 100}};697      tx = api.tx.nft.createItem(collectionId, owner, createData);698    } else {699      tx = api.tx.nft.createItem(collectionId, owner, createMode);700    }701    const events = await submitTransactionAsync(sender, tx);702    const result = getCreateItemResult(events);703704    const BItemCount = parseInt((await api.query.nft.itemListIndex(collectionId)).toString(), 10);705    const Bitem: any = (await api.query.nft.fungibleItemList(collectionId, owner)).toJSON();706    const BItemBalance = new BigNumber(Bitem.Value);707708    // What to expect709    // tslint:disable-next-line:no-unused-expression710    expect(result.success).to.be.true;711    if (createMode === 'Fungible') {712      expect(BItemBalance.minus(AItemBalance).toNumber()).to.be.equal(10);713    } else {714      expect(BItemCount).to.be.equal(AItemCount + 1);715    }716    expect(collectionId).to.be.equal(result.collectionId);717    expect(BItemCount).to.be.equal(result.itemId);718    newItemId = result.itemId;719  });720  return newItemId;721}722723export async function createItemExpectFailure(724  sender: IKeyringPair, collectionId: number, createMode: string, owner: string = sender.address) {725  await usingApi(async (api) => {726    const tx = api.tx.nft.createItem(collectionId, owner, createMode);727    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;728    const result = getCreateItemResult(events);729730    expect(result.success).to.be.false;731  });732}733734export async function setPublicAccessModeExpectSuccess(735  sender: IKeyringPair, collectionId: number,736  accessMode: 'Normal' | 'WhiteList',737) {738  await usingApi(async (api) => {739740    // Run the transaction741    const tx = api.tx.nft.setPublicAccessMode(collectionId, accessMode);742    const events = await submitTransactionAsync(sender, tx);743    const result = getGenericResult(events);744745    // Get the collection746    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();747748    // What to expect749    // tslint:disable-next-line:no-unused-expression750    expect(result.success).to.be.true;751    expect(collection.Access).to.be.equal(accessMode);752  });753}754755export async function enableWhiteListExpectSuccess(sender: IKeyringPair, collectionId: number) {756  await setPublicAccessModeExpectSuccess(sender, collectionId, 'WhiteList');757}758759export async function disableWhiteListExpectSuccess(sender: IKeyringPair, collectionId: number) {760  await setPublicAccessModeExpectSuccess(sender, collectionId, 'Normal');761}762763export async function setMintPermissionExpectSuccess(sender: IKeyringPair, collectionId: number, enabled: boolean) {764  await usingApi(async (api) => {765766    // Run the transaction767    const tx = api.tx.nft.setMintPermission(collectionId, enabled);768    const events = await submitTransactionAsync(sender, tx);769    const result = getGenericResult(events);770771    // Get the collection772    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();773774    // What to expect775    // tslint:disable-next-line:no-unused-expression776    expect(result.success).to.be.true;777    expect(collection.MintMode).to.be.equal(enabled);778  });779}780781export async function enablePublicMintingExpectSuccess(sender: IKeyringPair, collectionId: number) {782  await setMintPermissionExpectSuccess(sender, collectionId, true);783}784785export async function setMintPermissionExpectFailure(sender: IKeyringPair, collectionId: number, enabled: boolean) {786  await usingApi(async (api) => {787    // Run the transaction788    const tx = api.tx.nft.setMintPermission(collectionId, enabled);789    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;790    const result = getCreateCollectionResult(events);791    // tslint:disable-next-line:no-unused-expression792    expect(result.success).to.be.false;793  });794}795796export async function isWhitelisted(collectionId: number, address: string) {797  let whitelisted: boolean = false;798  await usingApi(async (api) => {799    whitelisted = (await api.query.nft.whiteList(collectionId, address)).toJSON() as unknown as boolean;800  });801  return whitelisted;802}803804export async function addToWhiteListExpectSuccess(sender: IKeyringPair, collectionId: number, address: string) {805  await usingApi(async (api) => {806807    const whiteListedBefore = (await api.query.nft.whiteList(collectionId, address)).toJSON();808809    // Run the transaction810    const tx = api.tx.nft.addToWhiteList(collectionId, address);811    const events = await submitTransactionAsync(sender, tx);812    const result = getGenericResult(events);813814    const whiteListedAfter = (await api.query.nft.whiteList(collectionId, address)).toJSON();815816    // What to expect817    // tslint:disable-next-line:no-unused-expression818    expect(result.success).to.be.true;819    // tslint:disable-next-line: no-unused-expression820    expect(whiteListedBefore).to.be.false;821    // tslint:disable-next-line: no-unused-expression822    expect(whiteListedAfter).to.be.true;823  });824}825826export async function removeFromWhiteListExpectSuccess(sender: IKeyringPair, collectionId: number, address: string) {827  await usingApi(async (api) => {828    // Run the transaction829    const tx = api.tx.nft.removeFromWhiteList(collectionId, address);830    const events = await submitTransactionAsync(sender, tx);831    const result = getGenericResult(events);832833    // What to expect834    // tslint:disable-next-line:no-unused-expression835    expect(result.success).to.be.true;836  });837}838839export async function removeFromWhiteListExpectFailure(sender: IKeyringPair, collectionId: number, address: string) {840  await usingApi(async (api) => {841    // Run the transaction842    const tx = api.tx.nft.removeFromWhiteList(collectionId, address);843    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;844    const result = getGenericResult(events);845846    // What to expect847    // tslint:disable-next-line:no-unused-expression848    expect(result.success).to.be.false;849  });850}851852export const getDetailedCollectionInfo = async (api: ApiPromise, collectionId: number)853  : Promise<ICollectionInterface | null> => {854  return await api.query.nft.collection(collectionId) as unknown as ICollectionInterface;855};856857export const getCreatedCollectionCount = async (api: ApiPromise): Promise<number> => {858  // set global object - collectionsCount859  return (await api.query.nft.createdCollectionCount() as unknown as BN).toNumber();860};
after · tests/src/util/helpers.ts
1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56import { ApiPromise, Keyring } from '@polkadot/api';7import { Enum, Struct } from '@polkadot/types/codec';8import type { AccountId, EventRecord } from '@polkadot/types/interfaces';9import { u128 } from '@polkadot/types/primitive';10import { IKeyringPair } from '@polkadot/types/types';11import { BigNumber } from 'bignumber.js';12import BN from 'bn.js';13import chai from 'chai';14import chaiAsPromised from 'chai-as-promised';15import { alicesPublicKey, nullPublicKey } from '../accounts';16import privateKey from '../substrate/privateKey';17import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from '../substrate/substrate-api';18import { ICollectionInterface } from '../types';19import { hexToStr, strToUTF16, utf16ToStr } from './util';2021chai.use(chaiAsPromised);22const expect = chai.expect;2324export const U128_MAX = (1n << 128n) - 1n;2526type GenericResult = {27  success: boolean,28};2930interface CreateCollectionResult {31  success: boolean;32  collectionId: number;33}3435interface CreateItemResult {36  success: boolean;37  collectionId: number;38  itemId: number;39}4041interface IReFungibleOwner {42  Fraction: BN;43  Owner: number[];44}4546interface ITokenDataType {47  Owner: number[];48  ConstData: number[];49  VariableData: number[];50}5152interface IFungibleTokenDataType {53  Value: BN;54}5556export interface IReFungibleTokenDataType {57  Owner: IReFungibleOwner[];58  ConstData: number[];59  VariableData: number[];60}6162export function getGenericResult(events: EventRecord[]): GenericResult {63  const result: GenericResult = {64    success: false,65  };66  events.forEach(({ phase, event: { data, method, section } }) => {67    // console.log(`    ${phase}: ${section}.${method}:: ${data}`);68    if (method === 'ExtrinsicSuccess') {69      result.success = true;70    }71  });72  return result;73}7475export function getCreateCollectionResult(events: EventRecord[]): CreateCollectionResult {76  let success = false;77  let collectionId: number = 0;78  events.forEach(({ phase, event: { data, method, section } }) => {79    // console.log(`    ${phase}: ${section}.${method}:: ${data}`);80    if (method == 'ExtrinsicSuccess') {81      success = true;82    } else if ((section == 'nft') && (method == 'Created')) {83      collectionId = parseInt(data[0].toString());84    }85  });86  const result: CreateCollectionResult = {87    success,88    collectionId,89  };90  return result;91}9293export function getCreateItemResult(events: EventRecord[]): CreateItemResult {94  let success = false;95  let collectionId: number = 0;96  let itemId: number = 0;97  events.forEach(({ phase, event: { data, method, section } }) => {98    // console.log(`    ${phase}: ${section}.${method}:: ${data}`);99    if (method == 'ExtrinsicSuccess') {100      success = true;101    } else if ((section == 'nft') && (method == 'ItemCreated')) {102      collectionId = parseInt(data[0].toString());103      itemId = parseInt(data[1].toString());104    }105  });106  const result: CreateItemResult = {107    success,108    collectionId,109    itemId,110  };111  return result;112}113114interface Invalid {115  type: 'Invalid';116}117118interface Nft {119  type: 'NFT';120}121122interface Fungible {123  type: 'Fungible';124  decimalPoints: number;125}126127interface ReFungible {128  type: 'ReFungible';129}130131type CollectionMode = Nft | Fungible | ReFungible | Invalid;132133export type CreateCollectionParams = {134  mode: CollectionMode,135  name: string,136  description: string,137  tokenPrefix: string,138};139140const defaultCreateCollectionParams: CreateCollectionParams = {141  description: 'description',142  mode: { type: 'NFT' },143  name: 'name',144  tokenPrefix: 'prefix',145}146147export async function createCollectionExpectSuccess(params: Partial<CreateCollectionParams> = {}): Promise<number> {148  const {name, description, mode, tokenPrefix } = {...defaultCreateCollectionParams, ...params};149150  let collectionId: number = 0;151  await usingApi(async (api) => {152    // Get number of collections before the transaction153    const AcollectionCount = parseInt((await api.query.nft.createdCollectionCount()).toString(), 10);154155    // Run the CreateCollection transaction156    const alicePrivateKey = privateKey('//Alice');157158    let modeprm = {};159    if (mode.type === 'NFT') {160      modeprm = {nft: null};161    } else if (mode.type === 'Fungible') {162      modeprm = {fungible: mode.decimalPoints};163    } else if (mode.type === 'ReFungible') {164      modeprm = {refungible: null};165    } else if (mode.type === 'Invalid') {166      modeprm = {invalid: null};167    }168169    const tx = api.tx.nft.createCollection(strToUTF16(name), strToUTF16(description), strToUTF16(tokenPrefix), modeprm);170    const events = await submitTransactionAsync(alicePrivateKey, tx);171    const result = getCreateCollectionResult(events);172173    // Get number of collections after the transaction174    const BcollectionCount = parseInt((await api.query.nft.createdCollectionCount()).toString(), 10);175176    // Get the collection177    const collection: any = (await api.query.nft.collection(result.collectionId)).toJSON();178179    // What to expect180    // tslint:disable-next-line:no-unused-expression181    expect(result.success).to.be.true;182    expect(result.collectionId).to.be.equal(BcollectionCount);183    // tslint:disable-next-line:no-unused-expression184    expect(collection).to.be.not.null;185    expect(BcollectionCount).to.be.equal(AcollectionCount + 1, 'Error: NFT collection NOT created.');186    expect(collection.Owner).to.be.equal(alicesPublicKey);187    expect(utf16ToStr(collection.Name)).to.be.equal(name);188    expect(utf16ToStr(collection.Description)).to.be.equal(description);189    expect(hexToStr(collection.TokenPrefix)).to.be.equal(tokenPrefix);190191    collectionId = result.collectionId;192  });193194  return collectionId;195}196197export async function createCollectionExpectFailure(params: Partial<CreateCollectionParams> = {}) {198  const {name, description, mode, tokenPrefix } = {...defaultCreateCollectionParams, ...params};199200  let modeprm = {};201  if (mode.type === 'NFT') {202    modeprm = {nft: null};203  } else if (mode.type === 'Fungible') {204    modeprm = {fungible: mode.decimalPoints};205  } else if (mode.type === 'ReFungible') {206    modeprm = {refungible: null};207  } else if (mode.type === 'Invalid') {208    modeprm = {invalid: null};209  }210211  await usingApi(async (api) => {212    // Get number of collections before the transaction213    const AcollectionCount = parseInt((await api.query.nft.createdCollectionCount()).toString());214215    // Run the CreateCollection transaction216    const alicePrivateKey = privateKey('//Alice');217    const tx = api.tx.nft.createCollection(strToUTF16(name), strToUTF16(description), strToUTF16(tokenPrefix), modeprm);218    const events = await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;219    const result = getCreateCollectionResult(events);220221    // Get number of collections after the transaction222    const BcollectionCount = parseInt((await api.query.nft.createdCollectionCount()).toString());223224    // What to expect225    // tslint:disable-next-line:no-unused-expression226    expect(result.success).to.be.false;227    expect(BcollectionCount).to.be.equal(AcollectionCount, 'Error: Collection with incorrect data created.');228  });229}230231export async function findUnusedAddress(api: ApiPromise): Promise<IKeyringPair> {232  let bal = new BigNumber(0);233  let unused;234  do {235    const randomSeed = 'seed' +  Math.floor(Math.random() * Math.floor(10000));236    const keyring = new Keyring({ type: 'sr25519' });237    unused = keyring.addFromUri(`//${randomSeed}`);238    bal = new BigNumber((await api.query.system.account(unused.address)).data.free.toString());239  } while (bal.toFixed() != '0');240  return unused;241}242243export async function getAllowance(collectionId: number, tokenId: number, owner: string, approved: string) {244  return await usingApi(async (api) => {245    const bn = await api.query.nft.allowances(collectionId, [tokenId, owner, approved]) as unknown as BN;246    return BigInt(bn.toString());247  });248}249250export function findUnusedAddresses(api: ApiPromise, amount: number): Promise<IKeyringPair[]> {251  return Promise.all(new Array(amount).fill(null).map(() => findUnusedAddress(api, '_' + Date.now())));252}253254export async function findNotExistingCollection(api: ApiPromise): Promise<number> {255  const totalNumber = parseInt((await api.query.nft.createdCollectionCount()).toString(), 10) as unknown as number;256  const newCollection: number = totalNumber + 1;257  return newCollection;258}259260function getDestroyResult(events: EventRecord[]): boolean {261  let success: boolean = false;262  events.forEach(({ phase, event: { data, method, section } }) => {263    // console.log(`    ${phase}: ${section}.${method}:: ${data}`);264    if (method == 'ExtrinsicSuccess') {265      success = true;266    }267  });268  return success;269}270271export async function destroyCollectionExpectFailure(collectionId: number, senderSeed: string = '//Alice') {272  await usingApi(async (api) => {273    // Run the DestroyCollection transaction274    const alicePrivateKey = privateKey(senderSeed);275    const tx = api.tx.nft.destroyCollection(collectionId);276    await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;277  });278}279280export async function destroyCollectionExpectSuccess(collectionId: number, senderSeed: string = '//Alice') {281  await usingApi(async (api) => {282    // Run the DestroyCollection transaction283    const alicePrivateKey = privateKey(senderSeed);284    const tx = api.tx.nft.destroyCollection(collectionId);285    const events = await submitTransactionAsync(alicePrivateKey, tx);286    const result = getDestroyResult(events);287288    // Get the collection289    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();290291    // What to expect292    expect(result).to.be.true;293    expect(collection).to.be.not.null;294    expect(collection.Owner).to.be.equal(nullPublicKey);295  });296}297298export async function setCollectionSponsorExpectSuccess(collectionId: number, sponsor: string) {299  await usingApi(async (api) => {300301    // Run the transaction302    const alicePrivateKey = privateKey('//Alice');303    const tx = api.tx.nft.setCollectionSponsor(collectionId, sponsor);304    const events = await submitTransactionAsync(alicePrivateKey, tx);305    const result = getGenericResult(events);306307    // Get the collection308    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();309310    // What to expect311    expect(result.success).to.be.true;312    expect(collection.Sponsor.toString()).to.be.equal(sponsor.toString());313    expect(collection.SponsorConfirmed).to.be.false;314  });315}316317export async function removeCollectionSponsorExpectSuccess(collectionId: number) {318  await usingApi(async (api) => {319320    // Run the transaction321    const alicePrivateKey = privateKey('//Alice');322    const tx = api.tx.nft.removeCollectionSponsor(collectionId);323    const events = await submitTransactionAsync(alicePrivateKey, tx);324    const result = getGenericResult(events);325326    // Get the collection327    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();328329    // What to expect330    expect(result.success).to.be.true;331    expect(collection.Sponsor).to.be.equal(nullPublicKey);332    expect(collection.SponsorConfirmed).to.be.false;333  });334}335336export async function removeCollectionSponsorExpectFailure(collectionId: number) {337  await usingApi(async (api) => {338339    // Run the transaction340    const alicePrivateKey = privateKey('//Alice');341    const tx = api.tx.nft.removeCollectionSponsor(collectionId);342    await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;343  });344}345346export async function setCollectionSponsorExpectFailure(collectionId: number, sponsor: string, senderSeed: string = '//Alice') {347  await usingApi(async (api) => {348349    // Run the transaction350    const alicePrivateKey = privateKey(senderSeed);351    const tx = api.tx.nft.setCollectionSponsor(collectionId, sponsor);352    await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;353  });354}355356export async function confirmSponsorshipExpectSuccess(collectionId: number, senderSeed: string = '//Alice') {357  await usingApi(async (api) => {358359    // Run the transaction360    const sender = privateKey(senderSeed);361    const tx = api.tx.nft.confirmSponsorship(collectionId);362    const events = await submitTransactionAsync(sender, tx);363    const result = getGenericResult(events);364365    // Get the collection366    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();367368    // What to expect369    expect(result.success).to.be.true;370    expect(collection.Sponsor).to.be.equal(sender.address);371    expect(collection.SponsorConfirmed).to.be.true;372  });373}374375376export async function confirmSponsorshipExpectFailure(collectionId: number, senderSeed: string = '//Alice') {377  await usingApi(async (api) => {378379    // Run the transaction380    const sender = privateKey(senderSeed);381    const tx = api.tx.nft.confirmSponsorship(collectionId);382    await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;383  });384}385386export async function enableContractSponsoringExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, enable: boolean) {387  await usingApi(async (api) => {388    const tx = api.tx.nft.enableContractSponsoring(contractAddress, enable);389    const events = await submitTransactionAsync(sender, tx);390    const result = getGenericResult(events);391392    expect(result.success).to.be.true;393  });394}395396export async function enableContractSponsoringExpectFailure(sender: IKeyringPair, contractAddress: AccountId | string, enable: boolean) {397  await usingApi(async (api) => {398    const tx = api.tx.nft.enableContractSponsoring(contractAddress, enable);399    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;400    const result = getGenericResult(events);401402    expect(result.success).to.be.false;403  });404}405406export async function setContractSponsoringRateLimitExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, rateLimit: number) {407  await usingApi(async (api) => {408    const tx = api.tx.nft.setContractSponsoringRateLimit(contractAddress, rateLimit);409    const events = await submitTransactionAsync(sender, tx);410    const result = getGenericResult(events);411412    expect(result.success).to.be.true;413  });414}415416export async function setContractSponsoringRateLimitExpectFailure(sender: IKeyringPair, contractAddress: AccountId | string, rateLimit: number) {417  await usingApi(async (api) => {418    const tx = api.tx.nft.setContractSponsoringRateLimit(contractAddress, rateLimit);419    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;420    const result = getGenericResult(events);421422    expect(result.success).to.be.false;423  });424}425426export async function toggleContractWhitelistExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, enabled: boolean) {427  await usingApi(async (api) => {428    const tx = api.tx.nft.toggleContractWhiteList(contractAddress, true);429    const events = await submitTransactionAsync(sender, tx);430    const result = getGenericResult(events);431432    expect(result.success).to.be.true;433  });434}435436export async function isWhitelistedInContract(contractAddress: AccountId | string, user: string) {437  let whitelisted: boolean = false;438  await usingApi(async (api) => {439    whitelisted = (await api.query.nft.contractWhiteList(contractAddress, user)).toJSON() as boolean;440  });441  return whitelisted;442}443444export async function addToContractWhiteListExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, user: string) {445  await usingApi(async (api) => {446    const tx = api.tx.nft.addToContractWhiteList(contractAddress, user);447    const events = await submitTransactionAsync(sender, tx);448    const result = getGenericResult(events);449450    expect(result.success).to.be.true;451  });452}453454export async function removeFromContractWhiteListExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, user: string) {455  await usingApi(async (api) => {456    const tx = api.tx.nft.removeFromContractWhiteList(contractAddress, user);457    const events = await submitTransactionAsync(sender, tx);458    const result = getGenericResult(events);459460    expect(result.success).to.be.true;461  });462}463464export async function removeFromContractWhiteListExpectFailure(sender: IKeyringPair, contractAddress: AccountId | string, user: string) {465  await usingApi(async (api) => {466    const tx = api.tx.nft.removeFromContractWhiteList(contractAddress, user);467    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;468    const result = getGenericResult(events);469470    expect(result.success).to.be.false;471  });472}473474export async function setVariableMetaDataExpectSuccess(sender: IKeyringPair, collectionId: number, itemId: number, data: number[]) {475  await usingApi(async (api) => {476    const tx = api.tx.nft.setVariableMetaData(collectionId, itemId, '0x' + Buffer.from(data).toString('hex'));477    const events = await submitTransactionAsync(sender, tx);478    const result = getGenericResult(events);479480    expect(result.success).to.be.true;481  });482}483484export async function setVariableMetaDataExpectFailure(sender: IKeyringPair, collectionId: number, itemId: number, data: number[]) {485  await usingApi(async (api) => {486    const tx = api.tx.nft.setVariableMetaData(collectionId, itemId, '0x' + Buffer.from(data).toString('hex'));487    await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;488  });489}490491export interface CreateFungibleData {492  readonly Value: bigint;493}494495export interface CreateReFungibleData { }496export interface CreateNftData { }497498export type CreateItemData = {499  NFT: CreateNftData;500} | {501  Fungible: CreateFungibleData;502} | {503  ReFungible: CreateReFungibleData;504};505506export async function burnItemExpectSuccess(owner: IKeyringPair, collectionId: number, tokenId: number, value = 0) {507  await usingApi(async (api) => {508    const tx = api.tx.nft.burnItem(collectionId, tokenId, value);509    const events = await submitTransactionAsync(owner, tx);510    const result = getGenericResult(events);511    // Get the item512    const item: any = (await api.query.nft.nftItemList(collectionId, tokenId)).toJSON();513    // What to expect514    // tslint:disable-next-line:no-unused-expression515    expect(result.success).to.be.true;516    // tslint:disable-next-line:no-unused-expression517    expect(item).to.be.not.null;518    expect(item.Owner).to.be.equal(nullPublicKey);519  });520}521522export async function523approveExpectSuccess(collectionId: number,524                     tokenId: number, owner: IKeyringPair, approved: IKeyringPair, amount: number | bigint = 1) {525  await usingApi(async (api: ApiPromise) => {526    const allowanceBefore =527      await api.query.nft.allowances(collectionId, [tokenId, owner.address, approved.address]) as unknown as BN;528    const approveNftTx = await api.tx.nft.approve(approved.address, collectionId, tokenId, amount);529    const events = await submitTransactionAsync(owner, approveNftTx);530    const result = getCreateItemResult(events);531    // tslint:disable-next-line:no-unused-expression532    expect(result.success).to.be.true;533    const allowanceAfter =534      await api.query.nft.allowances(collectionId, [tokenId, owner.address, approved.address]) as unknown as BN;535    expect(allowanceAfter.sub(allowanceBefore).toString()).to.be.equal(amount.toString());536  });537}538539export async function540transferFromExpectSuccess(collectionId: number,541                          tokenId: number,542                          accountApproved: IKeyringPair,543                          accountFrom: IKeyringPair,544                          accountTo: IKeyringPair,545                          value: number | bigint = 1,546                          type: string = 'NFT') {547  await usingApi(async (api: ApiPromise) => {548    let balanceBefore = new BN(0);549    if (type === 'Fungible') {550      balanceBefore = await api.query.nft.balance(collectionId, accountTo.address) as unknown as BN;551    }552    const transferFromTx = await api.tx.nft.transferFrom(553      accountFrom.address, accountTo.address, collectionId, tokenId, value);554    const events = await submitTransactionAsync(accountApproved, transferFromTx);555    const result = getCreateItemResult(events);556    // tslint:disable-next-line:no-unused-expression557    expect(result.success).to.be.true;558    if (type === 'NFT') {559      const nftItemData = await api.query.nft.nftItemList(collectionId, tokenId) as unknown as ITokenDataType;560      expect(nftItemData.Owner.toString()).to.be.equal(accountTo.address);561    }562    if (type === 'Fungible') {563      const balanceAfter = await api.query.nft.balance(collectionId, accountTo.address) as unknown as BN;564      expect(balanceAfter.sub(balanceBefore).toString()).to.be.equal(value.toString());565    }566    if (type === 'ReFungible') {567      const nftItemData =568        await api.query.nft.reFungibleItemList(collectionId, tokenId) as unknown as IReFungibleTokenDataType;569      expect(nftItemData.Owner[0].Owner.toString()).to.be.equal(accountTo.address);570      expect(nftItemData.Owner[0].Fraction.toNumber()).to.be.equal(value);571    }572  });573}574575export async function576transferFromExpectFail(collectionId: number,577                       tokenId: number,578                       accountApproved: IKeyringPair,579                       accountFrom: IKeyringPair,580                       accountTo: IKeyringPair,581                       value: number | bigint = 1) {582  await usingApi(async (api: ApiPromise) => {583    const transferFromTx = await api.tx.nft.transferFrom(584      accountFrom.address, accountTo.address, collectionId, tokenId, value);585    const events = await expect(submitTransactionExpectFailAsync(accountApproved, transferFromTx)).to.be.rejected;586    const result = getCreateCollectionResult(events);587    // tslint:disable-next-line:no-unused-expression588    expect(result.success).to.be.false;589  });590}591592export async function593transferExpectSuccess(collectionId: number,594                      tokenId: number,595                      sender: IKeyringPair,596                      recipient: IKeyringPair,597                      value: number | bigint = 1,598                      type: string = 'NFT') {599  await usingApi(async (api: ApiPromise) => {600    let balanceBefore = new BN(0);601    if (type === 'Fungible') {602      balanceBefore = await api.query.nft.balance(collectionId, recipient.address) as unknown as BN;603    }604    const transferTx = await api.tx.nft.transfer(recipient.address, collectionId, tokenId, value);605    const events = await submitTransactionAsync(sender, transferTx);606    const result = getCreateItemResult(events);607    // tslint:disable-next-line:no-unused-expression608    expect(result.success).to.be.true;609    if (type === 'NFT') {610      const nftItemData = await api.query.nft.nftItemList(collectionId, tokenId) as unknown as ITokenDataType;611      expect(nftItemData.Owner.toString()).to.be.equal(recipient.address);612    }613    if (type === 'Fungible') {614      const balanceAfter = await api.query.nft.balance(collectionId, recipient.address) as unknown as BN;615      expect(balanceAfter.sub(balanceBefore).toString()).to.be.equal(value.toString());616    }617    if (type === 'ReFungible') {618      const nftItemData =619        await api.query.nft.reFungibleItemList(collectionId, tokenId) as unknown as IReFungibleTokenDataType;620      expect(nftItemData.Owner[0].Owner.toString()).to.be.equal(recipient.address);621      expect(nftItemData.Owner[0].Fraction.toNumber()).to.be.equal(value);622    }623  });624}625626export async function627transferExpectFail(collectionId: number,628                   tokenId: number,629                   sender: IKeyringPair,630                   recipient: IKeyringPair,631                   value: number | bigint = 1,632                   type: string = 'NFT') {633  await usingApi(async (api: ApiPromise) => {634    const transferTx = await api.tx.nft.transfer(recipient.address, collectionId, tokenId, value);635    const events = await expect(submitTransactionExpectFailAsync(sender, transferTx)).to.be.rejected;636    if (events && Array.isArray(events)) {637      const result = getCreateCollectionResult(events);638      // tslint:disable-next-line:no-unused-expression639      expect(result.success).to.be.false;640    }641  });642}643644export async function645approveExpectFail(collectionId: number,646                  tokenId: number, owner: IKeyringPair, approved: IKeyringPair, amount: number | bigint = 1) {647  await usingApi(async (api: ApiPromise) => {648    const approveNftTx = await api.tx.nft.approve(approved.address, collectionId, tokenId, amount);649    const events = await expect(submitTransactionExpectFailAsync(owner, approveNftTx)).to.be.rejected;650    const result = getCreateCollectionResult(events);651    // tslint:disable-next-line:no-unused-expression652    expect(result.success).to.be.false;653  });654}655656export async function getFungibleBalance(657  collectionId: number,658  owner: string,659) {660  return await usingApi(async (api) => {661    const response = (await api.query.nft.fungibleItemList(collectionId, owner)).toJSON() as unknown as {Value: string};662    return BigInt(response.Value);663  });664}665666export async function createFungibleItemExpectSuccess(667  sender: IKeyringPair,668  collectionId: number,669  data: CreateFungibleData,670  owner: string = sender.address,671) {672  return await usingApi(async (api) => {673    const tx = api.tx.nft.createItem(collectionId, owner, { Fungible: data });674675    const events = await submitTransactionAsync(sender, tx);676    const result = getCreateItemResult(events);677678    expect(result.success).to.be.true;679    return result.itemId;680  });681}682683export async function createItemExpectSuccess(684  sender: IKeyringPair, collectionId: number, createMode: string, owner: string = '') {685  let newItemId: number = 0;686  await usingApi(async (api) => {687    const AItemCount = parseInt((await api.query.nft.itemListIndex(collectionId)).toString(), 10);688    const Aitem: any = (await api.query.nft.fungibleItemList(collectionId, owner)).toJSON();689    const AItemBalance = new BigNumber(Aitem.Value);690691    if (owner === '') {692      owner = sender.address;693    }694695    let tx;696    if (createMode === 'Fungible') {697      const createData = {fungible: {value: 10}};698      tx = api.tx.nft.createItem(collectionId, owner, createData);699    } else if (createMode === 'ReFungible') {700      const createData = {refungible: {const_data: [], variable_data: [], pieces: 100}};701      tx = api.tx.nft.createItem(collectionId, owner, createData);702    } else {703      tx = api.tx.nft.createItem(collectionId, owner, createMode);704    }705    const events = await submitTransactionAsync(sender, tx);706    const result = getCreateItemResult(events);707708    const BItemCount = parseInt((await api.query.nft.itemListIndex(collectionId)).toString(), 10);709    const Bitem: any = (await api.query.nft.fungibleItemList(collectionId, owner)).toJSON();710    const BItemBalance = new BigNumber(Bitem.Value);711712    // What to expect713    // tslint:disable-next-line:no-unused-expression714    expect(result.success).to.be.true;715    if (createMode === 'Fungible') {716      expect(BItemBalance.minus(AItemBalance).toNumber()).to.be.equal(10);717    } else {718      expect(BItemCount).to.be.equal(AItemCount + 1);719    }720    expect(collectionId).to.be.equal(result.collectionId);721    expect(BItemCount).to.be.equal(result.itemId);722    newItemId = result.itemId;723  });724  return newItemId;725}726727export async function createItemExpectFailure(728  sender: IKeyringPair, collectionId: number, createMode: string, owner: string = sender.address) {729  await usingApi(async (api) => {730    const tx = api.tx.nft.createItem(collectionId, owner, createMode);731    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;732    const result = getCreateItemResult(events);733734    expect(result.success).to.be.false;735  });736}737738export async function setPublicAccessModeExpectSuccess(739  sender: IKeyringPair, collectionId: number,740  accessMode: 'Normal' | 'WhiteList',741) {742  await usingApi(async (api) => {743744    // Run the transaction745    const tx = api.tx.nft.setPublicAccessMode(collectionId, accessMode);746    const events = await submitTransactionAsync(sender, tx);747    const result = getGenericResult(events);748749    // Get the collection750    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();751752    // What to expect753    // tslint:disable-next-line:no-unused-expression754    expect(result.success).to.be.true;755    expect(collection.Access).to.be.equal(accessMode);756  });757}758759export async function enableWhiteListExpectSuccess(sender: IKeyringPair, collectionId: number) {760  await setPublicAccessModeExpectSuccess(sender, collectionId, 'WhiteList');761}762763export async function disableWhiteListExpectSuccess(sender: IKeyringPair, collectionId: number) {764  await setPublicAccessModeExpectSuccess(sender, collectionId, 'Normal');765}766767export async function setMintPermissionExpectSuccess(sender: IKeyringPair, collectionId: number, enabled: boolean) {768  await usingApi(async (api) => {769770    // Run the transaction771    const tx = api.tx.nft.setMintPermission(collectionId, enabled);772    const events = await submitTransactionAsync(sender, tx);773    const result = getGenericResult(events);774775    // Get the collection776    const collection: any = (await api.query.nft.collection(collectionId)).toJSON();777778    // What to expect779    // tslint:disable-next-line:no-unused-expression780    expect(result.success).to.be.true;781    expect(collection.MintMode).to.be.equal(enabled);782  });783}784785export async function enablePublicMintingExpectSuccess(sender: IKeyringPair, collectionId: number) {786  await setMintPermissionExpectSuccess(sender, collectionId, true);787}788789export async function setMintPermissionExpectFailure(sender: IKeyringPair, collectionId: number, enabled: boolean) {790  await usingApi(async (api) => {791    // Run the transaction792    const tx = api.tx.nft.setMintPermission(collectionId, enabled);793    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;794    const result = getCreateCollectionResult(events);795    // tslint:disable-next-line:no-unused-expression796    expect(result.success).to.be.false;797  });798}799800export async function isWhitelisted(collectionId: number, address: string) {801  let whitelisted: boolean = false;802  await usingApi(async (api) => {803    whitelisted = (await api.query.nft.whiteList(collectionId, address)).toJSON() as unknown as boolean;804  });805  return whitelisted;806}807808export async function addToWhiteListExpectSuccess(sender: IKeyringPair, collectionId: number, address: string) {809  await usingApi(async (api) => {810811    const whiteListedBefore = (await api.query.nft.whiteList(collectionId, address)).toJSON();812813    // Run the transaction814    const tx = api.tx.nft.addToWhiteList(collectionId, address);815    const events = await submitTransactionAsync(sender, tx);816    const result = getGenericResult(events);817818    const whiteListedAfter = (await api.query.nft.whiteList(collectionId, address)).toJSON();819820    // What to expect821    // tslint:disable-next-line:no-unused-expression822    expect(result.success).to.be.true;823    // tslint:disable-next-line: no-unused-expression824    expect(whiteListedBefore).to.be.false;825    // tslint:disable-next-line: no-unused-expression826    expect(whiteListedAfter).to.be.true;827  });828}829830export async function removeFromWhiteListExpectSuccess(sender: IKeyringPair, collectionId: number, address: string) {831  await usingApi(async (api) => {832    // Run the transaction833    const tx = api.tx.nft.removeFromWhiteList(collectionId, address);834    const events = await submitTransactionAsync(sender, tx);835    const result = getGenericResult(events);836837    // What to expect838    // tslint:disable-next-line:no-unused-expression839    expect(result.success).to.be.true;840  });841}842843export async function removeFromWhiteListExpectFailure(sender: IKeyringPair, collectionId: number, address: string) {844  await usingApi(async (api) => {845    // Run the transaction846    const tx = api.tx.nft.removeFromWhiteList(collectionId, address);847    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;848    const result = getGenericResult(events);849850    // What to expect851    // tslint:disable-next-line:no-unused-expression852    expect(result.success).to.be.false;853  });854}855856export const getDetailedCollectionInfo = async (api: ApiPromise, collectionId: number)857  : Promise<ICollectionInterface | null> => {858  return await api.query.nft.collection(collectionId) as unknown as ICollectionInterface;859};860861export const getCreatedCollectionCount = async (api: ApiPromise): Promise<number> => {862  // set global object - collectionsCount863  return (await api.query.nft.createdCollectionCount() as unknown as BN).toNumber();864};
modifiedtests/yarn.lockdiffbeforeafterboth
--- a/tests/yarn.lock
+++ b/tests/yarn.lock
@@ -4638,7 +4638,7 @@
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.1.0:
+is-core-module@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
   integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
@@ -7027,11 +7027,11 @@
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.3.2:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
   dependencies:
-    is-core-module "^2.1.0"
+    is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
 responselike@^1.0.2: