git.delta.rocks / unique-network / refs/commits / 2be6b4ddbf24

difftreelog

test ownerCanTransfer allows only transferFrom/burnFrom

Daniel Shiposha2022-06-29parent: #6ed42b0.patch.diff
in: master

3 files changed

modifiedtests/package.jsondiffbeforeafterboth
before · tests/package.json
1{2  "name": "unique-tests",3  "version": "1.0.0",4  "description": "Unique Chain Tests",5  "main": "",6  "devDependencies": {7    "@polkadot/ts": "0.4.22",8    "@polkadot/typegen": "8.7.2-15",9    "@types/chai": "^4.3.1",10    "@types/chai-as-promised": "^7.1.5",11    "@types/mocha": "^9.1.1",12    "@types/node": "^17.0.35",13    "@typescript-eslint/eslint-plugin": "^5.26.0",14    "@typescript-eslint/parser": "^5.26.0",15    "chai": "^4.3.6",16    "eslint": "^8.16.0",17    "mocha": "^10.0.0",18    "ts-node": "^10.8.0",19    "typescript": "^4.7.2"20  },21  "mocha": {22    "timeout": 9999999,23    "require": "ts-node/register"24  },25  "scripts": {26    "lint": "eslint --ext .ts,.js src/",27    "fix": "eslint --ext .ts,.js src/ --fix",28    "test": "mocha --timeout 9999999 -r ts-node/register './src/**/*.test.ts'",29    "testEth": "mocha --timeout 9999999 -r ts-node/register './**/eth/**/*.test.ts'",30    "testEthMarketplace": "mocha --timeout 9999999 -r ts-node/register './**/eth/marketplace/**/*.test.ts'",31    "testEthNesting": "mocha --timeout 9999999 -r ts-node/register './**/eth/nesting/**/*.test.ts'",32    "load": "mocha --timeout 9999999 -r ts-node/register './**/*.load.ts'",33    "loadTransfer": "ts-node src/transfer.nload.ts",34    "testCollision": "mocha --timeout 9999999 -r ts-node/register ./src/collision-tests/*.test.ts",35    "testEvent": "mocha --timeout 9999999 -r ts-node/register ./src/check-event/*.test.ts",36    "testNesting": "mocha --timeout 9999999 -r ts-node/register ./**/nest.test.ts",37    "testUnnesting": "mocha --timeout 9999999 -r ts-node/register ./**/unnest.test.ts",38    "testStructure": "mocha --timeout 9999999 -r ts-node/register ./**/nesting/**.test.ts",39    "testProperties": "mocha --timeout 9999999 -r ts-node/register ./**/properties.test.ts",40    "testMigration": "mocha --timeout 9999999 -r ts-node/register ./**/nesting/migration-check.test.ts",41    "testRmrk": "mocha --timeout 9999999 -r ts-node/register ./**/rmrk/**.test.ts",42    "testAddCollectionAdmin": "mocha --timeout 9999999 -r ts-node/register ./**/addCollectionAdmin.test.ts",43    "testSetSchemaVersion": "mocha --timeout 9999999 -r ts-node/register ./**/setSchemaVersion.test.ts",44    "testSetCollectionLimits": "mocha --timeout 9999999 -r ts-node/register ./**/setCollectionLimits.test.ts",45    "testSetCollectionSponsor": "mocha --timeout 9999999 -r ts-node/register ./**/setCollectionSponsor.test.ts",46    "testConfirmSponsorship": "mocha --timeout 9999999 -r ts-node/register ./**/confirmSponsorship.test.ts",47    "testRemoveCollectionAdmin": "mocha --timeout 9999999 -r ts-node/register ./**/removeCollectionAdmin.test.ts",48    "testRemoveCollectionSponsor": "mocha --timeout 9999999 -r ts-node/register ./**/removeCollectionSponsor.test.ts",49    "testRemoveFromAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/removeFromAllowList.test.ts",50    "testConnection": "mocha --timeout 9999999 -r ts-node/register ./**/connection.test.ts",51    "testContracts": "mocha --timeout 9999999 -r ts-node/register ./**/contracts.test.ts",52    "testCreateItem": "mocha --timeout 9999999 -r ts-node/register ./**/createItem.test.ts",53    "testCreateMultipleItems": "mocha --timeout 9999999 -r ts-node/register ./**/createMultipleItems.test.ts",54    "testCreateMultipleItemsEx": "mocha --timeout 9999999 -r ts-node/register ./**/createMultipleItemsEx.test.ts",55    "testApprove": "mocha --timeout 9999999 -r ts-node/register ./**/approve.test.ts",56    "testTransferFrom": "mocha --timeout 9999999 -r ts-node/register ./**/transferFrom.test.ts",57    "testCreateCollection": "mocha --timeout 9999999 -r ts-node/register ./**/createCollection.test.ts",58    "testDestroyCollection": "mocha --timeout 9999999 -r ts-node/register ./**/destroyCollection.test.ts",59    "testToggleContractAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/toggleContractAllowList.test.ts",60    "testAddToContractAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/addToContractAllowList.test.ts",61    "testTransfer": "mocha --timeout 9999999 -r ts-node/register ./**/transfer.test.ts",62    "testBurnItem": "mocha --timeout 9999999 -r ts-node/register ./**/burnItem.test.ts",63    "testSetMintPermission": "mocha --timeout 9999999 -r ts-node/register ./**/setMintPermission.test.ts",64    "testCreditFeesToTreasury": "mocha --timeout 9999999 -r ts-node/register ./**/creditFeesToTreasury.test.ts",65    "testContractSponsoring": "mocha --timeout 9999999 -r ts-node/register ./**/contractSponsoring.test.ts",66    "testEnableContractSponsoring": "mocha --timeout 9999999 -r ts-node/register ./**/enableContractSponsoring.test.ts",67    "testRemoveFromContractAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/removeFromContractAllowList.test.ts",68    "testSetContractSponsoringRateLimit": "mocha --timeout 9999999 -r ts-node/register ./**/setContractSponsoringRateLimit.test.ts",69    "testSetOffchainSchema": "mocha --timeout 9999999 -r ts-node/register ./**/setOffchainSchema.test.ts",70    "testOverflow": "mocha --timeout 9999999 -r ts-node/register ./**/overflow.test.ts",71    "testSetVariableMetadataSponsoringRateLimit": "mocha --timeout 9999999 -r ts-node/register ./**/setVariableMetadataSponsoringRateLimit.test.ts",72    "testInflation": "mocha --timeout 9999999 -r ts-node/register ./**/inflation.test.ts",73    "testScheduler": "mocha --timeout 9999999 -r ts-node/register ./**/scheduler.test.ts",74    "testSchedulingEVM": "mocha --timeout 9999999 -r ts-node/register ./**/eth/scheduling.test.ts",75    "testXcmTransfer": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransfer.test.ts",76    "testPalletPresence": "mocha --timeout 9999999 -r ts-node/register ./**/pallet-presence.test.ts",77    "testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",78    "testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts",79    "testLimits": "mocha --timeout 9999999 -r ts-node/register ./**/limits.test.ts",80    "testEthCreateCollection": "mocha --timeout 9999999 -r ts-node/register ./**/eth/createCollection.test.ts",81    "testRFT": "mocha --timeout 9999999 -r ts-node/register ./**/refungible.test.ts",82    "polkadot-types-fetch-metadata": "curl -H 'Content-Type: application/json' -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9933 > src/interfaces/metadata.json",83    "polkadot-types-from-defs": "ts-node ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",84    "polkadot-types-from-chain": "ts-node ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",85    "polkadot-types": "echo \"export default {}\" > src/interfaces/lookup.ts && yarn polkadot-types-fetch-metadata && yarn polkadot-types-from-defs && yarn polkadot-types-from-defs && yarn polkadot-types-from-chain"86  },87  "author": "",88  "license": "SEE LICENSE IN ../LICENSE",89  "homepage": "",90  "dependencies": {91    "@polkadot/api": "8.7.2-15",92    "@polkadot/api-contract": "8.7.2-15",93    "@polkadot/util-crypto": "9.4.1",94    "bignumber.js": "^9.0.2",95    "chai-as-promised": "^7.1.1",96    "find-process": "^1.4.7",97    "solc": "0.8.14-fixed",98    "web3": "^1.7.3"99  },100  "standard": {101    "globals": [102      "it",103      "assert",104      "beforeEach",105      "afterEach",106      "describe",107      "contract",108      "artifacts"109    ]110  },111  "resolutions": {112    "simple-get": "^4.0.1"113  }114}
after · tests/package.json
1{2  "name": "unique-tests",3  "version": "1.0.0",4  "description": "Unique Chain Tests",5  "main": "",6  "devDependencies": {7    "@polkadot/ts": "0.4.22",8    "@polkadot/typegen": "8.7.2-15",9    "@types/chai": "^4.3.1",10    "@types/chai-as-promised": "^7.1.5",11    "@types/mocha": "^9.1.1",12    "@types/node": "^17.0.35",13    "@typescript-eslint/eslint-plugin": "^5.26.0",14    "@typescript-eslint/parser": "^5.26.0",15    "chai": "^4.3.6",16    "eslint": "^8.16.0",17    "mocha": "^10.0.0",18    "ts-node": "^10.8.0",19    "typescript": "^4.7.2"20  },21  "mocha": {22    "timeout": 9999999,23    "require": "ts-node/register"24  },25  "scripts": {26    "lint": "eslint --ext .ts,.js src/",27    "fix": "eslint --ext .ts,.js src/ --fix",28    "test": "mocha --timeout 9999999 -r ts-node/register './src/**/*.test.ts'",29    "testEth": "mocha --timeout 9999999 -r ts-node/register './**/eth/**/*.test.ts'",30    "testEthMarketplace": "mocha --timeout 9999999 -r ts-node/register './**/eth/marketplace/**/*.test.ts'",31    "testEthNesting": "mocha --timeout 9999999 -r ts-node/register './**/eth/nesting/**/*.test.ts'",32    "load": "mocha --timeout 9999999 -r ts-node/register './**/*.load.ts'",33    "loadTransfer": "ts-node src/transfer.nload.ts",34    "testCollision": "mocha --timeout 9999999 -r ts-node/register ./src/collision-tests/*.test.ts",35    "testEvent": "mocha --timeout 9999999 -r ts-node/register ./src/check-event/*.test.ts",36    "testNesting": "mocha --timeout 9999999 -r ts-node/register ./**/nest.test.ts",37    "testUnnesting": "mocha --timeout 9999999 -r ts-node/register ./**/unnest.test.ts",38    "testStructure": "mocha --timeout 9999999 -r ts-node/register ./**/nesting/**.test.ts",39    "testProperties": "mocha --timeout 9999999 -r ts-node/register ./**/properties.test.ts",40    "testMigration": "mocha --timeout 9999999 -r ts-node/register ./**/nesting/migration-check.test.ts",41    "testRmrk": "mocha --timeout 9999999 -r ts-node/register ./**/rmrk/**.test.ts",42    "testAddCollectionAdmin": "mocha --timeout 9999999 -r ts-node/register ./**/addCollectionAdmin.test.ts",43    "testSetSchemaVersion": "mocha --timeout 9999999 -r ts-node/register ./**/setSchemaVersion.test.ts",44    "testSetCollectionLimits": "mocha --timeout 9999999 -r ts-node/register ./**/setCollectionLimits.test.ts",45    "testSetCollectionSponsor": "mocha --timeout 9999999 -r ts-node/register ./**/setCollectionSponsor.test.ts",46    "testConfirmSponsorship": "mocha --timeout 9999999 -r ts-node/register ./**/confirmSponsorship.test.ts",47    "testRemoveCollectionAdmin": "mocha --timeout 9999999 -r ts-node/register ./**/removeCollectionAdmin.test.ts",48    "testRemoveCollectionSponsor": "mocha --timeout 9999999 -r ts-node/register ./**/removeCollectionSponsor.test.ts",49    "testRemoveFromAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/removeFromAllowList.test.ts",50    "testConnection": "mocha --timeout 9999999 -r ts-node/register ./**/connection.test.ts",51    "testContracts": "mocha --timeout 9999999 -r ts-node/register ./**/contracts.test.ts",52    "testCreateItem": "mocha --timeout 9999999 -r ts-node/register ./**/createItem.test.ts",53    "testCreateMultipleItems": "mocha --timeout 9999999 -r ts-node/register ./**/createMultipleItems.test.ts",54    "testCreateMultipleItemsEx": "mocha --timeout 9999999 -r ts-node/register ./**/createMultipleItemsEx.test.ts",55    "testApprove": "mocha --timeout 9999999 -r ts-node/register ./**/approve.test.ts",56    "testTransferFrom": "mocha --timeout 9999999 -r ts-node/register ./**/transferFrom.test.ts",57    "testCreateCollection": "mocha --timeout 9999999 -r ts-node/register ./**/createCollection.test.ts",58    "testDestroyCollection": "mocha --timeout 9999999 -r ts-node/register ./**/destroyCollection.test.ts",59    "testToggleContractAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/toggleContractAllowList.test.ts",60    "testAddToContractAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/addToContractAllowList.test.ts",61    "testTransfer": "mocha --timeout 9999999 -r ts-node/register ./**/transfer.test.ts",62    "testBurnItem": "mocha --timeout 9999999 -r ts-node/register ./**/burnItem.test.ts",63    "testAdminTransferAndBurn": "mocha --timeout 9999999 -r ts-node/register ./**/adminTransferAndBurn.test.ts",64    "testSetMintPermission": "mocha --timeout 9999999 -r ts-node/register ./**/setMintPermission.test.ts",65    "testCreditFeesToTreasury": "mocha --timeout 9999999 -r ts-node/register ./**/creditFeesToTreasury.test.ts",66    "testContractSponsoring": "mocha --timeout 9999999 -r ts-node/register ./**/contractSponsoring.test.ts",67    "testEnableContractSponsoring": "mocha --timeout 9999999 -r ts-node/register ./**/enableContractSponsoring.test.ts",68    "testRemoveFromContractAllowList": "mocha --timeout 9999999 -r ts-node/register ./**/removeFromContractAllowList.test.ts",69    "testSetContractSponsoringRateLimit": "mocha --timeout 9999999 -r ts-node/register ./**/setContractSponsoringRateLimit.test.ts",70    "testSetOffchainSchema": "mocha --timeout 9999999 -r ts-node/register ./**/setOffchainSchema.test.ts",71    "testOverflow": "mocha --timeout 9999999 -r ts-node/register ./**/overflow.test.ts",72    "testSetVariableMetadataSponsoringRateLimit": "mocha --timeout 9999999 -r ts-node/register ./**/setVariableMetadataSponsoringRateLimit.test.ts",73    "testInflation": "mocha --timeout 9999999 -r ts-node/register ./**/inflation.test.ts",74    "testScheduler": "mocha --timeout 9999999 -r ts-node/register ./**/scheduler.test.ts",75    "testSchedulingEVM": "mocha --timeout 9999999 -r ts-node/register ./**/eth/scheduling.test.ts",76    "testXcmTransfer": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransfer.test.ts",77    "testPalletPresence": "mocha --timeout 9999999 -r ts-node/register ./**/pallet-presence.test.ts",78    "testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",79    "testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts",80    "testLimits": "mocha --timeout 9999999 -r ts-node/register ./**/limits.test.ts",81    "testEthCreateCollection": "mocha --timeout 9999999 -r ts-node/register ./**/eth/createCollection.test.ts",82    "testRFT": "mocha --timeout 9999999 -r ts-node/register ./**/refungible.test.ts",83    "polkadot-types-fetch-metadata": "curl -H 'Content-Type: application/json' -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9933 > src/interfaces/metadata.json",84    "polkadot-types-from-defs": "ts-node ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",85    "polkadot-types-from-chain": "ts-node ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",86    "polkadot-types": "echo \"export default {}\" > src/interfaces/lookup.ts && yarn polkadot-types-fetch-metadata && yarn polkadot-types-from-defs && yarn polkadot-types-from-defs && yarn polkadot-types-from-chain"87  },88  "author": "",89  "license": "SEE LICENSE IN ../LICENSE",90  "homepage": "",91  "dependencies": {92    "@polkadot/api": "8.7.2-15",93    "@polkadot/api-contract": "8.7.2-15",94    "@polkadot/util-crypto": "9.4.1",95    "bignumber.js": "^9.0.2",96    "chai-as-promised": "^7.1.1",97    "find-process": "^1.4.7",98    "solc": "0.8.14-fixed",99    "web3": "^1.7.3"100  },101  "standard": {102    "globals": [103      "it",104      "assert",105      "beforeEach",106      "afterEach",107      "describe",108      "contract",109      "artifacts"110    ]111  },112  "resolutions": {113    "simple-get": "^4.0.1"114  }115}
addedtests/src/adminTransferAndBurn.test.tsdiffbeforeafterboth
--- /dev/null
+++ b/tests/src/adminTransferAndBurn.test.ts
@@ -0,0 +1,72 @@
+// Copyright 2019-2022 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 <http://www.gnu.org/licenses/>.
+
+import {IKeyringPair} from '@polkadot/types/types';
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import {default as usingApi} from './substrate/substrate-api';
+import {
+  createCollectionExpectSuccess,
+  createItemExpectSuccess,
+  transferExpectFailure,
+  transferFromExpectSuccess,
+  burnItemExpectFailure,
+  burnFromExpectSuccess,
+  setCollectionLimitsExpectSuccess,
+} from './util/helpers';
+
+chai.use(chaiAsPromised);
+const expect = chai.expect;
+
+describe('Integration Test: ownerCanTransfer allows admins to use only transferFrom/burnFrom:', () => {
+  let alice: IKeyringPair;
+  let bob: IKeyringPair;
+  let charlie: IKeyringPair;
+
+  before(async () => {
+    await usingApi(async (api, privateKeyWrapper) => {
+      alice = privateKeyWrapper('//Alice');
+      bob = privateKeyWrapper('//Bob');
+      charlie = privateKeyWrapper('//Charlie');
+    });
+  });
+
+  it('admin transfers other user\'s token', async () => {
+    await usingApi(async () => {
+      const collectionId = await createCollectionExpectSuccess();
+      await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
+
+      const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', {Substrate: bob.address});
+
+      await transferExpectFailure(collectionId, tokenId, alice, charlie);
+
+      await transferFromExpectSuccess(collectionId, tokenId, alice, bob, charlie, 1);
+    });
+  });
+
+  it('admin burns other user\'s token', async () => {
+    await usingApi(async () => {
+      const collectionId = await createCollectionExpectSuccess();
+      await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
+
+      const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', {Substrate: bob.address});
+
+      await burnItemExpectFailure(alice, collectionId, tokenId);
+
+      await burnFromExpectSuccess(alice, bob, collectionId, tokenId);
+    });
+  });
+})
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -830,6 +830,25 @@
   });
 }
 
+export async function burnItemExpectFailure(sender: IKeyringPair, collectionId: number, tokenId: number, value: number | bigint = 1) {
+  await usingApi(async (api) => {
+    const tx = api.tx.unique.burnItem(collectionId, tokenId, value);
+
+    const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
+    const result = getCreateCollectionResult(events);
+    // tslint:disable-next-line:no-unused-expression
+    expect(result.success).to.be.false;
+  });
+}
+
+export async function burnFromExpectSuccess(sender: IKeyringPair, from: IKeyringPair | CrossAccountId, collectionId: number, tokenId: number, value: number | bigint = 1) {
+  await usingApi(async (api) => {
+    const tx = api.tx.unique.burnFrom(collectionId, normalizeAccountId(from), tokenId, value);
+    const events = await submitTransactionAsync(sender, tx);
+    return getGenericResult(events).success;
+  });
+}
+
 export async function
 approve(
   api: ApiPromise,