difftreelog
feat external-internal api collection creation segreation
in: master
11 files changed
pallets/common/src/dispatch.rsdiffbeforeafterboth--- a/pallets/common/src/dispatch.rs
+++ b/pallets/common/src/dispatch.rs
@@ -36,6 +36,13 @@
},
error,
})?;
+ handle.check_is_internal().map_err(|error| DispatchErrorWithPostInfo {
+ post_info: PostDispatchInfo {
+ actual_weight: Some(dispatch_weight::<T>()),
+ pays_fee: Pays::Yes,
+ },
+ error,
+ })?;
let dispatched = T::CollectionDispatch::dispatch(handle);
let mut result = call(dispatched.as_dyn());
match &mut result {
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -316,8 +316,9 @@
}
fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {
+ // TODO possibly delete for the lack of transaction
collection
- .check_is_mutable()
+ .check_is_internal()
.map_err(dispatch_to_evm::<T>)?;
<crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());
Ok(())
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -149,20 +149,16 @@
))
}
pub fn save(self) -> Result<(), DispatchError> {
- self.check_is_mutable()?;
<CollectionById<T>>::insert(self.id, self.collection);
Ok(())
}
pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {
- self.check_is_mutable()?;
self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);
Ok(())
}
pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {
- self.check_is_mutable()?;
-
if self.collection.sponsorship.pending_sponsor() != Some(sender) {
return Ok(false);
}
@@ -171,11 +167,21 @@
Ok(true)
}
- /// Checks that collection is can be mutate.
- /// Now check only `external_collection` flag and if it **true**, than return `CollectionIsReadOnly` error.
- pub fn check_is_mutable(&self) -> DispatchResult {
+ /// Checks that the collection was created with, and must be operated upon through **Unique API**.
+ /// Now check only the `external_collection` flag and if it's **true**, then return `CollectionIsExternal` error.
+ pub fn check_is_internal(&self) -> DispatchResult {
if self.external_collection {
- return Err(<Error<T>>::CollectionIsReadOnly)?;
+ return Err(<Error<T>>::CollectionIsExternal)?;
+ }
+
+ Ok(())
+ }
+
+ /// Checks that the collection was created with, and must be operated upon through an **assimilated API**.
+ /// Now check only the `external_collection` flag and if it's **false**, then return `CollectionIsInternal` error.
+ pub fn check_is_external(&self) -> DispatchResult {
+ if !self.external_collection {
+ return Err(<Error<T>>::CollectionIsInternal)?;
}
Ok(())
@@ -449,8 +455,11 @@
/// Empty property keys are forbidden
EmptyPropertyKey,
- /// Collection is read only
- CollectionIsReadOnly,
+ /// Tried to access an external collection with an internal API
+ CollectionIsExternal,
+
+ /// Tried to access an internal collection with an external API
+ CollectionIsInternal,
}
#[pallet::storage]
@@ -754,6 +763,7 @@
pub fn init_collection(
owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
+ is_external: bool,
) -> Result<CollectionId, DispatchError> {
{
ensure!(
@@ -797,7 +807,7 @@
Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)
})
.unwrap_or_else(|| Ok(CollectionPermissions::default()))?,
- external_collection: false,
+ external_collection: is_external,
};
let mut collection_properties = up_data_structs::CollectionProperties::get();
@@ -854,7 +864,6 @@
collection: CollectionHandle<T>,
sender: &T::CrossAccountId,
) -> DispatchResult {
- collection.check_is_mutable()?;
ensure!(
collection.limits.owner_can_destroy(),
<Error<T>>::NoPermission,
@@ -884,7 +893,6 @@
sender: &T::CrossAccountId,
property: Property,
) -> DispatchResult {
- collection.check_is_mutable()?;
collection.check_is_owner_or_admin(sender)?;
CollectionProperties::<T>::try_mutate(collection.id, |properties| {
@@ -930,8 +938,6 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
for property in properties {
Self::set_collection_property(collection, sender, property)?;
}
@@ -944,7 +950,6 @@
sender: &T::CrossAccountId,
property_key: PropertyKey,
) -> DispatchResult {
- collection.check_is_mutable()?;
collection.check_is_owner_or_admin(sender)?;
CollectionProperties::<T>::try_mutate(collection.id, |properties| {
@@ -966,8 +971,6 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
for key in property_keys {
Self::delete_collection_property(collection, sender, key)?;
}
@@ -992,7 +995,6 @@
sender: &T::CrossAccountId,
property_permission: PropertyKeyPermission,
) -> DispatchResult {
- collection.check_is_mutable()?;
collection.check_is_owner_or_admin(sender)?;
let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);
@@ -1024,8 +1026,6 @@
sender: &T::CrossAccountId,
property_permissions: Vec<PropertyKeyPermission>,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
for prop_pemission in property_permissions {
Self::set_property_permission(collection, sender, prop_pemission)?;
}
@@ -1113,7 +1113,6 @@
user: &T::CrossAccountId,
allowed: bool,
) -> DispatchResult {
- collection.check_is_mutable()?;
collection.check_is_owner_or_admin(sender)?;
// =========
@@ -1133,7 +1132,6 @@
user: &T::CrossAccountId,
admin: bool,
) -> DispatchResult {
- collection.check_is_mutable()?;
collection.check_is_owner_or_admin(sender)?;
let was_admin = <IsAdmin<T>>::get((collection.id, user));
pallets/fungible/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#![cfg_attr(not(feature = "std"), no_std)]1819use core::ops::Deref;20use evm_coder::ToLog;21use frame_support::{ensure};22use pallet_evm::account::CrossAccountId;23use up_data_structs::{24 AccessMode, CollectionId, TokenId, CreateCollectionData, mapping::TokenAddressMapping,25 budget::Budget,26};27use pallet_common::{28 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,29 eth::collection_id_to_address,30};31use pallet_evm::Pallet as PalletEvm;32use pallet_structure::Pallet as PalletStructure;33use pallet_evm_coder_substrate::WithRecorder;34use sp_core::H160;35use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};36use sp_std::{collections::btree_map::BTreeMap};3738pub use pallet::*;3940use crate::erc::ERC20Events;41#[cfg(feature = "runtime-benchmarks")]42pub mod benchmarking;43pub mod common;44pub mod erc;45pub mod weights;4647pub type CreateItemData<T> = (<T as pallet_evm::account::Config>::CrossAccountId, u128);48pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;4950#[frame_support::pallet]51pub mod pallet {52 use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};53 use up_data_structs::CollectionId;54 use super::weights::WeightInfo;5556 #[pallet::error]57 pub enum Error<T> {58 /// Not Fungible item data used to mint in Fungible collection.59 NotFungibleDataUsedToMintFungibleCollectionToken,60 /// Not default id passed as TokenId argument61 FungibleItemsHaveNoId,62 /// Tried to set data for fungible item63 FungibleItemsDontHaveData,64 /// Fungible token does not support nested65 FungibleDisallowsNesting,66 /// Setting item properties is not allowed67 SettingPropertiesNotAllowed,68 }6970 #[pallet::config]71 pub trait Config:72 frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config73 {74 type WeightInfo: WeightInfo;75 }7677 #[pallet::pallet]78 #[pallet::generate_store(pub(super) trait Store)]79 pub struct Pallet<T>(_);8081 #[pallet::storage]82 pub type TotalSupply<T: Config> =83 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u128, QueryKind = ValueQuery>;8485 #[pallet::storage]86 pub type Balance<T: Config> = StorageNMap<87 Key = (88 Key<Twox64Concat, CollectionId>,89 Key<Blake2_128Concat, T::CrossAccountId>,90 ),91 Value = u128,92 QueryKind = ValueQuery,93 >;9495 #[pallet::storage]96 pub type Allowance<T: Config> = StorageNMap<97 Key = (98 Key<Twox64Concat, CollectionId>,99 Key<Blake2_128, T::CrossAccountId>,100 Key<Blake2_128Concat, T::CrossAccountId>,101 ),102 Value = u128,103 QueryKind = ValueQuery,104 >;105}106107pub struct FungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);108impl<T: Config> FungibleHandle<T> {109 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {110 Self(inner)111 }112 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {113 self.0114 }115 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {116 &mut self.0117 }118}119impl<T: Config> WithRecorder<T> for FungibleHandle<T> {120 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {121 self.0.recorder()122 }123 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {124 self.0.into_recorder()125 }126}127impl<T: Config> Deref for FungibleHandle<T> {128 type Target = pallet_common::CollectionHandle<T>;129130 fn deref(&self) -> &Self::Target {131 &self.0132 }133}134135impl<T: Config> Pallet<T> {136 pub fn init_collection(137 owner: T::CrossAccountId,138 data: CreateCollectionData<T::AccountId>,139 ) -> Result<CollectionId, DispatchError> {140 <PalletCommon<T>>::init_collection(owner, data)141 }142 pub fn destroy_collection(143 collection: FungibleHandle<T>,144 sender: &T::CrossAccountId,145 ) -> DispatchResult {146 let id = collection.id;147148 if Self::collection_has_tokens(id) {149 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());150 }151152 // =========153154 PalletCommon::destroy_collection(collection.0, sender)?;155156 <TotalSupply<T>>::remove(id);157 <Balance<T>>::remove_prefix((id,), None);158 <Allowance<T>>::remove_prefix((id,), None);159 Ok(())160 }161162 fn collection_has_tokens(collection_id: CollectionId) -> bool {163 <TotalSupply<T>>::get(collection_id) != 0164 }165166 pub fn burn(167 collection: &FungibleHandle<T>,168 owner: &T::CrossAccountId,169 amount: u128,170 ) -> DispatchResult {171 collection.check_is_mutable()?;172173 let total_supply = <TotalSupply<T>>::get(collection.id)174 .checked_sub(amount)175 .ok_or(<CommonError<T>>::TokenValueTooLow)?;176177 let balance = <Balance<T>>::get((collection.id, owner))178 .checked_sub(amount)179 .ok_or(<CommonError<T>>::TokenValueTooLow)?;180181 if collection.permissions.access() == AccessMode::AllowList {182 collection.check_allowlist(owner)?;183 }184185 // =========186187 if balance == 0 {188 <Balance<T>>::remove((collection.id, owner));189 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, TokenId::default());190 } else {191 <Balance<T>>::insert((collection.id, owner), balance);192 }193 <TotalSupply<T>>::insert(collection.id, total_supply);194195 <PalletEvm<T>>::deposit_log(196 ERC20Events::Transfer {197 from: *owner.as_eth(),198 to: H160::default(),199 value: amount.into(),200 }201 .to_log(collection_id_to_address(collection.id)),202 );203 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(204 collection.id,205 TokenId::default(),206 owner.clone(),207 amount,208 ));209 Ok(())210 }211212 pub fn transfer(213 collection: &FungibleHandle<T>,214 from: &T::CrossAccountId,215 to: &T::CrossAccountId,216 amount: u128,217 nesting_budget: &dyn Budget,218 ) -> DispatchResult {219 collection.check_is_mutable()?;220221 ensure!(222 collection.limits.transfers_enabled(),223 <CommonError<T>>::TransferNotAllowed,224 );225226 if collection.permissions.access() == AccessMode::AllowList {227 collection.check_allowlist(from)?;228 collection.check_allowlist(to)?;229 }230 <PalletCommon<T>>::ensure_correct_receiver(to)?;231232 let balance_from = <Balance<T>>::get((collection.id, from))233 .checked_sub(amount)234 .ok_or(<CommonError<T>>::TokenValueTooLow)?;235 let balance_to = if from != to {236 Some(237 <Balance<T>>::get((collection.id, to))238 .checked_add(amount)239 .ok_or(ArithmeticError::Overflow)?,240 )241 } else {242 None243 };244245 // =========246247 <PalletStructure<T>>::nest_if_sent_to_token(248 from.clone(),249 to,250 collection.id,251 TokenId::default(),252 nesting_budget,253 )?;254255 if let Some(balance_to) = balance_to {256 // from != to257 if balance_from == 0 {258 <Balance<T>>::remove((collection.id, from));259 <PalletStructure<T>>::unnest_if_nested(from, collection.id, TokenId::default());260 } else {261 <Balance<T>>::insert((collection.id, from), balance_from);262 }263 <Balance<T>>::insert((collection.id, to), balance_to);264 }265266 <PalletEvm<T>>::deposit_log(267 ERC20Events::Transfer {268 from: *from.as_eth(),269 to: *to.as_eth(),270 value: amount.into(),271 }272 .to_log(collection_id_to_address(collection.id)),273 );274 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(275 collection.id,276 TokenId::default(),277 from.clone(),278 to.clone(),279 amount,280 ));281 Ok(())282 }283284 pub fn create_multiple_items(285 collection: &FungibleHandle<T>,286 sender: &T::CrossAccountId,287 data: BTreeMap<T::CrossAccountId, u128>,288 nesting_budget: &dyn Budget,289 ) -> DispatchResult {290 collection.check_is_mutable()?;291292 if !collection.is_owner_or_admin(sender) {293 ensure!(294 collection.permissions.mint_mode(),295 <CommonError<T>>::PublicMintingNotAllowed296 );297 collection.check_allowlist(sender)?;298299 for (owner, _) in data.iter() {300 collection.check_allowlist(owner)?;301 }302 }303304 let total_supply = data305 .iter()306 .map(|(_, v)| *v)307 .try_fold(<TotalSupply<T>>::get(collection.id), |acc, v| {308 acc.checked_add(v)309 })310 .ok_or(ArithmeticError::Overflow)?;311312 let mut balances = data;313 for (k, v) in balances.iter_mut() {314 *v = <Balance<T>>::get((collection.id, &k))315 .checked_add(*v)316 .ok_or(ArithmeticError::Overflow)?;317 }318319 for (to, _) in balances.iter() {320 <PalletStructure<T>>::check_nesting(321 sender.clone(),322 to,323 collection.id,324 TokenId::default(),325 nesting_budget,326 )?;327 }328329 // =========330331 <TotalSupply<T>>::insert(collection.id, total_supply);332 for (user, amount) in balances {333 <Balance<T>>::insert((collection.id, &user), amount);334 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(335 &user,336 collection.id,337 TokenId::default(),338 );339 <PalletEvm<T>>::deposit_log(340 ERC20Events::Transfer {341 from: H160::default(),342 to: *user.as_eth(),343 value: amount.into(),344 }345 .to_log(collection_id_to_address(collection.id)),346 );347 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(348 collection.id,349 TokenId::default(),350 user.clone(),351 amount,352 ));353 }354355 Ok(())356 }357358 fn set_allowance_unchecked(359 collection: &FungibleHandle<T>,360 owner: &T::CrossAccountId,361 spender: &T::CrossAccountId,362 amount: u128,363 ) {364 if amount == 0 {365 <Allowance<T>>::remove((collection.id, owner, spender));366 } else {367 <Allowance<T>>::insert((collection.id, owner, spender), amount);368 }369370 <PalletEvm<T>>::deposit_log(371 ERC20Events::Approval {372 owner: *owner.as_eth(),373 spender: *spender.as_eth(),374 value: amount.into(),375 }376 .to_log(collection_id_to_address(collection.id)),377 );378 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(379 collection.id,380 TokenId(0),381 owner.clone(),382 spender.clone(),383 amount,384 ));385 }386387 pub fn set_allowance(388 collection: &FungibleHandle<T>,389 owner: &T::CrossAccountId,390 spender: &T::CrossAccountId,391 amount: u128,392 ) -> DispatchResult {393 collection.check_is_mutable()?;394 if collection.permissions.access() == AccessMode::AllowList {395 collection.check_allowlist(owner)?;396 collection.check_allowlist(spender)?;397 }398399 if <Balance<T>>::get((collection.id, owner)) < amount {400 ensure!(401 collection.ignores_owned_amount(owner),402 <CommonError<T>>::CantApproveMoreThanOwned403 );404 }405406 // =========407408 Self::set_allowance_unchecked(collection, owner, spender, amount);409 Ok(())410 }411412 fn check_allowed(413 collection: &FungibleHandle<T>,414 spender: &T::CrossAccountId,415 from: &T::CrossAccountId,416 amount: u128,417 nesting_budget: &dyn Budget,418 ) -> Result<Option<u128>, DispatchError> {419 if spender.conv_eq(from) {420 return Ok(None);421 }422 if collection.permissions.access() == AccessMode::AllowList {423 // `from`, `to` checked in [`transfer`]424 collection.check_allowlist(spender)?;425 }426 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {427 // TODO: should collection owner be allowed to perform this transfer?428 ensure!(429 <PalletStructure<T>>::check_indirectly_owned(430 spender.clone(),431 source.0,432 source.1,433 None,434 nesting_budget435 )?,436 <CommonError<T>>::ApprovedValueTooLow,437 );438 return Ok(None);439 }440 let allowance = <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount);441 if allowance.is_none() {442 ensure!(443 collection.ignores_allowance(spender),444 <CommonError<T>>::ApprovedValueTooLow445 );446 }447448 Ok(allowance)449 }450451 pub fn transfer_from(452 collection: &FungibleHandle<T>,453 spender: &T::CrossAccountId,454 from: &T::CrossAccountId,455 to: &T::CrossAccountId,456 amount: u128,457 nesting_budget: &dyn Budget,458 ) -> DispatchResult {459 let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;460461 // =========462463 Self::transfer(collection, from, to, amount, nesting_budget)?;464 if let Some(allowance) = allowance {465 Self::set_allowance_unchecked(collection, from, spender, allowance);466 }467 Ok(())468 }469470 pub fn burn_from(471 collection: &FungibleHandle<T>,472 spender: &T::CrossAccountId,473 from: &T::CrossAccountId,474 amount: u128,475 nesting_budget: &dyn Budget,476 ) -> DispatchResult {477 let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;478479 // =========480481 Self::burn(collection, from, amount)?;482 if let Some(allowance) = allowance {483 Self::set_allowance_unchecked(collection, from, spender, allowance);484 }485 Ok(())486 }487488 /// Delegated to `create_multiple_items`489 pub fn create_item(490 collection: &FungibleHandle<T>,491 sender: &T::CrossAccountId,492 data: CreateItemData<T>,493 nesting_budget: &dyn Budget,494 ) -> DispatchResult {495 Self::create_multiple_items(496 collection,497 sender,498 [(data.0, data.1)].into_iter().collect(),499 nesting_budget,500 )501 }502}pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -304,8 +304,9 @@
pub fn init_collection(
owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
+ is_external: bool,
) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(owner, data)
+ <PalletCommon<T>>::init_collection(owner, data, is_external)
}
pub fn destroy_collection(
collection: NonfungibleHandle<T>,
@@ -336,8 +337,6 @@
sender: &T::CrossAccountId,
token: TokenId,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
let token_data =
<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;
ensure!(
@@ -458,7 +457,6 @@
&property.key,
is_token_create,
)?;
- collection.check_is_mutable()?;
<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
let property = property.clone();
@@ -496,7 +494,6 @@
token_id: TokenId,
property_key: PropertyKey,
) -> DispatchResult {
- collection.check_is_mutable()?;
Self::check_token_change_permission(collection, sender, token_id, &property_key, false)?;
<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
@@ -574,8 +571,6 @@
token_id: TokenId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
for key in property_keys {
Self::delete_token_property(collection, sender, token_id, key)?;
}
@@ -622,8 +617,6 @@
token: TokenId,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed
@@ -902,8 +895,6 @@
token: TokenId,
spender: Option<&T::CrossAccountId>,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(sender)?;
if let Some(spender) = spender {
pallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -235,6 +235,7 @@
Self::unique_collection_id(collection_id)?,
misc::CollectionType::Regular,
)?;
+ collection.check_is_external()?;
<PalletNft<T>>::destroy_collection(collection, &cross_sender)
.map_err(Self::map_unique_err_to_proxy)?;
@@ -256,6 +257,9 @@
) -> DispatchResult {
let sender = ensure_signed(origin)?;
+ let collection = Self::get_nft_collection(Self::unique_collection_id(collection_id)?)?;
+ collection.check_is_external()?;
+
let new_issuer = T::Lookup::lookup(new_issuer)?;
Self::change_collection_owner(
@@ -287,6 +291,7 @@
Self::unique_collection_id(collection_id)?,
misc::CollectionType::Regular,
)?;
+ collection.check_is_external()?;
Self::check_collection_owner(&collection, &cross_sender)?;
@@ -318,17 +323,18 @@
let sender = ensure_signed(origin)?;
let sender = T::CrossAccountId::from_sub(sender);
let cross_owner = T::CrossAccountId::from_sub(owner.clone());
-
- let royalty_info = royalty_amount.map(|amount| rmrk_traits::RoyaltyInfo {
- recipient: recipient.unwrap_or_else(|| owner.clone()),
- amount,
- });
let collection = Self::get_typed_nft_collection(
Self::unique_collection_id(collection_id)?,
misc::CollectionType::Regular,
)?;
+ collection.check_is_external()?;
+ let royalty_info = royalty_amount.map(|amount| rmrk_traits::RoyaltyInfo {
+ recipient: recipient.unwrap_or_else(|| owner.clone()),
+ amount,
+ });
+
let nft_id = Self::create_nft(
&sender,
&cross_owner,
@@ -382,6 +388,12 @@
let sender = ensure_signed(origin)?;
let cross_sender = T::CrossAccountId::from_sub(sender.clone());
+ let collection = Self::get_typed_nft_collection(
+ Self::unique_collection_id(collection_id)?,
+ misc::CollectionType::Regular,
+ )?;
+ collection.check_is_external()?;
+
Self::destroy_nft(
cross_sender,
Self::unique_collection_id(collection_id)?,
@@ -411,13 +423,14 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
let nft_id = rmrk_nft_id.into();
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let token_data =
<TokenData<T>>::get((collection_id, nft_id)).ok_or(<Error<T>>::NoAvailableNftId)?;
let from = token_data.owner;
-
- let collection =
- Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
ensure!(
Self::get_nft_property_decoded(collection_id, nft_id, RmrkProperty::Transferable)?,
@@ -516,6 +529,7 @@
let collection =
Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
let new_cross_owner = match new_owner {
RmrkAccountIdOrCollectionNftTuple::AccountId(ref account_id) => {
@@ -581,6 +595,10 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
let nft_id = rmrk_nft_id.into();
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
Self::destroy_nft(cross_sender, collection_id, nft_id).map_err(|err| {
if err == <CommonError<T>>::NoPermission.into()
|| err == <CommonError<T>>::ApprovedValueTooLow.into()
@@ -613,6 +631,9 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)
.map_err(|_| <Error<T>>::ResourceDoesntExist)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
let nft_id = rmrk_nft_id.into();
let resource_id = rmrk_resource_id.into();
@@ -666,6 +687,9 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)
.map_err(|_| <Error<T>>::ResourceDoesntExist)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
let nft_id = rmrk_nft_id.into();
let resource_id = rmrk_resource_id.into();
@@ -720,6 +744,10 @@
let sender = T::CrossAccountId::from_sub(sender);
let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let budget = budget::Value::new(NESTING_BUDGET);
match maybe_nft_id {
@@ -775,6 +803,11 @@
let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
let nft_id = rmrk_nft_id.into();
+
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let budget = budget::Value::new(NESTING_BUDGET);
Self::ensure_nft_type(collection_id, nft_id, NftType::Regular)?;
@@ -799,15 +832,20 @@
#[transactional]
pub fn add_basic_resource(
origin: OriginFor<T>,
- collection_id: RmrkCollectionId,
+ rmrk_collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
resource: RmrkBasicResource,
) -> DispatchResult {
let sender = ensure_signed(origin.clone())?;
+ let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let resource_id = Self::resource_add(
sender,
- Self::unique_collection_id(collection_id)?,
+ collection_id,
nft_id.into(),
[
Self::rmrk_property(TokenType, &NftType::Resource)?,
@@ -831,16 +869,21 @@
#[transactional]
pub fn add_composable_resource(
origin: OriginFor<T>,
- collection_id: RmrkCollectionId,
+ rmrk_collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
_resource_id: RmrkBoundedResource,
resource: RmrkComposableResource,
) -> DispatchResult {
let sender = ensure_signed(origin.clone())?;
+ let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let resource_id = Self::resource_add(
sender,
- Self::unique_collection_id(collection_id)?,
+ collection_id,
nft_id.into(),
[
Self::rmrk_property(TokenType, &NftType::Resource)?,
@@ -866,15 +909,20 @@
#[transactional]
pub fn add_slot_resource(
origin: OriginFor<T>,
- collection_id: RmrkCollectionId,
+ rmrk_collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
resource: RmrkSlotResource,
) -> DispatchResult {
let sender = ensure_signed(origin.clone())?;
+ let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
let resource_id = Self::resource_add(
sender,
- Self::unique_collection_id(collection_id)?,
+ collection_id,
nft_id.into(),
[
Self::rmrk_property(TokenType, &NftType::Resource)?,
@@ -900,18 +948,18 @@
#[transactional]
pub fn remove_resource(
origin: OriginFor<T>,
- collection_id: RmrkCollectionId,
+ rmrk_collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
resource_id: RmrkResourceId,
) -> DispatchResult {
let sender = ensure_signed(origin.clone())?;
- Self::resource_remove(
- sender,
- Self::unique_collection_id(collection_id)?,
- nft_id.into(),
- resource_id.into(),
- )?;
+ let collection_id = Self::unique_collection_id(rmrk_collection_id)?;
+ let collection =
+ Self::get_typed_nft_collection(collection_id, misc::CollectionType::Regular)?;
+ collection.check_is_external()?;
+
+ Self::resource_remove(sender, collection_id, nft_id.into(), resource_id.into())?;
Self::deposit_event(Event::ResourceRemoval {
nft_id,
@@ -968,7 +1016,7 @@
data: CreateCollectionData<T::AccountId>,
properties: impl Iterator<Item = Property>,
) -> Result<CollectionId, DispatchError> {
- let collection_id = <PalletNft<T>>::init_collection(sender, data);
+ let collection_id = <PalletNft<T>>::init_collection(sender, data, true);
if let Err(DispatchError::Arithmetic(_)) = &collection_id {
return Err(<Error<T>>::NoAvailableCollectionId.into());
pallets/proxy-rmrk-equip/src/lib.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-equip/src/lib.rs
+++ b/pallets/proxy-rmrk-equip/src/lib.rs
@@ -94,7 +94,8 @@
..Default::default()
};
- let collection_id_res = <PalletNft<T>>::init_collection(cross_sender.clone(), data);
+ let collection_id_res =
+ <PalletNft<T>>::init_collection(cross_sender.clone(), data, true);
if let Err(DispatchError::Arithmetic(_)) = &collection_id_res {
return Err(<Error<T>>::NoAvailableBaseId.into());
@@ -155,6 +156,7 @@
misc::CollectionType::Base,
)
.map_err(|_| <Error<T>>::BaseDoesntExist)?;
+ collection.check_is_external()?;
if theme.name.as_slice() == b"default" {
<BaseHasDefaultTheme<T>>::insert(collection_id, true);
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -200,7 +200,7 @@
owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(owner, data)
+ <PalletCommon<T>>::init_collection(owner, data, false)
}
pub fn destroy_collection(
collection: RefungibleHandle<T>,
@@ -234,7 +234,6 @@
}
pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {
- collection.check_is_mutable()?;
let burnt = <TokensBurnt<T>>::get(collection.id)
.checked_add(1)
.ok_or(ArithmeticError::Overflow)?;
@@ -254,7 +253,6 @@
token: TokenId,
amount: u128,
) -> DispatchResult {
- collection.check_is_mutable()?;
let total_supply = <TotalSupply<T>>::get((collection.id, token))
.checked_sub(amount)
.ok_or(<CommonError<T>>::TokenValueTooLow)?;
@@ -327,7 +325,6 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_mutable()?;
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed
@@ -576,7 +573,6 @@
token: TokenId,
amount: u128,
) -> DispatchResult {
- collection.check_is_mutable()?;
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(sender)?;
collection.check_allowlist(spender)?;
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -92,8 +92,9 @@
..Default::default()
};
- let collection_id = <pallet_nonfungible::Pallet<T>>::init_collection(caller.clone(), data)
- .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+ let collection_id =
+ <pallet_nonfungible::Pallet<T>>::init_collection(caller.clone(), data, false)
+ .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
let address = pallet_common::eth::collection_id_to_address(collection_id);
Ok(address)
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -304,7 +304,7 @@
pub fn destroy_collection(origin, collection_id: CollectionId) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
- collection.check_is_mutable()?;
+ collection.check_is_internal()?;
// =========
@@ -339,6 +339,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ collection.check_is_internal()?;
<PalletCommon<T>>::toggle_allowlist(
&collection,
@@ -373,6 +374,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ collection.check_is_internal()?;
<PalletCommon<T>>::toggle_allowlist(
&collection,
@@ -407,7 +409,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
- target_collection.check_is_mutable()?;
+ target_collection.check_is_internal()?;
target_collection.check_is_owner(&sender)?;
target_collection.owner = new_owner.clone();
@@ -437,6 +439,7 @@
pub fn add_collection_admin(origin, collection_id: CollectionId, new_admin_id: T::CrossAccountId) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ collection.check_is_internal()?;
<Pallet<T>>::deposit_event(Event::<T>::CollectionAdminAdded(
collection_id,
@@ -463,6 +466,7 @@
pub fn remove_collection_admin(origin, collection_id: CollectionId, account_id: T::CrossAccountId) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ collection.check_is_internal()?;
<Pallet<T>>::deposit_event(Event::<T>::CollectionAdminRemoved(
collection_id,
@@ -488,6 +492,7 @@
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
target_collection.check_is_owner(&sender)?;
+ target_collection.check_is_internal()?;
target_collection.set_sponsor(new_sponsor.clone())?;
@@ -512,6 +517,7 @@
let sender = ensure_signed(origin)?;
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ target_collection.check_is_internal()?;
ensure!(
target_collection.confirm_sponsorship(&sender)?,
Error::<T>::ConfirmUnsetSponsorFail
@@ -540,6 +546,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ target_collection.check_is_internal()?;
target_collection.check_is_owner(&sender)?;
target_collection.sponsorship = SponsorshipState::Disabled;
@@ -704,6 +711,7 @@
pub fn set_transfers_enabled_flag(origin, collection_id: CollectionId, value: bool) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ target_collection.check_is_internal()?;
target_collection.check_is_owner(&sender)?;
// =========
@@ -858,6 +866,7 @@
) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ target_collection.check_is_internal()?;
target_collection.check_is_owner(&sender)?;
let old_limit = &target_collection.limits;
@@ -879,6 +888,7 @@
) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
+ target_collection.check_is_internal()?;
target_collection.check_is_owner(&sender)?;
let old_limit = &target_collection.permissions;
runtime/common/src/dispatch.rsdiffbeforeafterboth--- a/runtime/common/src/dispatch.rs
+++ b/runtime/common/src/dispatch.rs
@@ -35,7 +35,7 @@
data: CreateCollectionData<T::AccountId>,
) -> DispatchResult {
let _id = match data.mode {
- CollectionMode::NFT => <PalletNonfungible<T>>::init_collection(sender, data)?,
+ CollectionMode::NFT => <PalletNonfungible<T>>::init_collection(sender, data, false)?,
CollectionMode::Fungible(decimal_points) => {
// check params
ensure!(