`570880cf1d2e`

9 files changed

modifiedpallets/nft/src/lib.rsdiff before after both

--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -987,12 +987,12 @@
 		/// * item_id: ID of NFT to burn.
 		#[weight = <SelfWeightOf<T>>::burn_item()]
 		#[transactional]
-		pub fn burn_item(origin, collection_id: CollectionId, item_id: TokenId, value: u128) -> DispatchResult {
+		pub fn burn_item(origin, collection_id: CollectionId, item_id: TokenId, item_owner: T::CrossAccountId, value: u128) -> DispatchResult {
 
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let target_collection = Self::get_collection(collection_id)?;
 
-			Self::burn_item_internal(&sender, &target_collection, item_id, value)?;
+			Self::burn_item_internal(&sender, &target_collection, item_id, &item_owner, value)?;
 
 			target_collection.submit_logs()
 		}
@@ -1596,6 +1596,7 @@
 		sender: &T::CrossAccountId,
 		collection: &CollectionHandle<T>,
 		item_id: TokenId,
+		item_owner: &T::CrossAccountId,
 		value: u128,
 	) -> DispatchResult {
 		ensure!(
@@ -1611,8 +1612,11 @@
 
 		match collection.mode {
 			CollectionMode::NFT => Self::burn_nft_item(collection, item_id)?,
-			CollectionMode::Fungible(_) => Self::burn_fungible_item(sender, collection, value)?,
-			CollectionMode::ReFungible => Self::burn_refungible_item(collection, item_id, sender)?,
+			CollectionMode::Fungible(_) => Self::burn_fungible_item(collection, item_owner, value)?,
+			CollectionMode::ReFungible => {
+				Self::burn_refungible_item(collection, item_id, item_owner)?
+			}
+			_ => (),
 		};
 
 		Ok(())
@@ -1947,8 +1951,8 @@
 	}
 
 	fn burn_fungible_item(
-		owner: &T::CrossAccountId,
 		collection: &CollectionHandle<T>,
+		owner: &T::CrossAccountId,
 		value: u128,
 	) -> DispatchResult {
 		let collection_id = collection.id;

modifiedpallets/nft/src/tests.rsdiff before after both

--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -707,9 +707,15 @@
 		assert_eq!(TemplateModule::balance_count(1, 1), 1);
 
 		// burn item
-		assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1, 5));
+		assert_ok!(TemplateModule::burn_item(
+			origin1.clone(),
+			1,
+			1,
+			account(1),
+			5
+		));
 		assert_noop!(
-			TemplateModule::burn_item(origin1, 1, 1, 5),
+			TemplateModule::burn_item(origin1, 1, 1, account(1), 5),
 			Error::<Test>::TokenNotFound
 		);
 
@@ -736,9 +742,15 @@
 		assert_eq!(TemplateModule::balance_count(1, 1), 5);
 
 		// burn item
-		assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1, 5));
+		assert_ok!(TemplateModule::burn_item(
+			origin1.clone(),
+			1,
+			1,
+			account(1),
+			5
+		));
 		assert_noop!(
-			TemplateModule::burn_item(origin1, 1, 1, 5),
+			TemplateModule::burn_item(origin1, 1, 1, account(1), 5),
 			Error::<Test>::TokenValueNotEnough
 		);
 
@@ -781,9 +793,15 @@
 		assert_eq!(TemplateModule::balance_count(1, 1), 1023);
 
 		// burn item
-		assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1, 1023));
+		assert_ok!(TemplateModule::burn_item(
+			origin1.clone(),
+			1,
+			1,
+			account(1),
+			1023
+		));
 		assert_noop!(
-			TemplateModule::burn_item(origin1, 1, 1, 1023),
+			TemplateModule::burn_item(origin1, 1, 1, account(1), 1023),
 			Error::<Test>::TokenNotFound
 		);
 
@@ -1378,7 +1396,7 @@
 			AccessMode::WhiteList
 		));
 		assert_noop!(
-			TemplateModule::burn_item(origin1, 1, 1, 5),
+			TemplateModule::burn_item(origin1.clone(), 1, 1, account(1), 5),
 			Error::<Test>::AddresNotInWhiteList
 		);
 	});

modifiedtests/src/burnItem.test.tsdiff before after both

38    const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);38    const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
3939
40    await usingApi(async (api) => {40    await usingApi(async (api) => {
41      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);41      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
42      const events = await submitTransactionAsync(alice, tx);42      const events = await submitTransactionAsync(alice, tx);
43      const result = getGenericResult(events);43      const result = getGenericResult(events);
44      // Get the item44      // Get the item
5959
60    await usingApi(async (api) => {60    await usingApi(async (api) => {
61      // Destroy 1 of 1061      // Destroy 1 of 10
62      const tx = api.tx.nft.burnItem(collectionId, tokenId, 1);62      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 1);
63      const events = await submitTransactionAsync(alice, tx);63      const events = await submitTransactionAsync(alice, tx);
64      const result = getGenericResult(events);64      const result = getGenericResult(events);
65  65  
79    const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);79    const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
8080
81    await usingApi(async (api) => {81    await usingApi(async (api) => {
82      const tx = api.tx.nft.burnItem(collectionId, tokenId, 1);82      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 1);
83      const events = await submitTransactionAsync(alice, tx);83      const events = await submitTransactionAsync(alice, tx);
84      const result = getGenericResult(events);84      const result = getGenericResult(events);
85  85  
107      const balanceBefore: any = (await api.query.nft.reFungibleItemList(collectionId, tokenId)).toJSON();107      const balanceBefore: any = (await api.query.nft.reFungibleItemList(collectionId, tokenId)).toJSON();
108108
109      // Bob burns his portion109      // Bob burns his portion
110      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);110      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(bob.address), 0);
111      const events2 = await submitTransactionAsync(bob, tx);111      const events2 = await submitTransactionAsync(bob, tx);
112      const result2 = getGenericResult(events2);112      const result2 = getGenericResult(events2);
113113
152    await addCollectionAdminExpectSuccess(alice, collectionId, bob);152    await addCollectionAdminExpectSuccess(alice, collectionId, bob);
153153
154    await usingApi(async (api) => {154    await usingApi(async (api) => {
155      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);155      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
156      const events = await submitTransactionAsync(bob, tx);156      const events = await submitTransactionAsync(bob, tx);
157      const result = getGenericResult(events);157      const result = getGenericResult(events);
158      // Get the item158      // Get the item
166  });166  });
167
168
169  it('Burn item in Fungible collection', async () => {
170    const createMode = 'Fungible';
171    const collectionId = await createCollectionExpectSuccess({mode: {type: createMode, decimalPoints: 0 }});
172    await createItemExpectSuccess(alice, collectionId, createMode); // Helper creates 10 fungible tokens
173    await addCollectionAdminExpectSuccess(alice, collectionId, bob);
174    const tokenId = 0; // ignored
175
176    await usingApi(async (api) => {
177      // Destroy 1 of 10
178      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 1);
179      const events = await submitTransactionAsync(bob, tx);
180      const result = getGenericResult(events);
181  
182      // Get alice balance 
183      const balance: any = (await api.query.nft.fungibleItemList(collectionId, alice.address)).toJSON();
184 
185      // What to expect
186      expect(result.success).to.be.true;
187      expect(balance).to.be.not.null;
188      expect(balance.Value).to.be.equal(9);
189    });
190  });
191  
192  it('Burn item in ReFungible collection', async () => {
193    const createMode = 'ReFungible';
194    const collectionId = await createCollectionExpectSuccess({mode: {type: createMode }});
195    const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
196    await addCollectionAdminExpectSuccess(alice, collectionId, bob);
197
198    await usingApi(async (api) => {
199      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 1);
200      const events = await submitTransactionAsync(bob, tx);
201      const result = getGenericResult(events);
202      // Get alice balance 
203      const balance: any = (await api.query.nft.reFungibleItemList(collectionId, tokenId)).toJSON();
204      
205      // What to expect
206      expect(result.success).to.be.true;
207      expect(balance).to.be.null;
208    });
209  });
167});210});
168211
169describe('Negative integration test: ext. burnItem():', () => {212describe('Negative integration test: ext. burnItem():', () => {
182    await destroyCollectionExpectSuccess(collectionId);225    await destroyCollectionExpectSuccess(collectionId);
183226
184    await usingApi(async (api) => {227    await usingApi(async (api) => {
185      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);228      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
186      const badTransaction = async function () { 229      const badTransaction = async function () { 
187        await submitTransactionExpectFailAsync(alice, tx);230        await submitTransactionExpectFailAsync(alice, tx);
188      };231      };
197    const tokenId = 10;240    const tokenId = 10;
198241
199    await usingApi(async (api) => {242    await usingApi(async (api) => {
200      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);243      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
201      const badTransaction = async function () { 244      const badTransaction = async function () { 
202        await submitTransactionExpectFailAsync(alice, tx);245        await submitTransactionExpectFailAsync(alice, tx);
203      };246      };
212    const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);255    const tokenId = await createItemExpectSuccess(alice, collectionId, createMode);
213256
214    await usingApi(async (api) => {257    await usingApi(async (api) => {
215      const tx = api.tx.nft.burnItem(collectionId, tokenId, 0);258      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
216      const badTransaction = async function () { 259      const badTransaction = async function () { 
217        await submitTransactionExpectFailAsync(bob, tx);260        await submitTransactionExpectFailAsync(bob, tx);
218      };261      };
228271
229    await usingApi(async (api) => {272    await usingApi(async (api) => {
230273
231      const burntx = api.tx.nft.burnItem(collectionId, tokenId, 0);274      const burntx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 0);
232      const events1 = await submitTransactionAsync(alice, burntx);275      const events1 = await submitTransactionAsync(alice, burntx);
233      const result1 = getGenericResult(events1);276      const result1 = getGenericResult(events1);
234      expect(result1.success).to.be.true;277      expect(result1.success).to.be.true;
251294
252    await usingApi(async (api) => {295    await usingApi(async (api) => {
253      // Destroy 11 of 10296      // Destroy 11 of 10
254      const tx = api.tx.nft.burnItem(collectionId, tokenId, 11);297      const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(alice.address), 11);
255      const badTransaction = async function () { 298      const badTransaction = async function () { 
256        await submitTransactionExpectFailAsync(alice, tx);299        await submitTransactionExpectFailAsync(alice, tx);
257      };300      };

modifiedtests/src/check-event/burnItemEvent.test.tsdiff before after both

--- a/tests/src/check-event/burnItemEvent.test.ts
+++ b/tests/src/check-event/burnItemEvent.test.ts
@@ -10,7 +10,7 @@
 import chaiAsPromised from 'chai-as-promised';
 import privateKey from '../substrate/privateKey';
 import usingApi, {submitTransactionAsync} from '../substrate/substrate-api';
-import { createCollectionExpectSuccess, createItemExpectSuccess, nftEventMessage } from '../util/helpers';
+import { createCollectionExpectSuccess, createItemExpectSuccess, nftEventMessage, normalizeAccountId } from '../util/helpers';
 
 chai.use(chaiAsPromised);
 const expect = chai.expect;
@@ -29,7 +29,7 @@
     await usingApi(async (api: ApiPromise) => {
       const collectionID = await createCollectionExpectSuccess();
       const itemID = await createItemExpectSuccess(Alice, collectionID, 'NFT');
-      const burnItem = api.tx.nft.burnItem(collectionID, itemID, 1);
+      const burnItem = api.tx.nft.burnItem(collectionID, itemID, normalizeAccountId(Alice.address), 1);
       const events = await submitTransactionAsync(Alice, burnItem);
       const msg = JSON.stringify(nftEventMessage(events));
       expect(msg).to.be.contain(checkSection);

modifiedtests/src/collision-tests/admVsOwnerTake.test.tsdiff before after both

--- a/tests/src/collision-tests/admVsOwnerTake.test.ts
+++ b/tests/src/collision-tests/admVsOwnerTake.test.ts
@@ -34,7 +34,7 @@
       const itemId = await createItemExpectSuccess(Bob, collectionId, 'NFT');
       //
       const sendItem = api.tx.nft.transfer(normalizeAccountId(Ferdie.address), collectionId, itemId, 1);
-      const burnItem = api.tx.nft.burnItem(collectionId, itemId, 1);
+      const burnItem = api.tx.nft.burnItem(collectionId, itemId, normalizeAccountId(Alice.address), 1);
       await Promise.all([
         sendItem.signAndSend(Bob),
         burnItem.signAndSend(Alice),

modifiedtests/src/setVariableMetaData.test.tsdiff before after both

--- a/tests/src/setVariableMetaData.test.ts
+++ b/tests/src/setVariableMetaData.test.ts
@@ -116,7 +116,7 @@
   it('fails on removed token', async () => {
     const removedTokenCollectionId = await createCollectionExpectSuccess({ mode: { type: 'NFT' } });
     const removedTokenId = await createItemExpectSuccess(alice, removedTokenCollectionId, 'NFT');
-    await burnItemExpectSuccess(alice, removedTokenCollectionId, removedTokenId);
+    await burnItemExpectSuccess(alice, removedTokenCollectionId, removedTokenId, alice);
 
     await setVariableMetaDataExpectFailure(alice, removedTokenCollectionId, removedTokenId, data);
   });

modifiedtests/src/transfer.test.tsdiff before after both

--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -188,18 +188,18 @@
     // nft
     const nftCollectionId = await createCollectionExpectSuccess();
     const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
-    await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, 1);
+    await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, Alice, 1);
     await transferExpectFailure(nftCollectionId, newNftTokenId, Alice, Bob, 1);
     // fungible
     const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
     const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');
-    await burnItemExpectSuccess(Alice, fungibleCollectionId, newFungibleTokenId, 10);
+    await burnItemExpectSuccess(Alice, fungibleCollectionId, newFungibleTokenId, Alice, 10);
     await transferExpectFailure(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1);
     // reFungible
     const reFungibleCollectionId = await
     createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
     const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
-    await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);
+    await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, Alice, 1);
     await transferExpectFailure(
       reFungibleCollectionId,
       newReFungibleTokenId,

modifiedtests/src/transferFrom.test.tsdiff before after both

--- a/tests/src/transferFrom.test.ts
+++ b/tests/src/transferFrom.test.ts
@@ -246,7 +246,7 @@
       // nft
       const nftCollectionId = await createCollectionExpectSuccess();
       const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
-      await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, 1);
+      await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, Alice, 1);
       await approveExpectFail(nftCollectionId, newNftTokenId, Alice, Bob);
       await transferFromExpectFail(nftCollectionId, newNftTokenId, Bob, Alice, Charlie, 1);      
     });
@@ -255,7 +255,7 @@
     await usingApi(async () => {
       const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
       const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');
-      await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, 10);
+      await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, Alice, 10);
       await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob);
       await transferFromExpectFail(fungibleCollectionId, newFungibleTokenId, Bob, Alice, Charlie, 1);
           
@@ -265,7 +265,7 @@
     await usingApi(async () => {
       const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
       const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
-      await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);
+      await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, Alice, 1);
       await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);
       await transferFromExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice, Charlie, 1);
           
@@ -278,7 +278,7 @@
       const nftCollectionId = await createCollectionExpectSuccess();
       const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
       await approveExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob);
-      await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, 1);
+      await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, Alice, 1);
       await transferFromExpectFail(nftCollectionId, newNftTokenId, Bob, Alice, Charlie, 1);      
     });
   });
@@ -287,7 +287,7 @@
       const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
       const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');
       await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob);
-      await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, 10);
+      await burnItemExpectSuccess(Alice, fungibleCollectionId, 1, Alice, 10);
       await transferFromExpectFail(fungibleCollectionId, newFungibleTokenId, Bob, Alice, Charlie, 1);
           
     });
@@ -297,7 +297,7 @@
       const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
       const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
       await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, Alice, Bob);
-      await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);
+      await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, Alice, 1);
       await transferFromExpectFail(reFungibleCollectionId, newReFungibleTokenId, Bob, Alice, Charlie, 1);
           
     });

modifiedtests/src/util/helpers.tsdiff before after both

--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -700,10 +700,10 @@
   ReFungible: CreateReFungibleData;
 };
 
-export async function burnItemExpectSuccess(owner: IKeyringPair, collectionId: number, tokenId: number, value = 0) {
+export async function burnItemExpectSuccess(sender: IKeyringPair, collectionId: number, tokenId: number, owner: IKeyringPair, value = 0) {
   await usingApi(async (api) => {
-    const tx = api.tx.nft.burnItem(collectionId, tokenId, value);
-    const events = await submitTransactionAsync(owner, tx);
+    const tx = api.tx.nft.burnItem(collectionId, tokenId, normalizeAccountId(owner.address), value);
+    const events = await submitTransactionAsync(sender, tx);
     const result = getGenericResult(events);
     // Get the item
     const item: any = (await api.query.nft.nftItemList(collectionId, tokenId)).toJSON();