Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmd/devp2p: update eth/snap protocol test suites for PoS #28340

Merged
merged 24 commits into from
Dec 20, 2023
+22,738 −2,083
Merged

cmd/devp2p: update eth/snap protocol test suites for PoS #28340

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8abcae5
cmd/devp2p: update ethtest suite for pos with new hivechain generator
lightclient Oct 30, 2023
844ce90
core/rawdb: make debug log clearly refer to freezer
lightclient Oct 30, 2023
51f28d2
core/txpool/legacypool: add missing debug log for invalid tx discard
lightclient Oct 30, 2023
9590e08
cmd/devp2p: add blob tx violations test
lightclient Oct 30, 2023
c5042cb
cmd/devp2p: remove logging in test
lightclient Oct 30, 2023
55c43d7
cmd/devp2p: add hivechain make script
lightclient Oct 30, 2023
c6bfefa
cmd/devp2p/internal/ethtest: regen chain with forkenv output
fjl Oct 31, 2023
9e09c76
cmd/devp2p: pass test parameters as flags instead of args
fjl Nov 7, 2023
10ea044
cmd/devp2p: add -node flag for testing
fjl Nov 7, 2023
75393fd
cmd/devp2p: update protocol testing docs
fjl Nov 7, 2023
2f78e97
cmd/devp2p: rename flag to -jwtsecret
fjl Nov 7, 2023
06b85ab
cmd/devp2p: improve example command
fjl Nov 7, 2023
ac68412
cmd/devp2p: add 4788 contract to genesis
lightclient Nov 9, 2023
779437f
cmd/devp2p: update ethtest test chain with beacon root set
lightclient Nov 9, 2023
db4a904
cmd/devp2p: update testchain with deterministic beacon roots
fjl Nov 22, 2023
10802e4
WIP
fjl Nov 22, 2023
c5c21a8
cmd/devp2p: finish account range descriptions
fjl Nov 22, 2023
25013dd
cmd/devp2p/internal/ethtest: update test chain
fjl Dec 14, 2023
54e523d
cmd/devp2p/internal/ethtest: snap suite works
fjl Dec 14, 2023
e8ffcda
cmd/devp2p/internal/ethtest: rebase updates
fjl Dec 14, 2023
08c533c
cmd/devp2p/internal/ethtest: remove hard-coded port
fjl Dec 14, 2023
ee36e07
cmd/devp2p/internal/ethtest: remove snap test chain
fjl Dec 14, 2023
7c1c954
cmd/devp2p/internal/ethtest: remove print
fjl Dec 14, 2023
df1b035
cmd/devp2p/internal/ethtest: remove snap test that requests genesis
fjl Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cmd/devp2p/internal/ethtest: regen chain with forkenv output
@fjl
fjl committed Dec 14, 2023
commit c6bfefa1b290ee5f8f517e7a6998a229b6c18c76
2 changes: 1 addition & 1 deletion cmd/devp2p/internal/ethtest/mkchain.sh
View file
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@ hivechain generate \
--length 500 \
--outdir testdata \
--lastfork cancun \
--outputs accounts,genesis,chain,headstate,txinfo,headblock,headfcu,newpayload
--outputs accounts,genesis,chain,headstate,txinfo,headblock,headfcu,newpayload,forkenv
Binary file modified cmd/devp2p/internal/ethtest/testdata/chain.rlp
View file
Binary file not shown.
21 changes: 21 additions & 0 deletions cmd/devp2p/internal/ethtest/testdata/forkenv.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"HIVE_CANCUN_TIMESTAMP": "840",
"HIVE_CHAIN_ID": "3503995874084926",
"HIVE_FORK_ARROW_GLACIER": "60",
"HIVE_FORK_BERLIN": "48",
"HIVE_FORK_BYZANTIUM": "18",
"HIVE_FORK_CONSTANTINOPLE": "24",
"HIVE_FORK_GRAY_GLACIER": "66",
"HIVE_FORK_HOMESTEAD": "0",
"HIVE_FORK_ISTANBUL": "36",
"HIVE_FORK_LONDON": "54",
"HIVE_FORK_MUIR_GLACIER": "42",
"HIVE_FORK_PETERSBURG": "30",
"HIVE_FORK_SPURIOUS": "12",
"HIVE_FORK_TANGERINE": "6",
"HIVE_MERGE_BLOCK_ID": "72",
"HIVE_NETWORK_ID": "3503995874084926",
"HIVE_SHANGHAI_TIMESTAMP": "780",
"HIVE_SKIP_POW": "1",
"HIVE_TERMINAL_TOTAL_DIFFICULTY": "9454784"
}
2 changes: 1 addition & 1 deletion cmd/devp2p/internal/ethtest/testdata/genesis.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"config": {
"chainId": 35039958740849263516136087381459012528369084397061947147216452157383146382873,
"chainId": 3503995874084926,
"homesteadBlock": 0,
"eip150Block": 6,
"eip155Block": 12,
6 changes: 3 additions & 3 deletions cmd/devp2p/internal/ethtest/testdata/headblock.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"parentHash": "0xc27fe0e3f88cd8b83701989a46266e18eb199baf742d351536613b0848438578",
"parentHash": "0x70ad86e294eac8f37bd0bec96e1a9ef63256bc6fdf8c4b69700c9f8a3ad4b663",
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
"miner": "0x0000000000000000000000000000000000000000",
"stateRoot": "0x8126c508b9368662bc602ad6ef75b26975ea314f7296ff54db5af4b971c537f8",
"transactionsRoot": "0xce0b40c6a6c1b6133193c48aee99f16da7583e851fc889bb6eb8b22d27ddf7d3",
"transactionsRoot": "0xecda39025fc4c609ce778d75eed0aa53b65ce1e3d1373b34bad8578cc31e5b48",
"receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"difficulty": "0x0",
@@ -19,5 +19,5 @@
"blobGasUsed": "0x0",
"excessBlobGas": "0x0",
"parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"hash": "0xbdddd6c13b6345c06012c2fab056ccd257409b71c794c9945fae994b8022dda8"
"hash": "0x6f1a49ed7c974b890016da931355dc66f28cb4e8d720af0b2e3f697640e4fd22"
}
6 changes: 3 additions & 3 deletions cmd/devp2p/internal/ethtest/testdata/headfcu.json
View file
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@
"method": "engine_forkchoiceUpdatedV3",
"params": [
{
"headBlockHash": "0xbdddd6c13b6345c06012c2fab056ccd257409b71c794c9945fae994b8022dda8",
"safeBlockHash": "0xbdddd6c13b6345c06012c2fab056ccd257409b71c794c9945fae994b8022dda8",
"finalizedBlockHash": "0xbdddd6c13b6345c06012c2fab056ccd257409b71c794c9945fae994b8022dda8"
"headBlockHash": "0x6f1a49ed7c974b890016da931355dc66f28cb4e8d720af0b2e3f697640e4fd22",
"safeBlockHash": "0x6f1a49ed7c974b890016da931355dc66f28cb4e8d720af0b2e3f697640e4fd22",
"finalizedBlockHash": "0x6f1a49ed7c974b890016da931355dc66f28cb4e8d720af0b2e3f697640e4fd22"
},
null
]
2,406 changes: 1,203 additions & 1,203 deletions cmd/devp2p/internal/ethtest/testdata/newpayload.json
View file

Large diffs are not rendered by default.

1,012 changes: 506 additions & 506 deletions cmd/devp2p/internal/ethtest/testdata/txinfo.json
View file

Large diffs are not rendered by default.