feat: add maxblobspertx

README.md

@@ -664,13 +664,18 @@ network_params:
   # Do not confuse with genesis_gaslimit which sets the gas limit at the genesis file level
   gas_limit: 0
 
+  # Maximum number of blobs per transaction for Fulu fork (default 0)
+  fulu_max_blobs_per_tx: 0
+
   # BPO
   # BPO1 epoch (default 18446744073709551615)
   bpo_1_epoch: 18446744073709551615
   # Maximum number of blobs per block for BPO1 (default 12)
   bpo_1_max_blobs: 12
   # Target number of blobs per block for BPO1 (default 9)
   bpo_1_target_blobs: 9
+  # Maximum number of blobs per transaction for BPO1 (default 0)
+  bpo_1_max_blobs_per_tx: 0
   # Base fee update fraction for BPO1 (default 5007716)
   bpo_1_base_fee_update_fraction: 5007716
 
@@ -680,6 +685,8 @@ network_params:
   bpo_2_max_blobs: 12
   # Target number of blobs per block for BPO2 (default 9)
   bpo_2_target_blobs: 9
+  # Maximum number of blobs per transaction for BPO2 (default 0)
+  bpo_2_max_blobs_per_tx: 0
   # Base fee update fraction for BPO2 (default 5007716)
   bpo_2_base_fee_update_fraction: 5007716
 
@@ -689,6 +696,8 @@ network_params:
   bpo_3_max_blobs: 12
   # Target number of blobs per block for BPO3 (default 9)
   bpo_3_target_blobs: 9
+  # Maximum number of blobs per transaction for BPO3 (default 0)
+  bpo_3_max_blobs_per_tx: 0
   # Base fee update fraction for BPO3 (default 5007716)
   bpo_3_base_fee_update_fraction: 5007716
 
@@ -698,6 +707,8 @@ network_params:
   bpo_4_max_blobs: 12
   # Target number of blobs per block for BPO4 (default 9)
   bpo_4_target_blobs: 9
+  # Maximum number of blobs per transaction for BPO4 (default 0)
+  bpo_4_max_blobs_per_tx: 0
   # Base fee update fraction for BPO4 (default 5007716)
   bpo_4_base_fee_update_fraction: 5007716
 
@@ -707,6 +718,8 @@ network_params:
   bpo_5_max_blobs: 12
   # Target number of blobs per block for BPO5 (default 9)
   bpo_5_target_blobs: 9
+  # Maximum number of blobs per transaction for BPO5 (default 0)
+  bpo_5_max_blobs_per_tx: 0
   # Base fee update fraction for BPO5 (default 5007716)
   bpo_5_base_fee_update_fraction: 5007716
 
@@ -1064,7 +1077,7 @@ spamoor_params:
 # Ethereum genesis generator params
 ethereum_genesis_generator_params:
   # The image to use for ethereum genesis generator
-  image: ethpandaops/ethereum-genesis-generator:4.1.11
+  image: ethpandaops/ethereum-genesis-generator:4.1.12
 
 # Global parameter to set the exit ip address of services and public ports
 port_publisher:

main.star

@@ -641,19 +641,6 @@ def run(plan, args={}):
                 index,
             )
             plan.print("Successfully launched full-beaconchain-explorer")
-        elif additional_service == "grafana":
-            plan.print("Launching grafana...")
-            grafana.launch_grafana(
-                plan,
-                grafana_datasource_config_template,
-                grafana_dashboards_config_template,
-                prometheus_private_url,
-                global_node_selectors,
-                args_with_right_defaults.grafana_params,
-                args_with_right_defaults.port_publisher,
-                index,
-            )
-            plan.print("Successfully launched grafana")
         elif additional_service == "prometheus":
             plan.print("Launching prometheus...")
             prometheus_private_url = prometheus.launch_prometheus(
@@ -672,6 +659,19 @@ def run(plan, args={}):
                 index,
             )
             plan.print("Successfully launched prometheus")
+        elif additional_service == "grafana":
+            plan.print("Launching grafana...")
+            grafana.launch_grafana(
+                plan,
+                grafana_datasource_config_template,
+                grafana_dashboards_config_template,
+                prometheus_private_url,
+                global_node_selectors,
+                args_with_right_defaults.grafana_params,
+                args_with_right_defaults.port_publisher,
+                index,
+            )
+            plan.print("Successfully launched grafana")
         elif additional_service == "prometheus_grafana":
             # Allow prometheus to be launched last so is able to collect metrics from other services
             launch_prometheus_grafana = True

network_params.yaml

@@ -208,7 +208,7 @@ keymanager_enabled: false
 checkpoint_sync_enabled: false
 checkpoint_sync_url: ""
 ethereum_genesis_generator_params:
-  image: ethpandaops/ethereum-genesis-generator:4.1.11
+  image: ethpandaops/ethereum-genesis-generator:4.1.12
 port_publisher:
   nat_exit_ip: KURTOSIS_IP_ADDR_PLACEHOLDER
   el:

src/package_io/constants.star

@@ -96,7 +96,7 @@ DEFAULT_SPAMOOR_IMAGE = "ethpandaops/spamoor:latest"
 DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest"
 DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest"
 DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = (
-    "ethpandaops/ethereum-genesis-generator:4.1.11"
+    "ethpandaops/ethereum-genesis-generator:4.1.12"
 )
 DEFAULT_YQ_IMAGE = "linuxserver/yq"
 DEFAULT_FLASHBOTS_RELAY_IMAGE = "ethpandaops/mev-boost-relay:main"

src/package_io/input_parser.star

@@ -387,33 +387,39 @@ def input_parser(plan, input_args):
             base_fee_update_fraction_electra=result["network_params"][
                 "base_fee_update_fraction_electra"
             ],
+            fulu_max_blobs_per_tx=result["network_params"]["fulu_max_blobs_per_tx"],
             bpo_1_epoch=result["network_params"]["bpo_1_epoch"],
             bpo_1_max_blobs=result["network_params"]["bpo_1_max_blobs"],
             bpo_1_target_blobs=result["network_params"]["bpo_1_target_blobs"],
+            bpo_1_max_blobs_per_tx=result["network_params"]["bpo_1_max_blobs_per_tx"],
             bpo_1_base_fee_update_fraction=result["network_params"][
                 "bpo_1_base_fee_update_fraction"
             ],
             bpo_2_epoch=result["network_params"]["bpo_2_epoch"],
             bpo_2_max_blobs=result["network_params"]["bpo_2_max_blobs"],
             bpo_2_target_blobs=result["network_params"]["bpo_2_target_blobs"],
+            bpo_2_max_blobs_per_tx=result["network_params"]["bpo_2_max_blobs_per_tx"],
             bpo_2_base_fee_update_fraction=result["network_params"][
                 "bpo_2_base_fee_update_fraction"
             ],
             bpo_3_epoch=result["network_params"]["bpo_3_epoch"],
             bpo_3_max_blobs=result["network_params"]["bpo_3_max_blobs"],
             bpo_3_target_blobs=result["network_params"]["bpo_3_target_blobs"],
+            bpo_3_max_blobs_per_tx=result["network_params"]["bpo_3_max_blobs_per_tx"],
             bpo_3_base_fee_update_fraction=result["network_params"][
                 "bpo_3_base_fee_update_fraction"
             ],
             bpo_4_epoch=result["network_params"]["bpo_4_epoch"],
             bpo_4_max_blobs=result["network_params"]["bpo_4_max_blobs"],
             bpo_4_target_blobs=result["network_params"]["bpo_4_target_blobs"],
+            bpo_4_max_blobs_per_tx=result["network_params"]["bpo_4_max_blobs_per_tx"],
             bpo_4_base_fee_update_fraction=result["network_params"][
                 "bpo_4_base_fee_update_fraction"
             ],
             bpo_5_epoch=result["network_params"]["bpo_5_epoch"],
             bpo_5_max_blobs=result["network_params"]["bpo_5_max_blobs"],
             bpo_5_target_blobs=result["network_params"]["bpo_5_target_blobs"],
+            bpo_5_max_blobs_per_tx=result["network_params"]["bpo_5_max_blobs_per_tx"],
             bpo_5_base_fee_update_fraction=result["network_params"][
                 "bpo_5_base_fee_update_fraction"
             ],
@@ -1022,25 +1028,31 @@ def default_network_params():
         "max_payload_size": 10485760,
         "perfect_peerdas_enabled": False,
         "gas_limit": 0,
+        "fulu_max_blobs_per_tx": 0,
         "bpo_1_epoch": 18446744073709551615,
         "bpo_1_max_blobs": 12,
         "bpo_1_target_blobs": 9,
+        "bpo_1_max_blobs_per_tx": 0,
         "bpo_1_base_fee_update_fraction": 5007716,
         "bpo_2_epoch": 18446744073709551615,
         "bpo_2_max_blobs": 12,
         "bpo_2_target_blobs": 9,
+        "bpo_2_max_blobs_per_tx": 0,
         "bpo_2_base_fee_update_fraction": 5007716,
         "bpo_3_epoch": 18446744073709551615,
         "bpo_3_max_blobs": 12,
         "bpo_3_target_blobs": 9,
+        "bpo_3_max_blobs_per_tx": 0,
         "bpo_3_base_fee_update_fraction": 5007716,
         "bpo_4_epoch": 18446744073709551615,
         "bpo_4_max_blobs": 12,
         "bpo_4_target_blobs": 9,
+        "bpo_4_max_blobs_per_tx": 0,
         "bpo_4_base_fee_update_fraction": 5007716,
         "bpo_5_epoch": 18446744073709551615,
         "bpo_5_max_blobs": 12,
         "bpo_5_target_blobs": 9,
+        "bpo_5_max_blobs_per_tx": 0,
         "bpo_5_base_fee_update_fraction": 5007716,
         "withdrawal_type": "0x00",
         "withdrawal_address": "0x8943545177806ED17B9F23F0a21ee5948eCaa776",
@@ -1090,25 +1102,31 @@ def default_minimal_network_params():
         "max_payload_size": 10485760,
         "perfect_peerdas_enabled": False,
         "gas_limit": 0,
+        "fulu_max_blobs_per_tx": 0,
         "bpo_1_epoch": 18446744073709551615,
         "bpo_1_max_blobs": 12,
         "bpo_1_target_blobs": 9,
+        "bpo_1_max_blobs_per_tx": 0,
         "bpo_1_base_fee_update_fraction": 5007716,
         "bpo_2_epoch": 18446744073709551615,
         "bpo_2_max_blobs": 12,
         "bpo_2_target_blobs": 9,
+        "bpo_2_max_blobs_per_tx": 0,
         "bpo_2_base_fee_update_fraction": 5007716,
         "bpo_3_epoch": 18446744073709551615,
         "bpo_3_max_blobs": 12,
         "bpo_3_target_blobs": 9,
+        "bpo_3_max_blobs_per_tx": 0,
         "bpo_3_base_fee_update_fraction": 5007716,
         "bpo_4_epoch": 18446744073709551615,
         "bpo_4_max_blobs": 12,
         "bpo_4_target_blobs": 9,
+        "bpo_4_max_blobs_per_tx": 0,
         "bpo_4_base_fee_update_fraction": 5007716,
         "bpo_5_epoch": 18446744073709551615,
         "bpo_5_max_blobs": 12,
         "bpo_5_target_blobs": 9,
+        "bpo_5_max_blobs_per_tx": 0,
         "bpo_5_base_fee_update_fraction": 5007716,
         "withdrawal_type": "0x00",
         "withdrawal_address": "0x8943545177806ED17B9F23F0a21ee5948eCaa776",

src/package_io/sanity_check.star

@@ -178,25 +178,31 @@ SUBCATEGORY_PARAMS = {
         "max_payload_size",
         "perfect_peerdas_enabled",
         "gas_limit",
+        "fulu_max_blobs_per_tx",
         "bpo_1_epoch",
         "bpo_1_max_blobs",
         "bpo_1_target_blobs",
+        "bpo_1_max_blobs_per_tx",
         "bpo_1_base_fee_update_fraction",
         "bpo_2_epoch",
         "bpo_2_max_blobs",
         "bpo_2_target_blobs",
+        "bpo_2_max_blobs_per_tx",
         "bpo_2_base_fee_update_fraction",
         "bpo_3_epoch",
         "bpo_3_max_blobs",
         "bpo_3_target_blobs",
+        "bpo_3_max_blobs_per_tx",
         "bpo_3_base_fee_update_fraction",
         "bpo_4_epoch",
         "bpo_4_max_blobs",
         "bpo_4_target_blobs",
+        "bpo_4_max_blobs_per_tx",
         "bpo_4_base_fee_update_fraction",
         "bpo_5_epoch",
         "bpo_5_max_blobs",
         "bpo_5_target_blobs",
+        "bpo_5_max_blobs_per_tx",
         "bpo_5_base_fee_update_fraction",
         "withdrawal_type",
         "withdrawal_address",

src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star

@@ -162,25 +162,43 @@ def new_env_file_for_el_cl_genesis_data(
         + GENESIS_CONTRACTS_FILENAME,
         "PrefundedAccounts": json.encode(network_params.prefunded_accounts),
         "MaxPayloadSize": network_params.max_payload_size,
+        "FuluMaxBlobsPerTx": network_params.fulu_max_blobs_per_tx
+        if network_params.fulu_max_blobs_per_tx > 0
+        else 0,
         "Bpo1Epoch": "{0}".format(network_params.bpo_1_epoch),
         "Bpo1MaxBlobs": network_params.bpo_1_max_blobs,
         "Bpo1TargetBlobs": network_params.bpo_1_target_blobs,
+        "Bpo1MaxBlobsPerTx": network_params.bpo_1_max_blobs_per_tx
+        if network_params.bpo_1_max_blobs_per_tx > 0
+        else 0,
         "Bpo1BaseFeeUpdateFraction": network_params.bpo_1_base_fee_update_fraction,
         "Bpo2Epoch": "{0}".format(network_params.bpo_2_epoch),
         "Bpo2MaxBlobs": network_params.bpo_2_max_blobs,
+        "Bpo2MaxBlobsPerTx": network_params.bpo_2_max_blobs_per_tx
+        if network_params.bpo_2_max_blobs_per_tx > 0
+        else 0,
         "Bpo2TargetBlobs": network_params.bpo_2_target_blobs,
         "Bpo2BaseFeeUpdateFraction": network_params.bpo_2_base_fee_update_fraction,
         "Bpo3Epoch": "{0}".format(network_params.bpo_3_epoch),
         "Bpo3MaxBlobs": network_params.bpo_3_max_blobs,
         "Bpo3TargetBlobs": network_params.bpo_3_target_blobs,
+        "Bpo3MaxBlobsPerTx": network_params.bpo_3_max_blobs_per_tx
+        if network_params.bpo_3_max_blobs_per_tx > 0
+        else 0,
         "Bpo3BaseFeeUpdateFraction": network_params.bpo_3_base_fee_update_fraction,
         "Bpo4Epoch": "{0}".format(network_params.bpo_4_epoch),
         "Bpo4MaxBlobs": network_params.bpo_4_max_blobs,
         "Bpo4TargetBlobs": network_params.bpo_4_target_blobs,
+        "Bpo4MaxBlobsPerTx": network_params.bpo_4_max_blobs_per_tx
+        if network_params.bpo_4_max_blobs_per_tx > 0
+        else 0,
         "Bpo4BaseFeeUpdateFraction": network_params.bpo_4_base_fee_update_fraction,
         "Bpo5Epoch": "{0}".format(network_params.bpo_5_epoch),
         "Bpo5MaxBlobs": network_params.bpo_5_max_blobs,
         "Bpo5TargetBlobs": network_params.bpo_5_target_blobs,
+        "Bpo5MaxBlobsPerTx": network_params.bpo_5_max_blobs_per_tx
+        if network_params.bpo_5_max_blobs_per_tx > 0
+        else 0,
         "Bpo5BaseFeeUpdateFraction": network_params.bpo_5_base_fee_update_fraction,
         "WithdrawalType": "{0}".format(network_params.withdrawal_type),
         "WithdrawalAddress": network_params.withdrawal_address,

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

@@ -45,24 +45,30 @@ export BASEFEE_UPDATE_FRACTION_ELECTRA={{ .BaseFeeUpdateFractionElectra }}
 export ADDITIONAL_PRELOADED_CONTRACTS={{ .AdditionalPreloadedContractsFile }}
 export EL_PREMINE_ADDRS={{ .PrefundedAccounts }}
 export MAX_PAYLOAD_SIZE={{ .MaxPayloadSize }}
+export FULU_MAX_BLOBS_PER_TX={{ .FuluMaxBlobsPerTx }}
 export BPO_1_EPOCH="{{ .Bpo1Epoch }}"
 export BPO_1_MAX_BLOBS={{ .Bpo1MaxBlobs }}
 export BPO_1_TARGET_BLOBS={{ .Bpo1TargetBlobs }}
+export BPO_1_MAX_BLOBS_PER_TX={{ .Bpo1MaxBlobsPerTx }}
 export BPO_1_BASE_FEE_UPDATE_FRACTION={{ .Bpo1BaseFeeUpdateFraction }}
 export BPO_2_EPOCH="{{ .Bpo2Epoch }}"
 export BPO_2_MAX_BLOBS={{ .Bpo2MaxBlobs }}
 export BPO_2_TARGET_BLOBS={{ .Bpo2TargetBlobs }}
+export BPO_2_MAX_BLOBS_PER_TX={{ .Bpo2MaxBlobsPerTx }}
 export BPO_2_BASE_FEE_UPDATE_FRACTION={{ .Bpo2BaseFeeUpdateFraction }}
 export BPO_3_EPOCH="{{ .Bpo3Epoch }}"
 export BPO_3_MAX_BLOBS={{ .Bpo3MaxBlobs }}
 export BPO_3_TARGET_BLOBS={{ .Bpo3TargetBlobs }}
+export BPO_3_MAX_BLOBS_PER_TX={{ .Bpo3MaxBlobsPerTx }}
 export BPO_3_BASE_FEE_UPDATE_FRACTION={{ .Bpo3BaseFeeUpdateFraction }}
 export BPO_4_EPOCH="{{ .Bpo4Epoch }}"
 export BPO_4_MAX_BLOBS={{ .Bpo4MaxBlobs }}
 export BPO_4_TARGET_BLOBS={{ .Bpo4TargetBlobs }}
+export BPO_4_MAX_BLOBS_PER_TX={{ .Bpo4MaxBlobsPerTx }}
 export BPO_4_BASE_FEE_UPDATE_FRACTION={{ .Bpo4BaseFeeUpdateFraction }}
 export BPO_5_EPOCH="{{ .Bpo5Epoch }}"
 export BPO_5_MAX_BLOBS={{ .Bpo5MaxBlobs }}
 export BPO_5_TARGET_BLOBS={{ .Bpo5TargetBlobs }}
+export BPO_5_MAX_BLOBS_PER_TX={{ .Bpo5MaxBlobsPerTx }}
 export BPO_5_BASE_FEE_UPDATE_FRACTION={{ .Bpo5BaseFeeUpdateFraction }}
 export MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS={{ .MinEpochsForDataColumnSidecarsRequests }}