Implement EIP-7623 #897
Implement EIP-7623 #897
Conversation
There was a problem hiding this comment.
Some minor fixes I had to make when writing the tests.
Another thing is that validate_transaction function now fails because calculate_intrinsic_cost returns two values, so line:
if calculate_intrinsic_cost(tx) > tx.gas:has to be rewritten as:
if calculate_intrinsic_cost(tx)[0] > tx.gas:
src/ethereum/shanghai/fork.py
Outdated
| @@ -613,6 +614,14 @@ def process_transaction( | |||
| output = process_message_call(message, env) | |||
|
|
|||
| gas_used = tx.gas - output.gas_left | |||
|
|
|||
| floor = tokens_in_calldata * TOTAL_COST_FLOOR_PER_TOKEN + TX_BASE_COST | |||
There was a problem hiding this comment.
STANDARD_TOKEN_COST and TOTAL_COST_FLOOR_PER_TOKEN need to be imported from .fork_types.
There was a problem hiding this comment.
Thanks!
I replaced it for the imports
TX_DATA_COST_PER_NON_ZERO,
TX_DATA_COST_PER_ZERO,
src/ethereum/shanghai/fork.py
Outdated
| floor = tokens_in_calldata * TOTAL_COST_FLOOR_PER_TOKEN + TX_BASE_COST | ||
| if gas_used < floor: | ||
| if floor > tx.gas: | ||
| raise |
There was a problem hiding this comment.
We generally use ensure(<condition>, <exception>) to check for invalid conditions.
I'd also recommend choosing the exception type to raise. We have a few in exceptions.py (Maybe InvalidBlock?)
src/ethereum/shanghai/fork.py
Outdated
| """ | ||
| data_cost = 0 | ||
|
|
||
| zb = 0 |
There was a problem hiding this comment.
We generally prefer that identifiers be fully spelled out. What does zb represent?
There was a problem hiding this comment.
I was refering to zero-bytes. Agree that it makes sense to spell it out, fixed it.
src/ethereum/shanghai/fork.py
Outdated
| @@ -617,8 +617,7 @@ def process_transaction( | |||
|
|
|||
| floor = tokens_in_calldata * TOTAL_COST_FLOOR_PER_TOKEN + TX_BASE_COST | |||
| if gas_used < floor: | |||
| if floor > tx.gas: | |||
| raise | |||
| ensure(floor > tx.gas, InvalidBlock) | |||
There was a problem hiding this comment.
This may be backwards? It is now saying floor must be greater than tx.gas or else it'll raise InvalidBlock.
|
I believe I made a mistake here: Edit: This explains why you raised that comment in the last ACDE, @marioevz. So good catch. It should have been "deducting the high price" initially and then, in the case of not hitting the floor, increase the refund. |
src/ethereum/shanghai/fork.py
Outdated
|
|
||
| tokens_in_calldata = zero_bytes + (len(tx.data) - zero_bytes) * 4 | ||
|
|
||
| data_cost = tokens_in_calldata * TOTAL_COST_FLOOR_PER_TOKEN |
There was a problem hiding this comment.
It doesn't make sense to do
execution-specs/src/ethereum/shanghai/fork.py
Line 619 in f34da0b
If the data_cost = tokens_in_calldata * TOTAL_COST_FLOOR_PER_TOKEN
the gas_used is always gonna be greater than floor
explaination:
floor = tokens_in_calldata * TOTAL_COST_FLOOR_PER_TOKEN + TX_BASE_COST
i.e
floor = data_cost + TX_BASE_COST
And intrinsic_cost = TX_BASE_COST + data_cost + something
Or intrinsic_cost = floor + something
Or intrinsic_cost >= floor
And gas_used = intrinsic_cost + something
Or gas_used >= intrinsic_cost
Or gas_used >= floor always
There was a problem hiding this comment.
Accidentally closed. will reopen and fix that
|
Reopended at #934 |
I gave implementing EIP-7623 a try and got this first draft ready.
The EIP can be found here.
There's a side-doc with some additional analysis on the EIP here.
Cute Animal Picture