pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-27 02:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

pallet-evm: weight calculation for call/create based on gas provided (#4261)

Browse Source 
* pallet-evm: weight calculation for call/create based on gas provided

* Update frame/evm/src/lib.rs

Co-Authored-By: Niklas Adolfsson <niklasadolfsson1@gmail.com>
This commit is contained in:
Wei Tang
2019-12-03 18:04:17 +01:00
committed by Gavin Wood
parent 3b21f7fdc3
commit d4785ea314
1 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/evm/src/lib.rs
+37 -4
View File
@@ -23,13 +23,14 @@ mod backend;
pub use crate::backend::{Account, Log, Vicinity, Backend};
use rstd::vec::Vec;
use rstd::{vec::Vec, marker::PhantomData};
use support::{dispatch::Result, decl_module, decl_storage, decl_event};
use support::weights::{Weight, WeighData, ClassifyDispatch, DispatchClass, PaysFee};
use support::traits::{Currency, WithdrawReason, ExistenceRequirement};
use system::ensure_signed;
use sp_runtime::ModuleId;
use support::weights::SimpleDispatchInfo;
use sp_runtime::traits::{UniqueSaturatedInto, AccountIdConversion};
use sp_runtime::traits::{UniqueSaturatedInto, AccountIdConversion, SaturatedConversion};
use primitives::{U256, H256, H160};
use evm::{ExitReason, ExitSucceed, ExitError};
use evm::executor::StackExecutor;
@@ -82,6 +83,38 @@ impl Precompiles for () {
}
}
struct WeightForCallCreate<F>(PhantomData<F>);
impl<F> Default for WeightForCallCreate<F> {
fn default() -> Self {
Self(PhantomData)
}
}
impl<F: FeeCalculator> WeighData<(&H160, &Vec<u8>, &U256, &u32)> for WeightForCallCreate<F> {
fn weigh_data(&self, (_, _, _, gas_provided): (&H160, &Vec<u8>, &U256, &u32)) -> Weight {
F::gas_price().saturated_into::<Weight>().saturating_mul(*gas_provided)
}
}
impl<F: FeeCalculator> WeighData<(&Vec<u8>, &U256, &u32)> for WeightForCallCreate<F> {
fn weigh_data(&self, (_, _, gas_provided): (&Vec<u8>, &U256, &u32)) -> Weight {
F::gas_price().saturated_into::<Weight>().saturating_mul(*gas_provided)
}
}
impl<F: FeeCalculator, T> ClassifyDispatch<T> for WeightForCallCreate<F> {
fn classify_dispatch(&self, _: T) -> DispatchClass {
DispatchClass::Normal
}
}
impl<F: FeeCalculator> PaysFee for WeightForCallCreate<F> {
fn pays_fee(&self) -> bool {
true
}
}
/// EVM module trait
pub trait Trait: system::Trait + timestamp::Trait {
/// Calculator for current gas price.
@@ -161,7 +194,7 @@ decl_module! {
Ok(())
}
#[weight = SimpleDispatchInfo::FixedNormal(10_000)]
#[weight = WeightForCallCreate::<T::FeeCalculator>::default()]
fn call(origin, target: H160, input: Vec<u8>, value: U256, gas_limit: u32) -> Result {
let sender = ensure_signed(origin)?;
let source = T::ConvertAccountId::convert_account_id(&sender);
@@ -212,7 +245,7 @@ decl_module! {
ret
}
#[weight = SimpleDispatchInfo::FixedNormal(10_000)]
#[weight = WeightForCallCreate::<T::FeeCalculator>::default()]
fn create(origin, init: Vec<u8>, value: U256, gas_limit: u32) -> Result {
let sender = ensure_signed(origin)?;
let source = T::ConvertAccountId::convert_account_id(&sender);