difftreelog
fix find_parent
in: master
8 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -155,6 +155,11 @@
}
impl<T: Config> CollectionHandle<T> {
+ /// Get the mode of the collection: NFT/FT/RFT.
+ pub fn mode(&self) -> CollectionMode {
+ self.mode
+ }
+
/// Same as [CollectionHandle::new] but with an explicit gas limit.
pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {
<CollectionById<T>>::get(id).map(|collection| Self {
@@ -1872,6 +1877,9 @@
/// It wraps methods in Fungible, Nonfungible and Refungible pallets
/// and adds weight info.
pub trait CommonCollectionOperations<T: Config> {
+ /// Get the mode of the collection: NFT/FT/RFT.
+ fn mode(&self) -> CollectionMode;
+
/// Create token.
///
/// * `sender` - The user who mint the token and pays for the transaction.
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -125,6 +125,10 @@
/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete
/// methods and adds weight info.
impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {
+ fn mode(&self) -> up_data_structs::CollectionMode {
+ self.0.mode()
+ }
+
fn create_item(
&self,
sender: T::CrossAccountId,
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -152,6 +152,10 @@
/// Implementation of `CommonCollectionOperations` for `NonfungibleHandle`. It wraps Nonfungible Pallete
/// methods and adds weight info.
impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {
+ fn mode(&self) -> up_data_structs::CollectionMode {
+ self.0.mode()
+ }
+
fn create_item(
&self,
sender: T::CrossAccountId,
pallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -741,7 +741,8 @@
Some((collection_id, nft_id)),
&target_nft_budget,
)
- .map_err(Self::map_unique_err_to_proxy)?;
+ .map_err(Self::map_unique_err_to_proxy)?
+ .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;
approval_required = cross_sender != target_nft_owner;
@@ -989,7 +990,8 @@
let nft_owner =
<PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)
- .map_err(|_| <Error<T>>::ResourceDoesntExist)?;
+ .map_err(|_| <Error<T>>::ResourceDoesntExist)?
+ .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;
Self::try_mutate_resource_info(collection_id, nft_id, resource_id, |res| {
ensure!(res.pending, <Error<T>>::ResourceNotPending);
@@ -1044,7 +1046,8 @@
let nft_owner =
<PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)
- .map_err(|_| <Error<T>>::ResourceDoesntExist)?;
+ .map_err(|_| <Error<T>>::ResourceDoesntExist)?
+ .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;
ensure!(cross_sender == nft_owner, <Error<T>>::NoPermission);
@@ -1666,7 +1669,8 @@
let budget = budget::Value::new(NESTING_BUDGET);
let nft_owner = <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)
- .map_err(Self::map_unique_err_to_proxy)?;
+ .map_err(Self::map_unique_err_to_proxy)?
+ .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;
let pending = sender != nft_owner;
@@ -1720,7 +1724,8 @@
let budget = up_data_structs::budget::Value::new(NESTING_BUDGET);
let topmost_owner =
- <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)?;
+ <PalletStructure<T>>::find_topmost_owner(collection_id, nft_id, &budget)?
+ .ok_or::<DispatchError>(<Error<T>>::NoPermission.into())?;
let sender = T::CrossAccountId::from_sub(sender);
if topmost_owner == sender {
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -186,6 +186,10 @@
/// Implementation of `CommonCollectionOperations` for `RefungibleHandle`. It wraps Refungible Pallete
/// methods and adds weight info.
impl<T: Config> CommonCollectionOperations<T> for RefungibleHandle<T> {
+ fn mode(&self) -> up_data_structs::CollectionMode {
+ self.0.mode()
+ }
+
fn create_item(
&self,
sender: T::CrossAccountId,
pallets/structure/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Structure Pallet18//!19//! The Structure pallet provides functionality for handling tokens nesting an unnesting.20//!21//! - [`Config`]22//! - [`Pallet`]23//!24//! ## Overview25//!26//! The Structure pallet provides functions for:27//!28//! - Searching for token parents, children and owners. Actual implementation of searching for29//! parent/child is done by pallets corresponding to token's collection type.30//! - Nesting and unnesting tokens. Actual implementation of nesting is done by pallets corresponding31//! to token's collection type.32//!33//! ### Terminology34//!35//! - **Nesting:** Setting up parent-child relationship between tokens. Nested tokens are inhereting36//! owner from their parent. There could be multiple levels of nesting. Token couldn't be nested in37//! it's child token i.e. parent-child relationship graph shouldn't have38//!39//! - **Parent:** Token that current token is nested in.40//!41//! - **Owner:** Account that owns the token and all nested tokens.42//!43//! ## Interface44//!45//! ### Available Functions46//!47//! - `find_parent` - Find parent of the token. It could be an account or another token.48//! - `parent_chain` - Find chain of parents of the token.49//! - `find_topmost_owner` - Find account or token in the end of the chain of parents.50//! - `check_nesting` - Check if the token could be nested in the other token51//! - `nest_if_sent_to_token` - Nest the token in the other token52//! - `unnest_if_nested` - Unnest the token from the other token5354#![cfg_attr(not(feature = "std"), no_std)]5556use pallet_common::CommonCollectionOperations;57use pallet_common::{erc::CrossAccountId, eth::is_collection};58use sp_std::collections::btree_set::BTreeSet;5960use frame_support::dispatch::{DispatchError, DispatchResult, DispatchResultWithPostInfo};61use frame_support::fail;62pub use pallet::*;63use pallet_common::{dispatch::CollectionDispatch, CollectionHandle};64use up_data_structs::{CollectionId, TokenId, mapping::TokenAddressMapping, budget::Budget};6566#[cfg(feature = "runtime-benchmarks")]67pub mod benchmarking;68pub mod weights;6970pub type SelfWeightOf<T> = <T as crate::Config>::WeightInfo;7172#[frame_support::pallet]73pub mod pallet {74 use frame_support::Parameter;75 use frame_support::dispatch::{GetDispatchInfo, UnfilteredDispatchable};76 use frame_support::pallet_prelude::*;7778 use super::*;7980 #[pallet::error]81 pub enum Error<T> {82 /// While nesting, encountered an already checked account, detecting a loop.83 OuroborosDetected,84 /// While nesting, reached the depth limit of nesting, exceeding the provided budget.85 DepthLimit,86 /// While nesting, reached the breadth limit of nesting, exceeding the provided budget.87 BreadthLimit,88 /// Couldn't find the token owner that is itself a token.89 TokenNotFound,90 /// Tried to nest token under collection contract address, instead of token address91 CantNestTokenUnderCollection,92 }9394 #[pallet::event]95 pub enum Event<T> {96 /// Executed call on behalf of the token.97 Executed(DispatchResult),98 }99100 #[pallet::config]101 pub trait Config: frame_system::Config + pallet_common::Config {102 type WeightInfo: weights::WeightInfo;103 type RuntimeEvent: IsType<<Self as frame_system::Config>::RuntimeEvent> + From<Event<Self>>;104 type RuntimeCall: Parameter105 + UnfilteredDispatchable<RuntimeOrigin = Self::RuntimeOrigin>106 + GetDispatchInfo;107 }108109 #[pallet::pallet]110 pub struct Pallet<T>(_);111112 #[pallet::call]113 impl<T: Config> Pallet<T> {114 // #[pallet::weight({115 // let dispatch_info = call.get_dispatch_info();116117 // (118 // dispatch_info.weight119 // // Cost of dereferencing parent120 // .saturating_add(T::DbWeight::get().reads(2 * *max_depth as Weight))121 // .saturating_add(4000 * *max_depth as Weight),122 // dispatch_info.class)123 // })]124 // pub fn execute(125 // origin: OriginFor<T>,126 // call: Box<<T as Config>::Call>,127 // max_depth: u32,128 // ) -> DispatchResult {129 }130}131132#[derive(PartialEq)]133pub enum Parent<CrossAccountId> {134 /// Token owned by a normal account.135 User(CrossAccountId),136 /// Could not find the token provided as the owner.137 TokenNotFound,138 /// Token owner is another token (still, the target token may not exist).139 Token(CollectionId, TokenId),140}141142impl<T: Config> Pallet<T> {143 /// Find account owning the `token` or a token that the `token` is nested in.144 ///145 /// Returns the enum that have three variants:146 /// - [`User`](crate::Parent<T>::User): Contains account.147 /// - [`Token`](crate::Parent<T>::Token): Contains token id and collection id.148 /// - [`TokenNotFound`](crate::Parent<T>::TokenNotFound): Indicates that parent was not found149 pub fn find_parent(150 collection: CollectionId,151 token: TokenId,152 ) -> Result<Parent<T::CrossAccountId>, DispatchError> {153 // TODO: Reduce cost by not reading collection config154 let handle = match CollectionHandle::try_get(collection) {155 Ok(v) => v,156 Err(_) => return Ok(Parent::TokenNotFound),157 };158 let handle = T::CollectionDispatch::dispatch(handle);159 let handle = handle.as_dyn();160161 Ok(match handle.token_owner(token) {162 Some(owner) => match T::CrossTokenAddressMapping::address_to_token(&owner) {163 Some((collection, token)) => Parent::Token(collection, token),164 None => Parent::User(owner),165 },166 None => Parent::TokenNotFound,167 })168 }169170 /// Get the chain of parents of a token in the nesting hierarchy171 ///172 /// Returns an iterator of addresses of the owning tokens and the owning account,173 /// starting from the immediate parent token, ending with the account.174 /// Returns error if cycle is detected.175 pub fn parent_chain(176 mut collection: CollectionId,177 mut token: TokenId,178 ) -> impl Iterator<Item = Result<Parent<T::CrossAccountId>, DispatchError>> {179 let mut finished = false;180 let mut visited = BTreeSet::new();181 visited.insert((collection, token));182 core::iter::from_fn(move || {183 if finished {184 return None;185 }186 let parent = Self::find_parent(collection, token);187 match parent {188 Ok(Parent::Token(new_collection, new_token)) => {189 collection = new_collection;190 token = new_token;191 if !visited.insert((new_collection, new_token)) {192 finished = true;193 return Some(Err(<Error<T>>::OuroborosDetected.into()));194 }195 }196 _ => finished = true,197 }198 Some(parent as Result<_, DispatchError>)199 })200 }201202 /// Try to dereference address, until finding top level owner203 ///204 /// May return token address if parent token not yet exists205 ///206 /// - `budget`: Limit for searching parents in depth.207 pub fn find_topmost_owner(208 collection: CollectionId,209 token: TokenId,210 budget: &dyn Budget,211 ) -> Result<T::CrossAccountId, DispatchError> {212 let owner = Self::parent_chain(collection, token)213 .take_while(|_| budget.consume())214 .find(|p| matches!(p, Ok(Parent::User(_) | Parent::TokenNotFound)))215 .ok_or(<Error<T>>::DepthLimit)??;216217 Ok(match owner {218 Parent::User(v) => v,219 _ => fail!(<Error<T>>::TokenNotFound),220 })221 }222223 /// Find the topmost parent and check that assigning `for_nest` token as a child for224 /// `token` wouldn't create a cycle.225 ///226 /// - `budget`: Limit for searching parents in depth.227 pub fn get_checked_topmost_owner(228 collection: CollectionId,229 token: TokenId,230 for_nest: Option<(CollectionId, TokenId)>,231 budget: &dyn Budget,232 ) -> Result<T::CrossAccountId, DispatchError> {233 // Tried to nest token in itself234 if Some((collection, token)) == for_nest {235 return Err(<Error<T>>::OuroborosDetected.into());236 }237238 for parent in Self::parent_chain(collection, token).take_while(|_| budget.consume()) {239 match parent? {240 // Tried to nest token in chain, which has this token as one of parents241 Parent::Token(collection, token) if Some((collection, token)) == for_nest => {242 return Err(<Error<T>>::OuroborosDetected.into())243 }244 // Token is owned by other user245 Parent::User(user) => return Ok(user),246 Parent::TokenNotFound => return Err(<Error<T>>::TokenNotFound.into()),247 // Continue parent chain248 Parent::Token(_, _) => {}249 }250 }251252 Err(<Error<T>>::DepthLimit.into())253 }254255 /// Burn token and all of it's nested tokens256 ///257 /// - `self_budget`: Limit for searching children in depth.258 /// - `breadth_budget`: Limit of breadth of searching children.259 pub fn burn_item_recursively(260 from: T::CrossAccountId,261 collection: CollectionId,262 token: TokenId,263 self_budget: &dyn Budget,264 breadth_budget: &dyn Budget,265 ) -> DispatchResultWithPostInfo {266 let handle = <CollectionHandle<T>>::try_get(collection)?;267 let dispatch = T::CollectionDispatch::dispatch(handle);268 let dispatch = dispatch.as_dyn();269 dispatch.burn_item_recursively(from.clone(), token, self_budget, breadth_budget)270 }271272 /// Check if `token` indirectly owned by `user`273 ///274 /// Returns `true` if `user` is `token`'s owner. Or If token is provided as `user` then275 /// check that `user` and `token` have same owner.276 /// Checks that assigning `for_nest` token as a child for `token` wouldn't create a cycle.277 ///278 /// - `budget`: Limit for searching parents in depth.279 pub fn check_indirectly_owned(280 user: T::CrossAccountId,281 collection: CollectionId,282 token: TokenId,283 for_nest: Option<(CollectionId, TokenId)>,284 budget: &dyn Budget,285 ) -> Result<bool, DispatchError> {286 let target_parent = match T::CrossTokenAddressMapping::address_to_token(&user) {287 Some((collection, token)) => Self::find_topmost_owner(collection, token, budget)?,288 None => user,289 };290291 Self::get_checked_topmost_owner(collection, token, for_nest, budget)292 .map(|indirect_owner| indirect_owner == target_parent)293 }294295 /// Checks that `under` is valid token and that `token_id` could be nested under it296 /// and that `from` is `under`'s owner297 ///298 /// Returns OK if `under` is not a token299 ///300 /// - `nesting_budget`: Limit for searching parents in depth.301 pub fn check_nesting(302 from: T::CrossAccountId,303 under: &T::CrossAccountId,304 collection_id: CollectionId,305 token_id: TokenId,306 nesting_budget: &dyn Budget,307 ) -> DispatchResult {308 Self::try_exec_if_token(under, |collection, parent_id| {309 collection.check_nesting(from, (collection_id, token_id), parent_id, nesting_budget)310 })311 }312313 /// Nests `token_id` under `under` token314 ///315 /// Returns OK if `under` is not a token. Checks that nesting is possible.316 ///317 /// - `nesting_budget`: Limit for searching parents in depth.318 pub fn nest_if_sent_to_token(319 from: T::CrossAccountId,320 under: &T::CrossAccountId,321 collection_id: CollectionId,322 token_id: TokenId,323 nesting_budget: &dyn Budget,324 ) -> DispatchResult {325 Self::try_exec_if_token(under, |collection, parent_id| {326 collection.check_nesting(from, (collection_id, token_id), parent_id, nesting_budget)?;327328 collection.nest(parent_id, (collection_id, token_id));329330 Ok(())331 })332 }333334 /// Nests `token_id` under `owner` token335 ///336 /// Caller should check that nesting wouldn't cause recursion in nesting337 pub fn nest_if_sent_to_token_unchecked(338 owner: &T::CrossAccountId,339 collection_id: CollectionId,340 token_id: TokenId,341 ) {342 Self::exec_if_token(owner, |collection, parent_id| {343 collection.nest(parent_id, (collection_id, token_id))344 });345 }346347 /// Unnests `token_id` from `owner`.348 pub fn unnest_if_nested(349 owner: &T::CrossAccountId,350 collection_id: CollectionId,351 token_id: TokenId,352 ) {353 if let Err(e) = Self::try_exec_if_token(owner, |collection, parent_id| {354 collection.unnest(parent_id, (collection_id, token_id));355 Ok(())356 }) {357 log::warn!("unnest precondition failed: {e:?}")358 }359 }360361 /// # Panics362 /// If [`Self::try_exec_if_token`] fails363 fn exec_if_token(364 account: &T::CrossAccountId,365 action: impl FnOnce(&dyn CommonCollectionOperations<T>, TokenId),366 ) {367 Self::try_exec_if_token(account, |collection, id| {368 action(collection, id);369 Ok(())370 })371 .unwrap();372 }373374 /// If `account` is a token address, execute `action` providing found collection as an argument375 /// Token may not exist, it is expected it will be checked in the callback.376 fn try_exec_if_token(377 account: &T::CrossAccountId,378 action: impl FnOnce(&dyn CommonCollectionOperations<T>, TokenId) -> DispatchResult,379 ) -> DispatchResult {380 if is_collection(&account.as_eth()) {381 fail!(<Error<T>>::CantNestTokenUnderCollection);382 }383 let Some((collection, token)) = T::CrossTokenAddressMapping::address_to_token(account) else {384 return Ok(())385 };386387 let handle = <CollectionHandle<T>>::try_get(collection)?;388389 let dispatch = T::CollectionDispatch::dispatch(handle);390 let dispatch = dispatch.as_dyn();391392 action(dispatch, token)393 }394}primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -252,7 +252,7 @@
/// Collection can represent various types of tokens.
/// Each collection can contain only one type of tokens at a time.
/// This type helps to understand which tokens the collection contains.
-#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]
+#[derive(Encode, Decode, Eq, Debug, Clone, Copy, PartialEq, TypeInfo, MaxEncodedLen)]
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
pub enum CollectionMode {
/// Non fungible tokens.
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -83,7 +83,7 @@
fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {
let budget = up_data_structs::budget::Value::new(10);
- Ok(Some(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?))
+ Ok(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?)
}
fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>, DispatchError> {
Ok(<pallet_nonfungible::Pallet<Runtime>>::token_children_ids(collection, token))