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.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};20use up_data_structs::{21 TokenId, CreateItemExData, CollectionId, budget::Budget, Property, PropertyKey,22 PropertyKeyPermission, PropertyValue, TokenOwnerError,23};24use pallet_common::{25 CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight,26 weights::WeightInfo as _,27};28use sp_runtime::DispatchError;29use sp_std::{vec::Vec, vec};3031use crate::{32 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,33 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,34};3536pub struct CommonWeights<T: Config>(PhantomData<T>);37impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {38 fn create_item() -> Weight {39 <SelfWeightOf<T>>::create_item()40 }4142 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {43 match data {44 CreateItemExData::NFT(t) => {45 <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32)46 + t.iter()47 .filter_map(|t| {48 if t.properties.len() > 0 {49 Some(Self::set_token_properties(t.properties.len() as u32))50 } else {51 None52 }53 })54 .fold(Weight::zero(), |a, b| a.saturating_add(b))55 }56 _ => Weight::zero(),57 }58 }5960 fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {61 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32)62 + data63 .iter()64 .filter_map(|t| match t {65 up_data_structs::CreateItemData::NFT(n) if n.properties.len() > 0 => {66 Some(Self::set_token_properties(n.properties.len() as u32))67 }68 _ => None,69 })70 .fold(Weight::zero(), |a, b| a.saturating_add(b))71 }7273 fn burn_item() -> Weight {74 <SelfWeightOf<T>>::burn_item()75 }7677 fn set_collection_properties(amount: u32) -> Weight {78 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)79 }8081 fn delete_collection_properties(amount: u32) -> Weight {82 <pallet_common::SelfWeightOf<T>>::delete_collection_properties(amount)83 }8485 fn set_token_properties(amount: u32) -> Weight {86 <SelfWeightOf<T>>::set_token_properties(amount)87 }8889 fn delete_token_properties(amount: u32) -> Weight {90 <SelfWeightOf<T>>::delete_token_properties(amount)91 }9293 fn set_token_property_permissions(amount: u32) -> Weight {94 <SelfWeightOf<T>>::set_token_property_permissions(amount)95 }9697 fn transfer() -> Weight {98 <SelfWeightOf<T>>::transfer()99 }100101 fn approve() -> Weight {102 <SelfWeightOf<T>>::approve()103 }104105 fn approve_from() -> Weight {106 <SelfWeightOf<T>>::approve_from()107 }108109 fn transfer_from() -> Weight {110 <SelfWeightOf<T>>::transfer_from()111 }112113 fn burn_from() -> Weight {114 <SelfWeightOf<T>>::burn_from()115 }116117 fn burn_recursively_self_raw() -> Weight {118 <SelfWeightOf<T>>::burn_recursively_self_raw()119 }120121 fn burn_recursively_breadth_raw(amount: u32) -> Weight {122 <SelfWeightOf<T>>::burn_recursively_breadth_plus_self_plus_self_per_each_raw(amount)123 .saturating_sub(Self::burn_recursively_self_raw().saturating_mul(amount as u64 + 1))124 }125126 fn token_owner() -> Weight {127 <SelfWeightOf<T>>::token_owner()128 }129130 fn set_allowance_for_all() -> Weight {131 <SelfWeightOf<T>>::set_allowance_for_all()132 }133134 fn force_repair_item() -> Weight {135 <SelfWeightOf<T>>::repair_item()136 }137}138139fn map_create_data<T: Config>(140 data: up_data_structs::CreateItemData,141 to: &T::CrossAccountId,142) -> Result<CreateItemData<T>, DispatchError> {143 match data {144 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {145 properties: data.properties,146 owner: to.clone(),147 }),148 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),149 }150}151152/// Implementation of `CommonCollectionOperations` for `NonfungibleHandle`. It wraps Nonfungible Pallete153/// methods and adds weight info.154impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {155 fn create_item(156 &self,157 sender: T::CrossAccountId,158 to: T::CrossAccountId,159 data: up_data_structs::CreateItemData,160 nesting_budget: &dyn Budget,161 ) -> DispatchResultWithPostInfo {162 with_weight(163 <Pallet<T>>::create_item(164 self,165 &sender,166 map_create_data::<T>(data, &to)?,167 nesting_budget,168 ),169 <CommonWeights<T>>::create_item(),170 )171 }172173 fn create_multiple_items(174 &self,175 sender: T::CrossAccountId,176 to: T::CrossAccountId,177 data: Vec<up_data_structs::CreateItemData>,178 nesting_budget: &dyn Budget,179 ) -> DispatchResultWithPostInfo {180 let weight = <CommonWeights<T>>::create_multiple_items(&data);181 let data = data182 .into_iter()183 .map(|d| map_create_data::<T>(d, &to))184 .collect::<Result<Vec<_>, DispatchError>>()?;185186 with_weight(187 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),188 weight,189 )190 }191192 fn create_multiple_items_ex(193 &self,194 sender: <T>::CrossAccountId,195 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,196 nesting_budget: &dyn Budget,197 ) -> DispatchResultWithPostInfo {198 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);199 let data = match data {200 up_data_structs::CreateItemExData::NFT(nft) => nft,201 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),202 };203204 with_weight(205 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),206 weight,207 )208 }209210 fn set_collection_properties(211 &self,212 sender: T::CrossAccountId,213 properties: Vec<Property>,214 ) -> DispatchResultWithPostInfo {215 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);216217 with_weight(218 <Pallet<T>>::set_collection_properties(self, &sender, properties),219 weight,220 )221 }222223 fn delete_collection_properties(224 &self,225 sender: &T::CrossAccountId,226 property_keys: Vec<PropertyKey>,227 ) -> DispatchResultWithPostInfo {228 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);229230 with_weight(231 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),232 weight,233 )234 }235236 fn set_token_properties(237 &self,238 sender: T::CrossAccountId,239 token_id: TokenId,240 properties: Vec<Property>,241 nesting_budget: &dyn Budget,242 ) -> DispatchResultWithPostInfo {243 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);244245 with_weight(246 <Pallet<T>>::set_token_properties(247 self,248 &sender,249 token_id,250 properties.into_iter(),251 false,252 nesting_budget,253 ),254 weight,255 )256 }257258 fn delete_token_properties(259 &self,260 sender: T::CrossAccountId,261 token_id: TokenId,262 property_keys: Vec<PropertyKey>,263 nesting_budget: &dyn Budget,264 ) -> DispatchResultWithPostInfo {265 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);266267 with_weight(268 <Pallet<T>>::delete_token_properties(269 self,270 &sender,271 token_id,272 property_keys.into_iter(),273 nesting_budget,274 ),275 weight,276 )277 }278279 fn set_token_property_permissions(280 &self,281 sender: &T::CrossAccountId,282 property_permissions: Vec<PropertyKeyPermission>,283 ) -> DispatchResultWithPostInfo {284 let weight =285 <CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);286287 with_weight(288 <Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),289 weight,290 )291 }292293 fn burn_item(294 &self,295 sender: T::CrossAccountId,296 token: TokenId,297 amount: u128,298 ) -> DispatchResultWithPostInfo {299 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);300 if amount == 1 {301 with_weight(302 <Pallet<T>>::burn(self, &sender, token),303 <CommonWeights<T>>::burn_item(),304 )305 } else {306 <Pallet<T>>::check_token_immediate_ownership(self, token, &sender)?;307 Ok(().into())308 }309 }310311 fn burn_item_recursively(312 &self,313 sender: T::CrossAccountId,314 token: TokenId,315 self_budget: &dyn Budget,316 breadth_budget: &dyn Budget,317 ) -> DispatchResultWithPostInfo {318 <Pallet<T>>::burn_recursively(self, &sender, token, self_budget, breadth_budget)319 }320321 fn transfer(322 &self,323 from: T::CrossAccountId,324 to: T::CrossAccountId,325 token: TokenId,326 amount: u128,327 nesting_budget: &dyn Budget,328 ) -> DispatchResultWithPostInfo {329 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);330 if amount == 1 {331 with_weight(332 <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),333 <CommonWeights<T>>::transfer(),334 )335 } else {336 <Pallet<T>>::check_token_immediate_ownership(self, token, &from)?;337 Ok(().into())338 }339 }340341 fn approve(342 &self,343 sender: T::CrossAccountId,344 spender: T::CrossAccountId,345 token: TokenId,346 amount: u128,347 ) -> DispatchResultWithPostInfo {348 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);349350 with_weight(351 if amount == 1 {352 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))353 } else {354 <Pallet<T>>::set_allowance(self, &sender, token, None)355 },356 <CommonWeights<T>>::approve(),357 )358 }359360 fn approve_from(361 &self,362 sender: T::CrossAccountId,363 from: T::CrossAccountId,364 to: T::CrossAccountId,365 token: TokenId,366 amount: u128,367 ) -> DispatchResultWithPostInfo {368 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);369370 with_weight(371 if amount == 1 {372 <Pallet<T>>::set_allowance_from(self, &sender, &from, token, Some(&to))373 } else {374 <Pallet<T>>::set_allowance_from(self, &sender, &from, token, None)375 },376 <CommonWeights<T>>::approve_from(),377 )378 }379380 fn transfer_from(381 &self,382 sender: T::CrossAccountId,383 from: T::CrossAccountId,384 to: T::CrossAccountId,385 token: TokenId,386 amount: u128,387 nesting_budget: &dyn Budget,388 ) -> DispatchResultWithPostInfo {389 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);390391 if amount == 1 {392 with_weight(393 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),394 <CommonWeights<T>>::transfer_from(),395 )396 } else {397 <Pallet<T>>::check_allowed(self, &sender, &from, token, nesting_budget)?;398399 Ok(().into())400 }401 }402403 fn burn_from(404 &self,405 sender: T::CrossAccountId,406 from: T::CrossAccountId,407 token: TokenId,408 amount: u128,409 nesting_budget: &dyn Budget,410 ) -> DispatchResultWithPostInfo {411 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);412413 if amount == 1 {414 with_weight(415 <Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),416 <CommonWeights<T>>::burn_from(),417 )418 } else {419 <Pallet<T>>::check_allowed(self, &sender, &from, token, nesting_budget)?;420421 Ok(().into())422 }423 }424425 fn check_nesting(426 &self,427 sender: T::CrossAccountId,428 from: (CollectionId, TokenId),429 under: TokenId,430 nesting_budget: &dyn Budget,431 ) -> sp_runtime::DispatchResult {432 <Pallet<T>>::check_nesting(self, sender, from, under, nesting_budget)433 }434435 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {436 <Pallet<T>>::nest((self.id, under), to_nest);437 }438439 fn unnest(&self, under: TokenId, to_unnest: (CollectionId, TokenId)) {440 <Pallet<T>>::unnest((self.id, under), to_unnest);441 }442443 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {444 <Owned<T>>::iter_prefix((self.id, account))445 .map(|(id, _)| id)446 .collect()447 }448449 fn collection_tokens(&self) -> Vec<TokenId> {450 <TokenData<T>>::iter_prefix((self.id,))451 .map(|(id, _)| id)452 .collect()453 }454455 fn token_exists(&self, token: TokenId) -> bool {456 <Pallet<T>>::token_exists(self, token)457 }458459 fn last_token_id(&self) -> TokenId {460 TokenId(<TokensMinted<T>>::get(self.id))461 }462463 fn token_owner(&self, token: TokenId) -> Result<T::CrossAccountId, TokenOwnerError> {464 <TokenData<T>>::get((self.id, token))465 .map(|t| t.owner)466 .ok_or(TokenOwnerError::NotFound)467 }468469 /// Returns token owners.470 fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {471 self.token_owner(token).map_or_else(|_| vec![], |t| vec![t])472 }473474 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {475 <Pallet<T>>::token_properties((self.id, token_id))476 .get(key)477 .cloned()478 }479480 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {481 let properties = <Pallet<T>>::token_properties((self.id, token_id));482483 keys.map(|keys| {484 keys.into_iter()485 .filter_map(|key| {486 properties.get(&key).map(|value| Property {487 key,488 value: value.clone(),489 })490 })491 .collect()492 })493 .unwrap_or_else(|| {494 properties495 .into_iter()496 .map(|(key, value)| Property { key, value })497 .collect()498 })499 }500501 fn total_supply(&self) -> u32 {502 <Pallet<T>>::total_supply(self)503 }504505 fn account_balance(&self, account: T::CrossAccountId) -> u32 {506 <AccountBalance<T>>::get((self.id, account))507 }508509 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {510 if <TokenData<T>>::get((self.id, token))511 .map(|a| a.owner == account)512 .unwrap_or(false)513 {514 1515 } else {516 0517 }518 }519520 fn allowance(521 &self,522 sender: T::CrossAccountId,523 spender: T::CrossAccountId,524 token: TokenId,525 ) -> u128 {526 if <TokenData<T>>::get((self.id, token))527 .map(|a| a.owner != sender)528 .unwrap_or(true)529 {530 0531 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {532 1533 } else {534 0535 }536 }537538 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {539 None540 }541542 fn total_pieces(&self, token: TokenId) -> Option<u128> {543 if <TokenData<T>>::contains_key((self.id, token)) {544 Some(1)545 } else {546 None547 }548 }549550 fn set_allowance_for_all(551 &self,552 owner: T::CrossAccountId,553 operator: T::CrossAccountId,554 approve: bool,555 ) -> DispatchResultWithPostInfo {556 with_weight(557 <Pallet<T>>::set_allowance_for_all(self, &owner, &operator, approve),558 <CommonWeights<T>>::set_allowance_for_all(),559 )560 }561562 fn allowance_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool {563 <Pallet<T>>::allowance_for_all(self, &owner, &operator)564 }565566 fn repair_item(&self, token: TokenId) -> DispatchResultWithPostInfo {567 with_weight(568 <Pallet<T>>::repair_item(self, token),569 <CommonWeights<T>>::force_repair_item(),570 )571 }572}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};20use up_data_structs::{21 TokenId, CreateItemExData, CollectionId, budget::Budget, Property, PropertyKey,22 PropertyKeyPermission, PropertyValue, TokenOwnerError,23};24use pallet_common::{25 CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight,26 weights::WeightInfo as _,27};28use sp_runtime::DispatchError;29use sp_std::{vec::Vec, vec};3031use crate::{32 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,33 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,34};3536pub struct CommonWeights<T: Config>(PhantomData<T>);37impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {38 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {39 match data {40 CreateItemExData::NFT(t) => {41 <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32)42 + t.iter()43 .filter_map(|t| {44 if t.properties.len() > 0 {45 Some(Self::set_token_properties(t.properties.len() as u32))46 } else {47 None48 }49 })50 .fold(Weight::zero(), |a, b| a.saturating_add(b))51 }52 _ => Weight::zero(),53 }54 }5556 fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {57 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32)58 + data59 .iter()60 .filter_map(|t| match t {61 up_data_structs::CreateItemData::NFT(n) if n.properties.len() > 0 => {62 Some(Self::set_token_properties(n.properties.len() as u32))63 }64 _ => None,65 })66 .fold(Weight::zero(), |a, b| a.saturating_add(b))67 }6869 fn burn_item() -> Weight {70 <SelfWeightOf<T>>::burn_item()71 }7273 fn set_collection_properties(amount: u32) -> Weight {74 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)75 }7677 fn delete_collection_properties(amount: u32) -> Weight {78 <pallet_common::SelfWeightOf<T>>::delete_collection_properties(amount)79 }8081 fn set_token_properties(amount: u32) -> Weight {82 <SelfWeightOf<T>>::set_token_properties(amount)83 }8485 fn delete_token_properties(amount: u32) -> Weight {86 <SelfWeightOf<T>>::delete_token_properties(amount)87 }8889 fn set_token_property_permissions(amount: u32) -> Weight {90 <SelfWeightOf<T>>::set_token_property_permissions(amount)91 }9293 fn transfer() -> Weight {94 <SelfWeightOf<T>>::transfer()95 }9697 fn approve() -> Weight {98 <SelfWeightOf<T>>::approve()99 }100101 fn approve_from() -> Weight {102 <SelfWeightOf<T>>::approve_from()103 }104105 fn transfer_from() -> Weight {106 <SelfWeightOf<T>>::transfer_from()107 }108109 fn burn_from() -> Weight {110 <SelfWeightOf<T>>::burn_from()111 }112113 fn burn_recursively_self_raw() -> Weight {114 <SelfWeightOf<T>>::burn_recursively_self_raw()115 }116117 fn burn_recursively_breadth_raw(amount: u32) -> Weight {118 <SelfWeightOf<T>>::burn_recursively_breadth_plus_self_plus_self_per_each_raw(amount)119 .saturating_sub(Self::burn_recursively_self_raw().saturating_mul(amount as u64 + 1))120 }121122 fn token_owner() -> Weight {123 <SelfWeightOf<T>>::token_owner()124 }125126 fn set_allowance_for_all() -> Weight {127 <SelfWeightOf<T>>::set_allowance_for_all()128 }129130 fn force_repair_item() -> Weight {131 <SelfWeightOf<T>>::repair_item()132 }133}134135fn map_create_data<T: Config>(136 data: up_data_structs::CreateItemData,137 to: &T::CrossAccountId,138) -> Result<CreateItemData<T>, DispatchError> {139 match data {140 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {141 properties: data.properties,142 owner: to.clone(),143 }),144 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),145 }146}147148/// Implementation of `CommonCollectionOperations` for `NonfungibleHandle`. It wraps Nonfungible Pallete149/// methods and adds weight info.150impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {151 fn create_item(152 &self,153 sender: T::CrossAccountId,154 to: T::CrossAccountId,155 data: up_data_structs::CreateItemData,156 nesting_budget: &dyn Budget,157 ) -> DispatchResultWithPostInfo {158 let weight = <CommonWeights<T>>::create_item(&data);159 with_weight(160 <Pallet<T>>::create_item(161 self,162 &sender,163 map_create_data::<T>(data, &to)?,164 nesting_budget,165 ),166 weight,167 )168 }169170 fn create_multiple_items(171 &self,172 sender: T::CrossAccountId,173 to: T::CrossAccountId,174 data: Vec<up_data_structs::CreateItemData>,175 nesting_budget: &dyn Budget,176 ) -> DispatchResultWithPostInfo {177 let weight = <CommonWeights<T>>::create_multiple_items(&data);178 let data = data179 .into_iter()180 .map(|d| map_create_data::<T>(d, &to))181 .collect::<Result<Vec<_>, DispatchError>>()?;182183 with_weight(184 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),185 weight,186 )187 }188189 fn create_multiple_items_ex(190 &self,191 sender: <T>::CrossAccountId,192 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,193 nesting_budget: &dyn Budget,194 ) -> DispatchResultWithPostInfo {195 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);196 let data = match data {197 up_data_structs::CreateItemExData::NFT(nft) => nft,198 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),199 };200201 with_weight(202 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),203 weight,204 )205 }206207 fn set_collection_properties(208 &self,209 sender: T::CrossAccountId,210 properties: Vec<Property>,211 ) -> DispatchResultWithPostInfo {212 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);213214 with_weight(215 <Pallet<T>>::set_collection_properties(self, &sender, properties),216 weight,217 )218 }219220 fn delete_collection_properties(221 &self,222 sender: &T::CrossAccountId,223 property_keys: Vec<PropertyKey>,224 ) -> DispatchResultWithPostInfo {225 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);226227 with_weight(228 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),229 weight,230 )231 }232233 fn set_token_properties(234 &self,235 sender: T::CrossAccountId,236 token_id: TokenId,237 properties: Vec<Property>,238 nesting_budget: &dyn Budget,239 ) -> DispatchResultWithPostInfo {240 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);241242 with_weight(243 <Pallet<T>>::set_token_properties(244 self,245 &sender,246 token_id,247 properties.into_iter(),248 false,249 nesting_budget,250 ),251 weight,252 )253 }254255 fn delete_token_properties(256 &self,257 sender: T::CrossAccountId,258 token_id: TokenId,259 property_keys: Vec<PropertyKey>,260 nesting_budget: &dyn Budget,261 ) -> DispatchResultWithPostInfo {262 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);263264 with_weight(265 <Pallet<T>>::delete_token_properties(266 self,267 &sender,268 token_id,269 property_keys.into_iter(),270 nesting_budget,271 ),272 weight,273 )274 }275276 fn set_token_property_permissions(277 &self,278 sender: &T::CrossAccountId,279 property_permissions: Vec<PropertyKeyPermission>,280 ) -> DispatchResultWithPostInfo {281 let weight =282 <CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);283284 with_weight(285 <Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),286 weight,287 )288 }289290 fn burn_item(291 &self,292 sender: T::CrossAccountId,293 token: TokenId,294 amount: u128,295 ) -> DispatchResultWithPostInfo {296 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);297 if amount == 1 {298 with_weight(299 <Pallet<T>>::burn(self, &sender, token),300 <CommonWeights<T>>::burn_item(),301 )302 } else {303 <Pallet<T>>::check_token_immediate_ownership(self, token, &sender)?;304 Ok(().into())305 }306 }307308 fn burn_item_recursively(309 &self,310 sender: T::CrossAccountId,311 token: TokenId,312 self_budget: &dyn Budget,313 breadth_budget: &dyn Budget,314 ) -> DispatchResultWithPostInfo {315 <Pallet<T>>::burn_recursively(self, &sender, token, self_budget, breadth_budget)316 }317318 fn transfer(319 &self,320 from: T::CrossAccountId,321 to: T::CrossAccountId,322 token: TokenId,323 amount: u128,324 nesting_budget: &dyn Budget,325 ) -> DispatchResultWithPostInfo {326 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);327 if amount == 1 {328 with_weight(329 <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),330 <CommonWeights<T>>::transfer(),331 )332 } else {333 <Pallet<T>>::check_token_immediate_ownership(self, token, &from)?;334 Ok(().into())335 }336 }337338 fn approve(339 &self,340 sender: T::CrossAccountId,341 spender: T::CrossAccountId,342 token: TokenId,343 amount: u128,344 ) -> DispatchResultWithPostInfo {345 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);346347 with_weight(348 if amount == 1 {349 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))350 } else {351 <Pallet<T>>::set_allowance(self, &sender, token, None)352 },353 <CommonWeights<T>>::approve(),354 )355 }356357 fn approve_from(358 &self,359 sender: T::CrossAccountId,360 from: T::CrossAccountId,361 to: T::CrossAccountId,362 token: TokenId,363 amount: u128,364 ) -> DispatchResultWithPostInfo {365 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);366367 with_weight(368 if amount == 1 {369 <Pallet<T>>::set_allowance_from(self, &sender, &from, token, Some(&to))370 } else {371 <Pallet<T>>::set_allowance_from(self, &sender, &from, token, None)372 },373 <CommonWeights<T>>::approve_from(),374 )375 }376377 fn transfer_from(378 &self,379 sender: T::CrossAccountId,380 from: T::CrossAccountId,381 to: T::CrossAccountId,382 token: TokenId,383 amount: u128,384 nesting_budget: &dyn Budget,385 ) -> DispatchResultWithPostInfo {386 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);387388 if amount == 1 {389 with_weight(390 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),391 <CommonWeights<T>>::transfer_from(),392 )393 } else {394 <Pallet<T>>::check_allowed(self, &sender, &from, token, nesting_budget)?;395396 Ok(().into())397 }398 }399400 fn burn_from(401 &self,402 sender: T::CrossAccountId,403 from: T::CrossAccountId,404 token: TokenId,405 amount: u128,406 nesting_budget: &dyn Budget,407 ) -> DispatchResultWithPostInfo {408 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);409410 if amount == 1 {411 with_weight(412 <Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),413 <CommonWeights<T>>::burn_from(),414 )415 } else {416 <Pallet<T>>::check_allowed(self, &sender, &from, token, nesting_budget)?;417418 Ok(().into())419 }420 }421422 fn check_nesting(423 &self,424 sender: T::CrossAccountId,425 from: (CollectionId, TokenId),426 under: TokenId,427 nesting_budget: &dyn Budget,428 ) -> sp_runtime::DispatchResult {429 <Pallet<T>>::check_nesting(self, sender, from, under, nesting_budget)430 }431432 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {433 <Pallet<T>>::nest((self.id, under), to_nest);434 }435436 fn unnest(&self, under: TokenId, to_unnest: (CollectionId, TokenId)) {437 <Pallet<T>>::unnest((self.id, under), to_unnest);438 }439440 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {441 <Owned<T>>::iter_prefix((self.id, account))442 .map(|(id, _)| id)443 .collect()444 }445446 fn collection_tokens(&self) -> Vec<TokenId> {447 <TokenData<T>>::iter_prefix((self.id,))448 .map(|(id, _)| id)449 .collect()450 }451452 fn token_exists(&self, token: TokenId) -> bool {453 <Pallet<T>>::token_exists(self, token)454 }455456 fn last_token_id(&self) -> TokenId {457 TokenId(<TokensMinted<T>>::get(self.id))458 }459460 fn token_owner(&self, token: TokenId) -> Result<T::CrossAccountId, TokenOwnerError> {461 <TokenData<T>>::get((self.id, token))462 .map(|t| t.owner)463 .ok_or(TokenOwnerError::NotFound)464 }465466 /// Returns token owners.467 fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {468 self.token_owner(token).map_or_else(|_| vec![], |t| vec![t])469 }470471 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {472 <Pallet<T>>::token_properties((self.id, token_id))473 .get(key)474 .cloned()475 }476477 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {478 let properties = <Pallet<T>>::token_properties((self.id, token_id));479480 keys.map(|keys| {481 keys.into_iter()482 .filter_map(|key| {483 properties.get(&key).map(|value| Property {484 key,485 value: value.clone(),486 })487 })488 .collect()489 })490 .unwrap_or_else(|| {491 properties492 .into_iter()493 .map(|(key, value)| Property { key, value })494 .collect()495 })496 }497498 fn total_supply(&self) -> u32 {499 <Pallet<T>>::total_supply(self)500 }501502 fn account_balance(&self, account: T::CrossAccountId) -> u32 {503 <AccountBalance<T>>::get((self.id, account))504 }505506 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {507 if <TokenData<T>>::get((self.id, token))508 .map(|a| a.owner == account)509 .unwrap_or(false)510 {511 1512 } else {513 0514 }515 }516517 fn allowance(518 &self,519 sender: T::CrossAccountId,520 spender: T::CrossAccountId,521 token: TokenId,522 ) -> u128 {523 if <TokenData<T>>::get((self.id, token))524 .map(|a| a.owner != sender)525 .unwrap_or(true)526 {527 0528 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {529 1530 } else {531 0532 }533 }534535 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {536 None537 }538539 fn total_pieces(&self, token: TokenId) -> Option<u128> {540 if <TokenData<T>>::contains_key((self.id, token)) {541 Some(1)542 } else {543 None544 }545 }546547 fn set_allowance_for_all(548 &self,549 owner: T::CrossAccountId,550 operator: T::CrossAccountId,551 approve: bool,552 ) -> DispatchResultWithPostInfo {553 with_weight(554 <Pallet<T>>::set_allowance_for_all(self, &owner, &operator, approve),555 <CommonWeights<T>>::set_allowance_for_all(),556 )557 }558559 fn allowance_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool {560 <Pallet<T>>::allowance_for_all(self, &owner, &operator)561 }562563 fn repair_item(&self, token: TokenId) -> DispatchResultWithPostInfo {564 with_weight(565 <Pallet<T>>::repair_item(self, token),566 <CommonWeights<T>>::force_repair_item(),567 )568 }569}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.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -55,10 +55,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(data: &[up_data_structs::CreateItemData]) -> Weight {
<SelfWeightOf<T>>::create_multiple_items(data.len() as u32).saturating_add(
data.iter()
@@ -193,6 +189,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,
@@ -200,7 +197,7 @@
map_create_data::<T>(data, &to)?,
nesting_budget,
),
- <CommonWeights<T>>::create_item(),
+ weight,
)
}
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 {