difftreelog
CORE-390 Add read only flag
in: master
8 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 save(self);92 Ok(())93 }9495 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {96 let caller = T::CrossAccountId::from_eth(caller);97 if !self.confirm_sponsorship(caller.as_sub()) {98 return Err(Error::Revert("Caller is not set as sponsor".into()));99 }100 save(self);101 Ok(())102 }103104 #[solidity(rename_selector = "setCollectionLimit")]105 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {106 check_is_owner(caller, self)?;107 let mut limits = self.limits.clone();108109 match limit.as_str() {110 "accountTokenOwnershipLimit" => {111 limits.account_token_ownership_limit = Some(value);112 }113 "sponsoredDataSize" => {114 limits.sponsored_data_size = Some(value);115 }116 "sponsoredDataRateLimit" => {117 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));118 }119 "tokenLimit" => {120 limits.token_limit = Some(value);121 }122 "sponsorTransferTimeout" => {123 limits.sponsor_transfer_timeout = Some(value);124 }125 "sponsorApproveTimeout" => {126 limits.sponsor_approve_timeout = Some(value);127 }128 _ => {129 return Err(Error::Revert(format!(130 "Unknown integer limit \"{}\"",131 limit132 )))133 }134 }135 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)136 .map_err(dispatch_to_evm::<T>)?;137 save(self);138 Ok(())139 }140141 #[solidity(rename_selector = "setCollectionLimit")]142 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {143 check_is_owner(caller, self)?;144 let mut limits = self.limits.clone();145146 match limit.as_str() {147 "ownerCanTransfer" => {148 limits.owner_can_transfer = Some(value);149 }150 "ownerCanDestroy" => {151 limits.owner_can_destroy = Some(value);152 }153 "transfersEnabled" => {154 limits.transfers_enabled = Some(value);155 }156 _ => {157 return Err(Error::Revert(format!(158 "Unknown boolean limit \"{}\"",159 limit160 )))161 }162 }163 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)164 .map_err(dispatch_to_evm::<T>)?;165 save(self);166 Ok(())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<()> {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>) {319 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());320}321322pub fn token_uri_key() -> up_data_structs::PropertyKey {323 b"tokenURI"324 .to_vec()325 .try_into()326 .expect("length < limit; qed")327}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()).map_err(dispatch_to_evm::<T>)?;91 save(self)92 }9394 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {95 let caller = T::CrossAccountId::from_eth(caller);96 if !self.confirm_sponsorship(caller.as_sub()).map_err(dispatch_to_evm::<T>)? {97 return Err(Error::Revert("Caller is not set as sponsor".into()));98 }99 save(self)100 }101102 #[solidity(rename_selector = "setCollectionLimit")]103 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {104 check_is_owner(caller, self)?;105 let mut limits = self.limits.clone();106107 match limit.as_str() {108 "accountTokenOwnershipLimit" => {109 limits.account_token_ownership_limit = Some(value);110 }111 "sponsoredDataSize" => {112 limits.sponsored_data_size = Some(value);113 }114 "sponsoredDataRateLimit" => {115 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));116 }117 "tokenLimit" => {118 limits.token_limit = Some(value);119 }120 "sponsorTransferTimeout" => {121 limits.sponsor_transfer_timeout = Some(value);122 }123 "sponsorApproveTimeout" => {124 limits.sponsor_approve_timeout = Some(value);125 }126 _ => {127 return Err(Error::Revert(format!(128 "Unknown integer limit \"{}\"",129 limit130 )))131 }132 }133 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)134 .map_err(dispatch_to_evm::<T>)?;135 save(self)136 }137138 #[solidity(rename_selector = "setCollectionLimit")]139 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {140 check_is_owner(caller, self)?;141 let mut limits = self.limits.clone();142143 match limit.as_str() {144 "ownerCanTransfer" => {145 limits.owner_can_transfer = Some(value);146 }147 "ownerCanDestroy" => {148 limits.owner_can_destroy = Some(value);149 }150 "transfersEnabled" => {151 limits.transfers_enabled = Some(value);152 }153 _ => {154 return Err(Error::Revert(format!(155 "Unknown boolean limit \"{}\"",156 limit157 )))158 }159 }160 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)161 .map_err(dispatch_to_evm::<T>)?;162 save(self)163 }164165 fn contract_address(&self, _caller: caller) -> Result<address> {166 Ok(crate::eth::collection_id_to_address(self.id))167 }168169 // fn add_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {170 // let mut new_admin_h256 = H256::default();171 // new_admin.to_little_endian(&mut new_admin_h256.0);172 // let account_id = T::AccountId::from(new_admin_h256);173 // let caller = T::CrossAccountId::from_eth(caller);174 // let new_admin = T::CrossAccountId::from_sub(account_id);175 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)176 // .map_err(dispatch_to_evm::<T>)?;177 // Ok(())178 // }179180 // fn remove_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {181 // let mut new_admin_h256 = H256::default();182 // new_admin.to_little_endian(&mut new_admin_h256.0);183 // let account_id = T::AccountId::from(new_admin_h256);184 // let caller = T::CrossAccountId::from_eth(caller);185 // let new_admin = T::CrossAccountId::from_sub(account_id);186 // <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, false)187 // .map_err(dispatch_to_evm::<T>)?;188 // Ok(())189 // }190191 fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {192 let caller = T::CrossAccountId::from_eth(caller);193 self.check_is_owner_or_admin(&caller)194 .map_err(dispatch_to_evm::<T>)?;195 let new_admin = T::CrossAccountId::from_eth(new_admin);196 <Pallet<T>>::toggle_admin(&self, &caller, &new_admin, true)197 .map_err(dispatch_to_evm::<T>)?;198 Ok(())199 }200201 fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {202 let caller = T::CrossAccountId::from_eth(caller);203 self.check_is_owner_or_admin(&caller)204 .map_err(dispatch_to_evm::<T>)?;205 let admin = T::CrossAccountId::from_eth(admin);206 <Pallet<T>>::toggle_admin(&self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;207 Ok(())208 }209210 #[solidity(rename_selector = "setCollectionNesting")]211 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {212 let caller = T::CrossAccountId::from_eth(caller);213 self.check_is_owner_or_admin(&caller)214 .map_err(dispatch_to_evm::<T>)?;215 self.collection.permissions.nesting = Some(match enable {216 false => NestingRule::Disabled,217 true => NestingRule::Owner,218 });219 save(self);220 Ok(())221 }222223 #[solidity(rename_selector = "setCollectionNesting")]224 fn set_nesting(225 &mut self,226 caller: caller,227 enable: bool,228 collections: Vec<address>,229 ) -> Result<void> {230 if collections.is_empty() {231 return Err("No addresses provided".into());232 }233 if collections.len() >= OwnerRestrictedSet::bound() {234 return Err(Error::Revert(format!(235 "Out of bound: {} >= {}",236 collections.len(),237 OwnerRestrictedSet::bound()238 )));239 }240 let caller = T::CrossAccountId::from_eth(caller);241 self.check_is_owner_or_admin(&caller)242 .map_err(dispatch_to_evm::<T>)?;243 self.collection.permissions.nesting = Some(match enable {244 false => NestingRule::Disabled,245 true => {246 let mut bv = OwnerRestrictedSet::new();247 for i in collections {248 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or(Error::Revert(249 "Can't convert address into collection id".into(),250 ))?)251 .map_err(|e| Error::Revert(format!("{:?}", e)))?;252 }253 NestingRule::OwnerRestricted(bv)254 }255 });256 save(self);257 Ok(())258 }259260 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {261 let caller = T::CrossAccountId::from_eth(caller);262 self.check_is_owner_or_admin(&caller)263 .map_err(dispatch_to_evm::<T>)?;264 self.collection.permissions.access = Some(match mode {265 0 => AccessMode::Normal,266 1 => AccessMode::AllowList,267 _ => return Err("Not supported access mode".into()),268 });269 save(self);270 Ok(())271 }272273 fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {274 let caller = check_is_owner_or_admin(caller, self)?;275 let user = T::CrossAccountId::from_eth(user);276 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;277 Ok(())278 }279280 fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {281 let caller = check_is_owner_or_admin(caller, self)?;282 let user = T::CrossAccountId::from_eth(user);283 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;284 Ok(())285 }286287 fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {288 check_is_owner_or_admin(caller, self)?;289 self.collection.permissions.mint_mode = Some(mode);290 save(self);291 Ok(())292 }293}294295fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<void> {296 let caller = T::CrossAccountId::from_eth(caller);297 collection298 .check_is_owner(&caller)299 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;300 Ok(())301}302303fn check_is_owner_or_admin<T: Config>(304 caller: caller,305 collection: &CollectionHandle<T>,306) -> Result<T::CrossAccountId> {307 let caller = T::CrossAccountId::from_eth(caller);308 collection309 .check_is_owner_or_admin(&caller)310 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;311 Ok(caller)312}313314fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {315 collection.check_is_read_only().map_err(dispatch_to_evm::<T>)?;316 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());317 Ok(())318}319320pub fn token_uri_key() -> up_data_structs::PropertyKey {321 b"tokenURI"322 .to_vec()323 .try_into()324 .expect("length < limit; qed")325}pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -148,23 +148,35 @@
.saturating_mul(writes),
))
}
-
- pub fn save(self) -> DispatchResult {
+ pub fn save(self) -> Result<(), DispatchError> {
+ self.check_is_read_only()?;
<CollectionById<T>>::insert(self.id, self.collection);
Ok(())
}
- pub fn set_sponsor(&mut self, sponsor: T::AccountId) {
+ pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {
+ self.check_is_read_only()?;
self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);
+ Ok(())
}
- pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> bool {
+ pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {
+ self.check_is_read_only()?;
+
if self.collection.sponsorship.pending_sponsor() != Some(sender) {
- return false;
- };
+ return Ok(false);
+ }
self.collection.sponsorship = SponsorshipState::Confirmed(sender.clone());
- true
+ Ok(true)
+ }
+
+ pub fn check_is_read_only(&self) -> DispatchResult {
+ if self.read_only {
+ return Err(<Error<T>>::CollectionNotFound)?;
+ }
+
+ Ok(())
}
}
@@ -434,6 +446,9 @@
/// Empty property keys are forbidden
EmptyPropertyKey,
+
+ /// Collection is read only
+ CollectionIsReadOnly,
}
#[pallet::storage]
@@ -669,6 +684,7 @@
sponsorship,
limits,
permissions,
+ read_only,
} = <CollectionById<T>>::get(collection)?;
let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)
@@ -698,6 +714,7 @@
permissions,
token_property_permissions,
properties,
+ read_only,
})
}
}
@@ -778,6 +795,7 @@
Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)
})
.unwrap_or_else(|| Ok(CollectionPermissions::default()))?,
+ read_only: false,
};
let mut collection_properties = up_data_structs::CollectionProperties::get();
@@ -834,6 +852,7 @@
collection: CollectionHandle<T>,
sender: &T::CrossAccountId,
) -> DispatchResult {
+ collection.check_is_read_only()?;
ensure!(
collection.limits.owner_can_destroy(),
<Error<T>>::NoPermission,
@@ -863,6 +882,7 @@
sender: &T::CrossAccountId,
property: Property,
) -> DispatchResult {
+ collection.check_is_read_only()?;
collection.check_is_owner_or_admin(sender)?;
CollectionProperties::<T>::try_mutate(collection.id, |properties| {
@@ -908,6 +928,8 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
for property in properties {
Self::set_collection_property(collection, sender, property)?;
}
@@ -920,6 +942,7 @@
sender: &T::CrossAccountId,
property_key: PropertyKey,
) -> DispatchResult {
+ collection.check_is_read_only()?;
collection.check_is_owner_or_admin(sender)?;
CollectionProperties::<T>::try_mutate(collection.id, |properties| {
@@ -941,6 +964,8 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
for key in property_keys {
Self::delete_collection_property(collection, sender, key)?;
}
@@ -965,6 +990,7 @@
sender: &T::CrossAccountId,
property_permission: PropertyKeyPermission,
) -> DispatchResult {
+ collection.check_is_read_only()?;
collection.check_is_owner_or_admin(sender)?;
let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);
@@ -996,6 +1022,8 @@
sender: &T::CrossAccountId,
property_permissions: Vec<PropertyKeyPermission>,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
for prop_pemission in property_permissions {
Self::set_property_permission(collection, sender, prop_pemission)?;
}
@@ -1083,6 +1111,7 @@
user: &T::CrossAccountId,
allowed: bool,
) -> DispatchResult {
+ collection.check_is_read_only()?;
collection.check_is_owner_or_admin(sender)?;
// =========
@@ -1102,6 +1131,7 @@
user: &T::CrossAccountId,
admin: bool,
) -> DispatchResult {
+ collection.check_is_read_only()?;
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,6 +168,8 @@
owner: &T::CrossAccountId,
amount: u128,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
let total_supply = <TotalSupply<T>>::get(collection.id)
.checked_sub(amount)
.ok_or(<CommonError<T>>::TokenValueTooLow)?;
@@ -214,6 +216,8 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed,
@@ -283,6 +287,8 @@
data: BTreeMap<T::CrossAccountId, u128>,
nesting_budget: &dyn Budget,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
if !collection.is_owner_or_admin(sender) {
ensure!(
collection.permissions.mint_mode(),
@@ -384,6 +390,7 @@
spender: &T::CrossAccountId,
amount: u128,
) -> DispatchResult {
+ collection.check_is_read_only()?;
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,6 +336,8 @@
sender: &T::CrossAccountId,
token: TokenId,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
let token_data =
<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;
ensure!(
@@ -456,6 +458,7 @@
&property.key,
is_token_create,
)?;
+ collection.check_is_read_only()?;
<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
let property = property.clone();
@@ -494,6 +497,7 @@
property_key: PropertyKey,
) -> DispatchResult {
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)
@@ -570,6 +574,8 @@
token_id: TokenId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
for key in property_keys {
Self::delete_token_property(collection, sender, token_id, key)?;
}
@@ -616,6 +622,8 @@
token: TokenId,
nesting_budget: &dyn Budget,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed
@@ -894,6 +902,8 @@
token: TokenId,
spender: Option<&T::CrossAccountId>,
) -> DispatchResult {
+ collection.check_is_read_only()?;
+
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(sender)?;
if let Some(spender) = spender {
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -234,6 +234,7 @@
}
pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {
+ collection.check_is_read_only()?;
let burnt = <TokensBurnt<T>>::get(collection.id)
.checked_add(1)
.ok_or(ArithmeticError::Overflow)?;
@@ -253,6 +254,7 @@
token: TokenId,
amount: u128,
) -> DispatchResult {
+ collection.check_is_read_only()?;
let total_supply = <TotalSupply<T>>::get((collection.id, token))
.checked_sub(amount)
.ok_or(<CommonError<T>>::TokenValueTooLow)?;
@@ -325,6 +327,7 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
+ collection.check_is_read_only()?;
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed
@@ -573,6 +576,7 @@
token: TokenId,
amount: u128,
) -> DispatchResult {
+ collection.check_is_read_only()?;
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,6 +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()?;
// =========
@@ -406,6 +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_owner(&sender)?;
target_collection.owner = new_owner.clone();
@@ -487,7 +489,7 @@
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
target_collection.check_is_owner(&sender)?;
- target_collection.set_sponsor(new_sponsor.clone());
+ target_collection.set_sponsor(new_sponsor.clone())?;
<Pallet<T>>::deposit_event(Event::<T>::CollectionSponsorSet(
collection_id,
@@ -511,7 +513,7 @@
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
ensure!(
- target_collection.confirm_sponsorship(&sender),
+ target_collection.confirm_sponsorship(&sender)?,
Error::<T>::ConfirmUnsetSponsorFail
);
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -316,6 +316,9 @@
#[version(2.., upper(Default::default()))]
pub permissions: CollectionPermissions,
+ #[version(2.., upper(false))]
+ pub read_only: bool,
+
#[version(..2)]
pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,
@@ -340,6 +343,7 @@
pub permissions: CollectionPermissions,
pub token_property_permissions: Vec<PropertyKeyPermission>,
pub properties: Vec<Property>,
+ pub read_only: bool,
}
#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, Derivative, MaxEncodedLen)]
tests/src/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -87,6 +87,20 @@
expect(collection.limits.accountTokenOwnershipLimit.unwrap().toNumber()).to.equal(3);
});
});
+
+ it('Create new collection is not read only', async () => {
+ await usingApi(async api => {
+ const alice = privateKey('//Alice');
+ const tx = api.tx.unique.createCollectionEx({
+ readOnly: true
+ });
+ const events = await submitTransactionAsync(alice, tx);
+ const result = getCreateCollectionResult(events);
+
+ const collection = (await getDetailedCollectionInfo(api, result.collectionId))!;
+ expect(collection.readOnly.toHuman()).to.be.false;
+ });
+ });
});
describe('(!negative test!) integration test: ext. createCollection():', () => {