git.delta.rocks / unique-network / refs/commits / 07649f272b8b

difftreelog

Merge pull request #125 from usetech-llc/fix/NFTPAR-367_createMultipleItems_overflow_checks

usetech-llc2021-03-14parents: #447a9ec #a5cb42a.patch.diff
in: master
Fix bulk mint exceeds collection token limit

2 files changed

modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -967,7 +967,7 @@
 
             let target_collection = <Collection<T>>::get(collection_id);
 
-            Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner)?;
+            Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner, 1)?;
             Self::validate_create_item_args(&target_collection, &data)?;
             Self::create_item_no_validation(collection_id, owner, data)?;
 
@@ -1003,7 +1003,7 @@
             Self::collection_exists(collection_id)?;
             let target_collection = <Collection<T>>::get(collection_id);
 
-            Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner)?;
+            Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner, items_data.len() as u32)?;
 
             for data in &items_data {
                 Self::validate_create_item_args(&target_collection, data)?;
@@ -1638,13 +1638,17 @@
         Ok(())
     }
 
-    fn can_create_items_in_collection(collection_id: CollectionId, collection: &CollectionType<T::AccountId>, sender: &T::AccountId, owner: &T::AccountId) -> DispatchResult {
+    fn can_create_items_in_collection(collection_id: CollectionId, collection: &CollectionType<T::AccountId>, sender: &T::AccountId, owner: &T::AccountId, amount: u32) -> DispatchResult {
 
         // check token limit and account token limit
-        let total_items: u32 = ItemListIndex::get(collection_id);
-        let account_items: u32 = <AddressTokens<T>>::get(collection_id, owner).len() as u32;
-        ensure!(collection.limits.token_limit > total_items,  Error::<T>::CollectionTokenLimitExceeded);
-        ensure!(collection.limits.account_token_ownership_limit > account_items,  Error::<T>::AccountTokenLimitExceeded);
+        let total_items: u32 = ItemListIndex::get(collection_id)
+            .checked_add(amount)
+            .ok_or(Error::<T>::CollectionTokenLimitExceeded)?;
+        let account_items: u32 = (<AddressTokens<T>>::get(collection_id, owner).len() as u32)
+            .checked_add(amount)
+            .ok_or(Error::<T>::AccountTokenLimitExceeded)?;
+        ensure!(collection.limits.token_limit >= total_items,  Error::<T>::CollectionTokenLimitExceeded);
+        ensure!(collection.limits.account_token_ownership_limit >= account_items,  Error::<T>::AccountTokenLimitExceeded);
 
         if !Self::is_owner_or_admin_permissions(collection_id, sender.clone()) {
             ensure!(collection.mint_mode == true, Error::<T>::PublicMintingNotAllowed);
modifiedtests/src/createMultipleItems.test.tsdiffbeforeafterboth
before · tests/src/createMultipleItems.test.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//5import { ApiPromise } from '@polkadot/api';6import BN from 'bn.js';7import chai from 'chai';8import chaiAsPromised from 'chai-as-promised';9import privateKey from './substrate/privateKey';10import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from './substrate/substrate-api';11import {12  createCollectionExpectSuccess,13  destroyCollectionExpectSuccess,14  IReFungibleTokenDataType,15} from './util/helpers';1617chai.use(chaiAsPromised);18const expect = chai.expect;1920interface ITokenDataType {21  Owner: number[];22  ConstData: number[];23  VariableData: number[];24}2526describe('Integration Test createMultipleItems(collection_id, owner, items_data):', () => {27  it('Create  0x31, 0x32, 0x33 items in active NFT collection and verify tokens data in chain', async () => {28    await usingApi(async (api: ApiPromise) => {29      const collectionId = await createCollectionExpectSuccess();30      const itemsListIndexBefore = await api.query.nft.itemListIndex(collectionId) as unknown as BN;31      expect(itemsListIndexBefore.toNumber()).to.be.equal(0);32      const Alice = privateKey('//Alice');33      const args = [{ nft: ['0x31', '0x31'] }, { nft: ['0x32', '0x32'] }, { nft: ['0x33', '0x33'] }];34      const createMultipleItemsTx = await api.tx.nft35        .createMultipleItems(collectionId, Alice.address, args);36      await submitTransactionAsync(Alice, createMultipleItemsTx);37      const itemsListIndexAfter = await api.query.nft.itemListIndex(collectionId) as unknown as BN;38      expect(itemsListIndexAfter.toNumber()).to.be.equal(3);39      const token1Data = await api.query.nft.nftItemList(collectionId, 1) as unknown as ITokenDataType;40      const token2Data = await api.query.nft.nftItemList(collectionId, 2) as unknown as ITokenDataType;41      const token3Data = await api.query.nft.nftItemList(collectionId, 3) as unknown as ITokenDataType;4243      expect(token1Data.Owner.toString()).to.be.equal(Alice.address);44      expect(token2Data.Owner.toString()).to.be.equal(Alice.address);45      expect(token3Data.Owner.toString()).to.be.equal(Alice.address);4647      expect(token1Data.ConstData.toString()).to.be.equal('0x31');48      expect(token2Data.ConstData.toString()).to.be.equal('0x32');49      expect(token3Data.ConstData.toString()).to.be.equal('0x33');5051      expect(token1Data.VariableData.toString()).to.be.equal('0x31');52      expect(token2Data.VariableData.toString()).to.be.equal('0x32');53      expect(token3Data.VariableData.toString()).to.be.equal('0x33');54    });55  });5657  it('Create  0x31, 0x32, 0x33 items in active ReFungible collection and verify tokens data in chain', async () => {58    await usingApi(async (api: ApiPromise) => {59      const collectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});60      const itemsListIndexBefore = await api.query.nft.itemListIndex(collectionId) as unknown as BN;61      expect(itemsListIndexBefore.toNumber()).to.be.equal(0);62      const Alice = privateKey('//Alice');63      const args = [64        {refungible: {const_data: [0x31], variable_data: [0x31], pieces: 1}},65        {refungible: {const_data: [0x32], variable_data: [0x32], pieces: 1}},66        {refungible: {const_data: [0x33], variable_data: [0x33], pieces: 1}},67      ];68      const createMultipleItemsTx = await api.tx.nft69        .createMultipleItems(collectionId, Alice.address, args);70      await submitTransactionAsync(Alice, createMultipleItemsTx);71      const itemsListIndexAfter = await api.query.nft.itemListIndex(collectionId) as unknown as BN;72      expect(itemsListIndexAfter.toNumber()).to.be.equal(3);73      const token1Data = await api.query.nft.reFungibleItemList(collectionId, 1) as unknown as IReFungibleTokenDataType;74      const token2Data = await api.query.nft.reFungibleItemList(collectionId, 2) as unknown as IReFungibleTokenDataType;75      const token3Data = await api.query.nft.reFungibleItemList(collectionId, 3) as unknown as IReFungibleTokenDataType;7677      expect(token1Data.Owner[0].Owner.toString()).to.be.equal(Alice.address);78      expect(token1Data.Owner[0].Fraction.toNumber()).to.be.equal(1);7980      expect(token2Data.Owner[0].Owner.toString()).to.be.equal(Alice.address);81      expect(token2Data.Owner[0].Fraction.toNumber()).to.be.equal(1);8283      expect(token3Data.Owner[0].Owner.toString()).to.be.equal(Alice.address);84      expect(token3Data.Owner[0].Fraction.toNumber()).to.be.equal(1);8586      expect(token1Data.ConstData.toString()).to.be.equal('0x31');87      expect(token2Data.ConstData.toString()).to.be.equal('0x32');88      expect(token3Data.ConstData.toString()).to.be.equal('0x33');8990      expect(token1Data.VariableData.toString()).to.be.equal('0x31');91      expect(token2Data.VariableData.toString()).to.be.equal('0x32');92      expect(token3Data.VariableData.toString()).to.be.equal('0x33');93    });94  });95});9697describe('Negative Integration Test createMultipleItems(collection_id, owner, items_data):', () => {98  it('Create token with not existing type', async () => {99    await usingApi(async (api: ApiPromise) => {100      const collectionId = await createCollectionExpectSuccess();101      const Alice = privateKey('//Alice');102      try {103        const args = [{ invalid: null }, { invalid: null }, { invalid: null }];104        const createMultipleItemsTx = await api.tx.nft105          .createMultipleItems(collectionId, Alice.address, args);106        await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;107      } catch (e) {108        // tslint:disable-next-line:no-unused-expression109        expect(e).to.be.exist;110      }111    });112  });113114  it('Create token in not existing collection', async () => {115    await usingApi(async (api: ApiPromise) => {116      const collectionId = parseInt((await api.query.nft.createdCollectionCount()).toString()) + 1;117      const Alice = privateKey('//Alice');118      const createMultipleItemsTx = await api.tx.nft119        .createMultipleItems(collectionId, Alice.address, ['NFT', 'NFT', 'NFT']);120      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;121    });122  });123124  it('Create NFT and Re-fungible tokens that has reached the maximum data limit', async () => {125    await usingApi(async (api: ApiPromise) => {126      // NFT127      const collectionId = await createCollectionExpectSuccess();128      const Alice = privateKey('//Alice');129      const args = [130        { nft: ['A'.repeat(2049), 'A'.repeat(2049)] },131        { nft: ['B'.repeat(2049), 'B'.repeat(2049)] },132        { nft: ['C'.repeat(2049), 'C'.repeat(2049)] },133      ];134      const createMultipleItemsTx = await api.tx.nft135        .createMultipleItems(collectionId, Alice.address, args);136      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;137138      // ReFungible139      const collectionIdReFungible =140        await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});141      const argsReFungible = [142        { ReFungible: ['1'.repeat(2049), '1'.repeat(2049)] },143        { ReFungible: ['2'.repeat(2049), '2'.repeat(2049)] },144        { ReFungible: ['3'.repeat(2049), '3'.repeat(2049)] },145      ];146      const createMultipleItemsTxFungible = await api.tx.nft147        .createMultipleItems(collectionIdReFungible, Alice.address, argsReFungible);148      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTxFungible)).to.be.rejected;149    });150  });151152  it('Create tokens with different types', async () => {153    await usingApi(async (api: ApiPromise) => {154      const collectionId = await createCollectionExpectSuccess();155      const Alice = privateKey('//Alice');156      const createMultipleItemsTx = await api.tx.nft157        .createMultipleItems(collectionId, Alice.address, ['NFT', 'Fungible', 'ReFungible']);158      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;159      // garbage collection :-D160      await destroyCollectionExpectSuccess(collectionId);161    });162  });163164  it('Create tokens with different data limits <> maximum data limit', async () => {165    await usingApi(async (api: ApiPromise) => {166      const collectionId = await createCollectionExpectSuccess();167      const Alice = privateKey('//Alice');168      const args = [169        { nft: ['A', 'A'] },170        { nft: ['B', 'B'.repeat(2049)] },171        { nft: ['C'.repeat(2049), 'C'] },172      ];173      const createMultipleItemsTx = await api.tx.nft174        .createMultipleItems(collectionId, Alice.address, args);175      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;176    });177  });178});
after · tests/src/createMultipleItems.test.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//5import { ApiPromise } from '@polkadot/api';6import BN from 'bn.js';7import chai from 'chai';8import chaiAsPromised from 'chai-as-promised';9import privateKey from './substrate/privateKey';10import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from './substrate/substrate-api';11import {12  createCollectionExpectSuccess,13  destroyCollectionExpectSuccess,14  getGenericResult,15  IReFungibleTokenDataType,16  setCollectionLimitsExpectSuccess,17} from './util/helpers';1819chai.use(chaiAsPromised);20const expect = chai.expect;2122interface ITokenDataType {23  Owner: number[];24  ConstData: number[];25  VariableData: number[];26}2728describe('Integration Test createMultipleItems(collection_id, owner, items_data):', () => {29  it('Create  0x31, 0x32, 0x33 items in active NFT collection and verify tokens data in chain', async () => {30    await usingApi(async (api: ApiPromise) => {31      const collectionId = await createCollectionExpectSuccess();32      const itemsListIndexBefore = await api.query.nft.itemListIndex(collectionId) as unknown as BN;33      expect(itemsListIndexBefore.toNumber()).to.be.equal(0);34      const Alice = privateKey('//Alice');35      const args = [{ nft: ['0x31', '0x31'] }, { nft: ['0x32', '0x32'] }, { nft: ['0x33', '0x33'] }];36      const createMultipleItemsTx = await api.tx.nft37        .createMultipleItems(collectionId, Alice.address, args);38      await submitTransactionAsync(Alice, createMultipleItemsTx);39      const itemsListIndexAfter = await api.query.nft.itemListIndex(collectionId) as unknown as BN;40      expect(itemsListIndexAfter.toNumber()).to.be.equal(3);41      const token1Data = await api.query.nft.nftItemList(collectionId, 1) as unknown as ITokenDataType;42      const token2Data = await api.query.nft.nftItemList(collectionId, 2) as unknown as ITokenDataType;43      const token3Data = await api.query.nft.nftItemList(collectionId, 3) as unknown as ITokenDataType;4445      expect(token1Data.Owner.toString()).to.be.equal(Alice.address);46      expect(token2Data.Owner.toString()).to.be.equal(Alice.address);47      expect(token3Data.Owner.toString()).to.be.equal(Alice.address);4849      expect(token1Data.ConstData.toString()).to.be.equal('0x31');50      expect(token2Data.ConstData.toString()).to.be.equal('0x32');51      expect(token3Data.ConstData.toString()).to.be.equal('0x33');5253      expect(token1Data.VariableData.toString()).to.be.equal('0x31');54      expect(token2Data.VariableData.toString()).to.be.equal('0x32');55      expect(token3Data.VariableData.toString()).to.be.equal('0x33');56    });57  });5859  it('Create  0x31, 0x32, 0x33 items in active ReFungible collection and verify tokens data in chain', async () => {60    await usingApi(async (api: ApiPromise) => {61      const collectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});62      const itemsListIndexBefore = await api.query.nft.itemListIndex(collectionId) as unknown as BN;63      expect(itemsListIndexBefore.toNumber()).to.be.equal(0);64      const Alice = privateKey('//Alice');65      const args = [66        {refungible: {const_data: [0x31], variable_data: [0x31], pieces: 1}},67        {refungible: {const_data: [0x32], variable_data: [0x32], pieces: 1}},68        {refungible: {const_data: [0x33], variable_data: [0x33], pieces: 1}},69      ];70      const createMultipleItemsTx = await api.tx.nft71        .createMultipleItems(collectionId, Alice.address, args);72      await submitTransactionAsync(Alice, createMultipleItemsTx);73      const itemsListIndexAfter = await api.query.nft.itemListIndex(collectionId) as unknown as BN;74      expect(itemsListIndexAfter.toNumber()).to.be.equal(3);75      const token1Data = await api.query.nft.reFungibleItemList(collectionId, 1) as unknown as IReFungibleTokenDataType;76      const token2Data = await api.query.nft.reFungibleItemList(collectionId, 2) as unknown as IReFungibleTokenDataType;77      const token3Data = await api.query.nft.reFungibleItemList(collectionId, 3) as unknown as IReFungibleTokenDataType;7879      expect(token1Data.Owner[0].Owner.toString()).to.be.equal(Alice.address);80      expect(token1Data.Owner[0].Fraction.toNumber()).to.be.equal(1);8182      expect(token2Data.Owner[0].Owner.toString()).to.be.equal(Alice.address);83      expect(token2Data.Owner[0].Fraction.toNumber()).to.be.equal(1);8485      expect(token3Data.Owner[0].Owner.toString()).to.be.equal(Alice.address);86      expect(token3Data.Owner[0].Fraction.toNumber()).to.be.equal(1);8788      expect(token1Data.ConstData.toString()).to.be.equal('0x31');89      expect(token2Data.ConstData.toString()).to.be.equal('0x32');90      expect(token3Data.ConstData.toString()).to.be.equal('0x33');9192      expect(token1Data.VariableData.toString()).to.be.equal('0x31');93      expect(token2Data.VariableData.toString()).to.be.equal('0x32');94      expect(token3Data.VariableData.toString()).to.be.equal('0x33');95    });96  });9798  it('Can mint amount of items equals to collection limits', async () => {99    await usingApi(async (api) => {100      const alice = privateKey('//Alice');101102      const collectionId = await createCollectionExpectSuccess();103      await setCollectionLimitsExpectSuccess(alice, collectionId, {104        TokenLimit: 2,105      });106      const args = [107        { nft: ['A', 'A'] },108        { nft: ['B', 'B'] },109      ];110      const createMultipleItemsTx = api.tx.nft.createMultipleItems(collectionId, alice.address, args);111      const events = await submitTransactionAsync(alice, createMultipleItemsTx);112      const result = getGenericResult(events);113      expect(result.success).to.be.true;114    });115  });116});117118describe('Negative Integration Test createMultipleItems(collection_id, owner, items_data):', () => {119  it('Create token with not existing type', async () => {120    await usingApi(async (api: ApiPromise) => {121      const collectionId = await createCollectionExpectSuccess();122      const Alice = privateKey('//Alice');123      try {124        const args = [{ invalid: null }, { invalid: null }, { invalid: null }];125        const createMultipleItemsTx = await api.tx.nft126          .createMultipleItems(collectionId, Alice.address, args);127        await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;128      } catch (e) {129        // tslint:disable-next-line:no-unused-expression130        expect(e).to.be.exist;131      }132    });133  });134135  it('Create token in not existing collection', async () => {136    await usingApi(async (api: ApiPromise) => {137      const collectionId = parseInt((await api.query.nft.createdCollectionCount()).toString()) + 1;138      const Alice = privateKey('//Alice');139      const createMultipleItemsTx = await api.tx.nft140        .createMultipleItems(collectionId, Alice.address, ['NFT', 'NFT', 'NFT']);141      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;142    });143  });144145  it('Create NFT and Re-fungible tokens that has reached the maximum data limit', async () => {146    await usingApi(async (api: ApiPromise) => {147      // NFT148      const collectionId = await createCollectionExpectSuccess();149      const Alice = privateKey('//Alice');150      const args = [151        { nft: ['A'.repeat(2049), 'A'.repeat(2049)] },152        { nft: ['B'.repeat(2049), 'B'.repeat(2049)] },153        { nft: ['C'.repeat(2049), 'C'.repeat(2049)] },154      ];155      const createMultipleItemsTx = await api.tx.nft156        .createMultipleItems(collectionId, Alice.address, args);157      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;158159      // ReFungible160      const collectionIdReFungible =161        await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});162      const argsReFungible = [163        { ReFungible: ['1'.repeat(2049), '1'.repeat(2049)] },164        { ReFungible: ['2'.repeat(2049), '2'.repeat(2049)] },165        { ReFungible: ['3'.repeat(2049), '3'.repeat(2049)] },166      ];167      const createMultipleItemsTxFungible = await api.tx.nft168        .createMultipleItems(collectionIdReFungible, Alice.address, argsReFungible);169      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTxFungible)).to.be.rejected;170    });171  });172173  it('Create tokens with different types', async () => {174    await usingApi(async (api: ApiPromise) => {175      const collectionId = await createCollectionExpectSuccess();176      const Alice = privateKey('//Alice');177      const createMultipleItemsTx = await api.tx.nft178        .createMultipleItems(collectionId, Alice.address, ['NFT', 'Fungible', 'ReFungible']);179      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;180      // garbage collection :-D181      await destroyCollectionExpectSuccess(collectionId);182    });183  });184185  it('Create tokens with different data limits <> maximum data limit', async () => {186    await usingApi(async (api: ApiPromise) => {187      const collectionId = await createCollectionExpectSuccess();188      const Alice = privateKey('//Alice');189      const args = [190        { nft: ['A', 'A'] },191        { nft: ['B', 'B'.repeat(2049)] },192        { nft: ['C'.repeat(2049), 'C'] },193      ];194      const createMultipleItemsTx = await api.tx.nft195        .createMultipleItems(collectionId, Alice.address, args);196      await expect(submitTransactionExpectFailAsync(Alice, createMultipleItemsTx)).to.be.rejected;197    });198  });199200  it('Fails when minting tokens exceeds collectionLimits amount', async () => {201    await usingApi(async (api) => {202      const alice = privateKey('//Alice');203204      const collectionId = await createCollectionExpectSuccess();205      await setCollectionLimitsExpectSuccess(alice, collectionId, {206        TokenLimit: 1,207      });208      const args = [209        { nft: ['A', 'A'] },210        { nft: ['B', 'B'] },211      ];212      const createMultipleItemsTx = api.tx.nft.createMultipleItems(collectionId, alice.address, args);213      await expect(submitTransactionExpectFailAsync(alice, createMultipleItemsTx)).to.be.rejected;214    });215  });216});