difftreelog
fix sponsoring token ownership check
in: master
3 files changed
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -52,7 +52,7 @@
StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u128, QueryKind = ValueQuery>;
#[pallet::storage]
- pub(super) type Balance<T: Config> = StorageNMap<
+ pub type Balance<T: Config> = StorageNMap<
Key = (
Key<Twox64Concat, CollectionId>,
Key<Blake2_128Concat, T::CrossAccountId>,
pallets/nft/src/eth/sponsoring.rsdiffbeforeafterboth--- a/pallets/nft/src/eth/sponsoring.rs
+++ b/pallets/nft/src/eth/sponsoring.rs
@@ -10,7 +10,7 @@
use core::convert::TryInto;
use nft_data_structs::TokenId;
use up_evm_mapping::EvmBackwardsAddressMapping;
-use pallet_evm::AddressMapping;
+use pallet_common::account::CrossAccountId;
use pallet_nonfungible::erc::{UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721Call};
use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
@@ -23,7 +23,7 @@
let sponsor = collection.sponsorship.sponsor()?.clone();
let sponsor =
<T as pallet_common::Config>::EvmBackwardsAddressMapping::from_account_id(sponsor);
- let who = <T as pallet_common::Config>::EvmAddressMapping::into_account_id(*who);
+ let who = T::CrossAccountId::from_eth(*who);
let (method_id, mut reader) = AbiReader::new_call(&call.1).ok()?;
match &collection.mode {
crate::CollectionMode::NFT => {
@@ -31,14 +31,19 @@
match call {
UniqueNFTCall::ERC721UniqueExtensions(
ERC721UniqueExtensionsCall::Transfer { token_id, .. },
- )
- | UniqueNFTCall::ERC721(ERC721Call::TransferFrom { token_id, .. }) => {
+ ) => {
let token_id: TokenId = token_id.try_into().ok()?;
withdraw_transfer::<T>(&collection, &who, &token_id).map(|()| sponsor)
}
+ UniqueNFTCall::ERC721(ERC721Call::TransferFrom { token_id, from, .. }) => {
+ let token_id: TokenId = token_id.try_into().ok()?;
+ let from = T::CrossAccountId::from_eth(from);
+ withdraw_transfer::<T>(&collection, &from, &token_id).map(|()| sponsor)
+ }
UniqueNFTCall::ERC721(ERC721Call::Approve { token_id, .. }) => {
let token_id: TokenId = token_id.try_into().ok()?;
- withdraw_approve::<T>(&collection, &who, &token_id).map(|()| sponsor)
+ withdraw_approve::<T>(&collection, who.as_sub(), &token_id)
+ .map(|()| sponsor)
}
_ => None,
}
@@ -47,12 +52,17 @@
let call = UniqueFungibleCall::parse(method_id, &mut reader).ok()??;
#[allow(clippy::single_match)]
match call {
- UniqueFungibleCall::ERC20(
- ERC20Call::Transfer { .. } | ERC20Call::TransferFrom { .. },
- ) => withdraw_transfer::<T>(&collection, &who, &TokenId::default())
- .map(|()| sponsor),
+ UniqueFungibleCall::ERC20(ERC20Call::Transfer { .. }) => {
+ withdraw_transfer::<T>(&collection, &who, &TokenId::default())
+ .map(|()| sponsor)
+ }
+ UniqueFungibleCall::ERC20(ERC20Call::TransferFrom { from, .. }) => {
+ let from = T::CrossAccountId::from_eth(from);
+ withdraw_transfer::<T>(&collection, &from, &TokenId::default())
+ .map(|()| sponsor)
+ }
UniqueFungibleCall::ERC20(ERC20Call::Approve { .. }) => {
- withdraw_approve::<T>(&collection, &who, &TokenId::default())
+ withdraw_approve::<T>(&collection, who.as_sub(), &TokenId::default())
.map(|()| sponsor)
}
_ => None,
pallets/nft/src/sponsorship.rsdiffbeforeafterboth1use crate::{2 Config, Call, CreateItemBasket, VariableMetaDataBasket, ReFungibleTransferBasket,3 FungibleTransferBasket, NftTransferBasket, CreateItemData, CollectionMode, NftApproveBasket,4 FungibleApproveBasket, RefungibleApproveBasket,5};6use core::marker::PhantomData;7use up_sponsorship::SponsorshipHandler;8use frame_support::{9 traits::{IsSubType},10 storage::{StorageMap, StorageDoubleMap, StorageNMap},11};12use nft_data_structs::{13 CollectionId, FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, NFT_SPONSOR_TRANSFER_TIMEOUT,14 REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, TokenId,15};16use pallet_common::{CollectionHandle};17use pallet_common::account::CrossAccountId;1819pub fn withdraw_transfer<T: Config>(20 collection: &CollectionHandle<T>,21 who: &T::AccountId,22 item_id: &TokenId,23) -> Option<()> {24 // preliminary sponsoring correctness check25 if !((pallet_nonfungible::TokenData::<T>::get((collection.id, item_id))?.owner).as_sub() == who)26 || (pallet_refungible::Owned::<T>::get((27 collection.id,28 T::CrossAccountId::from_sub(who.clone()),29 item_id,30 ))) {31 return None;32 }3334 // sponsor timeout35 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;36 let limit = collection37 .limits38 .sponsor_transfer_timeout(match collection.mode {39 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,40 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,41 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,42 });4344 let last_tx_block = match collection.mode {45 CollectionMode::NFT => <NftTransferBasket<T>>::get(collection.id, item_id),46 CollectionMode::Fungible(_) => <FungibleTransferBasket<T>>::get(collection.id, who),47 CollectionMode::ReFungible => {48 <ReFungibleTransferBasket<T>>::get((collection.id, item_id, who))49 }50 };5152 if let Some(last_tx_block) = last_tx_block {53 let timeout = last_tx_block + limit.into();54 if block_number < timeout {55 return None;56 }57 }5859 match collection.mode {60 CollectionMode::NFT => <NftTransferBasket<T>>::insert(collection.id, item_id, block_number),61 CollectionMode::Fungible(_) => {62 <FungibleTransferBasket<T>>::insert(collection.id, who, block_number)63 }64 CollectionMode::ReFungible => {65 <ReFungibleTransferBasket<T>>::insert((collection.id, item_id, who), block_number)66 }67 };6869 Some(())70}7172pub fn withdraw_create_item<T: Config>(73 collection: &CollectionHandle<T>,74 who: &T::AccountId,75 _properties: &CreateItemData,76) -> Option<()> {77 if _properties.data_size() as u32 > collection.limits.sponsored_data_size() {78 return None;79 }8081 // sponsor timeout82 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;83 let limit = collection84 .limits85 .sponsor_transfer_timeout(match _properties {86 CreateItemData::NFT(_) => NFT_SPONSOR_TRANSFER_TIMEOUT,87 CreateItemData::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,88 CreateItemData::ReFungible(_) => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,89 });9091 if let Some(last_tx_block) = <CreateItemBasket<T>>::get((collection.id, &who)) {92 let timeout = last_tx_block + limit.into();93 if block_number < timeout {94 return None;95 }96 }9798 CreateItemBasket::<T>::insert((collection.id, who.clone()), block_number);99100 Some(())101}102103pub fn withdraw_set_variable_meta_data<T: Config>(104 who: &T::AccountId,105 collection: &CollectionHandle<T>,106 item_id: &TokenId,107 data: &[u8],108) -> Option<()> {109 // preliminary sponsoring correctness check110 if !((pallet_nonfungible::TokenData::<T>::get((collection.id, item_id))?.owner).as_sub() == who)111 || (pallet_refungible::Owned::<T>::get((112 collection.id,113 T::CrossAccountId::from_sub(who.clone()),114 item_id,115 ))) {116 return None;117 }118119 // Can't sponsor fungible collection, this tx will be rejected120 // as invalid121 if matches!(collection.mode, CollectionMode::Fungible(_)) {122 return None;123 }124 if data.len() > collection.limits.sponsored_data_size() as usize {125 return None;126 }127128 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;129 let limit = collection.limits.sponsored_data_rate_limit()?;130131 if let Some(last_tx_block) = VariableMetaDataBasket::<T>::get(collection.id, item_id) {132 let timeout = last_tx_block + limit.into();133 if block_number < timeout {134 return None;135 }136 }137138 <VariableMetaDataBasket<T>>::insert(collection.id, item_id, block_number);139140 Some(())141}142143pub fn withdraw_approve<T: Config>(144 collection: &CollectionHandle<T>,145 who: &T::AccountId,146 item_id: &TokenId,147) -> Option<()> {148 // sponsor timeout149 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;150 let limit = collection.limits.sponsor_approve_timeout();151152 let last_tx_block = match collection.mode {153 CollectionMode::NFT => <NftApproveBasket<T>>::get(collection.id, item_id),154 CollectionMode::Fungible(_) => <FungibleApproveBasket<T>>::get(collection.id, who),155 CollectionMode::ReFungible => {156 <RefungibleApproveBasket<T>>::get((collection.id, item_id, who))157 }158 };159160 if let Some(last_tx_block) = last_tx_block {161 let timeout = last_tx_block + limit.into();162 if block_number < timeout {163 return None;164 }165 }166167 match collection.mode {168 CollectionMode::NFT => <NftApproveBasket<T>>::insert(collection.id, item_id, block_number),169 CollectionMode::Fungible(_) => {170 <FungibleApproveBasket<T>>::insert(collection.id, who, block_number)171 }172 CollectionMode::ReFungible => {173 <RefungibleApproveBasket<T>>::insert((collection.id, item_id, who), block_number)174 }175 };176177 Some(())178}179180fn load<T: Config>(id: CollectionId) -> Option<(T::AccountId, CollectionHandle<T>)> {181 let collection = CollectionHandle::new(id)?;182 let sponsor = collection.sponsorship.sponsor().cloned()?;183 Some((sponsor, collection))184}185186pub struct NftSponsorshipHandler<T>(PhantomData<T>);187impl<T, C> SponsorshipHandler<T::AccountId, C> for NftSponsorshipHandler<T>188where189 T: Config,190 C: IsSubType<Call<T>>,191{192 fn get_sponsor(who: &T::AccountId, call: &C) -> Option<T::AccountId> {193 match IsSubType::<Call<T>>::is_sub_type(call)? {194 Call::create_item {195 collection_id,196 data,197 ..198 } => {199 let (sponsor, collection) = load(*collection_id)?;200 withdraw_create_item::<T>(&collection, who, data).map(|()| sponsor)201 }202 Call::transfer {203 collection_id,204 item_id,205 ..206 }207 | Call::transfer_from {208 collection_id,209 item_id,210 ..211 } => {212 let (sponsor, collection) = load(*collection_id)?;213 withdraw_transfer::<T>(&collection, who, item_id).map(|()| sponsor)214 }215 Call::approve {216 collection_id,217 item_id,218 ..219 } => {220 let (sponsor, collection) = load(*collection_id)?;221 withdraw_approve::<T>(&collection, who, item_id).map(|()| sponsor)222 }223 Call::set_variable_meta_data {224 collection_id,225 item_id,226 data,227 } => {228 let (sponsor, collection) = load(*collection_id)?;229 withdraw_set_variable_meta_data::<T>(&who, &collection, item_id, data)230 .map(|()| sponsor)231 }232 _ => None,233 }234 }235}