diff --git a/README.md b/README.md index 0aab84eea..e460ecbfa 100644 --- a/README.md +++ b/README.md @@ -979,16 +979,6 @@ mev_params: scrape_interval: 15s # Additional labels to be added. Default to empty labels: {} - # Image to use for mev-flood - mev_flood_image: flashbots/mev-flood - # Extra parameters to send to mev-flood - mev_flood_extra_args: [] - # Number of seconds between bundles for mev-flood - mev_flood_seconds_per_bundle: 15 - # Optional parameters to send to the custom_flood script that sends reliable payloads - custom_flood_params: - interval_between_transactions: 1 - # Image to use for mock mev mock_mev_image: ethpandaops/rustic-builder:main @@ -1304,7 +1294,6 @@ Starting your network up with `"mev_type": "full"` will instantiate and connect 3. `mev-relay-website` - A website to monitor payloads that have been delivered 4. `mev-relay-housekeeper` - Updates known validators, proposer duties, and more in the background. Only a single instance of this should run. 5. `mev-boost` - open-source middleware instantiated for each EL/Cl pair in the network, including the builder -6. `mev-flood` - Deploys UniV2 smart contracts, provisions liquidity on UniV2 pairs, & sends a constant stream of UniV2 swap transactions to the network's public mempool.
Caveats when using "mev_type": "full" @@ -1333,8 +1322,6 @@ Here's a table of where the keys are used | 0 | Builder | ✅ | | As coinbase | | 0 | mev_custom_flood | | ✅ | As the receiver of balance | | 3 | transaction_spammer | ✅ | | To spam transactions with | -| 6 | mev_flood | ✅ | | As the contract owner | -| 7 | mev_flood | ✅ | | As the user_key | | 8 | assertoor | ✅ | ✅ | As the funding for tests | | 11 | mev_custom_flood | ✅ | | As the sender of balance | | 12 | l2_contracts | ✅ | | Contract deployer address | diff --git a/main.star b/main.star index 74a1e055a..0fe2f32ab 100644 --- a/main.star +++ b/main.star @@ -47,7 +47,6 @@ flashbots_mev_relay = import_module( "./src/mev/flashbots/mev_relay/mev_relay_launcher.star" ) mock_mev = import_module("./src/mev/flashbots/mock_mev/mock_mev_launcher.star") -mev_flood = import_module("./src/mev/flashbots/mev_flood/mev_flood_launcher.star") mev_custom_flood = import_module( "./src/mev/flashbots/mev_custom_flood/mev_custom_flood_launcher.star" ) @@ -304,15 +303,6 @@ def run(plan, args={}): first_cl_client = all_cl_contexts[0] first_client_beacon_name = first_cl_client.beacon_service_name - contract_owner, normal_user = prefunded_accounts[6:8] - mev_flood.launch_mev_flood( - plan, - mev_params.mev_flood_image, - all_el_contexts[-1].rpc_http_url, # Only spam builder - contract_owner.private_key, - normal_user.private_key, - global_node_selectors, - ) if ( args_with_right_defaults.mev_type == constants.FLASHBOTS_MEV_TYPE or args_with_right_defaults.mev_type == constants.COMMIT_BOOST_MEV_TYPE @@ -344,14 +334,6 @@ def run(plan, args={}): else: fail("Invalid MEV type") - mev_flood.spam_in_background( - plan, - all_el_contexts[-1].rpc_http_url, # Only spam builder - mev_params.mev_flood_extra_args, - mev_params.mev_flood_seconds_per_bundle, - contract_owner.private_key, - normal_user.private_key, - ) mev_endpoints.append(endpoint) mev_endpoint_names.append(args_with_right_defaults.mev_type) diff --git a/network_params.yaml b/network_params.yaml index 2bc5f7e1c..b64f24de4 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -181,9 +181,6 @@ mev_params: mev_builder_prometheus_config: scrape_interval: 15s labels: {} - mev_flood_image: flashbots/mev-flood - mev_flood_extra_args: [] - mev_flood_seconds_per_bundle: 15 custom_flood_params: interval_between_transactions: 1 xatu_sentry_enabled: false diff --git a/src/mev/flashbots/mev_flood/mev_flood_launcher.star b/src/mev/flashbots/mev_flood/mev_flood_launcher.star deleted file mode 100644 index 21e14313d..000000000 --- a/src/mev/flashbots/mev_flood/mev_flood_launcher.star +++ /dev/null @@ -1,77 +0,0 @@ -ADMIN_KEY_INDEX = 0 -USER_KEY_INDEX = 2 - -# The min/max CPU/memory that mev-flood can use -MIN_CPU = 100 -MAX_CPU = 2000 -MIN_MEMORY = 128 -MAX_MEMORY = 1024 - - -def prefixed_address(address): - return "0x" + address - - -def launch_mev_flood( - plan, - image, - el_uri, - contract_owner, - normal_user, - global_node_selectors, -): - plan.add_service( - name="mev-flood", - config=ServiceConfig( - image=image, - entrypoint=["/bin/sh", "-c", "touch main.log && tail -F main.log"], - min_cpu=MIN_CPU, - max_cpu=MAX_CPU, - min_memory=MIN_MEMORY, - max_memory=MAX_MEMORY, - node_selectors=global_node_selectors, - ), - ) - - plan.exec( - service_name="mev-flood", - description="Initializing mev flood", - recipe=ExecRecipe( - command=[ - "/bin/sh", - "-c", - "./run init -r {0} -k {1} -u {2} -s deployment.json".format( - el_uri, - prefixed_address(contract_owner), - prefixed_address(normal_user), - ), - ] - ), - ) - - -def spam_in_background( - plan, el_uri, mev_flood_extra_args, seconds_per_bundle, contract_owner, normal_user -): - owner, user = prefixed_address(contract_owner), prefixed_address(normal_user) - command = [ - "/bin/sh", - "-c", - "nohup ./run spam -r {0} -k {1} -u {2} -l deployment.json --secondsPerBundle {3} >main.log 2>&1 &".format( - el_uri, owner, user, seconds_per_bundle - ), - ] - if mev_flood_extra_args: - joined_extra_args = " ".join(mev_flood_extra_args) - command = [ - "/bin/sh", - "-c", - "nohup ./run spam -r {0} -k {1} -u {2} -l deployment.json --secondsPerBundle {3} {4} >main.log 2>&1 &".format( - el_uri, owner, user, seconds_per_bundle, joined_extra_args - ), - ] - plan.exec( - service_name="mev-flood", - description="Sending spam transactions", - recipe=ExecRecipe(command=command), - ) diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index dbad84f08..d78abd3a3 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -464,11 +464,6 @@ def input_parser(plan, input_args): "mev_relay_website_extra_env_vars" ], mev_builder_extra_args=result["mev_params"]["mev_builder_extra_args"], - mev_flood_image=result["mev_params"]["mev_flood_image"], - mev_flood_extra_args=result["mev_params"]["mev_flood_extra_args"], - mev_flood_seconds_per_bundle=result["mev_params"][ - "mev_flood_seconds_per_bundle" - ], mock_mev_image=result["mev_params"]["mock_mev_image"], ) if result["mev_params"] @@ -1248,9 +1243,6 @@ def get_default_mev_params(mev_type, preset): mev_relay_website_extra_args = [] mev_relay_website_extra_env_vars = {} mev_builder_extra_args = [] - mev_flood_image = "flashbots/mev-flood" - mev_flood_extra_args = [] - mev_flood_seconds_per_bundle = 15 mev_builder_prometheus_config = { "scrape_interval": "15s", "labels": None, @@ -1309,9 +1301,6 @@ def get_default_mev_params(mev_type, preset): "mev_relay_housekeeper_extra_env_vars": mev_relay_housekeeper_extra_env_vars, "mev_relay_website_extra_args": mev_relay_website_extra_args, "mev_relay_website_extra_env_vars": mev_relay_website_extra_env_vars, - "mev_flood_image": mev_flood_image, - "mev_flood_extra_args": mev_flood_extra_args, - "mev_flood_seconds_per_bundle": mev_flood_seconds_per_bundle, "mev_builder_prometheus_config": mev_builder_prometheus_config, } @@ -1614,7 +1603,6 @@ def docker_cache_image_override(plan, result): "mev_params.mev_builder_image", "mev_params.mev_builder_cl_image", "mev_params.mev_boost_image", - "mev_params.mev_flood_image", "xatu_sentry_params.xatu_sentry_image", "tx_fuzz_params.image", "prometheus_params.image", diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star index 7499eaabd..da7176d17 100644 --- a/src/package_io/sanity_check.star +++ b/src/package_io/sanity_check.star @@ -271,9 +271,6 @@ SUBCATEGORY_PARAMS = { "mev_relay_website_extra_env_vars", "mev_builder_extra_args", "mev_builder_prometheus_config", - "mev_flood_image", - "mev_flood_extra_args", - "mev_flood_seconds_per_bundle", "custom_flood_params", "mock_mev_image", ],