feat: add max,target blobs for future forks (ethereum#851)

Signed-off-by: Barnabas Busa <barnabas.busa@ethereum.org>

Author: barnabasbusa

README.md

@@ -580,8 +580,16 @@ network_params:
   samples_per_slot: 8
   # Minimum number of subnets an honest node custodies and serves samples from
   custody_requirement: 4
-  # Maximum number of blobs per block
-  max_blobs_per_block: 6
+
+  # Maximum number of blobs per block for Electra fork
+  max_blobs_per_block_electra: 9
+  # Target number of blobs per block for Electra fork
+  target_blobs_per_block_electra: 6
+
+  # Maximum number of blobs per block for EIP7594 fork
+  max_blobs_per_block_eip7594: 12
+  # Target number of blobs per block for EIP7594 fork
+  target_blobs_per_block_eip7594: 9
 
   # Preset for the network
   # Default: "mainnet"
@@ -948,7 +956,7 @@ spamoor_params:
   # Defaults to empty
   spamoor_extra_args: []
 
-# Global paarameter to set the exit ip address of services and public ports
+# Global parameter to set the exit ip address of services and public ports
 port_publisher:
   # if you have a service that you want to expose on a specific interfact; set that IP here
   # if you set it to auto it gets the public ip from ident.me and sets it

network_params.yaml

@@ -94,7 +94,10 @@ network_params:
   data_column_sidecar_subnet_count: 128
   samples_per_slot: 8
   custody_requirement: 4
-  max_blobs_per_block: 6
+  max_blobs_per_block_electra: 9
+  target_blobs_per_block_electra: 6
+  max_blobs_per_block_eip7594: 12
+  target_blobs_per_block_eip7594: 9
   additional_preloaded_contracts: {}
   devnet_repo: ethpandaops
   prefunded_accounts: {}

src/package_io/constants.star

@@ -124,7 +124,7 @@ CONTAINER_REGISTRY = struct(
 
 
 ETHEREUM_GENESIS_GENERATOR = struct(
-    default_genesis_generator_image="ethpandaops/ethereum-genesis-generator:3.4.2",  # Default
+    default_genesis_generator_image="ethpandaops/ethereum-genesis-generator:3.4.4",  # Default
     verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
 )
 

src/package_io/input_parser.star

@@ -338,7 +338,18 @@ def input_parser(plan, input_args):
             ],
             samples_per_slot=result["network_params"]["samples_per_slot"],
             custody_requirement=result["network_params"]["custody_requirement"],
-            max_blobs_per_block=result["network_params"]["max_blobs_per_block"],
+            max_blobs_per_block_electra=result["network_params"][
+                "max_blobs_per_block_electra"
+            ],
+            target_blobs_per_block_electra=result["network_params"][
+                "target_blobs_per_block_electra"
+            ],
+            max_blobs_per_block_eip7594=result["network_params"][
+                "max_blobs_per_block_eip7594"
+            ],
+            target_blobs_per_block_eip7594=result["network_params"][
+                "target_blobs_per_block_eip7594"
+            ],
             preset=result["network_params"]["preset"],
             additional_preloaded_contracts=result["network_params"][
                 "additional_preloaded_contracts"
@@ -891,7 +902,10 @@ def default_network_params():
         "data_column_sidecar_subnet_count": 128,
         "samples_per_slot": 8,
         "custody_requirement": 4,
-        "max_blobs_per_block": 6,
+        "max_blobs_per_block_electra": 9,
+        "target_blobs_per_block_electra": 6,
+        "max_blobs_per_block_eip7594": 12,
+        "target_blobs_per_block_eip7594": 9,
         "preset": "mainnet",
         "additional_preloaded_contracts": {},
         "devnet_repo": "ethpandaops",
@@ -928,7 +942,10 @@ def default_minimal_network_params():
         "data_column_sidecar_subnet_count": 128,
         "samples_per_slot": 8,
         "custody_requirement": 4,
-        "max_blobs_per_block": 6,
+        "max_blobs_per_block_electra": 9,
+        "target_blobs_per_block_electra": 6,
+        "max_blobs_per_block_eip7594": 12,
+        "target_blobs_per_block_eip7594": 9,
         "preset": "minimal",
         "additional_preloaded_contracts": {},
         "devnet_repo": "ethpandaops",

src/package_io/sanity_check.star

@@ -165,7 +165,10 @@ SUBCATEGORY_PARAMS = {
         "data_column_sidecar_subnet_count",
         "samples_per_slot",
         "custody_requirement",
-        "max_blobs_per_block",
+        "max_blobs_per_block_electra",
+        "target_blobs_per_block_electra",
+        "max_blobs_per_block_eip7594",
+        "target_blobs_per_block_eip7594",
         "preset",
         "additional_preloaded_contracts",
         "devnet_repo",

src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star

@@ -128,7 +128,10 @@ def new_env_file_for_el_cl_genesis_data(
         "DataColumnSidecarSubnetCount": network_params.data_column_sidecar_subnet_count,
         "SamplesPerSlot": network_params.samples_per_slot,
         "CustodyRequirement": network_params.custody_requirement,
-        "MaxBlobsPerBlock": network_params.max_blobs_per_block,
+        "MaxBlobsPerBlockElectra": network_params.max_blobs_per_block_electra,
+        "TargetBlobsPerBlockElectra": network_params.target_blobs_per_block_electra,
+        "MaxBlobsPerBlockEIP7594": network_params.max_blobs_per_block_eip7594,
+        "TargetBlobsPerBlockEIP7594": network_params.target_blobs_per_block_eip7594,
         "Preset": network_params.preset,
         "AdditionalPreloadedContracts": json.encode(
             network_params.additional_preloaded_contracts

static_files/genesis-generation-config/el-cl/values.env.tmpl

@@ -36,6 +36,9 @@ export SHARD_COMMITTEE_PERIOD={{ .ShardCommitteePeriod }}
 export DATA_COLUMN_SIDECAR_SUBNET_COUNT={{ .DataColumnSidecarSubnetCount }}
 export SAMPLES_PER_SLOT={{ .SamplesPerSlot }}
 export CUSTODY_REQUIREMENT={{ .CustodyRequirement }}
-export MAX_BLOBS_PER_BLOCK={{ .MaxBlobsPerBlock }}
+export MAX_BLOBS_PER_BLOCK_ELECTRA={{ .MaxBlobsPerBlockElectra }}
+export TARGET_BLOBS_PER_BLOCK_ELECTRA={{ .TargetBlobsPerBlockElectra }}
+export MAX_BLOBS_PER_BLOCK_EIP7594={{ .MaxBlobsPerBlockEIP7594 }}
+export TARGET_BLOBS_PER_BLOCK_EIP7594={{ .TargetBlobsPerBlockEIP7594 }}
 export ADDITIONAL_PRELOADED_CONTRACTS={{ .AdditionalPreloadedContracts }}
 export EL_PREMINE_ADDRS={{ .PrefundedAccounts }}