From 59e224731e800733acc7008963550e43a447f57c Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Mon, 23 May 2022 10:03:54 +0000 Subject: [PATCH] feat: benchmark property calls --- --- a/Cargo.lock +++ b/Cargo.lock @@ -5913,6 +5913,7 @@ dependencies = [ "evm-coder", "fp-evm-mapping", + "frame-benchmarking", "frame-support", "frame-system", "pallet-evm", @@ -6649,6 +6650,7 @@ "frame-support", "frame-system", "pallet-common", + "pallet-evm", "parity-scale-codec 3.1.2", "scale-info", "sp-std", --- a/Makefile +++ b/Makefile @@ -41,6 +41,10 @@ bench-evm-migration: make _bench PALLET=evm-migration +.PHONY: bench-common +bench-common: + make _bench PALLET=common + .PHONY: bench-unique bench-unique: make _bench PALLET=unique --- a/pallets/common/Cargo.toml +++ b/pallets/common/Cargo.toml @@ -25,6 +25,7 @@ scale-info = { version = "2.0.1", default-features = false, features = [ "derive", ] } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" } [features] default = ["std"] @@ -37,4 +38,6 @@ "up-data-structs/std", "pallet-evm/std", ] -runtime-benchmarks = [] +runtime-benchmarks = [ + "frame-benchmarking" +] --- a/pallets/common/src/benchmarking.rs +++ b/pallets/common/src/benchmarking.rs @@ -15,11 +15,13 @@ // along with Unique Network. If not, see . use sp_std::vec::Vec; -use crate::{Config, CollectionHandle}; +use crate::{Config, CollectionHandle, Pallet}; +use pallet_evm::account::CrossAccountId; +use frame_benchmarking::{benchmarks, account}; use up_data_structs::{ - CollectionMode, CreateCollectionData, CollectionId, MAX_COLLECTION_NAME_LENGTH, - MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, OFFCHAIN_SCHEMA_LIMIT, - CONST_ON_CHAIN_SCHEMA_LIMIT, + CollectionMode, CreateCollectionData, CollectionId, Property, PropertyKey, PropertyValue, + MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, + OFFCHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT, MAX_PROPERTIES_PER_ITEM, }; use frame_support::{ traits::{Currency, Get}, @@ -29,6 +31,8 @@ use core::convert::TryInto; use sp_runtime::DispatchError; +const SEED: u32 = 1; + pub fn create_data() -> BoundedVec> { create_var_data::(S) } @@ -52,6 +56,22 @@ .try_into() .unwrap() } +pub fn property_key(id: usize) -> PropertyKey { + #[cfg(not(feature = "std"))] + use alloc::string::ToString; + let mut data = create_data(); + // No DerefMut available for .fill + for i in 0..data.len() { + data[i] = b'0'; + } + let bytes = id.to_string(); + let len = data.len(); + data[len - bytes.len()..].copy_from_slice(&bytes.as_bytes()); + data +} +pub fn property_value() -> PropertyValue { + create_data() +} pub fn create_collection_raw( owner: T::AccountId, @@ -83,6 +103,14 @@ .and_then(CollectionHandle::try_get) .map(cast) } +fn create_collection(owner: T::AccountId) -> Result, DispatchError> { + create_collection_raw( + owner, + CollectionMode::NFT, + |owner, data| >::init_collection(owner, data), + |h| h, + ) +} /// Helper macros, which handles all benchmarking preparation in semi-declarative way /// @@ -125,3 +153,31 @@ }; () => {} } + +benchmarks! { + set_collection_properties { + let b in 0..MAX_PROPERTIES_PER_ITEM; + bench_init!{ + owner: sub; collection: collection(owner); + owner: cross_from_sub; + }; + let props = (0..b).map(|p| Property { + key: property_key(p as usize), + value: property_value(), + }).collect::>(); + }: {>::set_collection_properties(&collection, &owner, props)?} + + delete_collection_properties { + let b in 0..MAX_PROPERTIES_PER_ITEM; + bench_init!{ + owner: sub; collection: collection(owner); + owner: cross_from_sub; + }; + let props = (0..b).map(|p| Property { + key: property_key(p as usize), + value: property_value(), + }).collect::>(); + >::set_collection_properties(&collection, &owner, props)?; + let to_delete = (0..b).map(|p| property_key(p as usize)).collect::>(); + }: {>::delete_collection_properties(&collection, &owner, to_delete)?} +} --- a/pallets/common/src/lib.rs +++ b/pallets/common/src/lib.rs @@ -16,6 +16,8 @@ #![cfg_attr(not(feature = "std"), no_std)] +extern crate alloc; + use core::ops::{Deref, DerefMut}; use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder}; use sp_std::vec::Vec; @@ -85,6 +87,9 @@ pub mod dispatch; pub mod erc; pub mod eth; +pub mod weights; + +pub type SelfWeightOf = ::WeightInfo; #[must_use = "Should call submit_logs or save, otherwise some data will be lost for evm side"] pub struct CollectionHandle { @@ -186,11 +191,13 @@ use frame_support::traits::Currency; use up_data_structs::{TokenId, mapping::TokenAddressMapping}; use scale_info::TypeInfo; + use weights::WeightInfo; #[pallet::config] pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config { + type WeightInfo: WeightInfo; type Event: IsType<::Event> + From>; type Currency: Currency; @@ -804,7 +811,7 @@ pub fn set_scoped_collection_properties( collection: &CollectionHandle, scope: PropertyScope, - properties: impl Iterator, + properties: impl Iterator, ) -> DispatchResult { CollectionProperties::::try_mutate(collection.id, |stored_properties| { stored_properties.try_scoped_set_from_iter(scope, properties) @@ -903,10 +910,11 @@ Ok(()) } - pub fn get_collection_property(collection_id: CollectionId, key: &PropertyKey) -> Option { - Self::collection_properties(collection_id) - .get(key) - .cloned() + pub fn get_collection_property( + collection_id: CollectionId, + key: &PropertyKey, + ) -> Option { + Self::collection_properties(collection_id).get(key).cloned() } pub fn bytes_keys_to_property_keys( @@ -1131,7 +1139,7 @@ /// Worst cases pub trait CommonWeightInfo { fn create_item() -> Weight; - fn create_multiple_items(amount: u32) -> Weight; + fn create_multiple_items(amount: &[CreateItemData]) -> Weight; fn create_multiple_items_ex(cost: &CreateItemExData) -> Weight; fn burn_item() -> Weight; fn set_collection_properties(amount: u32) -> Weight; --- /dev/null +++ b/pallets/common/src/weights.rs @@ -0,0 +1,79 @@ +// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs + +//! Autogenerated weights for pallet_common +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-05-23, STEPS: `50`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024 + +// Executed Command: +// target/release/unique-collator +// benchmark +// pallet +// --pallet +// pallet-common +// --wasm-execution +// compiled +// --extrinsic +// * +// --template +// .maintain/frame-weight-template.hbs +// --steps=50 +// --repeat=1 +// --heap-pages=4096 +// --output=./pallets/common/src/weights.rs + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(clippy::unnecessary_cast)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for pallet_common. +pub trait WeightInfo { + fn set_collection_properties(b: u32, ) -> Weight; + fn delete_collection_properties(b: u32, ) -> Weight; +} + +/// Weights for pallet_common using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + // Storage: Common CollectionProperties (r:1 w:1) + fn set_collection_properties(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 142_818_000 + .saturating_add((2_786_252_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + // Storage: Common CollectionProperties (r:1 w:1) + fn delete_collection_properties(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 101_087_000 + .saturating_add((2_739_521_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + // Storage: Common CollectionProperties (r:1 w:1) + fn set_collection_properties(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 142_818_000 + .saturating_add((2_786_252_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + // Storage: Common CollectionProperties (r:1 w:1) + fn delete_collection_properties(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 101_087_000 + .saturating_add((2_739_521_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } +} --- a/pallets/fungible/src/benchmarking.rs +++ b/pallets/fungible/src/benchmarking.rs @@ -40,7 +40,7 @@ owner: sub; collection: collection(owner); sender: cross_from_sub(owner); to: cross_sub; }; - }: {>::create_item(&collection, &sender, (to, 200))?} + }: {>::create_item(&collection, &sender, (to, 200), &Unlimited)?} create_multiple_items_ex { let b in 0..MAX_ITEMS_PER_BATCH; @@ -52,14 +52,14 @@ bench_init!(to: cross_sub(i);); (to, 200) }).collect::>().try_into().unwrap(); - }: {>::create_multiple_items(&collection, &sender, data)?} + }: {>::create_multiple_items(&collection, &sender, data, &Unlimited)?} burn_item { bench_init!{ owner: sub; collection: collection(owner); owner: cross_from_sub; burner: cross_sub; }; - >::create_item(&collection, &owner, (burner.clone(), 200))?; + >::create_item(&collection, &owner, (burner.clone(), 200), &Unlimited)?; }: {>::burn(&collection, &burner, 100)?} transfer { @@ -67,15 +67,15 @@ owner: sub; collection: collection(owner); owner: cross_from_sub; sender: cross_sub; to: cross_sub; }; - >::create_item(&collection, &owner, (sender.clone(), 200))?; - }: {>::transfer(&collection, &sender, &to, 200)?} + >::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?; + }: {>::transfer(&collection, &sender, &to, 200, &Unlimited)?} approve { bench_init!{ owner: sub; collection: collection(owner); owner: cross_from_sub; sender: cross_sub; spender: cross_sub; }; - >::create_item(&collection, &owner, (sender.clone(), 200))?; + >::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?; }: {>::set_allowance(&collection, &sender, &spender, 100)?} transfer_from { @@ -83,7 +83,7 @@ owner: sub; collection: collection(owner); owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub; }; - >::create_item(&collection, &owner, (sender.clone(), 200))?; + >::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?; >::set_allowance(&collection, &sender, &spender, 200)?; }: {>::transfer_from(&collection, &spender, &sender, &receiver, 100, &Unlimited)?} @@ -92,7 +92,7 @@ owner: sub; collection: collection(owner); owner: cross_from_sub; sender: cross_sub; burner: cross_sub; }; - >::create_item(&collection, &owner, (sender.clone(), 200))?; + >::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?; >::set_allowance(&collection, &sender, &burner, 200)?; }: {>::burn_from(&collection, &burner, &sender, 100, &Unlimited)?} } --- a/pallets/fungible/src/common.rs +++ b/pallets/fungible/src/common.rs @@ -17,7 +17,7 @@ use core::marker::PhantomData; use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight}; -use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget}; +use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget, CreateItemData}; use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight}; use sp_runtime::ArithmeticError; use sp_std::{vec::Vec, vec}; @@ -33,7 +33,8 @@ >::create_item() } - fn create_multiple_items(_amount: u32) -> Weight { + fn create_multiple_items(_data: &[CreateItemData]) -> Weight { + // All items minted for the same user, so it works same as create_item Self::create_item() } @@ -51,23 +52,28 @@ } fn set_collection_properties(amount: u32) -> Weight { - >::set_collection_properties(amount) + // Error + 0 } fn delete_collection_properties(amount: u32) -> Weight { - >::delete_collection_properties(amount) + // Error + 0 } fn set_token_properties(amount: u32) -> Weight { - >::set_token_properties(amount) + // Error + 0 } fn delete_token_properties(amount: u32) -> Weight { - >::delete_token_properties(amount) + // Error + 0 } fn set_property_permissions(amount: u32) -> Weight { - >::set_property_permissions(amount) + // Error + 0 } fn transfer() -> Weight { --- a/pallets/fungible/src/weights.rs +++ b/pallets/fungible/src/weights.rs @@ -35,11 +35,6 @@ fn create_item() -> Weight; fn create_multiple_items_ex(b: u32, ) -> Weight; fn burn_item() -> Weight; - fn set_collection_properties(amount: u32) -> Weight; - fn delete_collection_properties(amount: u32) -> Weight; - fn set_token_properties(amount: u32) -> Weight; - fn delete_token_properties(amount: u32) -> Weight; - fn set_property_permissions(amount: u32) -> Weight; fn transfer() -> Weight; fn approve() -> Weight; fn transfer_from() -> Weight; @@ -73,33 +68,8 @@ (15_565_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - - fn set_collection_properties(_amount: u32) -> Weight { - // Error - 0 - } - - fn delete_collection_properties(_amount: u32) -> Weight { - // Error - 0 - } - - fn set_token_properties(_amount: u32) -> Weight { - // Error - 0 - } - - fn delete_token_properties(_amount: u32) -> Weight { - // Error - 0 } - fn set_property_permissions(_amount: u32) -> Weight { - // Error - 0 - } - // Storage: Fungible Balance (r:2 w:2) fn transfer() -> Weight { (17_713_000 as Weight) @@ -156,31 +126,6 @@ (15_565_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - - fn set_collection_properties(_amount: u32) -> Weight { - // Error - 0 - } - - fn delete_collection_properties(_amount: u32) -> Weight { - // Error - 0 - } - - fn set_token_properties(_amount: u32) -> Weight { - // Error - 0 - } - - fn delete_token_properties(_amount: u32) -> Weight { - // Error - 0 - } - - fn set_property_permissions(_amount: u32) -> Weight { - // Error - 0 } // Storage: Fungible Balance (r:2 w:2) --- a/pallets/nonfungible/Cargo.toml +++ b/pallets/nonfungible/Cargo.toml @@ -49,4 +49,5 @@ 'frame-benchmarking', 'frame-support/runtime-benchmarks', 'frame-system/runtime-benchmarks', + 'up-data-structs/runtime-benchmarks', ] --- a/pallets/nonfungible/src/benchmarking.rs +++ b/pallets/nonfungible/src/benchmarking.rs @@ -18,24 +18,35 @@ use crate::{Pallet, Config, NonfungibleHandle}; use sp_std::prelude::*; -use pallet_common::benchmarking::{create_collection_raw, create_data, create_var_data}; +use pallet_common::benchmarking::{create_collection_raw, create_data, property_key, property_value}; use frame_benchmarking::{benchmarks, account}; -use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, CUSTOM_DATA_LIMIT, budget::Unlimited}; +use up_data_structs::{ + CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, CUSTOM_DATA_LIMIT, + budget::Unlimited, +}; use pallet_common::bench_init; -use core::convert::TryInto; const SEED: u32 = 1; fn create_max_item_data(owner: T::CrossAccountId) -> CreateItemData { let const_data = create_data::(); - CreateItemData:: { const_data, owner } + CreateItemData:: { + const_data, + owner, + properties: Default::default(), + } } fn create_max_item( collection: &NonfungibleHandle, sender: &T::CrossAccountId, owner: T::CrossAccountId, ) -> Result { - >::create_item(&collection, sender, create_max_item_data::(owner))?; + >::create_item( + &collection, + sender, + create_max_item_data::(owner), + &Unlimited, + )?; Ok(TokenId(>::get(&collection.id))) } @@ -65,7 +76,7 @@ sender: cross_from_sub(owner); to: cross_sub; }; let data = (0..b).map(|_| create_max_item_data::(to.clone())).collect(); - }: {>::create_multiple_items(&collection, &sender, data)?} + }: {>::create_multiple_items(&collection, &sender, data, &Unlimited)?} create_multiple_items_ex { let b in 0..MAX_ITEMS_PER_BATCH; @@ -77,7 +88,7 @@ bench_init!(to: cross_sub(i);); create_max_item_data::(to) }).collect(); - }: {>::create_multiple_items(&collection, &sender, data)?} + }: {>::create_multiple_items(&collection, &sender, data, &Unlimited)?} burn_item { bench_init!{ @@ -93,7 +104,7 @@ owner: cross_from_sub; sender: cross_sub; receiver: cross_sub; }; let item = create_max_item(&collection, &owner, sender.clone())?; - }: {>::transfer(&collection, &sender, &receiver, item)?} + }: {>::transfer(&collection, &sender, &receiver, item, &Unlimited)?} approve { bench_init!{ @@ -120,4 +131,66 @@ let item = create_max_item(&collection, &owner, sender.clone())?; >::set_allowance(&collection, &sender, item, Some(&burner))?; }: {>::burn_from(&collection, &burner, &sender, item, &Unlimited)?} + + set_property_permissions { + let b in 0..MAX_PROPERTIES_PER_ITEM; + bench_init!{ + owner: sub; collection: collection(owner); + owner: cross_from_sub; + }; + let perms = (0..b).map(|k| PropertyKeyPermission { + key: property_key(k as usize), + permission: PropertyPermission { + mutable: false, + collection_admin: false, + token_owner: false, + }, + }).collect::>(); + }: {>::set_property_permissions(&collection, &owner, perms)?} + + set_token_properties { + let b in 0..MAX_PROPERTIES_PER_ITEM; + bench_init!{ + owner: sub; collection: collection(owner); + owner: cross_from_sub; + }; + let perms = (0..b).map(|k| PropertyKeyPermission { + key: property_key(k as usize), + permission: PropertyPermission { + mutable: false, + collection_admin: true, + token_owner: true, + }, + }).collect::>(); + >::set_property_permissions(&collection, &owner, perms)?; + let props = (0..b).map(|k| Property { + key: property_key(k as usize), + value: property_value(), + }).collect::>(); + let item = create_max_item(&collection, &owner, owner.clone())?; + }: {>::set_token_properties(&collection, &owner, item, props)?} + + delete_token_properties { + let b in 0..MAX_PROPERTIES_PER_ITEM; + bench_init!{ + owner: sub; collection: collection(owner); + owner: cross_from_sub; + }; + let perms = (0..b).map(|k| PropertyKeyPermission { + key: property_key(k as usize), + permission: PropertyPermission { + mutable: true, + collection_admin: true, + token_owner: true, + }, + }).collect::>(); + >::set_property_permissions(&collection, &owner, perms)?; + let props = (0..b).map(|k| Property { + key: property_key(k as usize), + value: property_value(), + }).collect::>(); + let item = create_max_item(&collection, &owner, owner.clone())?; + >::set_token_properties(&collection, &owner, item, props)?; + let to_delete = (0..b).map(|k| property_key(k as usize)).collect::>(); + }: {>::delete_token_properties(&collection, &owner, item, to_delete)?} } --- a/pallets/nonfungible/src/common.rs +++ b/pallets/nonfungible/src/common.rs @@ -21,7 +21,9 @@ TokenId, CreateItemExData, CollectionId, budget::Budget, Property, PropertyKey, PropertyKeyPermission, PropertyValue, }; -use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight}; +use pallet_common::{ + CommonCollectionOperations, CommonWeightInfo, with_weight, weights::WeightInfo as _, +}; use sp_runtime::DispatchError; use sp_std::vec::Vec; @@ -38,13 +40,33 @@ fn create_multiple_items_ex(data: &CreateItemExData) -> Weight { match data { - CreateItemExData::NFT(t) => >::create_multiple_items_ex(t.len() as u32), + CreateItemExData::NFT(t) => { + >::create_multiple_items_ex(t.len() as u32) + + t.iter() + .map(|t| { + if t.properties.len() > 0 { + Self::set_token_properties(t.properties.len() as u32) + } else { + 0 + } + }) + .sum::() + } _ => 0, } } - fn create_multiple_items(amount: u32) -> Weight { - >::create_multiple_items(amount) + fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight { + >::create_multiple_items(data.len() as u32) + + data + .iter() + .filter_map(|t| match t { + up_data_structs::CreateItemData::NFT(n) if n.properties.len() > 0 => { + Some(Self::set_token_properties(n.properties.len() as u32)) + } + _ => None, + }) + .sum::() } fn burn_item() -> Weight { @@ -52,11 +74,11 @@ } fn set_collection_properties(amount: u32) -> Weight { - >::set_collection_properties(amount) + >::set_collection_properties(amount) } fn delete_collection_properties(amount: u32) -> Weight { - >::delete_collection_properties(amount) + >::delete_collection_properties(amount) } fn set_token_properties(amount: u32) -> Weight { @@ -128,15 +150,15 @@ data: Vec, nesting_budget: &dyn Budget, ) -> DispatchResultWithPostInfo { + let weight = >::create_multiple_items(&data); let data = data .into_iter() .map(|d| map_create_data::(d, &to)) .collect::, DispatchError>>()?; - let amount = data.len(); with_weight( >::create_multiple_items(self, &sender, data, nesting_budget), - >::create_multiple_items(amount as u32), + weight, ) } --- a/pallets/nonfungible/src/lib.rs +++ b/pallets/nonfungible/src/lib.rs @@ -18,7 +18,7 @@ use erc::ERC721Events; use evm_coder::ToLog; -use frame_support::{BoundedVec, ensure, fail, transactional}; +use frame_support::{BoundedVec, ensure, fail, transactional, storage::with_transaction}; use up_data_structs::{ AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData, mapping::TokenAddressMapping, NestingRule, budget::Budget, Property, PropertyPermission, @@ -32,7 +32,7 @@ use pallet_structure::Pallet as PalletStructure; use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder}; use sp_core::H160; -use sp_runtime::{ArithmeticError, DispatchError, DispatchResult}; +use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome}; use sp_std::{vec::Vec, vec}; use core::ops::Deref; use sp_std::collections::btree_map::BTreeMap; @@ -600,28 +600,37 @@ // ========= + with_transaction(|| { + for (i, data) in data.iter().enumerate() { + let token = first_token + i as u32 + 1; + + >::insert( + (collection.id, token), + ItemData { + const_data: data.const_data.clone(), + owner: data.owner.clone(), + }, + ); + + if let Err(e) = Self::set_token_properties( + collection, + sender, + TokenId(token), + data.properties.clone().into_inner(), + ) { + return TransactionOutcome::Rollback(Err(e)); + } + } + TransactionOutcome::Commit(Ok(())) + })?; + >::insert(collection.id, tokens_minted); for (account, balance) in balances { >::insert((collection.id, account), balance); } for (i, data) in data.into_iter().enumerate() { let token = first_token + i as u32 + 1; - - >::insert( - (collection.id, token), - ItemData { - const_data: data.const_data, - owner: data.owner.clone(), - }, - ); >::insert((collection.id, &data.owner, token), true); - - Self::set_token_properties( - collection, - sender, - TokenId(token), - data.properties.into_inner(), - )?; >::deposit_log( ERC721Events::Transfer { --- a/pallets/nonfungible/src/weights.rs +++ b/pallets/nonfungible/src/weights.rs @@ -151,10 +151,35 @@ // Storage: Nonfungible AccountBalance (r:1 w:1) // Storage: Nonfungible Owned (r:0 w:1) fn burn_from() -> Weight { - (27_580_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) } + // Storage: Common CollectionPropertyPermissions (r:1 w:1) + fn set_property_permissions(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 3_432_000 + .saturating_add((126_888_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + // Storage: Common CollectionPropertyPermissions (r:1 w:0) + // Storage: Nonfungible TokenData (r:1 w:0) + // Storage: Nonfungible TokenProperties (r:1 w:1) + fn set_token_properties(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 158_583_000 + .saturating_add((4_707_700_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + // Storage: Common CollectionPropertyPermissions (r:1 w:0) + // Storage: Nonfungible TokenData (r:1 w:0) + // Storage: Nonfungible TokenProperties (r:1 w:1) + fn delete_token_properties(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 169_018_000 + .saturating_add((4_783_967_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } } // For backwards compatibility and tests @@ -260,8 +285,33 @@ // Storage: Nonfungible AccountBalance (r:1 w:1) // Storage: Nonfungible Owned (r:0 w:1) fn burn_from() -> Weight { - (27_580_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } + // Storage: Common CollectionPropertyPermissions (r:1 w:1) + fn set_property_permissions(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 3_432_000 + .saturating_add((126_888_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + // Storage: Common CollectionPropertyPermissions (r:1 w:0) + // Storage: Nonfungible TokenData (r:1 w:0) + // Storage: Nonfungible TokenProperties (r:1 w:1) + fn set_token_properties(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 158_583_000 + .saturating_add((4_707_700_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + // Storage: Common CollectionPropertyPermissions (r:1 w:0) + // Storage: Nonfungible TokenData (r:1 w:0) + // Storage: Nonfungible TokenProperties (r:1 w:1) + fn delete_token_properties(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 169_018_000 + .saturating_add((4_783_967_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } } --- a/pallets/refungible/src/benchmarking.rs +++ b/pallets/refungible/src/benchmarking.rs @@ -18,7 +18,7 @@ use crate::{Pallet, Config, RefungibleHandle}; use sp_std::prelude::*; -use pallet_common::benchmarking::{create_collection_raw, create_data, create_var_data}; +use pallet_common::benchmarking::{create_collection_raw, create_data}; use frame_benchmarking::{benchmarks, account}; use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, CUSTOM_DATA_LIMIT, budget::Unlimited}; use pallet_common::bench_init; @@ -46,7 +46,7 @@ users: impl IntoIterator, ) -> Result { let data: CreateRefungibleExData = create_max_item_data(users); - >::create_item(&collection, sender, data)?; + >::create_item(&collection, sender, data, &Unlimited)?; Ok(TokenId(>::get(&collection.id))) } @@ -73,7 +73,7 @@ sender: cross_from_sub(owner); to: cross_sub; }; let data = (0..b).map(|_| create_max_item_data([(to.clone(), 200)])).collect(); - }: {>::create_multiple_items(&collection, &sender, data)?} + }: {>::create_multiple_items(&collection, &sender, data, &Unlimited)?} create_multiple_items_ex_multiple_items { let b in 0..MAX_ITEMS_PER_BATCH; @@ -85,7 +85,7 @@ bench_init!(to: cross_sub(t);); create_max_item_data([(to, 200)]) }).collect(); - }: {>::create_multiple_items(&collection, &sender, data)?} + }: {>::create_multiple_items(&collection, &sender, data, &Unlimited)?} create_multiple_items_ex_multiple_owners { let b in 0..MAX_ITEMS_PER_BATCH; @@ -97,7 +97,7 @@ bench_init!(to: cross_sub(u);); (to, 200) }))].try_into().unwrap(); - }: {>::create_multiple_items(&collection, &sender, data)?} + }: {>::create_multiple_items(&collection, &sender, data, &Unlimited)?} // Other user left, token data is kept burn_item_partial { @@ -122,7 +122,7 @@ sender: cross_from_sub(owner); receiver: cross_sub; }; let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?; - }: {>::transfer(&collection, &sender, &receiver, item, 100)?} + }: {>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?} // Target account is created transfer_creating { bench_init!{ @@ -130,7 +130,7 @@ sender: cross_from_sub(owner); receiver: cross_sub; }; let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?; - }: {>::transfer(&collection, &sender, &receiver, item, 100)?} + }: {>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?} // Source account is destroyed transfer_removing { bench_init!{ @@ -138,7 +138,7 @@ sender: cross_from_sub(owner); receiver: cross_sub; }; let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?; - }: {>::transfer(&collection, &sender, &receiver, item, 200)?} + }: {>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?} // Source account destroyed, target created transfer_creating_removing { bench_init!{ @@ -146,7 +146,7 @@ sender: cross_from_sub(owner); receiver: cross_sub; }; let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?; - }: {>::transfer(&collection, &sender, &receiver, item, 200)?} + }: {>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?} approve { bench_init!{ --- a/pallets/refungible/src/common.rs +++ b/pallets/refungible/src/common.rs @@ -20,7 +20,7 @@ use frame_support::{dispatch::DispatchResultWithPostInfo, fail, weights::Weight}; use up_data_structs::{ CollectionId, TokenId, CreateItemExData, CreateRefungibleExData, budget::Budget, Property, - PropertyKey, PropertyValue, PropertyKeyPermission, + PropertyKey, PropertyValue, PropertyKeyPermission, CreateItemData, }; use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight}; use sp_runtime::DispatchError; @@ -46,8 +46,8 @@ >::create_item() } - fn create_multiple_items(amount: u32) -> Weight { - >::create_multiple_items(amount) + fn create_multiple_items(data: &[CreateItemData]) -> Weight { + >::create_multiple_items(data.len() as u32) } fn create_multiple_items_ex(call: &CreateItemExData) -> Weight { @@ -66,12 +66,14 @@ max_weight_of!(burn_item_partial(), burn_item_fully()) } - fn set_collection_properties(amount: u32) -> Weight { - >::set_collection_properties(amount) + fn set_collection_properties(_amount: u32) -> Weight { + // Error + 0 } - fn delete_collection_properties(amount: u32) -> Weight { - >::delete_collection_properties(amount) + fn delete_collection_properties(_amount: u32) -> Weight { + // Error + 0 } fn set_token_properties(amount: u32) -> Weight { @@ -156,15 +158,15 @@ data: Vec, nesting_budget: &dyn Budget, ) -> DispatchResultWithPostInfo { + let weight = >::create_multiple_items(&data); let data = data .into_iter() .map(|d| map_create_data::(d, &to)) .collect::, DispatchError>>()?; - let amount = data.len(); with_weight( >::create_multiple_items(self, &sender, data, nesting_budget), - >::create_multiple_items(amount as u32), + weight, ) } --- a/pallets/refungible/src/weights.rs +++ b/pallets/refungible/src/weights.rs @@ -38,8 +38,6 @@ fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight; fn burn_item_partial() -> Weight; fn burn_item_fully() -> Weight; - fn set_collection_properties(amount: u32) -> Weight; - fn delete_collection_properties(amount: u32) -> Weight; fn set_token_properties(amount: u32) -> Weight; fn delete_token_properties(amount: u32) -> Weight; fn set_property_permissions(amount: u32) -> Weight; @@ -132,16 +130,6 @@ (32_489_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) - } - - fn set_collection_properties(_amount: u32) -> Weight { - // Error - 0 - } - - fn delete_collection_properties(_amount: u32) -> Weight { - // Error - 0 } fn set_token_properties(_amount: u32) -> Weight { @@ -320,16 +308,6 @@ (32_489_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) - } - - fn set_collection_properties(_amount: u32) -> Weight { - // Error - 0 - } - - fn delete_collection_properties(_amount: u32) -> Weight { - // Error - 0 } fn set_token_properties(_amount: u32) -> Weight { --- a/pallets/structure/Cargo.toml +++ b/pallets/structure/Cargo.toml @@ -16,6 +16,7 @@ "derive", ] } up-data-structs = { path = "../../primitives/data-structs", default-features = false } +pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" } [features] default = ["std"] @@ -28,5 +29,6 @@ "scale-info/std", "parity-scale-codec/std", "up-data-structs/std", + "pallet-evm/std", ] runtime-benchmarks = ['frame-benchmarking', 'pallet-common/runtime-benchmarks'] --- a/pallets/structure/src/benchmarking.rs +++ b/pallets/structure/src/benchmarking.rs @@ -2,8 +2,10 @@ use frame_benchmarking::{benchmarks, account}; use frame_support::traits::{Currency, Get}; -use up_data_structs::{CreateCollectionData, CollectionMode, CreateItemData, CreateNftData}; -use pallet_common::CrossAccountId; +use up_data_structs::{ + CreateCollectionData, CollectionMode, CreateItemData, CreateNftData, budget::Unlimited, +}; +use pallet_evm::account::CrossAccountId; const SEED: u32 = 1; @@ -20,9 +22,9 @@ let dispatch = T::CollectionDispatch::dispatch(CollectionHandle::try_get(CollectionId(1))?); let dispatch = dispatch.as_dyn(); - dispatch.create_item(caller_cross.clone(), caller_cross.clone(), CreateItemData::NFT(CreateNftData::default()))?; + dispatch.create_item(caller_cross.clone(), caller_cross.clone(), CreateItemData::NFT(CreateNftData::default()), &Unlimited)?; }: { let parent = >::find_parent(CollectionId(1), TokenId(1))?; - assert!(matches!(parent, Parent::Normal(_))) + assert!(matches!(parent, Parent::User(_))) } } --- a/pallets/unique/src/lib.rs +++ b/pallets/unique/src/lib.rs @@ -687,7 +687,7 @@ /// * itemsData: Array items properties. Each property is an array of bytes itself, see [create_item]. /// /// * owner: Address, initial owner of the NFT. - #[weight = T::CommonWeightInfo::create_multiple_items(items_data.len() as u32)] + #[weight = T::CommonWeightInfo::create_multiple_items(&items_data)] #[transactional] pub fn create_multiple_items(origin, collection_id: CollectionId, owner: T::CrossAccountId, items_data: Vec) -> DispatchResultWithPostInfo { ensure!(!items_data.is_empty(), Error::::EmptyArgument); --- a/primitives/data-structs/Cargo.toml +++ b/primitives/data-structs/Cargo.toml @@ -42,3 +42,4 @@ ] serde1 = ["serde"] limit-testing = [] +runtime-benchmarks = [] \ No newline at end of file --- a/primitives/data-structs/src/lib.rs +++ b/primitives/data-structs/src/lib.rs @@ -861,7 +861,9 @@ ) -> Result<(), PropertiesError> { let value_len = value.len(); - if self.consumed_space as usize + value_len > self.space_limit as usize { + if self.consumed_space as usize + value_len > self.space_limit as usize + && !cfg!(feature = "runtime-benchmarks") + { return Err(PropertiesError::NoSpaceForProperty); } --- a/runtime/common/src/eth_sponsoring.rs +++ b/runtime/common/src/eth_sponsoring.rs @@ -50,16 +50,20 @@ CollectionMode::NFT => { let call = >::parse(method_id, &mut reader).ok()??; match call { - UniqueNFTCall::TokenProperties( - TokenPropertiesCall::SetProperty { token_id, key, value, .. }, - ) => { + UniqueNFTCall::TokenProperties(TokenPropertiesCall::SetProperty { + token_id, + key, + value, + .. + }) => { let token_id: TokenId = token_id.try_into().ok()?; withdraw_set_token_property::( &collection, &who, &token_id, key.len() + value.len(), - ).map(|()| sponsor) + ) + .map(|()| sponsor) } UniqueNFTCall::ERC721UniqueExtensions( ERC721UniqueExtensionsCall::Transfer { token_id, .. }, --- a/runtime/common/src/runtime_apis.rs +++ b/runtime/common/src/runtime_apis.rs @@ -776,6 +776,7 @@ let mut list = Vec::::new(); list_benchmark!(list, extra, pallet_evm_migration, EvmMigration); + list_benchmark!(list, extra, pallet_common, Common); list_benchmark!(list, extra, pallet_unique, Unique); list_benchmark!(list, extra, pallet_structure, Structure); list_benchmark!(list, extra, pallet_inflation, Inflation); @@ -814,6 +815,7 @@ let params = (&config, &allowlist); add_benchmark!(params, batches, pallet_evm_migration, EvmMigration); + add_benchmark!(params, batches, pallet_common, Common); add_benchmark!(params, batches, pallet_unique, Unique); add_benchmark!(params, batches, pallet_structure, Structure); add_benchmark!(params, batches, pallet_inflation, Inflation); --- a/runtime/common/src/sponsoring.rs +++ b/runtime/common/src/sponsoring.rs @@ -29,8 +29,8 @@ use pallet_evm::account::CrossAccountId; use pallet_unique::{ Call as UniqueCall, Config as UniqueConfig, FungibleApproveBasket, RefungibleApproveBasket, - NftApproveBasket, CreateItemBasket, ReFungibleTransferBasket, - FungibleTransferBasket, NftTransferBasket, TokenPropertyBasket, + NftApproveBasket, CreateItemBasket, ReFungibleTransferBasket, FungibleTransferBasket, + NftTransferBasket, TokenPropertyBasket, }; use pallet_fungible::Config as FungibleConfig; use pallet_nonfungible::Config as NonfungibleConfig; @@ -247,7 +247,7 @@ &T::CrossAccountId::from_sub(who.clone()), &token_id, // No overflow may happen, as data larger than usize can't reach here - properties.iter().map(|p| p.key.len() + p.value.len()).sum() + properties.iter().map(|p| p.key.len() + p.value.len()).sum(), ) .map(|()| sponsor) } --- a/runtime/common/src/weights.rs +++ b/runtime/common/src/weights.rs @@ -21,7 +21,7 @@ use pallet_fungible::{Config as FungibleConfig, common::CommonWeights as FungibleWeights}; use pallet_nonfungible::{Config as NonfungibleConfig, common::CommonWeights as NonfungibleWeights}; use pallet_refungible::{Config as RefungibleConfig, common::CommonWeights as RefungibleWeights}; -use up_data_structs::CreateItemExData; +use up_data_structs::{CreateItemExData, CreateItemData}; macro_rules! max_weight_of { ($method:ident ( $($args:tt)* )) => { @@ -42,8 +42,8 @@ dispatch_weight::() + max_weight_of!(create_item()) } - fn create_multiple_items(amount: u32) -> Weight { - dispatch_weight::() + max_weight_of!(create_multiple_items(amount)) + fn create_multiple_items(data: &[CreateItemData]) -> Weight { + dispatch_weight::() + max_weight_of!(create_multiple_items(data)) } fn create_multiple_items_ex(data: &CreateItemExData) -> Weight { --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -875,6 +875,7 @@ } impl pallet_common::Config for Runtime { + type WeightInfo = pallet_common::weights::SubstrateWeight; type Event = Event; type Currency = Balances; type CollectionCreationPrice = CollectionCreationPrice; --- a/runtime/tests/src/lib.rs +++ b/runtime/tests/src/lib.rs @@ -212,6 +212,7 @@ } impl pallet_common::Config for Test { + type WeightInfo = (); type Event = (); type Currency = Balances; type CollectionCreationPrice = CollectionCreationPrice; --- a/runtime/unique/Cargo.toml +++ b/runtime/unique/Cargo.toml @@ -39,6 +39,7 @@ 'pallet-xcm/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', 'xcm-builder/runtime-benchmarks', + 'up-data-structs/runtime-benchmarks', ] try-runtime = [ 'frame-try-runtime', --- a/runtime/unique/src/lib.rs +++ b/runtime/unique/src/lib.rs @@ -66,7 +66,12 @@ WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier, }, }; -use unique_runtime_common::dispatch::{CollectionDispatchT, CollectionDispatch}; +use unique_runtime_common::{ + dispatch::{CollectionDispatchT, CollectionDispatch}, + weights::CommonWeights, + sponsoring::UniqueSponsorshipHandler, + eth_sponsoring::UniqueEthSponsorshipHandler, +}; use up_data_structs::*; // use pallet_contracts::weights::WeightInfo; // #[cfg(any(feature = "std", test))] @@ -846,6 +851,7 @@ } impl pallet_common::Config for Runtime { + type WeightInfo = pallet_common::weights::SubstrateWeight; type Event = Event; type Currency = Balances; type CollectionCreationPrice = CollectionCreationPrice; @@ -881,6 +887,7 @@ impl pallet_unique::Config for Runtime { type Event = Event; type WeightInfo = pallet_unique::weights::SubstrateWeight; + type CommonWeightInfo = CommonWeights; } parameter_types! { @@ -902,11 +909,11 @@ // } type EvmSponsorshipHandler = ( - pallet_unique::UniqueEthSponsorshipHandler, + UniqueEthSponsorshipHandler, pallet_evm_contract_helpers::HelpersContractSponsoring, ); type SponsorshipHandler = ( - pallet_unique::UniqueSponsorshipHandler, + UniqueSponsorshipHandler, //pallet_contract_helpers::ContractSponsorshipHandler, pallet_evm_transaction_payment::BridgeSponsorshipHandler, ); -- gitstuff