pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-15 16:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improves EVM gas price check (#7051)

Browse Source
This commit is contained in:
Alan Sapede
2020-09-08 16:40:52 -04:00
committed by GitHub
parent 5db3a4f500
commit 27d5584fba
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/evm/src/lib.rs
+12 -14
View File
@@ -333,7 +333,7 @@ decl_module! {
input, input,
value, value,
gas_limit, gas_limit,
Some(gas_price), gas_price,
nonce, nonce,
true, true,
)? { )? {
@@ -367,7 +367,7 @@ decl_module! {
init, init,
value, value,
gas_limit, gas_limit,
Some(gas_price), gas_price,
nonce, nonce,
true, true,
)? { )? {
@@ -402,7 +402,7 @@ decl_module! {
salt, salt,
value, value,
gas_limit, gas_limit,
Some(gas_price), gas_price,
nonce, nonce,
true, true,
)? { )? {
@@ -482,7 +482,7 @@ impl<T: Trait> Module<T> {
init: Vec<u8>, init: Vec<u8>,
value: U256, value: U256,
gas_limit: u32, gas_limit: u32,
gas_price: Option<U256>, gas_price: U256,
nonce: Option<U256>, nonce: Option<U256>,
apply_state: bool, apply_state: bool,
) -> Result<(ExitReason, H160, U256), Error<T>> { ) -> Result<(ExitReason, H160, U256), Error<T>> {
@@ -514,7 +514,7 @@ impl<T: Trait> Module<T> {
salt: H256, salt: H256,
value: U256, value: U256,
gas_limit: u32, gas_limit: u32,
gas_price: Option<U256>, gas_price: U256,
nonce: Option<U256>, nonce: Option<U256>,
apply_state: bool, apply_state: bool,
) -> Result<(ExitReason, H160, U256), Error<T>> { ) -> Result<(ExitReason, H160, U256), Error<T>> {
@@ -548,7 +548,7 @@ impl<T: Trait> Module<T> {
input: Vec<u8>, input: Vec<u8>,
value: U256, value: U256,
gas_limit: u32, gas_limit: u32,
gas_price: Option<U256>, gas_price: U256,
nonce: Option<U256>, nonce: Option<U256>,
apply_state: bool, apply_state: bool,
) -> Result<(ExitReason, Vec<u8>, U256), Error<T>> { ) -> Result<(ExitReason, Vec<u8>, U256), Error<T>> {
@@ -574,20 +574,18 @@ impl<T: Trait> Module<T> {
source: H160, source: H160,
value: U256, value: U256,
gas_limit: u32, gas_limit: u32,
gas_price: Option<U256>, gas_price: U256,
nonce: Option<U256>, nonce: Option<U256>,
apply_state: bool, apply_state: bool,
f: F, f: F,
) -> Result<(ExitReason, R, U256), Error<T>> where ) -> Result<(ExitReason, R, U256), Error<T>> where
F: FnOnce(&mut StackExecutor<Backend<T>>) -> (ExitReason, R), F: FnOnce(&mut StackExecutor<Backend<T>>) -> (ExitReason, R),
{ {
let gas_price = match gas_price {
Some(gas_price) => { // Gas price check is skipped when performing a gas estimation.
ensure!(gas_price >= T::FeeCalculator::min_gas_price(), Error::<T>::GasPriceTooLow); if apply_state {
gas_price ensure!(gas_price >= T::FeeCalculator::min_gas_price(), Error::<T>::GasPriceTooLow);
}, }
None => U256::zero(),
};
let vicinity = Vicinity { let vicinity = Vicinity {
gas_price, gas_price,