Skip to content

Commit 32a9e6c

Browse files
committed
Merge remote-tracking branch 'origin/master' into release
2 parents fb73b3f + 861fbc3 commit 32a9e6c

File tree

2 files changed

+7
-25
lines changed

2 files changed

+7
-25
lines changed

kevm-pyk/src/kevm_pyk/kproj/evm-semantics/schedule.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,13 @@ A `ScheduleConst` is a constant determined by the fee schedule.
440440
```k
441441
syntax Schedule ::= "PRAGUE" [symbol(PRAGUE_EVM), smtlib(schedule_PRAGUE)]
442442
// --------------------------------------------------------------------------
443-
rule [SCHEDCONSTPrague]: SCHEDCONST < PRAGUE > => SCHEDCONST < CANCUN >
443+
rule [GmaxblobgasPrague]: Gmaxblobgas < PRAGUE > => 1179648
444+
rule [GtargetblobgasPrague]: Gtargetblobgas < PRAGUE > => 786432
445+
rule [BlobbasefeeupdatefractionPrague]: Blobbasefeeupdatefraction < PRAGUE > => 5007716
446+
rule [SCHEDCONSTPrague]: SCHEDCONST < PRAGUE > => SCHEDCONST < CANCUN >
447+
requires notBool ( SCHEDCONST ==K Gmaxblobgas
448+
orBool SCHEDCONST ==K Gtargetblobgas
449+
orBool SCHEDCONST ==K Blobbasefeeupdatefraction )
444450
445451
rule [GhasrequestsPrague]: Ghasrequests << PRAGUE >> => true
446452
rule [GhashistoryPrague]: Ghashistory << PRAGUE >> => true

tests/execution-spec-tests/failing.llvm

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,18 +1189,6 @@ blockchain_tests/cancun/eip4844_blobs/blob_txs/valid_blob_tx_combinations.json,"
11891189
blockchain_tests/cancun/eip4844_blobs/blob_txs/valid_blob_tx_combinations.json,"tests/cancun/eip4844_blobs/test_blob_txs.py::test_valid_blob_tx_combinations[fork_Prague-blobs_per_tx_(8, 1)-blockchain_test]"
11901190
blockchain_tests/cancun/eip4844_blobs/blob_txs/valid_blob_tx_combinations.json,"tests/cancun/eip4844_blobs/test_blob_txs.py::test_valid_blob_tx_combinations[fork_Prague-blobs_per_tx_(8,)-blockchain_test]"
11911191
blockchain_tests/cancun/eip4844_blobs/blob_txs/valid_blob_tx_combinations.json,"tests/cancun/eip4844_blobs/test_blob_txs.py::test_valid_blob_tx_combinations[fork_Prague-blobs_per_tx_(9,)-blockchain_test]"
1192-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode_contexts/blobhash_opcode_contexts.json,tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py::test_blobhash_opcode_contexts[opcode_context_on_CALLCODE-fork_Prague-blockchain_test]
1193-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode_contexts/blobhash_opcode_contexts.json,tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py::test_blobhash_opcode_contexts[opcode_context_on_CREATE-fork_Prague-blockchain_test]
1194-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode_contexts/blobhash_opcode_contexts.json,tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py::test_blobhash_opcode_contexts[opcode_context_on_CREATE2-fork_Prague-blockchain_test]
1195-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode_contexts/blobhash_opcode_contexts.json,tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py::test_blobhash_opcode_contexts[opcode_context_on_DELEGATECALL-fork_Prague-blockchain_test]
1196-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode_contexts/blobhash_opcode_contexts.json,tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py::test_blobhash_opcode_contexts[opcode_context_on_max_value-fork_Prague-blockchain_test]
1197-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode_contexts/blobhash_opcode_contexts.json,tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py::test_blobhash_opcode_contexts[opcode_context_on_STATICCALL-fork_Prague-blockchain_test]
1198-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode/blobhash_invalid_blob_index.json,tests/cancun/eip4844_blobs/test_blobhash_opcode.py::test_blobhash_invalid_blob_index[fork_Prague-blockchain_test-scenario_invalid_calls]
1199-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode/blobhash_multiple_txs_in_block.json,tests/cancun/eip4844_blobs/test_blobhash_opcode.py::test_blobhash_multiple_txs_in_block[fork_Prague-blockchain_test]
1200-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode/blobhash_scenarios.json,tests/cancun/eip4844_blobs/test_blobhash_opcode.py::test_blobhash_scenarios[fork_Prague-blockchain_test-scenario_repeated_valid]
1201-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode/blobhash_scenarios.json,tests/cancun/eip4844_blobs/test_blobhash_opcode.py::test_blobhash_scenarios[fork_Prague-blockchain_test-scenario_single_valid]
1202-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode/blobhash_scenarios.json,tests/cancun/eip4844_blobs/test_blobhash_opcode.py::test_blobhash_scenarios[fork_Prague-blockchain_test-scenario_valid_invalid]
1203-
blockchain_tests/cancun/eip4844_blobs/blobhash_opcode/blobhash_scenarios.json,tests/cancun/eip4844_blobs/test_blobhash_opcode.py::test_blobhash_scenarios[fork_Prague-blockchain_test-scenario_varied_valid]
12041192
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas_fork_transition/fork_transition_excess_blob_gas_at_blob_genesis.json,*
12051193
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas_fork_transition/fork_transition_excess_blob_gas_post_blob_genesis.json,*
12061194
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas_fork_transition/invalid_post_fork_block_without_blob_fields.json,*
@@ -1211,12 +1199,6 @@ blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_decreasing_blob_ga
12111199
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_decreasing_blob_gas_costs.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_decreasing_blob_gas_costs[fork_Prague-parent_blobs_5-parent_excess_blobs_27-blockchain_test-new_blobs_1]
12121200
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_decreasing_blob_gas_costs.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_decreasing_blob_gas_costs[fork_Prague-parent_blobs_5-parent_excess_blobs_398-blockchain_test-new_blobs_1]
12131201
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_decreasing_blob_gas_costs.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_decreasing_blob_gas_costs[fork_Prague-parent_blobs_5-parent_excess_blobs_848-blockchain_test-new_blobs_1]
1214-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_excess_blob_gas_calculation.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_excess_blob_gas_calculation[fork_Prague-parent_excess_blobs_0-parent_blobs_4-blockchain_test-new_blobs_1]
1215-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_excess_blob_gas_calculation.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_excess_blob_gas_calculation[fork_Prague-parent_excess_blobs_0-parent_blobs_5-blockchain_test-new_blobs_1]
1216-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_excess_blob_gas_calculation.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_excess_blob_gas_calculation[fork_Prague-parent_excess_blobs_0-parent_blobs_6-blockchain_test-new_blobs_1]
1217-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_excess_blob_gas_calculation.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_excess_blob_gas_calculation[fork_Prague-parent_excess_blobs_0-parent_blobs_7-blockchain_test-new_blobs_1]
1218-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_excess_blob_gas_calculation.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_excess_blob_gas_calculation[fork_Prague-parent_excess_blobs_0-parent_blobs_8-blockchain_test-new_blobs_1]
1219-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_excess_blob_gas_calculation.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_excess_blob_gas_calculation[fork_Prague-parent_excess_blobs_0-parent_blobs_9-blockchain_test-new_blobs_1]
12201202
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_excess_blob_gas_calculation.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_excess_blob_gas_calculation[fork_Prague-parent_excess_blobs_1-parent_blobs_1-blockchain_test-new_blobs_1]
12211203
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_excess_blob_gas_calculation.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_excess_blob_gas_calculation[fork_Prague-parent_excess_blobs_1-parent_blobs_2-blockchain_test-new_blobs_1]
12221204
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/correct_excess_blob_gas_calculation.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_correct_excess_blob_gas_calculation[fork_Prague-parent_excess_blobs_1-parent_blobs_3-blockchain_test-new_blobs_1]
@@ -1436,9 +1418,6 @@ blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_ch
14361418
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_change.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_excess_blob_gas_change[fork_Prague-parent_blobs_9-header_excess_blobs_delta_4-blockchain_test-new_blobs_1]
14371419
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_change.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_excess_blob_gas_change[fork_Prague-parent_blobs_9-header_excess_blobs_delta_5-blockchain_test-new_blobs_1]
14381420
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_change.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_excess_blob_gas_change[fork_Prague-parent_blobs_9-header_excess_blobs_delta_6-blockchain_test-new_blobs_1]
1439-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_target_blobs_increase_from_zero.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_excess_blob_gas_target_blobs_increase_from_zero[fork_Prague-parent_blobs_4-header_excess_blobs_delta_1-blockchain_test-new_blobs_1-parent_excess_blobs_0]
1440-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_target_blobs_increase_from_zero.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_excess_blob_gas_target_blobs_increase_from_zero[fork_Prague-parent_blobs_5-header_excess_blobs_delta_2-blockchain_test-new_blobs_1-parent_excess_blobs_0]
1441-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_target_blobs_increase_from_zero.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_excess_blob_gas_target_blobs_increase_from_zero[fork_Prague-parent_blobs_6-header_excess_blobs_delta_3-blockchain_test-new_blobs_1-parent_excess_blobs_0]
14421421
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_negative_excess_blob_gas.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_negative_excess_blob_gas[fork_Prague-parent_excess_blobs_1-parent_blobs_1-header_excess_blob_gas_18446744073708765184-blockchain_test-new_blobs_1]
14431422
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_negative_excess_blob_gas.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_negative_excess_blob_gas[fork_Prague-parent_excess_blobs_1-parent_blobs_1-header_excess_blob_gas_18446744073708896256-blockchain_test-new_blobs_1]
14441423
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_negative_excess_blob_gas.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_negative_excess_blob_gas[fork_Prague-parent_excess_blobs_1-parent_blobs_1-header_excess_blob_gas_18446744073709027328-blockchain_test-new_blobs_1]
@@ -1593,9 +1572,6 @@ blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_non_multiple_exces
15931572
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_non_multiple_excess_blob_gas.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_non_multiple_excess_blob_gas[fork_Prague-parent_excess_blobs_7-parent_blobs_5-header_excess_blob_gas_delta_-131071-blockchain_test-new_blobs_1]
15941573
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_non_multiple_excess_blob_gas.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_non_multiple_excess_blob_gas[fork_Prague-parent_excess_blobs_7-parent_blobs_7-header_excess_blob_gas_delta_1-blockchain_test-new_blobs_1]
15951574
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_non_multiple_excess_blob_gas.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_non_multiple_excess_blob_gas[fork_Prague-parent_excess_blobs_7-parent_blobs_7-header_excess_blob_gas_delta_131071-blockchain_test-new_blobs_1]
1596-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_static_excess_blob_gas_from_zero_on_blobs_above_target.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_static_excess_blob_gas_from_zero_on_blobs_above_target[fork_Prague-parent_blobs_7-blockchain_test-new_blobs_1-parent_excess_blobs_0-header_excess_blob_gas_0]
1597-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_static_excess_blob_gas_from_zero_on_blobs_above_target.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_static_excess_blob_gas_from_zero_on_blobs_above_target[fork_Prague-parent_blobs_8-blockchain_test-new_blobs_1-parent_excess_blobs_0-header_excess_blob_gas_0]
1598-
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_static_excess_blob_gas_from_zero_on_blobs_above_target.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_static_excess_blob_gas_from_zero_on_blobs_above_target[fork_Prague-parent_blobs_9-blockchain_test-new_blobs_1-parent_excess_blobs_0-header_excess_blob_gas_0]
15991575
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_static_excess_blob_gas.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_static_excess_blob_gas[fork_Prague-parent_excess_blobs_1-parent_blobs_1-blockchain_test-new_blobs_1]
16001576
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_static_excess_blob_gas.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_static_excess_blob_gas[fork_Prague-parent_excess_blobs_1-parent_blobs_2-blockchain_test-new_blobs_1]
16011577
blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_static_excess_blob_gas.json,tests/cancun/eip4844_blobs/test_excess_blob_gas.py::test_invalid_static_excess_blob_gas[fork_Prague-parent_excess_blobs_1-parent_blobs_3-blockchain_test-new_blobs_1]

0 commit comments

Comments
 (0)