Skip to content

Commit c030b05

Browse files
authored
eth2: bump, remove holesky (#3786)
Holesky is no longer maintained and has been removed from eth2
1 parent 406115a commit c030b05

37 files changed

+112
-3261
lines changed

GeneralStateTestsDevnet.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ OK: 5/5 Fail: 0/5 Skip: 0/5
139139
+ valid_multi_inf.json OK
140140
```
141141
OK: 6/6 Fail: 0/6 Skip: 0/6
142+
## bls12_precompiles_before_fork
143+
```diff
144+
+ precompile_before_fork.json OK
145+
```
146+
OK: 1/1 Fail: 0/1 Skip: 0/1
142147
## bls12_variable_length_input_contracts
143148
```diff
144149
+ invalid_gas_g1msm.json OK
@@ -165,6 +170,11 @@ OK: 15/15 Fail: 0/15 Skip: 0/15
165170
+ call_memory_expands_on_early_revert.json OK
166171
```
167172
OK: 3/3 Fail: 0/3 Skip: 0/3
173+
## call_and_callcode_gas_calculation
174+
```diff
175+
+ value_transfer_gas_calculation.json OK
176+
```
177+
OK: 1/1 Fail: 0/1 Skip: 0/1
168178
## calldatacopy
169179
```diff
170180
+ calldatacopy.json OK
@@ -461,9 +471,10 @@ OK: 50/50 Fail: 0/50 Skip: 0/50
461471
+ pointer_to_precompile.json OK
462472
+ pointer_to_static.json OK
463473
+ pointer_to_static_reentry.json OK
474+
+ set_code_type_tx_pre_fork.json OK
464475
+ static_to_pointer.json OK
465476
```
466-
OK: 15/15 Fail: 0/15 Skip: 0/15
477+
OK: 16/16 Fail: 0/16 Skip: 0/16
467478
## shift_combinations
468479
```diff
469480
+ combinations.json OK
@@ -551,4 +562,4 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
551562
OK: 1/1 Fail: 0/1 Skip: 0/1
552563

553564
---TOTAL---
554-
OK: 265/265 Fail: 0/265 Skip: 0/265
565+
OK: 268/268 Fail: 0/268 Skip: 0/268

execution_chain/common/chain_config.nim

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ const
6060
# these are public network id
6161
MainNet* = 1.u256
6262
SepoliaNet* = 11155111.u256
63-
HoleskyNet* = 17000.u256
6463
HoodiNet* = 560048.u256
6564

6665
createJsonFlavor JGenesis,
@@ -579,33 +578,6 @@ func chainConfigForNetwork*(id: NetworkId): ChainConfig =
579578
depositContractAddress: Opt.some(SEPOLIANET_DEPOSIT_CONTRACT_ADDRESS),
580579
blobSchedule: defaultBlobSchedule(),
581580
)
582-
elif id == HoleskyNet:
583-
#https://github.com/eth-clients/holesky
584-
const
585-
HOLESKYNET_DEPOSIT_CONTRACT_ADDRESS = address"0x4242424242424242424242424242424242424242"
586-
ChainConfig(
587-
chainId: HoleskyNet,
588-
homesteadBlock: Opt.some(0.BlockNumber),
589-
eip150Block: Opt.some(0.BlockNumber),
590-
eip155Block: Opt.some(0.BlockNumber),
591-
eip158Block: Opt.some(0.BlockNumber),
592-
byzantiumBlock: Opt.some(0.BlockNumber),
593-
constantinopleBlock: Opt.some(0.BlockNumber),
594-
petersburgBlock: Opt.some(0.BlockNumber),
595-
istanbulBlock: Opt.some(0.BlockNumber),
596-
berlinBlock: Opt.some(0.BlockNumber),
597-
londonBlock: Opt.some(0.BlockNumber),
598-
mergeNetsplitBlock: Opt.some(0.BlockNumber),
599-
terminalTotalDifficulty: Opt.some(0.u256),
600-
shanghaiTime: Opt.some(1_696_000_704.EthTime), # Friday, 29 September 2023 15:18:24
601-
cancunTime: Opt.some(1_707_305_664.EthTime), # Wednesday, 7 February 2024 11:34:24
602-
pragueTime: Opt.some(1_740_434_112.EthTime), # Monday, 24 February 2025 21:55:12
603-
osakaTime: Opt.some(1_759_308_480.EthTime), # Wednesday, 1 October 2025 08:48:00
604-
bpo1Time: Opt.some(1_759_800_000.EthTime), # Tuesday, 7 October 2025 01:20:00
605-
bpo2Time: Opt.some(1_760_389_824.EthTime), # Monday, 13 October 2025 21:10:24
606-
depositContractAddress: Opt.some(HOLESKYNET_DEPOSIT_CONTRACT_ADDRESS),
607-
blobSchedule: defaultBlobSchedule(),
608-
)
609581
elif id == HoodiNet:
610582
const
611583
HOODI_DEPOSIT_CONTRACT_ADDRESS = address"0x00000000219ab540356cBB839Cbe05303d7705Fa"
@@ -661,14 +633,6 @@ func genesisBlockForNetwork*(id: NetworkId): Genesis
661633
difficulty: 0x20000.u256,
662634
alloc: decodePrealloc(sepoliaAllocData)
663635
)
664-
elif id == HoleskyNet:
665-
Genesis(
666-
difficulty: 0x01.u256,
667-
gasLimit: 0x17D7840,
668-
nonce: uint64(0x1234).to(Bytes8),
669-
timestamp: EthTime(0x65156994),
670-
alloc: decodePrealloc(holeskyAllocData)
671-
)
672636
elif id == HoodiNet:
673637
Genesis(
674638
difficulty: 0x01.u256,
@@ -685,8 +649,6 @@ func name*(id: NetworkId): string =
685649
"mainnet"
686650
elif id == SepoliaNet:
687651
"sepolia"
688-
elif id == HoleskyNet:
689-
"holesky"
690652
elif id == HoodiNet:
691653
"hoodi"
692654
else:

execution_chain/common/genesis_alloc.nim

Lines changed: 0 additions & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)