Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion tests/berlin/eip2930_access_list/test_tx_intrinsic_gas.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,29 @@ def test_tx_intrinsic_gas(
intrinsic_gas_cost_calculator = fork.transaction_intrinsic_cost_calculator()
intrinsic_gas_cost = intrinsic_gas_cost_calculator(calldata=data, access_list=access_list)

exception: List[TransactionException] | TransactionException | None = None
if below_intrinsic:
data_floor_gas_cost_calculator = fork.transaction_data_floor_cost_calculator()
data_floor_gas_cost = data_floor_gas_cost_calculator(data=data)
if data_floor_gas_cost > intrinsic_gas_cost:
exception = TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST
elif data_floor_gas_cost == intrinsic_gas_cost:
# Depending on the implementation, client might raise either exception.
exception = [
TransactionException.INTRINSIC_GAS_TOO_LOW,
TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST,
]
else:
exception = TransactionException.INTRINSIC_GAS_TOO_LOW

tx = Transaction(
ty=tx_type,
sender=pre.fund_eoa(),
to=pre.deploy_contract(code=Op.SSTORE(0, Op.ADD(1, 1))),
data=data,
access_list=access_list,
gas_limit=intrinsic_gas_cost + (-1 if below_intrinsic else 0),
error=TransactionException.INTRINSIC_GAS_TOO_LOW if below_intrinsic else None,
error=exception,
protected=True,
)

Expand Down
Loading