difftreelog
feat createMultipleItemsEx call
in: master
16 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -17,7 +17,7 @@
TokenId, Weight, WithdrawReasons, CollectionStats, MAX_TOKEN_OWNERSHIP, CollectionMode,
NFT_SPONSOR_TRANSFER_TIMEOUT, FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT, CUSTOM_DATA_LIMIT, CollectionLimits,
- CustomDataLimit, CreateCollectionData, SponsorshipState,
+ CustomDataLimit, CreateCollectionData, SponsorshipState, CreateItemExData,
};
pub use pallet::*;
use sp_core::H160;
@@ -624,9 +624,10 @@
}
/// Worst cases
-pub trait CommonWeightInfo {
+pub trait CommonWeightInfo<CrossAccountId> {
fn create_item() -> Weight;
fn create_multiple_items(amount: u32) -> Weight;
+ fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;
fn burn_item() -> Weight;
fn transfer() -> Weight;
fn approve() -> Weight;
@@ -648,6 +649,11 @@
to: T::CrossAccountId,
data: Vec<CreateItemData>,
) -> DispatchResultWithPostInfo;
+ fn create_multiple_items_ex(
+ &self,
+ sender: T::CrossAccountId,
+ data: CreateItemExData<T::CrossAccountId>,
+ ) -> DispatchResultWithPostInfo;
fn burn_item(
&self,
sender: T::CrossAccountId,
pallets/fungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -4,7 +4,7 @@
use sp_std::prelude::*;
use pallet_common::benchmarking::create_collection_raw;
use frame_benchmarking::{benchmarks, account};
-use up_data_structs::{CollectionMode};
+use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH};
use pallet_common::bench_init;
const SEED: u32 = 1;
@@ -26,6 +26,18 @@
};
}: {<Pallet<T>>::create_item(&collection, &sender, (to, 200))?}
+ create_multiple_items_ex {
+ let b in 0..MAX_ITEMS_PER_BATCH;
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ sender: cross_from_sub(owner);
+ };
+ let data = (0..b).map(|i| {
+ bench_init!(to: cross_sub(i););
+ (to, 200)
+ }).collect::<BTreeMap<_, _>>().try_into().unwrap();
+ }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)}
+
burn_item {
bench_init!{
owner: sub; collection: collection(owner);
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -1,7 +1,7 @@
use core::marker::PhantomData;
use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};
-use up_data_structs::TokenId;
+use up_data_structs::{TokenId, CreateItemExData};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::ArithmeticError;
use sp_std::{vec::Vec, vec};
@@ -21,6 +21,15 @@
Self::create_item()
}
+ fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {
+ match data {
+ CreateItemExData::Fungible(f) => {
+ <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)
+ }
+ _ => 0,
+ }
+ }
+
fn burn_item() -> Weight {
<SelfWeightOf<T>>::burn_item()
}
@@ -87,6 +96,23 @@
)
}
+ fn create_multiple_items_ex(
+ &self,
+ sender: <T>::CrossAccountId,
+ data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,
+ ) -> DispatchResultWithPostInfo {
+ let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);
+ let data = match data {
+ up_data_structs::CreateItemExData::Fungible(f) => f,
+ _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),
+ };
+
+ with_weight(
+ <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner()),
+ weight,
+ )
+ }
+
fn burn_item(
&self,
sender: T::CrossAccountId,
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -392,6 +392,6 @@
sender: &T::CrossAccountId,
data: CreateItemData<T>,
) -> DispatchResult {
- Self::create_multiple_items(collection, sender, vec![data])
+ Self::create_multiple_items(collection, sender, [(data.0, data.1)].into_iter().collect())
}
}
pallets/fungible/src/weights.rsdiffbeforeafterboth--- a/pallets/fungible/src/weights.rs
+++ b/pallets/fungible/src/weights.rs
@@ -33,6 +33,7 @@
/// Weight functions needed for pallet_fungible.
pub trait WeightInfo {
fn create_item() -> Weight;
+ fn create_multiple_items_ex(b: u32, ) -> Weight;
fn burn_item() -> Weight;
fn transfer() -> Weight;
fn approve() -> Weight;
@@ -51,6 +52,17 @@
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: Fungible TotalSupply (r:1 w:1)
+ // Storage: Fungible Balance (r:4 w:4)
+ fn create_multiple_items_ex(b: u32, ) -> Weight {
+ (1_055_000 as Weight)
+ // Standard Error: 22_000
+ .saturating_add((5_273_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
+ }
+ // Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:1 w:1)
fn burn_item() -> Weight {
(14_096_000 as Weight)
@@ -97,6 +109,17 @@
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: Fungible TotalSupply (r:1 w:1)
+ // Storage: Fungible Balance (r:4 w:4)
+ fn create_multiple_items_ex(b: u32, ) -> Weight {
+ (1_055_000 as Weight)
+ // Standard Error: 22_000
+ .saturating_add((5_273_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(RocksDbWeight::get().reads(1 as Weight))
+ .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(RocksDbWeight::get().writes(1 as Weight))
+ .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
+ }
+ // Storage: Fungible TotalSupply (r:1 w:1)
// Storage: Fungible Balance (r:1 w:1)
fn burn_item() -> Weight {
(14_096_000 as Weight)
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -56,6 +56,16 @@
let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();
}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}
+ create_multiple_items_ex {
+ let b in 0..MAX_ITEMS_PER_BATCH;
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ sender: cross_from_sub(owner);
+ };
+ let data = (0..b).map(|i| {
+ bench_init!(to: cross_sub(i););
+ create_max_item_data::<T>(to)
+ }).collect();
}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}
burn_item {
pallets/nonfungible/src/common.rsdiffbeforeafterboth1use core::marker::PhantomData;23use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};4use up_data_structs::{TokenId, CustomDataLimit};5use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};6use sp_runtime::DispatchError;7use sp_std::vec::Vec;89use crate::{10 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,11 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,12};1314pub struct CommonWeights<T: Config>(PhantomData<T>);15impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {16 fn create_item() -> Weight {17 <SelfWeightOf<T>>::create_item()18 }1920 fn create_multiple_items(amount: u32) -> Weight {21 <SelfWeightOf<T>>::create_multiple_items(amount)22 }2324 fn burn_item() -> Weight {25 <SelfWeightOf<T>>::burn_item()26 }2728 fn transfer() -> Weight {29 <SelfWeightOf<T>>::transfer()30 }3132 fn approve() -> Weight {33 <SelfWeightOf<T>>::approve()34 }3536 fn transfer_from() -> Weight {37 <SelfWeightOf<T>>::transfer_from()38 }3940 fn burn_from() -> Weight {41 <SelfWeightOf<T>>::burn_from()42 }4344 fn set_variable_metadata(bytes: u32) -> Weight {45 <SelfWeightOf<T>>::set_variable_metadata(bytes)46 }47}4849fn map_create_data<T: Config>(50 data: up_data_structs::CreateItemData,51 to: &T::CrossAccountId,52) -> Result<CreateItemData<T>, DispatchError> {53 match data {54 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {55 const_data: data.const_data,56 variable_data: data.variable_data,57 owner: to.clone(),58 }),59 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),60 }61}6263impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {64 fn create_item(65 &self,66 sender: T::CrossAccountId,67 to: T::CrossAccountId,68 data: up_data_structs::CreateItemData,69 ) -> DispatchResultWithPostInfo {70 with_weight(71 <Pallet<T>>::create_item(self, &sender, map_create_data::<T>(data, &to)?),72 <CommonWeights<T>>::create_item(),73 )74 }7576 fn create_multiple_items(77 &self,78 sender: T::CrossAccountId,79 to: T::CrossAccountId,80 data: Vec<up_data_structs::CreateItemData>,81 ) -> DispatchResultWithPostInfo {82 let data = data83 .into_iter()84 .map(|d| map_create_data::<T>(d, &to))85 .collect::<Result<Vec<_>, DispatchError>>()?;8687 let amount = data.len();88 with_weight(89 <Pallet<T>>::create_multiple_items(self, &sender, data),90 <CommonWeights<T>>::create_multiple_items(amount as u32),91 )92 }9394 fn burn_item(95 &self,96 sender: T::CrossAccountId,97 token: TokenId,98 amount: u128,99 ) -> DispatchResultWithPostInfo {100 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);101 if amount == 1 {102 with_weight(103 <Pallet<T>>::burn(self, &sender, token),104 <CommonWeights<T>>::burn_item(),105 )106 } else {107 Ok(().into())108 }109 }110111 fn transfer(112 &self,113 from: T::CrossAccountId,114 to: T::CrossAccountId,115 token: TokenId,116 amount: u128,117 ) -> DispatchResultWithPostInfo {118 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);119 if amount == 1 {120 with_weight(121 <Pallet<T>>::transfer(self, &from, &to, token),122 <CommonWeights<T>>::transfer(),123 )124 } else {125 Ok(().into())126 }127 }128129 fn approve(130 &self,131 sender: T::CrossAccountId,132 spender: T::CrossAccountId,133 token: TokenId,134 amount: u128,135 ) -> DispatchResultWithPostInfo {136 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);137138 with_weight(139 if amount == 1 {140 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))141 } else {142 <Pallet<T>>::set_allowance(self, &sender, token, None)143 },144 <CommonWeights<T>>::approve(),145 )146 }147148 fn transfer_from(149 &self,150 sender: T::CrossAccountId,151 from: T::CrossAccountId,152 to: T::CrossAccountId,153 token: TokenId,154 amount: u128,155 ) -> DispatchResultWithPostInfo {156 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);157158 if amount == 1 {159 with_weight(160 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token),161 <CommonWeights<T>>::transfer_from(),162 )163 } else {164 Ok(().into())165 }166 }167168 fn burn_from(169 &self,170 sender: T::CrossAccountId,171 from: T::CrossAccountId,172 token: TokenId,173 amount: u128,174 ) -> DispatchResultWithPostInfo {175 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);176177 if amount == 1 {178 with_weight(179 <Pallet<T>>::burn_from(self, &sender, &from, token),180 <CommonWeights<T>>::burn_from(),181 )182 } else {183 Ok(().into())184 }185 }186187 fn set_variable_metadata(188 &self,189 sender: T::CrossAccountId,190 token: TokenId,191 data: BoundedVec<u8, CustomDataLimit>,192 ) -> DispatchResultWithPostInfo {193 let len = data.len();194 with_weight(195 <Pallet<T>>::set_variable_metadata(self, &sender, token, data),196 <CommonWeights<T>>::set_variable_metadata(len as u32),197 )198 }199200 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {201 <Owned<T>>::iter_prefix((self.id, account))202 .map(|(id, _)| id)203 .collect()204 }205206 fn token_exists(&self, token: TokenId) -> bool {207 <Pallet<T>>::token_exists(self, token)208 }209210 fn last_token_id(&self) -> TokenId {211 TokenId(<TokensMinted<T>>::get(self.id))212 }213214 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId> {215 <TokenData<T>>::get((self.id, token)).map(|t| t.owner)216 }217 fn const_metadata(&self, token: TokenId) -> Vec<u8> {218 <TokenData<T>>::get((self.id, token))219 .map(|t| t.const_data)220 .unwrap_or_default()221 .into_inner()222 }223 fn variable_metadata(&self, token: TokenId) -> Vec<u8> {224 <TokenData<T>>::get((self.id, token))225 .map(|t| t.variable_data)226 .unwrap_or_default()227 .into_inner()228 }229230 fn collection_tokens(&self) -> u32 {231 <Pallet<T>>::total_supply(self)232 }233234 fn account_balance(&self, account: T::CrossAccountId) -> u32 {235 <AccountBalance<T>>::get((self.id, account))236 }237238 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {239 if <TokenData<T>>::get((self.id, token))240 .map(|a| a.owner == account)241 .unwrap_or(false)242 {243 1244 } else {245 0246 }247 }248249 fn allowance(250 &self,251 sender: T::CrossAccountId,252 spender: T::CrossAccountId,253 token: TokenId,254 ) -> u128 {255 if <TokenData<T>>::get((self.id, token))256 .map(|a| a.owner != sender)257 .unwrap_or(true)258 {259 0260 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {261 1262 } else {263 0264 }265 }266}1use core::marker::PhantomData;23use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};4use up_data_structs::{TokenId, CustomDataLimit, CreateItemExData};5use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};6use sp_runtime::DispatchError;7use sp_std::vec::Vec;89use crate::{10 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,11 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,12};1314pub struct CommonWeights<T: Config>(PhantomData<T>);15impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {16 fn create_item() -> Weight {17 <SelfWeightOf<T>>::create_item()18 }1920 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {21 match data {22 CreateItemExData::NFT(t) => <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32),23 _ => 0,24 }25 }2627 fn create_multiple_items(amount: u32) -> Weight {28 <SelfWeightOf<T>>::create_multiple_items(amount)29 }3031 fn burn_item() -> Weight {32 <SelfWeightOf<T>>::burn_item()33 }3435 fn transfer() -> Weight {36 <SelfWeightOf<T>>::transfer()37 }3839 fn approve() -> Weight {40 <SelfWeightOf<T>>::approve()41 }4243 fn transfer_from() -> Weight {44 <SelfWeightOf<T>>::transfer_from()45 }4647 fn burn_from() -> Weight {48 <SelfWeightOf<T>>::burn_from()49 }5051 fn set_variable_metadata(bytes: u32) -> Weight {52 <SelfWeightOf<T>>::set_variable_metadata(bytes)53 }54}5556fn map_create_data<T: Config>(57 data: up_data_structs::CreateItemData,58 to: &T::CrossAccountId,59) -> Result<CreateItemData<T>, DispatchError> {60 match data {61 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {62 const_data: data.const_data,63 variable_data: data.variable_data,64 owner: to.clone(),65 }),66 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),67 }68}6970impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {71 fn create_item(72 &self,73 sender: T::CrossAccountId,74 to: T::CrossAccountId,75 data: up_data_structs::CreateItemData,76 ) -> DispatchResultWithPostInfo {77 with_weight(78 <Pallet<T>>::create_item(self, &sender, map_create_data::<T>(data, &to)?),79 <CommonWeights<T>>::create_item(),80 )81 }8283 fn create_multiple_items(84 &self,85 sender: T::CrossAccountId,86 to: T::CrossAccountId,87 data: Vec<up_data_structs::CreateItemData>,88 ) -> DispatchResultWithPostInfo {89 let data = data90 .into_iter()91 .map(|d| map_create_data::<T>(d, &to))92 .collect::<Result<Vec<_>, DispatchError>>()?;9394 let amount = data.len();95 with_weight(96 <Pallet<T>>::create_multiple_items(self, &sender, data),97 <CommonWeights<T>>::create_multiple_items(amount as u32),98 )99 }100101 fn create_multiple_items_ex(102 &self,103 sender: <T>::CrossAccountId,104 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,105 ) -> DispatchResultWithPostInfo {106 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);107 let data = match data {108 up_data_structs::CreateItemExData::NFT(nft) => nft,109 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),110 };111112 with_weight(113 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner()),114 weight,115 )116 }117118 fn burn_item(119 &self,120 sender: T::CrossAccountId,121 token: TokenId,122 amount: u128,123 ) -> DispatchResultWithPostInfo {124 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);125 if amount == 1 {126 with_weight(127 <Pallet<T>>::burn(self, &sender, token),128 <CommonWeights<T>>::burn_item(),129 )130 } else {131 Ok(().into())132 }133 }134135 fn transfer(136 &self,137 from: T::CrossAccountId,138 to: T::CrossAccountId,139 token: TokenId,140 amount: u128,141 ) -> DispatchResultWithPostInfo {142 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);143 if amount == 1 {144 with_weight(145 <Pallet<T>>::transfer(self, &from, &to, token),146 <CommonWeights<T>>::transfer(),147 )148 } else {149 Ok(().into())150 }151 }152153 fn approve(154 &self,155 sender: T::CrossAccountId,156 spender: T::CrossAccountId,157 token: TokenId,158 amount: u128,159 ) -> DispatchResultWithPostInfo {160 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);161162 with_weight(163 if amount == 1 {164 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))165 } else {166 <Pallet<T>>::set_allowance(self, &sender, token, None)167 },168 <CommonWeights<T>>::approve(),169 )170 }171172 fn transfer_from(173 &self,174 sender: T::CrossAccountId,175 from: T::CrossAccountId,176 to: T::CrossAccountId,177 token: TokenId,178 amount: u128,179 ) -> DispatchResultWithPostInfo {180 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);181182 if amount == 1 {183 with_weight(184 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token),185 <CommonWeights<T>>::transfer_from(),186 )187 } else {188 Ok(().into())189 }190 }191192 fn burn_from(193 &self,194 sender: T::CrossAccountId,195 from: T::CrossAccountId,196 token: TokenId,197 amount: u128,198 ) -> DispatchResultWithPostInfo {199 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);200201 if amount == 1 {202 with_weight(203 <Pallet<T>>::burn_from(self, &sender, &from, token),204 <CommonWeights<T>>::burn_from(),205 )206 } else {207 Ok(().into())208 }209 }210211 fn set_variable_metadata(212 &self,213 sender: T::CrossAccountId,214 token: TokenId,215 data: BoundedVec<u8, CustomDataLimit>,216 ) -> DispatchResultWithPostInfo {217 let len = data.len();218 with_weight(219 <Pallet<T>>::set_variable_metadata(self, &sender, token, data),220 <CommonWeights<T>>::set_variable_metadata(len as u32),221 )222 }223224 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {225 <Owned<T>>::iter_prefix((self.id, account))226 .map(|(id, _)| id)227 .collect()228 }229230 fn token_exists(&self, token: TokenId) -> bool {231 <Pallet<T>>::token_exists(self, token)232 }233234 fn last_token_id(&self) -> TokenId {235 TokenId(<TokensMinted<T>>::get(self.id))236 }237238 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId> {239 <TokenData<T>>::get((self.id, token)).map(|t| t.owner)240 }241 fn const_metadata(&self, token: TokenId) -> Vec<u8> {242 <TokenData<T>>::get((self.id, token))243 .map(|t| t.const_data)244 .unwrap_or_default()245 .into_inner()246 }247 fn variable_metadata(&self, token: TokenId) -> Vec<u8> {248 <TokenData<T>>::get((self.id, token))249 .map(|t| t.variable_data)250 .unwrap_or_default()251 .into_inner()252 }253254 fn collection_tokens(&self) -> u32 {255 <Pallet<T>>::total_supply(self)256 }257258 fn account_balance(&self, account: T::CrossAccountId) -> u32 {259 <AccountBalance<T>>::get((self.id, account))260 }261262 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {263 if <TokenData<T>>::get((self.id, token))264 .map(|a| a.owner == account)265 .unwrap_or(false)266 {267 1268 } else {269 0270 }271 }272273 fn allowance(274 &self,275 sender: T::CrossAccountId,276 spender: T::CrossAccountId,277 token: TokenId,278 ) -> u128 {279 if <TokenData<T>>::get((self.id, token))280 .map(|a| a.owner != sender)281 .unwrap_or(true)282 {283 0284 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {285 1286 } else {287 0288 }289 }290}pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -2,7 +2,9 @@
use erc::ERC721Events;
use frame_support::{BoundedVec, ensure};
-use up_data_structs::{AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData};
+use up_data_structs::{
+ AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
+};
use pallet_common::{
Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, account::CrossAccountId,
};
@@ -22,11 +24,7 @@
pub mod erc;
pub mod weights;
-pub struct CreateItemData<T: Config> {
- pub const_data: BoundedVec<u8, CustomDataLimit>,
- pub variable_data: BoundedVec<u8, CustomDataLimit>,
- pub owner: T::CrossAccountId,
-}
+pub type CreateItemData<T> = CreateNftExData<<T as pallet_common::Config>::CrossAccountId>;
pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
#[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]
pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -34,6 +34,7 @@
pub trait WeightInfo {
fn create_item() -> Weight;
fn create_multiple_items(b: u32, ) -> Weight;
+ fn create_multiple_items_ex(b: u32, ) -> Weight;
fn burn_item() -> Weight;
fn transfer() -> Weight;
fn approve() -> Weight;
@@ -66,6 +67,19 @@
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))
}
+ // Storage: Nonfungible TokensMinted (r:1 w:1)
+ // Storage: Nonfungible AccountBalance (r:4 w:4)
+ // Storage: Nonfungible TokenData (r:0 w:4)
+ // Storage: Nonfungible Owned (r:0 w:4)
+ fn create_multiple_items_ex(b: u32, ) -> Weight {
+ (2_090_000 as Weight)
+ // Standard Error: 10_000
+ .saturating_add((9_230_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+ }
// Storage: Nonfungible TokenData (r:1 w:1)
// Storage: Nonfungible TokensBurnt (r:1 w:1)
// Storage: Nonfungible Allowance (r:1 w:0)
@@ -140,6 +154,19 @@
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))
}
+ // Storage: Nonfungible TokensMinted (r:1 w:1)
+ // Storage: Nonfungible AccountBalance (r:4 w:4)
+ // Storage: Nonfungible TokenData (r:0 w:4)
+ // Storage: Nonfungible Owned (r:0 w:4)
+ fn create_multiple_items_ex(b: u32, ) -> Weight {
+ (2_090_000 as Weight)
+ // Standard Error: 10_000
+ .saturating_add((9_230_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(RocksDbWeight::get().reads(1 as Weight))
+ .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(RocksDbWeight::get().writes(1 as Weight))
+ .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+ }
// Storage: Nonfungible TokenData (r:1 w:1)
// Storage: Nonfungible TokensBurnt (r:1 w:1)
// Storage: Nonfungible Allowance (r:1 w:0)
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -31,7 +31,8 @@
sender: &T::CrossAccountId,
users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,
) -> Result<TokenId, DispatchError> {
- <Pallet<T>>::create_item(&collection, sender, create_max_item_data(users))?;
+ let data: CreateRefungibleExData<T::CrossAccountId> = create_max_item_data(users);
+ <Pallet<T>>::create_item(&collection, sender, data)?;
Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))
}
@@ -60,6 +61,30 @@
let data = (0..b).map(|_| create_max_item_data([(to.clone(), 200)])).collect();
}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}
+ create_multiple_items_ex_multiple_items {
+ let b in 0..MAX_ITEMS_PER_BATCH;
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ sender: cross_from_sub(owner);
+ };
+ let data = (0..b).map(|t| {
+ bench_init!(to: cross_sub(t););
+ create_max_item_data([(to, 200)])
+ }).collect();
+ }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}
+
+ create_multiple_items_ex_multiple_owners {
+ let b in 0..MAX_ITEMS_PER_BATCH;
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ sender: cross_from_sub(owner);
+ };
+ let data = vec![create_max_item_data((0..b).map(|u| {
+ bench_init!(to: cross_sub(u););
+ (to, 200)
+ }))].try_into().unwrap();
+ }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}
+
// Other user left, token data is kept
burn_item_partial {
bench_init!{
@@ -170,6 +195,6 @@
sender: cross_from_sub(owner);
};
let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;
- let data = create_data(b as usize);
+ let data = create_var_data(b).try_into().unwrap();
}: {<Pallet<T>>::set_variable_metadata(&collection, &sender, item, data)?}
}
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -2,10 +2,10 @@
use sp_std::collections::btree_map::BTreeMap;
use frame_support::{dispatch::DispatchResultWithPostInfo, fail, weights::Weight, BoundedVec};
-use up_data_structs::{TokenId, CustomDataLimit};
+use up_data_structs::{TokenId, CustomDataLimit, CreateItemExData, CreateRefungibleExData};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::DispatchError;
-use sp_std::vec::Vec;
+use sp_std::{vec::Vec, vec};
use crate::{
AccountBalance, Allowance, Balance, Config, Error, Owned, Pallet, RefungibleHandle,
@@ -31,6 +31,18 @@
<SelfWeightOf<T>>::create_multiple_items(amount)
}
+ fn create_multiple_items_ex(call: &CreateItemExData<T::CrossAccountId>) -> Weight {
+ match call {
+ CreateItemExData::RefungibleMultipleOwners(i) => {
+ <SelfWeightOf<T>>::create_multiple_items_ex_multiple_owners(i.users.len() as u32)
+ }
+ CreateItemExData::RefungibleMultipleItems(i) => {
+ <SelfWeightOf<T>>::create_multiple_items_ex_multiple_items(i.len() as u32)
+ }
+ _ => 0,
+ }
+ }
+
fn burn_item() -> Weight {
max_weight_of!(burn_item_partial(), burn_item_fully())
}
@@ -69,15 +81,15 @@
fn map_create_data<T: Config>(
data: up_data_structs::CreateItemData,
to: &T::CrossAccountId,
-) -> Result<CreateItemData<T>, DispatchError> {
+) -> Result<CreateRefungibleExData<T::CrossAccountId>, DispatchError> {
match data {
- up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateItemData {
+ up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateRefungibleExData {
const_data: data.const_data,
variable_data: data.variable_data,
users: {
let mut out = BTreeMap::new();
out.insert(to.clone(), data.pieces);
- out
+ out.try_into().expect("limit > 0")
},
}),
_ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),
@@ -92,7 +104,7 @@
data: up_data_structs::CreateItemData,
) -> DispatchResultWithPostInfo {
with_weight(
- <Pallet<T>>::create_item(self, &sender, map_create_data(data, &to)?),
+ <Pallet<T>>::create_item(self, &sender, map_create_data::<T>(data, &to)?),
<CommonWeights<T>>::create_item(),
)
}
@@ -115,6 +127,28 @@
)
}
+ fn create_multiple_items_ex(
+ &self,
+ sender: <T>::CrossAccountId,
+ data: CreateItemExData<T::CrossAccountId>,
+ ) -> DispatchResultWithPostInfo {
+ let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);
+ let data = match data {
+ CreateItemExData::RefungibleMultipleOwners(r) => vec![r],
+ CreateItemExData::RefungibleMultipleItems(r)
+ if r.iter().all(|i| i.users.len() == 1) =>
+ {
+ r.into_inner()
+ }
+ _ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),
+ };
+
+ with_weight(
+ <Pallet<T>>::create_multiple_items(self, &sender, data),
+ weight,
+ )
+ }
+
fn burn_item(
&self,
sender: T::CrossAccountId,
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -2,7 +2,8 @@
use frame_support::{ensure, BoundedVec};
use up_data_structs::{
- AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId, CreateCollectionData,
+ AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId,
+ CreateCollectionData, CreateRefungibleExData,
};
use pallet_common::{
Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,
@@ -19,11 +20,6 @@
pub mod common;
pub mod erc;
pub mod weights;
-pub struct CreateItemData<T: Config> {
- pub const_data: BoundedVec<u8, CustomDataLimit>,
- pub variable_data: BoundedVec<u8, CustomDataLimit>,
- pub users: BTreeMap<T::CrossAccountId, u128>,
-}
pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
#[derive(Encode, Decode, Default, TypeInfo, MaxEncodedLen)]
@@ -361,7 +357,7 @@
pub fn create_multiple_items(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
- data: Vec<CreateItemData<T>>,
+ data: Vec<CreateRefungibleExData<T::CrossAccountId>>,
) -> DispatchResult {
if !collection.is_owner_or_admin(sender) {
ensure!(
@@ -606,7 +602,7 @@
pub fn create_item(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
- data: CreateItemData<T>,
+ data: CreateRefungibleExData<T::CrossAccountId>,
) -> DispatchResult {
Self::create_multiple_items(collection, sender, vec![data])
}
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -34,6 +34,8 @@
pub trait WeightInfo {
fn create_item() -> Weight;
fn create_multiple_items(b: u32, ) -> Weight;
+ fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight;
+ fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight;
fn burn_item_partial() -> Weight;
fn burn_item_fully() -> Weight;
fn transfer_normal() -> Weight;
@@ -77,6 +79,36 @@
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
}
+ // Storage: Refungible TokensMinted (r:1 w:1)
+ // Storage: Refungible AccountBalance (r:4 w:4)
+ // Storage: Refungible Balance (r:0 w:4)
+ // Storage: Refungible TotalSupply (r:0 w:4)
+ // Storage: Refungible TokenData (r:0 w:4)
+ // Storage: Refungible Owned (r:0 w:4)
+ fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
+ (11_953_000 as Weight)
+ // Standard Error: 27_000
+ .saturating_add((10_775_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(b as Weight)))
+ }
+ // Storage: Refungible TokensMinted (r:1 w:1)
+ // Storage: Refungible TotalSupply (r:0 w:1)
+ // Storage: Refungible TokenData (r:0 w:1)
+ // Storage: Refungible AccountBalance (r:4 w:4)
+ // Storage: Refungible Balance (r:0 w:4)
+ // Storage: Refungible Owned (r:0 w:4)
+ fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
+ (0 as Weight)
+ // Standard Error: 13_000
+ .saturating_add((8_528_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+ }
// Storage: Refungible TotalSupply (r:1 w:1)
// Storage: Refungible Balance (r:1 w:1)
// Storage: Refungible AccountBalance (r:1 w:1)
@@ -215,6 +247,36 @@
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
}
+ // Storage: Refungible TokensMinted (r:1 w:1)
+ // Storage: Refungible AccountBalance (r:4 w:4)
+ // Storage: Refungible Balance (r:0 w:4)
+ // Storage: Refungible TotalSupply (r:0 w:4)
+ // Storage: Refungible TokenData (r:0 w:4)
+ // Storage: Refungible Owned (r:0 w:4)
+ fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
+ (11_953_000 as Weight)
+ // Standard Error: 27_000
+ .saturating_add((10_775_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(RocksDbWeight::get().reads(1 as Weight))
+ .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(RocksDbWeight::get().writes(1 as Weight))
+ .saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(b as Weight)))
+ }
+ // Storage: Refungible TokensMinted (r:1 w:1)
+ // Storage: Refungible TotalSupply (r:0 w:1)
+ // Storage: Refungible TokenData (r:0 w:1)
+ // Storage: Refungible AccountBalance (r:4 w:4)
+ // Storage: Refungible Balance (r:0 w:4)
+ // Storage: Refungible Owned (r:0 w:4)
+ fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
+ (0 as Weight)
+ // Standard Error: 13_000
+ .saturating_add((8_528_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(RocksDbWeight::get().reads(1 as Weight))
+ .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(RocksDbWeight::get().writes(3 as Weight))
+ .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+ }
// Storage: Refungible TotalSupply (r:1 w:1)
// Storage: Refungible Balance (r:1 w:1)
// Storage: Refungible AccountBalance (r:1 w:1)
pallets/unique/src/common.rsdiffbeforeafterboth--- a/pallets/unique/src/common.rs
+++ b/pallets/unique/src/common.rs
@@ -5,6 +5,7 @@
use pallet_fungible::{common::CommonWeights as FungibleWeights};
use pallet_nonfungible::{common::CommonWeights as NonfungibleWeights};
use pallet_refungible::{common::CommonWeights as RefungibleWeights};
+use up_data_structs::CreateItemExData;
use crate::{Config, dispatch::dispatch_weight};
@@ -17,7 +18,7 @@
}
pub struct CommonWeights<T: Config>(PhantomData<T>);
-impl<T: Config> CommonWeightInfo for CommonWeights<T> {
+impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {
fn create_item() -> up_data_structs::Weight {
dispatch_weight::<T>() + max_weight_of!(create_item())
}
@@ -26,6 +27,10 @@
dispatch_weight::<T>() + max_weight_of!(create_multiple_items(amount))
}
+ fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {
+ dispatch_weight::<T>() + max_weight_of!(create_multiple_items_ex(data))
+ }
+
fn burn_item() -> Weight {
dispatch_weight::<T>() + max_weight_of!(burn_item())
}
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -40,7 +40,7 @@
OFFCHAIN_SCHEMA_LIMIT, MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH,
MAX_TOKEN_PREFIX_LENGTH, AccessMode, CreateItemData, CollectionLimits, CollectionId,
CollectionMode, TokenId, SchemaVersion, SponsorshipState, MetaUpdatePermission,
- CreateCollectionData, CustomDataLimit,
+ CreateCollectionData, CustomDataLimit, CreateItemExData,
};
use pallet_common::{
account::CrossAccountId, CollectionHandle, Pallet as PalletCommon, Error as CommonError,
@@ -735,6 +735,14 @@
dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items(sender, owner, items_data))
}
+ #[weight = <CommonWeights<T>>::create_multiple_items_ex(&data)]
+ #[transactional]
+ pub fn create_multiple_items_ex(origin, collection_id: CollectionId, data: CreateItemExData<T::CrossAccountId>) -> DispatchResultWithPostInfo {
+ let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+
+ dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items_ex(sender, data))
+ }
+
// TODO! transaction weight
/// Set transfers_enabled value for particular collection
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -1,6 +1,11 @@
#![cfg_attr(not(feature = "std"), no_std)]
-use core::convert::{TryFrom, TryInto};
+use core::{
+ convert::{TryFrom, TryInto},
+ fmt,
+};
+use frame_support::storage::bounded_btree_map::BoundedBTreeMap;
+use sp_std::collections::btree_map::BTreeMap;
#[cfg(feature = "serde")]
pub use serde::{Serialize, Deserialize};
@@ -525,6 +530,47 @@
ReFungible(CreateReFungibleData),
}
+#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]
+#[derivative(Debug)]
+pub struct CreateNftExData<CrossAccountId> {
+ #[derivative(Debug(format_with = "bounded_debug"))]
+ pub const_data: BoundedVec<u8, CustomDataLimit>,
+ #[derivative(Debug(format_with = "bounded_debug"))]
+ pub variable_data: BoundedVec<u8, CustomDataLimit>,
+ pub owner: CrossAccountId,
+}
+
+#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]
+#[derivative(Debug(bound = "CrossAccountId: fmt::Debug + Ord"))]
+pub struct CreateRefungibleExData<CrossAccountId> {
+ #[derivative(Debug(format_with = "bounded_debug"))]
+ pub const_data: BoundedVec<u8, CustomDataLimit>,
+ #[derivative(Debug(format_with = "bounded_debug"))]
+ pub variable_data: BoundedVec<u8, CustomDataLimit>,
+ #[derivative(Debug(format_with = "bounded_map_debug"))]
+ pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,
+}
+
+#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, TypeInfo, Derivative)]
+#[derivative(Debug(bound = "CrossAccountId: fmt::Debug + Ord"))]
+pub enum CreateItemExData<CrossAccountId> {
+ NFT(
+ #[derivative(Debug(format_with = "bounded_debug"))]
+ BoundedVec<CreateNftExData<CrossAccountId>, ConstU32<MAX_ITEMS_PER_BATCH>>,
+ ),
+ Fungible(
+ #[derivative(Debug(format_with = "bounded_map_debug"))]
+ BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,
+ ),
+ /// Many tokens, each may have only one owner
+ RefungibleMultipleItems(
+ #[derivative(Debug(format_with = "bounded_debug"))]
+ BoundedVec<CreateRefungibleExData<CrossAccountId>, ConstU32<MAX_ITEMS_PER_BATCH>>,
+ ),
+ /// Single token, which may have many owners
+ RefungibleMultipleOwners(CreateRefungibleExData<CrossAccountId>),
+}
+
impl CreateItemData {
pub fn data_size(&self) -> usize {
match self {