difftreelog
feat budgets
in: master
19 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -33,7 +33,7 @@
COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, TokenId, CollectionStats, MAX_TOKEN_OWNERSHIP,
CollectionMode, NFT_SPONSOR_TRANSFER_TIMEOUT, FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT, CUSTOM_DATA_LIMIT, CollectionLimits,
- CustomDataLimit, CreateCollectionData, SponsorshipState, CreateItemExData, SponsoringRateLimit,
+ CustomDataLimit, CreateCollectionData, SponsorshipState, CreateItemExData, SponsoringRateLimit, budget::Budget,
};
pub use pallet::*;
use sp_core::H160;
@@ -763,6 +763,7 @@
to: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo;
fn burn_from(
&self,
@@ -770,6 +771,7 @@
from: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo;
fn set_variable_metadata(
pallets/evm-coder-substrate/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-coder-substrate/Cargo.toml
+++ b/pallets/evm-coder-substrate/Cargo.toml
@@ -17,6 +17,7 @@
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
+up-data-structs = { default-features = false, path = "../../primitives/data-structs" }
[dependencies.codec]
default-features = false
pallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -18,33 +18,43 @@
#[cfg(not(feature = "std"))]
extern crate alloc;
+#[cfg(not(feature = "std"))]
+use alloc::format;
+use frame_support::dispatch::Weight;
+
+use core::marker::PhantomData;
+use sp_std::cell::RefCell;
+use sp_std::vec::Vec;
+
+use frame_support::pallet_prelude::DispatchError;
+use frame_support::traits::PalletInfo;
+use frame_support::{ensure, sp_runtime::ModuleError};
+use up_data_structs::budget;
+use pallet_evm::{
+ ExitError, ExitRevert, ExitSucceed, GasWeightMapping, PrecompileFailure, PrecompileOutput,
+ PrecompileResult, runner::stack::MaybeMirroredLog,
+};
+use ethereum::TransactionV2;
+use sp_core::{H160, H256};
+use pallet_ethereum::EthereumTransactionSender;
// #[cfg(feature = "runtime-benchmarks")]
// pub mod benchmarking;
+use evm_coder::{
+ ToLog,
+ abi::{AbiReader, AbiWrite, AbiWriter},
+ execution::{self, Result},
+ types::{Msg, value},
+};
+
pub use pallet::*;
#[frame_support::pallet]
pub mod pallet {
- #[cfg(not(feature = "std"))]
- use alloc::format;
+ use super::*;
- use evm_coder::{
- ToLog,
- abi::{AbiReader, AbiWrite, AbiWriter},
- execution::{self, Result},
- types::{Msg, value},
- };
- use frame_support::{ensure, sp_runtime::ModuleError};
- use pallet_evm::{
- ExitError, ExitRevert, ExitSucceed, GasWeightMapping, PrecompileFailure, PrecompileOutput,
- PrecompileResult, runner::stack::MaybeMirroredLog,
- };
use frame_system::ensure_signed;
pub use frame_support::dispatch::DispatchResult;
- use pallet_ethereum::EthereumTransactionSender;
- use sp_std::cell::RefCell;
- use sp_std::vec::Vec;
- use sp_core::H160;
use frame_support::{pallet_prelude::*, traits::PalletInfo};
use frame_system::pallet_prelude::*;
@@ -76,214 +86,258 @@
Ok(())
}
}
+}
- // From instabul hardfork configuration: https://github.com/rust-blockchain/evm/blob/fd4fd6acc0ca3208d6770fdb3ba407c94cdf97c6/runtime/src/lib.rs#L284
- pub const G_SLOAD_WORD: u64 = 800;
- pub const G_SSTORE_WORD: u64 = 20000;
+// From instabul hardfork configuration: https://github.com/rust-blockchain/evm/blob/fd4fd6acc0ca3208d6770fdb3ba407c94cdf97c6/runtime/src/lib.rs#L284
+pub const G_SLOAD_WORD: u64 = 800;
+pub const G_SSTORE_WORD: u64 = 20000;
- #[derive(Default)]
- pub struct SubstrateRecorder<T: Config> {
- contract: H160,
- logs: RefCell<Vec<MaybeMirroredLog>>,
- initial_gas: u64,
- gas_limit: RefCell<u64>,
- _phantom: PhantomData<*const T>,
+pub fn generate_transaction() -> TransactionV2 {
+ use ethereum::{TransactionV0, TransactionAction, TransactionSignature};
+ TransactionV2::Legacy(TransactionV0 {
+ nonce: 0.into(),
+ gas_price: 0.into(),
+ gas_limit: 0.into(),
+ action: TransactionAction::Call(H160([0; 20])),
+ value: 0.into(),
+ // zero selector, this transaction always has same sender, so all data should be acquired from logs
+ input: Vec::from([0, 0, 0, 0]),
+ // if v is not 27 - then we need to pass some other validity checks
+ signature: TransactionSignature::new(27, H256([0x88; 32]), H256([0x88; 32])).unwrap(),
+ })
+}
+
+pub struct GasCallsBudget<'r, T: Config> {
+ recorder: &'r SubstrateRecorder<T>,
+ gas_per_call: u64,
+}
+impl<T: Config> budget::Budget for GasCallsBudget<'_, T> {
+ fn consume_custom(&self, calls: u32) -> bool {
+ let (gas, overflown) = (calls as u64).overflowing_add(self.gas_per_call);
+ if overflown {
+ return false;
+ }
+ self.recorder.consume_gas(gas).is_ok()
}
+}
- impl<T: Config> SubstrateRecorder<T> {
- pub fn new(contract: H160, gas_limit: u64) -> Self {
- Self {
- contract,
- logs: RefCell::new(Vec::new()),
- initial_gas: gas_limit,
- gas_limit: RefCell::new(gas_limit),
- _phantom: PhantomData,
- }
+#[derive(Default)]
+pub struct SubstrateRecorder<T: Config> {
+ contract: H160,
+ logs: RefCell<Vec<MaybeMirroredLog>>,
+ initial_gas: u64,
+ gas_limit: RefCell<u64>,
+ _phantom: PhantomData<*const T>,
+}
+
+impl<T: Config> SubstrateRecorder<T> {
+ pub fn new(contract: H160, gas_limit: u64) -> Self {
+ Self {
+ contract,
+ logs: RefCell::new(Vec::new()),
+ initial_gas: gas_limit,
+ gas_limit: RefCell::new(gas_limit),
+ _phantom: PhantomData,
}
+ }
+
+ pub fn is_empty(&self) -> bool {
+ self.logs.borrow().is_empty()
+ }
+ // Logs emitted with log_direct appear as substrate evm.Log event
+ pub fn log_direct(&self, log: impl ToLog) {
+ self.logs
+ .borrow_mut()
+ .push(MaybeMirroredLog::direct(log.to_log(self.contract)))
+ }
+ /// If log already has substrate equivalent - then we don't need to emit evm.Log
+ pub fn log_mirrored(&self, log: impl ToLog) {
+ self.logs
+ .borrow_mut()
+ .push(MaybeMirroredLog::mirrored(log.to_log(self.contract)))
+ }
+ pub fn retrieve_logs(self) -> Vec<MaybeMirroredLog> {
+ self.logs.into_inner()
+ }
- pub fn is_empty(&self) -> bool {
- self.logs.borrow().is_empty()
- }
- // Logs emitted with log_direct appear as substrate evm.Log event
- pub fn log_direct(&self, log: impl ToLog) {
- self.logs
- .borrow_mut()
- .push(MaybeMirroredLog::direct(log.to_log(self.contract)))
- }
- /// If log already has substrate equivalent - then we don't need to emit evm.Log
- pub fn log_mirrored(&self, log: impl ToLog) {
- self.logs
- .borrow_mut()
- .push(MaybeMirroredLog::mirrored(log.to_log(self.contract)))
+ pub fn gas_left(&self) -> u64 {
+ *self.gas_limit.borrow()
+ }
+ pub fn gas_calls_budget(&self, gas_per_call: u64) -> GasCallsBudget<T> {
+ GasCallsBudget {
+ recorder: self,
+ gas_per_call,
}
- pub fn retrieve_logs(self) -> Vec<MaybeMirroredLog> {
- self.logs.into_inner()
+ }
+ pub fn weight_calls_budget(&self, weight_per_call: Weight) -> GasCallsBudget<T> {
+ GasCallsBudget {
+ recorder: self,
+ gas_per_call: T::GasWeightMapping::weight_to_gas(weight_per_call),
}
+ }
+ pub fn consume_sload_sub(&self) -> DispatchResult {
+ self.consume_gas_sub(G_SLOAD_WORD)
+ }
+ pub fn consume_sstores_sub(&self, amount: usize) -> DispatchResult {
+ self.consume_gas_sub(G_SSTORE_WORD.saturating_mul(amount as u64))
+ }
+ pub fn consume_sstore_sub(&self) -> DispatchResult {
+ self.consume_gas_sub(G_SSTORE_WORD)
+ }
+ pub fn consume_gas_sub(&self, gas: u64) -> DispatchResult {
+ ensure!(gas != u64::MAX, Error::<T>::OutOfGas);
+ let mut gas_limit = self.gas_limit.borrow_mut();
+ ensure!(gas <= *gas_limit, Error::<T>::OutOfGas);
+ *gas_limit -= gas;
+ Ok(())
+ }
- pub fn gas_left(&self) -> u64 {
- *self.gas_limit.borrow()
+ pub fn consume_sload(&self) -> Result<()> {
+ self.consume_gas(G_SLOAD_WORD)
+ }
+ pub fn consume_sstore(&self) -> Result<()> {
+ self.consume_gas(G_SSTORE_WORD)
+ }
+ pub fn consume_gas(&self, gas: u64) -> Result<()> {
+ if gas == u64::MAX {
+ return Err(execution::Error::Error(ExitError::OutOfGas));
}
- pub fn consume_sload_sub(&self) -> DispatchResult {
- self.consume_gas_sub(G_SLOAD_WORD)
+ let mut gas_limit = self.gas_limit.borrow_mut();
+ if gas > *gas_limit {
+ return Err(execution::Error::Error(ExitError::OutOfGas));
}
- pub fn consume_sstores_sub(&self, amount: usize) -> DispatchResult {
- self.consume_gas_sub(G_SSTORE_WORD.saturating_mul(amount as u64))
- }
- pub fn consume_sstore_sub(&self) -> DispatchResult {
- self.consume_gas_sub(G_SSTORE_WORD)
- }
- pub fn consume_gas_sub(&self, gas: u64) -> DispatchResult {
- ensure!(gas != u64::MAX, Error::<T>::OutOfGas);
- let mut gas_limit = self.gas_limit.borrow_mut();
- ensure!(gas <= *gas_limit, Error::<T>::OutOfGas);
- *gas_limit -= gas;
- Ok(())
- }
+ *gas_limit -= gas;
+ Ok(())
+ }
+ pub fn return_gas(&self, gas: u64) {
+ let mut gas_limit = self.gas_limit.borrow_mut();
+ *gas_limit += gas;
+ }
- pub fn consume_sload(&self) -> Result<()> {
- self.consume_gas(G_SLOAD_WORD)
- }
- pub fn consume_sstore(&self) -> Result<()> {
- self.consume_gas(G_SSTORE_WORD)
- }
- pub fn consume_gas(&self, gas: u64) -> Result<()> {
- if gas == u64::MAX {
- return Err(execution::Error::Error(ExitError::OutOfGas));
- }
- let mut gas_limit = self.gas_limit.borrow_mut();
- if gas > *gas_limit {
- return Err(execution::Error::Error(ExitError::OutOfGas));
- }
- *gas_limit -= gas;
- Ok(())
- }
- pub fn return_gas(&self, gas: u64) {
- let mut gas_limit = self.gas_limit.borrow_mut();
- *gas_limit += gas;
- }
+ pub fn evm_to_precompile_output(
+ self,
+ result: evm_coder::execution::Result<Option<AbiWriter>>,
+ ) -> Option<PrecompileResult> {
+ use evm_coder::execution::Error;
+ Some(match result {
+ Ok(Some(v)) => Ok(PrecompileOutput {
+ exit_status: ExitSucceed::Returned,
+ cost: self.initial_gas - self.gas_left(),
+ // TODO: preserve mirroring status
+ logs: self.retrieve_logs().into_iter().map(|l| l.log).collect(),
+ output: v.finish(),
+ }),
+ Ok(None) => return None,
+ Err(Error::Revert(e)) => {
+ let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));
+ (&e as &str).abi_write(&mut writer);
- pub fn evm_to_precompile_output(
- self,
- result: evm_coder::execution::Result<Option<AbiWriter>>,
- ) -> Option<PrecompileResult> {
- use evm_coder::execution::Error;
- Some(match result {
- Ok(Some(v)) => Ok(PrecompileOutput {
- exit_status: ExitSucceed::Returned,
+ Err(PrecompileFailure::Revert {
+ exit_status: ExitRevert::Reverted,
cost: self.initial_gas - self.gas_left(),
- // TODO: preserve mirroring status
- logs: self.retrieve_logs().into_iter().map(|l| l.log).collect(),
- output: v.finish(),
- }),
- Ok(None) => return None,
- Err(Error::Revert(e)) => {
- let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));
- (&e as &str).abi_write(&mut writer);
+ output: writer.finish(),
+ })
+ }
+ Err(Error::Fatal(f)) => Err(f.into()),
+ Err(Error::Error(e)) => Err(e.into()),
+ })
+ }
- Err(PrecompileFailure::Revert {
- exit_status: ExitRevert::Reverted,
- cost: self.initial_gas - self.gas_left(),
- output: writer.finish(),
- })
- }
- Err(Error::Fatal(f)) => Err(f.into()),
- Err(Error::Error(e)) => Err(e.into()),
- })
+ pub fn submit_logs(self) {
+ let logs = self.retrieve_logs();
+ if logs.is_empty() {
+ return;
}
+ T::EthereumTransactionSender::submit_logs_transaction(
+ Default::default(),
+ generate_transaction(),
+ logs,
+ )
+ }
+}
- pub fn submit_logs(self) {
- let logs = self.retrieve_logs();
- if logs.is_empty() {
- return;
+pub fn dispatch_to_evm<T: Config>(err: DispatchError) -> evm_coder::execution::Error {
+ use evm_coder::execution::Error as ExError;
+ match err {
+ DispatchError::Module(ModuleError { index, error, .. })
+ if index
+ == T::PalletInfo::index::<Pallet<T>>()
+ .expect("evm-coder-substrate is a pallet, which should be added to runtime")
+ as u8 =>
+ {
+ match error {
+ v if v == Error::<T>::OutOfGas.as_u8() => ExError::Error(ExitError::OutOfGas),
+ v if v == Error::<T>::OutOfFund.as_u8() => ExError::Error(ExitError::OutOfFund),
+ _ => unreachable!("this pallet only defines two possible errors"),
}
- T::EthereumTransactionSender::submit_logs_transaction(Default::default(), logs)
}
+ DispatchError::Module(ModuleError {
+ message: Some(msg), ..
+ }) => ExError::Revert(msg.into()),
+ DispatchError::Module(ModuleError { index, error, .. }) => {
+ ExError::Revert(format!("error {} in pallet {}", error, index))
+ }
+ e => ExError::Revert(format!("substrate error: {:?}", e)),
}
+}
+
+pub trait WithRecorder<T: Config> {
+ fn recorder(&self) -> &SubstrateRecorder<T>;
+ fn into_recorder(self) -> SubstrateRecorder<T>;
+}
- pub fn dispatch_to_evm<T: Config>(err: DispatchError) -> evm_coder::execution::Error {
- use evm_coder::execution::Error as ExError;
- match err {
- DispatchError::Module(ModuleError { index, error, .. })
- if index
- == T::PalletInfo::index::<Pallet<T>>()
- .expect("evm-coder-substrate is a pallet, which should be added to runtime")
- as u8 =>
- {
- let mut read = &error as &[u8];
- match Error::<T>::decode(&mut read) {
- Ok(Error::<T>::OutOfGas) => ExError::Error(ExitError::OutOfGas),
- Ok(Error::<T>::OutOfFund) => ExError::Error(ExitError::OutOfFund),
- _ => unreachable!("this pallet only defines two possible errors"),
- }
- }
- DispatchError::Module(ModuleError {
- message: Some(msg), ..
- }) => ExError::Revert(msg.into()),
- DispatchError::Module(ModuleError { index, error, .. }) => {
- ExError::Revert(format!("error {:?} in pallet {}", error, index))
- }
- e => ExError::Revert(format!("substrate error: {:?}", e)),
- }
- }
+/// Helper to simplify implementing bridge between evm-coder definitions and pallet-evm
+pub fn call<
+ T: Config,
+ C: evm_coder::Call + evm_coder::Weighted,
+ E: evm_coder::Callable<C> + WithRecorder<T>,
+>(
+ caller: H160,
+ mut e: E,
+ value: value,
+ input: &[u8],
+) -> Option<PrecompileResult> {
+ let result = call_internal(caller, &mut e, value, input);
+ e.into_recorder().evm_to_precompile_output(result)
+}
- pub trait WithRecorder<T: Config> {
- fn recorder(&self) -> &SubstrateRecorder<T>;
- fn into_recorder(self) -> SubstrateRecorder<T>;
+fn call_internal<
+ T: Config,
+ C: evm_coder::Call + evm_coder::Weighted,
+ E: evm_coder::Callable<C> + WithRecorder<T>,
+>(
+ caller: H160,
+ e: &mut E,
+ value: value,
+ input: &[u8],
+) -> evm_coder::execution::Result<Option<AbiWriter>> {
+ let (selector, mut reader) = AbiReader::new_call(input)?;
+ let call = C::parse(selector, &mut reader)?;
+ if call.is_none() {
+ return Ok(None);
}
+ let call = call.unwrap();
- /// Helper to simplify implementing bridge between evm-coder definitions and pallet-evm
- pub fn call<
- T: Config,
- C: evm_coder::Call + evm_coder::Weighted,
- E: evm_coder::Callable<C> + WithRecorder<T>,
- >(
- caller: H160,
- mut e: E,
- value: value,
- input: &[u8],
- ) -> Option<PrecompileResult> {
- let result = call_internal(caller, &mut e, value, input);
- e.into_recorder().evm_to_precompile_output(result)
- }
+ let dispatch_info = call.weight();
+ e.recorder()
+ .consume_gas(T::GasWeightMapping::weight_to_gas(dispatch_info.weight))?;
- fn call_internal<
- T: Config,
- C: evm_coder::Call + evm_coder::Weighted,
- E: evm_coder::Callable<C> + WithRecorder<T>,
- >(
- caller: H160,
- e: &mut E,
- value: value,
- input: &[u8],
- ) -> evm_coder::execution::Result<Option<AbiWriter>> {
- let (selector, mut reader) = AbiReader::new_call(input)?;
- let call = C::parse(selector, &mut reader)?;
- if call.is_none() {
- return Ok(None);
+ match e.call(Msg {
+ call,
+ caller,
+ value,
+ }) {
+ Ok(v) => {
+ let unspent = v.post_info.calc_unspent(&dispatch_info);
+ e.recorder()
+ .return_gas(T::GasWeightMapping::weight_to_gas(unspent));
+ Ok(Some(v.data))
}
- let call = call.unwrap();
-
- let dispatch_info = call.weight();
- e.recorder()
- .consume_gas(T::GasWeightMapping::weight_to_gas(dispatch_info.weight))?;
-
- match e.call(Msg {
- call,
- caller,
- value,
- }) {
- Ok(v) => {
- let unspent = v.post_info.calc_unspent(&dispatch_info);
- e.recorder()
- .return_gas(T::GasWeightMapping::weight_to_gas(unspent));
- Ok(Some(v.data))
- }
- Err(v) => {
- let unspent = v.post_info.calc_unspent(&dispatch_info);
- e.recorder()
- .return_gas(T::GasWeightMapping::weight_to_gas(unspent));
- Err(v.data)
- }
+ Err(v) => {
+ let unspent = v.post_info.calc_unspent(&dispatch_info);
+ e.recorder()
+ .return_gas(T::GasWeightMapping::weight_to_gas(unspent));
+ Err(v.data)
}
}
}
pallets/fungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -20,7 +20,7 @@
use sp_std::prelude::*;
use pallet_common::benchmarking::create_collection_raw;
use frame_benchmarking::{benchmarks, account};
-use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH};
+use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, budget::Unlimited};
use pallet_common::bench_init;
const SEED: u32 = 1;
@@ -52,7 +52,7 @@
bench_init!(to: cross_sub(i););
(to, 200)
}).collect::<BTreeMap<_, _>>().try_into().unwrap();
- }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)}
+ }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}
burn_item {
bench_init!{
@@ -85,7 +85,7 @@
};
<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200))?;
<Pallet<T>>::set_allowance(&collection, &sender, &spender, 200)?;
- }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, 100)?}
+ }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, 100, &Unlimited)?}
burn_from {
bench_init!{
@@ -94,5 +94,5 @@
};
<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200))?;
<Pallet<T>>::set_allowance(&collection, &sender, &burner, 200)?;
- }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, 100)?}
+ }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, 100, &Unlimited)?}
}
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -17,7 +17,7 @@
use core::marker::PhantomData;
use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};
-use up_data_structs::{TokenId, CreateItemExData};
+use up_data_structs::{TokenId, CreateItemExData, budget::Budget};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::ArithmeticError;
use sp_std::{vec::Vec, vec};
@@ -189,6 +189,7 @@
to: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
ensure!(
token == TokenId::default(),
@@ -196,7 +197,7 @@
);
with_weight(
- <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount),
+ <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget),
<CommonWeights<T>>::transfer_from(),
)
}
@@ -207,6 +208,7 @@
from: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
ensure!(
token == TokenId::default(),
@@ -214,7 +216,7 @@
);
with_weight(
- <Pallet<T>>::burn_from(self, &sender, &from, amount),
+ <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),
<CommonWeights<T>>::burn_from(),
)
}
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -23,6 +23,7 @@
use sp_std::vec::Vec;
use pallet_evm::account::CrossAccountId;
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
+use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
use crate::{
Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,
@@ -96,8 +97,11 @@
let from = T::CrossAccountId::from_eth(from);
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_from(self, &caller, &from, &to, amount)
+ <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
@@ -127,8 +131,12 @@
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
- <Pallet<T>>::burn_from(self, &caller, &from, amount).map_err(dispatch_to_evm::<T>)?;
+ <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)
+ .map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
}
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -21,6 +21,7 @@
use pallet_evm::account::CrossAccountId;
use up_data_structs::{
AccessMode, CollectionId, TokenId, CreateCollectionData, mapping::TokenAddressMapping,
+ budget::Budget,
};
use pallet_common::{
Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
@@ -361,6 +362,7 @@
spender: &T::CrossAccountId,
from: &T::CrossAccountId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> Result<Option<u128>, DispatchError> {
if spender.conv_eq(from) {
return Ok(None);
@@ -372,7 +374,12 @@
if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {
// TODO: should collection owner be allowed to perform this transfer?
ensure!(
- <PalletStructure<T>>::indirectly_owned(spender.clone(), source.0, source.1, 1)?,
+ <PalletStructure<T>>::indirectly_owned(
+ spender.clone(),
+ source.0,
+ source.1,
+ nesting_budget
+ )?,
<CommonError<T>>::ApprovedValueTooLow,
);
return Ok(None);
@@ -394,8 +401,9 @@
from: &T::CrossAccountId,
to: &T::CrossAccountId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
- let allowance = Self::check_allowed(collection, spender, from, amount)?;
+ let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;
// =========
@@ -411,8 +419,9 @@
spender: &T::CrossAccountId,
from: &T::CrossAccountId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
- let allowance = Self::check_allowed(collection, spender, from, amount)?;
+ let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;
// =========
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -20,7 +20,7 @@
use sp_std::prelude::*;
use pallet_common::benchmarking::{create_collection_raw, create_data, create_var_data};
use frame_benchmarking::{benchmarks, account};
-use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, CUSTOM_DATA_LIMIT};
+use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, CUSTOM_DATA_LIMIT, budget::Unlimited};
use pallet_common::bench_init;
use core::convert::TryInto;
@@ -115,7 +115,7 @@
};
let item = create_max_item(&collection, &owner, sender.clone())?;
<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;
- }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item)?}
+ }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, &Unlimited)?}
burn_from {
bench_init!{
@@ -124,7 +124,7 @@
};
let item = create_max_item(&collection, &owner, sender.clone())?;
<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;
- }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item)?}
+ }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}
set_variable_metadata {
let b in 0..CUSTOM_DATA_LIMIT;
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -17,7 +17,7 @@
use core::marker::PhantomData;
use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};
-use up_data_structs::{TokenId, CustomDataLimit, CreateItemExData, CollectionId};
+use up_data_structs::{TokenId, CustomDataLimit, CreateItemExData, CollectionId, budget::Budget};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::DispatchError;
use sp_std::vec::Vec;
@@ -192,12 +192,13 @@
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_from(self, &sender, &from, &to, token),
+ <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),
<CommonWeights<T>>::transfer_from(),
)
} else {
@@ -211,12 +212,13 @@
from: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);
if amount == 1 {
with_weight(
- <Pallet<T>>::burn_from(self, &sender, &from, token),
+ <Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),
<CommonWeights<T>>::burn_from(),
)
} else {
pallets/nonfungible/src/erc.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/>.1617extern crate alloc;18use core::{19 char::{REPLACEMENT_CHARACTER, decode_utf16},20 convert::TryInto,21};22use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};23use frame_support::BoundedVec;24use up_data_structs::{TokenId, SchemaVersion};25use pallet_evm_coder_substrate::dispatch_to_evm;26use sp_core::{H160, U256};27use sp_std::{vec::Vec, vec};28use pallet_common::{29 erc::{CommonEvmHandler, PrecompileResult},30};31use pallet_evm::account::CrossAccountId;32use pallet_evm_coder_substrate::call;3334use crate::{35 AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,36 SelfWeightOf, weights::WeightInfo,37};3839fn error_unsupported_schema_version() -> Error {40 alloc::format!(41 "Unsupported schema version! Support only {:?}",42 SchemaVersion::ImageURL43 )44 .as_str()45 .into()46}4748#[derive(ToLog)]49pub enum ERC721Events {50 Transfer {51 #[indexed]52 from: address,53 #[indexed]54 to: address,55 #[indexed]56 token_id: uint256,57 },58 Approval {59 #[indexed]60 owner: address,61 #[indexed]62 approved: address,63 #[indexed]64 token_id: uint256,65 },66 #[allow(dead_code)]67 ApprovalForAll {68 #[indexed]69 owner: address,70 #[indexed]71 operator: address,72 approved: bool,73 },74}7576#[derive(ToLog)]77pub enum ERC721MintableEvents {78 #[allow(dead_code)]79 MintingFinished {},80}8182#[solidity_interface(name = "ERC721Metadata")]83impl<T: Config> NonfungibleHandle<T> {84 fn name(&self) -> Result<string> {85 Ok(decode_utf16(self.name.iter().copied())86 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))87 .collect::<string>())88 }8990 fn symbol(&self) -> Result<string> {91 Ok(string::from_utf8_lossy(&self.token_prefix).into())92 }9394 /// Returns token's const_metadata95 #[solidity(rename_selector = "tokenURI")]96 fn token_uri(&self, token_id: uint256) -> Result<string> {97 if !matches!(self.schema_version, SchemaVersion::ImageURL) {98 return Err(error_unsupported_schema_version());99 }100101 self.consume_store_reads(1)?;102 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;103 Ok(string::from_utf8_lossy(104 &<TokenData<T>>::get((self.id, token_id))105 .ok_or("token not found")?106 .const_data,107 )108 .into())109 }110}111112#[solidity_interface(name = "ERC721Enumerable")]113impl<T: Config> NonfungibleHandle<T> {114 fn token_by_index(&self, index: uint256) -> Result<uint256> {115 Ok(index)116 }117118 /// Not implemented119 fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {120 // TODO: Not implemetable121 Err("not implemented".into())122 }123124 fn total_supply(&self) -> Result<uint256> {125 self.consume_store_reads(1)?;126 Ok(<Pallet<T>>::total_supply(self).into())127 }128}129130#[solidity_interface(name = "ERC721", events(ERC721Events))]131impl<T: Config> NonfungibleHandle<T> {132 fn balance_of(&self, owner: address) -> Result<uint256> {133 self.consume_store_reads(1)?;134 let owner = T::CrossAccountId::from_eth(owner);135 let balance = <AccountBalance<T>>::get((self.id, owner));136 Ok(balance.into())137 }138 fn owner_of(&self, token_id: uint256) -> Result<address> {139 self.consume_store_reads(1)?;140 let token: TokenId = token_id.try_into()?;141 Ok(*<TokenData<T>>::get((self.id, token))142 .ok_or("token not found")?143 .owner144 .as_eth())145 }146 /// Not implemented147 fn safe_transfer_from_with_data(148 &mut self,149 _from: address,150 _to: address,151 _token_id: uint256,152 _data: bytes,153 _value: value,154 ) -> Result<void> {155 // TODO: Not implemetable156 Err("not implemented".into())157 }158 /// Not implemented159 fn safe_transfer_from(160 &mut self,161 _from: address,162 _to: address,163 _token_id: uint256,164 _value: value,165 ) -> Result<void> {166 // TODO: Not implemetable167 Err("not implemented".into())168 }169170 #[weight(<SelfWeightOf<T>>::transfer_from())]171 fn transfer_from(172 &mut self,173 caller: caller,174 from: address,175 to: address,176 token_id: uint256,177 _value: value,178 ) -> Result<void> {179 let caller = T::CrossAccountId::from_eth(caller);180 let from = T::CrossAccountId::from_eth(from);181 let to = T::CrossAccountId::from_eth(to);182 let token = token_id.try_into()?;183184 <Pallet<T>>::transfer_from(self, &caller, &from, &to, token)185 .map_err(dispatch_to_evm::<T>)?;186 Ok(())187 }188189 #[weight(<SelfWeightOf<T>>::approve())]190 fn approve(191 &mut self,192 caller: caller,193 approved: address,194 token_id: uint256,195 _value: value,196 ) -> Result<void> {197 let caller = T::CrossAccountId::from_eth(caller);198 let approved = T::CrossAccountId::from_eth(approved);199 let token = token_id.try_into()?;200201 <Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))202 .map_err(dispatch_to_evm::<T>)?;203 Ok(())204 }205206 /// Not implemented207 fn set_approval_for_all(208 &mut self,209 _caller: caller,210 _operator: address,211 _approved: bool,212 ) -> Result<void> {213 // TODO: Not implemetable214 Err("not implemented".into())215 }216217 /// Not implemented218 fn get_approved(&self, _token_id: uint256) -> Result<address> {219 // TODO: Not implemetable220 Err("not implemented".into())221 }222223 /// Not implemented224 fn is_approved_for_all(&self, _owner: address, _operator: address) -> Result<address> {225 // TODO: Not implemetable226 Err("not implemented".into())227 }228}229230#[solidity_interface(name = "ERC721Burnable")]231impl<T: Config> NonfungibleHandle<T> {232 #[weight(<SelfWeightOf<T>>::burn_item())]233 fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {234 let caller = T::CrossAccountId::from_eth(caller);235 let token = token_id.try_into()?;236237 <Pallet<T>>::burn(self, &caller, token).map_err(dispatch_to_evm::<T>)?;238 Ok(())239 }240}241242#[solidity_interface(name = "ERC721Mintable", events(ERC721MintableEvents))]243impl<T: Config> NonfungibleHandle<T> {244 fn minting_finished(&self) -> Result<bool> {245 Ok(false)246 }247248 /// `token_id` should be obtained with `next_token_id` method,249 /// unlike standard, you can't specify it manually250 #[weight(<SelfWeightOf<T>>::create_item())]251 fn mint(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {252 let caller = T::CrossAccountId::from_eth(caller);253 let to = T::CrossAccountId::from_eth(to);254 let token_id: u32 = token_id.try_into()?;255 if <TokensMinted<T>>::get(self.id)256 .checked_add(1)257 .ok_or("item id overflow")?258 != token_id259 {260 return Err("item id should be next".into());261 }262263 <Pallet<T>>::create_item(264 self,265 &caller,266 CreateItemData::<T> {267 const_data: BoundedVec::default(),268 variable_data: BoundedVec::default(),269 owner: to,270 },271 )272 .map_err(dispatch_to_evm::<T>)?;273274 Ok(true)275 }276277 /// `token_id` should be obtained with `next_token_id` method,278 /// unlike standard, you can't specify it manually279 #[solidity(rename_selector = "mintWithTokenURI")]280 #[weight(<SelfWeightOf<T>>::create_item())]281 fn mint_with_token_uri(282 &mut self,283 caller: caller,284 to: address,285 token_id: uint256,286 token_uri: string,287 ) -> Result<bool> {288 if !matches!(self.schema_version, SchemaVersion::ImageURL) {289 return Err(error_unsupported_schema_version());290 }291292 let caller = T::CrossAccountId::from_eth(caller);293 let to = T::CrossAccountId::from_eth(to);294 let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;295 if <TokensMinted<T>>::get(self.id)296 .checked_add(1)297 .ok_or("item id overflow")?298 != token_id299 {300 return Err("item id should be next".into());301 }302303 <Pallet<T>>::create_item(304 self,305 &caller,306 CreateItemData::<T> {307 const_data: Vec::<u8>::from(token_uri)308 .try_into()309 .map_err(|_| "token uri is too long")?,310 variable_data: BoundedVec::default(),311 owner: to,312 },313 )314 .map_err(dispatch_to_evm::<T>)?;315 Ok(true)316 }317318 /// Not implemented319 fn finish_minting(&mut self, _caller: caller) -> Result<bool> {320 Err("not implementable".into())321 }322}323324#[solidity_interface(name = "ERC721UniqueExtensions")]325impl<T: Config> NonfungibleHandle<T> {326 #[weight(<SelfWeightOf<T>>::transfer())]327 fn transfer(328 &mut self,329 caller: caller,330 to: address,331 token_id: uint256,332 _value: value,333 ) -> Result<void> {334 let caller = T::CrossAccountId::from_eth(caller);335 let to = T::CrossAccountId::from_eth(to);336 let token = token_id.try_into()?;337338 <Pallet<T>>::transfer(self, &caller, &to, token).map_err(dispatch_to_evm::<T>)?;339 Ok(())340 }341342 #[weight(<SelfWeightOf<T>>::burn_from())]343 fn burn_from(344 &mut self,345 caller: caller,346 from: address,347 token_id: uint256,348 _value: value,349 ) -> Result<void> {350 let caller = T::CrossAccountId::from_eth(caller);351 let from = T::CrossAccountId::from_eth(from);352 let token = token_id.try_into()?;353354 <Pallet<T>>::burn_from(self, &caller, &from, token).map_err(dispatch_to_evm::<T>)?;355 Ok(())356 }357358 fn next_token_id(&self) -> Result<uint256> {359 self.consume_store_reads(1)?;360 Ok(<TokensMinted<T>>::get(self.id)361 .checked_add(1)362 .ok_or("item id overflow")?363 .into())364 }365366 #[weight(<SelfWeightOf<T>>::set_variable_metadata(data.len() as u32))]367 fn set_variable_metadata(368 &mut self,369 caller: caller,370 token_id: uint256,371 data: bytes,372 ) -> Result<void> {373 let caller = T::CrossAccountId::from_eth(caller);374 let token = token_id.try_into()?;375376 <Pallet<T>>::set_variable_metadata(377 self,378 &caller,379 token,380 data.try_into()381 .map_err(|_| "metadata size exceeded limit")?,382 )383 .map_err(dispatch_to_evm::<T>)?;384 Ok(())385 }386387 fn get_variable_metadata(&self, token_id: uint256) -> Result<bytes> {388 self.consume_store_reads(1)?;389 let token: TokenId = token_id.try_into()?;390391 Ok(<TokenData<T>>::get((self.id, token))392 .ok_or("token not found")?393 .variable_data394 .into_inner())395 }396397 #[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]398 fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {399 let caller = T::CrossAccountId::from_eth(caller);400 let to = T::CrossAccountId::from_eth(to);401 let mut expected_index = <TokensMinted<T>>::get(self.id)402 .checked_add(1)403 .ok_or("item id overflow")?;404405 let total_tokens = token_ids.len();406 for id in token_ids.into_iter() {407 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;408 if id != expected_index {409 return Err("item id should be next".into());410 }411 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;412 }413 let data = (0..total_tokens)414 .map(|_| CreateItemData::<T> {415 const_data: BoundedVec::default(),416 variable_data: BoundedVec::default(),417 owner: to.clone(),418 })419 .collect();420421 <Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;422 Ok(true)423 }424425 #[solidity(rename_selector = "mintBulkWithTokenURI")]426 #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]427 fn mint_bulk_with_token_uri(428 &mut self,429 caller: caller,430 to: address,431 tokens: Vec<(uint256, string)>,432 ) -> Result<bool> {433 if !matches!(self.schema_version, SchemaVersion::ImageURL) {434 return Err(error_unsupported_schema_version());435 }436437 let caller = T::CrossAccountId::from_eth(caller);438 let to = T::CrossAccountId::from_eth(to);439 let mut expected_index = <TokensMinted<T>>::get(self.id)440 .checked_add(1)441 .ok_or("item id overflow")?;442443 let mut data = Vec::with_capacity(tokens.len());444 for (id, token_uri) in tokens {445 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;446 if id != expected_index {447 return Err("item id should be next".into());448 }449 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;450451 data.push(CreateItemData::<T> {452 const_data: Vec::<u8>::from(token_uri)453 .try_into()454 .map_err(|_| "token uri is too long")?,455 variable_data: vec![].try_into().unwrap(),456 owner: to.clone(),457 });458 }459460 <Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;461 Ok(true)462 }463}464465#[solidity_interface(466 name = "UniqueNFT",467 is(468 ERC721,469 ERC721Metadata,470 ERC721Enumerable,471 ERC721UniqueExtensions,472 ERC721Mintable,473 ERC721Burnable,474 )475)]476impl<T: Config> NonfungibleHandle<T> {}477478// Not a tests, but code generators479generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);480generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);481482impl<T: Config> CommonEvmHandler for NonfungibleHandle<T> {483 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");484485 fn call(self, source: &H160, input: &[u8], value: U256) -> Option<PrecompileResult> {486 call::<T, UniqueNFTCall<T>, _>(*source, self, value, input)487 }488}pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -20,7 +20,7 @@
use frame_support::{BoundedVec, ensure, fail};
use up_data_structs::{
AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
- mapping::TokenAddressMapping, NestingRule,
+ mapping::TokenAddressMapping, NestingRule, budget::Budget,
};
use pallet_evm::account::CrossAccountId;
use pallet_common::{
@@ -511,6 +511,7 @@
spender: &T::CrossAccountId,
from: &T::CrossAccountId,
token: TokenId,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
if spender.conv_eq(from) {
return Ok(());
@@ -522,7 +523,12 @@
if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {
// TODO: should collection owner be allowed to perform this transfer?
ensure!(
- <PalletStructure<T>>::indirectly_owned(spender.clone(), source.0, source.1, 1)?,
+ <PalletStructure<T>>::indirectly_owned(
+ spender.clone(),
+ source.0,
+ source.1,
+ nesting_budget
+ )?,
<CommonError<T>>::ApprovedValueTooLow,
);
return Ok(());
@@ -543,8 +549,9 @@
from: &T::CrossAccountId,
to: &T::CrossAccountId,
token: TokenId,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
- Self::check_allowed(collection, spender, from, token)?;
+ Self::check_allowed(collection, spender, from, token, nesting_budget)?;
// =========
@@ -557,8 +564,9 @@
spender: &T::CrossAccountId,
from: &T::CrossAccountId,
token: TokenId,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
- Self::check_allowed(collection, spender, from, token)?;
+ Self::check_allowed(collection, spender, from, token, nesting_budget)?;
// =========
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -20,7 +20,7 @@
use sp_std::prelude::*;
use pallet_common::benchmarking::{create_collection_raw, create_data, create_var_data};
use frame_benchmarking::{benchmarks, account};
-use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, CUSTOM_DATA_LIMIT};
+use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, CUSTOM_DATA_LIMIT, budget::Unlimited};
use pallet_common::bench_init;
use core::convert::TryInto;
use core::iter::IntoIterator;
@@ -165,7 +165,7 @@
};
let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;
<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;
- }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100)?}
+ }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}
// Target account is created
transfer_from_creating {
bench_init!{
@@ -174,7 +174,7 @@
};
let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;
<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;
- }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100)?}
+ }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}
// Source account is destroyed
transfer_from_removing {
bench_init!{
@@ -183,7 +183,7 @@
};
let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;
<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;
- }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200)?}
+ }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}
// Source account destroyed, target created
transfer_from_creating_removing {
bench_init!{
@@ -192,7 +192,7 @@
};
let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;
<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;
- }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200)?}
+ }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}
// Both source account and token is destroyed
burn_from {
@@ -202,7 +202,7 @@
};
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)?}
+ }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?}
set_variable_metadata {
let b in 0..CUSTOM_DATA_LIMIT;
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -18,7 +18,9 @@
use sp_std::collections::btree_map::BTreeMap;
use frame_support::{dispatch::DispatchResultWithPostInfo, fail, weights::Weight, BoundedVec};
-use up_data_structs::{TokenId, CustomDataLimit, CreateItemExData, CreateRefungibleExData};
+use up_data_structs::{
+ TokenId, CustomDataLimit, CreateItemExData, CreateRefungibleExData, budget::Budget,
+};
use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
use sp_runtime::DispatchError;
use sp_std::{vec::Vec, vec};
@@ -210,9 +212,10 @@
to: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
with_weight(
- <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, amount),
+ <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, amount, nesting_budget),
<CommonWeights<T>>::transfer_from(),
)
}
@@ -223,9 +226,10 @@
from: T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
with_weight(
- <Pallet<T>>::burn_from(self, &sender, &from, token, amount),
+ <Pallet<T>>::burn_from(self, &sender, &from, token, amount, nesting_budget),
<CommonWeights<T>>::burn_from(),
)
}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -19,7 +19,7 @@
use frame_support::{ensure, BoundedVec};
use up_data_structs::{
AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId,
- CreateCollectionData, CreateRefungibleExData, mapping::TokenAddressMapping,
+ CreateCollectionData, CreateRefungibleExData, mapping::TokenAddressMapping, budget::Budget,
};
use pallet_evm::account::CrossAccountId;
use pallet_common::{
@@ -544,6 +544,7 @@
from: &T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> Result<Option<u128>, DispatchError> {
if spender.conv_eq(from) {
return Ok(None);
@@ -555,7 +556,12 @@
if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {
// TODO: should collection owner be allowed to perform this transfer?
ensure!(
- <PalletStructure<T>>::indirectly_owned(spender.clone(), source.0, source.1, 1)?,
+ <PalletStructure<T>>::indirectly_owned(
+ spender.clone(),
+ source.0,
+ source.1,
+ nesting_budget
+ )?,
<CommonError<T>>::ApprovedValueTooLow,
);
return Ok(None);
@@ -578,8 +584,10 @@
to: &T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
- let allowance = Self::check_allowed(collection, spender, from, token, amount)?;
+ let allowance =
+ Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;
// =========
@@ -596,8 +604,10 @@
from: &T::CrossAccountId,
token: TokenId,
amount: u128,
+ nesting_budget: &dyn Budget,
) -> DispatchResult {
- let allowance = Self::check_allowed(collection, spender, from, token, amount)?;
+ let allowance =
+ Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;
// =========
pallets/structure/src/lib.rsdiffbeforeafterboth--- a/pallets/structure/src/lib.rs
+++ b/pallets/structure/src/lib.rs
@@ -6,8 +6,14 @@
use frame_support::fail;
pub use pallet::*;
use pallet_common::{dispatch::CollectionDispatch, CollectionHandle};
-use up_data_structs::{CollectionId, TokenId, mapping::TokenAddressMapping};
+use up_data_structs::{CollectionId, TokenId, mapping::TokenAddressMapping, budget::Budget};
+#[cfg(feature = "runtime-benchmarks")]
+pub mod benchmarking;
+pub mod weights;
+
+pub type SelfWeightOf<T> = <T as crate::Config>::WeightInfo;
+
#[frame_support::pallet]
pub mod pallet {
use frame_support::Parameter;
@@ -35,6 +41,7 @@
#[pallet::config]
pub trait Config: frame_system::Config + pallet_common::Config {
+ type WeightInfo: weights::WeightInfo;
type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;
type Call: Parameter + UnfilteredDispatchable<Origin = Self::Origin> + GetDispatchInfo;
}
@@ -127,10 +134,10 @@
pub fn find_topmost_owner(
collection: CollectionId,
token: TokenId,
- max_depth: u32,
+ budget: &dyn Budget,
) -> Result<T::CrossAccountId, DispatchError> {
let owner = Self::parent_chain(collection, token)
- .take(max_depth as usize)
+ .take_while(|_| budget.consume())
.find(|p| matches!(p, Ok(Parent::Normal(_) | Parent::TokenNotFound)))
.ok_or(<Error<T>>::DepthLimit)??;
@@ -145,7 +152,7 @@
user: T::CrossAccountId,
collection: CollectionId,
token: TokenId,
- max_depth: u32,
+ budget: &dyn Budget,
) -> Result<bool, DispatchError> {
let target_parent = match T::CrossTokenAddressMapping::address_to_token(&user) {
Some((collection, token)) => Parent::Token(collection, token),
@@ -153,7 +160,7 @@
};
Ok(Self::parent_chain(collection, token)
- .take(max_depth as usize)
+ .take_while(|_| budget.consume())
.any(|parent| Ok(&target_parent) == parent.as_ref()))
}
}
pallets/unique/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/unique/src/benchmarking.rs
+++ b/pallets/unique/src/benchmarking.rs
@@ -19,8 +19,8 @@
use super::*;
use crate::Pallet;
use frame_system::RawOrigin;
+use frame_support::traits::{tokens::currency::Currency, Get};
use frame_benchmarking::{benchmarks, account};
-use up_data_structs::*;
use sp_runtime::DispatchError;
use pallet_common::benchmarking::{create_data, create_var_data, create_u16_data};
@@ -173,6 +173,7 @@
owner_can_transfer: Some(true),
sponsored_data_rate_limit: None,
transfers_enabled: Some(true),
+ nesting_rule: None,
};
}: set_collection_limits(RawOrigin::Signed(caller.clone()), collection, cl)
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -43,7 +43,7 @@
MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,
AccessMode, CreateItemData, CollectionLimits, CollectionId, CollectionMode, TokenId,
SchemaVersion, SponsorshipState, MetaUpdatePermission, CreateCollectionData, CustomDataLimit,
- CreateItemExData,
+ CreateItemExData, budget,
};
use pallet_evm::account::CrossAccountId;
use pallet_common::{
@@ -807,8 +807,9 @@
#[transactional]
pub fn burn_from(origin, collection_id: CollectionId, from: T::CrossAccountId, 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.burn_from(sender, from, item_id, value))
+ dispatch_call::<T, _>(collection_id, |d| d.burn_from(sender, from, item_id, value, &budget))
}
/// Change ownership of the token.
@@ -888,8 +889,9 @@
#[transactional]
pub fn transfer_from(origin, from: T::CrossAccountId, 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_from(sender, from, recipient, item_id, value))
+ dispatch_call::<T, _>(collection_id, |d| d.transfer_from(sender, from, recipient, item_id, value, &budget))
}
/// Set off-chain data schema.
primitives/data-structs/src/budget.rsdiffbeforeafterboth--- /dev/null
+++ b/primitives/data-structs/src/budget.rs
@@ -0,0 +1,38 @@
+use core::cell::Cell;
+
+pub trait Budget {
+ /// Returns true while not exceeded
+ fn consume(&self) -> bool {
+ self.consume_custom(1)
+ }
+ /// Returns true while not exceeded
+ /// Implementations should use interior mutabilitiy
+ fn consume_custom(&self, calls: u32) -> bool;
+}
+
+pub struct Unlimited;
+impl Budget for Unlimited {
+ fn consume_custom(&self, _calls: u32) -> bool {
+ true
+ }
+}
+
+pub struct Value(Cell<u32>);
+impl Value {
+ pub fn new(v: u32) -> Self {
+ Self(Cell::new(v))
+ }
+ pub fn refund(self) -> u32 {
+ self.0.get()
+ }
+}
+impl Budget for Value {
+ fn consume_custom(&self, calls: u32) -> bool {
+ let (result, overflown) = self.0.get().overflowing_sub(calls);
+ if overflown {
+ return false;
+ }
+ self.0.set(result);
+ true
+ }
+}
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -35,6 +35,7 @@
use scale_info::TypeInfo;
mod bounded;
+pub mod budget;
pub mod mapping;
mod migration;