Skip to content

Conpanion for the frontier bug fix #1208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aurexav merged 3 commits into from
Jul 19, 2023
Merged

Conpanion for the frontier bug fix #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bae4a6
Bump the frontier version
boundless-forest Jul 19, 2023
daa2551
Fix todo in the runtime api
boundless-forest Jul 19, 2023
d3809ea
Fix ts tests
boundless-forest Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

89 changes: 81 additions & 8 deletions runtime/crab/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,10 @@ sp_api::impl_runtime_apis! {
estimate: bool,
access_list: Option<Vec<(sp_core::H160, Vec<sp_core::H256>)>>,
) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
// crates.io
use codec::Encode;
// frontier
use pallet_evm::Runner;
use pallet_evm::{Runner, GasWeightMapping};
// substrate
use sp_runtime::traits::UniqueSaturatedInto;

Expand All @@ -435,6 +437,40 @@ sp_api::impl_runtime_apis! {
let validate = true;
#[allow(clippy::or_fun_call)]
let evm_config = config.as_ref().unwrap_or(<Runtime as pallet_evm::Config>::config());

let mut estimated_transaction_len = data.len() +
20 + // to
20 + // from
32 + // value
32 + // gas_limit
32 + // nonce
1 + // TransactionAction
8 + // chain id
65; // signature

if max_fee_per_gas.is_some() {
estimated_transaction_len += 32;
}
if max_priority_fee_per_gas.is_some() {
estimated_transaction_len += 32;
}
if access_list.is_some() {
estimated_transaction_len += access_list.encoded_size();
}

let gas_limit = gas_limit.min(u64::MAX.into()).low_u64();
let without_base_extrinsic_weight = true;

let (weight_limit, proof_size_base_cost) =
match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
gas_limit,
without_base_extrinsic_weight
) {
weight_limit if weight_limit.proof_size() > 0 => {
(Some(weight_limit), Some(estimated_transaction_len as u64))
}
_ => (None, None),
};
<Runtime as pallet_evm::Config>::Runner::call(
from,
to,
Expand All @@ -447,9 +483,8 @@ sp_api::impl_runtime_apis! {
access_list.unwrap_or_default(),
is_transactional,
validate,
// TODO: FIX ME https://github.com/paritytech/frontier/pull/1101
None,
None,
weight_limit,
proof_size_base_cost,
evm_config,
).map_err(|err| err.error.into())
}
Expand All @@ -465,8 +500,10 @@ sp_api::impl_runtime_apis! {
estimate: bool,
access_list: Option<Vec<(sp_core::H160, Vec<sp_core::H256>)>>,
) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
// crates.io
use codec::Encode;
// frontier
use pallet_evm::Runner;
use pallet_evm::{Runner, GasWeightMapping};
// substrate
use sp_runtime::traits::UniqueSaturatedInto;

Expand All @@ -482,6 +519,43 @@ sp_api::impl_runtime_apis! {
let validate = true;
#[allow(clippy::or_fun_call)]
let evm_config = config.as_ref().unwrap_or(<Runtime as pallet_evm::Config>::config());

let mut estimated_transaction_len = data.len() +
20 + // from
32 + // value
32 + // gas_limit
32 + // nonce
1 + // TransactionAction
8 + // chain id
65; // signature

if max_fee_per_gas.is_some() {
estimated_transaction_len += 32;
}
if max_priority_fee_per_gas.is_some() {
estimated_transaction_len += 32;
}
if access_list.is_some() {
estimated_transaction_len += access_list.encoded_size();
}

let gas_limit = if gas_limit > sp_core::U256::from(u64::MAX) {
u64::MAX
} else {
gas_limit.low_u64()
};
let without_base_extrinsic_weight = true;

let (weight_limit, proof_size_base_cost) =
match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
gas_limit,
without_base_extrinsic_weight
) {
weight_limit if weight_limit.proof_size() > 0 => {
(Some(weight_limit), Some(estimated_transaction_len as u64))
}
_ => (None, None),
};
<Runtime as pallet_evm::Config>::Runner::create(
from,
data,
Expand All @@ -493,9 +567,8 @@ sp_api::impl_runtime_apis! {
access_list.unwrap_or_default(),
is_transactional,
validate,
// TODO: FIX ME https://github.com/paritytech/frontier/pull/1101
None,
None,
weight_limit,
proof_size_base_cost,
evm_config,
).map_err(|err| err.error.into())
}
Expand Down
Loading