Skip to content

feat(tests): add consolidations & withdrawal requests with call_depth>2 #1415

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

Merged
marioevz merged 3 commits into from
Apr 16, 2025
Merged

feat(tests): add consolidations & withdrawal requests with call_depth>2 #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
527e335
feat(tests): add consolidations & withdrawal requests with `call_dept…
danceratopz Apr 8, 2025
0243fba
fix(tests): increase `gas_limit`; reduce depth
danceratopz Apr 11, 2025
813e70b
fix(tests): fix tx_gas_limit, reduce depth, make test id consistent
danceratopz Apr 16, 2025
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
2 changes: 1 addition & 1 deletion tests/prague/eip6110_deposits/test_deposits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@
tx_gas_limit=2_500_000_000_000,
),
],
id="single_deposit_from_contract_call_high_depth",
id="single_deposit_from_contract_call_depth_high",
),
# TODO: Send eth with the transaction to the contract
],
Expand Down
121 changes: 121 additions & 0 deletions tests/prague/eip7002_el_triggerable_withdrawals/test_withdrawal_requests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,41 @@
],
id="single_block_single_withdrawal_request_from_contract",
),
pytest.param(
[
[
WithdrawalRequestContract(
requests=[
WithdrawalRequest(
validator_pubkey=0x01,
amount=0,
fee=Spec.get_fee(0),
),
],
call_depth=3,
),
],
],
id="single_block_single_withdrawal_request_from_contract_call_depth_3",
),
pytest.param(
[
[
WithdrawalRequestContract(
requests=[
WithdrawalRequest(
validator_pubkey=0x01,
amount=0,
fee=Spec.get_fee(0),
),
],
call_depth=100,
tx_gas_limit=30_000_000,
),
],
],
id="single_block_single_withdrawal_request_from_contract_call_depth_high",
),
pytest.param(
[
[
Expand Down Expand Up @@ -505,6 +540,92 @@
],
id="single_block_single_withdrawal_request_delegatecall_staticcall_callcode",
),
pytest.param(
[
[
WithdrawalRequestContract(
requests=[
WithdrawalRequest(
validator_pubkey=0x01,
amount=0,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.DELEGATECALL,
call_depth=3,
),
WithdrawalRequestContract(
requests=[
WithdrawalRequest(
validator_pubkey=0x01,
amount=0,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.STATICCALL,
call_depth=3,
),
WithdrawalRequestContract(
requests=[
WithdrawalRequest(
validator_pubkey=0x01,
amount=0,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.CALLCODE,
call_depth=3,
),
],
],
id="single_block_single_withdrawal_request_delegatecall_staticcall_callcode_call_depth_3",
),
pytest.param(
[
[
WithdrawalRequestContract(
requests=[
WithdrawalRequest(
validator_pubkey=0x01,
amount=0,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.DELEGATECALL,
call_depth=1024,
),
WithdrawalRequestContract(
requests=[
WithdrawalRequest(
validator_pubkey=0x01,
amount=0,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.STATICCALL,
call_depth=1024,
),
WithdrawalRequestContract(
requests=[
WithdrawalRequest(
validator_pubkey=0x01,
amount=0,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.CALLCODE,
call_depth=1024,
),
],
],
id="single_block_single_withdrawal_request_delegatecall_staticcall_callcode_call_depth_high",
),
],
)
def test_withdrawal_requests(
Expand Down
123 changes: 123 additions & 0 deletions tests/prague/eip7251_consolidations/test_consolidations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,43 @@
],
id="single_block_multiple_consolidation_requests_from_contract",
),
pytest.param(
[
[
ConsolidationRequestContract(
requests=[
ConsolidationRequest(
source_pubkey=i * 2,
target_pubkey=i * 2 + 1,
fee=Spec.get_fee(0),
)
for i in range(Spec.MAX_CONSOLIDATION_REQUESTS_PER_BLOCK * 5)
],
call_depth=3,
),
],
],
id="single_block_multiple_consolidation_requests_from_contract_call_depth_3",
),
pytest.param(
[
[
ConsolidationRequestContract(
requests=[
ConsolidationRequest(
source_pubkey=i * 2,
target_pubkey=i * 2 + 1,
fee=Spec.get_fee(0),
gas_limit=6_000_000,
)
for i in range(Spec.MAX_CONSOLIDATION_REQUESTS_PER_BLOCK * 5)
],
call_depth=100,
),
],
],
id="single_block_multiple_consolidation_requests_from_contract_call_depth_high",
),
pytest.param(
[
[
Expand Down Expand Up @@ -534,6 +571,92 @@
],
id="single_block_single_consolidation_request_delegatecall_staticcall_callcode",
),
pytest.param(
[
[
ConsolidationRequestContract(
requests=[
ConsolidationRequest(
source_pubkey=0x01,
target_pubkey=0x02,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.DELEGATECALL,
call_depth=3,
),
ConsolidationRequestContract(
requests=[
ConsolidationRequest(
source_pubkey=0x01,
target_pubkey=0x02,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.STATICCALL,
call_depth=3,
),
ConsolidationRequestContract(
requests=[
ConsolidationRequest(
source_pubkey=0x01,
target_pubkey=0x02,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.CALLCODE,
call_depth=3,
),
],
],
id="single_block_single_consolidation_request_delegatecall_staticcall_callcode_call_depth_3",
),
pytest.param(
[
[
ConsolidationRequestContract(
requests=[
ConsolidationRequest(
source_pubkey=0x01,
target_pubkey=0x02,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.DELEGATECALL,
call_depth=1024,
),
ConsolidationRequestContract(
requests=[
ConsolidationRequest(
source_pubkey=0x01,
target_pubkey=0x02,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.STATICCALL,
call_depth=1024,
),
ConsolidationRequestContract(
requests=[
ConsolidationRequest(
source_pubkey=0x01,
target_pubkey=0x02,
fee=Spec.get_fee(0),
valid=False,
)
],
call_type=Op.CALLCODE,
call_depth=1024,
),
],
],
id="single_block_single_consolidation_request_delegatecall_staticcall_callcode_call_depth_high",
),
],
)
def test_consolidation_requests(
Expand Down
Loading