difftreelog
Add change_property_permissions
in: master
10 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -36,7 +36,7 @@
CUSTOM_DATA_LIMIT, CollectionLimits, CustomDataLimit, CreateCollectionData, SponsorshipState,
CreateItemExData, SponsoringRateLimit, budget::Budget, COLLECTION_FIELD_LIMIT, CollectionField,
PhantomType, Property, Properties, PropertiesPermissionMap, PropertyKey, PropertyPermission,
- PropertiesError,
+ PropertiesError, PropertyKeyPermission,
};
pub use pallet::*;
use sp_core::H160;
@@ -293,6 +293,8 @@
CollectionPropertySet(CollectionId, Property),
TokenPropertySet(CollectionId, TokenId, Property),
+
+ PropertyPermissionSet(CollectionId, PropertyKeyPermission),
}
#[pallet::error]
@@ -741,7 +743,7 @@
|properties| properties.try_change_property(property.clone())
)?;
- <Pallet<T>>::deposit_event(Event::CollectionPropertySet(collection.id, property));
+ Self::deposit_event(Event::CollectionPropertySet(collection.id, property));
Ok(())
}
@@ -761,19 +763,39 @@
pub fn change_property_permission(
collection: &CollectionHandle<T>,
sender: &T::CrossAccountId,
- property_key: PropertyKey,
- permission: PropertyPermission,
+ property_permission: PropertyKeyPermission
) -> DispatchResult {
collection.check_is_owner_or_admin(sender)?;
+ let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);
+ let current_permission = all_permissions.get(&property_permission.key);
+ if matches![current_permission, Some(PropertyPermission::AdminConst | PropertyPermission::ItemOwnerConst)] {
+ return Err(<Error<T>>::NoPermission.into());
+ }
+
CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {
- permissions.try_insert(property_key, permission)
+ let property_permission = property_permission.clone();
+ permissions.try_insert(property_permission.key, property_permission.permission)
})
.map_err(|_| PropertiesError::PropertyLimitReached)?;
+ Self::deposit_event(Event::PropertyPermissionSet(collection.id, property_permission));
+
Ok(())
}
+ pub fn change_property_permissions(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ property_permissions: Vec<PropertyKeyPermission>
+ ) -> DispatchResult {
+ for prop_pemission in property_permissions {
+ Self::change_property_permission(collection, sender, prop_pemission)?;
+ }
+
+ Ok(())
+ }
+
fn set_field_raw(
collection_id: CollectionId,
field: CollectionField,
@@ -928,6 +950,7 @@
fn burn_item() -> Weight;
fn change_collection_properties(amount: u32) -> Weight;
fn change_token_properties(amount: u32) -> Weight;
+ fn change_property_permissions(amount: u32) -> Weight;
fn transfer() -> Weight;
fn approve() -> Weight;
fn transfer_from() -> Weight;
@@ -962,20 +985,22 @@
token: TokenId,
amount: u128,
) -> DispatchResultWithPostInfo;
-
fn change_collection_properties(
&self,
sender: T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResultWithPostInfo;
-
fn change_token_properties(
&self,
sender: T::CrossAccountId,
token_id: TokenId,
property: Vec<Property>,
) -> DispatchResultWithPostInfo;
-
+ fn change_property_permissions(
+ &self,
+ sender: &T::CrossAccountId,
+ property_permissions: Vec<PropertyKeyPermission>,
+ ) -> DispatchResultWithPostInfo;
fn transfer(
&self,
sender: T::CrossAccountId,
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -21,7 +21,7 @@
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::ArithmeticError;
use sp_std::{vec::Vec, vec};
-use up_data_structs::{CustomDataLimit, Property};
+use up_data_structs::{CustomDataLimit, Property, PropertyKeyPermission,};
use crate::{
Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf, weights::WeightInfo,
@@ -58,6 +58,10 @@
<SelfWeightOf<T>>::change_token_properties(amount)
}
+ fn change_property_permissions(amount: u32) -> Weight {
+ <SelfWeightOf<T>>::change_property_permissions(amount)
+ }
+
fn transfer() -> Weight {
<SelfWeightOf<T>>::transfer()
}
@@ -250,6 +254,14 @@
fail!(<Error<T>>::PropertiesNotAllowed)
}
+ fn change_property_permissions(
+ &self,
+ _sender: &T::CrossAccountId,
+ _property_permissions: Vec<PropertyKeyPermission>,
+ ) -> DispatchResultWithPostInfo {
+ fail!(<Error<T>>::PropertiesNotAllowed)
+ }
+
fn set_variable_metadata(
&self,
_sender: T::CrossAccountId,
pallets/fungible/src/weights.rsdiffbeforeafterboth--- a/pallets/fungible/src/weights.rs
+++ b/pallets/fungible/src/weights.rs
@@ -37,6 +37,7 @@
fn burn_item() -> Weight;
fn change_collection_properties(amount: u32) -> Weight;
fn change_token_properties(amount: u32) -> Weight;
+ fn change_property_permissions(amount: u32) -> Weight;
fn transfer() -> Weight;
fn approve() -> Weight;
fn transfer_from() -> Weight;
@@ -82,6 +83,11 @@
0
}
+ fn change_property_permissions(amount: u32) -> Weight {
+ // Error
+ 0
+ }
+
// Storage: Fungible Balance (r:2 w:2)
fn transfer() -> Weight {
(17_713_000 as Weight)
@@ -150,6 +156,11 @@
0
}
+ fn change_property_permissions(amount: u32) -> Weight {
+ // Error
+ 0
+ }
+
// Storage: Fungible Balance (r:2 w:2)
fn transfer() -> Weight {
(17_713_000 as Weight)
pallets/nonfungible/src/common.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 core::marker::PhantomData;1819use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};20use up_data_structs::{21 TokenId, CustomDataLimit, CreateItemExData, CollectionId, budget::Budget, Property,22};23use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};24use sp_runtime::DispatchError;25use sp_std::vec::Vec;2627use crate::{28 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,29 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,30};3132pub struct CommonWeights<T: Config>(PhantomData<T>);33impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {34 fn create_item() -> Weight {35 <SelfWeightOf<T>>::create_item()36 }3738 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {39 match data {40 CreateItemExData::NFT(t) => <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32),41 _ => 0,42 }43 }4445 fn create_multiple_items(amount: u32) -> Weight {46 <SelfWeightOf<T>>::create_multiple_items(amount)47 }4849 fn burn_item() -> Weight {50 <SelfWeightOf<T>>::burn_item()51 }5253 fn change_collection_properties(amount: u32) -> Weight {54 <SelfWeightOf<T>>::change_collection_properties(amount)55 }5657 fn change_token_properties(amount: u32) -> Weight {58 <SelfWeightOf<T>>::change_token_properties(amount)59 }6061 fn transfer() -> Weight {62 <SelfWeightOf<T>>::transfer()63 }6465 fn approve() -> Weight {66 <SelfWeightOf<T>>::approve()67 }6869 fn transfer_from() -> Weight {70 <SelfWeightOf<T>>::transfer_from()71 }7273 fn burn_from() -> Weight {74 <SelfWeightOf<T>>::burn_from()75 }7677 fn set_variable_metadata(bytes: u32) -> Weight {78 <SelfWeightOf<T>>::set_variable_metadata(bytes)79 }80}8182fn map_create_data<T: Config>(83 data: up_data_structs::CreateItemData,84 to: &T::CrossAccountId,85) -> Result<CreateItemData<T>, DispatchError> {86 match data {87 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {88 const_data: data.const_data,89 variable_data: data.variable_data,90 owner: to.clone(),91 }),92 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),93 }94}9596impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {97 fn create_item(98 &self,99 sender: T::CrossAccountId,100 to: T::CrossAccountId,101 data: up_data_structs::CreateItemData,102 nesting_budget: &dyn Budget,103 ) -> DispatchResultWithPostInfo {104 with_weight(105 <Pallet<T>>::create_item(106 self,107 &sender,108 map_create_data::<T>(data, &to)?,109 nesting_budget,110 ),111 <CommonWeights<T>>::create_item(),112 )113 }114115 fn create_multiple_items(116 &self,117 sender: T::CrossAccountId,118 to: T::CrossAccountId,119 data: Vec<up_data_structs::CreateItemData>,120 nesting_budget: &dyn Budget,121 ) -> DispatchResultWithPostInfo {122 let data = data123 .into_iter()124 .map(|d| map_create_data::<T>(d, &to))125 .collect::<Result<Vec<_>, DispatchError>>()?;126127 let amount = data.len();128 with_weight(129 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),130 <CommonWeights<T>>::create_multiple_items(amount as u32),131 )132 }133134 fn create_multiple_items_ex(135 &self,136 sender: <T>::CrossAccountId,137 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,138 nesting_budget: &dyn Budget,139 ) -> DispatchResultWithPostInfo {140 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);141 let data = match data {142 up_data_structs::CreateItemExData::NFT(nft) => nft,143 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),144 };145146 with_weight(147 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),148 weight,149 )150 }151152 fn change_collection_properties(153 &self,154 sender: T::CrossAccountId,155 properties: Vec<Property>,156 ) -> DispatchResultWithPostInfo {157 let weight = <CommonWeights<T>>::change_collection_properties(properties.len() as u32);158159 with_weight(160 <Pallet<T>>::change_collection_properties(self, &sender, properties),161 weight162 )163 }164165 fn change_token_properties(166 &self,167 sender: T::CrossAccountId,168 token_id: TokenId,169 properties: Vec<Property>,170 ) -> DispatchResultWithPostInfo {171 let weight = <CommonWeights<T>>::change_token_properties(properties.len() as u32);172173 with_weight(174 <Pallet<T>>::change_token_properties(self, &sender, token_id, properties),175 weight176 )177 }178179 fn burn_item(180 &self,181 sender: T::CrossAccountId,182 token: TokenId,183 amount: u128,184 ) -> DispatchResultWithPostInfo {185 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);186 if amount == 1 {187 with_weight(188 <Pallet<T>>::burn(self, &sender, token),189 <CommonWeights<T>>::burn_item(),190 )191 } else {192 Ok(().into())193 }194 }195196 fn transfer(197 &self,198 from: T::CrossAccountId,199 to: T::CrossAccountId,200 token: TokenId,201 amount: u128,202 nesting_budget: &dyn Budget,203 ) -> DispatchResultWithPostInfo {204 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);205 if amount == 1 {206 with_weight(207 <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),208 <CommonWeights<T>>::transfer(),209 )210 } else {211 Ok(().into())212 }213 }214215 fn approve(216 &self,217 sender: T::CrossAccountId,218 spender: T::CrossAccountId,219 token: TokenId,220 amount: u128,221 ) -> DispatchResultWithPostInfo {222 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);223224 with_weight(225 if amount == 1 {226 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))227 } else {228 <Pallet<T>>::set_allowance(self, &sender, token, None)229 },230 <CommonWeights<T>>::approve(),231 )232 }233234 fn transfer_from(235 &self,236 sender: T::CrossAccountId,237 from: T::CrossAccountId,238 to: T::CrossAccountId,239 token: TokenId,240 amount: u128,241 nesting_budget: &dyn Budget,242 ) -> DispatchResultWithPostInfo {243 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);244245 if amount == 1 {246 with_weight(247 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),248 <CommonWeights<T>>::transfer_from(),249 )250 } else {251 Ok(().into())252 }253 }254255 fn burn_from(256 &self,257 sender: T::CrossAccountId,258 from: T::CrossAccountId,259 token: TokenId,260 amount: u128,261 nesting_budget: &dyn Budget,262 ) -> DispatchResultWithPostInfo {263 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);264265 if amount == 1 {266 with_weight(267 <Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),268 <CommonWeights<T>>::burn_from(),269 )270 } else {271 Ok(().into())272 }273 }274275 fn set_variable_metadata(276 &self,277 sender: T::CrossAccountId,278 token: TokenId,279 data: BoundedVec<u8, CustomDataLimit>,280 ) -> DispatchResultWithPostInfo {281 let len = data.len();282 with_weight(283 <Pallet<T>>::set_variable_metadata(self, &sender, token, data),284 <CommonWeights<T>>::set_variable_metadata(len as u32),285 )286 }287288 fn check_nesting(289 &self,290 sender: T::CrossAccountId,291 from: (CollectionId, TokenId),292 under: TokenId,293 budget: &dyn Budget,294 ) -> sp_runtime::DispatchResult {295 <Pallet<T>>::check_nesting(self, sender, from, under, budget)296 }297298 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {299 <Owned<T>>::iter_prefix((self.id, account))300 .map(|(id, _)| id)301 .collect()302 }303304 fn collection_tokens(&self) -> Vec<TokenId> {305 <TokenData<T>>::iter_prefix((self.id,))306 .map(|(id, _)| id)307 .collect()308 }309310 fn token_exists(&self, token: TokenId) -> bool {311 <Pallet<T>>::token_exists(self, token)312 }313314 fn last_token_id(&self) -> TokenId {315 TokenId(<TokensMinted<T>>::get(self.id))316 }317318 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId> {319 <TokenData<T>>::get((self.id, token)).map(|t| t.owner)320 }321 fn const_metadata(&self, token: TokenId) -> Vec<u8> {322 <TokenData<T>>::get((self.id, token))323 .map(|t| t.const_data)324 .unwrap_or_default()325 .into_inner()326 }327 fn variable_metadata(&self, token: TokenId) -> Vec<u8> {328 <TokenData<T>>::get((self.id, token))329 .map(|t| t.variable_data)330 .unwrap_or_default()331 .into_inner()332 }333334 fn total_supply(&self) -> u32 {335 <Pallet<T>>::total_supply(self)336 }337338 fn account_balance(&self, account: T::CrossAccountId) -> u32 {339 <AccountBalance<T>>::get((self.id, account))340 }341342 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {343 if <TokenData<T>>::get((self.id, token))344 .map(|a| a.owner == account)345 .unwrap_or(false)346 {347 1348 } else {349 0350 }351 }352353 fn allowance(354 &self,355 sender: T::CrossAccountId,356 spender: T::CrossAccountId,357 token: TokenId,358 ) -> u128 {359 if <TokenData<T>>::get((self.id, token))360 .map(|a| a.owner != sender)361 .unwrap_or(true)362 {363 0364 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {365 1366 } else {367 0368 }369 }370}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 core::marker::PhantomData;1819use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};20use up_data_structs::{21 TokenId, CustomDataLimit, CreateItemExData, CollectionId, budget::Budget, Property, PropertyKeyPermission,22};23use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};24use sp_runtime::DispatchError;25use sp_std::vec::Vec;2627use crate::{28 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,29 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,30};3132pub struct CommonWeights<T: Config>(PhantomData<T>);33impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {34 fn create_item() -> Weight {35 <SelfWeightOf<T>>::create_item()36 }3738 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {39 match data {40 CreateItemExData::NFT(t) => <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32),41 _ => 0,42 }43 }4445 fn create_multiple_items(amount: u32) -> Weight {46 <SelfWeightOf<T>>::create_multiple_items(amount)47 }4849 fn burn_item() -> Weight {50 <SelfWeightOf<T>>::burn_item()51 }5253 fn change_collection_properties(amount: u32) -> Weight {54 <SelfWeightOf<T>>::change_collection_properties(amount)55 }5657 fn change_token_properties(amount: u32) -> Weight {58 <SelfWeightOf<T>>::change_token_properties(amount)59 }6061 fn change_property_permissions(amount: u32) -> Weight {62 <SelfWeightOf<T>>::change_property_permissions(amount)63 }6465 fn transfer() -> Weight {66 <SelfWeightOf<T>>::transfer()67 }6869 fn approve() -> Weight {70 <SelfWeightOf<T>>::approve()71 }7273 fn transfer_from() -> Weight {74 <SelfWeightOf<T>>::transfer_from()75 }7677 fn burn_from() -> Weight {78 <SelfWeightOf<T>>::burn_from()79 }8081 fn set_variable_metadata(bytes: u32) -> Weight {82 <SelfWeightOf<T>>::set_variable_metadata(bytes)83 }84}8586fn map_create_data<T: Config>(87 data: up_data_structs::CreateItemData,88 to: &T::CrossAccountId,89) -> Result<CreateItemData<T>, DispatchError> {90 match data {91 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {92 const_data: data.const_data,93 variable_data: data.variable_data,94 owner: to.clone(),95 }),96 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),97 }98}99100impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {101 fn create_item(102 &self,103 sender: T::CrossAccountId,104 to: T::CrossAccountId,105 data: up_data_structs::CreateItemData,106 nesting_budget: &dyn Budget,107 ) -> DispatchResultWithPostInfo {108 with_weight(109 <Pallet<T>>::create_item(110 self,111 &sender,112 map_create_data::<T>(data, &to)?,113 nesting_budget,114 ),115 <CommonWeights<T>>::create_item(),116 )117 }118119 fn create_multiple_items(120 &self,121 sender: T::CrossAccountId,122 to: T::CrossAccountId,123 data: Vec<up_data_structs::CreateItemData>,124 nesting_budget: &dyn Budget,125 ) -> DispatchResultWithPostInfo {126 let data = data127 .into_iter()128 .map(|d| map_create_data::<T>(d, &to))129 .collect::<Result<Vec<_>, DispatchError>>()?;130131 let amount = data.len();132 with_weight(133 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),134 <CommonWeights<T>>::create_multiple_items(amount as u32),135 )136 }137138 fn create_multiple_items_ex(139 &self,140 sender: <T>::CrossAccountId,141 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,142 nesting_budget: &dyn Budget,143 ) -> DispatchResultWithPostInfo {144 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);145 let data = match data {146 up_data_structs::CreateItemExData::NFT(nft) => nft,147 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),148 };149150 with_weight(151 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),152 weight,153 )154 }155156 fn change_collection_properties(157 &self,158 sender: T::CrossAccountId,159 properties: Vec<Property>,160 ) -> DispatchResultWithPostInfo {161 let weight = <CommonWeights<T>>::change_collection_properties(properties.len() as u32);162163 with_weight(164 <Pallet<T>>::change_collection_properties(self, &sender, properties),165 weight166 )167 }168169 fn change_token_properties(170 &self,171 sender: T::CrossAccountId,172 token_id: TokenId,173 properties: Vec<Property>,174 ) -> DispatchResultWithPostInfo {175 let weight = <CommonWeights<T>>::change_token_properties(properties.len() as u32);176177 with_weight(178 <Pallet<T>>::change_token_properties(self, &sender, token_id, properties),179 weight180 )181 }182183 fn change_property_permissions(184 &self,185 sender: &T::CrossAccountId,186 property_permissions: Vec<PropertyKeyPermission>,187 ) -> DispatchResultWithPostInfo {188 let weight = <CommonWeights<T>>::change_property_permissions(property_permissions.len() as u32);189190 with_weight(191 <Pallet<T>>::change_property_permissions(self, sender, property_permissions),192 weight193 )194 }195196 fn burn_item(197 &self,198 sender: T::CrossAccountId,199 token: TokenId,200 amount: u128,201 ) -> DispatchResultWithPostInfo {202 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);203 if amount == 1 {204 with_weight(205 <Pallet<T>>::burn(self, &sender, token),206 <CommonWeights<T>>::burn_item(),207 )208 } else {209 Ok(().into())210 }211 }212213 fn transfer(214 &self,215 from: T::CrossAccountId,216 to: T::CrossAccountId,217 token: TokenId,218 amount: u128,219 nesting_budget: &dyn Budget,220 ) -> DispatchResultWithPostInfo {221 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);222 if amount == 1 {223 with_weight(224 <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),225 <CommonWeights<T>>::transfer(),226 )227 } else {228 Ok(().into())229 }230 }231232 fn approve(233 &self,234 sender: T::CrossAccountId,235 spender: T::CrossAccountId,236 token: TokenId,237 amount: u128,238 ) -> DispatchResultWithPostInfo {239 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);240241 with_weight(242 if amount == 1 {243 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))244 } else {245 <Pallet<T>>::set_allowance(self, &sender, token, None)246 },247 <CommonWeights<T>>::approve(),248 )249 }250251 fn transfer_from(252 &self,253 sender: T::CrossAccountId,254 from: T::CrossAccountId,255 to: T::CrossAccountId,256 token: TokenId,257 amount: u128,258 nesting_budget: &dyn Budget,259 ) -> DispatchResultWithPostInfo {260 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);261262 if amount == 1 {263 with_weight(264 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),265 <CommonWeights<T>>::transfer_from(),266 )267 } else {268 Ok(().into())269 }270 }271272 fn burn_from(273 &self,274 sender: T::CrossAccountId,275 from: T::CrossAccountId,276 token: TokenId,277 amount: u128,278 nesting_budget: &dyn Budget,279 ) -> DispatchResultWithPostInfo {280 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);281282 if amount == 1 {283 with_weight(284 <Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),285 <CommonWeights<T>>::burn_from(),286 )287 } else {288 Ok(().into())289 }290 }291292 fn set_variable_metadata(293 &self,294 sender: T::CrossAccountId,295 token: TokenId,296 data: BoundedVec<u8, CustomDataLimit>,297 ) -> DispatchResultWithPostInfo {298 let len = data.len();299 with_weight(300 <Pallet<T>>::set_variable_metadata(self, &sender, token, data),301 <CommonWeights<T>>::set_variable_metadata(len as u32),302 )303 }304305 fn check_nesting(306 &self,307 sender: T::CrossAccountId,308 from: (CollectionId, TokenId),309 under: TokenId,310 budget: &dyn Budget,311 ) -> sp_runtime::DispatchResult {312 <Pallet<T>>::check_nesting(self, sender, from, under, budget)313 }314315 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {316 <Owned<T>>::iter_prefix((self.id, account))317 .map(|(id, _)| id)318 .collect()319 }320321 fn collection_tokens(&self) -> Vec<TokenId> {322 <TokenData<T>>::iter_prefix((self.id,))323 .map(|(id, _)| id)324 .collect()325 }326327 fn token_exists(&self, token: TokenId) -> bool {328 <Pallet<T>>::token_exists(self, token)329 }330331 fn last_token_id(&self) -> TokenId {332 TokenId(<TokensMinted<T>>::get(self.id))333 }334335 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId> {336 <TokenData<T>>::get((self.id, token)).map(|t| t.owner)337 }338 fn const_metadata(&self, token: TokenId) -> Vec<u8> {339 <TokenData<T>>::get((self.id, token))340 .map(|t| t.const_data)341 .unwrap_or_default()342 .into_inner()343 }344 fn variable_metadata(&self, token: TokenId) -> Vec<u8> {345 <TokenData<T>>::get((self.id, token))346 .map(|t| t.variable_data)347 .unwrap_or_default()348 .into_inner()349 }350351 fn total_supply(&self) -> u32 {352 <Pallet<T>>::total_supply(self)353 }354355 fn account_balance(&self, account: T::CrossAccountId) -> u32 {356 <AccountBalance<T>>::get((self.id, account))357 }358359 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {360 if <TokenData<T>>::get((self.id, token))361 .map(|a| a.owner == account)362 .unwrap_or(false)363 {364 1365 } else {366 0367 }368 }369370 fn allowance(371 &self,372 sender: T::CrossAccountId,373 spender: T::CrossAccountId,374 token: TokenId,375 ) -> u128 {376 if <TokenData<T>>::get((self.id, token))377 .map(|a| a.owner != sender)378 .unwrap_or(true)379 {380 0381 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {382 1383 } else {384 0385 }386 }387}pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -21,6 +21,7 @@
use up_data_structs::{
AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
mapping::TokenAddressMapping, NestingRule, budget::Budget, Property, PropertyPermission,
+ PropertyKeyPermission,
};
use pallet_evm::account::CrossAccountId;
use pallet_common::{
@@ -324,6 +325,18 @@
<PalletCommon<T>>::change_collection_properties(collection, sender, properties)
}
+ pub fn change_property_permissions(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ property_permissions: Vec<PropertyKeyPermission>
+ ) -> DispatchResult {
+ <PalletCommon<T>>::change_property_permissions(
+ collection,
+ sender,
+ property_permissions,
+ )
+ }
+
pub fn transfer(
collection: &NonfungibleHandle<T>,
from: &T::CrossAccountId,
pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -38,6 +38,7 @@
fn burn_item() -> Weight;
fn change_collection_properties(amount: u32) -> Weight;
fn change_token_properties(amount: u32) -> Weight;
+ fn change_property_permissions(amount: u32) -> Weight;
fn transfer() -> Weight;
fn approve() -> Weight;
fn transfer_from() -> Weight;
@@ -103,6 +104,11 @@
(50_000_000 as Weight).saturating_mul(amount as Weight)
}
+ fn change_property_permissions(amount: u32) -> Weight {
+ // TODO calculate appropriate weight
+ (50_000_000 as Weight).saturating_mul(amount as Weight)
+ }
+
// Storage: Nonfungible TokenData (r:1 w:1)
// Storage: Nonfungible AccountBalance (r:2 w:2)
// Storage: Nonfungible Allowance (r:1 w:0)
@@ -203,6 +209,11 @@
(50_000_000 as Weight).saturating_mul(amount as Weight)
}
+ fn change_property_permissions(amount: u32) -> Weight {
+ // TODO calculate appropriate weight
+ (50_000_000 as Weight).saturating_mul(amount as Weight)
+ }
+
// Storage: Nonfungible TokenData (r:1 w:1)
// Storage: Nonfungible AccountBalance (r:2 w:2)
// Storage: Nonfungible Allowance (r:1 w:0)
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -20,7 +20,7 @@
use frame_support::{dispatch::DispatchResultWithPostInfo, fail, weights::Weight, BoundedVec};
use up_data_structs::{
CollectionId, TokenId, CustomDataLimit, CreateItemExData, CreateRefungibleExData,
- budget::Budget, Property,
+ budget::Budget, Property, PropertyKeyPermission,
};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::DispatchError;
@@ -74,6 +74,10 @@
<SelfWeightOf<T>>::change_token_properties(amount)
}
+ fn change_property_permissions(amount: u32) -> Weight {
+ <SelfWeightOf<T>>::change_property_permissions(amount)
+ }
+
fn transfer() -> Weight {
max_weight_of!(
transfer_normal(),
@@ -269,6 +273,14 @@
fail!(<Error<T>>::PropertiesNotAllowed)
}
+ fn change_property_permissions(
+ &self,
+ _sender: &T::CrossAccountId,
+ _property_permissions: Vec<PropertyKeyPermission>,
+ ) -> DispatchResultWithPostInfo {
+ fail!(<Error<T>>::PropertiesNotAllowed)
+ }
+
fn set_variable_metadata(
&self,
sender: T::CrossAccountId,
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -40,6 +40,7 @@
fn burn_item_fully() -> Weight;
fn change_collection_properties(amount: u32) -> Weight;
fn change_token_properties(amount: u32) -> Weight;
+ fn change_property_permissions(amount: u32) -> Weight;
fn transfer_normal() -> Weight;
fn transfer_creating() -> Weight;
fn transfer_removing() -> Weight;
@@ -142,6 +143,11 @@
0
}
+ fn change_property_permissions(amount: u32) -> Weight {
+ // Error
+ 0
+ }
+
// Storage: Refungible Balance (r:2 w:2)
fn transfer_normal() -> Weight {
(19_766_000 as Weight)
@@ -321,6 +327,11 @@
0
}
+ fn change_property_permissions(amount: u32) -> Weight {
+ // Error
+ 0
+ }
+
// Storage: Refungible Balance (r:2 w:2)
fn transfer_normal() -> Weight {
(19_766_000 as Weight)
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -39,7 +39,7 @@
MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,
AccessMode, CreateItemData, CollectionLimits, CollectionId, CollectionMode, TokenId,
SchemaVersion, SponsorshipState, MetaUpdatePermission, CreateCollectionData, CustomDataLimit,
- CreateItemExData, budget, CollectionField, Property,
+ CreateItemExData, budget, CollectionField, Property, PropertyKeyPermission,
};
use pallet_evm::account::CrossAccountId;
use pallet_common::{
@@ -723,6 +723,20 @@
dispatch_call::<T, _>(collection_id, |d| d.change_token_properties(sender, token_id, properties))
}
+ #[weight = T::CommonWeightInfo::change_property_permissions(property_permissions.len() as u32)]
+ #[transactional]
+ pub fn change_property_permissions(
+ origin,
+ collection_id: CollectionId,
+ property_permissions: Vec<PropertyKeyPermission>,
+ ) -> DispatchResultWithPostInfo {
+ ensure!(!property_permissions.is_empty(), Error::<T>::EmptyArgument);
+
+ let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+
+ dispatch_call::<T, _>(collection_id, |d| d.change_property_permissions(&sender, property_permissions))
+ }
+
#[weight = T::CommonWeightInfo::create_multiple_items_ex(&data)]
#[transactional]
pub fn create_multiple_items_ex(origin, collection_id: CollectionId, data: CreateItemExData<T::CrossAccountId>) -> DispatchResultWithPostInfo {
runtime/common/src/weights.rsdiffbeforeafterboth--- a/runtime/common/src/weights.rs
+++ b/runtime/common/src/weights.rs
@@ -62,6 +62,10 @@
dispatch_weight::<T>() + max_weight_of!(change_token_properties(amount))
}
+ fn change_property_permissions(amount: u32) -> Weight {
+ dispatch_weight::<T>() + max_weight_of!(change_property_permissions(amount))
+ }
+
fn transfer() -> Weight {
dispatch_weight::<T>() + max_weight_of!(transfer())
}