refactor to single cmd entrypoint

Author: metachris

.github/workflows/checks.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: warp-ubuntu-latest-x64-32x
     steps:
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -25,7 +25,7 @@ jobs:
 
   lint:
     name: Lint
-    runs-on: ubuntu-latest
+    runs-on: warp-ubuntu-latest-x64-32x
     steps:
       - name: Set up Go
         uses: actions/setup-go@v3

.github/workflows/release.yml

@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   build_and_release:
-    runs-on: ubuntu-latest
+    runs-on: warp-ubuntu-latest-x64-32x
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -22,15 +22,12 @@ jobs:
         with:
           go-version: ^v1.24
 
-      - name: Build
-        run: make build
-
-      # https://goreleaser.com/cmd/goreleaser_release/
+      # https://github.com/goreleaser/goreleaser-action
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
           version: "~> v2"
-          args: release --config .goreleaser.yaml
+          args: release --config .goreleaser.yaml --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yaml

@@ -1,13 +1,40 @@
-# https://goreleaser.com/customization/release/
 version: 2
+
+# https://goreleaser.com/customization/builds/go/
 builds:
-  - skip: true
+  - id: mempool-dumpster
+    main: ./cmd/
+    binary: mempool-dumpster
+
+    env:
+      # Force build to be all Go.
+      - CGO_ENABLED=0
+    flags:
+      # Remove all file system paths from the executable.
+      - -trimpath
+    ldflags:
+      # Sets the value of the symbol.
+      - -X github.com/flashbots/mempool-dumpster/common.Version={{.Version}}
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+      - riscv64
+    ignore:
+      - goos: darwin
+        goarch: riscv64
+
+# https://goreleaser.com/customization/release/
 release:
   draft: true
   extra_files:
-    - glob: ./build/*
+    - glob: ./dist/mempool-dumpster*.tar.gz
+    - glob: ./dist/mempool-dumpster*.txt
   header: |
     # 🚀 Features
     # 🎄 Enhancements
     # 🐞 Notable bug fixes
+    # 🔖 Version updates
     # 🎠 Community

Dockerfile

@@ -12,12 +12,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build go mod download
 # Now adding all the code and start building
 ADD . .
 ENV GOCACHE=/root/.cache/go-build
-RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -X main.version=${VERSION}" -v -o ./bin/collect cmd/collect/*
-RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -X main.version=${VERSION}" -v -o ./bin/merge cmd/merge/*
-RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -X main.version=${VERSION}" -v -o ./bin/analyze cmd/analyze/*
+RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -X github.com/flashbots/mempool-dumpster/common.Version=${VERSION}" -v -o ./bin/mempool-dumpster cmd/main.go
 
 FROM alpine:latest
 WORKDIR /app
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /build/bin/* /app/
-CMD ["/app/collect"]
+CMD ["/app/mempool-dumpster", "collect"]

Makefile

@@ -17,10 +17,7 @@ v: ## Show the current version
 .PHONY: build
 build: clean-build  ## build the binaries
 	@mkdir -p build
-	go build -trimpath -ldflags "-X main.version=${VERSION}" -v -o ./build/collect cmd/collect/*
-	go build -trimpath -ldflags "-X main.version=${VERSION}" -v -o ./build/merge cmd/merge/*
-	go build -trimpath -ldflags "-X main.version=${VERSION}" -v -o ./build/analyze cmd/analyze/*
-	go build -trimpath -ldflags "-X main.version=${VERSION}" -v -o ./build/website cmd/website/*
+	go build -trimpath -ldflags "-X github.com/flashbots/mempool-dumpster/common.Version=${VERSION}" -v -o ./build/mempool-dumpster cmd/main.go
 
 .PHONY: website
 website: ## Build the website and upload to R2

cmd/analyze/main.go

@@ -1,4 +1,4 @@
-package main
+package cmd_analyze //nolint:stylecheck
 
 import (
 	"fmt"
@@ -9,16 +9,11 @@ import (
 	"github.com/urfave/cli/v2"
 	"github.com/xitongsys/parquet-go-source/local"
 	"github.com/xitongsys/parquet-go/reader"
-	"go.uber.org/zap"
 )
 
 var (
-	version = "dev" // is set during build process
-	debug   = os.Getenv("DEBUG") == "1"
-	maxTxs  = common.GetEnvInt("MAX", 0) // 0 means no limit
-
-	// Helpers
-	log *zap.SugaredLogger
+	debug  = os.Getenv("DEBUG") == "1"
+	maxTxs = common.GetEnvInt("MAX", 0) // 0 means no limit
 
 	// CLI flags
 	cliFlags = []cli.Flag{
@@ -34,41 +29,25 @@ var (
 			Name:  "out",
 			Usage: "output filename",
 		},
-		// &cli.StringSliceFlag{
-		// 	Name:  "tx-blacklist",
-		// 	Usage: "metadata CSV/ZIP input files with transactions to ignore in analysis",
-		// },
-		// &cli.StringSliceFlag{
-		// 	Name:  "tx-whitelist",
-		// 	Usage: "metadata CSV/ZIP input files to only use transactions in there for analysis",
-		// },
 		&cli.StringSliceFlag{
 			Name:  "cmp",
 			Usage: "compare these sources",
 		},
 	}
 )
 
-func main() {
-	log = common.GetLogger(debug, false)
-	defer func() { _ = log.Sync() }()
-
-	app := &cli.App{
-		Name:   "analyze",
-		Usage:  "Analyze transaction and sourcelog files",
-		Flags:  cliFlags,
-		Action: analyzeV2,
-	}
-
-	if err := app.Run(os.Args); err != nil {
-		log.Fatal(err)
-	}
+var Command = cli.Command{
+	Name:   "analyze",
+	Usage:  "Analyze transaction and sourcelog files",
+	Flags:  cliFlags,
+	Action: analyzeV2,
 }
 
 func analyzeV2(cCtx *cli.Context) error {
+	log := common.GetLogger(debug, false)
+	defer func() { _ = log.Sync() }()
+
 	outFile := cCtx.String("out")
-	// ignoreTxsFiles := cCtx.StringSlice("tx-blacklist")
-	// whitelistTxsFiles := cCtx.StringSlice("tx-whitelist")
 	parquetInputFiles := cCtx.StringSlice("input-parquet")
 	inputSourceLogFiles := cCtx.StringSlice("input-sourcelog")
 	cmpSources := cCtx.StringSlice("cmp")
@@ -81,7 +60,7 @@ func analyzeV2(cCtx *cli.Context) error {
 		log.Fatal("no input-parquet files specified")
 	}
 
-	log.Infow("Analyzer V2", "version", version)
+	log.Infow("Analyzer V2", "version", common.Version)
 	// log.Infow("Comparing:", "sources", sourceComps)
 
 	// Ensure output files are don't yet exist