Skip to content

Commit a09f538

Browse files
lightclientgeoknee
authored andcommitted
params: add bpo forks to eth_config (#32579)
BPO forks should also be included in eth_config response.
1 parent 51614a3 commit a09f538

File tree

2 files changed

+38
-3
lines changed

2 files changed

+38
-3
lines changed

params/config.go

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,6 +1205,16 @@ func (c *ChainConfig) LatestFork(time uint64) forks.Fork {
12051205
london := c.LondonBlock
12061206

12071207
switch {
1208+
case c.IsBPO5(london, time):
1209+
return forks.BPO5
1210+
case c.IsBPO4(london, time):
1211+
return forks.BPO4
1212+
case c.IsBPO3(london, time):
1213+
return forks.BPO3
1214+
case c.IsBPO2(london, time):
1215+
return forks.BPO2
1216+
case c.IsBPO1(london, time):
1217+
return forks.BPO1
12081218
case c.IsOsaka(london, time):
12091219
return forks.Osaka
12101220
case c.IsPrague(london, time):
@@ -1223,12 +1233,22 @@ func (c *ChainConfig) BlobConfig(fork forks.Fork) *BlobConfig {
12231233
// TODO: https://github.com/ethereum-optimism/op-geth/issues/685
12241234
// This function has a bug.
12251235
switch fork {
1236+
case forks.BPO5:
1237+
return c.BlobScheduleConfig.BPO5
1238+
case forks.BPO4:
1239+
return c.BlobScheduleConfig.BPO4
1240+
case forks.BPO3:
1241+
return c.BlobScheduleConfig.BPO3
1242+
case forks.BPO2:
1243+
return c.BlobScheduleConfig.BPO2
1244+
case forks.BPO1:
1245+
return c.BlobScheduleConfig.BPO1
12261246
case forks.Osaka:
1227-
return DefaultOsakaBlobConfig
1247+
return c.BlobScheduleConfig.Osaka
12281248
case forks.Prague:
1229-
return DefaultPragueBlobConfig
1249+
return c.BlobScheduleConfig.Prague
12301250
case forks.Cancun:
1231-
return DefaultCancunBlobConfig
1251+
return c.BlobScheduleConfig.Cancun
12321252
default:
12331253
return nil
12341254
}
@@ -1258,6 +1278,16 @@ func (c *ChainConfig) ActiveSystemContracts(time uint64) map[string]common.Addre
12581278
// the fork isn't defined or isn't a time-based fork.
12591279
func (c *ChainConfig) Timestamp(fork forks.Fork) *uint64 {
12601280
switch {
1281+
case fork == forks.BPO5:
1282+
return c.BPO5Time
1283+
case fork == forks.BPO4:
1284+
return c.BPO4Time
1285+
case fork == forks.BPO3:
1286+
return c.BPO3Time
1287+
case fork == forks.BPO2:
1288+
return c.BPO2Time
1289+
case fork == forks.BPO1:
1290+
return c.BPO1Time
12611291
case fork == forks.Osaka:
12621292
return c.OsakaTime
12631293
case fork == forks.Prague:

params/forks/forks.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ const (
4040
Cancun
4141
Prague
4242
Osaka
43+
BPO1
44+
BPO2
45+
BPO3
46+
BPO4
47+
BPO5
4348
)
4449

4550
// String implements fmt.Stringer.

0 commit comments

Comments
 (0)