difftreelog
Merge pull request #854 from UniqueNetwork/fix/createItemWeight
in: master
15 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5783,7 +5783,7 @@
[[package]]
name = "pallet-common"
-version = "0.1.12"
+version = "0.1.13"
dependencies = [
"ethereum 0.14.0",
"evm-coder",
@@ -6340,7 +6340,7 @@
[[package]]
name = "pallet-nonfungible"
-version = "0.1.12"
+version = "0.1.13"
dependencies = [
"evm-coder",
"frame-benchmarking",
@@ -6499,7 +6499,7 @@
[[package]]
name = "pallet-refungible"
-version = "0.2.11"
+version = "0.2.12"
dependencies = [
"evm-coder",
"frame-benchmarking",
pallets/common/CHANGELOG.mddiffbeforeafterboth--- a/pallets/common/CHANGELOG.md
+++ b/pallets/common/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.1.13] - 2023-01-20
+
+### Changed
+
+- Behavior of the `CommonWeightInfo::create_item` method.
+
## [0.1.12] - 2022-11-16
### Changed
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -2,7 +2,7 @@
edition = "2021"
license = "GPLv3"
name = "pallet-common"
-version = "0.1.12"
+version = "0.1.13"
[dependencies]
codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = "3.1.2" }
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -53,7 +53,10 @@
#![cfg_attr(not(feature = "std"), no_std)]
extern crate alloc;
-use core::ops::{Deref, DerefMut};
+use core::{
+ ops::{Deref, DerefMut},
+ slice::from_ref,
+};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use sp_std::vec::Vec;
use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
@@ -1780,7 +1783,9 @@
/// Return weights for various worst-case operations.
pub trait CommonWeightInfo<CrossAccountId> {
/// Weight of item creation.
- fn create_item() -> Weight;
+ fn create_item(data: &CreateItemData) -> Weight {
+ Self::create_multiple_items(from_ref(data))
+ }
/// Weight of items creation.
fn create_multiple_items(amount: &[CreateItemData]) -> Weight;
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -36,13 +36,9 @@
pub struct CommonWeights<T: Config>(PhantomData<T>);
impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {
- fn create_item() -> Weight {
- <SelfWeightOf<T>>::create_item()
- }
-
fn create_multiple_items(_data: &[CreateItemData]) -> Weight {
// All items minted for the same user, so it works same as create_item
- Self::create_item()
+ <SelfWeightOf<T>>::create_item()
}
fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {
@@ -134,10 +130,10 @@
data: up_data_structs::CreateItemData,
nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
- match data {
- up_data_structs::CreateItemData::Fungible(data) => with_weight(
- <Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),
- <CommonWeights<T>>::create_item(),
+ match &data {
+ up_data_structs::CreateItemData::Fungible(fungible_data) => with_weight(
+ <Pallet<T>>::create_item(self, &sender, (to, fungible_data.value), nesting_budget),
+ <CommonWeights<T>>::create_item(&data),
),
_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),
}
@@ -151,8 +147,8 @@
nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
let mut sum: u128 = 0;
- for data in data {
- match data {
+ for data in &data {
+ match &data {
up_data_structs::CreateItemData::Fungible(data) => {
sum = sum
.checked_add(data.value)
@@ -164,7 +160,7 @@
with_weight(
<Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),
- <CommonWeights<T>>::create_item(),
+ <CommonWeights<T>>::create_multiple_items(&data),
)
}
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.1.13] - 2023-01-20
+
+### Fixed
+
+- The weight of properties when creating an item.
+
## [0.1.12] - 2022-12-16
### Added
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -2,7 +2,7 @@
edition = "2021"
license = "GPLv3"
name = "pallet-nonfungible"
-version = "0.1.12"
+version = "0.1.13"
[dependencies]
codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = "3.1.2" }
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -35,10 +35,6 @@
pub struct CommonWeights<T: Config>(PhantomData<T>);
impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {
- fn create_item() -> Weight {
- <SelfWeightOf<T>>::create_item()
- }
-
fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {
match data {
CreateItemExData::NFT(t) => {
@@ -159,6 +155,7 @@
data: up_data_structs::CreateItemData,
nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
+ let weight = <CommonWeights<T>>::create_item(&data);
with_weight(
<Pallet<T>>::create_item(
self,
@@ -166,7 +163,7 @@
map_create_data::<T>(data, &to)?,
nesting_budget,
),
- <CommonWeights<T>>::create_item(),
+ weight,
)
}
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -590,7 +590,7 @@
/// @param tokenUri Token URI that would be stored in the NFT properties
/// @return uint256 The id of the newly minted token
#[solidity(rename_selector = "mintWithTokenURI")]
- #[weight(<SelfWeightOf<T>>::create_item())]
+ #[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(1))]
fn mint_with_token_uri(
&mut self,
caller: Caller,
@@ -612,7 +612,7 @@
/// @param tokenId ID of the minted NFT
/// @param tokenUri Token URI that would be stored in the NFT properties
#[solidity(hide, rename_selector = "mintWithTokenURI")]
- #[weight(<SelfWeightOf<T>>::create_item())]
+ #[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(1))]
fn mint_with_token_uri_check_id(
&mut self,
caller: Caller,
@@ -943,7 +943,7 @@
/// @param to The new owner
/// @param tokens array of pairs of token ID and token URI for minted tokens
#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]
- #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]
+ #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32) + <SelfWeightOf<T>>::set_token_properties(tokens.len() as u32))]
fn mint_bulk_with_token_uri(
&mut self,
caller: Caller,
@@ -994,7 +994,7 @@
/// @param to The new owner crossAccountId
/// @param properties Properties of minted token
/// @return uint256 The id of the newly minted token
- #[weight(<SelfWeightOf<T>>::create_item())]
+ #[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]
fn mint_cross(
&mut self,
caller: Caller,
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.2.12] - 2023-01-20
+
+### Fixed
+
+- The weight of properties when creating an item.
+
## [0.2.11] - 2022-12-16
### Added
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -2,7 +2,7 @@
edition = "2021"
license = "GPLv3"
name = "pallet-refungible"
-version = "0.2.11"
+version = "0.2.12"
[dependencies]
codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = "3.1.2" }
pallets/refungible/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 sp_std::collections::btree_map::BTreeMap;20use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};21use up_data_structs::{22 CollectionId, TokenId, CreateItemExData, budget::Budget, Property, PropertyKey, PropertyValue,23 PropertyKeyPermission, CollectionPropertiesVec, CreateRefungibleExMultipleOwners,24 CreateRefungibleExSingleOwner, TokenOwnerError,25};26use pallet_common::{27 CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight,28 weights::WeightInfo as _,29};30use pallet_structure::Error as StructureError;31use sp_runtime::{DispatchError};32use sp_std::{vec::Vec, vec};3334use crate::{35 AccountBalance, Allowance, Balance, Config, Error, Owned, Pallet, RefungibleHandle,36 SelfWeightOf, weights::WeightInfo, TokensMinted, TotalSupply, CreateItemData,37};3839macro_rules! max_weight_of {40 ($($method:ident ($($args:tt)*)),*) => {41 Weight::zero()42 $(43 .max(<SelfWeightOf<T>>::$method($($args)*))44 )*45 };46}4748fn properties_weight<T: Config>(properties: &CollectionPropertiesVec) -> Weight {49 if properties.len() > 0 {50 <CommonWeights<T>>::set_token_properties(properties.len() as u32)51 } else {52 Weight::zero()53 }54}5556pub struct CommonWeights<T: Config>(PhantomData<T>);57impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {58 fn create_item() -> Weight {59 <SelfWeightOf<T>>::create_item()60 }6162 fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {63 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32).saturating_add(64 data.iter()65 .map(|data| match data {66 up_data_structs::CreateItemData::ReFungible(rft_data) => {67 properties_weight::<T>(&rft_data.properties)68 }69 _ => Weight::zero(),70 })71 .fold(Weight::zero(), |a, b| a.saturating_add(b)),72 )73 }7475 fn create_multiple_items_ex(call: &CreateItemExData<T::CrossAccountId>) -> Weight {76 match call {77 CreateItemExData::RefungibleMultipleOwners(i) => {78 <SelfWeightOf<T>>::create_multiple_items_ex_multiple_owners(i.users.len() as u32)79 .saturating_add(properties_weight::<T>(&i.properties))80 }81 CreateItemExData::RefungibleMultipleItems(i) => {82 <SelfWeightOf<T>>::create_multiple_items_ex_multiple_items(i.len() as u32)83 .saturating_add(84 i.iter()85 .map(|d| properties_weight::<T>(&d.properties))86 .fold(Weight::zero(), |a, b| a.saturating_add(b)),87 )88 }89 _ => Weight::zero(),90 }91 }9293 fn burn_item() -> Weight {94 max_weight_of!(burn_item_partial(), burn_item_fully())95 }9697 fn set_collection_properties(amount: u32) -> Weight {98 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)99 }100101 fn delete_collection_properties(amount: u32) -> Weight {102 <pallet_common::SelfWeightOf<T>>::delete_collection_properties(amount)103 }104105 fn set_token_properties(amount: u32) -> Weight {106 <SelfWeightOf<T>>::set_token_properties(amount)107 }108109 fn delete_token_properties(amount: u32) -> Weight {110 <SelfWeightOf<T>>::delete_token_properties(amount)111 }112113 fn set_token_property_permissions(amount: u32) -> Weight {114 <SelfWeightOf<T>>::set_token_property_permissions(amount)115 }116117 fn transfer() -> Weight {118 max_weight_of!(119 transfer_normal(),120 transfer_creating(),121 transfer_removing(),122 transfer_creating_removing()123 )124 }125126 fn approve() -> Weight {127 <SelfWeightOf<T>>::approve()128 }129130 fn approve_from() -> Weight {131 <SelfWeightOf<T>>::approve_from()132 }133134 fn transfer_from() -> Weight {135 max_weight_of!(136 transfer_from_normal(),137 transfer_from_creating(),138 transfer_from_removing(),139 transfer_from_creating_removing()140 )141 }142143 fn burn_from() -> Weight {144 <SelfWeightOf<T>>::burn_from()145 }146147 fn burn_recursively_self_raw() -> Weight {148 // Read to get total balance149 Self::burn_item() + T::DbWeight::get().reads(1)150 }151 fn burn_recursively_breadth_raw(_amount: u32) -> Weight {152 // Refungible token can't have children153 Weight::zero()154 }155156 fn token_owner() -> Weight {157 <SelfWeightOf<T>>::token_owner()158 }159160 fn set_allowance_for_all() -> Weight {161 <SelfWeightOf<T>>::set_allowance_for_all()162 }163164 fn force_repair_item() -> Weight {165 <SelfWeightOf<T>>::repair_item()166 }167}168169fn map_create_data<T: Config>(170 data: up_data_structs::CreateItemData,171 to: &T::CrossAccountId,172) -> Result<CreateItemData<T>, DispatchError> {173 match data {174 up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateItemData::<T> {175 users: {176 let mut out = BTreeMap::new();177 out.insert(to.clone(), data.pieces);178 out.try_into().expect("limit > 0")179 },180 properties: data.properties,181 }),182 _ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),183 }184}185186/// Implementation of `CommonCollectionOperations` for `RefungibleHandle`. It wraps Refungible Pallete187/// methods and adds weight info.188impl<T: Config> CommonCollectionOperations<T> for RefungibleHandle<T> {189 fn create_item(190 &self,191 sender: T::CrossAccountId,192 to: T::CrossAccountId,193 data: up_data_structs::CreateItemData,194 nesting_budget: &dyn Budget,195 ) -> DispatchResultWithPostInfo {196 with_weight(197 <Pallet<T>>::create_item(198 self,199 &sender,200 map_create_data::<T>(data, &to)?,201 nesting_budget,202 ),203 <CommonWeights<T>>::create_item(),204 )205 }206207 fn create_multiple_items(208 &self,209 sender: T::CrossAccountId,210 to: T::CrossAccountId,211 data: Vec<up_data_structs::CreateItemData>,212 nesting_budget: &dyn Budget,213 ) -> DispatchResultWithPostInfo {214 let weight = <CommonWeights<T>>::create_multiple_items(&data);215 let data = data216 .into_iter()217 .map(|d| map_create_data::<T>(d, &to))218 .collect::<Result<Vec<_>, DispatchError>>()?;219220 with_weight(221 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),222 weight,223 )224 }225226 fn create_multiple_items_ex(227 &self,228 sender: <T>::CrossAccountId,229 data: CreateItemExData<T::CrossAccountId>,230 nesting_budget: &dyn Budget,231 ) -> DispatchResultWithPostInfo {232 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);233 let data = match data {234 CreateItemExData::RefungibleMultipleOwners(CreateRefungibleExMultipleOwners {235 users,236 properties,237 }) => vec![CreateItemData::<T> { users, properties }],238 CreateItemExData::RefungibleMultipleItems(r) => r239 .into_inner()240 .into_iter()241 .map(242 |CreateRefungibleExSingleOwner {243 user,244 pieces,245 properties,246 }| CreateItemData::<T> {247 users: BTreeMap::from([(user, pieces)])248 .try_into()249 .expect("limit >= 1"),250 properties,251 },252 )253 .collect(),254 _ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),255 };256257 with_weight(258 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),259 weight,260 )261 }262263 fn burn_item(264 &self,265 sender: T::CrossAccountId,266 token: TokenId,267 amount: u128,268 ) -> DispatchResultWithPostInfo {269 with_weight(270 <Pallet<T>>::burn(self, &sender, token, amount),271 <CommonWeights<T>>::burn_item(),272 )273 }274275 fn burn_item_recursively(276 &self,277 sender: T::CrossAccountId,278 token: TokenId,279 self_budget: &dyn Budget,280 _breadth_budget: &dyn Budget,281 ) -> DispatchResultWithPostInfo {282 ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);283 with_weight(284 <Pallet<T>>::burn(285 self,286 &sender,287 token,288 <Balance<T>>::get((self.id, token, &sender)),289 ),290 <CommonWeights<T>>::burn_recursively_self_raw(),291 )292 }293294 fn transfer(295 &self,296 from: T::CrossAccountId,297 to: T::CrossAccountId,298 token: TokenId,299 amount: u128,300 nesting_budget: &dyn Budget,301 ) -> DispatchResultWithPostInfo {302 with_weight(303 <Pallet<T>>::transfer(self, &from, &to, token, amount, nesting_budget),304 <CommonWeights<T>>::transfer(),305 )306 }307308 fn approve(309 &self,310 sender: T::CrossAccountId,311 spender: T::CrossAccountId,312 token: TokenId,313 amount: u128,314 ) -> DispatchResultWithPostInfo {315 with_weight(316 <Pallet<T>>::set_allowance(self, &sender, &spender, token, amount),317 <CommonWeights<T>>::approve(),318 )319 }320321 fn approve_from(322 &self,323 sender: T::CrossAccountId,324 from: T::CrossAccountId,325 to: T::CrossAccountId,326 token_id: TokenId,327 amount: u128,328 ) -> DispatchResultWithPostInfo {329 with_weight(330 <Pallet<T>>::set_allowance_from(self, &sender, &from, &to, token_id, amount),331 <CommonWeights<T>>::approve_from(),332 )333 }334335 fn transfer_from(336 &self,337 sender: T::CrossAccountId,338 from: T::CrossAccountId,339 to: T::CrossAccountId,340 token: TokenId,341 amount: u128,342 nesting_budget: &dyn Budget,343 ) -> DispatchResultWithPostInfo {344 with_weight(345 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, amount, nesting_budget),346 <CommonWeights<T>>::transfer_from(),347 )348 }349350 fn burn_from(351 &self,352 sender: T::CrossAccountId,353 from: T::CrossAccountId,354 token: TokenId,355 amount: u128,356 nesting_budget: &dyn Budget,357 ) -> DispatchResultWithPostInfo {358 with_weight(359 <Pallet<T>>::burn_from(self, &sender, &from, token, amount, nesting_budget),360 <CommonWeights<T>>::burn_from(),361 )362 }363364 fn set_collection_properties(365 &self,366 sender: T::CrossAccountId,367 properties: Vec<Property>,368 ) -> DispatchResultWithPostInfo {369 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);370371 with_weight(372 <Pallet<T>>::set_collection_properties(self, &sender, properties),373 weight,374 )375 }376377 fn delete_collection_properties(378 &self,379 sender: &T::CrossAccountId,380 property_keys: Vec<PropertyKey>,381 ) -> DispatchResultWithPostInfo {382 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);383384 with_weight(385 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),386 weight,387 )388 }389390 fn set_token_properties(391 &self,392 sender: T::CrossAccountId,393 token_id: TokenId,394 properties: Vec<Property>,395 nesting_budget: &dyn Budget,396 ) -> DispatchResultWithPostInfo {397 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);398399 with_weight(400 <Pallet<T>>::set_token_properties(401 self,402 &sender,403 token_id,404 properties.into_iter(),405 false,406 nesting_budget,407 ),408 weight,409 )410 }411412 fn set_token_property_permissions(413 &self,414 sender: &T::CrossAccountId,415 property_permissions: Vec<PropertyKeyPermission>,416 ) -> DispatchResultWithPostInfo {417 let weight =418 <CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);419420 with_weight(421 <Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),422 weight,423 )424 }425426 fn delete_token_properties(427 &self,428 sender: T::CrossAccountId,429 token_id: TokenId,430 property_keys: Vec<PropertyKey>,431 nesting_budget: &dyn Budget,432 ) -> DispatchResultWithPostInfo {433 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);434435 with_weight(436 <Pallet<T>>::delete_token_properties(437 self,438 &sender,439 token_id,440 property_keys.into_iter(),441 nesting_budget,442 ),443 weight,444 )445 }446447 fn check_nesting(448 &self,449 _sender: <T>::CrossAccountId,450 _from: (CollectionId, TokenId),451 _under: TokenId,452 _nesting_budget: &dyn Budget,453 ) -> sp_runtime::DispatchResult {454 fail!(<Error<T>>::RefungibleDisallowsNesting)455 }456457 fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}458459 fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}460461 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {462 <Owned<T>>::iter_prefix((self.id, account))463 .map(|(id, _)| id)464 .collect()465 }466467 fn collection_tokens(&self) -> Vec<TokenId> {468 <TotalSupply<T>>::iter_prefix((self.id,))469 .map(|(id, _)| id)470 .collect()471 }472473 fn token_exists(&self, token: TokenId) -> bool {474 <Pallet<T>>::token_exists(self, token)475 }476477 fn last_token_id(&self) -> TokenId {478 TokenId(<TokensMinted<T>>::get(self.id))479 }480481 fn token_owner(&self, token: TokenId) -> Result<T::CrossAccountId, TokenOwnerError> {482 <Pallet<T>>::token_owner(self.id, token)483 }484485 /// Returns 10 token in no particular order.486 fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {487 <Pallet<T>>::token_owners(self.id, token).unwrap_or_default()488 }489490 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {491 <Pallet<T>>::token_properties((self.id, token_id))492 .get(key)493 .cloned()494 }495496 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {497 let properties = <Pallet<T>>::token_properties((self.id, token_id));498499 keys.map(|keys| {500 keys.into_iter()501 .filter_map(|key| {502 properties.get(&key).map(|value| Property {503 key,504 value: value.clone(),505 })506 })507 .collect()508 })509 .unwrap_or_else(|| {510 properties511 .into_iter()512 .map(|(key, value)| Property { key, value })513 .collect()514 })515 }516517 fn total_supply(&self) -> u32 {518 <Pallet<T>>::total_supply(self)519 }520521 fn account_balance(&self, account: T::CrossAccountId) -> u32 {522 <AccountBalance<T>>::get((self.id, account))523 }524525 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {526 <Balance<T>>::get((self.id, token, account))527 }528529 fn allowance(530 &self,531 sender: T::CrossAccountId,532 spender: T::CrossAccountId,533 token: TokenId,534 ) -> u128 {535 <Allowance<T>>::get((self.id, token, sender, spender))536 }537538 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {539 Some(self)540 }541542 fn total_pieces(&self, token: TokenId) -> Option<u128> {543 <Pallet<T>>::total_pieces(self.id, token)544 }545546 fn set_allowance_for_all(547 &self,548 owner: T::CrossAccountId,549 operator: T::CrossAccountId,550 approve: bool,551 ) -> DispatchResultWithPostInfo {552 with_weight(553 <Pallet<T>>::set_allowance_for_all(self, &owner, &operator, approve),554 <CommonWeights<T>>::set_allowance_for_all(),555 )556 }557558 fn allowance_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool {559 <Pallet<T>>::allowance_for_all(self, &owner, &operator)560 }561562 fn repair_item(&self, token: TokenId) -> DispatchResultWithPostInfo {563 with_weight(564 <Pallet<T>>::repair_item(self, token),565 <CommonWeights<T>>::force_repair_item(),566 )567 }568}569570impl<T: Config> RefungibleExtensions<T> for RefungibleHandle<T> {571 fn repartition(572 &self,573 owner: &T::CrossAccountId,574 token: TokenId,575 amount: u128,576 ) -> DispatchResultWithPostInfo {577 with_weight(578 <Pallet<T>>::repartition(self, owner, token, amount),579 <SelfWeightOf<T>>::repartition_item(),580 )581 }582}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 sp_std::collections::btree_map::BTreeMap;20use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};21use up_data_structs::{22 CollectionId, TokenId, CreateItemExData, budget::Budget, Property, PropertyKey, PropertyValue,23 PropertyKeyPermission, CollectionPropertiesVec, CreateRefungibleExMultipleOwners,24 CreateRefungibleExSingleOwner, TokenOwnerError,25};26use pallet_common::{27 CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight,28 weights::WeightInfo as _,29};30use pallet_structure::Error as StructureError;31use sp_runtime::{DispatchError};32use sp_std::{vec::Vec, vec};3334use crate::{35 AccountBalance, Allowance, Balance, Config, Error, Owned, Pallet, RefungibleHandle,36 SelfWeightOf, weights::WeightInfo, TokensMinted, TotalSupply, CreateItemData,37};3839macro_rules! max_weight_of {40 ($($method:ident ($($args:tt)*)),*) => {41 Weight::zero()42 $(43 .max(<SelfWeightOf<T>>::$method($($args)*))44 )*45 };46}4748fn properties_weight<T: Config>(properties: &CollectionPropertiesVec) -> Weight {49 if properties.len() > 0 {50 <CommonWeights<T>>::set_token_properties(properties.len() as u32)51 } else {52 Weight::zero()53 }54}5556pub struct CommonWeights<T: Config>(PhantomData<T>);57impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {58 fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {59 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32).saturating_add(60 data.iter()61 .map(|data| match data {62 up_data_structs::CreateItemData::ReFungible(rft_data) => {63 properties_weight::<T>(&rft_data.properties)64 }65 _ => Weight::zero(),66 })67 .fold(Weight::zero(), |a, b| a.saturating_add(b)),68 )69 }7071 fn create_multiple_items_ex(call: &CreateItemExData<T::CrossAccountId>) -> Weight {72 match call {73 CreateItemExData::RefungibleMultipleOwners(i) => {74 <SelfWeightOf<T>>::create_multiple_items_ex_multiple_owners(i.users.len() as u32)75 .saturating_add(properties_weight::<T>(&i.properties))76 }77 CreateItemExData::RefungibleMultipleItems(i) => {78 <SelfWeightOf<T>>::create_multiple_items_ex_multiple_items(i.len() as u32)79 .saturating_add(80 i.iter()81 .map(|d| properties_weight::<T>(&d.properties))82 .fold(Weight::zero(), |a, b| a.saturating_add(b)),83 )84 }85 _ => Weight::zero(),86 }87 }8889 fn burn_item() -> Weight {90 max_weight_of!(burn_item_partial(), burn_item_fully())91 }9293 fn set_collection_properties(amount: u32) -> Weight {94 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)95 }9697 fn delete_collection_properties(amount: u32) -> Weight {98 <pallet_common::SelfWeightOf<T>>::delete_collection_properties(amount)99 }100101 fn set_token_properties(amount: u32) -> Weight {102 <SelfWeightOf<T>>::set_token_properties(amount)103 }104105 fn delete_token_properties(amount: u32) -> Weight {106 <SelfWeightOf<T>>::delete_token_properties(amount)107 }108109 fn set_token_property_permissions(amount: u32) -> Weight {110 <SelfWeightOf<T>>::set_token_property_permissions(amount)111 }112113 fn transfer() -> Weight {114 max_weight_of!(115 transfer_normal(),116 transfer_creating(),117 transfer_removing(),118 transfer_creating_removing()119 )120 }121122 fn approve() -> Weight {123 <SelfWeightOf<T>>::approve()124 }125126 fn approve_from() -> Weight {127 <SelfWeightOf<T>>::approve_from()128 }129130 fn transfer_from() -> Weight {131 max_weight_of!(132 transfer_from_normal(),133 transfer_from_creating(),134 transfer_from_removing(),135 transfer_from_creating_removing()136 )137 }138139 fn burn_from() -> Weight {140 <SelfWeightOf<T>>::burn_from()141 }142143 fn burn_recursively_self_raw() -> Weight {144 // Read to get total balance145 Self::burn_item() + T::DbWeight::get().reads(1)146 }147 fn burn_recursively_breadth_raw(_amount: u32) -> Weight {148 // Refungible token can't have children149 Weight::zero()150 }151152 fn token_owner() -> Weight {153 <SelfWeightOf<T>>::token_owner()154 }155156 fn set_allowance_for_all() -> Weight {157 <SelfWeightOf<T>>::set_allowance_for_all()158 }159160 fn force_repair_item() -> Weight {161 <SelfWeightOf<T>>::repair_item()162 }163}164165fn map_create_data<T: Config>(166 data: up_data_structs::CreateItemData,167 to: &T::CrossAccountId,168) -> Result<CreateItemData<T>, DispatchError> {169 match data {170 up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateItemData::<T> {171 users: {172 let mut out = BTreeMap::new();173 out.insert(to.clone(), data.pieces);174 out.try_into().expect("limit > 0")175 },176 properties: data.properties,177 }),178 _ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),179 }180}181182/// Implementation of `CommonCollectionOperations` for `RefungibleHandle`. It wraps Refungible Pallete183/// methods and adds weight info.184impl<T: Config> CommonCollectionOperations<T> for RefungibleHandle<T> {185 fn create_item(186 &self,187 sender: T::CrossAccountId,188 to: T::CrossAccountId,189 data: up_data_structs::CreateItemData,190 nesting_budget: &dyn Budget,191 ) -> DispatchResultWithPostInfo {192 let weight = <CommonWeights<T>>::create_item(&data);193 with_weight(194 <Pallet<T>>::create_item(195 self,196 &sender,197 map_create_data::<T>(data, &to)?,198 nesting_budget,199 ),200 weight,201 )202 }203204 fn create_multiple_items(205 &self,206 sender: T::CrossAccountId,207 to: T::CrossAccountId,208 data: Vec<up_data_structs::CreateItemData>,209 nesting_budget: &dyn Budget,210 ) -> DispatchResultWithPostInfo {211 let weight = <CommonWeights<T>>::create_multiple_items(&data);212 let data = data213 .into_iter()214 .map(|d| map_create_data::<T>(d, &to))215 .collect::<Result<Vec<_>, DispatchError>>()?;216217 with_weight(218 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),219 weight,220 )221 }222223 fn create_multiple_items_ex(224 &self,225 sender: <T>::CrossAccountId,226 data: CreateItemExData<T::CrossAccountId>,227 nesting_budget: &dyn Budget,228 ) -> DispatchResultWithPostInfo {229 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);230 let data = match data {231 CreateItemExData::RefungibleMultipleOwners(CreateRefungibleExMultipleOwners {232 users,233 properties,234 }) => vec![CreateItemData::<T> { users, properties }],235 CreateItemExData::RefungibleMultipleItems(r) => r236 .into_inner()237 .into_iter()238 .map(239 |CreateRefungibleExSingleOwner {240 user,241 pieces,242 properties,243 }| CreateItemData::<T> {244 users: BTreeMap::from([(user, pieces)])245 .try_into()246 .expect("limit >= 1"),247 properties,248 },249 )250 .collect(),251 _ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),252 };253254 with_weight(255 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),256 weight,257 )258 }259260 fn burn_item(261 &self,262 sender: T::CrossAccountId,263 token: TokenId,264 amount: u128,265 ) -> DispatchResultWithPostInfo {266 with_weight(267 <Pallet<T>>::burn(self, &sender, token, amount),268 <CommonWeights<T>>::burn_item(),269 )270 }271272 fn burn_item_recursively(273 &self,274 sender: T::CrossAccountId,275 token: TokenId,276 self_budget: &dyn Budget,277 _breadth_budget: &dyn Budget,278 ) -> DispatchResultWithPostInfo {279 ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);280 with_weight(281 <Pallet<T>>::burn(282 self,283 &sender,284 token,285 <Balance<T>>::get((self.id, token, &sender)),286 ),287 <CommonWeights<T>>::burn_recursively_self_raw(),288 )289 }290291 fn transfer(292 &self,293 from: T::CrossAccountId,294 to: T::CrossAccountId,295 token: TokenId,296 amount: u128,297 nesting_budget: &dyn Budget,298 ) -> DispatchResultWithPostInfo {299 with_weight(300 <Pallet<T>>::transfer(self, &from, &to, token, amount, nesting_budget),301 <CommonWeights<T>>::transfer(),302 )303 }304305 fn approve(306 &self,307 sender: T::CrossAccountId,308 spender: T::CrossAccountId,309 token: TokenId,310 amount: u128,311 ) -> DispatchResultWithPostInfo {312 with_weight(313 <Pallet<T>>::set_allowance(self, &sender, &spender, token, amount),314 <CommonWeights<T>>::approve(),315 )316 }317318 fn approve_from(319 &self,320 sender: T::CrossAccountId,321 from: T::CrossAccountId,322 to: T::CrossAccountId,323 token_id: TokenId,324 amount: u128,325 ) -> DispatchResultWithPostInfo {326 with_weight(327 <Pallet<T>>::set_allowance_from(self, &sender, &from, &to, token_id, amount),328 <CommonWeights<T>>::approve_from(),329 )330 }331332 fn transfer_from(333 &self,334 sender: T::CrossAccountId,335 from: T::CrossAccountId,336 to: T::CrossAccountId,337 token: TokenId,338 amount: u128,339 nesting_budget: &dyn Budget,340 ) -> DispatchResultWithPostInfo {341 with_weight(342 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, amount, nesting_budget),343 <CommonWeights<T>>::transfer_from(),344 )345 }346347 fn burn_from(348 &self,349 sender: T::CrossAccountId,350 from: T::CrossAccountId,351 token: TokenId,352 amount: u128,353 nesting_budget: &dyn Budget,354 ) -> DispatchResultWithPostInfo {355 with_weight(356 <Pallet<T>>::burn_from(self, &sender, &from, token, amount, nesting_budget),357 <CommonWeights<T>>::burn_from(),358 )359 }360361 fn set_collection_properties(362 &self,363 sender: T::CrossAccountId,364 properties: Vec<Property>,365 ) -> DispatchResultWithPostInfo {366 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);367368 with_weight(369 <Pallet<T>>::set_collection_properties(self, &sender, properties),370 weight,371 )372 }373374 fn delete_collection_properties(375 &self,376 sender: &T::CrossAccountId,377 property_keys: Vec<PropertyKey>,378 ) -> DispatchResultWithPostInfo {379 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);380381 with_weight(382 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),383 weight,384 )385 }386387 fn set_token_properties(388 &self,389 sender: T::CrossAccountId,390 token_id: TokenId,391 properties: Vec<Property>,392 nesting_budget: &dyn Budget,393 ) -> DispatchResultWithPostInfo {394 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);395396 with_weight(397 <Pallet<T>>::set_token_properties(398 self,399 &sender,400 token_id,401 properties.into_iter(),402 false,403 nesting_budget,404 ),405 weight,406 )407 }408409 fn set_token_property_permissions(410 &self,411 sender: &T::CrossAccountId,412 property_permissions: Vec<PropertyKeyPermission>,413 ) -> DispatchResultWithPostInfo {414 let weight =415 <CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);416417 with_weight(418 <Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),419 weight,420 )421 }422423 fn delete_token_properties(424 &self,425 sender: T::CrossAccountId,426 token_id: TokenId,427 property_keys: Vec<PropertyKey>,428 nesting_budget: &dyn Budget,429 ) -> DispatchResultWithPostInfo {430 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);431432 with_weight(433 <Pallet<T>>::delete_token_properties(434 self,435 &sender,436 token_id,437 property_keys.into_iter(),438 nesting_budget,439 ),440 weight,441 )442 }443444 fn check_nesting(445 &self,446 _sender: <T>::CrossAccountId,447 _from: (CollectionId, TokenId),448 _under: TokenId,449 _nesting_budget: &dyn Budget,450 ) -> sp_runtime::DispatchResult {451 fail!(<Error<T>>::RefungibleDisallowsNesting)452 }453454 fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}455456 fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}457458 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {459 <Owned<T>>::iter_prefix((self.id, account))460 .map(|(id, _)| id)461 .collect()462 }463464 fn collection_tokens(&self) -> Vec<TokenId> {465 <TotalSupply<T>>::iter_prefix((self.id,))466 .map(|(id, _)| id)467 .collect()468 }469470 fn token_exists(&self, token: TokenId) -> bool {471 <Pallet<T>>::token_exists(self, token)472 }473474 fn last_token_id(&self) -> TokenId {475 TokenId(<TokensMinted<T>>::get(self.id))476 }477478 fn token_owner(&self, token: TokenId) -> Result<T::CrossAccountId, TokenOwnerError> {479 <Pallet<T>>::token_owner(self.id, token)480 }481482 /// Returns 10 token in no particular order.483 fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {484 <Pallet<T>>::token_owners(self.id, token).unwrap_or_default()485 }486487 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {488 <Pallet<T>>::token_properties((self.id, token_id))489 .get(key)490 .cloned()491 }492493 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {494 let properties = <Pallet<T>>::token_properties((self.id, token_id));495496 keys.map(|keys| {497 keys.into_iter()498 .filter_map(|key| {499 properties.get(&key).map(|value| Property {500 key,501 value: value.clone(),502 })503 })504 .collect()505 })506 .unwrap_or_else(|| {507 properties508 .into_iter()509 .map(|(key, value)| Property { key, value })510 .collect()511 })512 }513514 fn total_supply(&self) -> u32 {515 <Pallet<T>>::total_supply(self)516 }517518 fn account_balance(&self, account: T::CrossAccountId) -> u32 {519 <AccountBalance<T>>::get((self.id, account))520 }521522 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {523 <Balance<T>>::get((self.id, token, account))524 }525526 fn allowance(527 &self,528 sender: T::CrossAccountId,529 spender: T::CrossAccountId,530 token: TokenId,531 ) -> u128 {532 <Allowance<T>>::get((self.id, token, sender, spender))533 }534535 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {536 Some(self)537 }538539 fn total_pieces(&self, token: TokenId) -> Option<u128> {540 <Pallet<T>>::total_pieces(self.id, token)541 }542543 fn set_allowance_for_all(544 &self,545 owner: T::CrossAccountId,546 operator: T::CrossAccountId,547 approve: bool,548 ) -> DispatchResultWithPostInfo {549 with_weight(550 <Pallet<T>>::set_allowance_for_all(self, &owner, &operator, approve),551 <CommonWeights<T>>::set_allowance_for_all(),552 )553 }554555 fn allowance_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool {556 <Pallet<T>>::allowance_for_all(self, &owner, &operator)557 }558559 fn repair_item(&self, token: TokenId) -> DispatchResultWithPostInfo {560 with_weight(561 <Pallet<T>>::repair_item(self, token),562 <CommonWeights<T>>::force_repair_item(),563 )564 }565}566567impl<T: Config> RefungibleExtensions<T> for RefungibleHandle<T> {568 fn repartition(569 &self,570 owner: &T::CrossAccountId,571 token: TokenId,572 amount: u128,573 ) -> DispatchResultWithPostInfo {574 with_weight(575 <Pallet<T>>::repartition(self, owner, token, amount),576 <SelfWeightOf<T>>::repartition_item(),577 )578 }579}pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -629,7 +629,7 @@
/// @param tokenUri Token URI that would be stored in the NFT properties
/// @return uint256 The id of the newly minted token
#[solidity(rename_selector = "mintWithTokenURI")]
- #[weight(<SelfWeightOf<T>>::create_item())]
+ #[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(1))]
fn mint_with_token_uri(
&mut self,
caller: Caller,
@@ -651,7 +651,7 @@
/// @param tokenId ID of the minted RFT
/// @param tokenUri Token URI that would be stored in the RFT properties
#[solidity(hide, rename_selector = "mintWithTokenURI")]
- #[weight(<SelfWeightOf<T>>::create_item())]
+ #[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(1))]
fn mint_with_token_uri_check_id(
&mut self,
caller: Caller,
@@ -994,7 +994,7 @@
/// @param to The new owner
/// @param tokens array of pairs of token ID and token URI for minted tokens
#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]
- #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]
+ #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32) + <SelfWeightOf<T>>::set_token_properties(tokens.len() as u32))]
fn mint_bulk_with_token_uri(
&mut self,
caller: Caller,
@@ -1051,7 +1051,7 @@
/// @param to The new owner crossAccountId
/// @param properties Properties of minted token
/// @return uint256 The id of the newly minted token
- #[weight(<SelfWeightOf<T>>::create_item())]
+ #[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]
fn mint_cross(
&mut self,
caller: Caller,
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -518,7 +518,7 @@
/// * `collection_id`: ID of the collection to which an item would belong.
/// * `owner`: Address of the initial owner of the item.
/// * `data`: Token data describing the item to store on chain.
- #[weight = T::CommonWeightInfo::create_item()]
+ #[weight = T::CommonWeightInfo::create_item(&data)]
pub fn create_item(origin, collection_id: CollectionId, owner: T::CrossAccountId, data: CreateItemData) -> DispatchResultWithPostInfo {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let budget = budget::Value::new(NESTING_BUDGET);
runtime/common/weights.rsdiffbeforeafterboth--- a/runtime/common/weights.rs
+++ b/runtime/common/weights.rs
@@ -57,8 +57,8 @@
where
T: CommonWeightConfigs,
{
- fn create_item() -> Weight {
- dispatch_weight::<T>() + max_weight_of!(create_item())
+ fn create_item(data: &CreateItemData) -> Weight {
+ dispatch_weight::<T>() + max_weight_of!(create_item(data))
}
fn create_multiple_items(data: &[CreateItemData]) -> Weight {