difftreelog
CORE-390 Refactor naming
in: master
7 files changed
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_read_only()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 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}pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -149,19 +149,19 @@
))
}
pub fn save(self) -> Result<(), DispatchError> {
- self.check_is_read_only()?;
+ 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_read_only()?;
+ 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_read_only()?;
+ self.check_is_mutable()?;
if self.collection.sponsorship.pending_sponsor() != Some(sender) {
return Ok(false);
@@ -686,7 +686,7 @@
sponsorship,
limits,
permissions,
- read_only,
+ external_collection,
} = <CollectionById<T>>::get(collection)?;
let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)
@@ -716,7 +716,7 @@
permissions,
token_property_permissions,
properties,
- read_only,
+ read_only: external_collection,
})
}
}
@@ -797,7 +797,7 @@
Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)
})
.unwrap_or_else(|| Ok(CollectionPermissions::default()))?,
- read_only: false,
+ external_collection: false,
};
let mut collection_properties = up_data_structs::CollectionProperties::get();
@@ -854,7 +854,7 @@
collection: CollectionHandle<T>,
sender: &T::CrossAccountId,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
ensure!(
collection.limits.owner_can_destroy(),
<Error<T>>::NoPermission,
@@ -884,7 +884,7 @@
sender: &T::CrossAccountId,
property: Property,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
collection.check_is_owner_or_admin(sender)?;
CollectionProperties::<T>::try_mutate(collection.id, |properties| {
@@ -930,7 +930,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
for property in properties {
Self::set_collection_property(collection, sender, property)?;
@@ -944,7 +944,7 @@
sender: &T::CrossAccountId,
property_key: PropertyKey,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
collection.check_is_owner_or_admin(sender)?;
CollectionProperties::<T>::try_mutate(collection.id, |properties| {
@@ -966,7 +966,7 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
for key in property_keys {
Self::delete_collection_property(collection, sender, key)?;
@@ -992,7 +992,7 @@
sender: &T::CrossAccountId,
property_permission: PropertyKeyPermission,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
collection.check_is_owner_or_admin(sender)?;
let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);
@@ -1024,7 +1024,7 @@
sender: &T::CrossAccountId,
property_permissions: Vec<PropertyKeyPermission>,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
for prop_pemission in property_permissions {
Self::set_property_permission(collection, sender, prop_pemission)?;
@@ -1113,7 +1113,7 @@
user: &T::CrossAccountId,
allowed: bool,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
collection.check_is_owner_or_admin(sender)?;
// =========
@@ -1133,7 +1133,7 @@
user: &T::CrossAccountId,
admin: bool,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ 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
@@ -168,7 +168,7 @@
owner: &T::CrossAccountId,
amount: u128,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
let total_supply = <TotalSupply<T>>::get(collection.id)
.checked_sub(amount)
@@ -216,7 +216,7 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
ensure!(
collection.limits.transfers_enabled(),
@@ -287,7 +287,7 @@
data: BTreeMap<T::CrossAccountId, u128>,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
if !collection.is_owner_or_admin(sender) {
ensure!(
@@ -390,7 +390,7 @@
spender: &T::CrossAccountId,
amount: u128,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ 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
@@ -336,7 +336,7 @@
sender: &T::CrossAccountId,
token: TokenId,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
let token_data =
<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;
@@ -458,7 +458,7 @@
&property.key,
is_token_create,
)?;
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
let property = property.clone();
@@ -496,8 +496,8 @@
token_id: TokenId,
property_key: PropertyKey,
) -> DispatchResult {
+ collection.check_is_mutable()?;
Self::check_token_change_permission(collection, sender, token_id, &property_key, false)?;
- collection.check_is_read_only()?;
<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
properties.remove(&property_key)
@@ -574,7 +574,7 @@
token_id: TokenId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
for key in property_keys {
Self::delete_token_property(collection, sender, token_id, key)?;
@@ -622,7 +622,7 @@
token: TokenId,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
ensure!(
collection.limits.transfers_enabled(),
@@ -902,7 +902,7 @@
token: TokenId,
spender: Option<&T::CrossAccountId>,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(sender)?;
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -234,7 +234,7 @@
}
pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
let burnt = <TokensBurnt<T>>::get(collection.id)
.checked_add(1)
.ok_or(ArithmeticError::Overflow)?;
@@ -254,7 +254,7 @@
token: TokenId,
amount: u128,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
let total_supply = <TotalSupply<T>>::get((collection.id, token))
.checked_sub(amount)
.ok_or(<CommonError<T>>::TokenValueTooLow)?;
@@ -327,7 +327,7 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed
@@ -576,7 +576,7 @@
token: TokenId,
amount: u128,
) -> DispatchResult {
- collection.check_is_read_only()?;
+ collection.check_is_mutable()?;
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(sender)?;
collection.check_allowlist(spender)?;
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_read_only()?;
+ collection.check_is_mutable()?;
// =========
@@ -407,7 +407,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
- target_collection.check_is_read_only()?;
+ target_collection.check_is_mutable()?;
target_collection.check_is_owner(&sender)?;
target_collection.owner = new_owner.clone();
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -316,8 +316,9 @@
#[version(2.., upper(Default::default()))]
pub permissions: CollectionPermissions,
+ /// Marks that this collection is not "unique", and managed from external.
#[version(2.., upper(false))]
- pub read_only: bool,
+ pub external_collection: bool,
#[version(..2)]
pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,