chore(levm, l1, l2): remove code specific to unsupported forks #2670
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lines of code reportTotal lines added: Detailed view |
Benchmark Results ComparisonPR ResultsBenchmark Results: Factorial
Benchmark Results: Factorial - Recursive
Benchmark Results: Fibonacci
Benchmark Results: ManyHashes
Benchmark Results: BubbleSort
Benchmark Results: ERC20 - Transfer
Benchmark Results: ERC20 - Mint
Benchmark Results: ERC20 - Approval
Main ResultsBenchmark Results: Factorial
Benchmark Results: Factorial - Recursive
Benchmark Results: Fibonacci
Benchmark Results: ManyHashes
Benchmark Results: BubbleSort
Benchmark Results: ERC20 - Transfer
Benchmark Results: ERC20 - Mint
Benchmark Results: ERC20 - Approval
|
EF Tests ComparisonSame results between main branch and the current PR. |
SDartayet
changed the title
|
There is an unnecessary check of Paris fork in |
JereSalo
approved these changes
May 7, 2025
Comment on lines
+35
to
+56
| // check for gas limit is grater or equal than the minimum required | ||
| let calldata = vm.current_call_frame()?.calldata.clone(); | ||
| let intrinsic_gas: u64 = vm.get_intrinsic_gas()?; | ||
|
|
||
| // calldata_cost = tokens_in_calldata * 4 | ||
| let calldata_cost: u64 = gas_cost::tx_calldata(&calldata).map_err(VMError::OutOfGas)?; | ||
|
|
||
| // same as calculated in gas_used() | ||
| let tokens_in_calldata: u64 = calldata_cost | ||
| .checked_div(STANDARD_TOKEN_COST) | ||
| .ok_or(VMError::Internal(InternalError::DivisionError))?; | ||
|
|
||
| // floor_cost_by_tokens = TX_BASE_COST + TOTAL_COST_FLOOR_PER_TOKEN * tokens_in_calldata | ||
| let floor_cost_by_tokens = tokens_in_calldata | ||
| .checked_mul(TOTAL_COST_FLOOR_PER_TOKEN) | ||
| .ok_or(VMError::Internal(InternalError::GasOverflow))? | ||
| .checked_add(TX_BASE_COST) | ||
| .ok_or(VMError::Internal(InternalError::GasOverflow))?; | ||
|
|
||
| let min_gas_limit = max(intrinsic_gas, floor_cost_by_tokens); | ||
| if vm.current_call_frame()?.gas_limit < min_gas_limit { | ||
| return Err(VMError::TxValidation(TxValidationError::IntrinsicGasTooLow)); |
There was a problem hiding this comment.
Isn't all this the same as what's in validate_min_gas_limit?
| @@ -131,11 +131,13 @@ impl Hook for L2Hook { | |||
| vm.increase_account_balance(vm.env.origin, vm.current_call_frame()?.msg_value)?; | |||
| } | |||
|
|
|||
| // 2. Return unused gas + gas refunds to the sender. | |||
There was a problem hiding this comment.
Why add a comment in this PR?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Keep the codebase clean and as simple as possible by removing code we don't really need.
Description
All the code that was only relevant to forks prior to Paris was removed. This includes constants, ifs, etc.
Resolves issue #2659