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, MetaUpdatePermission,14 NFT_SPONSOR_TRANSFER_TIMEOUT, 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::CrossAccountId,22 item_id: &TokenId,23) -> Option<()> {24 // preliminary sponsoring correctness check25 match collection.mode {26 CollectionMode::NFT => {27 let owner = pallet_nonfungible::TokenData::<T>::get((collection.id, item_id))?.owner;28 if !owner.conv_eq(who) {29 return None;30 }31 }32 CollectionMode::Fungible(_) => {33 if item_id != &TokenId::default() {34 return None;35 }36 if <pallet_fungible::Balance<T>>::get((collection.id, who)) == 0 {37 return None;38 }39 }40 CollectionMode::ReFungible => {41 if !<pallet_refungible::Owned<T>>::get((collection.id, who, item_id)) {42 return None;43 }44 }45 }4647 // sponsor timeout48 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;49 let limit = collection50 .limits51 .sponsor_transfer_timeout(match collection.mode {52 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,53 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,54 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,55 });5657 let last_tx_block = match collection.mode {58 CollectionMode::NFT => <NftTransferBasket<T>>::get(collection.id, item_id),59 CollectionMode::Fungible(_) => {60 <FungibleTransferBasket<T>>::get(collection.id, who.as_sub())61 }62 CollectionMode::ReFungible => {63 <ReFungibleTransferBasket<T>>::get((collection.id, item_id, who.as_sub()))64 }65 };6667 if let Some(last_tx_block) = last_tx_block {68 let timeout = last_tx_block + limit.into();69 if block_number < timeout {70 return None;71 }72 }7374 match collection.mode {75 CollectionMode::NFT => <NftTransferBasket<T>>::insert(collection.id, item_id, block_number),76 CollectionMode::Fungible(_) => {77 <FungibleTransferBasket<T>>::insert(collection.id, who.as_sub(), block_number)78 }79 CollectionMode::ReFungible => <ReFungibleTransferBasket<T>>::insert(80 (collection.id, item_id, who.as_sub()),81 block_number,82 ),83 };8485 Some(())86}8788pub fn withdraw_create_item<T: Config>(89 collection: &CollectionHandle<T>,90 who: &T::AccountId,91 _properties: &CreateItemData,92) -> Option<()> {93 if _properties.data_size() as u32 > collection.limits.sponsored_data_size() {94 return None;95 }9697 // sponsor timeout98 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;99 let limit = collection100 .limits101 .sponsor_transfer_timeout(match _properties {102 CreateItemData::NFT(_) => NFT_SPONSOR_TRANSFER_TIMEOUT,103 CreateItemData::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,104 CreateItemData::ReFungible(_) => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,105 });106107 if let Some(last_tx_block) = <CreateItemBasket<T>>::get((collection.id, &who)) {108 let timeout = last_tx_block + limit.into();109 if block_number < timeout {110 return None;111 }112 }113114 CreateItemBasket::<T>::insert((collection.id, who.clone()), block_number);115116 Some(())117}118119pub fn withdraw_set_variable_meta_data<T: Config>(120 who: &T::CrossAccountId,121 collection: &CollectionHandle<T>,122 item_id: &TokenId,123 data: &[u8],124) -> Option<()> {125 // TODO: make it work for admins126 if collection.meta_update_permission != MetaUpdatePermission::ItemOwner {127 return None;128 }129 // preliminary sponsoring correctness check130 match collection.mode {131 CollectionMode::NFT => {132 let owner = pallet_nonfungible::TokenData::<T>::get((collection.id, item_id))?.owner;133 if !owner.conv_eq(who) {134 return None;135 }136 }137 CollectionMode::Fungible(_) => {138 if item_id != &TokenId::default() {139 return None;140 }141 if <pallet_fungible::Balance<T>>::get((collection.id, who)) == 0 {142 return None;143 }144 }145 CollectionMode::ReFungible => {146 if !<pallet_refungible::Owned<T>>::get((collection.id, who, item_id)) {147 return None;148 }149 }150 }151152 // Can't sponsor fungible collection, this tx will be rejected153 // as invalid154 if matches!(collection.mode, CollectionMode::Fungible(_)) {155 return None;156 }157 if data.len() > collection.limits.sponsored_data_size() as usize {158 return None;159 }160161 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;162 let limit = collection.limits.sponsored_data_rate_limit()?;163164 if let Some(last_tx_block) = VariableMetaDataBasket::<T>::get(collection.id, item_id) {165 let timeout = last_tx_block + limit.into();166 if block_number < timeout {167 return None;168 }169 }170171 <VariableMetaDataBasket<T>>::insert(collection.id, item_id, block_number);172173 Some(())174}175176pub fn withdraw_approve<T: Config>(177 collection: &CollectionHandle<T>,178 who: &T::AccountId,179 item_id: &TokenId,180) -> Option<()> {181 // sponsor timeout182 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;183 let limit = collection.limits.sponsor_approve_timeout();184185 let last_tx_block = match collection.mode {186 CollectionMode::NFT => <NftApproveBasket<T>>::get(collection.id, item_id),187 CollectionMode::Fungible(_) => <FungibleApproveBasket<T>>::get(collection.id, who),188 CollectionMode::ReFungible => {189 <RefungibleApproveBasket<T>>::get((collection.id, item_id, who))190 }191 };192193 if let Some(last_tx_block) = last_tx_block {194 let timeout = last_tx_block + limit.into();195 if block_number < timeout {196 return None;197 }198 }199200 match collection.mode {201 CollectionMode::NFT => <NftApproveBasket<T>>::insert(collection.id, item_id, block_number),202 CollectionMode::Fungible(_) => {203 <FungibleApproveBasket<T>>::insert(collection.id, who, block_number)204 }205 CollectionMode::ReFungible => {206 <RefungibleApproveBasket<T>>::insert((collection.id, item_id, who), block_number)207 }208 };209210 Some(())211}212213fn load<T: Config>(id: CollectionId) -> Option<(T::AccountId, CollectionHandle<T>)> {214 let collection = CollectionHandle::new(id)?;215 let sponsor = collection.sponsorship.sponsor().cloned()?;216 Some((sponsor, collection))217}218219pub struct NftSponsorshipHandler<T>(PhantomData<T>);220impl<T, C> SponsorshipHandler<T::AccountId, C> for NftSponsorshipHandler<T>221where222 T: Config,223 C: IsSubType<Call<T>>,224{225 fn get_sponsor(who: &T::AccountId, call: &C) -> Option<T::AccountId> {226 match IsSubType::<Call<T>>::is_sub_type(call)? {227 Call::create_item {228 collection_id,229 data,230 ..231 } => {232 let (sponsor, collection) = load(*collection_id)?;233 withdraw_create_item::<T>(&collection, who, data).map(|()| sponsor)234 }235 Call::transfer {236 collection_id,237 item_id,238 ..239 } => {240 let (sponsor, collection) = load(*collection_id)?;241 withdraw_transfer::<T>(242 &collection,243 &T::CrossAccountId::from_sub(who.clone()),244 item_id,245 )246 .map(|()| sponsor)247 }248 Call::transfer_from {249 collection_id,250 item_id,251 from,252 ..253 } => {254 let (sponsor, collection) = load(*collection_id)?;255 withdraw_transfer::<T>(&collection, from, item_id).map(|()| sponsor)256 }257 Call::approve {258 collection_id,259 item_id,260 ..261 } => {262 let (sponsor, collection) = load(*collection_id)?;263 withdraw_approve::<T>(&collection, who, item_id).map(|()| sponsor)264 }265 Call::set_variable_meta_data {266 collection_id,267 item_id,268 data,269 } => {270 let (sponsor, collection) = load(*collection_id)?;271 withdraw_set_variable_meta_data::<T>(272 &T::CrossAccountId::from_sub(who.clone()),273 &collection,274 item_id,275 data,276 )277 .map(|()| sponsor)278 }279 _ => None,280 }281 }282}