difftreelog
decoupling of unique and refungible pallets
in: master
16 files changed
.gitignorediffbeforeafterboth--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
/.idea/
/.cargo/
+/.vscode/
tests/.vscode
cumulus-parachain/
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6608,7 +6608,6 @@
"pallet-evm",
"pallet-evm-coder-substrate",
"pallet-nonfungible",
- "pallet-refungible",
"parity-scale-codec 3.1.5",
"scale-info",
"serde",
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1258,6 +1258,10 @@
}
}
+pub trait RefungibleExtensionsWeightInfo {
+ fn repartition() -> Weight;
+}
+
pub trait CommonCollectionOperations<T: Config> {
fn create_item(
&self,
@@ -1384,6 +1388,19 @@
spender: T::CrossAccountId,
token: TokenId,
) -> u128;
+ fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>>;
+}
+
+pub trait RefungibleExtensions<T>
+where
+ T: Config,
+{
+ fn repartition(
+ &self,
+ owner: &T::CrossAccountId,
+ token: TokenId,
+ amount: u128,
+ ) -> DispatchResultWithPostInfo;
}
// Flexible enough for implementing CommonCollectionOperations
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -18,7 +18,7 @@
use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};
use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget, CreateItemData};
-use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
+use pallet_common::{CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight};
use pallet_structure::Error as StructureError;
use sp_runtime::ArithmeticError;
use sp_std::{vec::Vec, vec};
@@ -399,4 +399,8 @@
}
<Allowance<T>>::get((self.id, sender, spender))
}
+
+ fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
+ None
+ }
}
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -22,7 +22,8 @@
PropertyKeyPermission, PropertyValue,
};
use pallet_common::{
- CommonCollectionOperations, CommonWeightInfo, with_weight, weights::WeightInfo as _,
+ CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight,
+ weights::WeightInfo as _,
};
use sp_runtime::DispatchError;
use sp_std::vec::Vec;
@@ -467,4 +468,8 @@
0
}
}
+
+ fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
+ None
+ }
}
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -203,4 +203,12 @@
let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;
<Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;
}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?}
+
+ repartition_item {
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ sender: cross_from_sub(owner); owner: cross_sub;
+ };
+ let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;
+ }: {<Pallet<T>>::repartition(&collection, &owner, item, 200)?}
}
pallets/refungible/src/common.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;1819use sp_std::collections::btree_map::BTreeMap;20use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};21use up_data_structs::{22 CollectionId, TokenId, CreateItemExData, CreateRefungibleExData, budget::Budget, Property,23 PropertyKey, PropertyValue, PropertyKeyPermission, CreateItemData,24};25use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};26use pallet_structure::Error as StructureError;27use sp_runtime::DispatchError;28use sp_std::{vec::Vec, vec};2930use crate::{31 AccountBalance, Allowance, Balance, Config, Error, Owned, Pallet, RefungibleHandle,32 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,33};3435macro_rules! max_weight_of {36 ($($method:ident ($($args:tt)*)),*) => {37 038 $(39 .max(<SelfWeightOf<T>>::$method($($args)*))40 )*41 };42}4344pub struct CommonWeights<T: Config>(PhantomData<T>);45impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {46 fn create_item() -> Weight {47 <SelfWeightOf<T>>::create_item()48 }4950 fn create_multiple_items(data: &[CreateItemData]) -> Weight {51 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32)52 }5354 fn create_multiple_items_ex(call: &CreateItemExData<T::CrossAccountId>) -> Weight {55 match call {56 CreateItemExData::RefungibleMultipleOwners(i) => {57 <SelfWeightOf<T>>::create_multiple_items_ex_multiple_owners(i.users.len() as u32)58 }59 CreateItemExData::RefungibleMultipleItems(i) => {60 <SelfWeightOf<T>>::create_multiple_items_ex_multiple_items(i.len() as u32)61 }62 _ => 0,63 }64 }6566 fn burn_item() -> Weight {67 max_weight_of!(burn_item_partial(), burn_item_fully())68 }6970 fn set_collection_properties(_amount: u32) -> Weight {71 // Error72 073 }7475 fn delete_collection_properties(_amount: u32) -> Weight {76 // Error77 078 }7980 fn set_token_properties(_amount: u32) -> Weight {81 // Error82 083 }8485 fn delete_token_properties(_amount: u32) -> Weight {86 // Error87 088 }8990 fn set_token_property_permissions(_amount: u32) -> Weight {91 // Error92 093 }9495 fn transfer() -> Weight {96 max_weight_of!(97 transfer_normal(),98 transfer_creating(),99 transfer_removing(),100 transfer_creating_removing()101 )102 }103104 fn approve() -> Weight {105 <SelfWeightOf<T>>::approve()106 }107108 fn transfer_from() -> Weight {109 max_weight_of!(110 transfer_from_normal(),111 transfer_from_creating(),112 transfer_from_removing(),113 transfer_from_creating_removing()114 )115 }116117 fn burn_from() -> Weight {118 <SelfWeightOf<T>>::burn_from()119 }120121 fn burn_recursively_self_raw() -> Weight {122 // Read to get total balance123 Self::burn_item() + T::DbWeight::get().reads(1)124 }125 fn burn_recursively_breadth_raw(_amount: u32) -> Weight {126 // Refungible token can't have children127 0128 }129}130131fn map_create_data<T: Config>(132 data: up_data_structs::CreateItemData,133 to: &T::CrossAccountId,134) -> Result<CreateRefungibleExData<T::CrossAccountId>, DispatchError> {135 match data {136 up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateRefungibleExData {137 const_data: data.const_data,138 users: {139 let mut out = BTreeMap::new();140 out.insert(to.clone(), data.pieces);141 out.try_into().expect("limit > 0")142 },143 }),144 _ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),145 }146}147148impl<T: Config> CommonCollectionOperations<T> for RefungibleHandle<T> {149 fn create_item(150 &self,151 sender: T::CrossAccountId,152 to: T::CrossAccountId,153 data: up_data_structs::CreateItemData,154 nesting_budget: &dyn Budget,155 ) -> DispatchResultWithPostInfo {156 with_weight(157 <Pallet<T>>::create_item(158 self,159 &sender,160 map_create_data::<T>(data, &to)?,161 nesting_budget,162 ),163 <CommonWeights<T>>::create_item(),164 )165 }166167 fn create_multiple_items(168 &self,169 sender: T::CrossAccountId,170 to: T::CrossAccountId,171 data: Vec<up_data_structs::CreateItemData>,172 nesting_budget: &dyn Budget,173 ) -> DispatchResultWithPostInfo {174 let weight = <CommonWeights<T>>::create_multiple_items(&data);175 let data = data176 .into_iter()177 .map(|d| map_create_data::<T>(d, &to))178 .collect::<Result<Vec<_>, DispatchError>>()?;179180 with_weight(181 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),182 weight,183 )184 }185186 fn create_multiple_items_ex(187 &self,188 sender: <T>::CrossAccountId,189 data: CreateItemExData<T::CrossAccountId>,190 nesting_budget: &dyn Budget,191 ) -> DispatchResultWithPostInfo {192 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);193 let data = match data {194 CreateItemExData::RefungibleMultipleOwners(r) => vec![r],195 CreateItemExData::RefungibleMultipleItems(r)196 if r.iter().all(|i| i.users.len() == 1) =>197 {198 r.into_inner()199 }200 _ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),201 };202203 with_weight(204 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),205 weight,206 )207 }208209 fn burn_item(210 &self,211 sender: T::CrossAccountId,212 token: TokenId,213 amount: u128,214 ) -> DispatchResultWithPostInfo {215 with_weight(216 <Pallet<T>>::burn(self, &sender, token, amount),217 <CommonWeights<T>>::burn_item(),218 )219 }220221 fn burn_item_recursively(222 &self,223 sender: T::CrossAccountId,224 token: TokenId,225 self_budget: &dyn Budget,226 _breadth_budget: &dyn Budget,227 ) -> DispatchResultWithPostInfo {228 ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);229 with_weight(230 <Pallet<T>>::burn(231 self,232 &sender,233 token,234 <Balance<T>>::get((self.id, token, &sender)),235 ),236 <CommonWeights<T>>::burn_recursively_self_raw(),237 )238 }239240 fn transfer(241 &self,242 from: T::CrossAccountId,243 to: T::CrossAccountId,244 token: TokenId,245 amount: u128,246 nesting_budget: &dyn Budget,247 ) -> DispatchResultWithPostInfo {248 with_weight(249 <Pallet<T>>::transfer(self, &from, &to, token, amount, nesting_budget),250 <CommonWeights<T>>::transfer(),251 )252 }253254 fn approve(255 &self,256 sender: T::CrossAccountId,257 spender: T::CrossAccountId,258 token: TokenId,259 amount: u128,260 ) -> DispatchResultWithPostInfo {261 with_weight(262 <Pallet<T>>::set_allowance(self, &sender, &spender, token, amount),263 <CommonWeights<T>>::approve(),264 )265 }266267 fn transfer_from(268 &self,269 sender: T::CrossAccountId,270 from: T::CrossAccountId,271 to: T::CrossAccountId,272 token: TokenId,273 amount: u128,274 nesting_budget: &dyn Budget,275 ) -> DispatchResultWithPostInfo {276 with_weight(277 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, amount, nesting_budget),278 <CommonWeights<T>>::transfer_from(),279 )280 }281282 fn burn_from(283 &self,284 sender: T::CrossAccountId,285 from: T::CrossAccountId,286 token: TokenId,287 amount: u128,288 nesting_budget: &dyn Budget,289 ) -> DispatchResultWithPostInfo {290 with_weight(291 <Pallet<T>>::burn_from(self, &sender, &from, token, amount, nesting_budget),292 <CommonWeights<T>>::burn_from(),293 )294 }295296 fn set_collection_properties(297 &self,298 _sender: T::CrossAccountId,299 _property: Vec<Property>,300 ) -> DispatchResultWithPostInfo {301 fail!(<Error<T>>::SettingPropertiesNotAllowed)302 }303304 fn delete_collection_properties(305 &self,306 _sender: &T::CrossAccountId,307 _property_keys: Vec<PropertyKey>,308 ) -> DispatchResultWithPostInfo {309 fail!(<Error<T>>::SettingPropertiesNotAllowed)310 }311312 fn set_token_properties(313 &self,314 _sender: T::CrossAccountId,315 _token_id: TokenId,316 _property: Vec<Property>,317 ) -> DispatchResultWithPostInfo {318 fail!(<Error<T>>::SettingPropertiesNotAllowed)319 }320321 fn set_token_property_permissions(322 &self,323 _sender: &T::CrossAccountId,324 _property_permissions: Vec<PropertyKeyPermission>,325 ) -> DispatchResultWithPostInfo {326 fail!(<Error<T>>::SettingPropertiesNotAllowed)327 }328329 fn delete_token_properties(330 &self,331 _sender: T::CrossAccountId,332 _token_id: TokenId,333 _property_keys: Vec<PropertyKey>,334 ) -> DispatchResultWithPostInfo {335 fail!(<Error<T>>::SettingPropertiesNotAllowed)336 }337338 fn check_nesting(339 &self,340 _sender: <T>::CrossAccountId,341 _from: (CollectionId, TokenId),342 _under: TokenId,343 _budget: &dyn Budget,344 ) -> sp_runtime::DispatchResult {345 fail!(<Error<T>>::RefungibleDisallowsNesting)346 }347348 fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}349350 fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}351352 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {353 <Owned<T>>::iter_prefix((self.id, account))354 .map(|(id, _)| id)355 .collect()356 }357358 fn collection_tokens(&self) -> Vec<TokenId> {359 <TokenData<T>>::iter_prefix((self.id,))360 .map(|(id, _)| id)361 .collect()362 }363364 fn token_exists(&self, token: TokenId) -> bool {365 <Pallet<T>>::token_exists(self, token)366 }367368 fn last_token_id(&self) -> TokenId {369 TokenId(<TokensMinted<T>>::get(self.id))370 }371372 fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {373 None374 }375376 fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {377 None378 }379380 fn token_properties(381 &self,382 _token_id: TokenId,383 _keys: Option<Vec<PropertyKey>>,384 ) -> Vec<Property> {385 Vec::new()386 }387388 fn total_supply(&self) -> u32 {389 <Pallet<T>>::total_supply(self)390 }391392 fn account_balance(&self, account: T::CrossAccountId) -> u32 {393 <AccountBalance<T>>::get((self.id, account))394 }395396 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {397 <Balance<T>>::get((self.id, token, account))398 }399400 fn allowance(401 &self,402 sender: T::CrossAccountId,403 spender: T::CrossAccountId,404 token: TokenId,405 ) -> u128 {406 <Allowance<T>>::get((self.id, token, sender, spender))407 }408}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;1819use sp_std::collections::btree_map::BTreeMap;20use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};21use up_data_structs::{22 CollectionId, TokenId, CreateItemExData, CreateRefungibleExData, budget::Budget, Property,23 PropertyKey, PropertyValue, PropertyKeyPermission, CreateItemData,24};25use pallet_common::{CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight};26use pallet_structure::Error as StructureError;27use sp_runtime::{DispatchError};28use sp_std::{vec::Vec, vec};2930use crate::{31 AccountBalance, Allowance, Balance, Config, Error, Owned, Pallet, RefungibleHandle,32 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,33};3435macro_rules! max_weight_of {36 ($($method:ident ($($args:tt)*)),*) => {37 038 $(39 .max(<SelfWeightOf<T>>::$method($($args)*))40 )*41 };42}4344pub struct CommonWeights<T: Config>(PhantomData<T>);45impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {46 fn create_item() -> Weight {47 <SelfWeightOf<T>>::create_item()48 }4950 fn create_multiple_items(data: &[CreateItemData]) -> Weight {51 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32)52 }5354 fn create_multiple_items_ex(call: &CreateItemExData<T::CrossAccountId>) -> Weight {55 match call {56 CreateItemExData::RefungibleMultipleOwners(i) => {57 <SelfWeightOf<T>>::create_multiple_items_ex_multiple_owners(i.users.len() as u32)58 }59 CreateItemExData::RefungibleMultipleItems(i) => {60 <SelfWeightOf<T>>::create_multiple_items_ex_multiple_items(i.len() as u32)61 }62 _ => 0,63 }64 }6566 fn burn_item() -> Weight {67 max_weight_of!(burn_item_partial(), burn_item_fully())68 }6970 fn set_collection_properties(_amount: u32) -> Weight {71 // Error72 073 }7475 fn delete_collection_properties(_amount: u32) -> Weight {76 // Error77 078 }7980 fn set_token_properties(_amount: u32) -> Weight {81 // Error82 083 }8485 fn delete_token_properties(_amount: u32) -> Weight {86 // Error87 088 }8990 fn set_token_property_permissions(_amount: u32) -> Weight {91 // Error92 093 }9495 fn transfer() -> Weight {96 max_weight_of!(97 transfer_normal(),98 transfer_creating(),99 transfer_removing(),100 transfer_creating_removing()101 )102 }103104 fn approve() -> Weight {105 <SelfWeightOf<T>>::approve()106 }107108 fn transfer_from() -> Weight {109 max_weight_of!(110 transfer_from_normal(),111 transfer_from_creating(),112 transfer_from_removing(),113 transfer_from_creating_removing()114 )115 }116117 fn burn_from() -> Weight {118 <SelfWeightOf<T>>::burn_from()119 }120121 fn burn_recursively_self_raw() -> Weight {122 // Read to get total balance123 Self::burn_item() + T::DbWeight::get().reads(1)124 }125 fn burn_recursively_breadth_raw(_amount: u32) -> Weight {126 // Refungible token can't have children127 0128 }129}130131fn map_create_data<T: Config>(132 data: up_data_structs::CreateItemData,133 to: &T::CrossAccountId,134) -> Result<CreateRefungibleExData<T::CrossAccountId>, DispatchError> {135 match data {136 up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateRefungibleExData {137 const_data: data.const_data,138 users: {139 let mut out = BTreeMap::new();140 out.insert(to.clone(), data.pieces);141 out.try_into().expect("limit > 0")142 },143 }),144 _ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),145 }146}147148impl<T: Config> CommonCollectionOperations<T> for RefungibleHandle<T> {149 fn create_item(150 &self,151 sender: T::CrossAccountId,152 to: T::CrossAccountId,153 data: up_data_structs::CreateItemData,154 nesting_budget: &dyn Budget,155 ) -> DispatchResultWithPostInfo {156 with_weight(157 <Pallet<T>>::create_item(158 self,159 &sender,160 map_create_data::<T>(data, &to)?,161 nesting_budget,162 ),163 <CommonWeights<T>>::create_item(),164 )165 }166167 fn create_multiple_items(168 &self,169 sender: T::CrossAccountId,170 to: T::CrossAccountId,171 data: Vec<up_data_structs::CreateItemData>,172 nesting_budget: &dyn Budget,173 ) -> DispatchResultWithPostInfo {174 let weight = <CommonWeights<T>>::create_multiple_items(&data);175 let data = data176 .into_iter()177 .map(|d| map_create_data::<T>(d, &to))178 .collect::<Result<Vec<_>, DispatchError>>()?;179180 with_weight(181 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),182 weight,183 )184 }185186 fn create_multiple_items_ex(187 &self,188 sender: <T>::CrossAccountId,189 data: CreateItemExData<T::CrossAccountId>,190 nesting_budget: &dyn Budget,191 ) -> DispatchResultWithPostInfo {192 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);193 let data = match data {194 CreateItemExData::RefungibleMultipleOwners(r) => vec![r],195 CreateItemExData::RefungibleMultipleItems(r)196 if r.iter().all(|i| i.users.len() == 1) =>197 {198 r.into_inner()199 }200 _ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),201 };202203 with_weight(204 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),205 weight,206 )207 }208209 fn burn_item(210 &self,211 sender: T::CrossAccountId,212 token: TokenId,213 amount: u128,214 ) -> DispatchResultWithPostInfo {215 with_weight(216 <Pallet<T>>::burn(self, &sender, token, amount),217 <CommonWeights<T>>::burn_item(),218 )219 }220221 fn burn_item_recursively(222 &self,223 sender: T::CrossAccountId,224 token: TokenId,225 self_budget: &dyn Budget,226 _breadth_budget: &dyn Budget,227 ) -> DispatchResultWithPostInfo {228 ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);229 with_weight(230 <Pallet<T>>::burn(231 self,232 &sender,233 token,234 <Balance<T>>::get((self.id, token, &sender)),235 ),236 <CommonWeights<T>>::burn_recursively_self_raw(),237 )238 }239240 fn transfer(241 &self,242 from: T::CrossAccountId,243 to: T::CrossAccountId,244 token: TokenId,245 amount: u128,246 nesting_budget: &dyn Budget,247 ) -> DispatchResultWithPostInfo {248 with_weight(249 <Pallet<T>>::transfer(self, &from, &to, token, amount, nesting_budget),250 <CommonWeights<T>>::transfer(),251 )252 }253254 fn approve(255 &self,256 sender: T::CrossAccountId,257 spender: T::CrossAccountId,258 token: TokenId,259 amount: u128,260 ) -> DispatchResultWithPostInfo {261 with_weight(262 <Pallet<T>>::set_allowance(self, &sender, &spender, token, amount),263 <CommonWeights<T>>::approve(),264 )265 }266267 fn transfer_from(268 &self,269 sender: T::CrossAccountId,270 from: T::CrossAccountId,271 to: T::CrossAccountId,272 token: TokenId,273 amount: u128,274 nesting_budget: &dyn Budget,275 ) -> DispatchResultWithPostInfo {276 with_weight(277 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, amount, nesting_budget),278 <CommonWeights<T>>::transfer_from(),279 )280 }281282 fn burn_from(283 &self,284 sender: T::CrossAccountId,285 from: T::CrossAccountId,286 token: TokenId,287 amount: u128,288 nesting_budget: &dyn Budget,289 ) -> DispatchResultWithPostInfo {290 with_weight(291 <Pallet<T>>::burn_from(self, &sender, &from, token, amount, nesting_budget),292 <CommonWeights<T>>::burn_from(),293 )294 }295296 fn set_collection_properties(297 &self,298 _sender: T::CrossAccountId,299 _property: Vec<Property>,300 ) -> DispatchResultWithPostInfo {301 fail!(<Error<T>>::SettingPropertiesNotAllowed)302 }303304 fn delete_collection_properties(305 &self,306 _sender: &T::CrossAccountId,307 _property_keys: Vec<PropertyKey>,308 ) -> DispatchResultWithPostInfo {309 fail!(<Error<T>>::SettingPropertiesNotAllowed)310 }311312 fn set_token_properties(313 &self,314 _sender: T::CrossAccountId,315 _token_id: TokenId,316 _property: Vec<Property>,317 ) -> DispatchResultWithPostInfo {318 fail!(<Error<T>>::SettingPropertiesNotAllowed)319 }320321 fn set_token_property_permissions(322 &self,323 _sender: &T::CrossAccountId,324 _property_permissions: Vec<PropertyKeyPermission>,325 ) -> DispatchResultWithPostInfo {326 fail!(<Error<T>>::SettingPropertiesNotAllowed)327 }328329 fn delete_token_properties(330 &self,331 _sender: T::CrossAccountId,332 _token_id: TokenId,333 _property_keys: Vec<PropertyKey>,334 ) -> DispatchResultWithPostInfo {335 fail!(<Error<T>>::SettingPropertiesNotAllowed)336 }337338 fn check_nesting(339 &self,340 _sender: <T>::CrossAccountId,341 _from: (CollectionId, TokenId),342 _under: TokenId,343 _budget: &dyn Budget,344 ) -> sp_runtime::DispatchResult {345 fail!(<Error<T>>::RefungibleDisallowsNesting)346 }347348 fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}349350 fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}351352 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {353 <Owned<T>>::iter_prefix((self.id, account))354 .map(|(id, _)| id)355 .collect()356 }357358 fn collection_tokens(&self) -> Vec<TokenId> {359 <TokenData<T>>::iter_prefix((self.id,))360 .map(|(id, _)| id)361 .collect()362 }363364 fn token_exists(&self, token: TokenId) -> bool {365 <Pallet<T>>::token_exists(self, token)366 }367368 fn last_token_id(&self) -> TokenId {369 TokenId(<TokensMinted<T>>::get(self.id))370 }371372 fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {373 None374 }375376 fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {377 None378 }379380 fn token_properties(381 &self,382 _token_id: TokenId,383 _keys: Option<Vec<PropertyKey>>,384 ) -> Vec<Property> {385 Vec::new()386 }387388 fn total_supply(&self) -> u32 {389 <Pallet<T>>::total_supply(self)390 }391392 fn account_balance(&self, account: T::CrossAccountId) -> u32 {393 <AccountBalance<T>>::get((self.id, account))394 }395396 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {397 <Balance<T>>::get((self.id, token, account))398 }399400 fn allowance(401 &self,402 sender: T::CrossAccountId,403 spender: T::CrossAccountId,404 token: TokenId,405 ) -> u128 {406 <Allowance<T>>::get((self.id, token, sender, spender))407 }408409 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {410 Some(self)411 }412}413414impl<T: Config> RefungibleExtensions<T> for RefungibleHandle<T> {415 fn repartition(416 &self,417 owner: &T::CrossAccountId,418 token: TokenId,419 amount: u128,420 ) -> DispatchResultWithPostInfo {421 with_weight(422 <Pallet<T>>::repartition(self, owner, token, amount),423 <SelfWeightOf<T>>::repartition_item(),424 )425 }426}pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -688,8 +688,8 @@
}
pub fn repartition(
+ collection: &RefungibleHandle<T>,
owner: &T::CrossAccountId,
- collection: &RefungibleHandle<T>,
token: TokenId,
amount: u128,
) -> DispatchResult {
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -3,7 +3,7 @@
//! Autogenerated weights for pallet_refungible
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-27, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
@@ -49,6 +49,7 @@
fn transfer_from_removing() -> Weight;
fn transfer_from_creating_removing() -> Weight;
fn burn_from() -> Weight;
+ fn repartition_item() -> Weight;
}
/// Weights for pallet_refungible using the Substrate node and recommended hardware.
@@ -61,7 +62,7 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (21_321_000 as Weight)
+ (17_553_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
@@ -72,9 +73,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (16_313_000 as Weight)
- // Standard Error: 4_000
- .saturating_add((5_464_000 as Weight).saturating_mul(b as Weight))
+ (10_654_000 as Weight)
+ // Standard Error: 1_000
+ .saturating_add((5_114_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
@@ -86,9 +87,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
- (15_631_000 as Weight)
- // Standard Error: 5_000
- .saturating_add((8_141_000 as Weight).saturating_mul(b as Weight))
+ (3_587_000 as Weight)
+ // Standard Error: 2_000
+ .saturating_add((7_931_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))
@@ -101,9 +102,9 @@
// Storage: Refungible Balance (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
- (11_191_000 as Weight)
- // Standard Error: 4_000
- .saturating_add((6_321_000 as Weight).saturating_mul(b as Weight))
+ (1_980_000 as Weight)
+ // Standard Error: 2_000
+ .saturating_add((6_305_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))
@@ -114,7 +115,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_partial() -> Weight {
- (24_421_000 as Weight)
+ (21_010_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -125,13 +126,13 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_fully() -> Weight {
- (32_900_000 as Weight)
+ (28_413_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Refungible Balance (r:2 w:2)
fn transfer_normal() -> Weight {
- (20_215_000 as Weight)
+ (17_513_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
@@ -139,7 +140,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_creating() -> Weight {
- (24_809_000 as Weight)
+ (20_469_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -147,7 +148,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_removing() -> Weight {
- (26_704_000 as Weight)
+ (22_472_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -155,21 +156,21 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_creating_removing() -> Weight {
- (28_728_000 as Weight)
+ (24_866_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Refungible Balance (r:1 w:0)
// Storage: Refungible Allowance (r:0 w:1)
fn approve() -> Weight {
- (16_107_000 as Weight)
+ (13_475_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Refungible Allowance (r:1 w:1)
// Storage: Refungible Balance (r:2 w:2)
fn transfer_from_normal() -> Weight {
- (28_765_000 as Weight)
+ (24_707_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
@@ -178,7 +179,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_creating() -> Weight {
- (32_788_000 as Weight)
+ (27_812_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -187,7 +188,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_removing() -> Weight {
- (34_523_000 as Weight)
+ (29_966_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -196,7 +197,7 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_from_creating_removing() -> Weight {
- (36_749_000 as Weight)
+ (31_660_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(7 as Weight))
}
@@ -208,10 +209,17 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_from() -> Weight {
- (42_259_000 as Weight)
+ (36_248_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(7 as Weight))
}
+ // Storage: Refungible TotalSupply (r:1 w:1)
+ // Storage: Refungible Balance (r:1 w:1)
+ fn repartition_item() -> Weight {
+ (8_226_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
}
// For backwards compatibility and tests
@@ -223,7 +231,7 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (21_321_000 as Weight)
+ (17_553_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
@@ -234,9 +242,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (16_313_000 as Weight)
- // Standard Error: 4_000
- .saturating_add((5_464_000 as Weight).saturating_mul(b as Weight))
+ (10_654_000 as Weight)
+ // Standard Error: 1_000
+ .saturating_add((5_114_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
@@ -248,9 +256,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
- (15_631_000 as Weight)
- // Standard Error: 5_000
- .saturating_add((8_141_000 as Weight).saturating_mul(b as Weight))
+ (3_587_000 as Weight)
+ // Standard Error: 2_000
+ .saturating_add((7_931_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))
@@ -263,9 +271,9 @@
// Storage: Refungible Balance (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
- (11_191_000 as Weight)
- // Standard Error: 4_000
- .saturating_add((6_321_000 as Weight).saturating_mul(b as Weight))
+ (1_980_000 as Weight)
+ // Standard Error: 2_000
+ .saturating_add((6_305_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))
@@ -276,7 +284,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_partial() -> Weight {
- (24_421_000 as Weight)
+ (21_010_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -287,13 +295,13 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_fully() -> Weight {
- (32_900_000 as Weight)
+ (28_413_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Refungible Balance (r:2 w:2)
fn transfer_normal() -> Weight {
- (20_215_000 as Weight)
+ (17_513_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
@@ -301,7 +309,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_creating() -> Weight {
- (24_809_000 as Weight)
+ (20_469_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -309,7 +317,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_removing() -> Weight {
- (26_704_000 as Weight)
+ (22_472_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -317,21 +325,21 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_creating_removing() -> Weight {
- (28_728_000 as Weight)
+ (24_866_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Refungible Balance (r:1 w:0)
// Storage: Refungible Allowance (r:0 w:1)
fn approve() -> Weight {
- (16_107_000 as Weight)
+ (13_475_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Refungible Allowance (r:1 w:1)
// Storage: Refungible Balance (r:2 w:2)
fn transfer_from_normal() -> Weight {
- (28_765_000 as Weight)
+ (24_707_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
}
@@ -340,7 +348,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_creating() -> Weight {
- (32_788_000 as Weight)
+ (27_812_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -349,7 +357,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_removing() -> Weight {
- (34_523_000 as Weight)
+ (29_966_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -358,7 +366,7 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_from_creating_removing() -> Weight {
- (36_749_000 as Weight)
+ (31_660_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(7 as Weight))
}
@@ -370,8 +378,15 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_from() -> Weight {
- (42_259_000 as Weight)
+ (36_248_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(7 as Weight))
}
+ // Storage: Refungible TotalSupply (r:1 w:1)
+ // Storage: Refungible Balance (r:1 w:1)
+ fn repartition_item() -> Weight {
+ (8_226_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(2 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(2 as Weight))
+ }
}
pallets/unique/Cargo.tomldiffbeforeafterboth--- a/pallets/unique/Cargo.toml
+++ b/pallets/unique/Cargo.toml
@@ -103,4 +103,3 @@
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
pallet-nonfungible = { default-features = false, path = '../../pallets/nonfungible' }
-pallet-refungible = { default-features = false, path = '../../pallets/refungible' }
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -45,9 +45,8 @@
use pallet_evm::account::CrossAccountId;
use pallet_common::{
CollectionHandle, Pallet as PalletCommon, CommonWeightInfo, dispatch::dispatch_tx,
- dispatch::CollectionDispatch,
+ dispatch::CollectionDispatch, RefungibleExtensionsWeightInfo,
};
-use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle};
pub mod eth;
#[cfg(feature = "runtime-benchmarks")]
@@ -71,14 +70,13 @@
}
}
-pub trait Config:
- system::Config + pallet_common::Config + pallet_refungible::Config + Sized + TypeInfo
-{
+pub trait Config: system::Config + pallet_common::Config + Sized + TypeInfo {
type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
/// Weight information for extrinsics in this pallet.
type WeightInfo: WeightInfo;
type CommonWeightInfo: CommonWeightInfo<Self::CrossAccountId>;
+ type RefungibleExtensionsWeightInfo: RefungibleExtensionsWeightInfo;
}
decl_event! {
@@ -904,23 +902,22 @@
target_collection.save()
}
- #[weight = <SelfWeightOf<T>>::set_collection_limits()]
+ #[weight = T::RefungibleExtensionsWeightInfo::repartition()]
#[transactional]
pub fn repartition(
origin,
collection_id: CollectionId,
token: TokenId,
amount: u128,
- ) -> DispatchResult {
+ ) -> DispatchResultWithPostInfo {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
- let target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
- target_collection.check_is_internal()?;
- let refungible_collection = match target_collection.mode {
- CollectionMode::ReFungible => RefungibleHandle::cast(target_collection),
- _ => fail!(<Error<T>>::RepartitionCalledOnNonRefungibleCollection),
- };
- <PalletRefungible<T>>::repartition(&sender, &refungible_collection, token, amount)?;
- Ok(())
+ dispatch_tx::<T, _>(collection_id, |d| {
+ if let Some(refungible_extensions) = d.refungible_extensions() {
+ refungible_extensions.repartition(&sender, token, amount)
+ } else {
+ fail!(<Error<T>>::RepartitionCalledOnNonRefungibleCollection)
+ }
+ })
}
}
}
pallets/unique/src/weights.rsdiffbeforeafterboth--- a/pallets/unique/src/weights.rs
+++ b/pallets/unique/src/weights.rs
@@ -3,7 +3,7 @@
//! Autogenerated weights for pallet_unique
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-06-28, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
@@ -57,7 +57,7 @@
// Storage: Common CollectionProperties (r:0 w:1)
// Storage: Common CollectionById (r:0 w:1)
fn create_collection() -> Weight {
- (39_427_000 as Weight)
+ (53_511_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
@@ -69,27 +69,27 @@
// Storage: Common AdminAmount (r:0 w:1)
// Storage: Common CollectionProperties (r:0 w:1)
fn destroy_collection() -> Weight {
- (48_339_000 as Weight)
+ (69_481_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
fn add_to_allow_list() -> Weight {
- (17_379_000 as Weight)
+ (22_892_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
fn remove_from_allow_list() -> Weight {
- (17_490_000 as Weight)
+ (22_973_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn change_collection_owner() -> Weight {
- (17_701_000 as Weight)
+ (22_392_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -97,7 +97,7 @@
// Storage: Common IsAdmin (r:1 w:1)
// Storage: Common AdminAmount (r:1 w:1)
fn add_collection_admin() -> Weight {
- (23_301_000 as Weight)
+ (30_298_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
@@ -105,37 +105,37 @@
// Storage: Common IsAdmin (r:1 w:1)
// Storage: Common AdminAmount (r:1 w:1)
fn remove_collection_admin() -> Weight {
- (24_859_000 as Weight)
+ (32_842_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_collection_sponsor() -> Weight {
- (17_795_000 as Weight)
+ (22_613_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn confirm_sponsorship() -> Weight {
- (17_297_000 as Weight)
+ (22_462_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn remove_collection_sponsor() -> Weight {
- (17_079_000 as Weight)
+ (21_730_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_transfers_enabled_flag() -> Weight {
- (9_734_000 as Weight)
+ (10_941_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_collection_limits() -> Weight {
- (17_998_000 as Weight)
+ (22_363_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -150,7 +150,7 @@
// Storage: Common CollectionProperties (r:0 w:1)
// Storage: Common CollectionById (r:0 w:1)
fn create_collection() -> Weight {
- (39_427_000 as Weight)
+ (53_511_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
@@ -162,27 +162,27 @@
// Storage: Common AdminAmount (r:0 w:1)
// Storage: Common CollectionProperties (r:0 w:1)
fn destroy_collection() -> Weight {
- (48_339_000 as Weight)
+ (69_481_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
fn add_to_allow_list() -> Weight {
- (17_379_000 as Weight)
+ (22_892_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
fn remove_from_allow_list() -> Weight {
- (17_490_000 as Weight)
+ (22_973_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn change_collection_owner() -> Weight {
- (17_701_000 as Weight)
+ (22_392_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -190,7 +190,7 @@
// Storage: Common IsAdmin (r:1 w:1)
// Storage: Common AdminAmount (r:1 w:1)
fn add_collection_admin() -> Weight {
- (23_301_000 as Weight)
+ (30_298_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
@@ -198,37 +198,37 @@
// Storage: Common IsAdmin (r:1 w:1)
// Storage: Common AdminAmount (r:1 w:1)
fn remove_collection_admin() -> Weight {
- (24_859_000 as Weight)
+ (32_842_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_collection_sponsor() -> Weight {
- (17_795_000 as Weight)
+ (22_613_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn confirm_sponsorship() -> Weight {
- (17_297_000 as Weight)
+ (22_462_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn remove_collection_sponsor() -> Weight {
- (17_079_000 as Weight)
+ (21_730_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_transfers_enabled_flag() -> Weight {
- (9_734_000 as Weight)
+ (10_941_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:1)
fn set_collection_limits() -> Weight {
- (17_998_000 as Weight)
+ (22_363_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
runtime/common/src/weights.rsdiffbeforeafterboth--- a/runtime/common/src/weights.rs
+++ b/runtime/common/src/weights.rs
@@ -16,11 +16,13 @@
use core::marker::PhantomData;
use frame_support::{weights::Weight};
-use pallet_common::{CommonWeightInfo, dispatch::dispatch_weight};
+use pallet_common::{CommonWeightInfo, dispatch::dispatch_weight, RefungibleExtensionsWeightInfo};
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 pallet_refungible::{
+ Config as RefungibleConfig, weights::WeightInfo, common::CommonWeights as RefungibleWeights,
+};
use up_data_structs::{CreateItemExData, CreateItemData};
macro_rules! max_weight_of {
@@ -98,3 +100,12 @@
max_weight_of!(burn_recursively_breadth_raw(amount))
}
}
+
+impl<T> RefungibleExtensionsWeightInfo for CommonWeights<T>
+where
+ T: FungibleConfig + NonfungibleConfig + RefungibleConfig,
+{
+ fn repartition() -> Weight {
+ dispatch_weight::<T>() + <<T as RefungibleConfig>::WeightInfo>::repartition_item()
+ }
+}
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -925,6 +925,7 @@
type Event = Event;
type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;
type CommonWeightInfo = CommonWeights<Self>;
+ type RefungibleExtensionsWeightInfo = CommonWeights<Self>;
}
parameter_types! {
runtime/tests/src/lib.rsdiffbeforeafterboth--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -255,6 +255,7 @@
type Event = ();
type WeightInfo = ();
type CommonWeightInfo = CommonWeights<Self>;
+ type RefungibleExtensionsWeightInfo = CommonWeights<Self>;
}
// Build genesis storage according to the mock runtime.
runtime/tests/src/tests.rsdiffbeforeafterboth--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -21,7 +21,7 @@
CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT, TokenId,
MAX_TOKEN_OWNERSHIP, CreateCollectionData, CollectionMode, AccessMode, CollectionPermissions,
PropertyKeyPermission, PropertyPermission, Property, CollectionPropertiesVec,
- CollectionPropertiesPermissionsVec, TokenChild,
+ CollectionPropertiesPermissionsVec,
};
use frame_support::{assert_noop, assert_ok, assert_err};
use sp_std::convert::TryInto;