difftreelog
fix deny zero NFT transfer/burn if not owned/allowed
in: master
2 files changed
pallets/nonfungible/src/common.rsdiffbeforeafterboth291 <CommonWeights<T>>::burn_item(),291 <CommonWeights<T>>::burn_item(),292 )292 )293 } else {293 } else {294 <Pallet<T>>::check_token_immediate_ownership(self, token, &sender)?;294 Ok(().into())295 Ok(().into())295 }296 }296 }297 }320 <CommonWeights<T>>::transfer(),321 <CommonWeights<T>>::transfer(),321 )322 )322 } else {323 } else {324 <Pallet<T>>::check_token_immediate_ownership(self, token, &from)?;323 Ok(().into())325 Ok(().into())324 }326 }325 }327 }360 <CommonWeights<T>>::transfer_from(),362 <CommonWeights<T>>::transfer_from(),361 )363 )362 } else {364 } else {365 <Pallet<T>>::check_allowed(self, &sender, &from, token, nesting_budget)?;366363 Ok(().into())367 Ok(().into())364 }368 }380 <CommonWeights<T>>::burn_from(),384 <CommonWeights<T>>::burn_from(),381 )385 )382 } else {386 } else {387 <Pallet<T>>::check_allowed(self, &sender, &from, token, nesting_budget)?;388383 Ok(().into())389 Ok(().into())384 }390 }pallets/nonfungible/src/lib.rsdiffbeforeafterboth814 <PalletCommon<T>>::set_property_permission(collection, sender, permission)814 <PalletCommon<T>>::set_property_permission(collection, sender, permission)815 }815 }816817 pub fn check_token_immediate_ownership(818 collection: &NonfungibleHandle<T>,819 token: TokenId,820 possible_owner: &T::CrossAccountId,821 ) -> DispatchResult {822 let token_data =823 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;824 ensure!(825 &token_data.owner == possible_owner,826 <CommonError<T>>::NoPermission827 );828 Ok(())829 }816830817 /// Transfer NFT token from one account to another.831 /// Transfer NFT token from one account to another.818 ///832 ///