difftreelog
test transfer already nested token + destroy a non-empty collection + additional refactoring
in: master
7 files changed
tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -54,6 +54,7 @@
"testApprove": "mocha --timeout 9999999 -r ts-node/register ./**/approve.test.ts",
"testTransferFrom": "mocha --timeout 9999999 -r ts-node/register ./**/transferFrom.test.ts",
"testCreateCollection": "mocha --timeout 9999999 -r ts-node/register ./**/createCollection.test.ts",
+ "testDestroyCollection": "mocha --timeout 9999999 -r ts-node/register ./**/destroyCollection.test.ts",
"testToggleContractAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/toggleContractAllowList.test.ts",
"testAddToContractAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/addToContractAllowList.test.ts",
"testTransfer": "mocha --timeout 9999999 -r ts-node/register ./**/transfer.test.ts",
tests/src/createMultipleItemsEx.test.tsdiffbeforeafterboth--- a/tests/src/createMultipleItemsEx.test.ts
+++ b/tests/src/createMultipleItemsEx.test.ts
@@ -29,13 +29,10 @@
const data = [
{
owner: {substrate: alice.address},
- // constData: '0x0000',
}, {
owner: {substrate: bob.address},
- // constData: '0x2222',
}, {
owner: {substrate: charlie.address},
- // constData: '0x4444',
},
];
@@ -57,15 +54,12 @@
const data = [
{
owner: {substrate: alice.address},
- // constData: '0x1111',
properties: [{key: 'k', value: 'v1'}],
}, {
owner: {substrate: bob.address},
- // constData: '0x2222',
properties: [{key: 'k', value: 'v2'}],
}, {
owner: {substrate: charlie.address},
- // constData: '0x4444',
properties: [{key: 'k', value: 'v3'}],
},
];
@@ -88,15 +82,12 @@
const data = [
{
owner: {substrate: alice.address},
- // constData: '0x0000',
properties: [{key: 'k', value: 'v1'}],
}, {
owner: {substrate: bob.address},
- // constData: '0x2222',
properties: [{key: 'k', value: 'v2'}],
}, {
owner: {substrate: charlie.address},
- // constData: '0x4444',
properties: [{key: 'k', value: 'v3'}],
},
];
@@ -119,15 +110,12 @@
const data = [
{
owner: {substrate: alice.address},
- // constData: '0x0000',
properties: [{key: 'k', value: 'v1'}],
}, {
owner: {substrate: bob.address},
- // constData: '0x2222',
properties: [{key: 'k', value: 'v2'}],
}, {
owner: {substrate: charlie.address},
- // constData: '0x4444',
properties: [{key: 'k', value: 'v3'}],
},
];
@@ -272,13 +260,10 @@
const data = [
{
owner: {substrate: alice.address},
- // constData: '0x0000',
}, {
owner: {substrate: bob.address},
- // constData: '0x2222',
}, {
owner: {substrate: charlie.address},
- // constData: '0x4444',
},
];
@@ -300,13 +285,10 @@
const data = [
{
owner: {substrate: alice.address},
- // constData: '0x0000',
}, {
owner: {substrate: bob.address},
- // constData: '0x2222',
}, {
owner: {substrate: charlie.address},
- // constData: '0x4444',
},
];
tests/src/destroyCollection.test.tsdiffbeforeafterboth--- a/tests/src/destroyCollection.test.ts
+++ b/tests/src/destroyCollection.test.ts
@@ -25,6 +25,7 @@
setCollectionLimitsExpectSuccess,
addCollectionAdminExpectSuccess,
getCreatedCollectionCount,
+ createItemExpectSuccess,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -83,4 +84,10 @@
await destroyCollectionExpectFailure(collectionId, '//Alice');
});
+ it('fails when a collection still has a token', async () => {
+ const collectionId = await createCollectionExpectSuccess();
+ await createItemExpectSuccess(alice, collectionId, 'NFT');
+
+ await destroyCollectionExpectFailure(collectionId, '//Alice');
+ });
});
tests/src/nesting/migration-check.test.tsdiffbeforeafterboth--- a/tests/src/nesting/migration-check.test.ts
+++ b/tests/src/nesting/migration-check.test.ts
@@ -31,12 +31,12 @@
name: strToUTF16('Mojave Pictures'),
description: strToUTF16('$2.2 billion power plant!'),
tokenPrefix: '0x0002030',
- offchainSchema: '0x111111',
- schemaVersion: 'Unique',
+ //offchainSchema: '0x111111',
+ //schemaVersion: 'Unique',
limits: {
accountTokenOwnershipLimit: 3,
},
- constOnChainSchema: '0x333333',
+ //constOnChainSchema: '0x333333',
});
const events = await submitTransactionAsync(alice, tx);
const result = getCreateCollectionResult(events);
@@ -96,17 +96,17 @@
const collectionNew = (await api.query.common.collectionById(collectionId)).toJSON() as any;
// Make sure the extra fields are what they should be
- const constOnChainSchema = await api.query.common.collectionData(collectionId, 'ConstOnChainSchema');
- const offchainSchema = await api.query.common.collectionData(collectionId, 'OffchainSchema');
+ //const constOnChainSchema = await api.query.common.collectionData(collectionId, 'ConstOnChainSchema');
+ //const offchainSchema = await api.query.common.collectionData(collectionId, 'OffchainSchema');
- expect(constOnChainSchema.toHex()).to.be.deep.equal(collectionOld.constOnChainSchema);
- expect(offchainSchema.toHex()).to.be.deep.equal(collectionOld.offchainSchema);
+ //expect(constOnChainSchema.toHex()).to.be.deep.equal(collectionOld.constOnChainSchema);
+ //expect(offchainSchema.toHex()).to.be.deep.equal(collectionOld.offchainSchema);
expect(collectionNew).to.have.nested.property('limits.nestingRule');
// Get rid of extra fields to perform comparison on the rest of the collection
delete collectionNew.limits.nestingRule;
- delete collectionOld.constOnChainSchema;
- delete collectionOld.offchainSchema;
+ //delete collectionOld.constOnChainSchema;
+ //delete collectionOld.offchainSchema;
expect(collectionNew).to.be.deep.equal(collectionOld);
});
tests/src/nesting/nest.test.tsdiffbeforeafterboth1import {expect} from 'chai';2import {tokenIdToAddress} from '../eth/util/helpers';3import privateKey from '../substrate/privateKey';4import usingApi, {executeTransaction} from '../substrate/substrate-api';5import {6 addToAllowListExpectSuccess,7 createCollectionExpectSuccess,8 createItemExpectSuccess,9 enableAllowListExpectSuccess,10 enablePublicMintingExpectSuccess,11 getTokenOwner,12 getTopmostTokenOwner,13 setCollectionPermissionsExpectSuccess,14 transferExpectFailure,15 transferExpectSuccess,16 transferFromExpectSuccess,17} from '../util/helpers';18import {IKeyringPair} from '@polkadot/types/types';1920let alice: IKeyringPair;21let bob: IKeyringPair;2223describe('Integration Test: Nesting', () => {24 before(async () => {25 await usingApi(async () => {26 alice = privateKey('//Alice');27 bob = privateKey('//Bob');28 });29 });3031 it('Performs the full suite: bundles a token, transfers, and allows to unnest', async () => {32 await usingApi(async api => {33 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});34 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});35 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');3637 // Create a nested token38 const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});39 expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});40 expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});4142 // Create a token to be nested43 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');4445 // Nest46 await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});47 expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});48 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});4950 // Move bundle to different user51 await transferExpectSuccess(collection, targetToken, alice, {Substrate: bob.address});52 expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: bob.address});53 expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});5455 // Unnest56 await transferFromExpectSuccess(collection, newToken, bob, {Ethereum: tokenIdToAddress(collection, targetToken)}, {Substrate: bob.address});57 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: bob.address});58 });59 });6061 // ---------- Non-Fungible ----------6263 it('NFT: allows an Owner to nest/unnest their token', async () => {64 await usingApi(async api => {65 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});66 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});67 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');6869 // Create a nested token70 const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});71 expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});72 expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});7374 // Create a token to be nested and nest75 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');76 await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});77 expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});78 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});79 });80 });8182 it('NFT: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {83 await usingApi(async api => {84 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});85 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {OwnerRestricted:[collection]}});86 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');8788 // Create a nested token89 const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});90 expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});91 expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});9293 // Create a token to be nested and nest94 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');95 await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});96 expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});97 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});98 });99 });100101 // ---------- Fungible ----------102103 it('Fungible: allows an Owner to nest/unnest their token', async () => {104 await usingApi(async api => {105 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});106 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});107 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});108 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};109110 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});111112 // Create a nested token113 await expect(executeTransaction(api, alice, api.tx.unique.createItem(114 collectionFT,115 targetAddress,116 {Fungible: {Value: 10}},117 ))).to.not.be.rejected;118119 // Nest a new token120 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');121 await transferExpectSuccess(collectionFT, newToken, alice, targetAddress, 1, 'Fungible');122 });123 });124125 it('Fungible: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {126 await usingApi(async api => {127 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});128 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});129 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};130131 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});132133 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted: [collectionFT]}});134135 // Create a nested token136 await expect(executeTransaction(api, alice, api.tx.unique.createItem(137 collectionFT,138 targetAddress,139 {Fungible: {Value: 10}},140 ))).to.not.be.rejected;141142 // Nest a new token143 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');144 await transferExpectSuccess(collectionFT, newToken, alice, targetAddress, 1, 'Fungible');145 });146 });147148 // ---------- Re-Fungible ----------149150 it('ReFungible: allows an Owner to nest/unnest their token', async () => {151 await usingApi(async api => {152 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});153 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});154 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});155 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};156157 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});158159 // Create a nested token160 await expect(executeTransaction(api, alice, api.tx.unique.createItem(161 collectionRFT,162 targetAddress,163 {ReFungible: {const_data: [], pieces: 100}},164 ))).to.not.be.rejected;165166 // Nest a new token167 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');168 await transferExpectSuccess(collectionRFT, newToken, alice, targetAddress, 100, 'ReFungible');169 });170 });171172 it('ReFungible: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {173 await usingApi(async api => {174 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});175 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});176 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};177178 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});179180 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[collectionRFT]}});181182 // Create a nested token183 await expect(executeTransaction(api, alice, api.tx.unique.createItem(184 collectionRFT,185 targetAddress,186 {ReFungible: {const_data: [], pieces: 100}},187 ))).to.not.be.rejected;188189 // Nest a new token190 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');191 await transferExpectSuccess(collectionRFT, newToken, alice, targetAddress, 100, 'ReFungible');192 });193 });194});195196describe('Negative Test: Nesting', async() => {197 before(async () => {198 await usingApi(async () => {199 alice = privateKey('//Alice');200 bob = privateKey('//Bob');201 });202 });203204 it('Disallows excessive token nesting', async () => {205 await usingApi(async api => {206 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});207 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});208 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');209210 const maxNestingLevel = 5;211 let prevToken = targetToken;212213 // Create a nested-token matryoshka214 for (let i = 0; i < maxNestingLevel; i++) {215 const nestedToken = await createItemExpectSuccess(216 alice,217 collection,218 'NFT',219 {Ethereum: tokenIdToAddress(collection, prevToken)},220 );221222 prevToken = nestedToken;223 }224225 // The nesting depth is limited by `maxNestingLevel`226 await expect(executeTransaction(api, alice, api.tx.unique.createItem(227 collection,228 {Ethereum: tokenIdToAddress(collection, prevToken)},229 {nft: {const_data: [], variable_data: []}} as any,230 )), 'while creating nested token').to.be.rejectedWith(/^structure\.DepthLimit$/);231232 expect(await getTopmostTokenOwner(api, collection, prevToken)).to.be.deep.equal({Substrate: alice.address});233 });234 });235236 // ---------- Non-Fungible ----------237238 it('NFT: disallows to nest token if nesting is disabled', async () => {239 await usingApi(async api => {240 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});241 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Disabled'});242 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');243244 // Try to create a nested token245 await expect(executeTransaction(api, alice, api.tx.unique.createItem(246 collection,247 {Ethereum: tokenIdToAddress(collection, targetToken)},248 {nft: {const_data: [], variable_data: []}} as any,249 )), 'while creating nested token').to.be.rejectedWith(/^common\.NestingIsDisabled$/);250251 // Create a token to be nested252 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');253 // Try to nest254 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.NestingIsDisabled/);255 expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});256 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});257 });258 });259260 it('NFT: disallows a non-Owner to nest someone else\'s token', async () => {261 await usingApi(async api => {262 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});263 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: 'Owner'});264265 await addToAllowListExpectSuccess(alice, collection, bob.address);266 await enableAllowListExpectSuccess(alice, collection);267 await enablePublicMintingExpectSuccess(alice, collection);268269 // Create a token to attempt to be nested into270 const targetToken = await createItemExpectSuccess(bob, collection, 'NFT');271272 // Try to create a nested token in the wrong collection273 await expect(executeTransaction(api, alice, api.tx.unique.createItem(274 collection,275 {Ethereum: tokenIdToAddress(collection, targetToken)},276 {nft: {const_data: [], variable_data: []}} as any,277 )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);278279 // Try to create and nest a token in the wrong collection280 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');281 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.AddressNotInAllowlist/);282 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});283 });284 });285286 it('NFT: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {287 await usingApi(async api => {288 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});289 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {OwnerRestricted:[collection]}});290291 await addToAllowListExpectSuccess(alice, collection, bob.address);292 await enableAllowListExpectSuccess(alice, collection);293 await enablePublicMintingExpectSuccess(alice, collection);294295 // Create a token to attempt to be nested into296 const targetToken = await createItemExpectSuccess(bob, collection, 'NFT');297298 // Try to create a nested token in the wrong collection299 await expect(executeTransaction(api, alice, api.tx.unique.createItem(300 collection,301 {Ethereum: tokenIdToAddress(collection, targetToken)},302 {nft: {const_data: [], variable_data: []}} as any,303 )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);304305 // Try to create and nest a token in the wrong collection306 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');307 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.AddressNotInAllowlist/);308 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});309 });310 });311312 it('NFT: disallows to nest token in an unlisted collection', async () => {313 await usingApi(async api => {314 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});315 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {OwnerRestricted:[]}});316317 // Create a token to attempt to be nested into318 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');319320 // Try to create a nested token in the wrong collection321 await expect(executeTransaction(api, alice, api.tx.unique.createItem(322 collection,323 {Ethereum: tokenIdToAddress(collection, targetToken)},324 {nft: {const_data: [], variable_data: []}} as any,325 )), 'while creating nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);326327 // Try to create and nest a token in the wrong collection328 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');329 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);330 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});331 });332 });333334 // ---------- Fungible ----------335336 it('Fungible: disallows to nest token if nesting is disabled', async () => {337 await usingApi(async api => {338 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});339 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Disabled'});340 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');341 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};342343 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});344345 // Try to create a nested token346 await expect(executeTransaction(api, alice, api.tx.unique.createItem(347 collectionFT,348 targetAddress,349 {Fungible: {Value: 10}},350 )), 'while creating nested token').to.be.rejectedWith(/^common\.NestingIsDisabled$/);351352 // Create a token to be nested353 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');354 // Try to nest355 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.NestingIsDisabled/);356357 // Create another token to be nested358 const newToken2 = await createItemExpectSuccess(alice, collectionFT, 'Fungible');359 // Try to nest inside a fungible token360 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collectionFT, newToken)}, collectionFT, newToken2, 1)), 'while nesting new token inside fungible').to.be.rejectedWith(/fungible\.FungibleDisallowsNesting/);361 });362 });363364 it('Fungible: disallows a non-Owner to nest someone else\'s token', async () => {365 await usingApi(async api => {366 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});367 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});368369 await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);370 await enableAllowListExpectSuccess(alice, collectionNFT);371 await enablePublicMintingExpectSuccess(alice, collectionNFT);372373 // Create a token to attempt to be nested into374 const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');375 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};376377 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});378379 // Try to create a nested token in the wrong collection380 await expect(executeTransaction(api, alice, api.tx.unique.createItem(381 collectionFT,382 targetAddress,383 {Fungible: {Value: 10}},384 )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);385386 // Try to create and nest a token in the wrong collection387 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');388 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);389 });390 });391392 it('Fungible: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {393 await usingApi(async api => {394 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});395 await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);396 await enableAllowListExpectSuccess(alice, collectionNFT);397 await enablePublicMintingExpectSuccess(alice, collectionNFT);398399 // Create a token to attempt to be nested into400 const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');401 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};402403 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});404 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[collectionFT]}});405406 // Try to create a nested token in the wrong collection407 await expect(executeTransaction(api, alice, api.tx.unique.createItem(408 collectionFT,409 targetAddress,410 {Fungible: {Value: 10}},411 )), 'while creating nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);412413 // Try to create and nest a token in the wrong collection414 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');415 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);416 });417 });418419 it('Fungible: disallows to nest token in an unlisted collection', async () => {420 await usingApi(async api => {421 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});422 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[]}});423424 // Create a token to attempt to be nested into425 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');426 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};427428 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});429430 // Try to create a nested token in the wrong collection431 await expect(executeTransaction(api, alice, api.tx.unique.createItem(432 collectionFT,433 targetAddress,434 {Fungible: {Value: 10}},435 )), 'while creating a nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);436437 // Try to create and nest a token in the wrong collection438 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');439 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);440 });441 });442443 // ---------- Re-Fungible ----------444445 it('ReFungible: disallows to nest token if nesting is disabled', async () => {446 await usingApi(async api => {447 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});448 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Disabled'});449 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');450 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};451452 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});453454 // Create a nested token455 await expect(executeTransaction(api, alice, api.tx.unique.createItem(456 collectionRFT,457 targetAddress,458 {ReFungible: {const_data: [], pieces: 100}},459 )), 'while creating a nested token').to.be.rejectedWith(/^common\.NestingIsDisabled$/);460461 // Create a token to be nested462 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');463 // Try to nest464 await transferExpectFailure(collectionRFT, newToken, alice, targetAddress, 100);465 // Try to nest466 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.NestingIsDisabled/);467468 // Create another token to be nested469 const newToken2 = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');470 // Try to nest inside a fungible token471 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collectionRFT, newToken)}, collectionRFT, newToken2, 1)), 'while nesting new token inside refungible').to.be.rejectedWith(/refungible\.RefungibleDisallowsNesting/);472 });473 });474475 it('ReFungible: disallows a non-Owner to nest someone else\'s token', async () => {476 await usingApi(async api => {477 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});478 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: 'Owner'});479480 await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);481 await enableAllowListExpectSuccess(alice, collectionNFT);482 await enablePublicMintingExpectSuccess(alice, collectionNFT);483484 // Create a token to attempt to be nested into485 const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');486 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};487488 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});489490 // Try to create a nested token in the wrong collection491 await expect(executeTransaction(api, alice, api.tx.unique.createItem(492 collectionRFT,493 targetAddress,494 {ReFungible: {const_data: [], pieces: 100}},495 )), 'while creating a nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);496497 // Try to create and nest a token in the wrong collection498 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');499 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);500 });501 });502503 it('ReFungible: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {504 await usingApi(async api => {505 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});506 await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);507 await enableAllowListExpectSuccess(alice, collectionNFT);508 await enablePublicMintingExpectSuccess(alice, collectionNFT);509510 // Create a token to attempt to be nested into511 const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');512 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};513514 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});515 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[collectionRFT]}});516517 // Try to create a nested token in the wrong collection518 await expect(executeTransaction(api, alice, api.tx.unique.createItem(519 collectionRFT,520 targetAddress,521 {ReFungible: {const_data: [], pieces: 100}},522 )), 'while creating a nested token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);523524 // Try to create and nest a token in the wrong collection525 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');526 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.OnlyOwnerAllowedToNest/);527 });528 });529530 it('ReFungible: disallows to nest token to an unlisted collection', async () => {531 await usingApi(async api => {532 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});533 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {OwnerRestricted:[]}});534535 // Create a token to attempt to be nested into536 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');537 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};538539 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});540541 // Try to create a nested token in the wrong collection542 await expect(executeTransaction(api, alice, api.tx.unique.createItem(543 collectionRFT,544 targetAddress,545 {ReFungible: {const_data: [], pieces: 100}},546 )), 'while creating a nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);547548 // Try to create and nest a token in the wrong collection549 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');550 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);551 });552 });553});tests/src/setChainLimits.test.tsdiffbeforeafterboth--- a/tests/src/setChainLimits.test.ts
+++ b/tests/src/setChainLimits.test.ts
@@ -43,8 +43,6 @@
nftSponsorTransferTimeout: 1,
fungibleSponsorTransferTimeout: 1,
refungibleSponsorTransferTimeout: 1,
- offchainSchemaLimit: 1,
- constOnChainSchemaLimit: 1,
};
});
});
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -135,8 +135,8 @@
nftSponsorTransferTimeout: number;
fungibleSponsorTransferTimeout: number;
refungibleSponsorTransferTimeout: number;
- offchainSchemaLimit: number;
- constOnChainSchemaLimit: number;
+ //offchainSchemaLimit: number;
+ //constOnChainSchemaLimit: number;
}
export interface IReFungibleTokenDataType {
@@ -310,7 +310,6 @@
name: string,
description: string,
tokenPrefix: string,
- schemaVersion: string,
properties?: Array<Property>,
propPerm?: Array<PropertyPermission>
};
@@ -320,7 +319,6 @@
mode: {type: 'NFT'},
name: 'name',
tokenPrefix: 'prefix',
- schemaVersion: 'ImageURL',
};
export async function createCollectionExpectSuccess(params: Partial<CreateCollectionParams> = {}): Promise<number> {
@@ -780,25 +778,8 @@
const result = getGenericResult(events);
expect(result.success).to.be.false;
- });
-}
-
-/*export async function setOffchainSchemaExpectSuccess(sender: IKeyringPair, collectionId: number, data: number[]) {
- await usingApi(async (api) => {
- const tx = api.tx.unique.setOffchainSchema(collectionId, '0x' + Buffer.from(data).toString('hex'));
- const events = await submitTransactionAsync(sender, tx);
- const result = getGenericResult(events);
-
- expect(result.success).to.be.true;
});
}
-
-export async function setOffchainSchemaExpectFailure(sender: IKeyringPair, collectionId: number, data: number[]) {
- await usingApi(async (api) => {
- const tx = api.tx.unique.setOffchainSchema(collectionId, '0x' + Buffer.from(data).toString('hex'));
- await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
- });
-}*/
export interface CreateFungibleData {
readonly Value: bigint;
@@ -1110,13 +1091,6 @@
): Promise<string[]> {
return (await api.rpc.unique.adminlist(collectionId)).toHuman() as any;
}
-/*export async function getConstMetadata(
- api: ApiPromise,
- collectionId: number,
- tokenId: number,
-): Promise<number[]> {
- return [...(await api.rpc.unique.constMetadata(collectionId, tokenId))];
-}*/
export async function getTokenProperties(
api: ApiPromise,
collectionId: number,