Skip to content

Commit 2dc0979

Browse files
Merge branch 'master' into eip-7610
2 parents 893db22 + ee88122 commit 2dc0979

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

Makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@ test: test-integration test-conformance test-prove test-interactive
4040
test-conformance: poetry
4141
$(MAKE) -C kevm-pyk/ test-integration PYTEST_ARGS+="-k test_conformance.py"
4242

43+
conformance-failing-list: poetry
44+
cat /dev/null > tests/failing.llvm
45+
- $(MAKE) -C kevm-pyk/ test-integration PYTEST_ARGS+="-k test_conformance.py --save-failing --maxfail=10000"
46+
LC_ALL=en_US.UTF-8 sort -f -d -o tests/failing.llvm tests/failing.llvm
47+
if [ "$(shell uname)" = "Darwin" ]; then \
48+
sed -i '' '1{/^[[:space:]]*$$/d;}' tests/failing.llvm ;\
49+
echo >> tests/failing.llvm ;\
50+
else \
51+
sed -i '1{/^[[:space:]]*$$/d;}' tests/failing.llvm ;\
52+
fi
53+
4354
test-vm: poetry
4455
$(MAKE) -C kevm-pyk/ test-integration PYTEST_ARGS+="-k test_vm"
4556

tests/failing.llvm

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4788_beacon_root/no_beacon_r
1717
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4788_beacon_root/tx_to_beacon_root_contract.json,src/GeneralStateTestsFiller/Pyspecs/cancun/eip4788_beacon_root/test_beacon_root_contract.py::test_tx_to_beacon_root_contract[fork_Cancun-tx_type_3-blockchain_test-call_beacon_root_contract_True-auto_access_list_False]
1818
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4788_beacon_root/tx_to_beacon_root_contract.json,src/GeneralStateTestsFiller/Pyspecs/cancun/eip4788_beacon_root/test_beacon_root_contract.py::test_tx_to_beacon_root_contract[fork_Cancun-tx_type_3-blockchain_test-call_beacon_root_contract_True-auto_access_list_True]
1919
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_gas_subtraction_tx.json,*
20-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_tx_attribute_calldata_opcodes.json,*
21-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_tx_attribute_gasprice_opcode.json,*
22-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_tx_attribute_opcodes.json,*
23-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_tx_attribute_value_opcode.json,*
24-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_type_tx_pre_fork.json,*
2520
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blobhash_gas_cost.json,*
2621
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blobhash_invalid_blob_index.json,*
2722
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blobhash_multiple_txs_in_block.json,*
2823
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blobhash_opcode_contexts.json,*
2924
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blobhash_scenarios.json,*
25+
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_tx_attribute_calldata_opcodes.json,*
26+
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_tx_attribute_gasprice_opcode.json,*
27+
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_tx_attribute_opcodes.json,*
28+
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_tx_attribute_value_opcode.json,*
29+
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_type_tx_pre_fork.json,*
3030
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/call_opcode_types.json,*
3131
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/correct_decreasing_blob_gas_costs.json,*
3232
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/correct_excess_blob_gas_calculation.json,*
@@ -58,18 +58,18 @@ BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/point_evaluation_
5858
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/precompile_before_fork.json,*
5959
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/precompile_during_fork.json,*
6060
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/reject_valid_full_blob_in_block_rlp.json,*
61-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/sufficient_balance_blob_tx_pre_fund_tx.json,*
6261
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/sufficient_balance_blob_tx.json,*
62+
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/sufficient_balance_blob_tx_pre_fund_tx.json,*
6363
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/tx_entry_point.json,*
6464
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/valid_blob_tx_combinations.json,*
6565
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/valid_inputs.json,*
6666
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/create_selfdestruct_same_tx.json,*
6767
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/dynamic_create2_selfdestruct_collision_multi_tx.json,*
6868
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/dynamic_create2_selfdestruct_collision_two_different_transactions.json,*
6969
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/recreate_self_destructed_contract_different_txs.json,*
70+
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/selfdestruct_created_same_block_different_tx.json,*
7071
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/self_destructing_initcode_create_tx.json,*
7172
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/self_destructing_initcode.json,*
72-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/selfdestruct_created_same_block_different_tx.json,*
7373
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/selfdestruct_pre_existing.json,*
7474
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip7516_blobgasfee/blobbasefee_before_fork.json,*
7575
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip7516_blobgasfee/blobbasefee_during_fork.json,*
@@ -1010,8 +1010,8 @@ BlockchainTests/GeneralStateTests/stEIP1559/valCausesOOF.json,valCausesOOF_d0g2v
10101010
BlockchainTests/GeneralStateTests/stEIP1559/valCausesOOF.json,valCausesOOF_d1g0v1_Cancun
10111011
BlockchainTests/GeneralStateTests/stEIP1559/valCausesOOF.json,valCausesOOF_d1g2v0_Cancun
10121012
BlockchainTests/GeneralStateTests/stEIP1559/valCausesOOF.json,valCausesOOF_d1g2v1_Cancun
1013-
BlockchainTests/GeneralStateTests/stEIP3607/transactionCollidingWithNonEmptyAccount_calls.json,*
10141013
BlockchainTests/GeneralStateTests/stEIP3607/transactionCollidingWithNonEmptyAccount_callsItself.json,*
1014+
BlockchainTests/GeneralStateTests/stEIP3607/transactionCollidingWithNonEmptyAccount_calls.json,*
10151015
BlockchainTests/GeneralStateTests/stEIP3607/transactionCollidingWithNonEmptyAccount_init_Paris.json,*
10161016
BlockchainTests/GeneralStateTests/stEIP3607/transactionCollidingWithNonEmptyAccount_send_Paris.json,*
10171017
BlockchainTests/GeneralStateTests/stExample/invalidTr.json,*
@@ -1042,8 +1042,8 @@ BlockchainTests/GeneralStateTests/stSpecialTest/eoaEmptyParis.json,eoaEmptyParis
10421042
BlockchainTests/GeneralStateTests/stSpecialTest/eoaEmptyParis.json,eoaEmptyParis_d1g0v1_Cancun
10431043
BlockchainTests/GeneralStateTests/stSpecialTest/failed_tx_xcf416c53_Paris.json,*
10441044
BlockchainTests/GeneralStateTests/stTransactionTest/HighGasPriceParis.json,*
1045-
BlockchainTests/GeneralStateTests/stTransactionTest/NoSrcAccount.json,*
10461045
BlockchainTests/GeneralStateTests/stTransactionTest/NoSrcAccount1559.json,*
1047-
BlockchainTests/GeneralStateTests/stTransactionTest/NoSrcAccountCreate.json,*
10481046
BlockchainTests/GeneralStateTests/stTransactionTest/NoSrcAccountCreate1559.json,*
1047+
BlockchainTests/GeneralStateTests/stTransactionTest/NoSrcAccountCreate.json,*
1048+
BlockchainTests/GeneralStateTests/stTransactionTest/NoSrcAccount.json,*
10491049
BlockchainTests/GeneralStateTests/stTransactionTest/ValueOverflowParis.json,*

0 commit comments

Comments
 (0)