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.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::{TokenId, CollectionId, CreateItemExData, budget::Budget};21use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};22use sp_runtime::ArithmeticError;23use sp_std::{vec::Vec, vec};24use up_data_structs::{CustomDataLimit, Property};2526use crate::{27 Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf, weights::WeightInfo,28};2930pub struct CommonWeights<T: Config>(PhantomData<T>);31impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {32 fn create_item() -> Weight {33 <SelfWeightOf<T>>::create_item()34 }3536 fn create_multiple_items(_amount: u32) -> Weight {37 Self::create_item()38 }3940 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {41 match data {42 CreateItemExData::Fungible(f) => {43 <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)44 }45 _ => 0,46 }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 // Error79 080 }81}8283impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {84 fn create_item(85 &self,86 sender: T::CrossAccountId,87 to: T::CrossAccountId,88 data: up_data_structs::CreateItemData,89 nesting_budget: &dyn Budget,90 ) -> DispatchResultWithPostInfo {91 match data {92 up_data_structs::CreateItemData::Fungible(data) => with_weight(93 <Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),94 <CommonWeights<T>>::create_item(),95 ),96 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),97 }98 }99100 fn create_multiple_items(101 &self,102 sender: T::CrossAccountId,103 to: T::CrossAccountId,104 data: Vec<up_data_structs::CreateItemData>,105 nesting_budget: &dyn Budget,106 ) -> DispatchResultWithPostInfo {107 let mut sum: u128 = 0;108 for data in data {109 match data {110 up_data_structs::CreateItemData::Fungible(data) => {111 sum = sum112 .checked_add(data.value)113 .ok_or(ArithmeticError::Overflow)?;114 }115 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),116 }117 }118119 with_weight(120 <Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),121 <CommonWeights<T>>::create_item(),122 )123 }124125 fn create_multiple_items_ex(126 &self,127 sender: <T>::CrossAccountId,128 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,129 nesting_budget: &dyn Budget,130 ) -> DispatchResultWithPostInfo {131 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);132 let data = match data {133 up_data_structs::CreateItemExData::Fungible(f) => f,134 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),135 };136137 with_weight(138 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),139 weight,140 )141 }142143 fn burn_item(144 &self,145 sender: T::CrossAccountId,146 token: TokenId,147 amount: u128,148 ) -> DispatchResultWithPostInfo {149 ensure!(150 token == TokenId::default(),151 <Error<T>>::FungibleItemsHaveNoId152 );153154 with_weight(155 <Pallet<T>>::burn(self, &sender, amount),156 <CommonWeights<T>>::burn_item(),157 )158 }159160 fn transfer(161 &self,162 from: T::CrossAccountId,163 to: T::CrossAccountId,164 token: TokenId,165 amount: u128,166 nesting_budget: &dyn Budget,167 ) -> DispatchResultWithPostInfo {168 ensure!(169 token == TokenId::default(),170 <Error<T>>::FungibleItemsHaveNoId171 );172173 with_weight(174 <Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget),175 <CommonWeights<T>>::transfer(),176 )177 }178179 fn approve(180 &self,181 sender: T::CrossAccountId,182 spender: T::CrossAccountId,183 token: TokenId,184 amount: u128,185 ) -> DispatchResultWithPostInfo {186 ensure!(187 token == TokenId::default(),188 <Error<T>>::FungibleItemsHaveNoId189 );190191 with_weight(192 <Pallet<T>>::set_allowance(self, &sender, &spender, amount),193 <CommonWeights<T>>::approve(),194 )195 }196197 fn transfer_from(198 &self,199 sender: T::CrossAccountId,200 from: T::CrossAccountId,201 to: T::CrossAccountId,202 token: TokenId,203 amount: u128,204 nesting_budget: &dyn Budget,205 ) -> DispatchResultWithPostInfo {206 ensure!(207 token == TokenId::default(),208 <Error<T>>::FungibleItemsHaveNoId209 );210211 with_weight(212 <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),213 <CommonWeights<T>>::transfer_from(),214 )215 }216217 fn burn_from(218 &self,219 sender: T::CrossAccountId,220 from: T::CrossAccountId,221 token: TokenId,222 amount: u128,223 nesting_budget: &dyn Budget,224 ) -> DispatchResultWithPostInfo {225 ensure!(226 token == TokenId::default(),227 <Error<T>>::FungibleItemsHaveNoId228 );229230 with_weight(231 <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),232 <CommonWeights<T>>::burn_from(),233 )234 }235236 fn change_collection_properties(237 &self,238 _sender: T::CrossAccountId,239 _property: Vec<Property>,240 ) -> DispatchResultWithPostInfo {241 fail!(<Error<T>>::PropertiesNotAllowed)242 }243244 fn change_token_properties(245 &self,246 _sender: T::CrossAccountId,247 _token_id: TokenId,248 _property: Vec<Property>,249 ) -> DispatchResultWithPostInfo {250 fail!(<Error<T>>::PropertiesNotAllowed)251 }252253 fn set_variable_metadata(254 &self,255 _sender: T::CrossAccountId,256 _token: TokenId,257 _data: BoundedVec<u8, CustomDataLimit>,258 ) -> DispatchResultWithPostInfo {259 fail!(<Error<T>>::FungibleItemsDontHaveData)260 }261262 fn check_nesting(263 &self,264 _sender: <T>::CrossAccountId,265 _from: (CollectionId, TokenId),266 _under: TokenId,267 _budget: &dyn Budget,268 ) -> sp_runtime::DispatchResult {269 fail!(<Error<T>>::FungibleDisallowsNesting)270 }271272 fn collection_tokens(&self) -> Vec<TokenId> {273 vec![TokenId::default()]274 }275276 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {277 if <Balance<T>>::get((self.id, account)) != 0 {278 vec![TokenId::default()]279 } else {280 vec![]281 }282 }283284 fn token_exists(&self, token: TokenId) -> bool {285 token == TokenId::default()286 }287288 fn last_token_id(&self) -> TokenId {289 TokenId::default()290 }291292 fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {293 None294 }295 fn const_metadata(&self, _token: TokenId) -> Vec<u8> {296 Vec::new()297 }298 fn variable_metadata(&self, _token: TokenId) -> Vec<u8> {299 Vec::new()300 }301302 fn total_supply(&self) -> u32 {303 1304 }305306 fn account_balance(&self, account: T::CrossAccountId) -> u32 {307 if <Balance<T>>::get((self.id, account)) != 0 {308 1309 } else {310 0311 }312 }313314 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {315 if token != TokenId::default() {316 return 0;317 }318 <Balance<T>>::get((self.id, account))319 }320321 fn allowance(322 &self,323 sender: T::CrossAccountId,324 spender: T::CrossAccountId,325 token: TokenId,326 ) -> u128 {327 if token != TokenId::default() {328 return 0;329 }330 <Allowance<T>>::get((self.id, sender, spender))331 }332}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::{TokenId, CollectionId, CreateItemExData, budget::Budget};21use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};22use sp_runtime::ArithmeticError;23use sp_std::{vec::Vec, vec};24use up_data_structs::{CustomDataLimit, Property, PropertyKeyPermission,};2526use crate::{27 Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf, weights::WeightInfo,28};2930pub struct CommonWeights<T: Config>(PhantomData<T>);31impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {32 fn create_item() -> Weight {33 <SelfWeightOf<T>>::create_item()34 }3536 fn create_multiple_items(_amount: u32) -> Weight {37 Self::create_item()38 }3940 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {41 match data {42 CreateItemExData::Fungible(f) => {43 <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)44 }45 _ => 0,46 }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 // Error83 084 }85}8687impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {88 fn create_item(89 &self,90 sender: T::CrossAccountId,91 to: T::CrossAccountId,92 data: up_data_structs::CreateItemData,93 nesting_budget: &dyn Budget,94 ) -> DispatchResultWithPostInfo {95 match data {96 up_data_structs::CreateItemData::Fungible(data) => with_weight(97 <Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),98 <CommonWeights<T>>::create_item(),99 ),100 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),101 }102 }103104 fn create_multiple_items(105 &self,106 sender: T::CrossAccountId,107 to: T::CrossAccountId,108 data: Vec<up_data_structs::CreateItemData>,109 nesting_budget: &dyn Budget,110 ) -> DispatchResultWithPostInfo {111 let mut sum: u128 = 0;112 for data in data {113 match data {114 up_data_structs::CreateItemData::Fungible(data) => {115 sum = sum116 .checked_add(data.value)117 .ok_or(ArithmeticError::Overflow)?;118 }119 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),120 }121 }122123 with_weight(124 <Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),125 <CommonWeights<T>>::create_item(),126 )127 }128129 fn create_multiple_items_ex(130 &self,131 sender: <T>::CrossAccountId,132 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,133 nesting_budget: &dyn Budget,134 ) -> DispatchResultWithPostInfo {135 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);136 let data = match data {137 up_data_structs::CreateItemExData::Fungible(f) => f,138 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),139 };140141 with_weight(142 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),143 weight,144 )145 }146147 fn burn_item(148 &self,149 sender: T::CrossAccountId,150 token: TokenId,151 amount: u128,152 ) -> DispatchResultWithPostInfo {153 ensure!(154 token == TokenId::default(),155 <Error<T>>::FungibleItemsHaveNoId156 );157158 with_weight(159 <Pallet<T>>::burn(self, &sender, amount),160 <CommonWeights<T>>::burn_item(),161 )162 }163164 fn transfer(165 &self,166 from: T::CrossAccountId,167 to: T::CrossAccountId,168 token: TokenId,169 amount: u128,170 nesting_budget: &dyn Budget,171 ) -> DispatchResultWithPostInfo {172 ensure!(173 token == TokenId::default(),174 <Error<T>>::FungibleItemsHaveNoId175 );176177 with_weight(178 <Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget),179 <CommonWeights<T>>::transfer(),180 )181 }182183 fn approve(184 &self,185 sender: T::CrossAccountId,186 spender: T::CrossAccountId,187 token: TokenId,188 amount: u128,189 ) -> DispatchResultWithPostInfo {190 ensure!(191 token == TokenId::default(),192 <Error<T>>::FungibleItemsHaveNoId193 );194195 with_weight(196 <Pallet<T>>::set_allowance(self, &sender, &spender, amount),197 <CommonWeights<T>>::approve(),198 )199 }200201 fn transfer_from(202 &self,203 sender: T::CrossAccountId,204 from: T::CrossAccountId,205 to: T::CrossAccountId,206 token: TokenId,207 amount: u128,208 nesting_budget: &dyn Budget,209 ) -> DispatchResultWithPostInfo {210 ensure!(211 token == TokenId::default(),212 <Error<T>>::FungibleItemsHaveNoId213 );214215 with_weight(216 <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),217 <CommonWeights<T>>::transfer_from(),218 )219 }220221 fn burn_from(222 &self,223 sender: T::CrossAccountId,224 from: T::CrossAccountId,225 token: TokenId,226 amount: u128,227 nesting_budget: &dyn Budget,228 ) -> DispatchResultWithPostInfo {229 ensure!(230 token == TokenId::default(),231 <Error<T>>::FungibleItemsHaveNoId232 );233234 with_weight(235 <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),236 <CommonWeights<T>>::burn_from(),237 )238 }239240 fn change_collection_properties(241 &self,242 _sender: T::CrossAccountId,243 _property: Vec<Property>,244 ) -> DispatchResultWithPostInfo {245 fail!(<Error<T>>::PropertiesNotAllowed)246 }247248 fn change_token_properties(249 &self,250 _sender: T::CrossAccountId,251 _token_id: TokenId,252 _property: Vec<Property>,253 ) -> DispatchResultWithPostInfo {254 fail!(<Error<T>>::PropertiesNotAllowed)255 }256257 fn change_property_permissions(258 &self,259 _sender: &T::CrossAccountId,260 _property_permissions: Vec<PropertyKeyPermission>,261 ) -> DispatchResultWithPostInfo {262 fail!(<Error<T>>::PropertiesNotAllowed)263 }264265 fn set_variable_metadata(266 &self,267 _sender: T::CrossAccountId,268 _token: TokenId,269 _data: BoundedVec<u8, CustomDataLimit>,270 ) -> DispatchResultWithPostInfo {271 fail!(<Error<T>>::FungibleItemsDontHaveData)272 }273274 fn check_nesting(275 &self,276 _sender: <T>::CrossAccountId,277 _from: (CollectionId, TokenId),278 _under: TokenId,279 _budget: &dyn Budget,280 ) -> sp_runtime::DispatchResult {281 fail!(<Error<T>>::FungibleDisallowsNesting)282 }283284 fn collection_tokens(&self) -> Vec<TokenId> {285 vec![TokenId::default()]286 }287288 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {289 if <Balance<T>>::get((self.id, account)) != 0 {290 vec![TokenId::default()]291 } else {292 vec![]293 }294 }295296 fn token_exists(&self, token: TokenId) -> bool {297 token == TokenId::default()298 }299300 fn last_token_id(&self) -> TokenId {301 TokenId::default()302 }303304 fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {305 None306 }307 fn const_metadata(&self, _token: TokenId) -> Vec<u8> {308 Vec::new()309 }310 fn variable_metadata(&self, _token: TokenId) -> Vec<u8> {311 Vec::new()312 }313314 fn total_supply(&self) -> u32 {315 1316 }317318 fn account_balance(&self, account: T::CrossAccountId) -> u32 {319 if <Balance<T>>::get((self.id, account)) != 0 {320 1321 } else {322 0323 }324 }325326 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {327 if token != TokenId::default() {328 return 0;329 }330 <Balance<T>>::get((self.id, account))331 }332333 fn allowance(334 &self,335 sender: T::CrossAccountId,336 spender: T::CrossAccountId,337 token: TokenId,338 ) -> u128 {339 if token != TokenId::default() {340 return 0;341 }342 <Allowance<T>>::get((self.id, sender, spender))343 }344}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.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -18,7 +18,7 @@
use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};
use up_data_structs::{
- TokenId, CustomDataLimit, CreateItemExData, CollectionId, budget::Budget, Property,
+ TokenId, CustomDataLimit, CreateItemExData, CollectionId, budget::Budget, Property, PropertyKeyPermission,
};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::DispatchError;
@@ -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()
}
@@ -176,6 +180,19 @@
)
}
+ fn change_property_permissions(
+ &self,
+ sender: &T::CrossAccountId,
+ property_permissions: Vec<PropertyKeyPermission>,
+ ) -> DispatchResultWithPostInfo {
+ let weight = <CommonWeights<T>>::change_property_permissions(property_permissions.len() as u32);
+
+ with_weight(
+ <Pallet<T>>::change_property_permissions(self, sender, property_permissions),
+ weight
+ )
+ }
+
fn burn_item(
&self,
sender: T::CrossAccountId,
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())
}