difftreelog
Add first draft of Properties
in: master
14 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -18,7 +18,7 @@
use core::ops::{Deref, DerefMut};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
-use sp_std::vec::Vec;
+use sp_std::{vec::Vec, collections::btree_map::BTreeMap};
use pallet_evm::account::CrossAccountId;
use frame_support::{
dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},
@@ -35,7 +35,8 @@
FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT,
CUSTOM_DATA_LIMIT, CollectionLimits, CustomDataLimit, CreateCollectionData, SponsorshipState,
CreateItemExData, SponsoringRateLimit, budget::Budget, COLLECTION_FIELD_LIMIT, CollectionField,
- PhantomType,
+ PhantomType, Property, Properties, PropertiesPermissionMap, PropertyKey, PropertyPermission,
+ PropertiesError,
};
pub use pallet::*;
use sp_core::H160;
@@ -288,6 +289,10 @@
T::CrossAccountId,
u128,
),
+
+ CollectionPropertySet(CollectionId, Property),
+
+ TokenPropertySet(CollectionId, TokenId, Property),
}
#[pallet::error]
@@ -319,7 +324,6 @@
CollectionLimitBoundsExceeded,
/// Tried to enable permissions which are only permitted to be disabled
OwnerPermissionsCantBeReverted,
-
/// Collection settings not allowing items transferring
TransferNotAllowed,
/// Account token limit exceeded per collection
@@ -372,6 +376,25 @@
QueryKind = OptionQuery,
>;
+ /// Collection properties
+ #[pallet::storage]
+ pub type CollectionProperties<T> = StorageMap<
+ Hasher = Blake2_128Concat,
+ Key = CollectionId,
+ Value = Properties,
+ QueryKind = ValueQuery,
+ OnEmpty = up_data_structs::CollectionProperties,
+ >;
+
+ #[pallet::storage]
+ #[pallet::getter(fn property_permission)]
+ pub type CollectionPropertyPermissions<T> = StorageMap<
+ Hasher = Blake2_128Concat,
+ Key = CollectionId,
+ Value = PropertiesPermissionMap,
+ QueryKind = ValueQuery,
+ >;
+
/// Large variable-size collection fields are extracted here
#[pallet::storage]
pub type CollectionData<T> = StorageNMap<
@@ -538,6 +561,7 @@
sponsorship,
limits,
meta_update_permission,
+ ..
} = <CollectionById<T>>::get(collection)?;
Some(RpcCollection {
name: name.into_inner(),
@@ -615,8 +639,25 @@
.map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))
.unwrap_or_else(|| Ok(CollectionLimits::default()))?,
meta_update_permission: data.meta_update_permission.unwrap_or_default(),
+ // token_property_permissions: data.token_property_permissions.unwrap_or_default(),
+ // properties: Properties::from_collection_props_vec(data.properties)?
};
+ CollectionProperties::<T>::insert(
+ id,
+ Properties::from_collection_props_vec(data.properties)?,
+ );
+
+ let token_props_permissions: PropertiesPermissionMap = data
+ .token_property_permissions
+ .into_iter()
+ .map(|property| (property.key, property.permission))
+ .collect::<BTreeMap<_, _>>()
+ .try_into()
+ .map_err(|_| PropertiesError::PropertyLimitReached)?;
+
+ CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);
+
// Take a (non-refundable) deposit of collection creation
{
let mut imbalance =
@@ -688,6 +729,34 @@
Ok(())
}
+ pub fn change_collection_property(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ property: Property,
+ ) -> DispatchResult {
+ collection.check_is_owner_or_admin(sender)?;
+
+ CollectionProperties::<T>::get(collection.id).try_change_property(property)?;
+
+ Ok(())
+ }
+
+ pub fn change_property_permission(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ property_key: PropertyKey,
+ permission: PropertyPermission,
+ ) -> DispatchResult {
+ collection.check_is_owner_or_admin(sender)?;
+
+ CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {
+ permissions.try_insert(property_key, permission)
+ })
+ .map_err(|_| PropertiesError::PropertyLimitReached)?;
+
+ Ok(())
+ }
+
fn set_field_raw(
collection_id: CollectionId,
field: CollectionField,
@@ -840,6 +909,7 @@
fn create_multiple_items(amount: u32) -> Weight;
fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;
fn burn_item() -> Weight;
+ fn set_property() -> Weight;
fn transfer() -> Weight;
fn approve() -> Weight;
fn transfer_from() -> Weight;
@@ -875,6 +945,19 @@
amount: u128,
) -> DispatchResultWithPostInfo;
+ fn change_collection_property(
+ &self,
+ sender: T::CrossAccountId,
+ property: Property,
+ ) -> DispatchResultWithPostInfo;
+
+ fn change_token_property(
+ &self,
+ sender: T::CrossAccountId,
+ token_id: TokenId,
+ property: Property,
+ ) -> 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;
+use up_data_structs::{CustomDataLimit, Property};
use crate::{
Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf, weights::WeightInfo,
@@ -50,6 +50,10 @@
<SelfWeightOf<T>>::burn_item()
}
+ fn set_property() -> Weight {
+ <SelfWeightOf<T>>::set_property()
+ }
+
fn transfer() -> Weight {
<SelfWeightOf<T>>::transfer()
}
@@ -225,6 +229,23 @@
)
}
+ fn change_collection_property(
+ &self,
+ _sender: T::CrossAccountId,
+ _property: Property,
+ ) -> DispatchResultWithPostInfo {
+ fail!(<Error<T>>::PropertiesNotAllowed)
+ }
+
+ fn change_token_property(
+ &self,
+ _sender: T::CrossAccountId,
+ _token_id: TokenId,
+ _property: Property,
+ ) -> DispatchResultWithPostInfo {
+ fail!(<Error<T>>::PropertiesNotAllowed)
+ }
+
fn set_variable_metadata(
&self,
_sender: T::CrossAccountId,
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -61,6 +61,8 @@
FungibleItemsDontHaveData,
/// Fungible token does not support nested
FungibleDisallowsNesting,
+ /// Item properties are not allowed
+ PropertiesNotAllowed,
}
#[pallet::config]
pallets/fungible/src/weights.rsdiffbeforeafterboth--- a/pallets/fungible/src/weights.rs
+++ b/pallets/fungible/src/weights.rs
@@ -35,6 +35,7 @@
fn create_item() -> Weight;
fn create_multiple_items_ex(b: u32, ) -> Weight;
fn burn_item() -> Weight;
+ fn set_property() -> Weight;
fn transfer() -> Weight;
fn approve() -> Weight;
fn transfer_from() -> Weight;
@@ -69,6 +70,12 @@
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
+
+ fn set_property() -> Weight {
+ // Error
+ 0
+ }
+
// Storage: Fungible Balance (r:2 w:2)
fn transfer() -> Weight {
(17_713_000 as Weight)
@@ -126,6 +133,12 @@
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
+
+ fn set_property() -> 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
@@ -17,7 +17,9 @@
use core::marker::PhantomData;
use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};
-use up_data_structs::{TokenId, CustomDataLimit, CreateItemExData, CollectionId, budget::Budget};
+use up_data_structs::{
+ TokenId, CustomDataLimit, CreateItemExData, CollectionId, budget::Budget, Property,
+};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::DispatchError;
use sp_std::vec::Vec;
@@ -48,6 +50,10 @@
<SelfWeightOf<T>>::burn_item()
}
+ fn set_property() -> Weight {
+ <SelfWeightOf<T>>::set_property()
+ }
+
fn transfer() -> Weight {
<SelfWeightOf<T>>::transfer()
}
@@ -235,6 +241,32 @@
}
}
+ fn change_collection_property(
+ &self,
+ sender: T::CrossAccountId,
+ property: Property,
+ ) -> DispatchResultWithPostInfo {
+ // let token_id = None;
+ with_weight(
+ // <Pallet<T>>::change_property(self, &sender, token_id, property),
+ Ok(()),
+ <CommonWeights<T>>::set_property(),
+ )
+ }
+
+ fn change_token_property(
+ &self,
+ sender: T::CrossAccountId,
+ token_id: TokenId,
+ property: Property,
+ ) -> DispatchResultWithPostInfo {
+ with_weight(
+ // <Pallet<T>>::change_property(self, &sender, Some(token_id), property),
+ Ok(()),
+ <CommonWeights<T>>::set_property(),
+ )
+ }
+
fn set_variable_metadata(
&self,
sender: T::CrossAccountId,
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -20,7 +20,7 @@
use frame_support::{BoundedVec, ensure, fail};
use up_data_structs::{
AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
- mapping::TokenAddressMapping, NestingRule, budget::Budget,
+ mapping::TokenAddressMapping, NestingRule, budget::Budget, Property, PropertyPermission,
};
use pallet_evm::account::CrossAccountId;
use pallet_common::{
@@ -94,6 +94,14 @@
QueryKind = OptionQuery,
>;
+ #[pallet::storage]
+ pub type TokenProperties<T: Config> = StorageNMap<
+ Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),
+ Value = up_data_structs::Properties,
+ QueryKind = ValueQuery,
+ OnEmpty = up_data_structs::TokenProperties,
+ >;
+
/// Used to enumerate tokens owned by account
#[pallet::storage]
pub type Owned<T: Config> = StorageNMap<
@@ -246,6 +254,56 @@
Ok(())
}
+ pub fn change_token_property(
+ collection: &NonfungibleHandle<T>,
+ sender: &T::CrossAccountId,
+ token_id: TokenId,
+ property: Property,
+ ) -> DispatchResult {
+ let permission = <PalletCommon<T>>::property_permission(collection.id)
+ .get(&property.key)
+ .map(|p| p.clone())
+ .unwrap_or(PropertyPermission::None);
+
+ let check_token_owner = || -> DispatchResult {
+ let token_data = <TokenData<T>>::get((collection.id, token_id))
+ .ok_or(<CommonError<T>>::TokenNotFound)?;
+
+ ensure!(&token_data.owner == sender, <CommonError<T>>::NoPermission);
+
+ Ok(())
+ };
+
+ let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))
+ .get_property(&property.key)
+ .is_some();
+
+ match (permission, is_property_exists) {
+ (PropertyPermission::AdminConst, false) => {
+ collection.check_is_owner_or_admin(sender)?
+ }
+ (PropertyPermission::Admin, _) => collection.check_is_owner_or_admin(sender)?,
+ (PropertyPermission::ItemOwnerConst, false) => check_token_owner()?,
+ (PropertyPermission::ItemOwner, _) => check_token_owner()?,
+ (PropertyPermission::ItemOwnerOrAdmin, _) => {
+ check_token_owner().or(collection.check_is_owner_or_admin(sender))?;
+ }
+ _ => return Err(<CommonError<T>>::NoPermission.into()),
+ }
+
+ <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
+ properties.try_change_property(property.clone())
+ })?;
+
+ <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
+ collection.id,
+ token_id,
+ property,
+ ));
+
+ Ok(())
+ }
+
pub fn transfer(
collection: &NonfungibleHandle<T>,
from: &T::CrossAccountId,
pallets/nonfungible/src/weights.rsdiffbeforeafterboth1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_nonfungible4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2022-03-01, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 102489// Executed Command:10// target/release/unique-collator11// benchmark12// --pallet13// pallet-nonfungible14// --wasm-execution15// compiled16// --extrinsic17// *18// --template19// .maintain/frame-weight-template.hbs20// --steps=5021// --repeat=20022// --heap-pages=409623// --output=./pallets/nonfungible/src/weights.rs2425#![cfg_attr(rustfmt, rustfmt_skip)]26#![allow(unused_parens)]27#![allow(unused_imports)]28#![allow(clippy::unnecessary_cast)]2930use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};31use sp_std::marker::PhantomData;3233/// Weight functions needed for pallet_nonfungible.34pub trait WeightInfo {35 fn create_item() -> Weight;36 fn create_multiple_items(b: u32, ) -> Weight;37 fn create_multiple_items_ex(b: u32, ) -> Weight;38 fn burn_item() -> Weight;39 fn transfer() -> Weight;40 fn approve() -> Weight;41 fn transfer_from() -> Weight;42 fn burn_from() -> Weight;43 fn set_variable_metadata(b: u32, ) -> Weight;44}4546/// Weights for pallet_nonfungible using the Substrate node and recommended hardware.47pub struct SubstrateWeight<T>(PhantomData<T>);48impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {49 // Storage: Nonfungible TokensMinted (r:1 w:1)50 // Storage: Nonfungible AccountBalance (r:1 w:1)51 // Storage: Nonfungible TokenData (r:0 w:1)52 // Storage: Nonfungible Owned (r:0 w:1)53 fn create_item() -> Weight {54 (18_450_000 as Weight)55 .saturating_add(T::DbWeight::get().reads(2 as Weight))56 .saturating_add(T::DbWeight::get().writes(4 as Weight))57 }58 // Storage: Nonfungible TokensMinted (r:1 w:1)59 // Storage: Nonfungible AccountBalance (r:1 w:1)60 // Storage: Nonfungible TokenData (r:0 w:4)61 // Storage: Nonfungible Owned (r:0 w:4)62 fn create_multiple_items(b: u32, ) -> Weight {63 (10_228_000 as Weight)64 // Standard Error: 1_00065 .saturating_add((4_392_000 as Weight).saturating_mul(b as Weight))66 .saturating_add(T::DbWeight::get().reads(2 as Weight))67 .saturating_add(T::DbWeight::get().writes(2 as Weight))68 .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))69 }70 // Storage: Nonfungible TokensMinted (r:1 w:1)71 // Storage: Nonfungible AccountBalance (r:4 w:4)72 // Storage: Nonfungible TokenData (r:0 w:4)73 // Storage: Nonfungible Owned (r:0 w:4)74 fn create_multiple_items_ex(b: u32, ) -> Weight {75 (6_543_000 as Weight)76 // Standard Error: 2_00077 .saturating_add((7_175_000 as Weight).saturating_mul(b as Weight))78 .saturating_add(T::DbWeight::get().reads(1 as Weight))79 .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))80 .saturating_add(T::DbWeight::get().writes(1 as Weight))81 .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))82 }83 // Storage: Nonfungible TokenData (r:1 w:1)84 // Storage: Nonfungible TokensBurnt (r:1 w:1)85 // Storage: Nonfungible AccountBalance (r:1 w:1)86 // Storage: Nonfungible Allowance (r:1 w:0)87 // Storage: Nonfungible Owned (r:0 w:1)88 fn burn_item() -> Weight {89 (24_554_000 as Weight)90 .saturating_add(T::DbWeight::get().reads(4 as Weight))91 .saturating_add(T::DbWeight::get().writes(4 as Weight))92 }93 // Storage: Nonfungible TokenData (r:1 w:1)94 // Storage: Nonfungible AccountBalance (r:2 w:2)95 // Storage: Nonfungible Allowance (r:1 w:0)96 // Storage: Nonfungible Owned (r:0 w:2)97 fn transfer() -> Weight {98 (28_339_000 as Weight)99 .saturating_add(T::DbWeight::get().reads(4 as Weight))100 .saturating_add(T::DbWeight::get().writes(5 as Weight))101 }102 // Storage: Nonfungible TokenData (r:1 w:0)103 // Storage: Nonfungible Allowance (r:1 w:1)104 fn approve() -> Weight {105 (17_616_000 as Weight)106 .saturating_add(T::DbWeight::get().reads(2 as Weight))107 .saturating_add(T::DbWeight::get().writes(1 as Weight))108 }109 // Storage: Nonfungible Allowance (r:1 w:1)110 // Storage: Nonfungible TokenData (r:1 w:1)111 // Storage: Nonfungible AccountBalance (r:2 w:2)112 // Storage: Nonfungible Owned (r:0 w:2)113 fn transfer_from() -> Weight {114 (32_196_000 as Weight)115 .saturating_add(T::DbWeight::get().reads(4 as Weight))116 .saturating_add(T::DbWeight::get().writes(6 as Weight))117 }118 // Storage: Nonfungible Allowance (r:1 w:1)119 // Storage: Nonfungible TokenData (r:1 w:1)120 // Storage: Nonfungible TokensBurnt (r:1 w:1)121 // Storage: Nonfungible AccountBalance (r:1 w:1)122 // Storage: Nonfungible Owned (r:0 w:1)123 fn burn_from() -> Weight {124 (27_580_000 as Weight)125 .saturating_add(T::DbWeight::get().reads(4 as Weight))126 .saturating_add(T::DbWeight::get().writes(5 as Weight))127 }128 // Storage: Nonfungible TokenData (r:1 w:1)129 fn set_variable_metadata(_b: u32, ) -> Weight {130 (7_700_000 as Weight)131 .saturating_add(T::DbWeight::get().reads(1 as Weight))132 .saturating_add(T::DbWeight::get().writes(1 as Weight))133 }134}135136// For backwards compatibility and tests137impl WeightInfo for () {138 // Storage: Nonfungible TokensMinted (r:1 w:1)139 // Storage: Nonfungible AccountBalance (r:1 w:1)140 // Storage: Nonfungible TokenData (r:0 w:1)141 // Storage: Nonfungible Owned (r:0 w:1)142 fn create_item() -> Weight {143 (18_450_000 as Weight)144 .saturating_add(RocksDbWeight::get().reads(2 as Weight))145 .saturating_add(RocksDbWeight::get().writes(4 as Weight))146 }147 // Storage: Nonfungible TokensMinted (r:1 w:1)148 // Storage: Nonfungible AccountBalance (r:1 w:1)149 // Storage: Nonfungible TokenData (r:0 w:4)150 // Storage: Nonfungible Owned (r:0 w:4)151 fn create_multiple_items(b: u32, ) -> Weight {152 (10_228_000 as Weight)153 // Standard Error: 1_000154 .saturating_add((4_392_000 as Weight).saturating_mul(b as Weight))155 .saturating_add(RocksDbWeight::get().reads(2 as Weight))156 .saturating_add(RocksDbWeight::get().writes(2 as Weight))157 .saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))158 }159 // Storage: Nonfungible TokensMinted (r:1 w:1)160 // Storage: Nonfungible AccountBalance (r:4 w:4)161 // Storage: Nonfungible TokenData (r:0 w:4)162 // Storage: Nonfungible Owned (r:0 w:4)163 fn create_multiple_items_ex(b: u32, ) -> Weight {164 (6_543_000 as Weight)165 // Standard Error: 2_000166 .saturating_add((7_175_000 as Weight).saturating_mul(b as Weight))167 .saturating_add(RocksDbWeight::get().reads(1 as Weight))168 .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))169 .saturating_add(RocksDbWeight::get().writes(1 as Weight))170 .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))171 }172 // Storage: Nonfungible TokenData (r:1 w:1)173 // Storage: Nonfungible TokensBurnt (r:1 w:1)174 // Storage: Nonfungible AccountBalance (r:1 w:1)175 // Storage: Nonfungible Allowance (r:1 w:0)176 // Storage: Nonfungible Owned (r:0 w:1)177 fn burn_item() -> Weight {178 (24_554_000 as Weight)179 .saturating_add(RocksDbWeight::get().reads(4 as Weight))180 .saturating_add(RocksDbWeight::get().writes(4 as Weight))181 }182 // Storage: Nonfungible TokenData (r:1 w:1)183 // Storage: Nonfungible AccountBalance (r:2 w:2)184 // Storage: Nonfungible Allowance (r:1 w:0)185 // Storage: Nonfungible Owned (r:0 w:2)186 fn transfer() -> Weight {187 (28_339_000 as Weight)188 .saturating_add(RocksDbWeight::get().reads(4 as Weight))189 .saturating_add(RocksDbWeight::get().writes(5 as Weight))190 }191 // Storage: Nonfungible TokenData (r:1 w:0)192 // Storage: Nonfungible Allowance (r:1 w:1)193 fn approve() -> Weight {194 (17_616_000 as Weight)195 .saturating_add(RocksDbWeight::get().reads(2 as Weight))196 .saturating_add(RocksDbWeight::get().writes(1 as Weight))197 }198 // Storage: Nonfungible Allowance (r:1 w:1)199 // Storage: Nonfungible TokenData (r:1 w:1)200 // Storage: Nonfungible AccountBalance (r:2 w:2)201 // Storage: Nonfungible Owned (r:0 w:2)202 fn transfer_from() -> Weight {203 (32_196_000 as Weight)204 .saturating_add(RocksDbWeight::get().reads(4 as Weight))205 .saturating_add(RocksDbWeight::get().writes(6 as Weight))206 }207 // Storage: Nonfungible Allowance (r:1 w:1)208 // Storage: Nonfungible TokenData (r:1 w:1)209 // Storage: Nonfungible TokensBurnt (r:1 w:1)210 // Storage: Nonfungible AccountBalance (r:1 w:1)211 // Storage: Nonfungible Owned (r:0 w:1)212 fn burn_from() -> Weight {213 (27_580_000 as Weight)214 .saturating_add(RocksDbWeight::get().reads(4 as Weight))215 .saturating_add(RocksDbWeight::get().writes(5 as Weight))216 }217 // Storage: Nonfungible TokenData (r:1 w:1)218 fn set_variable_metadata(_b: u32, ) -> Weight {219 (7_700_000 as Weight)220 .saturating_add(RocksDbWeight::get().reads(1 as Weight))221 .saturating_add(RocksDbWeight::get().writes(1 as Weight))222 }223}1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_nonfungible4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2022-03-01, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 102489// Executed Command:10// target/release/unique-collator11// benchmark12// --pallet13// pallet-nonfungible14// --wasm-execution15// compiled16// --extrinsic17// *18// --template19// .maintain/frame-weight-template.hbs20// --steps=5021// --repeat=20022// --heap-pages=409623// --output=./pallets/nonfungible/src/weights.rs2425#![cfg_attr(rustfmt, rustfmt_skip)]26#![allow(unused_parens)]27#![allow(unused_imports)]28#![allow(clippy::unnecessary_cast)]2930use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};31use sp_std::marker::PhantomData;3233/// Weight functions needed for pallet_nonfungible.34pub trait WeightInfo {35 fn create_item() -> Weight;36 fn create_multiple_items(b: u32, ) -> Weight;37 fn create_multiple_items_ex(b: u32, ) -> Weight;38 fn burn_item() -> Weight;39 fn set_property() -> Weight;40 fn transfer() -> Weight;41 fn approve() -> Weight;42 fn transfer_from() -> Weight;43 fn burn_from() -> Weight;44 fn set_variable_metadata(b: u32, ) -> Weight;45}4647/// Weights for pallet_nonfungible using the Substrate node and recommended hardware.48pub struct SubstrateWeight<T>(PhantomData<T>);49impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {50 // Storage: Nonfungible TokensMinted (r:1 w:1)51 // Storage: Nonfungible AccountBalance (r:1 w:1)52 // Storage: Nonfungible TokenData (r:0 w:1)53 // Storage: Nonfungible Owned (r:0 w:1)54 fn create_item() -> Weight {55 (18_450_000 as Weight)56 .saturating_add(T::DbWeight::get().reads(2 as Weight))57 .saturating_add(T::DbWeight::get().writes(4 as Weight))58 }59 // Storage: Nonfungible TokensMinted (r:1 w:1)60 // Storage: Nonfungible AccountBalance (r:1 w:1)61 // Storage: Nonfungible TokenData (r:0 w:4)62 // Storage: Nonfungible Owned (r:0 w:4)63 fn create_multiple_items(b: u32, ) -> Weight {64 (10_228_000 as Weight)65 // Standard Error: 1_00066 .saturating_add((4_392_000 as Weight).saturating_mul(b as Weight))67 .saturating_add(T::DbWeight::get().reads(2 as Weight))68 .saturating_add(T::DbWeight::get().writes(2 as Weight))69 .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))70 }71 // Storage: Nonfungible TokensMinted (r:1 w:1)72 // Storage: Nonfungible AccountBalance (r:4 w:4)73 // Storage: Nonfungible TokenData (r:0 w:4)74 // Storage: Nonfungible Owned (r:0 w:4)75 fn create_multiple_items_ex(b: u32, ) -> Weight {76 (6_543_000 as Weight)77 // Standard Error: 2_00078 .saturating_add((7_175_000 as Weight).saturating_mul(b as Weight))79 .saturating_add(T::DbWeight::get().reads(1 as Weight))80 .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))81 .saturating_add(T::DbWeight::get().writes(1 as Weight))82 .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))83 }84 // Storage: Nonfungible TokenData (r:1 w:1)85 // Storage: Nonfungible TokensBurnt (r:1 w:1)86 // Storage: Nonfungible AccountBalance (r:1 w:1)87 // Storage: Nonfungible Allowance (r:1 w:0)88 // Storage: Nonfungible Owned (r:0 w:1)89 fn burn_item() -> Weight {90 (24_554_000 as Weight)91 .saturating_add(T::DbWeight::get().reads(4 as Weight))92 .saturating_add(T::DbWeight::get().writes(4 as Weight))93 }9495 fn set_property() -> Weight {96 // TODO calculate appropriate weight97 50_000_000 as Weight98 }99100 // Storage: Nonfungible TokenData (r:1 w:1)101 // Storage: Nonfungible AccountBalance (r:2 w:2)102 // Storage: Nonfungible Allowance (r:1 w:0)103 // Storage: Nonfungible Owned (r:0 w:2)104 fn transfer() -> Weight {105 (28_339_000 as Weight)106 .saturating_add(T::DbWeight::get().reads(4 as Weight))107 .saturating_add(T::DbWeight::get().writes(5 as Weight))108 }109 // Storage: Nonfungible TokenData (r:1 w:0)110 // Storage: Nonfungible Allowance (r:1 w:1)111 fn approve() -> Weight {112 (17_616_000 as Weight)113 .saturating_add(T::DbWeight::get().reads(2 as Weight))114 .saturating_add(T::DbWeight::get().writes(1 as Weight))115 }116 // Storage: Nonfungible Allowance (r:1 w:1)117 // Storage: Nonfungible TokenData (r:1 w:1)118 // Storage: Nonfungible AccountBalance (r:2 w:2)119 // Storage: Nonfungible Owned (r:0 w:2)120 fn transfer_from() -> Weight {121 (32_196_000 as Weight)122 .saturating_add(T::DbWeight::get().reads(4 as Weight))123 .saturating_add(T::DbWeight::get().writes(6 as Weight))124 }125 // Storage: Nonfungible Allowance (r:1 w:1)126 // Storage: Nonfungible TokenData (r:1 w:1)127 // Storage: Nonfungible TokensBurnt (r:1 w:1)128 // Storage: Nonfungible AccountBalance (r:1 w:1)129 // Storage: Nonfungible Owned (r:0 w:1)130 fn burn_from() -> Weight {131 (27_580_000 as Weight)132 .saturating_add(T::DbWeight::get().reads(4 as Weight))133 .saturating_add(T::DbWeight::get().writes(5 as Weight))134 }135 // Storage: Nonfungible TokenData (r:1 w:1)136 fn set_variable_metadata(_b: u32, ) -> Weight {137 (7_700_000 as Weight)138 .saturating_add(T::DbWeight::get().reads(1 as Weight))139 .saturating_add(T::DbWeight::get().writes(1 as Weight))140 }141}142143// For backwards compatibility and tests144impl WeightInfo for () {145 // Storage: Nonfungible TokensMinted (r:1 w:1)146 // Storage: Nonfungible AccountBalance (r:1 w:1)147 // Storage: Nonfungible TokenData (r:0 w:1)148 // Storage: Nonfungible Owned (r:0 w:1)149 fn create_item() -> Weight {150 (18_450_000 as Weight)151 .saturating_add(RocksDbWeight::get().reads(2 as Weight))152 .saturating_add(RocksDbWeight::get().writes(4 as Weight))153 }154 // Storage: Nonfungible TokensMinted (r:1 w:1)155 // Storage: Nonfungible AccountBalance (r:1 w:1)156 // Storage: Nonfungible TokenData (r:0 w:4)157 // Storage: Nonfungible Owned (r:0 w:4)158 fn create_multiple_items(b: u32, ) -> Weight {159 (10_228_000 as Weight)160 // Standard Error: 1_000161 .saturating_add((4_392_000 as Weight).saturating_mul(b as Weight))162 .saturating_add(RocksDbWeight::get().reads(2 as Weight))163 .saturating_add(RocksDbWeight::get().writes(2 as Weight))164 .saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))165 }166 // Storage: Nonfungible TokensMinted (r:1 w:1)167 // Storage: Nonfungible AccountBalance (r:4 w:4)168 // Storage: Nonfungible TokenData (r:0 w:4)169 // Storage: Nonfungible Owned (r:0 w:4)170 fn create_multiple_items_ex(b: u32, ) -> Weight {171 (6_543_000 as Weight)172 // Standard Error: 2_000173 .saturating_add((7_175_000 as Weight).saturating_mul(b as Weight))174 .saturating_add(RocksDbWeight::get().reads(1 as Weight))175 .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))176 .saturating_add(RocksDbWeight::get().writes(1 as Weight))177 .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))178 }179 // Storage: Nonfungible TokenData (r:1 w:1)180 // Storage: Nonfungible TokensBurnt (r:1 w:1)181 // Storage: Nonfungible AccountBalance (r:1 w:1)182 // Storage: Nonfungible Allowance (r:1 w:0)183 // Storage: Nonfungible Owned (r:0 w:1)184 fn burn_item() -> Weight {185 (24_554_000 as Weight)186 .saturating_add(RocksDbWeight::get().reads(4 as Weight))187 .saturating_add(RocksDbWeight::get().writes(4 as Weight))188 }189190 fn set_property() -> Weight {191 // TODO calculate appropriate weight192 50_000_000 as Weight193 }194195 // Storage: Nonfungible TokenData (r:1 w:1)196 // Storage: Nonfungible AccountBalance (r:2 w:2)197 // Storage: Nonfungible Allowance (r:1 w:0)198 // Storage: Nonfungible Owned (r:0 w:2)199 fn transfer() -> Weight {200 (28_339_000 as Weight)201 .saturating_add(RocksDbWeight::get().reads(4 as Weight))202 .saturating_add(RocksDbWeight::get().writes(5 as Weight))203 }204 // Storage: Nonfungible TokenData (r:1 w:0)205 // Storage: Nonfungible Allowance (r:1 w:1)206 fn approve() -> Weight {207 (17_616_000 as Weight)208 .saturating_add(RocksDbWeight::get().reads(2 as Weight))209 .saturating_add(RocksDbWeight::get().writes(1 as Weight))210 }211 // Storage: Nonfungible Allowance (r:1 w:1)212 // Storage: Nonfungible TokenData (r:1 w:1)213 // Storage: Nonfungible AccountBalance (r:2 w:2)214 // Storage: Nonfungible Owned (r:0 w:2)215 fn transfer_from() -> Weight {216 (32_196_000 as Weight)217 .saturating_add(RocksDbWeight::get().reads(4 as Weight))218 .saturating_add(RocksDbWeight::get().writes(6 as Weight))219 }220 // Storage: Nonfungible Allowance (r:1 w:1)221 // Storage: Nonfungible TokenData (r:1 w:1)222 // Storage: Nonfungible TokensBurnt (r:1 w:1)223 // Storage: Nonfungible AccountBalance (r:1 w:1)224 // Storage: Nonfungible Owned (r:0 w:1)225 fn burn_from() -> Weight {226 (27_580_000 as Weight)227 .saturating_add(RocksDbWeight::get().reads(4 as Weight))228 .saturating_add(RocksDbWeight::get().writes(5 as Weight))229 }230 // Storage: Nonfungible TokenData (r:1 w:1)231 fn set_variable_metadata(_b: u32, ) -> Weight {232 (7_700_000 as Weight)233 .saturating_add(RocksDbWeight::get().reads(1 as Weight))234 .saturating_add(RocksDbWeight::get().writes(1 as Weight))235 }236}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,
+ budget::Budget, Property,
};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::DispatchError;
@@ -66,6 +66,10 @@
max_weight_of!(burn_item_partial(), burn_item_fully())
}
+ fn set_property() -> Weight {
+ <SelfWeightOf<T>>::set_property()
+ }
+
fn transfer() -> Weight {
max_weight_of!(
transfer_normal(),
@@ -244,6 +248,23 @@
)
}
+ fn change_collection_property(
+ &self,
+ _sender: T::CrossAccountId,
+ _property: Property,
+ ) -> DispatchResultWithPostInfo {
+ fail!(<Error<T>>::PropertiesNotAllowed)
+ }
+
+ fn change_token_property(
+ &self,
+ _sender: T::CrossAccountId,
+ _token_id: TokenId,
+ _property: Property,
+ ) -> DispatchResultWithPostInfo {
+ fail!(<Error<T>>::PropertiesNotAllowed)
+ }
+
fn set_variable_metadata(
&self,
sender: T::CrossAccountId,
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -62,6 +62,8 @@
WrongRefungiblePieces,
/// Refungible token can't nest other tokens
RefungibleDisallowsNesting,
+ /// Item properties are not allowed
+ PropertiesNotAllowed,
}
#[pallet::config]
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -38,6 +38,7 @@
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight;
fn burn_item_partial() -> Weight;
fn burn_item_fully() -> Weight;
+ fn set_property() -> Weight;
fn transfer_normal() -> Weight;
fn transfer_creating() -> Weight;
fn transfer_removing() -> Weight;
@@ -129,6 +130,12 @@
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
+
+ fn set_property() -> Weight {
+ // Error
+ 0
+ }
+
// Storage: Refungible Balance (r:2 w:2)
fn transfer_normal() -> Weight {
(19_766_000 as Weight)
@@ -297,6 +304,12 @@
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
+
+ fn set_property() -> 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,
+ CreateItemExData, budget, CollectionField, Property,
};
use pallet_evm::account::CrossAccountId;
use pallet_common::{
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -22,13 +22,14 @@
};
use frame_support::{
storage::{bounded_btree_map::BoundedBTreeMap, bounded_btree_set::BoundedBTreeSet},
+ traits::Get,
};
#[cfg(feature = "serde")]
use serde::{Serialize, Deserialize};
use sp_core::U256;
-use sp_runtime::{ArithmeticError, sp_std::prelude::Vec};
+use sp_runtime::{ArithmeticError, sp_std::prelude::Vec, DispatchError};
use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
use frame_support::{BoundedVec, traits::ConstU32};
use derivative::Derivative;
@@ -85,6 +86,26 @@
pub const MAX_COLLECTION_DESCRIPTION_LENGTH: u32 = 256;
pub const MAX_TOKEN_PREFIX_LENGTH: u32 = 16;
+pub const MAX_PROPERTY_KEY_LENGTH: u32 = 256;
+pub const MAX_PROPERTY_VALUE_LENGTH: u32 = 32768;
+pub const MAX_PROPERTIES_PER_ITEM: u32 = 64;
+
+// pub const MAX_PROPERTY_KEYS_OVERALL_LENGTH: u32 = MAX_PROPERTY_KEY_LENGTH * MAX_PROPERTIES_PER_ITEM;
+pub const MAX_COLLECTION_PROPERTIES_SIZE: u32 = 40960;
+pub const MAX_TOKEN_PROPERTIES_SIZE: u32 = 32768;
+
+pub const MAX_COLLECTION_PROPERTIES_ENCODE_LEN: u32 =
+ MAX_PROPERTIES_PER_ITEM * MAX_PROPERTY_KEY_LENGTH + MAX_COLLECTION_PROPERTIES_SIZE;
+
+pub struct MaxPropertiesPermissionsEncodeLen;
+
+impl Get<u32> for MaxPropertiesPermissionsEncodeLen {
+ fn get() -> u32 {
+ MAX_PROPERTIES_PER_ITEM * MAX_PROPERTY_KEY_LENGTH
+ + <PropertyPermission as MaxEncodedLen>::max_encoded_len() as u32
+ }
+}
+
/// How much items can be created per single
/// create_many call
pub const MAX_ITEMS_PER_BATCH: u32 = 200;
@@ -310,31 +331,32 @@
OffchainSchema,
}
-#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, Debug, Derivative, MaxEncodedLen)]
-#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
-#[derivative(Default(bound = ""))]
+#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, Derivative, MaxEncodedLen)]
+#[derivative(Debug, Default(bound = ""))]
pub struct CreateCollectionData<AccountId> {
#[derivative(Default(value = "CollectionMode::NFT"))]
pub mode: CollectionMode,
pub access: Option<AccessMode>,
- #[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]
pub name: BoundedVec<u16, ConstU32<MAX_COLLECTION_NAME_LENGTH>>,
- #[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]
pub description: BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>,
- #[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]
pub token_prefix: BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>,
- #[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]
pub offchain_schema: BoundedVec<u8, ConstU32<OFFCHAIN_SCHEMA_LIMIT>>,
pub schema_version: Option<SchemaVersion>,
pub pending_sponsor: Option<AccountId>,
pub limits: Option<CollectionLimits>,
- #[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]
pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,
- #[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]
pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,
pub meta_update_permission: Option<MetaUpdatePermission>,
+ pub token_property_permissions: CollectionPropertiesPermissionsVec,
+ pub properties: CollectionPropertiesVec,
}
+pub type CollectionPropertiesPermissionsVec =
+ BoundedVec<PropertyKeyPermission, MaxPropertiesPermissionsEncodeLen>;
+
+pub type CollectionPropertiesVec =
+ BoundedVec<Property, ConstU32<MAX_COLLECTION_PROPERTIES_ENCODE_LEN>>;
+
#[derive(Encode, Decode, Debug, Clone, PartialEq, TypeInfo)]
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
pub struct NftItemType<AccountId> {
@@ -607,3 +629,128 @@
0
}
}
+
+pub type PropertyKey = BoundedVec<u8, ConstU32<MAX_PROPERTY_KEY_LENGTH>>;
+pub type PropertyValue = BoundedVec<u8, ConstU32<MAX_PROPERTY_VALUE_LENGTH>>;
+
+#[derive(Encode, Decode, TypeInfo, Debug, MaxEncodedLen, PartialEq, Clone)]
+pub enum PropertyPermission {
+ None,
+ AdminConst,
+ Admin,
+ ItemOwnerConst,
+ ItemOwner,
+ ItemOwnerOrAdmin,
+}
+
+#[derive(Encode, Decode, Debug, TypeInfo, Clone, PartialEq, MaxEncodedLen)]
+pub struct Property {
+ pub key: PropertyKey,
+ pub value: PropertyValue,
+}
+
+#[derive(Encode, Decode, TypeInfo, Debug, MaxEncodedLen, PartialEq, Clone)]
+pub struct PropertyKeyPermission {
+ pub key: PropertyKey,
+ pub permission: PropertyPermission,
+}
+
+pub enum PropertiesError {
+ NoSpaceForProperty,
+ PropertyLimitReached,
+}
+
+impl From<PropertiesError> for DispatchError {
+ fn from(error: PropertiesError) -> Self {
+ match error {
+ PropertiesError::NoSpaceForProperty => DispatchError::Other("no space for property"),
+ PropertiesError::PropertyLimitReached => {
+ DispatchError::Other("property key limit reached")
+ }
+ }
+ }
+}
+
+pub type PropertiesMap =
+ BoundedBTreeMap<PropertyKey, PropertyValue, ConstU32<MAX_PROPERTIES_PER_ITEM>>;
+pub type PropertiesPermissionMap =
+ BoundedBTreeMap<PropertyKey, PropertyPermission, ConstU32<MAX_PROPERTIES_PER_ITEM>>;
+
+#[derive(Encode, Decode, TypeInfo, Clone, PartialEq, MaxEncodedLen)]
+pub struct Properties {
+ map: PropertiesMap,
+ consumed_space: u32,
+ space_limit: u32,
+}
+
+impl Properties {
+ pub fn new(space_limit: u32) -> Self {
+ Self {
+ map: BoundedBTreeMap::new(),
+ consumed_space: 0,
+ space_limit,
+ }
+ }
+
+ pub fn from_collection_props_vec(
+ data: CollectionPropertiesVec,
+ ) -> Result<Self, PropertiesError> {
+ let mut props = Self::new(MAX_COLLECTION_PROPERTIES_SIZE);
+
+ for property in data.into_iter() {
+ props.try_change_property(property)?;
+ }
+
+ Ok(props)
+ }
+
+ pub fn try_change_property(&mut self, property: Property) -> Result<(), PropertiesError> {
+ let value_len = property.value.len();
+
+ if self.consumed_space as usize + value_len > self.space_limit as usize {
+ return Err(PropertiesError::NoSpaceForProperty);
+ }
+
+ self.map
+ .try_insert(property.key, property.value)
+ .map_err(|_| PropertiesError::PropertyLimitReached)?;
+
+ self.consumed_space += value_len as u32;
+
+ Ok(())
+ }
+
+ pub fn get_property(&self, key: &PropertyKey) -> Option<&PropertyValue> {
+ self.map.get(key)
+ }
+}
+
+pub struct CollectionProperties;
+
+impl Get<Properties> for CollectionProperties {
+ fn get() -> Properties {
+ Properties::new(MAX_COLLECTION_PROPERTIES_SIZE)
+ }
+}
+
+pub struct TokenProperties;
+
+impl Get<Properties> for TokenProperties {
+ fn get() -> Properties {
+ Properties::new(MAX_TOKEN_PROPERTIES_SIZE)
+ }
+}
+
+// #[cfg(not(feature = "std"))]
+// fn properties_map_debug(_properties: &PropertiesMap, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+// write!(f, "<properties>")
+// }
+
+// #[cfg(not(feature = "std"))]
+// fn opt_properties_permissions_map_debug(properties: &Option<PropertiesPermissionMap>, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+// if properties.is_some() {
+// write!(f, "Some(<properties permissions>)")
+// } else {
+// write!(f, "None")
+// }
+// }
primitives/rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -16,7 +16,9 @@
#![cfg_attr(not(feature = "std"), no_std)]
-use up_data_structs::{CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits};
+use up_data_structs::{
+ CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,
+};
use sp_std::vec::Vec;
use codec::Decode;
use sp_runtime::DispatchError;
runtime/common/src/weights.rsdiffbeforeafterboth--- a/runtime/common/src/weights.rs
+++ b/runtime/common/src/weights.rs
@@ -54,6 +54,10 @@
dispatch_weight::<T>() + max_weight_of!(burn_item())
}
+ fn set_property() -> Weight {
+ dispatch_weight::<T>() + max_weight_of!(set_property())
+ }
+
fn transfer() -> Weight {
dispatch_weight::<T>() + max_weight_of!(transfer())
}