difftreelog
Merge pull request #112 from usetech-llc/feature/NFTPAR-308_limited_owners_control
in: master
Limited owners control
7 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -382,6 +382,8 @@
AccountTokenLimitExceeded,
/// Collection limit bounds per collection exceeded
CollectionLimitBoundsExceeded,
+ /// Tried to enable permissions which are only permitted to be disabled
+ OwnerPermissionsCantBeReverted,
/// Schema data size limit bound exceeded
SchemaDataLimitExceeded,
/// Maximum refungibility exceeded
@@ -639,6 +641,11 @@
let sender = ensure_signed(origin)?;
Self::check_owner_permissions(collection_id, sender)?;
+ let target_collection = <Collection<T>>::get(collection_id);
+ if !target_collection.limits.owner_can_destroy {
+ fail!(Error::<T>::NoPermission);
+ }
+
<AddressTokens<T>>::remove_prefix(collection_id);
<Allowances<T>>::remove_prefix(collection_id);
<Balance<T>>::remove_prefix(collection_id);
@@ -1022,9 +1029,14 @@
// 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);
+ ensure!(
+ Self::is_item_owner(sender.clone(), collection_id, item_id) ||
+ (
+ target_collection.limits.owner_can_transfer &&
+ Self::is_owner_or_admin_permissions(collection_id, sender.clone())
+ ),
+ Error::<T>::NoPermission
+ );
if target_collection.access == AccessMode::WhiteList {
Self::check_white_list(collection_id, &sender)?;
@@ -1098,9 +1110,14 @@
// 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);
+ ensure!(
+ Self::is_item_owner(sender.clone(), collection_id, item_id) ||
+ (
+ target_collection.limits.owner_can_transfer &&
+ Self::is_owner_or_admin_permissions(collection_id, sender.clone())
+ ),
+ Error::<T>::NoPermission
+ );
if target_collection.access == AccessMode::WhiteList {
Self::check_white_list(collection_id, &sender)?;
@@ -1156,8 +1173,14 @@
Self::is_correct_transfer(collection_id, &target_collection, &recipient)?;
// Transfer permissions check
- ensure!(appoved_transfer || Self::is_owner_or_admin_permissions(collection_id, sender.clone()),
- Error::<T>::NoPermission);
+ ensure!(
+ appoved_transfer ||
+ (
+ target_collection.limits.owner_can_transfer &&
+ Self::is_owner_or_admin_permissions(collection_id, sender.clone())
+ ),
+ Error::<T>::NoPermission
+ );
if target_collection.access == AccessMode::WhiteList {
Self::check_white_list(collection_id, &sender)?;
@@ -1524,25 +1547,32 @@
pub fn set_collection_limits(
origin,
collection_id: u32,
- limits: CollectionLimits,
+ new_limits: CollectionLimits,
) -> DispatchResult {
let sender = ensure_signed(origin)?;
Self::check_owner_permissions(collection_id, sender.clone())?;
let mut target_collection = <Collection<T>>::get(collection_id);
+ let old_limits = target_collection.limits;
let chain_limits = ChainLimit::get();
- let climits = target_collection.limits;
// collection bounds
- ensure!(limits.sponsor_transfer_timeout <= MAX_SPONSOR_TIMEOUT &&
- limits.account_token_ownership_limit <= MAX_TOKEN_OWNERSHIP,
+ ensure!(new_limits.sponsor_transfer_timeout <= MAX_SPONSOR_TIMEOUT &&
+ new_limits.account_token_ownership_limit <= MAX_TOKEN_OWNERSHIP &&
+ new_limits.sponsored_data_size <= chain_limits.custom_data_limit &&
+ new_limits.sponsored_mint_size <= chain_limits.custom_data_limit,
Error::<T>::CollectionLimitBoundsExceeded);
// token_limit check prev
- ensure!(climits.token_limit > limits.token_limit &&
- limits.token_limit <= chain_limits.account_token_ownership_limit,
- Error::<T>::AccountTokenLimitExceeded);
+ ensure!(old_limits.token_limit >= new_limits.token_limit, Error::<T>::CollectionTokenLimitExceeded);
+ ensure!(new_limits.token_limit > 0, Error::<T>::CollectionTokenLimitExceeded);
- target_collection.limits = limits;
+ ensure!(
+ (old_limits.owner_can_transfer || !new_limits.owner_can_transfer) &&
+ (old_limits.owner_can_destroy || !new_limits.owner_can_destroy),
+ Error::<T>::OwnerPermissionsCantBeReverted,
+ );
+
+ target_collection.limits = new_limits;
<Collection<T>>::insert(collection_id, target_collection);
Ok(())
tests/src/approve.test.tsdiffbeforeafterboth--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -3,6 +3,7 @@
// file 'LICENSE', which is part of this source code package.
//
import { ApiPromise } from '@polkadot/api';
+import { IKeyringPair } from '@polkadot/types/types';
import BN from 'bn.js';
import chai from 'chai';
import chaiAsPromised from 'chai-as-promised';
@@ -15,6 +16,7 @@
createFungibleItemExpectSuccess,
createItemExpectSuccess,
destroyCollectionExpectSuccess,
+ setCollectionLimitsExpectSuccess,
transferFromExpectSuccess,
U128_MAX,
} from './util/helpers';
@@ -23,10 +25,20 @@
const expect = chai.expect;
describe('Integration Test approve(spender, collection_id, item_id, amount):', () => {
+ let Alice: IKeyringPair;
+ let Bob: IKeyringPair;
+ let Charlie: IKeyringPair;
+
+ before(async () => {
+ await usingApi(async (api) => {
+ Alice = privateKey('//Alice');
+ Bob = privateKey('//Bob');
+ Charlie = privateKey('//Charlie');
+ });
+ });
+
it('Execute the extrinsic and check approvedList', async () => {
await usingApi(async (api: ApiPromise) => {
- const Alice = privateKey('//Alice');
- const Bob = privateKey('//Bob');
const nftCollectionId = await createCollectionExpectSuccess();
// nft
const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
@@ -45,8 +57,6 @@
it('Remove approval by using 0 amount', async () => {
await usingApi(async (api: ApiPromise) => {
- const Alice = privateKey('//Alice');
- const Bob = privateKey('//Bob');
const nftCollectionId = await createCollectionExpectSuccess();
// nft
const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
@@ -65,13 +75,30 @@
await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob, 0);
});
});
+
+ it('can be called by collection owner on non-owned item when OwnerCanTransfer == true', async () => {
+ const collectionId = await createCollectionExpectSuccess();
+ const itemId = await createItemExpectSuccess(Alice, collectionId, 'NFT', Bob.address);
+
+ await approveExpectSuccess(collectionId, itemId, Alice, Charlie);
+ });
});
describe('Negative Integration Test approve(spender, collection_id, item_id, amount):', () => {
+ let Alice: IKeyringPair;
+ let Bob: IKeyringPair;
+ let Charlie: IKeyringPair;
+
+ before(async () => {
+ await usingApi(async (api) => {
+ Alice = privateKey('//Alice');
+ Bob = privateKey('//Bob');
+ Charlie = privateKey('//Charlie');
+ });
+ });
+
it('Approve for a collection that does not exist', async () => {
await usingApi(async (api: ApiPromise) => {
- const Alice = privateKey('//Alice');
- const Bob = privateKey('//Bob');
// nft
const nftCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
await approveExpectFail(nftCollectionCount + 1, 1, Alice, Bob);
@@ -86,8 +113,6 @@
it('Approve for a collection that was destroyed', async () => {
await usingApi(async (api: ApiPromise) => {
- const Alice = privateKey('//Alice');
- const Bob = privateKey('//Bob');
// nft
const nftCollectionId = await createCollectionExpectSuccess();
await destroyCollectionExpectSuccess(nftCollectionId);
@@ -106,8 +131,6 @@
it('Approve transfer of a token that does not exist', async () => {
await usingApi(async (api: ApiPromise) => {
- const Alice = privateKey('//Alice');
- const Bob = privateKey('//Bob');
// nft
const nftCollectionId = await createCollectionExpectSuccess();
await approveExpectFail(nftCollectionId, 2, Alice, Bob);
@@ -123,8 +146,6 @@
it('Approve using the address that does not own the approved token', async () => {
await usingApi(async (api: ApiPromise) => {
- const Alice = privateKey('//Alice');
- const Bob = privateKey('//Bob');
const nftCollectionId = await createCollectionExpectSuccess();
// nft
const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
@@ -140,4 +161,12 @@
await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice);
});
});
+
+ it('fails when called by collection owner on non-owned item when OwnerCanTransfer == false', async () => {
+ const collectionId = await createCollectionExpectSuccess();
+ const itemId = await createItemExpectSuccess(Alice, collectionId, 'NFT', Bob.address);
+ await setCollectionLimitsExpectSuccess(Alice, collectionId, { OwnerCanTransfer: false });
+
+ await approveExpectFail(collectionId, itemId, Alice, Charlie);
+ });
});
tests/src/destroyCollection.test.tsdiffbeforeafterboth--- a/tests/src/destroyCollection.test.ts
+++ b/tests/src/destroyCollection.test.ts
@@ -3,10 +3,12 @@
// file 'LICENSE', which is part of this source code package.
//
+import { IKeyringPair } from '@polkadot/types/types';
import chai from 'chai';
import chaiAsPromised from 'chai-as-promised';
+import privateKey from './substrate/privateKey';
import { default as usingApi } from "./substrate/substrate-api";
-import { createCollectionExpectSuccess, destroyCollectionExpectSuccess, destroyCollectionExpectFailure } from "./util/helpers";
+import { createCollectionExpectSuccess, destroyCollectionExpectSuccess, destroyCollectionExpectFailure, setCollectionLimitsExpectSuccess } from "./util/helpers";
chai.use(chaiAsPromised);
@@ -26,6 +28,14 @@
});
describe('(!negative test!) integration test: ext. destroyCollection():', () => {
+ let alice: IKeyringPair;
+
+ before(async () => {
+ await usingApi(async (api) => {
+ alice = privateKey('//Alice');
+ });
+ });
+
it('(!negative test!) Destroy a collection that never existed', async () => {
await usingApi(async (api) => {
// Find the collection that never existed
@@ -43,4 +53,10 @@
await destroyCollectionExpectFailure(collectionId, '//Bob');
await destroyCollectionExpectSuccess(collectionId, '//Alice');
});
+ it('fails when OwnerCanDestroy == false', async () => {
+ const collectionId = await createCollectionExpectSuccess();
+ await setCollectionLimitsExpectSuccess(alice, collectionId, { OwnerCanDestroy: false });
+
+ await destroyCollectionExpectFailure(collectionId, '//Alice');
+ });
});
tests/src/setCollectionLimits.test.tsdiffbeforeafterboth--- a/tests/src/setCollectionLimits.test.ts
+++ b/tests/src/setCollectionLimits.test.ts
@@ -14,6 +14,8 @@
createCollectionExpectSuccess, getCreatedCollectionCount,
getCreateItemResult,
getDetailedCollectionInfo,
+ setCollectionLimitsExpectFailure,
+ setCollectionLimitsExpectSuccess,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -26,21 +28,8 @@
const accountTokenOwnershipLimit = 0;
const sponsoredDataSize = 0;
const sponsoredMintSize = 0;
-const tokenLimit = 0;
-
-describe('hooks', () => {
- before(async () => {
- await usingApi(async () => {
- const keyring = new Keyring({ type: 'sr25519' });
- alice = keyring.addFromUri('//Alice');
- });
- });
- it('choose or create collection for testing', async () => {
- await usingApi(async () => {
- collectionIdForTesting = await createCollectionExpectSuccess({name: 'A', description: 'B', tokenPrefix: 'C', mode: {type: 'NFT'}});
- });
- });
-});
+const sponsorTimeout = 1;
+const tokenLimit = 1;
describe('setCollectionLimits positive', () => {
let tx;
@@ -48,6 +37,7 @@
await usingApi(async () => {
const keyring = new Keyring({ type: 'sr25519' });
alice = keyring.addFromUri('//Alice');
+ collectionIdForTesting = await createCollectionExpectSuccess({name: 'A', description: 'B', tokenPrefix: 'C', mode: {type: 'NFT'}});
});
});
it('execute setCollectionLimits with predefined params ', async () => {
@@ -55,25 +45,28 @@
tx = api.tx.nft.setCollectionLimits(
collectionIdForTesting,
{
- accountTokenOwnershipLimit,
- sponsoredDataSize,
- sponsoredMintSize,
- tokenLimit,
+ AccountTokenOwnershipLimit: accountTokenOwnershipLimit,
+ SponsoredMintSize: sponsoredDataSize,
+ TokenLimit: tokenLimit,
+ SponsorTimeout: sponsorTimeout,
+ OwnerCanTransfer: true,
+ OwnerCanDestroy: true
},
);
const events = await submitTransactionAsync(alice, tx);
const result = getCreateItemResult(events);
+
+ // get collection limits defined previously
+ const collectionInfo = await getDetailedCollectionInfo(api, collectionIdForTesting) as ICollectionInterface;
+
// tslint:disable-next-line:no-unused-expression
expect(result.success).to.be.true;
- });
- });
- it('get collection limits defined in previous test', async () => {
- await usingApi(async (api: ApiPromise) => {
- const collectionInfo = await getDetailedCollectionInfo(api, collectionIdForTesting) as ICollectionInterface;
expect(collectionInfo.Limits.AccountTokenOwnershipLimit.toNumber()).to.be.equal(accountTokenOwnershipLimit);
- expect(collectionInfo.Limits.SponsoredMintSize.toNumber()).to.be.equal(sponsoredMintSize);
+ expect(collectionInfo.Limits.SponsoredMintSize.toNumber()).to.be.equal(sponsoredDataSize);
expect(collectionInfo.Limits.TokenLimit.toNumber()).to.be.equal(tokenLimit);
- expect(collectionInfo.Limits.SponsorTimeout.toNumber()).to.be.equal(sponsoredDataSize);
+ expect(collectionInfo.Limits.SponsorTimeout.toNumber()).to.be.equal(sponsorTimeout);
+ expect(collectionInfo.Limits.OwnerCanTransfer.valueOf()).to.be.true;
+ expect(collectionInfo.Limits.OwnerCanDestroy.valueOf()).to.be.true;
});
});
});
@@ -85,6 +78,7 @@
const keyring = new Keyring({ type: 'sr25519' });
alice = keyring.addFromUri('//Alice');
bob = keyring.addFromUri('//Bob');
+ collectionIdForTesting = await createCollectionExpectSuccess({name: 'A', description: 'B', tokenPrefix: 'C', mode: {type: 'NFT'}});
});
});
it('execute setCollectionLimits for not exists collection', async () => {
@@ -131,4 +125,44 @@
await expect(submitTransactionExpectFailAsync(alice, tx)).to.be.rejected;
});
});
+
+ it('fails when trying to enable OwnerCanTransfer after it was disabled', async () => {
+ const collectionId = await createCollectionExpectSuccess();
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {
+ AccountTokenOwnershipLimit: accountTokenOwnershipLimit,
+ SponsoredMintSize: sponsoredDataSize,
+ TokenLimit: tokenLimit,
+ SponsorTimeout: sponsorTimeout,
+ OwnerCanTransfer: false,
+ OwnerCanDestroy: true
+ });
+ await setCollectionLimitsExpectFailure(alice, collectionId, {
+ AccountTokenOwnershipLimit: accountTokenOwnershipLimit,
+ SponsoredMintSize: sponsoredDataSize,
+ TokenLimit: tokenLimit,
+ SponsorTimeout: sponsorTimeout,
+ OwnerCanTransfer: true,
+ OwnerCanDestroy: true
+ });
+ });
+
+ it('fails when trying to enable OwnerCanDestroy after it was disabled', async () => {
+ const collectionId = await createCollectionExpectSuccess();
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {
+ AccountTokenOwnershipLimit: accountTokenOwnershipLimit,
+ SponsoredMintSize: sponsoredDataSize,
+ TokenLimit: tokenLimit,
+ SponsorTimeout: sponsorTimeout,
+ OwnerCanTransfer: true,
+ OwnerCanDestroy: false
+ });
+ await setCollectionLimitsExpectFailure(alice, collectionId, {
+ AccountTokenOwnershipLimit: accountTokenOwnershipLimit,
+ SponsoredMintSize: sponsoredDataSize,
+ TokenLimit: tokenLimit,
+ SponsorTimeout: sponsorTimeout,
+ OwnerCanTransfer: true,
+ OwnerCanDestroy: true
+ });
+ });
});
tests/src/transferFrom.test.tsdiffbeforeafterboth3// file 'LICENSE', which is part of this source code package.3// file 'LICENSE', which is part of this source code package.4//4//5import { ApiPromise } from '@polkadot/api';5import { ApiPromise } from '@polkadot/api';6import { IKeyringPair } from '@polkadot/types/types';6import chai from 'chai';7import chai from 'chai';7import chaiAsPromised from 'chai-as-promised';8import chaiAsPromised from 'chai-as-promised';8import privateKey from './substrate/privateKey';9import privateKey from './substrate/privateKey';18 transferFromExpectFail,19 transferFromExpectFail,19 transferFromExpectSuccess,20 transferFromExpectSuccess,20 burnItemExpectSuccess,21 burnItemExpectSuccess,22 setCollectionLimitsExpectSuccess,21} from './util/helpers';23} from './util/helpers';222423chai.use(chaiAsPromised);25chai.use(chaiAsPromised);24const expect = chai.expect;26const expect = chai.expect;252726describe('Integration Test transferFrom(from, recipient, collection_id, item_id, value):', () => {28describe('Integration Test transferFrom(from, recipient, collection_id, item_id, value):', () => {29 let Alice: IKeyringPair;30 let Bob: IKeyringPair;31 let Charlie: IKeyringPair;3233 before(async () => {34 await usingApi(async (api) => {35 Alice = privateKey('//Alice');36 Bob = privateKey('//Bob');37 Charlie = privateKey('//Charlie');38 });39 });4027 it('Execute the extrinsic and check nftItemList - owner of token', async () => {41 it('Execute the extrinsic and check nftItemList - owner of token', async () => {28 await usingApi(async (api: ApiPromise) => {42 await usingApi(async (api: ApiPromise) => {29 const Alice = privateKey('//Alice');30 const Bob = privateKey('//Bob');31 const Charlie = privateKey('//Charlie');32 // nft43 // nft33 const nftCollectionId = await createCollectionExpectSuccess();44 const nftCollectionId = await createCollectionExpectSuccess();34 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');45 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');67 });78 });68 });79 });8081 it('can be called by collection owner on non-owned item when OwnerCanTransfer == true', async () => {82 const collectionId = await createCollectionExpectSuccess();83 const itemId = await createItemExpectSuccess(Alice, collectionId, 'NFT', Bob.address);8485 await transferFromExpectSuccess(collectionId, itemId, Alice, Bob, Charlie);86 });69});87});708871describe('Negative Integration Test transferFrom(from, recipient, collection_id, item_id, value):', () => {89describe('Negative Integration Test transferFrom(from, recipient, collection_id, item_id, value):', () => {90 let Alice: IKeyringPair;91 let Bob: IKeyringPair;92 let Charlie: IKeyringPair;9394 before(async () => {95 await usingApi(async (api) => {96 Alice = privateKey('//Alice');97 Bob = privateKey('//Bob');98 Charlie = privateKey('//Charlie');99 });100 });10172 it('transferFrom for a collection that does not exist', async () => {102 it('transferFrom for a collection that does not exist', async () => {73 await usingApi(async (api: ApiPromise) => {103 await usingApi(async (api: ApiPromise) => {74 const Alice = privateKey('//Alice');75 const Bob = privateKey('//Bob');76 const Charlie = privateKey('//Charlie');77 // nft104 // nft78 const nftCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;105 const nftCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;79 await approveExpectFail(nftCollectionCount + 1, 1, Alice, Bob);106 await approveExpectFail(nftCollectionCount + 1, 1, Alice, Bob);113140114 it('transferFrom for not approved address', async () => {141 it('transferFrom for not approved address', async () => {115 await usingApi(async (api: ApiPromise) => {142 await usingApi(async (api: ApiPromise) => {116 const Alice = privateKey('//Alice');117 const Bob = privateKey('//Bob');118 const Charlie = privateKey('//Charlie');119 // nft143 // nft120 const nftCollectionId = await createCollectionExpectSuccess();144 const nftCollectionId = await createCollectionExpectSuccess();121 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');145 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');137161138 it('transferFrom incorrect token count', async () => {162 it('transferFrom incorrect token count', async () => {139 await usingApi(async (api: ApiPromise) => {163 await usingApi(async (api: ApiPromise) => {140 const Alice = privateKey('//Alice');141 const Bob = privateKey('//Bob');142 const Charlie = privateKey('//Charlie');143 // nft164 // nft144 const nftCollectionId = await createCollectionExpectSuccess();165 const nftCollectionId = await createCollectionExpectSuccess();145 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');166 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');164185165 it('execute transferFrom from account that is not owner of collection', async () => {186 it('execute transferFrom from account that is not owner of collection', async () => {166 await usingApi(async (api: ApiPromise) => {187 await usingApi(async (api: ApiPromise) => {167 const Alice = privateKey('//Alice');168 const Bob = privateKey('//Bob');169 const Charlie = privateKey('//Charlie');170 const Dave = privateKey('//Dave');188 const Dave = privateKey('//Dave');171 // nft189 // nft172 const nftCollectionId = await createCollectionExpectSuccess();190 const nftCollectionId = await createCollectionExpectSuccess();206 });224 });207 it( 'transferFrom burnt token before approve NFT', async () => {225 it( 'transferFrom burnt token before approve NFT', async () => {208 await usingApi(async (api: ApiPromise) => {226 await usingApi(async (api: ApiPromise) => {209 const Alice = privateKey('//Alice');210 const Bob = privateKey('//Bob');211 const Charlie = privateKey('//Charlie');212 // nft227 // nft213 const nftCollectionId = await createCollectionExpectSuccess();228 const nftCollectionId = await createCollectionExpectSuccess();214 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');229 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');219 });234 });220 it( 'transferFrom burnt token before approve Fungible', async () => {235 it( 'transferFrom burnt token before approve Fungible', async () => {221 await usingApi(async (api: ApiPromise) => {236 await usingApi(async (api: ApiPromise) => {222 const Alice = privateKey('//Alice');223 const Bob = privateKey('//Bob');224 const Charlie = privateKey('//Charlie');225 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});237 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});226 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');238 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');227 await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, 10);239 await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, 10);232 }); 244 }); 233 it( 'transferFrom burnt token before approve ReFungible', async () => {245 it( 'transferFrom burnt token before approve ReFungible', async () => {234 await usingApi(async (api: ApiPromise) => {246 await usingApi(async (api: ApiPromise) => {235 const Alice = privateKey('//Alice');236 const Bob = privateKey('//Bob');237 const Charlie = privateKey('//Charlie');238 const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});247 const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});239 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');248 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');240 await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);249 await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);246 255 247 it( 'transferFrom burnt token after approve NFT', async () => {256 it( 'transferFrom burnt token after approve NFT', async () => {248 await usingApi(async (api: ApiPromise) => {257 await usingApi(async (api: ApiPromise) => {249 const Alice = privateKey('//Alice');250 const Bob = privateKey('//Bob');251 const Charlie = privateKey('//Charlie');252 // nft258 // nft253 const nftCollectionId = await createCollectionExpectSuccess();259 const nftCollectionId = await createCollectionExpectSuccess();254 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');260 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');259 });265 });260 it( 'transferFrom burnt token after approve Fungible', async () => {266 it( 'transferFrom burnt token after approve Fungible', async () => {261 await usingApi(async (api: ApiPromise) => {267 await usingApi(async (api: ApiPromise) => {262 const Alice = privateKey('//Alice');263 const Bob = privateKey('//Bob');264 const Charlie = privateKey('//Charlie');265 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});268 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});266 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');269 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');267 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob);270 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob);272 }); 275 }); 273 it( 'transferFrom burnt token after approve ReFungible', async () => {276 it( 'transferFrom burnt token after approve ReFungible', async () => {274 await usingApi(async (api: ApiPromise) => {277 await usingApi(async (api: ApiPromise) => {275 const Alice = privateKey('//Alice');276 const Bob = privateKey('//Bob');277 const Charlie = privateKey('//Charlie');278 const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});278 const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});279 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');279 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');280 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);280 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);284 });284 });285 }); 285 });286287 it('fails when called by collection owner on non-owned item when OwnerCanTransfer == false', async () => {288 const collectionId = await createCollectionExpectSuccess();289 const itemId = await createItemExpectSuccess(Alice, collectionId, 'NFT', Bob.address);290 await setCollectionLimitsExpectSuccess(Alice, collectionId, { OwnerCanTransfer: false });291292 await transferFromExpectFail(collectionId, itemId, Alice, Bob, Charlie);293 });286});294});287295tests/src/types.tsdiffbeforeafterboth--- a/tests/src/types.ts
+++ b/tests/src/types.ts
@@ -17,6 +17,8 @@
SponsoredMintSize: BN;
TokenLimit: BN;
SponsorTimeout: BN;
+ OwnerCanTransfer: boolean;
+ OwnerCanDestroy: boolean;
};
MintMode: boolean;
Mode: {
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -333,6 +333,36 @@
});
}
+export async function queryCollectionLimits(collectionId: number) {
+ return await usingApi(async (api) => {
+ return ((await api.query.nft.collection(collectionId)).toJSON() as any).Limits;
+ });
+}
+
+export async function setCollectionLimitsExpectSuccess(sender: IKeyringPair, collectionId: number, limits: any) {
+ await usingApi(async (api) => {
+ const oldLimits = await queryCollectionLimits(collectionId);
+ const newLimits = { ...oldLimits as any, ...limits };
+ const tx = api.tx.nft.setCollectionLimits(collectionId, newLimits);
+ const events = await submitTransactionAsync(sender, tx);
+ const result = getGenericResult(events);
+
+ expect(result.success).to.be.true;
+ });
+}
+
+export async function setCollectionLimitsExpectFailure(sender: IKeyringPair, collectionId: number, limits: any) {
+ await usingApi(async (api) => {
+ const oldLimits = await queryCollectionLimits(collectionId);
+ const newLimits = { ...oldLimits as any, ...limits };
+ const tx = api.tx.nft.setCollectionLimits(collectionId, newLimits);
+ const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
+ const result = getGenericResult(events);
+
+ expect(result.success).to.be.false;
+ });
+}
+
export async function setCollectionSponsorExpectSuccess(collectionId: number, sponsor: string) {
await usingApi(async (api) => {