Skip to content

Commit bb925d2

Browse files
committed
Merge remote-tracking branch 'origin/master' into release
2 parents e1dfdf0 + ebad50f commit bb925d2

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ To do so, we'll extend sort `JSON` with some EVM specific syntax, and provide a
7373
rule <k> startTx => loadTx( #sender( #getTxData(TXID), TW, TR, TS, B ) ) ... </k>
7474
<txPending> ListItem(TXID:Int) ... </txPending>
7575
<chainID> B </chainID>
76+
<gas> _ => 0 </gas>
7677
<message>
7778
<msgID> TXID </msgID>
7879
<sigV> TW </sigV>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@ After executing a transaction, it's necessary to have the effect of the substate
595595
<acctID> ACCT </acctID>
596596
<storage> STORAGE </storage>
597597
<origStorage> _ => STORAGE </origStorage>
598+
<transientStorage> _ => .Map </transientStorage>
598599
...
599600
</account>
600601

tests/failing.llvm

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ BlockchainTests/GeneralStateTests/Cancun/stEIP4844-blobtransactions/blobhashList
22
BlockchainTests/GeneralStateTests/Cancun/stEIP4844-blobtransactions/createBlobhashTx.json,*
33
BlockchainTests/GeneralStateTests/Cancun/stEIP4844-blobtransactions/emptyBlobhashList.json,*
44
BlockchainTests/GeneralStateTests/Cancun/stEIP4844-blobtransactions/wrongBlobhashVersion.json,*
5-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip1153_tstore/tstore_clear_after_deployment_tx.json,*
6-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip1153_tstore/tstore_clear_after_tx.json,*
75
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4788_beacon_root/beacon_root_transition.json,*
86
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_gas_subtraction_tx.json,*
9-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blobhash_multiple_txs_in_block.json,*
107
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/blob_type_tx_pre_fork.json,*
118
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/fork_transition_excess_blob_gas.json,*
129
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/insufficient_balance_blob_tx_combinations.json,*
@@ -33,19 +30,13 @@ BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/precompile_before
3330
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/precompile_during_fork.json,*
3431
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/reject_valid_full_blob_in_block_rlp.json,*
3532
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/create_selfdestruct_same_tx.json,*
36-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/dynamic_create2_selfdestruct_collision_multi_tx.json,*
37-
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/dynamic_create2_selfdestruct_collision_two_different_transactions.json,*
3833
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/recreate_self_destructed_contract_different_txs.json,*
3934
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/selfdestruct_created_same_block_different_tx.json,*
4035
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/self_destructing_initcode_create_tx.json,*
4136
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/self_destructing_initcode.json,*
4237
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip6780_selfdestruct/selfdestruct_pre_existing.json,*
4338
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip7516_blobgasfee/blobbasefee_before_fork.json,*
4439
BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip7516_blobgasfee/blobbasefee_during_fork.json,*
45-
BlockchainTests/GeneralStateTests/Pyspecs/constantinople/eip1014_create2/recreate.json,*
46-
BlockchainTests/GeneralStateTests/Pyspecs/frontier/opcodes/double_kill.json,*
47-
BlockchainTests/GeneralStateTests/Pyspecs/paris/security/tx_selfdestruct_balance_bug.json,*
48-
BlockchainTests/GeneralStateTests/Pyspecs/shanghai/eip4895_withdrawals/no_evm_execution.json,*
4940
BlockchainTests/GeneralStateTests/stEIP1559/lowFeeCap.json,*
5041
BlockchainTests/GeneralStateTests/stEIP1559/lowGasLimit.json,lowGasLimit_d0g0v0_Cancun
5142
BlockchainTests/GeneralStateTests/stEIP1559/lowGasPriceOldTypes.json,*

0 commit comments

Comments
 (0)