difftreelog
Revert "fix: find_parent"
in: master
This reverts commit e0035410299d589d1232ce7c17dfd86b7d8a3f45.
8 files changed
pallets/common/src/lib.rsdiffbeforeafterboth155}155}156156157impl<T: Config> CollectionHandle<T> {157impl<T: Config> CollectionHandle<T> {158 /// Get the mode of the collection: NFT/FT/RFT.159 pub fn mode(&self) -> CollectionMode {160 self.mode161 }162163 /// Same as [CollectionHandle::new] but with an explicit gas limit.158 /// Same as [CollectionHandle::new] but with an explicit gas limit.164 pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {159 pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {1877/// It wraps methods in Fungible, Nonfungible and Refungible pallets1872/// It wraps methods in Fungible, Nonfungible and Refungible pallets1878/// and adds weight info.1873/// and adds weight info.1879pub trait CommonCollectionOperations<T: Config> {1874pub trait CommonCollectionOperations<T: Config> {1880 /// Get the mode of the collection: NFT/FT/RFT.1881 fn mode(&self) -> CollectionMode;18821883 /// Create token.1875 /// Create token.1884 ///1876 ///pallets/fungible/src/common.rsdiffbeforeafterboth125/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete125/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete126/// methods and adds weight info.126/// methods and adds weight info.127impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {127impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {128 fn mode(&self) -> up_data_structs::CollectionMode {129 self.0.mode()130 }131132 fn create_item(128 fn create_item(133 &self,129 &self,pallets/nonfungible/src/common.rsdiffbeforeafterboth152/// Implementation of `CommonCollectionOperations` for `NonfungibleHandle`. It wraps Nonfungible Pallete152/// Implementation of `CommonCollectionOperations` for `NonfungibleHandle`. It wraps Nonfungible Pallete153/// methods and adds weight info.153/// methods and adds weight info.154impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {154impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {155 fn mode(&self) -> up_data_structs::CollectionMode {156 self.0.mode()157 }158159 fn create_item(155 fn create_item(160 &self,156 &self,pallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth742 &target_nft_budget,742 &target_nft_budget,743 )743 )744 .map_err(Self::map_unique_err_to_proxy)?744 .map_err(Self::map_unique_err_to_proxy)?;745 .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;746745747 approval_required = cross_sender != target_nft_owner;746 approval_required = cross_sender != target_nft_owner;748747991 let nft_owner =990 let nft_owner =992 <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)991 <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)993 .map_err(|_| <Error<T>>::ResourceDoesntExist)?992 .map_err(|_| <Error<T>>::ResourceDoesntExist)?;994 .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;995993996 Self::try_mutate_resource_info(collection_id, nft_id, resource_id, |res| {994 Self::try_mutate_resource_info(collection_id, nft_id, resource_id, |res| {997 ensure!(res.pending, <Error<T>>::ResourceNotPending);995 ensure!(res.pending, <Error<T>>::ResourceNotPending);1047 let nft_owner =1045 let nft_owner =1048 <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)1046 <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)1049 .map_err(|_| <Error<T>>::ResourceDoesntExist)?1047 .map_err(|_| <Error<T>>::ResourceDoesntExist)?;1050 .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;105110481052 ensure!(cross_sender == nft_owner, <Error<T>>::NoPermission);1049 ensure!(cross_sender == nft_owner, <Error<T>>::NoPermission);10531050167016671671 let nft_owner = <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)1668 let nft_owner = <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)1672 .map_err(Self::map_unique_err_to_proxy)?1669 .map_err(Self::map_unique_err_to_proxy)?;1673 .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;167416701675 let pending = sender != nft_owner;1671 let pending = sender != nft_owner;167616721725 let budget = up_data_structs::budget::Value::new(NESTING_BUDGET);1721 let budget = up_data_structs::budget::Value::new(NESTING_BUDGET);1726 let topmost_owner =1722 let topmost_owner =1727 <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)?1723 <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)?;1728 .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;172917241730 let sender = T::CrossAccountId::from_sub(sender);1725 let sender = T::CrossAccountId::from_sub(sender);1731 if topmost_owner == sender {1726 if topmost_owner == sender {pallets/refungible/src/common.rsdiffbeforeafterboth186/// Implementation of `CommonCollectionOperations` for `RefungibleHandle`. It wraps Refungible Pallete186/// Implementation of `CommonCollectionOperations` for `RefungibleHandle`. It wraps Refungible Pallete187/// methods and adds weight info.187/// methods and adds weight info.188impl<T: Config> CommonCollectionOperations<T> for RefungibleHandle<T> {188impl<T: Config> CommonCollectionOperations<T> for RefungibleHandle<T> {189 fn mode(&self) -> up_data_structs::CollectionMode {190 self.0.mode()191 }192193 fn create_item(189 fn create_item(194 &self,190 &self,pallets/structure/src/lib.rsdiffbeforeafterboth61use frame_support::fail;61use frame_support::fail;62pub use pallet::*;62pub use pallet::*;63use pallet_common::{dispatch::CollectionDispatch, CollectionHandle};63use pallet_common::{dispatch::CollectionDispatch, CollectionHandle};64use up_data_structs::CollectionMode;65use up_data_structs::{CollectionId, TokenId, mapping::TokenAddressMapping, budget::Budget};64use up_data_structs::{CollectionId, TokenId, mapping::TokenAddressMapping, budget::Budget};666567#[cfg(feature = "runtime-benchmarks")]66#[cfg(feature = "runtime-benchmarks")]136 User(CrossAccountId),135 User(CrossAccountId),137 /// Could not find the token provided as the owner.136 /// Could not find the token provided as the owner.138 TokenNotFound,137 TokenNotFound,139 /// Nested token has multiple owners.140 MultipleOwners,141 /// Token owner is another token (still, the target token may not exist).138 /// Token owner is another token (still, the target token may not exist).142 Token(CollectionId, TokenId),139 Token(CollectionId, TokenId),143}140}166 Some((collection, token)) => Parent::Token(collection, token),163 Some((collection, token)) => Parent::Token(collection, token),167 None => Parent::User(owner),164 None => Parent::User(owner),168 },165 },169 None if handle.mode() == CollectionMode::ReFungible => handle170 .total_pieces(token)171 .map(|_| Parent::MultipleOwners)172 .unwrap_or(Parent::TokenNotFound),173 None => Parent::TokenNotFound,166 None => Parent::TokenNotFound,174 })167 })175 }168 }209 /// Try to dereference address, until finding top level owner202 /// Try to dereference address, until finding top level owner210 ///203 ///211 /// May return token address if parent token not yet exists204 /// May return token address if parent token not yet exists212 ///213 /// Returns `None` if the token has multiple owners.214 ///205 ///215 /// - `budget`: Limit for searching parents in depth.206 /// - `budget`: Limit for searching parents in depth.216 pub fn find_topmost_owner(207 pub fn find_topmost_owner(217 collection: CollectionId,208 collection: CollectionId,218 token: TokenId,209 token: TokenId,219 budget: &dyn Budget,210 budget: &dyn Budget,220 ) -> Result<Option<T::CrossAccountId>, DispatchError> {211 ) -> Result<T::CrossAccountId, DispatchError> {221 let owner = Self::parent_chain(collection, token)212 let owner = Self::parent_chain(collection, token)222 .take_while(|_| budget.consume())213 .take_while(|_| budget.consume())223 .find(|p| {214 .find(|p| matches!(p, Ok(Parent::User(_) | Parent::TokenNotFound)))224 matches!(225 p,226 Ok(Parent::User(_) | Parent::TokenNotFound | Parent::MultipleOwners)227 )228 })229 .ok_or(<Error<T>>::DepthLimit)??;215 .ok_or(<Error<T>>::DepthLimit)??;230216231 Ok(match owner {217 Ok(match owner {232 Parent::User(v) => Some(v),218 Parent::User(v) => v,233 Parent::MultipleOwners => None,234 _ => fail!(<Error<T>>::TokenNotFound),219 _ => fail!(<Error<T>>::TokenNotFound),235 })220 })236 }221 }237222238 /// Find the topmost parent and check that assigning `for_nest` token as a child for223 /// Find the topmost parent and check that assigning `for_nest` token as a child for239 /// `token` wouldn't create a cycle.224 /// `token` wouldn't create a cycle.240 ///241 /// Returns `None` if the token has multiple owners.242 ///225 ///243 /// - `budget`: Limit for searching parents in depth.226 /// - `budget`: Limit for searching parents in depth.244 pub fn get_checked_topmost_owner(227 pub fn get_checked_topmost_owner(245 collection: CollectionId,228 collection: CollectionId,246 token: TokenId,229 token: TokenId,247 for_nest: Option<(CollectionId, TokenId)>,230 for_nest: Option<(CollectionId, TokenId)>,248 budget: &dyn Budget,231 budget: &dyn Budget,249 ) -> Result<Option<T::CrossAccountId>, DispatchError> {232 ) -> Result<T::CrossAccountId, DispatchError> {250 // Tried to nest token in itself233 // Tried to nest token in itself251 if Some((collection, token)) == for_nest {234 if Some((collection, token)) == for_nest {252 return Err(<Error<T>>::OuroborosDetected.into());235 return Err(<Error<T>>::OuroborosDetected.into());259 return Err(<Error<T>>::OuroborosDetected.into())242 return Err(<Error<T>>::OuroborosDetected.into())260 }243 }261 // Token is owned by other user244 // Token is owned by other user262 Parent::User(user) => return Ok(Some(user)),245 Parent::User(user) => return Ok(user),263 Parent::TokenNotFound => return Err(<Error<T>>::TokenNotFound.into()),246 Parent::TokenNotFound => return Err(<Error<T>>::TokenNotFound.into()),264 Parent::MultipleOwners => return Ok(None),265 // Continue parent chain247 // Continue parent chain266 Parent::Token(_, _) => {}248 Parent::Token(_, _) => {}267 }249 }302 budget: &dyn Budget,284 budget: &dyn Budget,303 ) -> Result<bool, DispatchError> {285 ) -> Result<bool, DispatchError> {304 let target_parent = match T::CrossTokenAddressMapping::address_to_token(&user) {286 let target_parent = match T::CrossTokenAddressMapping::address_to_token(&user) {305 Some((collection, token)) => match Self::find_topmost_owner(collection, token, budget)?287 Some((collection, token)) => Self::find_topmost_owner(collection, token, budget)?,306 {307 Some(topmost_owner) => topmost_owner,308 None => return Ok(false),309 },310 None => user,288 None => user,311 };289 };312290313 Self::get_checked_topmost_owner(collection, token, for_nest, budget).map(|indirect_owner| {291 Self::get_checked_topmost_owner(collection, token, for_nest, budget)314 indirect_owner.map_or(false, |indirect_owner| indirect_owner == target_parent)292 .map(|indirect_owner| indirect_owner == target_parent)315 })316 }293 }317294318 /// Checks that `under` is valid token and that `token_id` could be nested under it295 /// Checks that `under` is valid token and that `token_id` could be nested under itprimitives/data-structs/src/lib.rsdiffbeforeafterboth252/// Collection can represent various types of tokens.252/// Collection can represent various types of tokens.253/// Each collection can contain only one type of tokens at a time.253/// Each collection can contain only one type of tokens at a time.254/// This type helps to understand which tokens the collection contains.254/// This type helps to understand which tokens the collection contains.255#[derive(Encode, Decode, Eq, Debug, Clone, Copy, PartialEq, TypeInfo, MaxEncodedLen)]255#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]256#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]256#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]257pub enum CollectionMode {257pub enum CollectionMode {258 /// Non fungible tokens.258 /// Non fungible tokens.runtime/common/runtime_apis.rsdiffbeforeafterboth83 fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {83 fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {84 let budget = up_data_structs::budget::Value::new(10);84 let budget = up_data_structs::budget::Value::new(10);858586 Ok(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?)86 Ok(Some(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?))87 }87 }88 fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>, DispatchError> {88 fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>, DispatchError> {89 Ok(<pallet_nonfungible::Pallet<Runtime>>::token_children_ids(collection, token))89 Ok(<pallet_nonfungible::Pallet<Runtime>>::token_children_ids(collection, token))