difftreelog
Merge pull request #125 from usetech-llc/fix/NFTPAR-367_createMultipleItems_overflow_checks
in: master
Fix bulk mint exceeds collection token limit
2 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth967967968 let target_collection = <Collection<T>>::get(collection_id);968 let target_collection = <Collection<T>>::get(collection_id);969969970 Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner)?;970 Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner, 1)?;971 Self::validate_create_item_args(&target_collection, &data)?;971 Self::validate_create_item_args(&target_collection, &data)?;972 Self::create_item_no_validation(collection_id, owner, data)?;972 Self::create_item_no_validation(collection_id, owner, data)?;9739731003 Self::collection_exists(collection_id)?;1003 Self::collection_exists(collection_id)?;1004 let target_collection = <Collection<T>>::get(collection_id);1004 let target_collection = <Collection<T>>::get(collection_id);100510051006 Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner)?;1006 Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner, items_data.len() as u32)?;100710071008 for data in &items_data {1008 for data in &items_data {1009 Self::validate_create_item_args(&target_collection, data)?;1009 Self::validate_create_item_args(&target_collection, data)?;1638 Ok(())1638 Ok(())1639 }1639 }164016401641 fn can_create_items_in_collection(collection_id: CollectionId, collection: &CollectionType<T::AccountId>, sender: &T::AccountId, owner: &T::AccountId) -> DispatchResult {1641 fn can_create_items_in_collection(collection_id: CollectionId, collection: &CollectionType<T::AccountId>, sender: &T::AccountId, owner: &T::AccountId, amount: u32) -> DispatchResult {164216421643 // check token limit and account token limit1643 // check token limit and account token limit1644 let total_items: u32 = ItemListIndex::get(collection_id);1644 let total_items: u32 = ItemListIndex::get(collection_id)1645 .checked_add(amount)1646 .ok_or(Error::<T>::CollectionTokenLimitExceeded)?;1645 let account_items: u32 = <AddressTokens<T>>::get(collection_id, owner).len() as u32;1647 let account_items: u32 = (<AddressTokens<T>>::get(collection_id, owner).len() as u32)1648 .checked_add(amount)1649 .ok_or(Error::<T>::AccountTokenLimitExceeded)?;1646 ensure!(collection.limits.token_limit > total_items, Error::<T>::CollectionTokenLimitExceeded);1650 ensure!(collection.limits.token_limit >= total_items, Error::<T>::CollectionTokenLimitExceeded);1647 ensure!(collection.limits.account_token_ownership_limit > account_items, Error::<T>::AccountTokenLimitExceeded);1651 ensure!(collection.limits.account_token_ownership_limit >= account_items, Error::<T>::AccountTokenLimitExceeded);164816521649 if !Self::is_owner_or_admin_permissions(collection_id, sender.clone()) {1653 if !Self::is_owner_or_admin_permissions(collection_id, sender.clone()) {1650 ensure!(collection.mint_mode == true, Error::<T>::PublicMintingNotAllowed);1654 ensure!(collection.mint_mode == true, Error::<T>::PublicMintingNotAllowed);tests/src/createMultipleItems.test.tsdiffbeforeafterboth11import {11import {12 createCollectionExpectSuccess,12 createCollectionExpectSuccess,13 destroyCollectionExpectSuccess,13 destroyCollectionExpectSuccess,14 getGenericResult,14 IReFungibleTokenDataType,15 IReFungibleTokenDataType,16 setCollectionLimitsExpectSuccess,15} from './util/helpers';17} from './util/helpers';161817chai.use(chaiAsPromised);19chai.use(chaiAsPromised);93 });95 });94 });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 });95});116});9611797describe('Negative Integration Test createMultipleItems(collection_id, owner, items_data):', () => {118describe('Negative Integration Test createMultipleItems(collection_id, owner, items_data):', () => {176 });197 });177 });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 });178});216});179217