difftreelog
feat nest on create/transfer
in: master
12 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -723,17 +723,20 @@
sender: T::CrossAccountId,
to: T::CrossAccountId,
data: CreateItemData,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo;
fn create_multiple_items(
&self,
sender: T::CrossAccountId,
to: T::CrossAccountId,
data: Vec<CreateItemData>,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo;
fn create_multiple_items_ex(
&self,
sender: T::CrossAccountId,
data: CreateItemExData<T::CrossAccountId>,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo;
fn burn_item(
&self,
@@ -748,6 +751,7 @@
to: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo;
fn approve(
&self,
@@ -781,11 +785,12 @@
data: BoundedVec<u8, CustomDataLimit>,
) -> DispatchResultWithPostInfo;
- fn nest_token(
+ fn check_nesting(
&self,
sender: T::CrossAccountId,
- from: (CollectionId, TokenId),
+ from: CollectionId,
under: TokenId,
+ budget: &dyn Budget,
) -> DispatchResult;
fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;
pallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -55,7 +55,6 @@
use frame_system::ensure_signed;
pub use frame_support::dispatch::DispatchResult;
- use frame_support::{pallet_prelude::*, traits::PalletInfo};
use frame_system::pallet_prelude::*;
/// DispatchError is opaque, but we need to somehow extract correct error in case of OutOfGas failure
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, BoundedVec};20use up_data_structs::{TokenId, CreateItemExData, budget::Budget};21use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};22use sp_runtime::ArithmeticError;23use sp_std::{vec::Vec, vec};24use up_data_structs::CustomDataLimit;2526use crate::{27 Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf, weights::WeightInfo,28};2930pub struct CommonWeights<T: Config>(PhantomData<T>);31impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {32 fn create_item() -> Weight {33 <SelfWeightOf<T>>::create_item()34 }3536 fn create_multiple_items(_amount: u32) -> Weight {37 Self::create_item()38 }3940 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {41 match data {42 CreateItemExData::Fungible(f) => {43 <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)44 }45 _ => 0,46 }47 }4849 fn burn_item() -> Weight {50 <SelfWeightOf<T>>::burn_item()51 }5253 fn transfer() -> Weight {54 <SelfWeightOf<T>>::transfer()55 }5657 fn approve() -> Weight {58 <SelfWeightOf<T>>::approve()59 }6061 fn transfer_from() -> Weight {62 <SelfWeightOf<T>>::transfer_from()63 }6465 fn burn_from() -> Weight {66 <SelfWeightOf<T>>::burn_from()67 }6869 fn set_variable_metadata(_bytes: u32) -> Weight {70 // Error71 072 }73}7475impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {76 fn create_item(77 &self,78 sender: T::CrossAccountId,79 to: T::CrossAccountId,80 data: up_data_structs::CreateItemData,81 ) -> DispatchResultWithPostInfo {82 match data {83 up_data_structs::CreateItemData::Fungible(data) => with_weight(84 <Pallet<T>>::create_item(self, &sender, (to, data.value)),85 <CommonWeights<T>>::create_item(),86 ),87 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),88 }89 }9091 fn create_multiple_items(92 &self,93 sender: T::CrossAccountId,94 to: T::CrossAccountId,95 data: Vec<up_data_structs::CreateItemData>,96 ) -> DispatchResultWithPostInfo {97 let mut sum: u128 = 0;98 for data in data {99 match data {100 up_data_structs::CreateItemData::Fungible(data) => {101 sum = sum102 .checked_add(data.value)103 .ok_or(ArithmeticError::Overflow)?;104 }105 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),106 }107 }108109 with_weight(110 <Pallet<T>>::create_item(self, &sender, (to, sum)),111 <CommonWeights<T>>::create_item(),112 )113 }114115 fn create_multiple_items_ex(116 &self,117 sender: <T>::CrossAccountId,118 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,119 ) -> DispatchResultWithPostInfo {120 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);121 let data = match data {122 up_data_structs::CreateItemExData::Fungible(f) => f,123 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),124 };125126 with_weight(127 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner()),128 weight,129 )130 }131132 fn burn_item(133 &self,134 sender: T::CrossAccountId,135 token: TokenId,136 amount: u128,137 ) -> DispatchResultWithPostInfo {138 ensure!(139 token == TokenId::default(),140 <Error<T>>::FungibleItemsHaveNoId141 );142143 with_weight(144 <Pallet<T>>::burn(self, &sender, amount),145 <CommonWeights<T>>::burn_item(),146 )147 }148149 fn transfer(150 &self,151 from: T::CrossAccountId,152 to: T::CrossAccountId,153 token: TokenId,154 amount: u128,155 ) -> DispatchResultWithPostInfo {156 ensure!(157 token == TokenId::default(),158 <Error<T>>::FungibleItemsHaveNoId159 );160161 with_weight(162 <Pallet<T>>::transfer(self, &from, &to, amount),163 <CommonWeights<T>>::transfer(),164 )165 }166167 fn approve(168 &self,169 sender: T::CrossAccountId,170 spender: T::CrossAccountId,171 token: TokenId,172 amount: u128,173 ) -> DispatchResultWithPostInfo {174 ensure!(175 token == TokenId::default(),176 <Error<T>>::FungibleItemsHaveNoId177 );178179 with_weight(180 <Pallet<T>>::set_allowance(self, &sender, &spender, amount),181 <CommonWeights<T>>::approve(),182 )183 }184185 fn transfer_from(186 &self,187 sender: T::CrossAccountId,188 from: T::CrossAccountId,189 to: T::CrossAccountId,190 token: TokenId,191 amount: u128,192 nesting_budget: &dyn Budget,193 ) -> DispatchResultWithPostInfo {194 ensure!(195 token == TokenId::default(),196 <Error<T>>::FungibleItemsHaveNoId197 );198199 with_weight(200 <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),201 <CommonWeights<T>>::transfer_from(),202 )203 }204205 fn burn_from(206 &self,207 sender: T::CrossAccountId,208 from: T::CrossAccountId,209 token: TokenId,210 amount: u128,211 nesting_budget: &dyn Budget,212 ) -> DispatchResultWithPostInfo {213 ensure!(214 token == TokenId::default(),215 <Error<T>>::FungibleItemsHaveNoId216 );217218 with_weight(219 <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),220 <CommonWeights<T>>::burn_from(),221 )222 }223224 fn set_variable_metadata(225 &self,226 _sender: T::CrossAccountId,227 _token: TokenId,228 _data: BoundedVec<u8, CustomDataLimit>,229 ) -> DispatchResultWithPostInfo {230 fail!(<Error<T>>::FungibleItemsDontHaveData)231 }232233 fn nest_token(234 &self,235 _sender: <T>::CrossAccountId,236 _from: (up_data_structs::CollectionId, TokenId),237 _under: TokenId,238 ) -> sp_runtime::DispatchResult {239 fail!(<Error<T>>::FungibleDisallowsNesting)240 }241242 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {243 if <Balance<T>>::get((self.id, account)) != 0 {244 vec![TokenId::default()]245 } else {246 vec![]247 }248 }249250 fn token_exists(&self, token: TokenId) -> bool {251 token == TokenId::default()252 }253254 fn last_token_id(&self) -> TokenId {255 TokenId::default()256 }257258 fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {259 None260 }261 fn const_metadata(&self, _token: TokenId) -> Vec<u8> {262 Vec::new()263 }264 fn variable_metadata(&self, _token: TokenId) -> Vec<u8> {265 Vec::new()266 }267268 fn collection_tokens(&self) -> u32 {269 1270 }271272 fn account_balance(&self, account: T::CrossAccountId) -> u32 {273 if <Balance<T>>::get((self.id, account)) != 0 {274 1275 } else {276 0277 }278 }279280 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {281 if token != TokenId::default() {282 return 0;283 }284 <Balance<T>>::get((self.id, account))285 }286287 fn allowance(288 &self,289 sender: T::CrossAccountId,290 spender: T::CrossAccountId,291 token: TokenId,292 ) -> u128 {293 if token != TokenId::default() {294 return 0;295 }296 <Allowance<T>>::get((self.id, sender, spender))297 }298}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, BoundedVec};20use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget};21use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};22use sp_runtime::ArithmeticError;23use sp_std::{vec::Vec, vec};24use up_data_structs::CustomDataLimit;2526use crate::{27 Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf, weights::WeightInfo,28};2930pub struct CommonWeights<T: Config>(PhantomData<T>);31impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {32 fn create_item() -> Weight {33 <SelfWeightOf<T>>::create_item()34 }3536 fn create_multiple_items(_amount: u32) -> Weight {37 Self::create_item()38 }3940 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {41 match data {42 CreateItemExData::Fungible(f) => {43 <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)44 }45 _ => 0,46 }47 }4849 fn burn_item() -> Weight {50 <SelfWeightOf<T>>::burn_item()51 }5253 fn transfer() -> Weight {54 <SelfWeightOf<T>>::transfer()55 }5657 fn approve() -> Weight {58 <SelfWeightOf<T>>::approve()59 }6061 fn transfer_from() -> Weight {62 <SelfWeightOf<T>>::transfer_from()63 }6465 fn burn_from() -> Weight {66 <SelfWeightOf<T>>::burn_from()67 }6869 fn set_variable_metadata(_bytes: u32) -> Weight {70 // Error71 072 }73}7475impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {76 fn create_item(77 &self,78 sender: T::CrossAccountId,79 to: T::CrossAccountId,80 data: up_data_structs::CreateItemData,81 nesting_budget: &dyn Budget,82 ) -> DispatchResultWithPostInfo {83 match data {84 up_data_structs::CreateItemData::Fungible(data) => with_weight(85 <Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),86 <CommonWeights<T>>::create_item(),87 ),88 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),89 }90 }9192 fn create_multiple_items(93 &self,94 sender: T::CrossAccountId,95 to: T::CrossAccountId,96 data: Vec<up_data_structs::CreateItemData>,97 nesting_budget: &dyn Budget,98 ) -> DispatchResultWithPostInfo {99 let mut sum: u128 = 0;100 for data in data {101 match data {102 up_data_structs::CreateItemData::Fungible(data) => {103 sum = sum104 .checked_add(data.value)105 .ok_or(ArithmeticError::Overflow)?;106 }107 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),108 }109 }110111 with_weight(112 <Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),113 <CommonWeights<T>>::create_item(),114 )115 }116117 fn create_multiple_items_ex(118 &self,119 sender: <T>::CrossAccountId,120 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,121 nesting_budget: &dyn Budget,122 ) -> DispatchResultWithPostInfo {123 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);124 let data = match data {125 up_data_structs::CreateItemExData::Fungible(f) => f,126 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),127 };128129 with_weight(130 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),131 weight,132 )133 }134135 fn burn_item(136 &self,137 sender: T::CrossAccountId,138 token: TokenId,139 amount: u128,140 ) -> DispatchResultWithPostInfo {141 ensure!(142 token == TokenId::default(),143 <Error<T>>::FungibleItemsHaveNoId144 );145146 with_weight(147 <Pallet<T>>::burn(self, &sender, amount),148 <CommonWeights<T>>::burn_item(),149 )150 }151152 fn transfer(153 &self,154 from: T::CrossAccountId,155 to: T::CrossAccountId,156 token: TokenId,157 amount: u128,158 nesting_budget: &dyn Budget,159 ) -> DispatchResultWithPostInfo {160 ensure!(161 token == TokenId::default(),162 <Error<T>>::FungibleItemsHaveNoId163 );164165 with_weight(166 <Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget),167 <CommonWeights<T>>::transfer(),168 )169 }170171 fn approve(172 &self,173 sender: T::CrossAccountId,174 spender: T::CrossAccountId,175 token: TokenId,176 amount: u128,177 ) -> DispatchResultWithPostInfo {178 ensure!(179 token == TokenId::default(),180 <Error<T>>::FungibleItemsHaveNoId181 );182183 with_weight(184 <Pallet<T>>::set_allowance(self, &sender, &spender, amount),185 <CommonWeights<T>>::approve(),186 )187 }188189 fn transfer_from(190 &self,191 sender: T::CrossAccountId,192 from: T::CrossAccountId,193 to: T::CrossAccountId,194 token: TokenId,195 amount: u128,196 nesting_budget: &dyn Budget,197 ) -> DispatchResultWithPostInfo {198 ensure!(199 token == TokenId::default(),200 <Error<T>>::FungibleItemsHaveNoId201 );202203 with_weight(204 <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),205 <CommonWeights<T>>::transfer_from(),206 )207 }208209 fn burn_from(210 &self,211 sender: T::CrossAccountId,212 from: T::CrossAccountId,213 token: TokenId,214 amount: u128,215 nesting_budget: &dyn Budget,216 ) -> DispatchResultWithPostInfo {217 ensure!(218 token == TokenId::default(),219 <Error<T>>::FungibleItemsHaveNoId220 );221222 with_weight(223 <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),224 <CommonWeights<T>>::burn_from(),225 )226 }227228 fn set_variable_metadata(229 &self,230 _sender: T::CrossAccountId,231 _token: TokenId,232 _data: BoundedVec<u8, CustomDataLimit>,233 ) -> DispatchResultWithPostInfo {234 fail!(<Error<T>>::FungibleItemsDontHaveData)235 }236237 fn check_nesting(238 &self,239 _sender: <T>::CrossAccountId,240 _from: CollectionId,241 _under: TokenId,242 _budget: &dyn Budget,243 ) -> sp_runtime::DispatchResult {244 fail!(<Error<T>>::FungibleDisallowsNesting)245 }246247 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {248 if <Balance<T>>::get((self.id, account)) != 0 {249 vec![TokenId::default()]250 } else {251 vec![]252 }253 }254255 fn token_exists(&self, token: TokenId) -> bool {256 token == TokenId::default()257 }258259 fn last_token_id(&self) -> TokenId {260 TokenId::default()261 }262263 fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {264 None265 }266 fn const_metadata(&self, _token: TokenId) -> Vec<u8> {267 Vec::new()268 }269 fn variable_metadata(&self, _token: TokenId) -> Vec<u8> {270 Vec::new()271 }272273 fn collection_tokens(&self) -> u32 {274 1275 }276277 fn account_balance(&self, account: T::CrossAccountId) -> u32 {278 if <Balance<T>>::get((self.id, account)) != 0 {279 1280 } else {281 0282 }283 }284285 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {286 if token != TokenId::default() {287 return 0;288 }289 <Balance<T>>::get((self.id, account))290 }291292 fn allowance(293 &self,294 sender: T::CrossAccountId,295 spender: T::CrossAccountId,296 token: TokenId,297 ) -> u128 {298 if token != TokenId::default() {299 return 0;300 }301 <Allowance<T>>::get((self.id, sender, spender))302 }303}pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -81,8 +81,11 @@
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
- <Pallet<T>>::transfer(self, &caller, &to, amount).map_err(|_| "transfer error")?;
+ <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;
Ok(true)
}
#[weight(<SelfWeightOf<T>>::transfer_from())]
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -193,6 +193,7 @@
from: &T::CrossAccountId,
to: &T::CrossAccountId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
ensure!(
collection.limits.transfers_enabled(),
@@ -222,12 +223,12 @@
let handle = <CollectionHandle<T>>::try_get(target.0)?;
let dispatch = T::CollectionDispatch::dispatch(handle);
let dispatch = dispatch.as_dyn();
-
- // =========
- dispatch.nest_token(from.clone(), (collection.id, TokenId::default()), target.1)?;
+ dispatch.check_nesting(from.clone(), collection.id, target.1, nesting_budget)?;
}
+ // =========
+
if let Some(balance_to) = balance_to {
// from != to
if balance_from == 0 {
@@ -257,6 +258,7 @@
collection: &FungibleHandle<T>,
sender: &T::CrossAccountId,
data: BTreeMap<T::CrossAccountId, u128>,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
if !collection.is_owner_or_admin(sender) {
ensure!(
@@ -285,6 +287,16 @@
.ok_or(ArithmeticError::Overflow)?;
}
+ for (to, _) in balances.iter() {
+ if let Some(target) = T::CrossTokenAddressMapping::address_to_token(to) {
+ let handle = <CollectionHandle<T>>::try_get(target.0)?;
+ let dispatch = T::CollectionDispatch::dispatch(handle);
+ let dispatch = dispatch.as_dyn();
+
+ dispatch.check_nesting(sender.clone(), collection.id, target.1, nesting_budget)?;
+ }
+ }
+
// =========
<TotalSupply<T>>::insert(collection.id, total_supply);
@@ -407,7 +419,7 @@
// =========
- Self::transfer(collection, from, to, amount)?;
+ Self::transfer(collection, from, to, amount, nesting_budget)?;
if let Some(allowance) = allowance {
Self::set_allowance_unchecked(collection, from, spender, allowance);
}
@@ -437,7 +449,13 @@
collection: &FungibleHandle<T>,
sender: &T::CrossAccountId,
data: CreateItemData<T>,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
- Self::create_multiple_items(collection, sender, [(data.0, data.1)].into_iter().collect())
+ Self::create_multiple_items(
+ collection,
+ sender,
+ [(data.0, data.1)].into_iter().collect(),
+ nesting_budget,
+ )
}
}
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -89,9 +89,15 @@
sender: T::CrossAccountId,
to: T::CrossAccountId,
data: up_data_structs::CreateItemData,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
with_weight(
- <Pallet<T>>::create_item(self, &sender, map_create_data::<T>(data, &to)?),
+ <Pallet<T>>::create_item(
+ self,
+ &sender,
+ map_create_data::<T>(data, &to)?,
+ nesting_budget,
+ ),
<CommonWeights<T>>::create_item(),
)
}
@@ -101,6 +107,7 @@
sender: T::CrossAccountId,
to: T::CrossAccountId,
data: Vec<up_data_structs::CreateItemData>,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
let data = data
.into_iter()
@@ -109,7 +116,7 @@
let amount = data.len();
with_weight(
- <Pallet<T>>::create_multiple_items(self, &sender, data),
+ <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),
<CommonWeights<T>>::create_multiple_items(amount as u32),
)
}
@@ -118,6 +125,7 @@
&self,
sender: <T>::CrossAccountId,
data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);
let data = match data {
@@ -126,7 +134,7 @@
};
with_weight(
- <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner()),
+ <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),
weight,
)
}
@@ -154,11 +162,12 @@
to: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);
if amount == 1 {
with_weight(
- <Pallet<T>>::transfer(self, &from, &to, token),
+ <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),
<CommonWeights<T>>::transfer(),
)
} else {
@@ -239,13 +248,14 @@
)
}
- fn nest_token(
+ fn check_nesting(
&self,
sender: T::CrossAccountId,
- (from, _): (CollectionId, TokenId),
+ from: CollectionId,
under: TokenId,
+ budget: &dyn Budget,
) -> sp_runtime::DispatchResult {
- <Pallet<T>>::nest_token(self, sender, from, under)
+ <Pallet<T>>::check_nesting(self, sender, from, under, budget)
}
fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -256,6 +256,10 @@
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token_id: u32 = token_id.try_into()?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
if <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?
@@ -272,6 +276,7 @@
variable_data: BoundedVec::default(),
owner: to,
},
+ &budget,
)
.map_err(dispatch_to_evm::<T>)?;
@@ -296,6 +301,10 @@
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
if <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?
@@ -314,6 +323,7 @@
variable_data: BoundedVec::default(),
owner: to,
},
+ &budget,
)
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
@@ -338,8 +348,11 @@
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token = token_id.try_into()?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
- <Pallet<T>>::transfer(self, &caller, &to, token).map_err(dispatch_to_evm::<T>)?;
+ <Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;
Ok(())
}
@@ -409,6 +422,9 @@
let mut expected_index = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
let total_tokens = token_ids.len();
for id in token_ids.into_iter() {
@@ -426,7 +442,8 @@
})
.collect();
- <Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;
+ <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)
+ .map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
@@ -447,6 +464,9 @@
let mut expected_index = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
let mut data = Vec::with_capacity(tokens.len());
for (id, token_uri) in tokens {
@@ -465,7 +485,8 @@
});
}
- <Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;
+ <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)
+ .map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
}
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -251,6 +251,7 @@
from: &T::CrossAccountId,
to: &T::CrossAccountId,
token: TokenId,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
ensure!(
collection.limits.transfers_enabled(),
@@ -294,12 +295,12 @@
let handle = <CollectionHandle<T>>::try_get(target.0)?;
let dispatch = T::CollectionDispatch::dispatch(handle);
let dispatch = dispatch.as_dyn();
-
- // =========
- dispatch.nest_token(from.clone(), (collection.id, token), target.1)?;
+ dispatch.check_nesting(from.clone(), collection.id, target.1, nesting_budget)?;
}
+ // =========
+
<TokenData<T>>::insert(
(collection.id, token),
ItemData {
@@ -340,6 +341,7 @@
collection: &NonfungibleHandle<T>,
sender: &T::CrossAccountId,
data: Vec<CreateItemData<T>>,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
if !collection.is_owner_or_admin(sender) {
ensure!(
@@ -379,6 +381,16 @@
);
}
+ for (to, _) in balances.iter() {
+ if let Some(target) = T::CrossTokenAddressMapping::address_to_token(to) {
+ let handle = <CollectionHandle<T>>::try_get(target.0)?;
+ let dispatch = T::CollectionDispatch::dispatch(handle);
+ let dispatch = dispatch.as_dyn();
+
+ dispatch.check_nesting(sender.clone(), collection.id, target.1, nesting_budget)?;
+ }
+ }
+
// =========
<TokensMinted<T>>::insert(collection.id, tokens_minted);
@@ -556,7 +568,7 @@
// =========
// Allowance is reset in [`transfer`]
- Self::transfer(collection, from, to, token)
+ Self::transfer(collection, from, to, token, nesting_budget)
}
pub fn burn_from(
@@ -595,35 +607,34 @@
Ok(())
}
- pub fn nest_token(
+ pub fn check_nesting(
handle: &NonfungibleHandle<T>,
sender: T::CrossAccountId,
from: CollectionId,
under: TokenId,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
fn ensure_sender_allowed<T: Config>(
collection: CollectionId,
token: TokenId,
sender: T::CrossAccountId,
+ budget: &dyn Budget,
) -> DispatchResult {
ensure!(
- <TokenData<T>>::get((collection, token))
- .ok_or(<CommonError<T>>::TokenNotFound)?
- .owner
- .conv_eq(&sender),
+ <PalletStructure<T>>::indirectly_owned(sender, collection, token, budget)?,
<CommonError<T>>::OnlyOwnerAllowedToNest,
);
Ok(())
}
match handle.limits.nesting_rule() {
NestingRule::Disabled => fail!(<CommonError<T>>::NestingIsDisabled),
- NestingRule::Owner => ensure_sender_allowed::<T>(from, under, sender)?,
+ NestingRule::Owner => ensure_sender_allowed::<T>(from, under, sender, nesting_budget)?,
NestingRule::OwnerRestricted(whitelist) => {
ensure!(
whitelist.contains(&from),
<CommonError<T>>::SourceCollectionIsNotAllowedToNest
);
- ensure_sender_allowed::<T>(from, under, sender)?
+ ensure_sender_allowed::<T>(from, under, sender, nesting_budget)?
}
}
Ok(())
@@ -634,7 +645,8 @@
collection: &NonfungibleHandle<T>,
sender: &T::CrossAccountId,
data: CreateItemData<T>,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
- Self::create_multiple_items(collection, sender, vec![data])
+ Self::create_multiple_items(collection, sender, vec![data], nesting_budget)
}
}
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -19,7 +19,8 @@
use sp_std::collections::btree_map::BTreeMap;
use frame_support::{dispatch::DispatchResultWithPostInfo, fail, weights::Weight, BoundedVec};
use up_data_structs::{
- TokenId, CustomDataLimit, CreateItemExData, CreateRefungibleExData, budget::Budget,
+ CollectionId, TokenId, CustomDataLimit, CreateItemExData, CreateRefungibleExData,
+ budget::Budget,
};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::DispatchError;
@@ -120,9 +121,15 @@
sender: T::CrossAccountId,
to: T::CrossAccountId,
data: up_data_structs::CreateItemData,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
with_weight(
- <Pallet<T>>::create_item(self, &sender, map_create_data::<T>(data, &to)?),
+ <Pallet<T>>::create_item(
+ self,
+ &sender,
+ map_create_data::<T>(data, &to)?,
+ nesting_budget,
+ ),
<CommonWeights<T>>::create_item(),
)
}
@@ -132,6 +139,7 @@
sender: T::CrossAccountId,
to: T::CrossAccountId,
data: Vec<up_data_structs::CreateItemData>,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
let data = data
.into_iter()
@@ -140,7 +148,7 @@
let amount = data.len();
with_weight(
- <Pallet<T>>::create_multiple_items(self, &sender, data),
+ <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),
<CommonWeights<T>>::create_multiple_items(amount as u32),
)
}
@@ -149,6 +157,7 @@
&self,
sender: <T>::CrossAccountId,
data: CreateItemExData<T::CrossAccountId>,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);
let data = match data {
@@ -162,7 +171,7 @@
};
with_weight(
- <Pallet<T>>::create_multiple_items(self, &sender, data),
+ <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),
weight,
)
}
@@ -185,9 +194,10 @@
to: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
with_weight(
- <Pallet<T>>::transfer(self, &from, &to, token, amount),
+ <Pallet<T>>::transfer(self, &from, &to, token, amount, nesting_budget),
<CommonWeights<T>>::transfer(),
)
}
@@ -247,11 +257,12 @@
)
}
- fn nest_token(
+ fn check_nesting(
&self,
_sender: <T>::CrossAccountId,
- _from: (up_data_structs::CollectionId, TokenId),
+ _from: CollectionId,
_under: TokenId,
+ _budget: &dyn Budget,
) -> sp_runtime::DispatchResult {
fail!(<Error<T>>::RefungibleDisallowsNesting)
}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -289,6 +289,7 @@
to: &T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
ensure!(
collection.limits.transfers_enabled(),
@@ -351,10 +352,10 @@
let dispatch = T::CollectionDispatch::dispatch(handle);
let dispatch = dispatch.as_dyn();
- // =========
+ dispatch.check_nesting(from.clone(), collection.id, target.1, nesting_budget)?;
+ }
- dispatch.nest_token(from.clone(), (collection.id, token), target.1)?;
- }
+ // =========
if let Some(balance_to) = balance_to {
// from != to
@@ -389,6 +390,7 @@
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
data: Vec<CreateRefungibleExData<T::CrossAccountId>>,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
if !collection.is_owner_or_admin(sender) {
ensure!(
@@ -453,6 +455,23 @@
}
}
+ for token in data.iter() {
+ for (to, _) in token.users.iter() {
+ if let Some(target) = T::CrossTokenAddressMapping::address_to_token(to) {
+ let handle = <CollectionHandle<T>>::try_get(target.0)?;
+ let dispatch = T::CollectionDispatch::dispatch(handle);
+ let dispatch = dispatch.as_dyn();
+
+ dispatch.check_nesting(
+ sender.clone(),
+ collection.id,
+ target.1,
+ nesting_budget,
+ )?;
+ }
+ }
+ }
+
// =========
<TokensMinted<T>>::insert(collection.id, tokens_minted);
@@ -591,7 +610,7 @@
// =========
- Self::transfer(collection, from, to, token, amount)?;
+ Self::transfer(collection, from, to, token, amount, nesting_budget)?;
if let Some(allowance) = allowance {
Self::set_allowance_unchecked(collection, from, spender, token, allowance);
}
@@ -648,7 +667,8 @@
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
data: CreateRefungibleExData<T::CrossAccountId>,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
- Self::create_multiple_items(collection, sender, vec![data])
+ Self::create_multiple_items(collection, sender, vec![data], nesting_budget)
}
}
pallets/structure/src/lib.rsdiffbeforeafterboth--- a/pallets/structure/src/lib.rs
+++ b/pallets/structure/src/lib.rs
@@ -19,7 +19,6 @@
use frame_support::Parameter;
use frame_support::dispatch::{GetDispatchInfo, UnfilteredDispatchable};
use frame_support::pallet_prelude::*;
- use frame_system::pallet_prelude::*;
use super::*;
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -693,8 +693,9 @@
#[transactional]
pub fn create_item(origin, collection_id: CollectionId, owner: T::CrossAccountId, data: CreateItemData) -> DispatchResultWithPostInfo {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+ let budget = budget::Value::new(2);
- dispatch_call::<T, _>(collection_id, |d| d.create_item(sender, owner, data))
+ dispatch_call::<T, _>(collection_id, |d| d.create_item(sender, owner, data, &budget))
}
/// This method creates multiple items in a collection created with CreateCollection method.
@@ -720,16 +721,18 @@
pub fn create_multiple_items(origin, collection_id: CollectionId, owner: T::CrossAccountId, items_data: Vec<CreateItemData>) -> DispatchResultWithPostInfo {
ensure!(!items_data.is_empty(), Error::<T>::EmptyArgument);
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+ let budget = budget::Value::new(2);
- dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items(sender, owner, items_data))
+ dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items(sender, owner, items_data, &budget))
}
#[weight = <CommonWeights<T>>::create_multiple_items_ex(&data)]
#[transactional]
pub fn create_multiple_items_ex(origin, collection_id: CollectionId, data: CreateItemExData<T::CrossAccountId>) -> DispatchResultWithPostInfo {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+ let budget = budget::Value::new(2);
- dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items_ex(sender, data))
+ dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items_ex(sender, data, &budget))
}
// TODO! transaction weight
@@ -839,8 +842,9 @@
#[transactional]
pub fn transfer(origin, recipient: T::CrossAccountId, collection_id: CollectionId, item_id: TokenId, value: u128) -> DispatchResultWithPostInfo {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+ let budget = budget::Value::new(2);
- dispatch_call::<T, _>(collection_id, |d| d.transfer(sender, recipient, item_id, value))
+ dispatch_call::<T, _>(collection_id, |d| d.transfer(sender, recipient, item_id, value, &budget))
}
/// Set, change, or remove approved address to transfer the ownership of the NFT.