params,core: add max and target value to chain config

core/genesis.go

@@ -262,6 +262,9 @@ func (o *ChainOverrides) apply(cfg *params.ChainConfig) (*params.ChainConfig, er
 	if err := cpy.CheckConfigForkOrder(); err != nil {
 		return nil, err
 	}
+	if err := cpy.CheckConfigBlobSchedule(); err != nil {
+		return nil, err
+	}
 	return &cpy, nil
 }
 
@@ -513,6 +516,9 @@ func (g *Genesis) Commit(db ethdb.Database, triedb *triedb.Database) (*types.Blo
 	if err := config.CheckConfigForkOrder(); err != nil {
 		return nil, err
 	}
+	if err := config.CheckConfigBlobSchedule(); err != nil {
+		return nil, err
+	}
 	if config.Clique != nil && len(g.ExtraData) < 32+crypto.SignatureLength {
 		return nil, errors.New("can't start clique chain without signers")
 	}

params/config.go

@@ -488,13 +488,14 @@ type BlobConfig struct {
 type BlobScheduleConfig struct {
 	Cancun *BlobConfig `json:"cancun,omitempty"`
 	Prague *BlobConfig `json:"prague,omitempty"`
+	Verkle *BlobConfig `json:"verkle,omitempty"`
 }
 
 // TargetBlobsPerBlock returns the target blobs per block associated with
 // requested time.
 func (c *ChainConfig) TargetBlobsPerBlock(time uint64) uint64 {
 	if c.BlobScheduleConfig == nil {
-		panic("blob schedule not defined")
+		return 0
 	}
 	var (
 		london = c.LondonBlock
@@ -514,7 +515,7 @@ func (c *ChainConfig) TargetBlobsPerBlock(time uint64) uint64 {
 // requested time.
 func (c *ChainConfig) MaxBlobsPerBlock(time uint64) uint64 {
 	if c.BlobScheduleConfig == nil {
-		panic("blob schedule not defined")
+		return 0
 	}
 	var (
 		london = c.LondonBlock
@@ -543,7 +544,7 @@ func (c *ChainConfig) LatestMaxBlobsPerBlock() uint64 {
 	case s.Cancun != nil:
 		return s.Cancun.Max
 	default:
-		panic("blob schedule empty")
+		return 0
 	}
 }
 
@@ -756,6 +757,30 @@ func (c *ChainConfig) CheckConfigForkOrder() error {
 			lastFork = cur
 		}
 	}
+
+	return nil
+}
+
+// CheckConfigBlobSchedule checks that all forks with blobs enabled explicitly
+// define the blob schedule configuration.
+func (c *ChainConfig) CheckConfigBlobSchedule() error {
+	bsc := c.BlobScheduleConfig
+	if bsc == nil {
+		bsc = &BlobScheduleConfig{}
+	}
+	for _, cur := range []struct {
+		name      string
+		timestamp *uint64
+		config    *BlobConfig
+	}{
+		{name: "cancun", timestamp: c.CancunTime, config: bsc.Cancun},
+		{name: "prague", timestamp: c.PragueTime, config: bsc.Prague},
+		{name: "verkle", timestamp: c.VerkleTime, config: bsc.Verkle},
+	} {
+		if cur.timestamp != nil && cur.config == nil {
+			return fmt.Errorf("unsupported fork configuration: missing blob configuration entry for %v in schedule", cur.name)
+		}
+	}
 	return nil
 }