Skip to content

Commit b3b2a57

Browse files
committed
update specific osaka refs
1 parent 90e915e commit b3b2a57

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

setup.cfg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ packages =
116116
ethereum/prague/vm/instructions
117117
ethereum/prague/vm/precompiled_contracts
118118
ethereum/prague/vm/precompiled_contracts/bls12_381
119+
ethereum/osaka
120+
ethereum/osaka/utils
121+
ethereum/osaka/vm
122+
ethereum/osaka/vm/instructions
123+
ethereum/osaka/vm/precompiled_contracts
124+
ethereum/osaka/vm/precompiled_contracts/bls12_381
119125

120126

121127
package_dir =

src/ethereum/osaka/trie.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
from ethereum_types.numeric import U256, Uint
3737
from typing_extensions import assert_type
3838

39-
from ethereum.cancun import trie as previous_trie
4039
from ethereum.crypto.hash import keccak256
40+
from ethereum.prague import trie as previous_trie
4141
from ethereum.utils.hexadecimal import hex_to_bytes
4242

4343
from .blocks import Receipt, Withdrawal

src/ethereum/prague/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
The Prague fork.
33
"""
44

5-
from ethereum.fork_criteria import Unscheduled
5+
from ethereum.fork_criteria import ByTimestamp
66

7-
FORK_CRITERIA = Unscheduled()
7+
FORK_CRITERIA = ByTimestamp(1710338138)

tox.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ commands =
2222
pytest \
2323
-m "not slow" \
2424
-n auto --maxprocesses 5 \
25+
tests/osaka \
2526
--cov=ethereum --cov-report=term --cov-report "xml:{toxworkdir}/coverage.xml" \
2627
--ignore-glob='tests/fixtures/*' \
2728
--basetemp="{temp_dir}/pytest"
@@ -38,6 +39,7 @@ commands =
3839
--disable-warnings \
3940
-m "not slow" \
4041
-n auto --maxprocesses 2 \
42+
tests/osaka \
4143
--ignore-glob='tests/fixtures/*' \
4244
--basetemp="{temp_dir}/pytest"
4345

@@ -51,6 +53,7 @@ commands =
5153
pytest \
5254
-m "not slow and not evm_tools" \
5355
-n auto --maxprocesses 5 \
56+
tests/osaka \
5457
--ignore-glob='tests/fixtures/*' \
5558
--ignore-glob='tests/test_t8n.py' \
5659
--basetemp="{temp_dir}/pytest" \

0 commit comments

Comments
 (0)