difftreelog
Merge pull request #115 from usetech-llc/Antz0x0z-patch-1
in: master
Antz0x0z patch 1
3 files changed
.github/workflows/notify.ymldiffbeforeafterboth--- a/.github/workflows/notify.yml
+++ b/.github/workflows/notify.yml
@@ -6,8 +6,8 @@
build:
runs-on: ubuntu-latest
steps:
- - uses: avkviring/telegram-github-action@v0.0.8
+ - uses: avkviring/telegram-github-action@v0.0.13
env:
telegram_to: ${{ secrets.TELEGRAM_TO }}
telegram_token: ${{ secrets.TELEGRAM_TOKEN }}
- event: ${{ toJson(github.event) }}
\ No newline at end of file
+ event: ${{ toJson(github.event) }}
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -1098,9 +1098,20 @@
// Transfer permissions check
let target_collection = <Collection<T>>::get(collection_id);
- ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||
- Self::is_owner_or_admin_permissions(collection_id, sender.clone()),
- Error::<T>::NoPermission);
+ let allowance_limit = if Self::is_owner_or_admin_permissions(
+ collection_id,
+ sender.clone(),
+ ) {
+ None
+ } else if let Some(amount) = Self::owned_amount(
+ sender.clone(),
+ collection_id,
+ item_id,
+ ) {
+ Some(amount)
+ } else {
+ fail!(Error::<T>::NoPermission);
+ };
if target_collection.access == AccessMode::WhiteList {
Self::check_white_list(collection_id, &sender)?;
@@ -1112,6 +1123,9 @@
if allowance_exists {
allowance += <Allowances<T>>::get(collection_id, (item_id, &sender, &spender));
}
+ if let Some(limit) = allowance_limit {
+ ensure!(limit >= allowance, Error::<T>::TokenValueTooLow);
+ }
<Allowances<T>>::insert(collection_id, (item_id, sender.clone(), spender.clone()), allowance);
Ok(())
@@ -1883,6 +1897,36 @@
Ok(())
}
+ fn owned_amount(
+ subject: T::AccountId,
+ collection_id: CollectionId,
+ item_id: TokenId,
+ ) -> Option<u128> {
+ let target_collection = <Collection<T>>::get(collection_id);
+
+ match target_collection.mode {
+ CollectionMode::NFT => {
+ if <NftItemList<T>>::get(collection_id, item_id).owner == subject {
+ return Some(1)
+ }
+ None
+ },
+ CollectionMode::Fungible(_) => {
+ if <FungibleItemList<T>>::contains_key(collection_id, &subject) {
+ return Some(<FungibleItemList<T>>::get(collection_id, &subject)
+ .value);
+ }
+ None
+ },
+ CollectionMode::ReFungible => <ReFungibleItemList<T>>::get(collection_id, item_id)
+ .owner
+ .iter()
+ .find(|i| i.owner == subject)
+ .map(|i| i.fraction),
+ CollectionMode::Invalid => None,
+ }
+ }
+
fn is_item_owner(subject: T::AccountId, collection_id: CollectionId, item_id: TokenId) -> bool {
let target_collection = <Collection<T>>::get(collection_id);
tests/src/approve.test.tsdiffbeforeafterboth1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//5import { IKeyringPair } from '@polkadot/types/types';6import { ApiPromise } from '@polkadot/api';7import chai from 'chai';8import chaiAsPromised from 'chai-as-promised';9import privateKey from './substrate/privateKey';10import { default as usingApi } from './substrate/substrate-api';11import {12 approveExpectFail,13 approveExpectSuccess,14 createCollectionExpectSuccess,15 createItemExpectSuccess,16 destroyCollectionExpectSuccess,17 transferExpectSuccess,18} from './util/helpers';1920chai.use(chaiAsPromised);2122let Alice: IKeyringPair;23let Bob: IKeyringPair;2425describe.only('Integration Test approve(spender, collection_id, item_id, amount):', () => {26 before(async () => {27 await usingApi(async () => {28 Alice = privateKey('//Alice');29 Bob = privateKey('//Bob');30 });31 });3233 it('Execute the extrinsic and check approvedList', async () => {34 const nftCollectionId = await createCollectionExpectSuccess();35 // nft36 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');37 await approveExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob);38 // fungible39 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});40 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');41 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob);42 // reFungible43 const reFungibleCollectionId =44 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});45 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');46 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);47 });4849 it('Remove approval by using 0 amount', async () => {50 const nftCollectionId = await createCollectionExpectSuccess();51 // nft52 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');53 await approveExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob, 1);54 await approveExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob, 0);55 // fungible56 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});57 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');58 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1);59 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 0);60 // reFungible61 const reFungibleCollectionId =62 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});63 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');64 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob, 1);65 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob, 0);66 });67});6869describe.only('Negative Integration Test approve(spender, collection_id, item_id, amount):', () => {70 before(async () => {71 await usingApi(async (api) => {72 Alice = privateKey('//Alice');73 Bob = privateKey('//Bob');74 });75 });7677 it('Approve for a collection that does not exist', async () => {78 await usingApi(async (api: ApiPromise) => {79 // nft80 const nftCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;81 await approveExpectFail(nftCollectionCount + 1, 1, Alice, Bob);82 // fungible83 const fungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;84 await approveExpectFail(fungibleCollectionCount + 1, 1, Alice, Bob);85 // reFungible86 const reFungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;87 await approveExpectFail(reFungibleCollectionCount + 1, 1, Alice, Bob);88 });89 });9091 it('Approve for a collection that was destroyed', async () => {92 // nft93 const nftCollectionId = await createCollectionExpectSuccess();94 await destroyCollectionExpectSuccess(nftCollectionId);95 await approveExpectFail(nftCollectionId, 1, Alice, Bob);96 // fungible97 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});98 await destroyCollectionExpectSuccess(fungibleCollectionId);99 await approveExpectFail(fungibleCollectionId, 1, Alice, Bob);100 // reFungible101 const reFungibleCollectionId =102 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});103 await destroyCollectionExpectSuccess(reFungibleCollectionId);104 await approveExpectFail(reFungibleCollectionId, 1, Alice, Bob);105 });106107 it('Approve transfer of a token that does not exist', async () => {108 // nft109 const nftCollectionId = await createCollectionExpectSuccess();110 await approveExpectFail(nftCollectionId, 2, Alice, Bob);111 // fungible112 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});113 await approveExpectFail(fungibleCollectionId, 2, Alice, Bob);114 // reFungible115 const reFungibleCollectionId =116 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});117 await approveExpectFail(reFungibleCollectionId, 2, Alice, Bob);118 });119120 it('Approve using the address that does not own the approved token', async () => {121 const nftCollectionId = await createCollectionExpectSuccess();122 // nft123 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');124 await approveExpectFail(nftCollectionId, newNftTokenId, Bob, Alice);125 // fungible126 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});127 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');128 await approveExpectFail(fungibleCollectionId, newFungibleTokenId, Bob, Alice);129 // reFungible130 const reFungibleCollectionId =131 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});132 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');133 await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice);134 });135136 it('should fail if approved more NFTs than owned', async () => {137 const nftCollectionId = await createCollectionExpectSuccess({ mode: { type: 'NFT' } });138 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');139 await transferExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob, 1, 'NFT');140 await approveExpectSuccess(nftCollectionId, newNftTokenId, Bob, Alice);141 await approveExpectFail(nftCollectionId, newNftTokenId, Bob, Alice);142 });143144 it('should fail if approved more ReFungibles than owned', async () => {145 const nftCollectionId = await createCollectionExpectSuccess({ mode: { type: 'ReFungible' } });146 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'ReFungible');147 await transferExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob, 100, 'ReFungible');148 await approveExpectSuccess(nftCollectionId, newNftTokenId, Bob, Alice, 100);149 await approveExpectFail(nftCollectionId, newNftTokenId, Bob, Alice, 1);150 });151152 it('should fail if approved more Fungibles than owned', async () => {153 const nftCollectionId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });154 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'Fungible');155 await transferExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob, 10, 'Fungible');156 await approveExpectSuccess(nftCollectionId, newNftTokenId, Bob, Alice, 10);157 await approveExpectFail(nftCollectionId, newNftTokenId, Bob, Alice, 1);158 });159});