Skip to content
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

Use previous block hash to compute tx effectiveGasPrice #199

Merged
merged 5 commits into from
Jan 12, 2024
Merged

Use previous block hash to compute tx effectiveGasPrice #199

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
009b9f9
Use previous block hash to compute tx effectiveGasPrice
elfedy Jan 8, 2024
25be8e7
Respect previous spacing
elfedy Jan 8, 2024
1b510e4
Get substrate hash vs the whole BlockInfo
elfedy Jan 9, 2024
09bfffd
Remove unnecessary map_err
elfedy Jan 9, 2024
56d5a44
Update client/rpc/src/eth/transaction.rs
elfedy Jan 12, 2024
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
28 changes: 19 additions & 9 deletions client/rpc/src/eth/transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ where
block,
receipts,
statuses,
substrate_hash,
..
} = block_info.clone();
match (block, statuses, receipts) {
Expand Down Expand Up @@ -288,14 +287,25 @@ where
let effective_gas_price = match transaction {
EthereumTransaction::Legacy(t) => t.gas_price,
EthereumTransaction::EIP2930(t) => t.gas_price,
EthereumTransaction::EIP1559(t) => self
.client
.runtime_api()
.gas_price(substrate_hash)
.unwrap_or_default()
.checked_add(t.max_priority_fee_per_gas)
.unwrap_or_else(U256::max_value)
.min(t.max_fee_per_gas),
EthereumTransaction::EIP1559(t) => {
let parent_eth_hash = block.header.parent_hash;
let parent_substrate_hash = frontier_backend_client::load_hash::<B, C>(
self.client.as_ref(),
self.backend.as_ref(),
parent_eth_hash,
)
.await
.map_err(|err| internal_err(format!("{:?}", err)))?
.ok_or(internal_err("Failed to retrieve substrate parent block hash"))?;

self.client
.runtime_api()
.gas_price(parent_substrate_hash)
.unwrap_or_default()
.checked_add(t.max_priority_fee_per_gas)
.unwrap_or_else(U256::max_value)
.min(t.max_fee_per_gas)
}
};

return Ok(Some(Receipt {
Expand Down