difftreelog
OwnerCanTransfer flag
in: master
10 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1164,6 +1164,7 @@
old_limit: &CollectionLimits,
mut new_limit: CollectionLimits,
) -> Result<CollectionLimits, DispatchError> {
+ let limits = old_limit;
limit_default!(old_limit, new_limit,
account_token_ownership_limit => ensure!(
new_limit <= MAX_TOKEN_OWNERSHIP,
@@ -1190,6 +1191,7 @@
),
sponsor_approve_timeout => {},
owner_can_transfer => ensure!(
+ !limits.owner_can_transfer_instaled() ||
old_limit || !new_limit,
<Error<T>>::OwnerPermissionsCantBeReverted,
),
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -409,7 +409,10 @@
.min(MAX_SPONSOR_TIMEOUT)
}
pub fn owner_can_transfer(&self) -> bool {
- self.owner_can_transfer.unwrap_or(true)
+ self.owner_can_transfer.unwrap_or(false)
+ }
+ pub fn owner_can_transfer_instaled(&self) -> bool {
+ self.owner_can_transfer.is_some()
}
pub fn owner_can_destroy(&self) -> bool {
self.owner_can_destroy.unwrap_or(true)
tests/src/approve.test.tsdiffbeforeafterboth--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -28,7 +28,7 @@
setCollectionLimitsExpectSuccess,
transferExpectSuccess,
addCollectionAdminExpectSuccess,
- adminApproveFromExpectSuccess,
+ adminApproveFromExpectFail,
getCreatedCollectionCount,
transferFromExpectSuccess,
transferFromExpectFail,
@@ -84,11 +84,11 @@
await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address, 0);
});
- it('can be called by collection owner on non-owned item when OwnerCanTransfer == true', async () => {
+ it('can`t be 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 adminApproveFromExpectSuccess(collectionId, itemId, alice, bob.address, charlie.address);
+ await adminApproveFromExpectFail(collectionId, itemId, alice, bob.address, charlie.address);
});
});
@@ -292,7 +292,7 @@
});
});
-describe('Administrator and collection owner do not need approval in order to execute TransferFrom:', () => {
+describe('Administrator and collection owner do not need approval in order to execute TransferFrom (with owner_can_transfer_flag = true):', () => {
let alice: IKeyringPair;
let bob: IKeyringPair;
let charlie: IKeyringPair;
@@ -309,6 +309,7 @@
it('NFT', async () => {
const collectionId = await createCollectionExpectSuccess();
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', charlie.address);
await transferFromExpectSuccess(collectionId, itemId, alice, charlie, dave, 1, 'NFT');
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
@@ -317,6 +318,7 @@
it('Fungible up to an approved amount', async () => {
const collectionId = await createCollectionExpectSuccess({mode:{type: 'Fungible', decimalPoints: 0}});
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', charlie.address);
await transferFromExpectSuccess(collectionId, itemId, alice, charlie, dave, 1, 'Fungible');
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
@@ -325,6 +327,7 @@
it('ReFungible up to an approved amount', async () => {
const collectionId = await createCollectionExpectSuccess({mode:{type: 'ReFungible'}});
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', charlie.address);
await transferFromExpectSuccess(collectionId, itemId, alice, charlie, dave, 1, 'ReFungible');
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
@@ -402,7 +405,7 @@
const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', alice.address);
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
- await adminApproveFromExpectSuccess(collectionId, itemId, bob, alice.address, charlie.address);
+ await adminApproveFromExpectFail(collectionId, itemId, bob, alice.address, charlie.address);
});
});
tests/src/burnItem.test.tsdiffbeforeafterboth--- a/tests/src/burnItem.test.ts
+++ b/tests/src/burnItem.test.ts
@@ -23,6 +23,7 @@
normalizeAccountId,
addCollectionAdminExpectSuccess,
getBalance,
+ setCollectionLimitsExpectSuccess,
isTokenExists,
} from './util/helpers';
@@ -149,6 +150,7 @@
it('Burn item in NFT collection', async () => {
const createMode = 'NFT';
const collectionId = await createCollectionExpectSuccess({mode: {type: createMode}});
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
@@ -167,6 +169,7 @@
it('Burn item in Fungible collection', async () => {
const createMode = 'Fungible';
const collectionId = await createCollectionExpectSuccess({mode: {type: createMode, decimalPoints: 0}});
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
const tokenId = await createItemExpectSuccess(alice, collectionId, createMode); // Helper creates 10 fungible tokens
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
@@ -189,6 +192,7 @@
it('Burn item in ReFungible collection', async () => {
const createMode = 'ReFungible';
const collectionId = await createCollectionExpectSuccess({mode: {type: createMode}});
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
tests/src/eth/crossTransfer.test.tsdiffbeforeafterboth--- a/tests/src/eth/crossTransfer.test.ts
+++ b/tests/src/eth/crossTransfer.test.ts
@@ -18,6 +18,7 @@
createFungibleItemExpectSuccess,
transferExpectSuccess,
transferFromExpectSuccess,
+ setCollectionLimitsExpectSuccess,
createItemExpectSuccess} from '../util/helpers';
import {collectionIdToAddress,
createEthAccountWithBalance,
@@ -35,6 +36,7 @@
const alice = privateKeyWrapper('//Alice');
const bob = privateKeyWrapper('//Bob');
const charlie = privateKeyWrapper('//Charlie');
+ await setCollectionLimitsExpectSuccess(alice, collection, {ownerCanTransfer: true});
await createFungibleItemExpectSuccess(alice, collection, {Value: 200n}, {Substrate: alice.address});
await transferExpectSuccess(collection, 0, alice, {Ethereum: subToEth(charlie.address)} , 200, 'Fungible');
await transferFromExpectSuccess(collection, 0, alice, {Ethereum: subToEth(charlie.address)}, charlie, 50, 'Fungible');
@@ -48,6 +50,7 @@
});
const alice = privateKeyWrapper('//Alice');
const bob = privateKeyWrapper('//Bob');
+ await setCollectionLimitsExpectSuccess(alice, collection, {ownerCanTransfer: true});
const bobProxy = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const aliceProxy = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
@@ -71,6 +74,7 @@
const alice = privateKeyWrapper('//Alice');
const bob = privateKeyWrapper('//Bob');
const charlie = privateKeyWrapper('//Charlie');
+ await setCollectionLimitsExpectSuccess(alice, collection, {ownerCanTransfer: true});
const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
await transferExpectSuccess(collection, tokenId, alice, {Ethereum: subToEth(charlie.address)}, 1, 'NFT');
await transferFromExpectSuccess(collection, tokenId, alice, {Ethereum: subToEth(charlie.address)}, charlie, 1, 'NFT');
@@ -85,6 +89,7 @@
const alice = privateKeyWrapper('//Alice');
const bob = privateKeyWrapper('//Bob');
const charlie = privateKeyWrapper('//Charlie');
+ await setCollectionLimitsExpectSuccess(alice, collection, {ownerCanTransfer: true});
const bobProxy = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const aliceProxy = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});
tests/src/limits.test.tsdiffbeforeafterboth--- a/tests/src/limits.test.ts
+++ b/tests/src/limits.test.ts
@@ -406,6 +406,7 @@
it('Effective collection limits', async () => {
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
{ // Check that limits is undefined
const collection = await api.rpc.unique.collectionById(collectionId);
@@ -419,7 +420,7 @@
expect(limits.tokenLimit.toHuman()).to.be.null;
expect(limits.sponsorTransferTimeout.toHuman()).to.be.null;
expect(limits.sponsorApproveTimeout.toHuman()).to.be.null;
- expect(limits.ownerCanTransfer.toHuman()).to.be.null;
+ expect(limits.ownerCanTransfer.toHuman()).to.be.true;
expect(limits.ownerCanDestroy.toHuman()).to.be.null;
expect(limits.transfersEnabled.toHuman()).to.be.null;
}
tests/src/nesting/graphs.test.tsdiffbeforeafterboth--- a/tests/src/nesting/graphs.test.ts
+++ b/tests/src/nesting/graphs.test.ts
@@ -3,7 +3,7 @@
import {expect} from 'chai';
import {tokenIdToCross} from '../eth/util/helpers';
import usingApi, {executeTransaction} from '../substrate/substrate-api';
-import {getCreateCollectionResult, transferExpectSuccess} from '../util/helpers';
+import {getCreateCollectionResult, transferExpectSuccess, setCollectionLimitsExpectSuccess} from '../util/helpers';
/**
* ```dot
@@ -36,6 +36,7 @@
await usingApi(async (api, privateKeyWrapper) => {
const alice = privateKeyWrapper('//Alice');
const collection = await buildComplexObjectGraph(api, alice);
+ await setCollectionLimitsExpectSuccess(alice, collection, {ownerCanTransfer: true});
// to self
await expect(
tests/src/nesting/nest.test.tsdiffbeforeafterboth1import {expect} from 'chai';2import {tokenIdToAddress} from '../eth/util/helpers';3import usingApi, {executeTransaction} from '../substrate/substrate-api';4import {5 addToAllowListExpectSuccess,6 createCollectionExpectSuccess,7 createItemExpectSuccess,8 enableAllowListExpectSuccess,9 enablePublicMintingExpectSuccess,10 getTokenChildren,11 getTokenOwner,12 getTopmostTokenOwner,13 normalizeAccountId,14 setCollectionPermissionsExpectSuccess,15 transferExpectFailure,16 transferExpectSuccess,17 transferFromExpectSuccess,18 setCollectionLimitsExpectSuccess,19} from '../util/helpers';20import {IKeyringPair} from '@polkadot/types/types';2122let alice: IKeyringPair;23let bob: IKeyringPair;2425describe('Integration Test: Nesting', () => {26 before(async () => {27 await usingApi(async (api, privateKeyWrapper) => {28 alice = privateKeyWrapper('//Alice');29 bob = privateKeyWrapper('//Bob');30 });31 });3233 it('Performs the full suite: bundles a token, transfers, and unnests', async () => {34 await usingApi(async api => {35 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});36 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {tokenOwner: true}});37 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');3839 // Create a nested token40 const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});41 expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});42 expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});4344 // Create a token to be nested45 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');4647 // Nest48 await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});49 expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});50 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});5152 // Move bundle to different user53 await transferExpectSuccess(collection, targetToken, alice, {Substrate: bob.address});54 expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: bob.address});55 expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});5657 // Unnest58 await transferFromExpectSuccess(collection, newToken, bob, {Ethereum: tokenIdToAddress(collection, targetToken)}, {Substrate: bob.address});59 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: bob.address});60 });61 });6263 it('Transfers an already bundled token', async () => {64 await usingApi(async api => {65 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});66 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {tokenOwner: true}});6768 const tokenA = await createItemExpectSuccess(alice, collection, 'NFT');69 const tokenB = await createItemExpectSuccess(alice, collection, 'NFT');7071 // Create a nested token72 const tokenC = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, tokenA)});73 expect(await getTopmostTokenOwner(api, collection, tokenC)).to.be.deep.equal({Substrate: alice.address});74 expect(await getTokenOwner(api, collection, tokenC)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, tokenA).toLowerCase()});7576 // Transfer the nested token to another token77 await expect(executeTransaction(78 api,79 alice,80 api.tx.unique.transferFrom(81 normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenA)}),82 normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenB)}),83 collection,84 tokenC,85 1,86 ),87 )).to.not.be.rejected;88 expect(await getTopmostTokenOwner(api, collection, tokenC)).to.be.deep.equal({Substrate: alice.address});89 expect(await getTokenOwner(api, collection, tokenC)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, tokenB).toLowerCase()});90 });91 });9293 it('Checks token children', async () => {94 await usingApi(async api => {95 const collectionA = await createCollectionExpectSuccess({mode: {type: 'NFT'}});96 await setCollectionLimitsExpectSuccess(alice, collectionA, {ownerCanTransfer: true});97 await setCollectionPermissionsExpectSuccess(alice, collectionA, {nesting: {tokenOwner: true}});98 const collectionB = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});99100 const targetToken = await createItemExpectSuccess(alice, collectionA, 'NFT');101 const targetAddress = {Ethereum: tokenIdToAddress(collectionA, targetToken)};102 let children = await getTokenChildren(api, collectionA, targetToken);103 expect(children.length).to.be.equal(0, 'Children length check at creation');104105 // Create a nested NFT token106 const tokenA = await createItemExpectSuccess(alice, collectionA, 'NFT', targetAddress);107 children = await getTokenChildren(api, collectionA, targetToken);108 expect(children.length).to.be.equal(1, 'Children length check at nesting #1');109 expect(children).to.have.deep.members([110 {token: tokenA, collection: collectionA},111 ], 'Children contents check at nesting #1');112113 // Create then nest114 const tokenB = await createItemExpectSuccess(alice, collectionA, 'NFT');115 await transferExpectSuccess(collectionA, tokenB, alice, targetAddress);116 children = await getTokenChildren(api, collectionA, targetToken);117 expect(children.length).to.be.equal(2, 'Children length check at nesting #2');118 expect(children).to.have.deep.members([119 {token: tokenA, collection: collectionA},120 {token: tokenB, collection: collectionA},121 ], 'Children contents check at nesting #2');122123 // Move token B to a different user outside the nesting tree124 await transferExpectSuccess(collectionA, tokenB, alice, bob);125 children = await getTokenChildren(api, collectionA, targetToken);126 expect(children.length).to.be.equal(1, 'Children length check at unnesting');127 expect(children).to.be.have.deep.members([128 {token: tokenA, collection: collectionA},129 ], 'Children contents check at unnesting');130131 // Create a fungible token in another collection and then nest132 const tokenC = await createItemExpectSuccess(alice, collectionB, 'Fungible');133 await transferExpectSuccess(collectionB, tokenC, alice, targetAddress, 1, 'Fungible');134 children = await getTokenChildren(api, collectionA, targetToken);135 expect(children.length).to.be.equal(2, 'Children length check at nesting #3 (from another collection)');136 expect(children).to.be.have.deep.members([137 {token: tokenA, collection: collectionA},138 {token: tokenC, collection: collectionB},139 ], 'Children contents check at nesting #3 (from another collection)');140141 // Move the fungible token inside token A deeper in the nesting tree142 await transferFromExpectSuccess(collectionB, tokenC, alice, targetAddress, {Ethereum: tokenIdToAddress(collectionA, tokenA)}, 1, 'Fungible');143 children = await getTokenChildren(api, collectionA, targetToken);144 expect(children.length).to.be.equal(1, 'Children length check at deeper nesting');145 expect(children).to.be.have.deep.members([146 {token: tokenA, collection: collectionA},147 ], 'Children contents check at deeper nesting');148 });149 });150151 // ---------- Non-Fungible ----------152153 it('NFT: allows an Owner to nest/unnest their token', async () => {154 await usingApi(async api => {155 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});156 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {tokenOwner: true}});157 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');158159 // Create a nested token160 const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});161 expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});162 expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});163164 // Create a token to be nested and nest165 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');166 await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});167 expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});168 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});169 });170 });171172 it('NFT: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {173 await usingApi(async api => {174 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});175 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {tokenOwner: true, restricted:[collection]}});176 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');177178 // Create a nested token179 const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});180 expect(await getTopmostTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Substrate: alice.address});181 expect(await getTokenOwner(api, collection, nestedToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});182183 // Create a token to be nested and nest184 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');185 await transferExpectSuccess(collection, newToken, alice, {Ethereum: tokenIdToAddress(collection, targetToken)});186 expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});187 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Ethereum: tokenIdToAddress(collection, targetToken).toLowerCase()});188 });189 });190191 // ---------- Fungible ----------192193 it('Fungible: allows an Owner to nest/unnest their token', async () => {194 await usingApi(async api => {195 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});196 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true}});197 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});198 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};199200 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});201202 // Create a nested token203 await expect(executeTransaction(api, alice, api.tx.unique.createItem(204 collectionFT,205 targetAddress,206 {Fungible: {Value: 10}},207 ))).to.not.be.rejected;208209 // Nest a new token210 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');211 await transferExpectSuccess(collectionFT, newToken, alice, targetAddress, 1, 'Fungible');212 });213 });214215 it('Fungible: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {216 await usingApi(async api => {217 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});218 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});219 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};220221 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});222223 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true, restricted: [collectionFT]}});224225 // Create a nested token226 await expect(executeTransaction(api, alice, api.tx.unique.createItem(227 collectionFT,228 targetAddress,229 {Fungible: {Value: 10}},230 ))).to.not.be.rejected;231232 // Nest a new token233 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');234 await transferExpectSuccess(collectionFT, newToken, alice, targetAddress, 1, 'Fungible');235 });236 });237238 // ---------- Re-Fungible ----------239240 it('ReFungible: allows an Owner to nest/unnest their token', async () => {241 await usingApi(async api => {242 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});243 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true}});244 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});245 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};246247 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});248249 // Create a nested token250 await expect(executeTransaction(api, alice, api.tx.unique.createItem(251 collectionRFT,252 targetAddress,253 {ReFungible: {const_data: [], pieces: 100}},254 ))).to.not.be.rejected;255256 // Nest a new token257 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');258 await transferExpectSuccess(collectionRFT, newToken, alice, targetAddress, 100, 'ReFungible');259 });260 });261262 it('ReFungible: allows an Owner to nest/unnest their token (Restricted nesting)', async () => {263 await usingApi(async api => {264 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});265 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT', {Substrate: alice.address});266 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};267268 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});269270 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true, restricted:[collectionRFT]}});271272 // Create a nested token273 await expect(executeTransaction(api, alice, api.tx.unique.createItem(274 collectionRFT,275 targetAddress,276 {ReFungible: {const_data: [], pieces: 100}},277 ))).to.not.be.rejected;278279 // Nest a new token280 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');281 await transferExpectSuccess(collectionRFT, newToken, alice, targetAddress, 100, 'ReFungible');282 });283 });284});285286describe('Negative Test: Nesting', async() => {287 before(async () => {288 await usingApi(async (api, privateKeyWrapper) => {289 alice = privateKeyWrapper('//Alice');290 bob = privateKeyWrapper('//Bob');291 });292 });293294 it('Disallows excessive token nesting', async () => {295 await usingApi(async api => {296 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});297 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {tokenOwner: true}});298 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');299300 const maxNestingLevel = 5;301 let prevToken = targetToken;302303 // Create a nested-token matryoshka304 for (let i = 0; i < maxNestingLevel; i++) {305 const nestedToken = await createItemExpectSuccess(306 alice,307 collection,308 'NFT',309 {Ethereum: tokenIdToAddress(collection, prevToken)},310 );311312 prevToken = nestedToken;313 }314315 // The nesting depth is limited by `maxNestingLevel`316 await expect(executeTransaction(api, alice, api.tx.unique.createItem(317 collection,318 {Ethereum: tokenIdToAddress(collection, prevToken)},319 {nft: {const_data: [], variable_data: []}} as any,320 )), 'while creating nested token').to.be.rejectedWith(/^structure\.DepthLimit$/);321322 expect(await getTopmostTokenOwner(api, collection, prevToken)).to.be.deep.equal({Substrate: alice.address});323 });324 });325326 // ---------- Non-Fungible ----------327328 it('NFT: disallows to nest token if nesting is disabled', async () => {329 await usingApi(async api => {330 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});331 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {}});332 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');333334 // Try to create a nested token335 await expect(executeTransaction(api, alice, api.tx.unique.createItem(336 collection,337 {Ethereum: tokenIdToAddress(collection, targetToken)},338 {nft: {const_data: [], variable_data: []}} as any,339 )), 'while creating nested token').to.be.rejectedWith(/^common\.UserIsNotAllowedToNest$/);340341 // Create a token to be nested342 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');343 // Try to nest344 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);345 expect(await getTopmostTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});346 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});347 });348 });349350 it('NFT: disallows a non-Owner to nest someone else\'s token', async () => {351 await usingApi(async api => {352 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});353 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {tokenOwner: true}});354355 await addToAllowListExpectSuccess(alice, collection, bob.address);356 await enableAllowListExpectSuccess(alice, collection);357 await enablePublicMintingExpectSuccess(alice, collection);358359 // Create a token to attempt to be nested into360 const targetToken = await createItemExpectSuccess(bob, collection, 'NFT');361362 // Try to create a nested token in the wrong collection363 await expect(executeTransaction(api, alice, api.tx.unique.createItem(364 collection,365 {Ethereum: tokenIdToAddress(collection, targetToken)},366 {nft: {const_data: [], variable_data: []}} as any,367 )), 'while creating nested token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);368369 // Try to create and nest a token in the wrong collection370 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');371 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.AddressNotInAllowlist/);372 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});373 });374 });375376 it('NFT: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {377 await usingApi(async api => {378 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});379 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {tokenOwner: true, restricted:[collection]}});380381 await addToAllowListExpectSuccess(alice, collection, bob.address);382 await enableAllowListExpectSuccess(alice, collection);383 await enablePublicMintingExpectSuccess(alice, collection);384385 // Create a token to attempt to be nested into386 const targetToken = await createItemExpectSuccess(bob, collection, 'NFT');387388 // Try to create a nested token in the wrong collection389 await expect(executeTransaction(api, alice, api.tx.unique.createItem(390 collection,391 {Ethereum: tokenIdToAddress(collection, targetToken)},392 {nft: {const_data: [], variable_data: []}} as any,393 )), 'while creating nested token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);394395 // Try to create and nest a token in the wrong collection396 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');397 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.AddressNotInAllowlist/);398 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});399 });400 });401402 it('NFT: disallows to nest token in an unlisted collection', async () => {403 await usingApi(async api => {404 const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});405 await setCollectionPermissionsExpectSuccess(alice, collection, {nesting: {tokenOwner: true, restricted:[]}});406407 // Create a token to attempt to be nested into408 const targetToken = await createItemExpectSuccess(alice, collection, 'NFT');409410 // Try to create a nested token in the wrong collection411 await expect(executeTransaction(api, alice, api.tx.unique.createItem(412 collection,413 {Ethereum: tokenIdToAddress(collection, targetToken)},414 {nft: {const_data: [], variable_data: []}} as any,415 )), 'while creating nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);416417 // Try to create and nest a token in the wrong collection418 const newToken = await createItemExpectSuccess(alice, collection, 'NFT');419 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collection, targetToken)}, collection, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);420 expect(await getTokenOwner(api, collection, newToken)).to.be.deep.equal({Substrate: alice.address});421 });422 });423424 // ---------- Fungible ----------425426 it('Fungible: disallows to nest token if nesting is disabled', async () => {427 await usingApi(async api => {428 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});429 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {}});430 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');431 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};432433 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});434435 // Try to create a nested token436 await expect(executeTransaction(api, alice, api.tx.unique.createItem(437 collectionFT,438 targetAddress,439 {Fungible: {Value: 10}},440 )), 'while creating nested token').to.be.rejectedWith(/^common\.UserIsNotAllowedToNest$/);441442 // Create a token to be nested443 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');444 // Try to nest445 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);446447 // Create another token to be nested448 const newToken2 = await createItemExpectSuccess(alice, collectionFT, 'Fungible');449 // Try to nest inside a fungible token450 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collectionFT, newToken)}, collectionFT, newToken2, 1)), 'while nesting new token inside fungible').to.be.rejectedWith(/fungible\.FungibleDisallowsNesting/);451 });452 });453454 it('Fungible: disallows a non-Owner to nest someone else\'s token', async () => {455 await usingApi(async api => {456 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});457 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true}});458459 await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);460 await enableAllowListExpectSuccess(alice, collectionNFT);461 await enablePublicMintingExpectSuccess(alice, collectionNFT);462463 // Create a token to attempt to be nested into464 const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');465 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};466467 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});468469 // Try to create a nested token in the wrong collection470 await expect(executeTransaction(api, alice, api.tx.unique.createItem(471 collectionFT,472 targetAddress,473 {Fungible: {Value: 10}},474 )), 'while creating nested token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);475476 // Try to create and nest a token in the wrong collection477 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');478 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);479 });480 });481482 it('Fungible: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {483 await usingApi(async api => {484 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});485 await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);486 await enableAllowListExpectSuccess(alice, collectionNFT);487 await enablePublicMintingExpectSuccess(alice, collectionNFT);488489 // Create a token to attempt to be nested into490 const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');491 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};492493 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});494 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true, restricted:[collectionFT]}});495496 // Try to create a nested token in the wrong collection497 await expect(executeTransaction(api, alice, api.tx.unique.createItem(498 collectionFT,499 targetAddress,500 {Fungible: {Value: 10}},501 )), 'while creating nested token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);502503 // Try to create and nest a token in the wrong collection504 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');505 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);506 });507 });508509 it('Fungible: disallows to nest token in an unlisted collection', async () => {510 await usingApi(async api => {511 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});512 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true, restricted:[]}});513514 // Create a token to attempt to be nested into515 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');516 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};517518 const collectionFT = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});519520 // Try to create a nested token in the wrong collection521 await expect(executeTransaction(api, alice, api.tx.unique.createItem(522 collectionFT,523 targetAddress,524 {Fungible: {Value: 10}},525 )), 'while creating a nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);526527 // Try to create and nest a token in the wrong collection528 const newToken = await createItemExpectSuccess(alice, collectionFT, 'Fungible');529 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);530 });531 });532533 // ---------- Re-Fungible ----------534535 it('ReFungible: disallows to nest token if nesting is disabled', async () => {536 await usingApi(async api => {537 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});538 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {}});539 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');540 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};541542 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});543544 // Create a nested token545 await expect(executeTransaction(api, alice, api.tx.unique.createItem(546 collectionRFT,547 targetAddress,548 {ReFungible: {const_data: [], pieces: 100}},549 )), 'while creating a nested token').to.be.rejectedWith(/^common\.UserIsNotAllowedToNest$/);550551 // Create a token to be nested552 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');553 // Try to nest554 await transferExpectFailure(collectionRFT, newToken, alice, targetAddress, 100);555 // Try to nest556 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);557558 // Create another token to be nested559 const newToken2 = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');560 // Try to nest inside a fungible token561 await expect(executeTransaction(api, alice, api.tx.unique.transfer({Ethereum: tokenIdToAddress(collectionRFT, newToken)}, collectionRFT, newToken2, 1)), 'while nesting new token inside refungible').to.be.rejectedWith(/refungible\.RefungibleDisallowsNesting/);562 });563 });564565 it('ReFungible: disallows a non-Owner to nest someone else\'s token', async () => {566 await usingApi(async api => {567 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});568 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true}});569570 await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);571 await enableAllowListExpectSuccess(alice, collectionNFT);572 await enablePublicMintingExpectSuccess(alice, collectionNFT);573574 // Create a token to attempt to be nested into575 const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');576 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};577578 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});579580 // Try to create a nested token in the wrong collection581 await expect(executeTransaction(api, alice, api.tx.unique.createItem(582 collectionRFT,583 targetAddress,584 {ReFungible: {const_data: [], pieces: 100}},585 )), 'while creating a nested token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);586587 // Try to create and nest a token in the wrong collection588 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');589 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);590 });591 });592593 it('ReFungible: disallows a non-Owner to nest someone else\'s token (Restricted nesting)', async () => {594 await usingApi(async api => {595 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});596 await addToAllowListExpectSuccess(alice, collectionNFT, bob.address);597 await enableAllowListExpectSuccess(alice, collectionNFT);598 await enablePublicMintingExpectSuccess(alice, collectionNFT);599600 // Create a token to attempt to be nested into601 const targetToken = await createItemExpectSuccess(bob, collectionNFT, 'NFT');602 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};603604 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});605 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true, restricted:[collectionRFT]}});606607 // Try to create a nested token in the wrong collection608 await expect(executeTransaction(api, alice, api.tx.unique.createItem(609 collectionRFT,610 targetAddress,611 {ReFungible: {const_data: [], pieces: 100}},612 )), 'while creating a nested token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);613614 // Try to create and nest a token in the wrong collection615 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');616 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.UserIsNotAllowedToNest/);617 });618 });619620 it('ReFungible: disallows to nest token to an unlisted collection', async () => {621 await usingApi(async api => {622 const collectionNFT = await createCollectionExpectSuccess({mode: {type: 'NFT'}});623 await setCollectionPermissionsExpectSuccess(alice, collectionNFT, {nesting: {tokenOwner: true, restricted:[]}});624625 // Create a token to attempt to be nested into626 const targetToken = await createItemExpectSuccess(alice, collectionNFT, 'NFT');627 const targetAddress = {Ethereum: tokenIdToAddress(collectionNFT, targetToken)};628629 const collectionRFT = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});630631 // Try to create a nested token in the wrong collection632 await expect(executeTransaction(api, alice, api.tx.unique.createItem(633 collectionRFT,634 targetAddress,635 {ReFungible: {const_data: [], pieces: 100}},636 )), 'while creating a nested token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);637638 // Try to create and nest a token in the wrong collection639 const newToken = await createItemExpectSuccess(alice, collectionRFT, 'ReFungible');640 await expect(executeTransaction(api, alice, api.tx.unique.transfer(targetAddress, collectionRFT, newToken, 1)), 'while nesting new token').to.be.rejectedWith(/common\.SourceCollectionIsNotAllowedToNest/);641 });642 });643});tests/src/transferFrom.test.tsdiffbeforeafterboth--- a/tests/src/transferFrom.test.ts
+++ b/tests/src/transferFrom.test.ts
@@ -99,6 +99,7 @@
it('can be called by collection owner on non-owned item when OwnerCanTransfer == true', async () => {
const collectionId = await createCollectionExpectSuccess();
+ await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: true});
const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);
await transferFromExpectSuccess(collectionId, itemId, alice, bob, charlie);
@@ -257,6 +258,7 @@
await usingApi(async () => {
// nft
const nftCollectionId = await createCollectionExpectSuccess();
+ await setCollectionLimitsExpectSuccess(alice, nftCollectionId, {ownerCanTransfer: true});
const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');
await burnItemExpectSuccess(alice, nftCollectionId, newNftTokenId, 1);
await approveExpectFail(nftCollectionId, newNftTokenId, alice, bob);
@@ -266,6 +268,7 @@
it('transferFrom burnt token before approve Fungible', async () => {
await usingApi(async () => {
const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
+ await setCollectionLimitsExpectSuccess(alice, fungibleCollectionId, {ownerCanTransfer: true});
const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');
await burnItemExpectSuccess(alice, fungibleCollectionId, newFungibleTokenId, 10);
await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address);
@@ -276,6 +279,7 @@
it('transferFrom burnt token before approve ReFungible', async () => {
await usingApi(async () => {
const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
+ await setCollectionLimitsExpectSuccess(alice, reFungibleCollectionId, {ownerCanTransfer: true});
const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');
await burnItemExpectSuccess(alice, reFungibleCollectionId, newReFungibleTokenId, 100);
await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, alice, bob);
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -921,6 +921,18 @@
});
}
+export async function adminApproveFromExpectFail(
+ collectionId: number,
+ tokenId: number, admin: IKeyringPair, owner: CrossAccountId | string, approved: CrossAccountId | string, amount: number | bigint = 1,
+) {
+ await usingApi(async (api: ApiPromise) => {
+ const approveUniqueTx = api.tx.unique.approve(normalizeAccountId(approved), collectionId, tokenId, amount);
+ const events = await expect(submitTransactionAsync(admin, approveUniqueTx)).to.be.rejected;
+ const result = getGenericResult(events);
+ expect(result.success).to.be.false;
+ });
+}
+
export async function
getFreeBalance(account: IKeyringPair): Promise<bigint> {
let balance = 0n;