Skip to content

Commit 63a01b5

Browse files
authored
[r32] Schedule Fusaka on Ethereum mainnet (#17736)
Cherry pick #17734 into `release/3.2`
1 parent 60fc317 commit 63a01b5

File tree

6 files changed

+24
-15
lines changed

6 files changed

+24
-15
lines changed

cl/clparams/config.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ var MainnetBeaconConfig BeaconChainConfig = BeaconChainConfig{
900900
ElectraForkVersion: 0x05000000,
901901
ElectraForkEpoch: 364032,
902902
FuluForkVersion: 0x06000000,
903-
FuluForkEpoch: math.MaxUint64,
903+
FuluForkEpoch: 411392,
904904

905905
// New values introduced in Altair hard fork 1.
906906
// Participation flag indices.
@@ -992,7 +992,10 @@ var MainnetBeaconConfig BeaconChainConfig = BeaconChainConfig{
992992
// Fulu
993993
ValidatorCustodyRequirement: 8,
994994
BalancePerAdditionalCustodyGroup: 32_000_000_000,
995-
BlobSchedule: []BlobParameters{},
995+
BlobSchedule: []BlobParameters{
996+
{412672, 15},
997+
{419072, 21},
998+
},
996999
}
9971000

9981001
func mainnetConfig() BeaconChainConfig {
@@ -1199,6 +1202,7 @@ func gnosisConfig() BeaconChainConfig {
11991202
cfg.MaxPerEpochActivationExitChurnLimit = 64_000_000_000
12001203
cfg.MaxRequestBlobSidecarsElectra = 256
12011204
cfg.MaxPendingPartialsPerWithdrawalsSweep = 6
1205+
cfg.BlobSchedule = []BlobParameters{}
12021206
cfg.InitializeForkSchedule()
12031207
return cfg
12041208
}
@@ -1243,6 +1247,7 @@ func chiadoConfig() BeaconChainConfig {
12431247
cfg.MaxPerEpochActivationChurnLimit = 2
12441248
cfg.MaxPerEpochActivationExitChurnLimit = 64_000_000_000
12451249
cfg.MaxRequestBlobSidecarsElectra = 256
1250+
cfg.BlobSchedule = []BlobParameters{}
12461251
cfg.InitializeForkSchedule()
12471252
return cfg
12481253
}

cl/utils/eth_clock/ethereum_clock_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestGetForkDigests(t *testing.T) {
3737
clock := NewEthereumClock(0, common.Hash{}, &clparams.MainnetBeaconConfig)
3838
currDigest, err := clock.CurrentForkDigest()
3939
require.NoError(t, err)
40-
require.Equal(t, common.Bytes4{0xc8, 0xb9, 0xe6, 0xac}, currDigest)
40+
require.Equal(t, common.Bytes4{0x0b, 0x15, 0x44, 0xdc}, currDigest)
4141
nextDigest, err := clock.NextForkDigest()
4242
require.NoError(t, err)
4343
lastFork, err := clock.LastFork()

execution/chain/chain_config.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,6 @@ func (c *Config) GetBlobConfig(time uint64) *params.BlobConfig {
373373
if c.PragueTime != nil {
374374
c.parsedBlobSchedule[c.PragueTime.Uint64()] = &params.DefaultPragueBlobConfig
375375
}
376-
if c.OsakaTime != nil {
377-
c.parsedBlobSchedule[c.OsakaTime.Uint64()] = &params.DefaultOsakaBlobConfig
378-
}
379376

380377
// Override with supplied values
381378
val, ok := c.BlobSchedule["cancun"]

execution/chain/params/protocol.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,3 @@ var DefaultPragueBlobConfig = BlobConfig{
255255
Max: 9,
256256
BaseFeeUpdateFraction: 5007716,
257257
}
258-
259-
var DefaultOsakaBlobConfig = BlobConfig{
260-
Target: 6,
261-
Max: 9,
262-
BaseFeeUpdateFraction: 5007716,
263-
}

execution/chain/spec/chainspecs/mainnet.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"shanghaiTime": 1681338455,
2222
"cancunTime": 1710338135,
2323
"pragueTime": 1746612311,
24+
"osakaTime": 1764798551,
25+
"bpo1Time": 1765290071,
26+
"bpo2Time": 1767747671,
2427
"blobSchedule": {
2528
"cancun": {
2629
"target": 3,
@@ -31,6 +34,16 @@
3134
"target": 6,
3235
"max": 9,
3336
"baseFeeUpdateFraction": 5007716
37+
},
38+
"bpo1": {
39+
"target": 10,
40+
"max": 15,
41+
"baseFeeUpdateFraction": 8346193
42+
},
43+
"bpo2": {
44+
"target": 14,
45+
"max": 21,
46+
"baseFeeUpdateFraction": 11684671
3447
}
3548
},
3649
"depositContractAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa",

p2p/forkid/forkid_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ func TestCreation(t *testing.T) {
7777
{17034870, 1681338479, ID{Hash: ChecksumToBytes(0xdce96c2d), Activation: 1681338455, Next: 1710338135}}, // First Shanghai block
7878
{19426586, 1710338123, ID{Hash: ChecksumToBytes(0xdce96c2d), Activation: 1681338455, Next: 1710338135}}, // Last Shanghai block
7979
{19426587, 1710338135, ID{Hash: ChecksumToBytes(0x9f3d2254), Activation: 1710338135, Next: 1746612311}}, // First Cancun block
80-
{22432453, 1746612299, ID{Hash: ChecksumToBytes(0x9f3d2254), Activation: 1710338135, Next: 1746612311}}, // Last Cancun block (approx.)
81-
{22432454, 1746612311, ID{Hash: ChecksumToBytes(0xc376cf8b), Activation: 1746612311, Next: 0}}, // First Prague block (approx.)
82-
{30000000, 1900000000, ID{Hash: ChecksumToBytes(0xc376cf8b), Activation: 1746612311, Next: 0}}, // Future Prague block (mock)
80+
{22431083, 1746612299, ID{Hash: ChecksumToBytes(0x9f3d2254), Activation: 1710338135, Next: 1746612311}}, // Last Cancun block
81+
{22431084, 1746612311, ID{Hash: ChecksumToBytes(0xc376cf8b), Activation: 1746612311, Next: 1764798551}}, // First Prague block
82+
{30000000, 1900000000, ID{Hash: ChecksumToBytes(0x07c9462e), Activation: 1767747671, Next: 0}}, // Future block (mock)
8383
},
8484
},
8585
{

0 commit comments

Comments
 (0)