difftreelog
rename: budget to nesting_budget
in: master
4 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1311,14 +1311,14 @@
sender: T::CrossAccountId,
token_id: TokenId,
property: Vec<Property>,
- budget: &dyn Budget,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo;
fn delete_token_properties(
&self,
sender: T::CrossAccountId,
token_id: TokenId,
property_keys: Vec<PropertyKey>,
- budget: &dyn Budget,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo;
fn set_token_property_permissions(
&self,
@@ -1363,7 +1363,7 @@
sender: T::CrossAccountId,
from: (CollectionId, TokenId),
under: TokenId,
- budget: &dyn Budget,
+ nesting_budget: &dyn Budget,
) -> DispatchResult;
fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId));
pallets/fungible/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, traits::Get};20use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget, CreateItemData};21use pallet_common::{CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight};22use pallet_structure::Error as StructureError;23use sp_runtime::ArithmeticError;24use sp_std::{vec::Vec, vec};25use up_data_structs::{Property, PropertyKey, PropertyValue, PropertyKeyPermission};2627use crate::{28 Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf, weights::WeightInfo,29};3031pub struct CommonWeights<T: Config>(PhantomData<T>);32impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {33 fn create_item() -> Weight {34 <SelfWeightOf<T>>::create_item()35 }3637 fn create_multiple_items(_data: &[CreateItemData]) -> Weight {38 // All items minted for the same user, so it works same as create_item39 Self::create_item()40 }4142 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {43 match data {44 CreateItemExData::Fungible(f) => {45 <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)46 }47 _ => 0,48 }49 }5051 fn burn_item() -> Weight {52 <SelfWeightOf<T>>::burn_item()53 }5455 fn set_collection_properties(_amount: u32) -> Weight {56 // Error57 058 }5960 fn delete_collection_properties(_amount: u32) -> Weight {61 // Error62 063 }6465 fn set_token_properties(_amount: u32) -> Weight {66 // Error67 068 }6970 fn delete_token_properties(_amount: u32) -> Weight {71 // Error72 073 }7475 fn set_token_property_permissions(_amount: u32) -> Weight {76 // Error77 078 }7980 fn transfer() -> Weight {81 <SelfWeightOf<T>>::transfer()82 }8384 fn approve() -> Weight {85 <SelfWeightOf<T>>::approve()86 }8788 fn transfer_from() -> Weight {89 <SelfWeightOf<T>>::transfer_from()90 }9192 fn burn_from() -> Weight {93 <SelfWeightOf<T>>::burn_from()94 }9596 fn burn_recursively_self_raw() -> Weight {97 // Read to get total balance98 Self::burn_item() + T::DbWeight::get().reads(1)99 }100101 fn burn_recursively_breadth_raw(_amount: u32) -> Weight {102 // Fungible tokens can't have children103 0104 }105}106107impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {108 fn create_item(109 &self,110 sender: T::CrossAccountId,111 to: T::CrossAccountId,112 data: up_data_structs::CreateItemData,113 nesting_budget: &dyn Budget,114 ) -> DispatchResultWithPostInfo {115 match data {116 up_data_structs::CreateItemData::Fungible(data) => with_weight(117 <Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),118 <CommonWeights<T>>::create_item(),119 ),120 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),121 }122 }123124 fn create_multiple_items(125 &self,126 sender: T::CrossAccountId,127 to: T::CrossAccountId,128 data: Vec<up_data_structs::CreateItemData>,129 nesting_budget: &dyn Budget,130 ) -> DispatchResultWithPostInfo {131 let mut sum: u128 = 0;132 for data in data {133 match data {134 up_data_structs::CreateItemData::Fungible(data) => {135 sum = sum136 .checked_add(data.value)137 .ok_or(ArithmeticError::Overflow)?;138 }139 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),140 }141 }142143 with_weight(144 <Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),145 <CommonWeights<T>>::create_item(),146 )147 }148149 fn create_multiple_items_ex(150 &self,151 sender: <T>::CrossAccountId,152 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,153 nesting_budget: &dyn Budget,154 ) -> DispatchResultWithPostInfo {155 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);156 let data = match data {157 up_data_structs::CreateItemExData::Fungible(f) => f,158 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),159 };160161 with_weight(162 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),163 weight,164 )165 }166167 fn burn_item(168 &self,169 sender: T::CrossAccountId,170 token: TokenId,171 amount: u128,172 ) -> DispatchResultWithPostInfo {173 ensure!(174 token == TokenId::default(),175 <Error<T>>::FungibleItemsHaveNoId176 );177178 with_weight(179 <Pallet<T>>::burn(self, &sender, amount),180 <CommonWeights<T>>::burn_item(),181 )182 }183184 fn burn_item_recursively(185 &self,186 sender: T::CrossAccountId,187 token: TokenId,188 self_budget: &dyn Budget,189 _breadth_budget: &dyn Budget,190 ) -> DispatchResultWithPostInfo {191 // Should not happen?192 ensure!(193 token == TokenId::default(),194 <Error<T>>::FungibleItemsHaveNoId195 );196 ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);197198 with_weight(199 <Pallet<T>>::burn(self, &sender, <Balance<T>>::get((self.id, &sender))),200 <CommonWeights<T>>::burn_recursively_self_raw(),201 )202 }203204 fn transfer(205 &self,206 from: T::CrossAccountId,207 to: T::CrossAccountId,208 token: TokenId,209 amount: u128,210 nesting_budget: &dyn Budget,211 ) -> DispatchResultWithPostInfo {212 ensure!(213 token == TokenId::default(),214 <Error<T>>::FungibleItemsHaveNoId215 );216217 with_weight(218 <Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget),219 <CommonWeights<T>>::transfer(),220 )221 }222223 fn approve(224 &self,225 sender: T::CrossAccountId,226 spender: T::CrossAccountId,227 token: TokenId,228 amount: u128,229 ) -> DispatchResultWithPostInfo {230 ensure!(231 token == TokenId::default(),232 <Error<T>>::FungibleItemsHaveNoId233 );234235 with_weight(236 <Pallet<T>>::set_allowance(self, &sender, &spender, amount),237 <CommonWeights<T>>::approve(),238 )239 }240241 fn transfer_from(242 &self,243 sender: T::CrossAccountId,244 from: T::CrossAccountId,245 to: T::CrossAccountId,246 token: TokenId,247 amount: u128,248 nesting_budget: &dyn Budget,249 ) -> DispatchResultWithPostInfo {250 ensure!(251 token == TokenId::default(),252 <Error<T>>::FungibleItemsHaveNoId253 );254255 with_weight(256 <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),257 <CommonWeights<T>>::transfer_from(),258 )259 }260261 fn burn_from(262 &self,263 sender: T::CrossAccountId,264 from: T::CrossAccountId,265 token: TokenId,266 amount: u128,267 nesting_budget: &dyn Budget,268 ) -> DispatchResultWithPostInfo {269 ensure!(270 token == TokenId::default(),271 <Error<T>>::FungibleItemsHaveNoId272 );273274 with_weight(275 <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),276 <CommonWeights<T>>::burn_from(),277 )278 }279280 fn set_collection_properties(281 &self,282 _sender: T::CrossAccountId,283 _property: Vec<Property>,284 ) -> DispatchResultWithPostInfo {285 fail!(<Error<T>>::SettingPropertiesNotAllowed)286 }287288 fn delete_collection_properties(289 &self,290 _sender: &T::CrossAccountId,291 _property_keys: Vec<PropertyKey>,292 ) -> DispatchResultWithPostInfo {293 fail!(<Error<T>>::SettingPropertiesNotAllowed)294 }295296 fn set_token_properties(297 &self,298 _sender: T::CrossAccountId,299 _token_id: TokenId,300 _property: Vec<Property>,301 _budget: &dyn Budget,302 ) -> DispatchResultWithPostInfo {303 fail!(<Error<T>>::SettingPropertiesNotAllowed)304 }305306 fn set_token_property_permissions(307 &self,308 _sender: &T::CrossAccountId,309 _property_permissions: Vec<PropertyKeyPermission>,310 ) -> DispatchResultWithPostInfo {311 fail!(<Error<T>>::SettingPropertiesNotAllowed)312 }313314 fn delete_token_properties(315 &self,316 _sender: T::CrossAccountId,317 _token_id: TokenId,318 _property_keys: Vec<PropertyKey>,319 _budget: &dyn Budget,320 ) -> DispatchResultWithPostInfo {321 fail!(<Error<T>>::SettingPropertiesNotAllowed)322 }323324 fn check_nesting(325 &self,326 _sender: <T>::CrossAccountId,327 _from: (CollectionId, TokenId),328 _under: TokenId,329 _budget: &dyn Budget,330 ) -> sp_runtime::DispatchResult {331 fail!(<Error<T>>::FungibleDisallowsNesting)332 }333334 fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}335336 fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}337338 fn collection_tokens(&self) -> Vec<TokenId> {339 vec![TokenId::default()]340 }341342 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {343 if <Balance<T>>::get((self.id, account)) != 0 {344 vec![TokenId::default()]345 } else {346 vec![]347 }348 }349350 fn token_exists(&self, token: TokenId) -> bool {351 token == TokenId::default()352 }353354 fn last_token_id(&self) -> TokenId {355 TokenId::default()356 }357358 fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {359 None360 }361362 fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {363 None364 }365366 fn token_properties(367 &self,368 _token_id: TokenId,369 _keys: Option<Vec<PropertyKey>>,370 ) -> Vec<Property> {371 Vec::new()372 }373374 fn total_supply(&self) -> u32 {375 1376 }377378 fn account_balance(&self, account: T::CrossAccountId) -> u32 {379 if <Balance<T>>::get((self.id, account)) != 0 {380 1381 } else {382 0383 }384 }385386 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {387 if token != TokenId::default() {388 return 0;389 }390 <Balance<T>>::get((self.id, account))391 }392393 fn allowance(394 &self,395 sender: T::CrossAccountId,396 spender: T::CrossAccountId,397 token: TokenId,398 ) -> u128 {399 if token != TokenId::default() {400 return 0;401 }402 <Allowance<T>>::get((self.id, sender, spender))403 }404405 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {406 None407 }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 frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};20use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget, CreateItemData};21use pallet_common::{CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight};22use pallet_structure::Error as StructureError;23use sp_runtime::ArithmeticError;24use sp_std::{vec::Vec, vec};25use up_data_structs::{Property, PropertyKey, PropertyValue, PropertyKeyPermission};2627use crate::{28 Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf, weights::WeightInfo,29};3031pub struct CommonWeights<T: Config>(PhantomData<T>);32impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {33 fn create_item() -> Weight {34 <SelfWeightOf<T>>::create_item()35 }3637 fn create_multiple_items(_data: &[CreateItemData]) -> Weight {38 // All items minted for the same user, so it works same as create_item39 Self::create_item()40 }4142 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {43 match data {44 CreateItemExData::Fungible(f) => {45 <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)46 }47 _ => 0,48 }49 }5051 fn burn_item() -> Weight {52 <SelfWeightOf<T>>::burn_item()53 }5455 fn set_collection_properties(_amount: u32) -> Weight {56 // Error57 058 }5960 fn delete_collection_properties(_amount: u32) -> Weight {61 // Error62 063 }6465 fn set_token_properties(_amount: u32) -> Weight {66 // Error67 068 }6970 fn delete_token_properties(_amount: u32) -> Weight {71 // Error72 073 }7475 fn set_token_property_permissions(_amount: u32) -> Weight {76 // Error77 078 }7980 fn transfer() -> Weight {81 <SelfWeightOf<T>>::transfer()82 }8384 fn approve() -> Weight {85 <SelfWeightOf<T>>::approve()86 }8788 fn transfer_from() -> Weight {89 <SelfWeightOf<T>>::transfer_from()90 }9192 fn burn_from() -> Weight {93 <SelfWeightOf<T>>::burn_from()94 }9596 fn burn_recursively_self_raw() -> Weight {97 // Read to get total balance98 Self::burn_item() + T::DbWeight::get().reads(1)99 }100101 fn burn_recursively_breadth_raw(_amount: u32) -> Weight {102 // Fungible tokens can't have children103 0104 }105}106107impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {108 fn create_item(109 &self,110 sender: T::CrossAccountId,111 to: T::CrossAccountId,112 data: up_data_structs::CreateItemData,113 nesting_budget: &dyn Budget,114 ) -> DispatchResultWithPostInfo {115 match data {116 up_data_structs::CreateItemData::Fungible(data) => with_weight(117 <Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),118 <CommonWeights<T>>::create_item(),119 ),120 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),121 }122 }123124 fn create_multiple_items(125 &self,126 sender: T::CrossAccountId,127 to: T::CrossAccountId,128 data: Vec<up_data_structs::CreateItemData>,129 nesting_budget: &dyn Budget,130 ) -> DispatchResultWithPostInfo {131 let mut sum: u128 = 0;132 for data in data {133 match data {134 up_data_structs::CreateItemData::Fungible(data) => {135 sum = sum136 .checked_add(data.value)137 .ok_or(ArithmeticError::Overflow)?;138 }139 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),140 }141 }142143 with_weight(144 <Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),145 <CommonWeights<T>>::create_item(),146 )147 }148149 fn create_multiple_items_ex(150 &self,151 sender: <T>::CrossAccountId,152 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,153 nesting_budget: &dyn Budget,154 ) -> DispatchResultWithPostInfo {155 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);156 let data = match data {157 up_data_structs::CreateItemExData::Fungible(f) => f,158 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),159 };160161 with_weight(162 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),163 weight,164 )165 }166167 fn burn_item(168 &self,169 sender: T::CrossAccountId,170 token: TokenId,171 amount: u128,172 ) -> DispatchResultWithPostInfo {173 ensure!(174 token == TokenId::default(),175 <Error<T>>::FungibleItemsHaveNoId176 );177178 with_weight(179 <Pallet<T>>::burn(self, &sender, amount),180 <CommonWeights<T>>::burn_item(),181 )182 }183184 fn burn_item_recursively(185 &self,186 sender: T::CrossAccountId,187 token: TokenId,188 self_budget: &dyn Budget,189 _breadth_budget: &dyn Budget,190 ) -> DispatchResultWithPostInfo {191 // Should not happen?192 ensure!(193 token == TokenId::default(),194 <Error<T>>::FungibleItemsHaveNoId195 );196 ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);197198 with_weight(199 <Pallet<T>>::burn(self, &sender, <Balance<T>>::get((self.id, &sender))),200 <CommonWeights<T>>::burn_recursively_self_raw(),201 )202 }203204 fn transfer(205 &self,206 from: T::CrossAccountId,207 to: T::CrossAccountId,208 token: TokenId,209 amount: u128,210 nesting_budget: &dyn Budget,211 ) -> DispatchResultWithPostInfo {212 ensure!(213 token == TokenId::default(),214 <Error<T>>::FungibleItemsHaveNoId215 );216217 with_weight(218 <Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget),219 <CommonWeights<T>>::transfer(),220 )221 }222223 fn approve(224 &self,225 sender: T::CrossAccountId,226 spender: T::CrossAccountId,227 token: TokenId,228 amount: u128,229 ) -> DispatchResultWithPostInfo {230 ensure!(231 token == TokenId::default(),232 <Error<T>>::FungibleItemsHaveNoId233 );234235 with_weight(236 <Pallet<T>>::set_allowance(self, &sender, &spender, amount),237 <CommonWeights<T>>::approve(),238 )239 }240241 fn transfer_from(242 &self,243 sender: T::CrossAccountId,244 from: T::CrossAccountId,245 to: T::CrossAccountId,246 token: TokenId,247 amount: u128,248 nesting_budget: &dyn Budget,249 ) -> DispatchResultWithPostInfo {250 ensure!(251 token == TokenId::default(),252 <Error<T>>::FungibleItemsHaveNoId253 );254255 with_weight(256 <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),257 <CommonWeights<T>>::transfer_from(),258 )259 }260261 fn burn_from(262 &self,263 sender: T::CrossAccountId,264 from: T::CrossAccountId,265 token: TokenId,266 amount: u128,267 nesting_budget: &dyn Budget,268 ) -> DispatchResultWithPostInfo {269 ensure!(270 token == TokenId::default(),271 <Error<T>>::FungibleItemsHaveNoId272 );273274 with_weight(275 <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),276 <CommonWeights<T>>::burn_from(),277 )278 }279280 fn set_collection_properties(281 &self,282 _sender: T::CrossAccountId,283 _property: Vec<Property>,284 ) -> DispatchResultWithPostInfo {285 fail!(<Error<T>>::SettingPropertiesNotAllowed)286 }287288 fn delete_collection_properties(289 &self,290 _sender: &T::CrossAccountId,291 _property_keys: Vec<PropertyKey>,292 ) -> DispatchResultWithPostInfo {293 fail!(<Error<T>>::SettingPropertiesNotAllowed)294 }295296 fn set_token_properties(297 &self,298 _sender: T::CrossAccountId,299 _token_id: TokenId,300 _property: Vec<Property>,301 _nesting_budget: &dyn Budget,302 ) -> DispatchResultWithPostInfo {303 fail!(<Error<T>>::SettingPropertiesNotAllowed)304 }305306 fn set_token_property_permissions(307 &self,308 _sender: &T::CrossAccountId,309 _property_permissions: Vec<PropertyKeyPermission>,310 ) -> DispatchResultWithPostInfo {311 fail!(<Error<T>>::SettingPropertiesNotAllowed)312 }313314 fn delete_token_properties(315 &self,316 _sender: T::CrossAccountId,317 _token_id: TokenId,318 _property_keys: Vec<PropertyKey>,319 _nesting_budget: &dyn Budget,320 ) -> DispatchResultWithPostInfo {321 fail!(<Error<T>>::SettingPropertiesNotAllowed)322 }323324 fn check_nesting(325 &self,326 _sender: <T>::CrossAccountId,327 _from: (CollectionId, TokenId),328 _under: TokenId,329 _nesting_budget: &dyn Budget,330 ) -> sp_runtime::DispatchResult {331 fail!(<Error<T>>::FungibleDisallowsNesting)332 }333334 fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}335336 fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}337338 fn collection_tokens(&self) -> Vec<TokenId> {339 vec![TokenId::default()]340 }341342 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {343 if <Balance<T>>::get((self.id, account)) != 0 {344 vec![TokenId::default()]345 } else {346 vec![]347 }348 }349350 fn token_exists(&self, token: TokenId) -> bool {351 token == TokenId::default()352 }353354 fn last_token_id(&self) -> TokenId {355 TokenId::default()356 }357358 fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {359 None360 }361362 fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {363 None364 }365366 fn token_properties(367 &self,368 _token_id: TokenId,369 _keys: Option<Vec<PropertyKey>>,370 ) -> Vec<Property> {371 Vec::new()372 }373374 fn total_supply(&self) -> u32 {375 1376 }377378 fn account_balance(&self, account: T::CrossAccountId) -> u32 {379 if <Balance<T>>::get((self.id, account)) != 0 {380 1381 } else {382 0383 }384 }385386 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {387 if token != TokenId::default() {388 return 0;389 }390 <Balance<T>>::get((self.id, account))391 }392393 fn allowance(394 &self,395 sender: T::CrossAccountId,396 spender: T::CrossAccountId,397 token: TokenId,398 ) -> u128 {399 if token != TokenId::default() {400 return 0;401 }402 <Allowance<T>>::get((self.id, sender, spender))403 }404405 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {406 None407 }408}pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -220,12 +220,12 @@
sender: T::CrossAccountId,
token_id: TokenId,
properties: Vec<Property>,
- budget: &dyn Budget,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);
with_weight(
- <Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false, budget),
+ <Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false, nesting_budget),
weight,
)
}
@@ -235,12 +235,12 @@
sender: T::CrossAccountId,
token_id: TokenId,
property_keys: Vec<PropertyKey>,
- budget: &dyn Budget,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);
with_weight(
- <Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys, budget),
+ <Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys, nesting_budget),
weight,
)
}
@@ -370,9 +370,9 @@
sender: T::CrossAccountId,
from: (CollectionId, TokenId),
under: TokenId,
- budget: &dyn Budget,
+ nesting_budget: &dyn Budget,
) -> sp_runtime::DispatchResult {
- <Pallet<T>>::check_nesting(self, sender, from, under, budget)
+ <Pallet<T>>::check_nesting(self, sender, from, under, nesting_budget)
}
fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -314,7 +314,7 @@
_sender: T::CrossAccountId,
_token_id: TokenId,
_property: Vec<Property>,
- _budget: &dyn Budget,
+ _nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
fail!(<Error<T>>::SettingPropertiesNotAllowed)
}
@@ -332,7 +332,7 @@
_sender: T::CrossAccountId,
_token_id: TokenId,
_property_keys: Vec<PropertyKey>,
- _budget: &dyn Budget,
+ _nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
fail!(<Error<T>>::SettingPropertiesNotAllowed)
}
@@ -342,7 +342,7 @@
_sender: <T>::CrossAccountId,
_from: (CollectionId, TokenId),
_under: TokenId,
- _budget: &dyn Budget,
+ _nesting_budget: &dyn Budget,
) -> sp_runtime::DispatchResult {
fail!(<Error<T>>::RefungibleDisallowsNesting)
}