chore: merge branch 'main' into dashboards-improvements

Author: cbermudez97

scripts/Dockerfile.debug

@@ -0,0 +1,34 @@
+# Support setting various labels on the final image
+ARG COMMIT=""
+ARG VERSION=""
+ARG BUILDNUM=""
+
+# Build Geth in a stock Go builder container
+FROM golang:1.20-alpine as builder
+
+RUN apk add --no-cache gcc musl-dev linux-headers git
+
+# Get dependencies - will also be cached if we won't change go.mod/go.sum
+COPY go.mod /go-ethereum/
+COPY go.sum /go-ethereum/
+RUN cd /go-ethereum && go mod download
+
+ADD . /go-ethereum
+
+RUN cd /go-ethereum && go build -o ./build/bin/geth   -gcflags=all='-N -l' -v ./cmd/geth
+
+RUN go install github.com/go-delve/delve/cmd/dlv@latest
+# Pull Geth into a second stage deploy alpine container
+FROM alpine:latest
+
+RUN apk add --no-cache ca-certificates
+COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
+COPY --from=builder /go/bin/dlv /
+EXPOSE 8545 8546 30303 30303/udp 40000
+ENTRYPOINT ["/dlv", "--listen=:40000", "--headless=true", "--continue", "--accept-multiclient", "--api-version=2", "exec", "/usr/local/bin/geth"]
+# Add some metadata labels to help programatic image consumption
+ARG COMMIT=""
+ARG VERSION=""
+ARG BUILDNUM=""
+
+LABEL commit="$COMMIT" version="$VERSION" buildnum="$BUILDNUM"

scripts/emulate_network.go

@@ -186,7 +186,7 @@ Available commands:
 - build
   - -t : Image tag (optional, default: "flashbots/builder:dev")
   - -d : Image Build directory (optional, default: "..")
-  - -f : Build dockerfile path (optional, default: "../Dockerfile")
+  - -f : Build dockerfile path (optional, default: "./Dockerfile.debug")
 - run
   - -t : Image tag (optional, default: "flashbots/builder:dev")
   - -n : Enclave name (optional, default: "explorer")
@@ -214,7 +214,7 @@ func main() {
 	switch os.Args[1] {
 	case "build":
 		buildDir := flagSet.String("d", "..", "Build directory.")
-		buildDockerfilePath := flagSet.String("f", "../Dockerfile", "Build dockerfile path.")
+		buildDockerfilePath := flagSet.String("f", "./Dockerfile.debug", "Build dockerfile path.")
 		flagSet.Parse(os.Args[2:])
 		build(*imageTag, *buildDir, *buildDockerfilePath)
 	case "run":

scripts/kurtosis/network_params.json

@@ -51,9 +51,8 @@
     },
     "mev_params": {
         "mev_flood_seconds_per_bundle": 13,
-        "launch_custom_flood": true,
         "mev_flood_extra_args": [
-            "--txsPerBundle=100"
+            "--txsPerBundle=250"
         ],
         "mev_flood_image": "flashbots/mev-flood:0.0.9",
         "mev_relay_image": "flashbots/mev-boost-relay:0.27",
@@ -66,16 +65,20 @@
     "additional_services": [
         "tx_spammer",
         "blob_spammer",
+        "custom_flood",
         "beacon_metrics_gazer",
         "dora",
         "prometheus_grafana"
     ],
     "tx_spammer_params": {
         "tx_spammer_extra_args": [
-            "--txcount=100"
+            "--txcount=250"
         ]
     },
+    "custom_flood_params": {
+        "interval_between_transactions": 0.05
+    },
     "grafana_additional_dashboards": [
         "github.com/flashbots/builder-startup-script/data/grafana"
     ]
-}
+}