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.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/>.1617use evm_coder::{18 solidity_interface, solidity, ToLog,19 types::*,20 execution::{Result, Error},21};22pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};23use pallet_evm_coder_substrate::dispatch_to_evm;24use sp_core::{H160, U256, H256};25use sp_std::vec::Vec;26use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};27use alloc::format;2829use crate::{Pallet, CollectionHandle, Config, CollectionProperties};3031#[derive(ToLog)]32pub enum CollectionHelpersEvents {33 CollectionCreated {34 #[indexed]35 owner: address,36 #[indexed]37 collection_id: address,38 },39}4041/// Does not always represent a full collection, for RFT it is either42/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)43pub trait CommonEvmHandler {44 const CODE: &'static [u8];4546 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;47}4849#[solidity_interface(name = "Collection")]50impl<T: Config> CollectionHandle<T>51// where52// T::AccountId: From<H256>53{54 fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {55 let caller = T::CrossAccountId::from_eth(caller);56 let key = <Vec<u8>>::from(key)57 .try_into()58 .map_err(|_| "key too large")?;59 let value = value.try_into().map_err(|_| "value too large")?;6061 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })62 .map_err(dispatch_to_evm::<T>)63 }6465 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {66 let caller = T::CrossAccountId::from_eth(caller);67 let key = <Vec<u8>>::from(key)68 .try_into()69 .map_err(|_| "key too large")?;7071 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)72 }7374 /// Throws error if key not found75 fn collection_property(&self, key: string) -> Result<bytes> {76 let key = <Vec<u8>>::from(key)77 .try_into()78 .map_err(|_| "key too large")?;7980 let props = <CollectionProperties<T>>::get(self.id);81 let prop = props.get(&key).ok_or("key not found")?;8283 Ok(prop.to_vec())84 }8586 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {87 check_is_owner(caller, self)?;8889 let sponsor = T::CrossAccountId::from_eth(sponsor);90 self.set_sponsor(sponsor.as_sub().clone())91 .map_err(dispatch_to_evm::<T>)?;92 save(self)93 }9495 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {96 let caller = T::CrossAccountId::from_eth(caller);97 if !self98 .confirm_sponsorship(caller.as_sub())99 .map_err(dispatch_to_evm::<T>)?100 {101 return Err(Error::Revert("Caller is not set as sponsor".into()));102 }103 save(self)104 }105106 #[solidity(rename_selector = "setCollectionLimit")]107 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {108 check_is_owner(caller, self)?;109 let mut limits = self.limits.clone();110111 match limit.as_str() {112 "accountTokenOwnershipLimit" => {113 limits.account_token_ownership_limit = Some(value);114 }115 "sponsoredDataSize" => {116 limits.sponsored_data_size = Some(value);117 }118 "sponsoredDataRateLimit" => {119 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));120 }121 "tokenLimit" => {122 limits.token_limit = Some(value);123 }124 "sponsorTransferTimeout" => {125 limits.sponsor_transfer_timeout = Some(value);126 }127 "sponsorApproveTimeout" => {128 limits.sponsor_approve_timeout = Some(value);129 }130 _ => {131 return Err(Error::Revert(format!(132 "Unknown integer limit \"{}\"",133 limit134 )))135 }136 }137 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)138 .map_err(dispatch_to_evm::<T>)?;139 save(self)140 }141142 #[solidity(rename_selector = "setCollectionLimit")]143 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {144 check_is_owner(caller, self)?;145 let mut limits = self.limits.clone();146147 match limit.as_str() {148 "ownerCanTransfer" => {149 limits.owner_can_transfer = Some(value);150 }151 "ownerCanDestroy" => {152 limits.owner_can_destroy = Some(value);153 }154 "transfersEnabled" => {155 limits.transfers_enabled = Some(value);156 }157 _ => {158 return Err(Error::Revert(format!(159 "Unknown boolean limit \"{}\"",160 limit161 )))162 }163 }164 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)165 .map_err(dispatch_to_evm::<T>)?;166 save(self)167 }168169 fn contract_address(&self, _caller: caller) -> Result<address> {170 Ok(crate::eth::collection_id_to_address(self.id))171 }172173 // fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {174 // let mut new_admin_h256 = H256::default();175 // new_admin.to_little_endian(&mut new_admin_h256.0);176 // let account_id = T::AccountId::from(new_admin_h256);177 // let caller = T::CrossAccountId::from_eth(caller);178 // let new_admin = T::CrossAccountId::from_sub(account_id);179 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)180 // .map_err(dispatch_to_evm::<T>)?;181 // Ok(())182 // }183184 // fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {185 // let mut new_admin_h256 = H256::default();186 // new_admin.to_little_endian(&mut new_admin_h256.0);187 // let account_id = T::AccountId::from(new_admin_h256);188 // let caller = T::CrossAccountId::from_eth(caller);189 // let new_admin = T::CrossAccountId::from_sub(account_id);190 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)191 // .map_err(dispatch_to_evm::<T>)?;192 // Ok(())193 // }194195 fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {196 let caller = T::CrossAccountId::from_eth(caller);197 self.check_is_owner_or_admin(&caller)198 .map_err(dispatch_to_evm::<T>)?;199 let new_admin = T::CrossAccountId::from_eth(new_admin);200 <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)201 .map_err(dispatch_to_evm::<T>)?;202 Ok(())203 }204205 fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {206 let caller = T::CrossAccountId::from_eth(caller);207 self.check_is_owner_or_admin(&caller)208 .map_err(dispatch_to_evm::<T>)?;209 let admin = T::CrossAccountId::from_eth(admin);210 <Pallet<T>>::toggle_admin(&self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;211 Ok(())212 }213214 #[solidity(rename_selector = "setCollectionNesting")]215 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {216 let caller = T::CrossAccountId::from_eth(caller);217 self.check_is_owner_or_admin(&caller)218 .map_err(dispatch_to_evm::<T>)?;219 self.collection.permissions.nesting = Some(match enable {220 false => NestingRule::Disabled,221 true => NestingRule::Owner,222 });223 save(self);224 Ok(())225 }226227 #[solidity(rename_selector = "setCollectionNesting")]228 fn set_nesting(229 &mut self,230 caller: caller,231 enable: bool,232 collections: Vec<address>,233 ) -> Result<void> {234 if collections.is_empty() {235 return Err("No addresses provided".into());236 }237 if collections.len() >= OwnerRestrictedSet::bound() {238 return Err(Error::Revert(format!(239 "Out of bound: {} >= {}",240 collections.len(),241 OwnerRestrictedSet::bound()242 )));243 }244 let caller = T::CrossAccountId::from_eth(caller);245 self.check_is_owner_or_admin(&caller)246 .map_err(dispatch_to_evm::<T>)?;247 self.collection.permissions.nesting = Some(match enable {248 false => NestingRule::Disabled,249 true => {250 let mut bv = OwnerRestrictedSet::new();251 for i in collections {252 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(253 "Can't convert address into collection id".into(),254 ))?)255 .map_err(|e| Error::Revert(format!("{:?}", e)))?;256 }257 NestingRule::OwnerRestricted(bv)258 }259 });260 save(self);261 Ok(())262 }263264 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {265 let caller = T::CrossAccountId::from_eth(caller);266 self.check_is_owner_or_admin(&caller)267 .map_err(dispatch_to_evm::<T>)?;268 self.collection.permissions.access = Some(match mode {269 0 => AccessMode::Normal,270 1 => AccessMode::AllowList,271 _ => return Err("Not supported access mode".into()),272 });273 save(self);274 Ok(())275 }276277 fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {278 let caller = check_is_owner_or_admin(caller, self)?;279 let user = T::CrossAccountId::from_eth(user);280 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;281 Ok(())282 }283284 fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {285 let caller = check_is_owner_or_admin(caller, self)?;286 let user = T::CrossAccountId::from_eth(user);287 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;288 Ok(())289 }290291 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {292 check_is_owner_or_admin(caller, self)?;293 self.collection.permissions.mint_mode = Some(mode);294 save(self);295 Ok(())296 }297}298299fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<void> {300 let caller = T::CrossAccountId::from_eth(caller);301 collection302 .check_is_owner(&caller)303 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;304 Ok(())305}306307fn check_is_owner_or_admin<T: Config>(308 caller: caller,309 collection: &CollectionHandle<T>,310) -> Result<T::CrossAccountId> {311 let caller = T::CrossAccountId::from_eth(caller);312 collection313 .check_is_owner_or_admin(&caller)314 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;315 Ok(caller)316}317318fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {319 collection320 .check_is_mutable()321 .map_err(dispatch_to_evm::<T>)?;322 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());323 Ok(())324}325326pub fn token_uri_key() -> up_data_structs::PropertyKey {327 b"tokenURI"328 .to_vec()329 .try_into()330 .expect("length < limit; qed")331}1// 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/>.1617use evm_coder::{18 solidity_interface, solidity, ToLog,19 types::*,20 execution::{Result, Error},21};22pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};23use pallet_evm_coder_substrate::dispatch_to_evm;24use sp_core::{H160, U256, H256};25use sp_std::vec::Vec;26use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};27use alloc::format;2829use crate::{Pallet, CollectionHandle, Config, CollectionProperties};3031#[derive(ToLog)]32pub enum CollectionHelpersEvents {33 CollectionCreated {34 #[indexed]35 owner: address,36 #[indexed]37 collection_id: address,38 },39}4041/// Does not always represent a full collection, for RFT it is either42/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)43pub trait CommonEvmHandler {44 const CODE: &'static [u8];4546 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;47}4849#[solidity_interface(name = "Collection")]50impl<T: Config> CollectionHandle<T>51// where52// T::AccountId: From<H256>53{54 fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {55 let caller = T::CrossAccountId::from_eth(caller);56 let key = <Vec<u8>>::from(key)57 .try_into()58 .map_err(|_| "key too large")?;59 let value = value.try_into().map_err(|_| "value too large")?;6061 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })62 .map_err(dispatch_to_evm::<T>)63 }6465 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {66 let caller = T::CrossAccountId::from_eth(caller);67 let key = <Vec<u8>>::from(key)68 .try_into()69 .map_err(|_| "key too large")?;7071 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)72 }7374 /// Throws error if key not found75 fn collection_property(&self, key: string) -> Result<bytes> {76 let key = <Vec<u8>>::from(key)77 .try_into()78 .map_err(|_| "key too large")?;7980 let props = <CollectionProperties<T>>::get(self.id);81 let prop = props.get(&key).ok_or("key not found")?;8283 Ok(prop.to_vec())84 }8586 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {87 check_is_owner(caller, self)?;8889 let sponsor = T::CrossAccountId::from_eth(sponsor);90 self.set_sponsor(sponsor.as_sub().clone())91 .map_err(dispatch_to_evm::<T>)?;92 save(self)93 }9495 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {96 let caller = T::CrossAccountId::from_eth(caller);97 if !self98 .confirm_sponsorship(caller.as_sub())99 .map_err(dispatch_to_evm::<T>)?100 {101 return Err(Error::Revert("Caller is not set as sponsor".into()));102 }103 save(self)104 }105106 #[solidity(rename_selector = "setCollectionLimit")]107 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {108 check_is_owner(caller, self)?;109 let mut limits = self.limits.clone();110111 match limit.as_str() {112 "accountTokenOwnershipLimit" => {113 limits.account_token_ownership_limit = Some(value);114 }115 "sponsoredDataSize" => {116 limits.sponsored_data_size = Some(value);117 }118 "sponsoredDataRateLimit" => {119 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));120 }121 "tokenLimit" => {122 limits.token_limit = Some(value);123 }124 "sponsorTransferTimeout" => {125 limits.sponsor_transfer_timeout = Some(value);126 }127 "sponsorApproveTimeout" => {128 limits.sponsor_approve_timeout = Some(value);129 }130 _ => {131 return Err(Error::Revert(format!(132 "Unknown integer limit \"{}\"",133 limit134 )))135 }136 }137 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)138 .map_err(dispatch_to_evm::<T>)?;139 save(self)140 }141142 #[solidity(rename_selector = "setCollectionLimit")]143 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {144 check_is_owner(caller, self)?;145 let mut limits = self.limits.clone();146147 match limit.as_str() {148 "ownerCanTransfer" => {149 limits.owner_can_transfer = Some(value);150 }151 "ownerCanDestroy" => {152 limits.owner_can_destroy = Some(value);153 }154 "transfersEnabled" => {155 limits.transfers_enabled = Some(value);156 }157 _ => {158 return Err(Error::Revert(format!(159 "Unknown boolean limit \"{}\"",160 limit161 )))162 }163 }164 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)165 .map_err(dispatch_to_evm::<T>)?;166 save(self)167 }168169 fn contract_address(&self, _caller: caller) -> Result<address> {170 Ok(crate::eth::collection_id_to_address(self.id))171 }172173 // fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {174 // let mut new_admin_h256 = H256::default();175 // new_admin.to_little_endian(&mut new_admin_h256.0);176 // let account_id = T::AccountId::from(new_admin_h256);177 // let caller = T::CrossAccountId::from_eth(caller);178 // let new_admin = T::CrossAccountId::from_sub(account_id);179 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)180 // .map_err(dispatch_to_evm::<T>)?;181 // Ok(())182 // }183184 // fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {185 // let mut new_admin_h256 = H256::default();186 // new_admin.to_little_endian(&mut new_admin_h256.0);187 // let account_id = T::AccountId::from(new_admin_h256);188 // let caller = T::CrossAccountId::from_eth(caller);189 // let new_admin = T::CrossAccountId::from_sub(account_id);190 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)191 // .map_err(dispatch_to_evm::<T>)?;192 // Ok(())193 // }194195 fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {196 let caller = T::CrossAccountId::from_eth(caller);197 self.check_is_owner_or_admin(&caller)198 .map_err(dispatch_to_evm::<T>)?;199 let new_admin = T::CrossAccountId::from_eth(new_admin);200 <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)201 .map_err(dispatch_to_evm::<T>)?;202 Ok(())203 }204205 fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {206 let caller = T::CrossAccountId::from_eth(caller);207 self.check_is_owner_or_admin(&caller)208 .map_err(dispatch_to_evm::<T>)?;209 let admin = T::CrossAccountId::from_eth(admin);210 <Pallet<T>>::toggle_admin(&self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;211 Ok(())212 }213214 #[solidity(rename_selector = "setCollectionNesting")]215 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {216 let caller = T::CrossAccountId::from_eth(caller);217 self.check_is_owner_or_admin(&caller)218 .map_err(dispatch_to_evm::<T>)?;219 self.collection.permissions.nesting = Some(match enable {220 false => NestingRule::Disabled,221 true => NestingRule::Owner,222 });223 save(self);224 Ok(())225 }226227 #[solidity(rename_selector = "setCollectionNesting")]228 fn set_nesting(229 &mut self,230 caller: caller,231 enable: bool,232 collections: Vec<address>,233 ) -> Result<void> {234 if collections.is_empty() {235 return Err("No addresses provided".into());236 }237 if collections.len() >= OwnerRestrictedSet::bound() {238 return Err(Error::Revert(format!(239 "Out of bound: {} >= {}",240 collections.len(),241 OwnerRestrictedSet::bound()242 )));243 }244 let caller = T::CrossAccountId::from_eth(caller);245 self.check_is_owner_or_admin(&caller)246 .map_err(dispatch_to_evm::<T>)?;247 self.collection.permissions.nesting = Some(match enable {248 false => NestingRule::Disabled,249 true => {250 let mut bv = OwnerRestrictedSet::new();251 for i in collections {252 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(253 "Can't convert address into collection id".into(),254 ))?)255 .map_err(|e| Error::Revert(format!("{:?}", e)))?;256 }257 NestingRule::OwnerRestricted(bv)258 }259 });260 save(self);261 Ok(())262 }263264 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {265 let caller = T::CrossAccountId::from_eth(caller);266 self.check_is_owner_or_admin(&caller)267 .map_err(dispatch_to_evm::<T>)?;268 self.collection.permissions.access = Some(match mode {269 0 => AccessMode::Normal,270 1 => AccessMode::AllowList,271 _ => return Err("Not supported access mode".into()),272 });273 save(self);274 Ok(())275 }276277 fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {278 let caller = check_is_owner_or_admin(caller, self)?;279 let user = T::CrossAccountId::from_eth(user);280 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;281 Ok(())282 }283284 fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {285 let caller = check_is_owner_or_admin(caller, self)?;286 let user = T::CrossAccountId::from_eth(user);287 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;288 Ok(())289 }290291 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {292 check_is_owner_or_admin(caller, self)?;293 self.collection.permissions.mint_mode = Some(mode);294 save(self);295 Ok(())296 }297}298299fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<void> {300 let caller = T::CrossAccountId::from_eth(caller);301 collection302 .check_is_owner(&caller)303 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;304 Ok(())305}306307fn check_is_owner_or_admin<T: Config>(308 caller: caller,309 collection: &CollectionHandle<T>,310) -> Result<T::CrossAccountId> {311 let caller = T::CrossAccountId::from_eth(caller);312 collection313 .check_is_owner_or_admin(&caller)314 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;315 Ok(caller)316}317318fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {319 // TODO possibly delete for the lack of transaction320 collection321 .check_is_internal()322 .map_err(dispatch_to_evm::<T>)?;323 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());324 Ok(())325}326327pub fn token_uri_key() -> up_data_structs::PropertyKey {328 b"tokenURI"329 .to_vec()330 .try_into()331 .expect("length < limit; qed")332}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.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -137,7 +137,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: FungibleHandle<T>,
@@ -168,8 +168,6 @@
owner: &T::CrossAccountId,
amount: u128,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
let total_supply = <TotalSupply<T>>::get(collection.id)
.checked_sub(amount)
.ok_or(<CommonError<T>>::TokenValueTooLow)?;
@@ -216,8 +214,6 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed,
@@ -287,8 +283,6 @@
data: BTreeMap<T::CrossAccountId, u128>,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_mutable()?;
-
if !collection.is_owner_or_admin(sender) {
ensure!(
collection.permissions.mint_mode(),
@@ -390,7 +384,6 @@
spender: &T::CrossAccountId,
amount: u128,
) -> DispatchResult {
- collection.check_is_mutable()?;
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(owner)?;
collection.check_allowlist(spender)?;
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!(