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.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;1819use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight};20use up_data_structs::{21 TokenId, CreateItemExData, CollectionId, budget::Budget, Property, PropertyKey,22 PropertyKeyPermission, PropertyValue,23};24use pallet_common::{25 CommonCollectionOperations, CommonWeightInfo, with_weight, weights::WeightInfo as _,26};27use sp_runtime::DispatchError;28use sp_std::vec::Vec;2930use crate::{31 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,32 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,33};3435pub struct CommonWeights<T: Config>(PhantomData<T>);36impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {37 fn create_item() -> Weight {38 <SelfWeightOf<T>>::create_item()39 }4041 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {42 match data {43 CreateItemExData::NFT(t) => {44 <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32)45 + t.iter()46 .map(|t| {47 if t.properties.len() > 0 {48 Self::set_token_properties(t.properties.len() as u32)49 } else {50 051 }52 })53 .sum::<u64>()54 }55 _ => 0,56 }57 }5859 fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {60 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32)61 + data62 .iter()63 .filter_map(|t| match t {64 up_data_structs::CreateItemData::NFT(n) if n.properties.len() > 0 => {65 Some(Self::set_token_properties(n.properties.len() as u32))66 }67 _ => None,68 })69 .sum::<u64>()70 }7172 fn burn_item() -> Weight {73 <SelfWeightOf<T>>::burn_item()74 }7576 fn set_collection_properties(amount: u32) -> Weight {77 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)78 }7980 fn delete_collection_properties(amount: u32) -> Weight {81 <pallet_common::SelfWeightOf<T>>::delete_collection_properties(amount)82 }8384 fn set_token_properties(amount: u32) -> Weight {85 <SelfWeightOf<T>>::set_token_properties(amount)86 }8788 fn delete_token_properties(amount: u32) -> Weight {89 <SelfWeightOf<T>>::delete_token_properties(amount)90 }9192 fn set_token_property_permissions(amount: u32) -> Weight {93 <SelfWeightOf<T>>::set_token_property_permissions(amount)94 }9596 fn transfer() -> Weight {97 <SelfWeightOf<T>>::transfer()98 }99100 fn approve() -> Weight {101 <SelfWeightOf<T>>::approve()102 }103104 fn transfer_from() -> Weight {105 <SelfWeightOf<T>>::transfer_from()106 }107108 fn burn_from() -> Weight {109 <SelfWeightOf<T>>::burn_from()110 }111112 fn burn_recursively_self_raw() -> Weight {113 <SelfWeightOf<T>>::burn_recursively_self_raw()114 }115116 fn burn_recursively_breadth_raw(amount: u32) -> Weight {117 <SelfWeightOf<T>>::burn_recursively_breadth_plus_self_plus_self_per_each_raw(amount)118 .saturating_sub(Self::burn_recursively_self_raw().saturating_mul(amount as u64 + 1))119 }120}121122fn map_create_data<T: Config>(123 data: up_data_structs::CreateItemData,124 to: &T::CrossAccountId,125) -> Result<CreateItemData<T>, DispatchError> {126 match data {127 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {128 properties: data.properties,129 owner: to.clone(),130 }),131 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),132 }133}134135impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {136 fn create_item(137 &self,138 sender: T::CrossAccountId,139 to: T::CrossAccountId,140 data: up_data_structs::CreateItemData,141 nesting_budget: &dyn Budget,142 ) -> DispatchResultWithPostInfo {143 with_weight(144 <Pallet<T>>::create_item(145 self,146 &sender,147 map_create_data::<T>(data, &to)?,148 nesting_budget,149 ),150 <CommonWeights<T>>::create_item(),151 )152 }153154 fn create_multiple_items(155 &self,156 sender: T::CrossAccountId,157 to: T::CrossAccountId,158 data: Vec<up_data_structs::CreateItemData>,159 nesting_budget: &dyn Budget,160 ) -> DispatchResultWithPostInfo {161 let weight = <CommonWeights<T>>::create_multiple_items(&data);162 let data = data163 .into_iter()164 .map(|d| map_create_data::<T>(d, &to))165 .collect::<Result<Vec<_>, DispatchError>>()?;166167 with_weight(168 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),169 weight,170 )171 }172173 fn create_multiple_items_ex(174 &self,175 sender: <T>::CrossAccountId,176 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,177 nesting_budget: &dyn Budget,178 ) -> DispatchResultWithPostInfo {179 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);180 let data = match data {181 up_data_structs::CreateItemExData::NFT(nft) => nft,182 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),183 };184185 with_weight(186 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),187 weight,188 )189 }190191 fn set_collection_properties(192 &self,193 sender: T::CrossAccountId,194 properties: Vec<Property>,195 ) -> DispatchResultWithPostInfo {196 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);197198 with_weight(199 <Pallet<T>>::set_collection_properties(self, &sender, properties),200 weight,201 )202 }203204 fn delete_collection_properties(205 &self,206 sender: &T::CrossAccountId,207 property_keys: Vec<PropertyKey>,208 ) -> DispatchResultWithPostInfo {209 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);210211 with_weight(212 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),213 weight,214 )215 }216217 fn set_token_properties(218 &self,219 sender: T::CrossAccountId,220 token_id: TokenId,221 properties: Vec<Property>,222 ) -> DispatchResultWithPostInfo {223 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);224225 with_weight(226 <Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false),227 weight,228 )229 }230231 fn delete_token_properties(232 &self,233 sender: T::CrossAccountId,234 token_id: TokenId,235 property_keys: Vec<PropertyKey>,236 ) -> DispatchResultWithPostInfo {237 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);238239 with_weight(240 <Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys),241 weight,242 )243 }244245 fn set_token_property_permissions(246 &self,247 sender: &T::CrossAccountId,248 property_permissions: Vec<PropertyKeyPermission>,249 ) -> DispatchResultWithPostInfo {250 let weight =251 <CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);252253 with_weight(254 <Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),255 weight,256 )257 }258259 fn burn_item(260 &self,261 sender: T::CrossAccountId,262 token: TokenId,263 amount: u128,264 ) -> DispatchResultWithPostInfo {265 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);266 if amount == 1 {267 with_weight(268 <Pallet<T>>::burn(self, &sender, token),269 <CommonWeights<T>>::burn_item(),270 )271 } else {272 Ok(().into())273 }274 }275276 fn burn_item_recursively(277 &self,278 sender: T::CrossAccountId,279 token: TokenId,280 self_budget: &dyn Budget,281 breadth_budget: &dyn Budget,282 ) -> DispatchResultWithPostInfo {283 <Pallet<T>>::burn_recursively(self, &sender, token, self_budget, breadth_budget)284 }285286 fn transfer(287 &self,288 from: T::CrossAccountId,289 to: T::CrossAccountId,290 token: TokenId,291 amount: u128,292 nesting_budget: &dyn Budget,293 ) -> DispatchResultWithPostInfo {294 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);295 if amount == 1 {296 with_weight(297 <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),298 <CommonWeights<T>>::transfer(),299 )300 } else {301 Ok(().into())302 }303 }304305 fn approve(306 &self,307 sender: T::CrossAccountId,308 spender: T::CrossAccountId,309 token: TokenId,310 amount: u128,311 ) -> DispatchResultWithPostInfo {312 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);313314 with_weight(315 if amount == 1 {316 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))317 } else {318 <Pallet<T>>::set_allowance(self, &sender, token, None)319 },320 <CommonWeights<T>>::approve(),321 )322 }323324 fn transfer_from(325 &self,326 sender: T::CrossAccountId,327 from: T::CrossAccountId,328 to: T::CrossAccountId,329 token: TokenId,330 amount: u128,331 nesting_budget: &dyn Budget,332 ) -> DispatchResultWithPostInfo {333 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);334335 if amount == 1 {336 with_weight(337 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),338 <CommonWeights<T>>::transfer_from(),339 )340 } else {341 Ok(().into())342 }343 }344345 fn burn_from(346 &self,347 sender: T::CrossAccountId,348 from: T::CrossAccountId,349 token: TokenId,350 amount: u128,351 nesting_budget: &dyn Budget,352 ) -> DispatchResultWithPostInfo {353 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);354355 if amount == 1 {356 with_weight(357 <Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),358 <CommonWeights<T>>::burn_from(),359 )360 } else {361 Ok(().into())362 }363 }364365 fn check_nesting(366 &self,367 sender: T::CrossAccountId,368 from: (CollectionId, TokenId),369 under: TokenId,370 budget: &dyn Budget,371 ) -> sp_runtime::DispatchResult {372 <Pallet<T>>::check_nesting(self, sender, from, under, budget)373 }374375 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {376 <Pallet<T>>::nest((self.id, under), to_nest);377 }378379 fn unnest(&self, under: TokenId, to_unnest: (CollectionId, TokenId)) {380 <Pallet<T>>::unnest((self.id, under), to_unnest);381 }382383 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {384 <Owned<T>>::iter_prefix((self.id, account))385 .map(|(id, _)| id)386 .collect()387 }388389 fn collection_tokens(&self) -> Vec<TokenId> {390 <TokenData<T>>::iter_prefix((self.id,))391 .map(|(id, _)| id)392 .collect()393 }394395 fn token_exists(&self, token: TokenId) -> bool {396 <Pallet<T>>::token_exists(self, token)397 }398399 fn last_token_id(&self) -> TokenId {400 TokenId(<TokensMinted<T>>::get(self.id))401 }402403 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId> {404 <TokenData<T>>::get((self.id, token)).map(|t| t.owner)405 }406407 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {408 <Pallet<T>>::token_properties((self.id, token_id))409 .get(key)410 .cloned()411 }412413 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {414 let properties = <Pallet<T>>::token_properties((self.id, token_id));415416 keys.map(|keys| {417 keys.into_iter()418 .filter_map(|key| {419 properties.get(&key).map(|value| Property {420 key,421 value: value.clone(),422 })423 })424 .collect()425 })426 .unwrap_or_else(|| {427 properties428 .into_iter()429 .map(|(key, value)| Property { key, value })430 .collect()431 })432 }433434 fn total_supply(&self) -> u32 {435 <Pallet<T>>::total_supply(self)436 }437438 fn account_balance(&self, account: T::CrossAccountId) -> u32 {439 <AccountBalance<T>>::get((self.id, account))440 }441442 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {443 if <TokenData<T>>::get((self.id, token))444 .map(|a| a.owner == account)445 .unwrap_or(false)446 {447 1448 } else {449 0450 }451 }452453 fn allowance(454 &self,455 sender: T::CrossAccountId,456 spender: T::CrossAccountId,457 token: TokenId,458 ) -> u128 {459 if <TokenData<T>>::get((self.id, token))460 .map(|a| a.owner != sender)461 .unwrap_or(true)462 {463 0464 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {465 1466 } else {467 0468 }469 }470}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;1819use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight};20use up_data_structs::{21 TokenId, CreateItemExData, CollectionId, budget::Budget, Property, PropertyKey,22 PropertyKeyPermission, PropertyValue,23};24use pallet_common::{25 CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight,26 weights::WeightInfo as _,27};28use sp_runtime::DispatchError;29use sp_std::vec::Vec;3031use crate::{32 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,33 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,34};3536pub struct CommonWeights<T: Config>(PhantomData<T>);37impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {38 fn create_item() -> Weight {39 <SelfWeightOf<T>>::create_item()40 }4142 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {43 match data {44 CreateItemExData::NFT(t) => {45 <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32)46 + t.iter()47 .map(|t| {48 if t.properties.len() > 0 {49 Self::set_token_properties(t.properties.len() as u32)50 } else {51 052 }53 })54 .sum::<u64>()55 }56 _ => 0,57 }58 }5960 fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {61 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32)62 + data63 .iter()64 .filter_map(|t| match t {65 up_data_structs::CreateItemData::NFT(n) if n.properties.len() > 0 => {66 Some(Self::set_token_properties(n.properties.len() as u32))67 }68 _ => None,69 })70 .sum::<u64>()71 }7273 fn burn_item() -> Weight {74 <SelfWeightOf<T>>::burn_item()75 }7677 fn set_collection_properties(amount: u32) -> Weight {78 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)79 }8081 fn delete_collection_properties(amount: u32) -> Weight {82 <pallet_common::SelfWeightOf<T>>::delete_collection_properties(amount)83 }8485 fn set_token_properties(amount: u32) -> Weight {86 <SelfWeightOf<T>>::set_token_properties(amount)87 }8889 fn delete_token_properties(amount: u32) -> Weight {90 <SelfWeightOf<T>>::delete_token_properties(amount)91 }9293 fn set_token_property_permissions(amount: u32) -> Weight {94 <SelfWeightOf<T>>::set_token_property_permissions(amount)95 }9697 fn transfer() -> Weight {98 <SelfWeightOf<T>>::transfer()99 }100101 fn approve() -> Weight {102 <SelfWeightOf<T>>::approve()103 }104105 fn transfer_from() -> Weight {106 <SelfWeightOf<T>>::transfer_from()107 }108109 fn burn_from() -> Weight {110 <SelfWeightOf<T>>::burn_from()111 }112113 fn burn_recursively_self_raw() -> Weight {114 <SelfWeightOf<T>>::burn_recursively_self_raw()115 }116117 fn burn_recursively_breadth_raw(amount: u32) -> Weight {118 <SelfWeightOf<T>>::burn_recursively_breadth_plus_self_plus_self_per_each_raw(amount)119 .saturating_sub(Self::burn_recursively_self_raw().saturating_mul(amount as u64 + 1))120 }121}122123fn map_create_data<T: Config>(124 data: up_data_structs::CreateItemData,125 to: &T::CrossAccountId,126) -> Result<CreateItemData<T>, DispatchError> {127 match data {128 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {129 properties: data.properties,130 owner: to.clone(),131 }),132 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),133 }134}135136impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {137 fn create_item(138 &self,139 sender: T::CrossAccountId,140 to: T::CrossAccountId,141 data: up_data_structs::CreateItemData,142 nesting_budget: &dyn Budget,143 ) -> DispatchResultWithPostInfo {144 with_weight(145 <Pallet<T>>::create_item(146 self,147 &sender,148 map_create_data::<T>(data, &to)?,149 nesting_budget,150 ),151 <CommonWeights<T>>::create_item(),152 )153 }154155 fn create_multiple_items(156 &self,157 sender: T::CrossAccountId,158 to: T::CrossAccountId,159 data: Vec<up_data_structs::CreateItemData>,160 nesting_budget: &dyn Budget,161 ) -> DispatchResultWithPostInfo {162 let weight = <CommonWeights<T>>::create_multiple_items(&data);163 let data = data164 .into_iter()165 .map(|d| map_create_data::<T>(d, &to))166 .collect::<Result<Vec<_>, DispatchError>>()?;167168 with_weight(169 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),170 weight,171 )172 }173174 fn create_multiple_items_ex(175 &self,176 sender: <T>::CrossAccountId,177 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,178 nesting_budget: &dyn Budget,179 ) -> DispatchResultWithPostInfo {180 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);181 let data = match data {182 up_data_structs::CreateItemExData::NFT(nft) => nft,183 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),184 };185186 with_weight(187 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),188 weight,189 )190 }191192 fn set_collection_properties(193 &self,194 sender: T::CrossAccountId,195 properties: Vec<Property>,196 ) -> DispatchResultWithPostInfo {197 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);198199 with_weight(200 <Pallet<T>>::set_collection_properties(self, &sender, properties),201 weight,202 )203 }204205 fn delete_collection_properties(206 &self,207 sender: &T::CrossAccountId,208 property_keys: Vec<PropertyKey>,209 ) -> DispatchResultWithPostInfo {210 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);211212 with_weight(213 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),214 weight,215 )216 }217218 fn set_token_properties(219 &self,220 sender: T::CrossAccountId,221 token_id: TokenId,222 properties: Vec<Property>,223 ) -> DispatchResultWithPostInfo {224 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);225226 with_weight(227 <Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false),228 weight,229 )230 }231232 fn delete_token_properties(233 &self,234 sender: T::CrossAccountId,235 token_id: TokenId,236 property_keys: Vec<PropertyKey>,237 ) -> DispatchResultWithPostInfo {238 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);239240 with_weight(241 <Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys),242 weight,243 )244 }245246 fn set_token_property_permissions(247 &self,248 sender: &T::CrossAccountId,249 property_permissions: Vec<PropertyKeyPermission>,250 ) -> DispatchResultWithPostInfo {251 let weight =252 <CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);253254 with_weight(255 <Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),256 weight,257 )258 }259260 fn burn_item(261 &self,262 sender: T::CrossAccountId,263 token: TokenId,264 amount: u128,265 ) -> DispatchResultWithPostInfo {266 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);267 if amount == 1 {268 with_weight(269 <Pallet<T>>::burn(self, &sender, token),270 <CommonWeights<T>>::burn_item(),271 )272 } else {273 Ok(().into())274 }275 }276277 fn burn_item_recursively(278 &self,279 sender: T::CrossAccountId,280 token: TokenId,281 self_budget: &dyn Budget,282 breadth_budget: &dyn Budget,283 ) -> DispatchResultWithPostInfo {284 <Pallet<T>>::burn_recursively(self, &sender, token, self_budget, breadth_budget)285 }286287 fn transfer(288 &self,289 from: T::CrossAccountId,290 to: T::CrossAccountId,291 token: TokenId,292 amount: u128,293 nesting_budget: &dyn Budget,294 ) -> DispatchResultWithPostInfo {295 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);296 if amount == 1 {297 with_weight(298 <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),299 <CommonWeights<T>>::transfer(),300 )301 } else {302 Ok(().into())303 }304 }305306 fn approve(307 &self,308 sender: T::CrossAccountId,309 spender: T::CrossAccountId,310 token: TokenId,311 amount: u128,312 ) -> DispatchResultWithPostInfo {313 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);314315 with_weight(316 if amount == 1 {317 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))318 } else {319 <Pallet<T>>::set_allowance(self, &sender, token, None)320 },321 <CommonWeights<T>>::approve(),322 )323 }324325 fn transfer_from(326 &self,327 sender: T::CrossAccountId,328 from: T::CrossAccountId,329 to: T::CrossAccountId,330 token: TokenId,331 amount: u128,332 nesting_budget: &dyn Budget,333 ) -> DispatchResultWithPostInfo {334 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);335336 if amount == 1 {337 with_weight(338 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),339 <CommonWeights<T>>::transfer_from(),340 )341 } else {342 Ok(().into())343 }344 }345346 fn burn_from(347 &self,348 sender: T::CrossAccountId,349 from: T::CrossAccountId,350 token: TokenId,351 amount: u128,352 nesting_budget: &dyn Budget,353 ) -> DispatchResultWithPostInfo {354 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);355356 if amount == 1 {357 with_weight(358 <Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),359 <CommonWeights<T>>::burn_from(),360 )361 } else {362 Ok(().into())363 }364 }365366 fn check_nesting(367 &self,368 sender: T::CrossAccountId,369 from: (CollectionId, TokenId),370 under: TokenId,371 budget: &dyn Budget,372 ) -> sp_runtime::DispatchResult {373 <Pallet<T>>::check_nesting(self, sender, from, under, budget)374 }375376 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {377 <Pallet<T>>::nest((self.id, under), to_nest);378 }379380 fn unnest(&self, under: TokenId, to_unnest: (CollectionId, TokenId)) {381 <Pallet<T>>::unnest((self.id, under), to_unnest);382 }383384 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {385 <Owned<T>>::iter_prefix((self.id, account))386 .map(|(id, _)| id)387 .collect()388 }389390 fn collection_tokens(&self) -> Vec<TokenId> {391 <TokenData<T>>::iter_prefix((self.id,))392 .map(|(id, _)| id)393 .collect()394 }395396 fn token_exists(&self, token: TokenId) -> bool {397 <Pallet<T>>::token_exists(self, token)398 }399400 fn last_token_id(&self) -> TokenId {401 TokenId(<TokensMinted<T>>::get(self.id))402 }403404 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId> {405 <TokenData<T>>::get((self.id, token)).map(|t| t.owner)406 }407408 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {409 <Pallet<T>>::token_properties((self.id, token_id))410 .get(key)411 .cloned()412 }413414 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {415 let properties = <Pallet<T>>::token_properties((self.id, token_id));416417 keys.map(|keys| {418 keys.into_iter()419 .filter_map(|key| {420 properties.get(&key).map(|value| Property {421 key,422 value: value.clone(),423 })424 })425 .collect()426 })427 .unwrap_or_else(|| {428 properties429 .into_iter()430 .map(|(key, value)| Property { key, value })431 .collect()432 })433 }434435 fn total_supply(&self) -> u32 {436 <Pallet<T>>::total_supply(self)437 }438439 fn account_balance(&self, account: T::CrossAccountId) -> u32 {440 <AccountBalance<T>>::get((self.id, account))441 }442443 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {444 if <TokenData<T>>::get((self.id, token))445 .map(|a| a.owner == account)446 .unwrap_or(false)447 {448 1449 } else {450 0451 }452 }453454 fn allowance(455 &self,456 sender: T::CrossAccountId,457 spender: T::CrossAccountId,458 token: TokenId,459 ) -> u128 {460 if <TokenData<T>>::get((self.id, token))461 .map(|a| a.owner != sender)462 .unwrap_or(true)463 {464 0465 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {466 1467 } else {468 0469 }470 }471472 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {473 None474 }475}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.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -22,9 +22,9 @@
CollectionId, TokenId, CreateItemExData, CreateRefungibleExData, budget::Budget, Property,
PropertyKey, PropertyValue, PropertyKeyPermission, 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::DispatchError;
+use sp_runtime::{DispatchError};
use sp_std::{vec::Vec, vec};
use crate::{
@@ -405,4 +405,22 @@
) -> u128 {
<Allowance<T>>::get((self.id, token, sender, spender))
}
+
+ fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
+ Some(self)
+ }
+}
+
+impl<T: Config> RefungibleExtensions<T> for RefungibleHandle<T> {
+ fn repartition(
+ &self,
+ owner: &T::CrossAccountId,
+ token: TokenId,
+ amount: u128,
+ ) -> DispatchResultWithPostInfo {
+ with_weight(
+ <Pallet<T>>::repartition(self, owner, token, amount),
+ <SelfWeightOf<T>>::repartition_item(),
+ )
+ }
}
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;