feat!: rename max_blob to sidecar for spamoor-blob (#959)

Author: barnabasbusa

.github/tests/mev-pectra.yaml

@@ -1,9 +1,10 @@
-participants:
+participants_matrix:
   - el_type: geth
     el_image: ethereum/client-go:v1.15.7
     el_extra_params: ["--miner.extradata=pawanRocks"]
     cl_type: lighthouse
     cl_image: sigp/lighthouse:v7.0.0-beta.5
+    validator_count: 1
   - el_type: geth
     el_image: ethereum/client-go:v1.15.7
     el_extra_params: ["--miner.extradata=TekuFromLocal"]
@@ -35,13 +36,14 @@ additional_services:
   - dora
   - tx_fuzz
   - spamoor_blob
+  - spamoor
 mev_type: flashbots
 
 mev_params:
-  mev_relay_image: flashbots/mev-boost-relay:0.30.0rc1
-  mev_boost_image: flashbots/mev-boost:1.9rc3
-  mev_builder_cl_image: sigp/lighthouse:v7.0.0-beta.4
-  mev_builder_image: ethpandaops/reth-rbuilder:develop-8ffb4cf
+  mev_relay_image: ethpandaops/mev-boost-relay:main-17ed054
+  mev_boost_image: ethpandaops/mev-boost:develop-79c3997
+  mev_builder_cl_image: sigp/lighthouse:v7.0.0-beta.5
+  mev_builder_image: ethpandaops/reth-rbuilder:develop-01c8071
 
 network_params:
   electra_fork_epoch: 1
@@ -52,5 +54,5 @@ network_params:
 
 spamoor_blob_params:
   throughput: 10
-  max_blobs: 2
+  sidecars: 2
   max_pending: 40

.github/tests/minimal-pectra-devnet-5.yaml.norun

@@ -28,7 +28,7 @@ dora_params:
   image: "ethpandaops/dora:master-latest"
 spamoor_blob_params:
   throughput: 10
-  max_blobs: 2
+  sidecars: 2
   max_pending: 40
 
 assertoor_params:

.github/tests/mock-mev-pectra-devnet-5.yaml.norun

@@ -36,7 +36,7 @@ dora_params:
   image: "ethpandaops/dora:master-latest"
 spamoor_blob_params:
   throughput: 10
-  max_blobs: 2
+  sidecars: 2
   max_pending: 40
 
 global_log_level: debug

.github/tests/pectra-devnet-6.yaml.norun

@@ -39,7 +39,7 @@ dora_params:
   image: "ethpandaops/dora:master-latest"
 spamoor_blob_params:
   throughput: 10
-  max_blobs: 2
+  sidecars: 2
   max_pending: 40
 
 global_log_level: debug

README.md

@@ -979,7 +979,7 @@ spamoor_blob_params:
   throughput: 3
   # Maximum number of blobs per transaction
   # Defaults to 2
-  max_blobs: 2
+  sidecars: 2
   # Max pending blob transactions for spamoor
   # Defaults to 6
   max_pending: 6

src/package_io/constants.star

@@ -304,3 +304,8 @@ VOLUME_SIZE["mainnet-shadowfork"] = VOLUME_SIZE["mainnet"]
 VOLUME_SIZE["sepolia-shadowfork"] = VOLUME_SIZE["sepolia"]
 VOLUME_SIZE["holesky-shadowfork"] = VOLUME_SIZE["holesky"]
 VOLUME_SIZE["hoodi-shadowfork"] = VOLUME_SIZE["hoodi"]
+
+SPAMOOR_BLOB_THROUGHPUT_MULTIPLIER = 2
+SPAMOOR_BLOB_DEFAULT_THROUGHPUT = 3
+SPAMOOR_BLOB_DEFAULT_SIDECARS = 2
+SPAMOOR_BLOB_DEFAULT_MAX_WALLETS = 29

src/package_io/input_parser.star

@@ -468,7 +468,7 @@ def input_parser(plan, input_args):
             image=result["spamoor_blob_params"]["image"],
             scenario=result["spamoor_blob_params"]["scenario"],
             throughput=result["spamoor_blob_params"]["throughput"],
-            max_blobs=result["spamoor_blob_params"]["max_blobs"],
+            sidecars=result["spamoor_blob_params"]["sidecars"],
             max_pending=result["spamoor_blob_params"]["max_pending"],
             max_wallets=result["spamoor_blob_params"]["max_wallets"],
             spamoor_extra_args=result["spamoor_blob_params"]["spamoor_extra_args"],
@@ -1245,10 +1245,11 @@ def get_default_spamoor_blob_params():
     return {
         "image": constants.DEFAULT_SPAMOOR_BLOB_IMAGE,
         "scenario": "blob-combined",
-        "throughput": 3,
-        "max_blobs": 2,
-        "max_pending": 6,
-        "max_wallets": 29,
+        "throughput": constants.SPAMOOR_BLOB_DEFAULT_THROUGHPUT,
+        "sidecars": constants.SPAMOOR_BLOB_DEFAULT_SIDECARS,
+        "max_pending": constants.SPAMOOR_BLOB_DEFAULT_THROUGHPUT
+        * constants.SPAMOOR_BLOB_THROUGHPUT_MULTIPLIER,
+        "max_wallets": constants.SPAMOOR_BLOB_DEFAULT_MAX_WALLETS,
         "spamoor_extra_args": [],
     }
 

src/package_io/sanity_check.star

@@ -262,7 +262,7 @@ SUBCATEGORY_PARAMS = {
         "image",
         "scenario",
         "throughput",
-        "max_blobs",
+        "sidecars",
         "max_pending",
         "max_wallets",
         "spamoor_extra_args",

src/spamoor_blob/spamoor_blob.star

@@ -55,17 +55,35 @@ def get_config(
             cmd.append("--fulu-activation={}".format(osaka_time))
             cmd.append("--blob-v1-percent=100")
 
-    if spamoor_params.throughput != None:
-        cmd.append("--throughput={}".format(spamoor_params.throughput))
+    throughput = (
+        spamoor_params.throughput
+        if spamoor_params.throughput != constants.SPAMOOR_BLOB_DEFAULT_THROUGHPUT
+        else constants.SPAMOOR_BLOB_DEFAULT_THROUGHPUT
+    )
+    cmd.append("--throughput={}".format(throughput))
 
-    if spamoor_params.max_blobs != None:
-        cmd.append("--sidecars={}".format(spamoor_params.max_blobs))
+    max_pending = (
+        spamoor_params.max_pending
+        if spamoor_params.max_pending
+        != constants.SPAMOOR_BLOB_DEFAULT_THROUGHPUT
+        * constants.SPAMOOR_BLOB_THROUGHPUT_MULTIPLIER
+        else throughput * constants.SPAMOOR_BLOB_THROUGHPUT_MULTIPLIER
+    )
+    cmd.append("--max-pending={}".format(max_pending))
 
-    if spamoor_params.max_pending != None:
-        cmd.append("--max-pending={}".format(spamoor_params.max_pending))
+    sidecars = (
+        spamoor_params.sidecars
+        if spamoor_params.sidecars != constants.SPAMOOR_BLOB_DEFAULT_SIDECARS
+        else constants.SPAMOOR_BLOB_DEFAULT_SIDECARS
+    )
+    cmd.append("--sidecars={}".format(sidecars))
 
-    if spamoor_params.max_wallets != None:
-        cmd.append("--max-wallets={}".format(spamoor_params.max_wallets))
+    max_wallets = (
+        spamoor_params.max_wallets
+        if spamoor_params.max_wallets != constants.SPAMOOR_BLOB_DEFAULT_MAX_WALLETS
+        else constants.SPAMOOR_BLOB_DEFAULT_MAX_WALLETS
+    )
+    cmd.append("--max-wallets={}".format(max_wallets))
 
     if len(spamoor_params.spamoor_extra_args) > 0:
         cmd.extend([param for param in spamoor_params.spamoor_extra_args])