Skip to content

Commit ad7cb1b

Browse files
authored
chore(ci|tests): more updates for fusaka devnet 2 release (#1776)
* chore(all): updates to align with fusaka devnet 2. * chore: bump eels resolution. * chore(ci): feature.yaml * chore: remove rogue comment.
1 parent 71b4a57 commit ad7cb1b

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/configs/feature.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ eip7692:
3939
feature_only: true
4040
fusaka-devnet-2:
4141
evm-type: develop
42-
fill-params: --from=Prague --until=Osaka -k "((test_precompiles and address_0x100) or (test_set_code_to_precompile and precompile_0x0000000000000000000000000000000000000100)) or (eip198_modexp) or (test_sufficient_balance_blob_tx) or (test_valid_blob_tx_combinations)" tests/osaka tests/byzantium/eip198_modexp_precompile ./tests/cancun/eip4844_blobs/test_blob_txs.py::test_sufficient_balance_blob_tx ./tests/cancun/eip4844_blobs/test_blob_txs.py::test_valid_blob_tx_combinations
42+
fill-params: --from=Prague --until=Osaka ./tests/osaka ./tests/shanghai/eip3860_initcode ./tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_precompile ./tests/byzantium/eip198_modexp_precompile ./tests/frontier/precompiles/test_precompiles.py ./tests/cancun/eip4844_blobs/test_blob_txs.py::test_sufficient_balance_blob_tx ./tests/cancun/eip4844_blobs/test_blob_txs.py::test_valid_blob_tx_combinations
4343
feature_only: true

eels_resolutions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
"commit": "bb0eb750d643ced0ebf5dec732cdd23558d0b7f2"
4141
},
4242
"Osaka": {
43-
"git_url": "https://github.com/spencer-tb/execution-specs.git",
43+
"git_url": "https://github.com/ethereum/execution-specs.git",
4444
"branch": "forks/osaka",
45-
"commit": "99734284b89766883ecb680e57b07fbca47da51b"
45+
"commit": "f947ab1744aaf12f652a85e28ac5d155af26dd25"
4646
}
4747
}

tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ def test_clz_fork_transition(blockchain_test: BlockchainTestFiller, pre: Alloc):
160160
"""Test CLZ opcode behavior at fork transition."""
161161
sender = pre.fund_eoa()
162162
callee_address = pre.deploy_contract(
163-
code=Op.SSTORE(Op.NUMBER, Op.CLZ(1 << 100)) + Op.STOP,
164-
storage={"0x00": "0xdeadbeef"},
163+
code=Op.SSTORE(Op.TIMESTAMP, Op.CLZ(1 << 100)) + Op.STOP,
164+
storage={14_999: "0xdeadbeef"},
165165
)
166166
caller_address = pre.deploy_contract(
167-
code=Op.SSTORE(Op.NUMBER, Op.CALL(gas=0xFFFF, address=callee_address)),
168-
storage={"0x00": "0xdeadbeef"},
167+
code=Op.SSTORE(Op.TIMESTAMP, Op.CALL(gas=0xFFFF, address=callee_address)),
168+
storage={14_999: "0xdeadbeef"},
169169
)
170170
blocks = [
171171
Block(
@@ -208,16 +208,16 @@ def test_clz_fork_transition(blockchain_test: BlockchainTestFiller, pre: Alloc):
208208
post={
209209
caller_address: Account(
210210
storage={
211-
14_999: 0,
212-
15_000: 1,
213-
15_001: 1,
211+
14_999: 0, # Call fails as opcode not valid before Osaka
212+
15_000: 1, # Call succeeds on fork transition block
213+
15_001: 1, # Call continues to succeed after transition
214214
}
215215
),
216216
callee_address: Account(
217217
storage={
218-
14_999: 155,
219-
15_000: 155,
220-
15_001: 155,
218+
14_999: "0xdeadbeef", # CLZ not valid before fork, storage unchanged
219+
15_000: 155, # CLZ valid on transition block, CLZ(1 << 100) = 155
220+
15_001: 155, # CLZ continues to be valid after transition
221221
}
222222
),
223223
},

0 commit comments

Comments
 (0)