Skip to content

Commit 0977a02

Browse files
fjlfjl
authored
params: schedule Osaka/BPO1/BPO2 for testnets (#32735)
Timestamps taken from: - Holesky: https://github.com/eth-clients/holesky/blob/main/metadata/genesis.json - Sepolia: https://github.com/eth-clients/sepolia/blob/main/metadata/genesis.json - Hoodi: https://github.com/eth-clients/hoodi/blob/main/metadata/genesis.json
1 parent 7d8ccdd commit 0977a02

File tree

3 files changed

+72
-24
lines changed

3 files changed

+72
-24
lines changed

‎core/forkid/forkid_test.go‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,14 @@ func TestCreation(t *testing.T) {
9595
{1735372, 1706655071, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 1706655072}}, // Last Shanghai block
9696
{1735372, 1706655072, ID{Hash: checksumToBytes(0x88cf81d9), Next: 1741159776}}, // First Cancun block
9797
{1735372, 1741159775, ID{Hash: checksumToBytes(0x88cf81d9), Next: 1741159776}}, // Last Cancun block
98-
{1735372, 1741159776, ID{Hash: checksumToBytes(0xed88b5fd), Next: 0}}, // First Prague block
99-
{1735372, 2741159776, ID{Hash: checksumToBytes(0xed88b5fd), Next: 0}}, // Future Prague block
98+
{1735372, 1741159776, ID{Hash: checksumToBytes(0xed88b5fd), Next: 1760427360}}, // First Prague block
99+
{1735372, 1760427359, ID{Hash: checksumToBytes(0xed88b5fd), Next: 1760427360}}, // Last Prague block
100+
{1735372, 1760427360, ID{Hash: checksumToBytes(0xe2ae4999), Next: 1761017184}}, // First Osaka block
101+
{1735372, 1761017183, ID{Hash: checksumToBytes(0xe2ae4999), Next: 1761017184}}, // Last Osaka block
102+
{1735372, 1761017184, ID{Hash: checksumToBytes(0x56078a1e), Next: 1761607008}}, // First BPO1 block
103+
{1735372, 1761607007, ID{Hash: checksumToBytes(0x56078a1e), Next: 1761607008}}, // Last BPO1 block
104+
{1735372, 1761607008, ID{Hash: checksumToBytes(0x268956b6), Next: 0}}, // First BPO2 block
105+
{1735372, 2000000000, ID{Hash: checksumToBytes(0x268956b6), Next: 0}}, // Future BPO2 block
100106
},
101107
},
102108
// Holesky test cases
@@ -110,8 +116,14 @@ func TestCreation(t *testing.T) {
110116
{123, 1707305663, ID{Hash: checksumToBytes(0xfd4f016b), Next: 1707305664}}, // Last Shanghai block
111117
{123, 1707305664, ID{Hash: checksumToBytes(0x9b192ad0), Next: 1740434112}}, // First Cancun block
112118
{123, 1740434111, ID{Hash: checksumToBytes(0x9b192ad0), Next: 1740434112}}, // Last Cancun block
113-
{123, 1740434112, ID{Hash: checksumToBytes(0xdfbd9bed), Next: 0}}, // First Prague block
114-
{123, 2740434112, ID{Hash: checksumToBytes(0xdfbd9bed), Next: 0}}, // Future Prague block
119+
{123, 1740434112, ID{Hash: checksumToBytes(0xdfbd9bed), Next: 1759308480}}, // First Prague block
120+
{123, 1759308479, ID{Hash: checksumToBytes(0xdfbd9bed), Next: 1759308480}}, // Last Prague block
121+
{123, 1759308480, ID{Hash: checksumToBytes(0x783def52), Next: 1759800000}}, // First Osaka block
122+
{123, 1759799999, ID{Hash: checksumToBytes(0x783def52), Next: 1759800000}}, // Last Osaka block
123+
{123, 1759800000, ID{Hash: checksumToBytes(0xa280a45c), Next: 1760389824}}, // First BPO1 block
124+
{123, 1760389823, ID{Hash: checksumToBytes(0xa280a45c), Next: 1760389824}}, // Last BPO1 block
125+
{123, 1760389824, ID{Hash: checksumToBytes(0x9bc6cb31), Next: 0}}, // First BPO2 block
126+
{123, 2000000000, ID{Hash: checksumToBytes(0x9bc6cb31), Next: 0}}, // Future BPO1 block
115127
},
116128
},
117129
// Hoodi test cases
@@ -121,8 +133,14 @@ func TestCreation(t *testing.T) {
121133
[]testcase{
122134
{0, 0, ID{Hash: checksumToBytes(0xbef71d30), Next: 1742999832}}, // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris, Shanghai, Cancun block
123135
{123, 1742999831, ID{Hash: checksumToBytes(0xbef71d30), Next: 1742999832}}, // Last Cancun block
124-
{123, 1742999832, ID{Hash: checksumToBytes(0x0929e24e), Next: 0}}, // First Prague block
125-
{123, 2740434112, ID{Hash: checksumToBytes(0x0929e24e), Next: 0}}, // Future Prague block
136+
{123, 1742999832, ID{Hash: checksumToBytes(0x0929e24e), Next: 1761677592}}, // First Prague block
137+
{123, 1761677591, ID{Hash: checksumToBytes(0x0929e24e), Next: 1761677592}}, // Last Prague block
138+
{123, 1761677592, ID{Hash: checksumToBytes(0xe7e0e7ff), Next: 1762365720}}, // First Osaka block
139+
{123, 1762365719, ID{Hash: checksumToBytes(0xe7e0e7ff), Next: 1762365720}}, // Last Osaka block
140+
{123, 1762365720, ID{Hash: checksumToBytes(0x3893353e), Next: 1762955544}}, // First BPO1 block
141+
{123, 1762955543, ID{Hash: checksumToBytes(0x3893353e), Next: 1762955544}}, // Last BPO1 block
142+
{123, 1762955544, ID{Hash: checksumToBytes(0x23aa1351), Next: 0}}, // First BPO2 block
143+
{123, 2000000000, ID{Hash: checksumToBytes(0x23aa1351), Next: 0}}, // Future BPO2 block
126144
},
127145
},
128146
}

‎params/config.go‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,17 @@ var (
9191
ShanghaiTime: newUint64(1696000704),
9292
CancunTime: newUint64(1707305664),
9393
PragueTime: newUint64(1740434112),
94+
OsakaTime: newUint64(1759308480),
95+
BPO1Time: newUint64(1759800000),
96+
BPO2Time: newUint64(1760389824),
9497
DepositContractAddress: common.HexToAddress("0x4242424242424242424242424242424242424242"),
9598
Ethash: new(EthashConfig),
9699
BlobScheduleConfig: &BlobScheduleConfig{
97100
Cancun: DefaultCancunBlobConfig,
98101
Prague: DefaultPragueBlobConfig,
102+
Osaka: DefaultOsakaBlobConfig,
103+
BPO1: DefaultBPO1BlobConfig,
104+
BPO2: DefaultBPO2BlobConfig,
99105
},
100106
}
101107
// SepoliaChainConfig contains the chain parameters to run a node on the Sepolia test network.
@@ -121,11 +127,17 @@ var (
121127
ShanghaiTime: newUint64(1677557088),
122128
CancunTime: newUint64(1706655072),
123129
PragueTime: newUint64(1741159776),
130+
OsakaTime: newUint64(1760427360),
131+
BPO1Time: newUint64(1761017184),
132+
BPO2Time: newUint64(1761607008),
124133
DepositContractAddress: common.HexToAddress("0x7f02c3e3c98b133055b8b348b2ac625669ed295d"),
125134
Ethash: new(EthashConfig),
126135
BlobScheduleConfig: &BlobScheduleConfig{
127136
Cancun: DefaultCancunBlobConfig,
128137
Prague: DefaultPragueBlobConfig,
138+
Osaka: DefaultOsakaBlobConfig,
139+
BPO1: DefaultBPO1BlobConfig,
140+
BPO2: DefaultBPO2BlobConfig,
129141
},
130142
}
131143
// HoodiChainConfig contains the chain parameters to run a node on the Hoodi test network.
@@ -151,11 +163,17 @@ var (
151163
ShanghaiTime: newUint64(0),
152164
CancunTime: newUint64(0),
153165
PragueTime: newUint64(1742999832),
166+
OsakaTime: newUint64(1761677592),
167+
BPO1Time: newUint64(1762365720),
168+
BPO2Time: newUint64(1762955544),
154169
DepositContractAddress: common.HexToAddress("0x00000000219ab540356cBB839Cbe05303d7705Fa"),
155170
Ethash: new(EthashConfig),
156171
BlobScheduleConfig: &BlobScheduleConfig{
157172
Cancun: DefaultCancunBlobConfig,
158173
Prague: DefaultPragueBlobConfig,
174+
Osaka: DefaultOsakaBlobConfig,
175+
BPO1: DefaultBPO1BlobConfig,
176+
BPO2: DefaultBPO2BlobConfig,
159177
},
160178
}
161179
// AllEthashProtocolChanges contains every protocol change (EIPs) introduced
@@ -361,15 +379,15 @@ var (
361379
}
362380
// DefaultBPO1BlobConfig is the default blob configuration for the Osaka fork.
363381
DefaultBPO1BlobConfig = &BlobConfig{
364-
Target: 9,
365-
Max: 14,
366-
UpdateFraction: 8832827,
382+
Target: 10,
383+
Max: 15,
384+
UpdateFraction: 8346193,
367385
}
368386
// DefaultBPO1BlobConfig is the default blob configuration for the Osaka fork.
369387
DefaultBPO2BlobConfig = &BlobConfig{
370388
Target: 14,
371389
Max: 21,
372-
UpdateFraction: 13739630,
390+
UpdateFraction: 11684671,
373391
}
374392
// DefaultBPO1BlobConfig is the default blob configuration for the Osaka fork.
375393
DefaultBPO3BlobConfig = &BlobConfig{

‎tests/init.go‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ var Forks = map[string]*params.ChainConfig{
490490
Cancun: params.DefaultCancunBlobConfig,
491491
Prague: params.DefaultPragueBlobConfig,
492492
Osaka: params.DefaultOsakaBlobConfig,
493-
BPO1: params.DefaultBPO1BlobConfig,
493+
BPO1: bpo1BlobConfig,
494494
},
495495
},
496496
"OsakaToBPO1AtTime15k": {
@@ -519,7 +519,7 @@ var Forks = map[string]*params.ChainConfig{
519519
Cancun: params.DefaultCancunBlobConfig,
520520
Prague: params.DefaultPragueBlobConfig,
521521
Osaka: params.DefaultOsakaBlobConfig,
522-
BPO1: params.DefaultBPO1BlobConfig,
522+
BPO1: bpo1BlobConfig,
523523
},
524524
},
525525
"BPO2": {
@@ -549,8 +549,8 @@ var Forks = map[string]*params.ChainConfig{
549549
Cancun: params.DefaultCancunBlobConfig,
550550
Prague: params.DefaultPragueBlobConfig,
551551
Osaka: params.DefaultOsakaBlobConfig,
552-
BPO1: params.DefaultBPO1BlobConfig,
553-
BPO2: params.DefaultBPO2BlobConfig,
552+
BPO1: bpo1BlobConfig,
553+
BPO2: bpo2BlobConfig,
554554
},
555555
},
556556
"BPO1ToBPO2AtTime15k": {
@@ -580,8 +580,8 @@ var Forks = map[string]*params.ChainConfig{
580580
Cancun: params.DefaultCancunBlobConfig,
581581
Prague: params.DefaultPragueBlobConfig,
582582
Osaka: params.DefaultOsakaBlobConfig,
583-
BPO1: params.DefaultBPO1BlobConfig,
584-
BPO2: params.DefaultBPO2BlobConfig,
583+
BPO1: bpo1BlobConfig,
584+
BPO2: bpo2BlobConfig,
585585
},
586586
},
587587
"BPO3": {
@@ -612,8 +612,8 @@ var Forks = map[string]*params.ChainConfig{
612612
Cancun: params.DefaultCancunBlobConfig,
613613
Prague: params.DefaultPragueBlobConfig,
614614
Osaka: params.DefaultOsakaBlobConfig,
615-
BPO1: params.DefaultBPO1BlobConfig,
616-
BPO2: params.DefaultBPO2BlobConfig,
615+
BPO1: bpo1BlobConfig,
616+
BPO2: bpo2BlobConfig,
617617
BPO3: params.DefaultBPO3BlobConfig,
618618
},
619619
},
@@ -645,8 +645,8 @@ var Forks = map[string]*params.ChainConfig{
645645
Cancun: params.DefaultCancunBlobConfig,
646646
Prague: params.DefaultPragueBlobConfig,
647647
Osaka: params.DefaultOsakaBlobConfig,
648-
BPO1: params.DefaultBPO1BlobConfig,
649-
BPO2: params.DefaultBPO2BlobConfig,
648+
BPO1: bpo1BlobConfig,
649+
BPO2: bpo2BlobConfig,
650650
BPO3: params.DefaultBPO3BlobConfig,
651651
},
652652
},
@@ -679,8 +679,8 @@ var Forks = map[string]*params.ChainConfig{
679679
Cancun: params.DefaultCancunBlobConfig,
680680
Prague: params.DefaultPragueBlobConfig,
681681
Osaka: params.DefaultOsakaBlobConfig,
682-
BPO1: params.DefaultBPO1BlobConfig,
683-
BPO2: params.DefaultBPO2BlobConfig,
682+
BPO1: bpo1BlobConfig,
683+
BPO2: bpo2BlobConfig,
684684
BPO3: params.DefaultBPO3BlobConfig,
685685
BPO4: params.DefaultBPO4BlobConfig,
686686
},
@@ -714,14 +714,26 @@ var Forks = map[string]*params.ChainConfig{
714714
Cancun: params.DefaultCancunBlobConfig,
715715
Prague: params.DefaultPragueBlobConfig,
716716
Osaka: params.DefaultOsakaBlobConfig,
717-
BPO1: params.DefaultBPO1BlobConfig,
718-
BPO2: params.DefaultBPO2BlobConfig,
717+
BPO1: bpo1BlobConfig,
718+
BPO2: bpo2BlobConfig,
719719
BPO3: params.DefaultBPO3BlobConfig,
720720
BPO4: params.DefaultBPO4BlobConfig,
721721
},
722722
},
723723
}
724724

725+
var bpo1BlobConfig = &params.BlobConfig{
726+
Target: 9,
727+
Max: 14,
728+
UpdateFraction: 8832827,
729+
}
730+
731+
var bpo2BlobConfig = &params.BlobConfig{
732+
Target: 14,
733+
Max: 21,
734+
UpdateFraction: 13739630,
735+
}
736+
725737
// AvailableForks returns the set of defined fork names
726738
func AvailableForks() []string {
727739
var availableForks []string

0 commit comments

Comments
 (0)