Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1706,6 +1706,17 @@ spamoor_params:
# config:
# throughput: 10 # 10 tx per block
spammers: []
# Start spamoor's built-in "Regular Chain Load" default group on first launch
# (a balanced mix of everyday transaction types sharing a global throughput budget)
start_chainload: false
# Start spamoor's built-in "Fuzzing" default group on first launch
# (EVM execution and transaction-layer fuzzing under a shared throughput budget)
start_fuzzing: false
# A list of additional built-in spamoor defaults (by technical key) to start on first launch
# example:
# - eoatx-heavy
# - blob-average
defaults: []
# A list of optional params that will be passed to the spamoor command for modifying its behaviour
extra_args: []

Expand Down
3 changes: 3 additions & 0 deletions network_params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ spamoor_params:
max_cpu: 1000
min_mem: 20
max_mem: 300
start_chainload: false
start_fuzzing: false
defaults: []
extra_args: []
disruptoor_params:
image: ethpandaops/disruptoor:latest
Expand Down
9 changes: 9 additions & 0 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,9 @@ def input_parser(plan, input_args):
max_mem=result["spamoor_params"]["max_mem"],
spammers=result["spamoor_params"]["spammers"],
extra_args=result["spamoor_params"]["extra_args"],
start_chainload=result["spamoor_params"]["start_chainload"],
start_fuzzing=result["spamoor_params"]["start_fuzzing"],
defaults=result["spamoor_params"]["defaults"],
),
disruptoor_params=struct(
image=result["disruptoor_params"]["image"],
Expand Down Expand Up @@ -2399,6 +2402,12 @@ def get_default_spamoor_params():
"min_mem": 100,
"max_mem": 800,
"extra_args": [],
# start spamoor's built-in "Regular Chain Load" default group on first launch
"start_chainload": False,

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd argue to enable this by default.

If you assume someone to add spamoor in their list, I'd expect spamming to happen.

# start spamoor's built-in "Fuzzing" default group on first launch
"start_fuzzing": False,
# additional built-in defaults (by technical key) to start on first launch
"defaults": [],
"spammers": [
# default spammers
{
Expand Down
3 changes: 3 additions & 0 deletions src/package_io/sanity_check.star
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,9 @@ SUBCATEGORY_PARAMS = {
"max_mem",
"extra_args",
"spammers",
"start_chainload",
"start_fuzzing",
"defaults",
],
"disruptoor_params": [
"image",
Expand Down
14 changes: 14 additions & 0 deletions src/spamoor/spamoor.star
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,20 @@ def get_config(
"--startup-spammer={}".format(config_file_path),
]

# Built-in spamoor defaults (by technical key) to auto-start on first launch.
# start_chainload/start_fuzzing map to the built-in default groups; spamoor_params.defaults
# can list any other default keys. Deduplicated so overlapping entries don't conflict.
startup_defaults = []
if spamoor_params.start_chainload:
startup_defaults.append("regular-chain-load")
if spamoor_params.start_fuzzing:
startup_defaults.append("fuzzing")
for default_key in spamoor_params.defaults:
if default_key not in startup_defaults:
startup_defaults.append(default_key)
if len(startup_defaults) > 0:
cmd.append("--startup-defaults={}".format(",".join(startup_defaults)))

public_ports = shared_utils.get_additional_service_standard_public_port(
port_publisher,
constants.HTTP_PORT_ID,
Expand Down
Loading