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

Fix estimate_gas execution doesn't match the actual execution #1257

Merged
merged 6 commits into from
Dec 13, 2023
Merged

Fix estimate_gas execution doesn't match the actual execution #1257

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99f8c40
Ensure the actual executed proof base size is the same as the estimat…
boundless-forest Dec 12, 2023
4424482
Add tests
boundless-forest Dec 12, 2023
65e2be6
Fix estimate-gas bug
boundless-forest Dec 12, 2023
6a84b88
Fix the broken ts test, very tricky
boundless-forest Dec 12, 2023
30c684c
Rewrite the total fee per gas part and code clean
boundless-forest Dec 13, 2023
d4abbf5
Fix clippy
boundless-forest Dec 13, 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
Prev Previous commit
Fix clippy
@boundless-forest
boundless-forest committed Dec 13, 2023
commit d4abbf54ccad883669cea903ea150e3b61f09d34
8 changes: 3 additions & 5 deletions client/rpc/src/eth/execute.rs
View file
Original file line number Diff line number Diff line change
@@ -1020,11 +1020,9 @@ fn fee_details(
request_max_fee_per_gas,
request_priority_fee_per_gas,
) {
(Some(_), Some(_), Some(_)) => {
return Err(internal_err(
"both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified",
));
}
(Some(_), Some(_), Some(_)) => Err(internal_err(
"both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified",
)),
// Legacy or EIP-2930 transaction.
(gas_price, None, None) if gas_price.is_some() => Ok(FeeDetails {
gas_price,