From 0f4a5cb4c8039a4957609ed08fef8fd1af6e3be4 Mon Sep 17 00:00:00 2001 From: netotericdev Date: Sat, 11 Jan 2025 15:42:36 -0500 Subject: [PATCH] Add spamoor --- .gitmodules | 3 +++ Makefile | 5 ++++- go-prof-sequencer | 2 +- prof-ethereum-package | 2 +- prof-spamoor | 1 + scripts/attach-loggers.sh | 14 +++++++------- 6 files changed, 17 insertions(+), 10 deletions(-) create mode 160000 prof-spamoor diff --git a/.gitmodules b/.gitmodules index 25d2cd9..8979cb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "go-prof-builder"] path = go-prof-builder url = https://github.com/prof-project/builder.git +[submodule "prof-spamoor"] + path = prof-spamoor + url = https://github.com/prof-project/prof-spamoor.git diff --git a/Makefile b/Makefile index 6984760..f475ccb 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,11 @@ build-go-prof-sequencer: build-prof-flood: $(MAKE) -C prof-flood/ docker-build +build-prof-spamoor: + $(MAKE) -C prof-spamoor/ docker-build + # Target to build all containers -build-all-containers: stop build-go-bundle-merger build-go-prof-builder build-go-prof-relay build-go-prof-sequencer build-prof-flood +build-all-containers: stop build-go-bundle-merger build-go-prof-builder build-go-prof-relay build-go-prof-sequencer build-prof-flood build-prof-spamoor @echo "All containers have been built." setup: init diff --git a/go-prof-sequencer b/go-prof-sequencer index 53acd84..c65c66a 160000 --- a/go-prof-sequencer +++ b/go-prof-sequencer @@ -1 +1 @@ -Subproject commit 53acd84b70f9b0e19da61abb5c53accfb4856b75 +Subproject commit c65c66a43402061a7e751c6b42297bb10d688b67 diff --git a/prof-ethereum-package b/prof-ethereum-package index 79d9cc7..f0b7e08 160000 --- a/prof-ethereum-package +++ b/prof-ethereum-package @@ -1 +1 @@ -Subproject commit 79d9cc7dadc20fbf8f7445fbfba1fcf6423fa1ac +Subproject commit f0b7e087c607242ff1e2597e9b87e8ec548aac27 diff --git a/prof-spamoor b/prof-spamoor new file mode 160000 index 0000000..97695f4 --- /dev/null +++ b/prof-spamoor @@ -0,0 +1 @@ +Subproject commit 97695f4c6db5635e2a11f573b65c951ea5149c0b diff --git a/scripts/attach-loggers.sh b/scripts/attach-loggers.sh index 940fa4a..d72a7de 100755 --- a/scripts/attach-loggers.sh +++ b/scripts/attach-loggers.sh @@ -36,9 +36,9 @@ start_service_logger() { local max_retries=3 local retry=0 - # Immediately start mev-flood-2 logger - if [ "$service" = "mev-flood-2" ]; then - echo "Starting priority logger for mev-flood-2" + # Immediately start prof-spamoor logger + if [ "$service" = "prof-spamoor" ]; then + echo "Starting priority logger for prof-spamoor" kurtosis service logs "$ENCLAVE_NAME" "$service" -f > "$logfile" 2>&1 & local pid=$! echo $pid >> "$LOG_DIR/pids" @@ -72,10 +72,10 @@ start_service_logger() { } # Main execution -# Start mev-flood-2 immediately if it exists -echo "Checking for mev-flood-2..." -if kurtosis enclave inspect $ENCLAVE_NAME | grep -q "mev-flood-2.*RUNNING"; then - start_service_logger "mev-flood-2" +# Start prof-spamoor immediately if it exists +echo "Checking for prof-spamoor..." +if kurtosis enclave inspect $ENCLAVE_NAME | grep -q "prof-spamoor.*RUNNING"; then + start_service_logger "prof-spamoor" fi wait_for_services