Skip to content

Feat(Engine): Include cost of access list in intrinsic gas #219

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
joshuajbouw merged 1 commit into from
Aug 5, 2021
Merged

Feat(Engine): Include cost of access list in intrinsic gas #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions src/transaction/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,10 @@ fn rlp_extract_to(rlp: &Rlp<'_>, index: usize) -> Result<Option<Address>, Decode
}
}

// TODO: need to include access_list gas cost (see https://eips.ethereum.org/EIPS/eip-2930)
// Should go in the config, which requires upstream change.
fn intrinsic_gas(
is_contract_creation: bool,
data: &[u8],
_access_list: &[access_list::AccessTuple],
access_list: &[access_list::AccessTuple],
config: &evm::Config,
) -> Option<u64> {
let base_gas = if is_contract_creation {
Expand All @@ -163,9 +161,21 @@ fn intrinsic_gas(
.gas_transaction_non_zero_data
.checked_mul(num_non_zero_bytes as u64)?;

let gas_access_list_address = config
.gas_access_list_address
.checked_mul(access_list.len() as u64)?;
let gas_access_list_storage = config.gas_access_list_storage_key.checked_mul(
access_list
.iter()
.map(|a| a.storage_keys.len() as u64)
.sum(),
)?;

base_gas
.checked_add(gas_zero_bytes)
.and_then(|gas| gas.checked_add(gas_non_zero_bytes))
.and_then(|gas| gas.checked_add(gas_access_list_address))
.and_then(|gas| gas.checked_add(gas_access_list_storage))
}

fn vrs_to_arr(v: u8, r: U256, s: U256) -> [u8; 65] {
Expand Down