--- a/tests/src/NativeFungible.test.ts +++ /dev/null @@ -1,210 +0,0 @@ -// Copyright 2019-2023 Unique Network (Gibraltar) Ltd. -// This file is part of Unique Network. - -// Unique Network is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Unique Network is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Unique Network. If not, see . - -import {IKeyringPair} from '@polkadot/types/types'; -import {expect, itSub, Pallets, requirePalletsOrSkip, usingPlaygrounds} from './util'; -import {ICollectionCreationOptions} from './util/playgrounds/types'; - -describe('Native fungible', () => { - let alice: IKeyringPair; - let bob: IKeyringPair; - - before(async () => { - await usingPlaygrounds(async (helper, privateKey) => { - const donor = await privateKey({url: import.meta.url}); - [alice, bob] = await helper.arrange.createAccounts([10n, 10n], donor); - }); - }); - - itSub('destroy_collection()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.burn(alice)).to.be.rejectedWith('common.UnsupportedOperation'); - await expect(helper.executeExtrinsic(alice, 'api.tx.unique.destroyCollection', [0])).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('add_to_allow_list()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.addToAllowList(alice, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('remove_from_allow_list()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.removeFromAllowList(alice, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('change_collection_owner()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.changeOwner(alice, bob.address)).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('add_collection_admin()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.addAdmin(alice, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('remove_collection_admin()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.removeAdmin(alice, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('set_collection_sponsor()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.setSponsor(alice, bob.address)).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('confirm_sponsorship()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.confirmSponsorship(alice)).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('remove_collection_sponsor()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.removeSponsor(alice)).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('create_item()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.mint(alice, 100n, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('set_collection_properties()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.setProperties(alice, [{key: 'value'}])).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('delete_collection_properties()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.deleteProperties(alice, ['key'])).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('set_token_properties()', async ({helper}) => { - await expect(helper.executeExtrinsic( - alice, - 'api.tx.unique.setTokenProperties', - [0, 0, [{key: 'value'}]], - true, - )).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('delete_token_properties()', async ({helper}) => { - await expect(helper.executeExtrinsic( - alice, - 'api.tx.unique.deleteTokenProperties', - [0, 0, ['key']], - true, - )).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('set_transfers_enabled_flag()', async ({helper}) => { - await expect(helper.executeExtrinsic( - alice, - 'api.tx.unique.setTransfersEnabledFlag', - [0, true], - true, - )).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('burn_item()', async ({helper}) => { - await expect(helper.executeExtrinsic( - alice, - 'api.tx.unique.burnItem', - [0, 0, 100n], - true, - )).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('burn_from()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.burnTokens(alice, 100n)).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('transfer()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - const balanceAliceBefore = await helper.balance.getSubstrate(alice.address); - const balanceBobBefore = await helper.balance.getSubstrate(bob.address); - await collection.transfer(alice, {Substrate: bob.address}, 100n); - const balanceAliceAfter = await helper.balance.getSubstrate(alice.address); - const balanceBobAfter = await helper.balance.getSubstrate(bob.address); - expect(balanceAliceBefore - balanceAliceAfter > 100n).to.be.true; - expect(balanceBobAfter - balanceBobBefore === 100n).to.be.true; - }); - - itSub('transfer_from()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - const balanceAliceBefore = await helper.balance.getSubstrate(alice.address); - const balanceBobBefore = await helper.balance.getSubstrate(bob.address); - - await collection.transferFrom(alice, {Substrate: alice.address}, {Substrate: bob.address}, 100n); - - const balanceAliceAfter = await helper.balance.getSubstrate(alice.address); - const balanceBobAfter = await helper.balance.getSubstrate(bob.address); - expect(balanceAliceBefore - balanceAliceAfter > 100n).to.be.true; - expect(balanceBobAfter - balanceBobBefore === 100n).to.be.true; - - await expect(collection.transferFrom(alice, {Substrate: bob.address}, {Substrate: alice.address}, 100n)).to.be.rejectedWith('common.NoPermission'); - }); - - itSub('approve()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.approveTokens(alice, {Substrate: bob.address}, 100n)).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('approve_from()', async ({helper}) => { - await expect(helper.executeExtrinsic( - alice, - 'api.tx.unique.approveFrom', - [{Substrate: alice.address}, {Substrate: bob.address}, 0, 0, 100n], - true, - )).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('set_collection_limits()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.setLimits(alice, {accountTokenOwnershipLimit: 1})).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('set_collection_permissions()', async ({helper}) => { - const collection = helper.ft.getCollectionObject(0); - await expect(collection.setPermissions(alice, {access: 'AllowList'})).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('repartition()', async ({helper}) => { - await expect(helper.executeExtrinsic( - alice, - 'api.tx.unique.repartition', - [0, 0, 100n], - true, - )).to.be.rejectedWith('unique.RepartitionCalledOnNonRefungibleCollection'); - }); - - itSub('force_repair_collection()', async ({helper}) => { - await expect(helper.executeExtrinsic( - alice, - 'api.tx.unique.forceRepairCollection', - [0], - true, - )).to.be.rejectedWith('common.UnsupportedOperation'); - }); - - itSub('force_repair_item()', async ({helper}) => { - await expect(helper.executeExtrinsic( - alice, - 'api.tx.unique.forceRepairItem', - [0, 0], - true, - )).to.be.rejectedWith('BadOrigin'); - }); -}); \ No newline at end of file --- a/tests/src/eth/nativeFungible.test.ts +++ b/tests/src/eth/nativeFungible.test.ts @@ -117,7 +117,7 @@ expect(balanceOwnerBefore - 50n > balanceOwnerAfter).to.be.true; expect(balanceReceiverBefore === balanceReceiverAfter - 50n).to.be.true; - await expect(contract.methods.transferFrom(receiver, receiver, 50).call({from: owner})).to.be.rejectedWith('no permission'); + await expect(contract.methods.transferFrom(receiver, receiver, 50).call({from: owner})).to.be.rejectedWith('ApprovedValueTooLow'); }); }); --- /dev/null +++ b/tests/src/nativeFungible.test.ts @@ -0,0 +1,219 @@ +// Copyright 2019-2023 Unique Network (Gibraltar) Ltd. +// This file is part of Unique Network. + +// Unique Network is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Unique Network is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Unique Network. If not, see . + +import {IKeyringPair} from '@polkadot/types/types'; +import {expect, itSub, usingPlaygrounds} from './util'; + +describe('Native fungible', () => { + let alice: IKeyringPair; + let bob: IKeyringPair; + + before(async () => { + await usingPlaygrounds(async (helper, privateKey) => { + const donor = await privateKey({url: import.meta.url}); + [alice, bob] = await helper.arrange.createAccounts([10n, 10n], donor); + }); + }); + + itSub('destroy_collection()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.burn(alice)).to.be.rejectedWith('common.UnsupportedOperation'); + await expect(helper.executeExtrinsic(alice, 'api.tx.unique.destroyCollection', [0])).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('add_to_allow_list()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.addToAllowList(alice, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('remove_from_allow_list()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.removeFromAllowList(alice, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('change_collection_owner()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.changeOwner(alice, bob.address)).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('add_collection_admin()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.addAdmin(alice, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('remove_collection_admin()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.removeAdmin(alice, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('set_collection_sponsor()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.setSponsor(alice, bob.address)).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('confirm_sponsorship()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.confirmSponsorship(alice)).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('remove_collection_sponsor()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.removeSponsor(alice)).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('create_item()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.mint(alice, 100n, {Substrate: bob.address})).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('set_collection_properties()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.setProperties(alice, [{key: 'value'}])).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('delete_collection_properties()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.deleteProperties(alice, ['key'])).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('set_token_properties()', async ({helper}) => { + await expect(helper.executeExtrinsic( + alice, + 'api.tx.unique.setTokenProperties', + [0, 0, [{key: 'value'}]], + true, + )).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('delete_token_properties()', async ({helper}) => { + await expect(helper.executeExtrinsic( + alice, + 'api.tx.unique.deleteTokenProperties', + [0, 0, ['key']], + true, + )).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('set_transfers_enabled_flag()', async ({helper}) => { + await expect(helper.executeExtrinsic( + alice, + 'api.tx.unique.setTransfersEnabledFlag', + [0, true], + true, + )).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('burn_item()', async ({helper}) => { + await expect(helper.executeExtrinsic( + alice, + 'api.tx.unique.burnItem', + [0, 0, 100n], + true, + )).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('burn_from()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.burnTokens(alice, 100n)).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('transfer()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + const balanceAliceBefore = await helper.balance.getSubstrate(alice.address); + const balanceBobBefore = await helper.balance.getSubstrate(bob.address); + await collection.transfer(alice, {Substrate: bob.address}, 100n); + const balanceAliceAfter = await helper.balance.getSubstrate(alice.address); + const balanceBobAfter = await helper.balance.getSubstrate(bob.address); + expect(balanceAliceBefore - balanceAliceAfter > 100n).to.be.true; + expect(balanceBobAfter - balanceBobBefore === 100n).to.be.true; + }); + + itSub('transfer_from()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + const balanceAliceBefore = await helper.balance.getSubstrate(alice.address); + const balanceBobBefore = await helper.balance.getSubstrate(bob.address); + + await collection.transferFrom(alice, {Substrate: alice.address}, {Substrate: bob.address}, 100n); + + const balanceAliceAfter = await helper.balance.getSubstrate(alice.address); + const balanceBobAfter = await helper.balance.getSubstrate(bob.address); + expect(balanceAliceBefore - balanceAliceAfter > 100n).to.be.true; + expect(balanceBobAfter - balanceBobBefore === 100n).to.be.true; + + await expect(collection.transferFrom(alice, {Substrate: bob.address}, {Substrate: alice.address}, 100n)).to.be.rejectedWith('common.ApprovedValueTooLow'); + }); + + itSub('approve()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.approveTokens(alice, {Substrate: bob.address}, 100n)).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('approve_from()', async ({helper}) => { + await expect(helper.executeExtrinsic( + alice, + 'api.tx.unique.approveFrom', + [{Substrate: alice.address}, {Substrate: bob.address}, 0, 0, 100n], + true, + )).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('set_collection_limits()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.setLimits(alice, {accountTokenOwnershipLimit: 1})).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('set_collection_permissions()', async ({helper}) => { + const collection = helper.ft.getCollectionObject(0); + await expect(collection.setPermissions(alice, {access: 'AllowList'})).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('repartition()', async ({helper}) => { + await expect(helper.executeExtrinsic( + alice, + 'api.tx.unique.repartition', + [0, 0, 100n], + true, + )).to.be.rejectedWith('unique.RepartitionCalledOnNonRefungibleCollection'); + }); + + itSub('force_repair_collection()', async ({helper}) => { + await expect(helper.executeExtrinsic( + alice, + 'api.tx.unique.forceRepairCollection', + [0], + true, + )).to.be.rejectedWith('common.UnsupportedOperation'); + }); + + itSub('force_repair_item()', async ({helper}) => { + await expect(helper.executeExtrinsic( + alice, + 'api.tx.unique.forceRepairItem', + [0, 0], + true, + )).to.be.rejectedWith('BadOrigin'); + }); + + itSub.only('Nest into NFT token()', async ({helper}) => { + const nftCollection = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}}); + const targetToken = await nftCollection.mintToken(alice); + + const collection = helper.ft.getCollectionObject(0); + await collection.transfer(alice, targetToken.nestingAccount(), 100n); + + await collection.transferFrom(alice, targetToken.nestingAccount(), {Substrate: alice.address}, 100n); + }); +}); \ No newline at end of file --- a/tests/src/nesting/unnest.test.ts +++ b/tests/src/nesting/unnest.test.ts @@ -47,6 +47,20 @@ await expect(nestedToken.getOwner()).to.be.rejected; }); + itSub('NativeFungible: allows the owner to successfully unnest a token', async ({helper}) => { + const collection = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}}); + const targetToken = await collection.mintToken(alice); + + const collectionFT = helper.ft.getCollectionObject(0); + + // Nest + await collectionFT.transfer(alice, targetToken.nestingAccount(), 10n); + // Unnest + await expect(collectionFT.transferFrom(alice, targetToken.nestingAccount(), {Substrate: alice.address}, 9n), 'while unnesting').to.be.fulfilled; + + expect(await collectionFT.getBalance(targetToken.nestingAccount())).to.be.equal(1n); + }); + itSub('Fungible: allows the owner to successfully unnest a token', async ({helper}) => { const collection = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}}); const targetToken = await collection.mintToken(alice); --- a/tests/src/sub/nesting/common.test.ts +++ b/tests/src/sub/nesting/common.test.ts @@ -88,6 +88,27 @@ }); }); +[ + {restrictedMode: true}, + {restrictedMode: false}, +].map(testCase => { + itSub(`Token owner can nest Native FT in NFT if "tokenOwner" permission set ${testCase.restrictedMode ? 'in restricted mode': ''}`, async ({helper}) => { + // Only NFT allows nesting, permissions should be set: + const targetNFTCollection = await helper.nft.mintCollection(alice); + const targetTokenBob = await targetNFTCollection.mintToken(alice, {Substrate: bob.address}); + + const collectionForNesting = helper.ft.getCollectionObject(0); + // permissions should be set: + await targetNFTCollection.setPermissions(alice, { + nesting: {tokenOwner: true, restricted: testCase.restrictedMode ? [collectionForNesting.collectionId] : null}, + }); + + // Alice can mint and nest token: + await collectionForNesting.transfer(bob, targetTokenBob.nestingAccount(), 50n); + expect(await collectionForNesting.getBalance(targetTokenBob.nestingAccount())).eq(50n); + }); +}); + itSub.ifWithPallets('Owner can unnest tokens using transferFrom', [Pallets.ReFungible], async ({helper}) => { const collectionToNest = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}}); @@ -98,18 +119,22 @@ const nftCollectionToBeNested = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}}); const rftCollectionToBeNested = await helper.rft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}}); const ftCollectionToBeNested = await helper.ft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}}); + const nativeFtCollectionToBeNested = helper.ft.getCollectionObject(0); const nestedNFT = await nftCollectionToBeNested.mintToken(alice, tokenA.nestingAccount()); const nestedRFT = await rftCollectionToBeNested.mintToken(alice, 100n, tokenA.nestingAccount()); const _nestedFT = await ftCollectionToBeNested.mint(alice, 100n, tokenA.nestingAccount()); + await nativeFtCollectionToBeNested.transfer(alice, tokenA.nestingAccount(), 100n); expect(await nestedNFT.getOwner()).to.be.deep.equal(tokenA.nestingAccount().toLowerCase()); expect(await nestedRFT.getOwner()).to.be.deep.equal(tokenA.nestingAccount().toLowerCase()); expect(await ftCollectionToBeNested.getBalance(tokenA.nestingAccount())).to.equal(100n); + expect(await nativeFtCollectionToBeNested.getBalance(tokenA.nestingAccount())).to.equal(100n); // Transfer the nested token to another token await nestedNFT.transferFrom(alice, tokenA.nestingAccount(), tokenB.nestingAccount()); await nestedRFT.transferFrom(alice, tokenA.nestingAccount(), tokenB.nestingAccount(), 25n); await ftCollectionToBeNested.transferFrom(alice, tokenA.nestingAccount(), tokenB.nestingAccount(), 25n); + await nativeFtCollectionToBeNested.transferFrom(alice, tokenA.nestingAccount(), tokenB.nestingAccount(), 25n); expect(await nestedNFT.getTopmostOwner()).to.be.deep.equal({Substrate: alice.address}); expect(await nestedNFT.getOwner()).to.be.deep.equal(tokenB.nestingAccount().toLowerCase()); @@ -119,4 +144,7 @@ expect(await ftCollectionToBeNested.getBalance(tokenB.nestingAccount())).to.equal(25n); expect(await ftCollectionToBeNested.getBalance(tokenA.nestingAccount())).to.equal(75n); + + expect(await nativeFtCollectionToBeNested.getBalance(tokenB.nestingAccount())).to.equal(25n); + expect(await nativeFtCollectionToBeNested.getBalance(tokenA.nestingAccount())).to.equal(75n); }); --- a/tests/src/sub/nesting/e2e.test.ts +++ b/tests/src/sub/nesting/e2e.test.ts @@ -32,6 +32,7 @@ const collectionA = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}}); const collectionB = await helper.ft.mintCollection(alice); const collectionC = await helper.rft.mintCollection(alice); + const collectionD = helper.ft.getCollectionObject(0); const targetToken = await collectionA.mintToken(alice); expect((await targetToken.getChildren()).length).to.be.equal(0, 'Children length check at creation'); @@ -73,20 +74,31 @@ {tokenId: tokenC.tokenId, collectionId: collectionC.collectionId}, ]).and.has.length(3); + // Nest native fungible token into another collection + await collectionD.transfer(alice, targetToken.nestingAccount(), 2n); + expect(await targetToken.getChildren()).to.have.deep.members([ + {tokenId: tokenA.tokenId, collectionId: collectionA.collectionId}, + {tokenId: 0, collectionId: collectionB.collectionId}, + {tokenId: tokenC.tokenId, collectionId: collectionC.collectionId}, + {tokenId: 0, collectionId: collectionD.collectionId}, + ]).and.has.length(4); + // Burn all nested pieces await tokenC.burnFrom(alice, targetToken.nestingAccount(), 2n); expect(await targetToken.getChildren()).to.have.deep.members([ {tokenId: tokenA.tokenId, collectionId: collectionA.collectionId}, {tokenId: 0, collectionId: collectionB.collectionId}, + {tokenId: 0, collectionId: collectionD.collectionId}, ]) - .and.has.length(2); + .and.has.length(3); // Move part of the fungible token inside token A deeper in the nesting tree await collectionB.transferFrom(alice, targetToken.nestingAccount(), tokenA.nestingAccount(), 1n); expect(await targetToken.getChildren()).to.be.have.deep.members([ {tokenId: tokenA.tokenId, collectionId: collectionA.collectionId}, {tokenId: 0, collectionId: collectionB.collectionId}, - ]).and.has.length(2); + {tokenId: 0, collectionId: collectionD.collectionId}, + ]).and.has.length(3); // Nested token also has children now: expect(await tokenA.getChildren()).to.have.deep.members([ {tokenId: 0, collectionId: collectionB.collectionId}, @@ -96,7 +108,8 @@ await collectionB.transferFrom(alice, targetToken.nestingAccount(), tokenA.nestingAccount(), 1n); expect(await targetToken.getChildren()).to.have.deep.members([ {tokenId: tokenA.tokenId, collectionId: collectionA.collectionId}, - ]).and.has.length(1); + {tokenId: 0, collectionId: collectionD.collectionId}, + ]).and.has.length(2); expect(await tokenA.getChildren()).to.have.deep.members([ {tokenId: 0, collectionId: collectionB.collectionId}, ]).and.has.length(1); --- a/tests/src/sub/nesting/nesting.negative.test.ts +++ b/tests/src/sub/nesting/nesting.negative.test.ts @@ -53,25 +53,35 @@ }); }); -itSub('Owner cannot nest FT if nesting is disabled', async ({helper}) => { +[ + {mode: 'ft'}, + {mode: 'nativeFt'}, +].map(testCase => { + itSub(`Owner cannot nest [${testCase.mode}] if nesting is disabled`, async ({helper}) => { // Create default collection, permissions are not set: - const aliceNFTCollection = await helper.nft.mintCollection(alice); - const targetToken = await aliceNFTCollection.mintToken(alice); + const aliceNFTCollection = await helper.nft.mintCollection(alice); + const targetToken = await aliceNFTCollection.mintToken(alice); - const collectionForNesting = await helper.ft.mintCollection(alice); + const collectionForNesting = testCase.mode === 'ft' ? await helper.ft.mintCollection(alice) : helper.ft.getCollectionObject(0); - // 1. Alice cannot create immediately nested tokens: - await expect(collectionForNesting.mint(alice, 100n, targetToken.nestingAccount())).to.be.rejectedWith('common.UserIsNotAllowedToNest'); + // Alice cannot create immediately nested tokens: + await expect(testCase.mode === 'ft' + ? collectionForNesting.mint(alice, 100n, targetToken.nestingAccount()) + : collectionForNesting.transfer(alice, targetToken.nestingAccount(), 100n)).to.be.rejectedWith('common.UserIsNotAllowedToNest'); - // 2. Alice can mint and nest token: - await collectionForNesting.mint(alice, 100n); - await expect(collectionForNesting.transfer(alice, targetToken.nestingAccount(), 50n)).to.be.rejectedWith('common.UserIsNotAllowedToNest'); + // Alice can mint and nest token: + if (testCase.mode === 'ft') { + await collectionForNesting.mint(alice, 100n); + } + await expect(collectionForNesting.transfer(alice, targetToken.nestingAccount(), 50n)).to.be.rejectedWith('common.UserIsNotAllowedToNest'); + }); }); [ {mode: 'nft' as const}, {mode: 'rft' as const}, {mode: 'ft' as const}, + {mode: 'native ft' as const}, ].map(testCase => { itSub(`Non-owner and non-admin cannot nest ${testCase.mode.toUpperCase()} in someone else's tokens`, async ({helper}) => { const targetCollection = await helper.nft.mintCollection(alice, {permissions: @@ -79,13 +89,18 @@ }); const targetToken = await targetCollection.mintToken(alice); - const nestedCollectionBob = await helper[testCase.mode].mintCollection(bob); + const nestedCollectionBob = await ( + testCase.mode === 'native ft' + ? helper.ft.getCollectionObject(0) + : helper[testCase.mode].mintCollection(bob) + ); let nestedTokenBob: UniqueNFToken | UniqueRFToken; switch (testCase.mode) { case 'nft': nestedTokenBob = await (nestedCollectionBob as UniqueNFTCollection).mintToken(bob); break; case 'rft': nestedTokenBob = await (nestedCollectionBob as UniqueRFTCollection).mintToken(bob, 100n); break; case 'ft': await (nestedCollectionBob as UniqueFTCollection).mint(bob, 100n); break; + case 'native ft': break; } // Bob non-owner of targetToken and non admin of targetCollection, so @@ -94,6 +109,7 @@ case 'nft': await expect((nestedCollectionBob as UniqueNFTCollection).mintToken(bob, targetToken.nestingAccount())).to.be.rejectedWith('common.UserIsNotAllowedToNest'); break; case 'rft': await expect((nestedCollectionBob as UniqueRFTCollection).mintToken(bob, 100n, targetToken.nestingAccount())).to.be.rejectedWith('common.UserIsNotAllowedToNest'); break; case 'ft': await expect((nestedCollectionBob as UniqueFTCollection).mint(bob, 100n, targetToken.nestingAccount())).to.be.rejectedWith('common.UserIsNotAllowedToNest'); break; + case 'native ft': break; } // 2. cannot nest existing token: @@ -101,6 +117,7 @@ case 'nft': case 'rft': await expect(nestedTokenBob!.transfer(bob, targetToken.nestingAccount())).to.be.rejectedWith('common.UserIsNotAllowedToNest'); break; case 'ft': await expect((nestedCollectionBob as UniqueFTCollection).transfer(bob, targetToken.nestingAccount(), 100n)).to.be.rejectedWith('common.UserIsNotAllowedToNest'); break; + case 'native ft': await expect((nestedCollectionBob as UniqueFTCollection).transfer(bob, targetToken.nestingAccount(), 100n)).to.be.rejectedWith('common.UserIsNotAllowedToNest'); break; } }); }); @@ -140,6 +157,7 @@ const nftCollectionForNesting = await helper.nft.mintCollection(alice); const rftCollectionForNesting = await helper.rft.mintCollection(alice); const ftCollectionForNesting = await helper.ft.mintCollection(alice); + const nativeFtCollectionForNesting = helper.ft.getCollectionObject(0); const testCases = [ {token: tokenFromNonExistingCollection, error: 'CollectionNotFound'}, @@ -160,6 +178,7 @@ await expect(nft.transfer(alice, testCase.token.nestingAccount())).to.be.rejectedWith(testCase.error); await expect(rft.transfer(alice, testCase.token.nestingAccount())).to.be.rejectedWith(testCase.error); await expect(ftCollectionForNesting.transfer(alice, testCase.token.nestingAccount(), 50n)).to.be.rejectedWith(testCase.error); + await expect(nativeFtCollectionForNesting.transfer(alice, testCase.token.nestingAccount(), 50n)).to.be.rejectedWith(testCase.error); } }); @@ -184,6 +203,7 @@ // Create default collection, permissions are not set: const rftCollection = await helper.rft.mintCollection(alice); const ftCollection = await helper.ft.mintCollection(alice); + const nativeFtCollection = helper.ft.getCollectionObject(0); const rftToken = await rftCollection.mintToken(alice); const _ftToken = await ftCollection.mint(alice, 100n); @@ -193,11 +213,13 @@ // 1. Alice cannot create immediately nested tokens: await expect(collectionForNesting.mintToken(alice, rftToken.nestingAccount())).to.be.rejectedWith('refungible.RefungibleDisallowsNesting'); await expect(collectionForNesting.mintToken(alice, {Ethereum: helper.ethAddress.fromTokenId(ftCollection.collectionId, 0)})).to.be.rejectedWith('fungible.FungibleDisallowsNesting'); + await expect(collectionForNesting.mintToken(alice, {Ethereum: helper.ethAddress.fromTokenId(nativeFtCollection.collectionId, 0)})).to.be.rejectedWith('common.UnsupportedOperation'); // 2. Alice cannot mint and nest token: const nestedToken2 = await collectionForNesting.mintToken(alice); await expect(nestedToken2.nest(alice, rftToken)).to.be.rejectedWith('refungible.RefungibleDisallowsNesting'); await expect(ftCollection.transfer(alice, {Ethereum: helper.ethAddress.fromTokenId(ftCollection.collectionId, 0)})).to.be.rejectedWith('fungible.FungibleDisallowsNesting'); + await expect(nativeFtCollection.transfer(alice, {Ethereum: helper.ethAddress.fromTokenId(nativeFtCollection.collectionId, 0)})).to.be.rejectedWith('common.UnsupportedOperation'); }); itSub('Cannot nest in restricted collection if collection is not in the list', async ({helper}) => { @@ -205,6 +227,7 @@ const notAllowedCollectionNFT = await helper.nft.mintCollection(alice); const notAllowedCollectionRFT = await helper.rft.mintCollection(alice); const notAllowedCollectionFT = await helper.ft.mintCollection(alice); + const notAllowedCollectionNativeFT = helper.ft.getCollectionObject(0); // Collection restricted to allowedCollectionId const restrictedCollectionA = await helper.nft.mintCollection(alice, {permissions: @@ -229,6 +252,8 @@ await expect(notAllowedCollectionRFT.mintToken(alice, 100n, targetTokenB.nestingAccount())).to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/); await expect(notAllowedCollectionFT.mint(alice, 100n, targetTokenA.nestingAccount())).to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/); await expect(notAllowedCollectionFT.mint(alice, 100n, targetTokenB.nestingAccount())).to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/); + await expect(notAllowedCollectionNativeFT.transfer(alice, targetTokenA.nestingAccount(), 100n)).to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/); + await expect(notAllowedCollectionNativeFT.transfer(alice, targetTokenB.nestingAccount(), 100n)).to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/); }); itSub('Cannot create nesting chains greater than 5', async ({helper}) => { --- a/tests/src/sub/nesting/unnesting.negative.test.ts +++ b/tests/src/sub/nesting/unnesting.negative.test.ts @@ -52,12 +52,19 @@ }); [ - {restrictedMode: true}, - {restrictedMode: false}, + {mode: 'ft' as const}, + {mode: 'native ft' as const}, + ].map(md => [ + {mode: md.mode, restrictedMode: true}, + {mode: md.mode, restrictedMode: false}, ].map(testCase => { - itSub(`Fungible: disallows a non-Owner to unnest someone else's token ${testCase.restrictedMode ? '(Restricted nesting)' : ''}`, async ({helper}) => { + itSub.only(`Fungible: disallows a non-Owner to unnest someone else's token [${testCase.mode}${testCase.restrictedMode ? ' (Restricted nesting)' : ''}]`, async ({helper}) => { const collectionNFT = await helper.nft.mintCollection(alice); - const collectionFT = await helper.ft.mintCollection(alice); + const collectionFT = await ( + testCase.mode === 'ft' + ? helper.ft.mintCollection(alice) + : helper.ft.getCollectionObject(0) + ); const targetToken = await collectionNFT.mintToken(alice, {Substrate: bob.address}); await collectionNFT.setPermissions(alice, {nesting: { @@ -65,12 +72,16 @@ }}); // Nest some tokens as Alice into Bob's token - await collectionFT.mint(alice, 5n, targetToken.nestingAccount()); + await ( + testCase.mode === 'ft' + ? collectionFT.mint(alice, 5n, targetToken.nestingAccount()) + : collectionFT.transfer(alice, targetToken.nestingAccount(), 5n) + ); // Try to pull it out as Alice still await expect(collectionFT.transferFrom(alice, targetToken.nestingAccount(), {Substrate: bob.address}, 1n)) .to.be.rejectedWith(/common\.ApprovedValueTooLow/); expect(await collectionFT.getBalance(targetToken.nestingAccount())).to.be.equal(5n); }); - }); + })); });