Fix Pectra/EIP-7549 attestation over-counting, add Erigon (Caplin) compatibility, repo & test rework

.github/workflows/golangci-lint.yml

@@ -16,19 +16,15 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.25'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v8
         with:
           # Require: The version of golangci-lint to use.
-          # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
-          # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.60
-
-          # XXX Workaround for https://github.com/golangci/golangci-lint-action/issues/135
-          # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
-          skip-pkg-cache: true
+          # When `install-mode` is `binary` (default) the value can be v2.x.y or `latest` to use the latest version.
+          # When `install-mode` is `goinstall` the value can be v2.x.y, `latest`, or the hash of a commit.
+          version: v2.12.2
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
@@ -51,3 +47,15 @@ jobs:
 
           # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
           # install-mode: "goinstall"
+
+  coverage:
+    name: coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.25'
+          cache: false
+      - name: go test -cover
+        run: go test -cover ./...

.github/workflows/main.yml

@@ -32,13 +32,24 @@ jobs:
   #     run: |
   #       go get -u github.com/client9/misspell/cmd/misspell
   #       $(go env GOPATH)/bin/misspell -locale US *.md $(find . -name '*.go')
+  test:
+    name: Run tests
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v3
+      with:
+        go-version: 1.25.x
+    - name: go test
+      run: go test ./...
   build:
     name: Build the executable
     runs-on: ubuntu-latest
+    needs: [test]
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.23.x
+        go-version: 1.25.x
     - uses: actions/checkout@v3
     - name: Build
       run: |
@@ -49,7 +60,7 @@ jobs:
         }
 
         mkdir -p build
-        for arch in arm64 arm64; do
+        for arch in amd64 arm64; do
           for os in linux darwin freebsd windows; do
             build "$arch" "$os"
           done

.gitignore

@@ -150,3 +150,12 @@ eth2-monitor
 test-env/data/
 test-env/mev-relays.json
 test-env/.env
+
+.idea
+.serena
+.env
+
+# accidental `go build ./tools/fixturegen` from the repo root drops the
+# binary here; the tool is meant to be run via `go run ./tools/fixturegen`
+# or `make refresh-fixtures`, never built into the source tree.
+/fixturegen

.tool-versions

@@ -1 +1 @@
-golang 1.19.3
+golang 1.25.10

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine3.19 AS builder
+FROM golang:1.25.10-alpine3.23 AS builder
 
 RUN apk update && \
     apk add --no-cache ca-certificates && \
@@ -16,10 +16,10 @@ RUN go mod download
 RUN go mod verify
 
 COPY . .
-RUN go build -o /go/bin/eth2-monitor -ldflags '-extldflags "-static"'
+RUN go build -o /go/bin/eth2-monitor -ldflags '-extldflags "-static"' ./cmd/eth2-monitor
 
 # second step to build minimal image
-FROM alpine:3.21.3
+FROM alpine:3.23
 
 # add common trusted certificates from the build stage
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

Makefile

@@ -1,13 +1,53 @@
 VERSION = $(shell git describe --tags --abbrev=8 2>/dev/null)
 
-LDFLAGS += -X eth2-monitor/cmd.version=${VERSION}
+LDFLAGS += -X github.com/stakefish/eth2-monitor/internal/cli.version=${VERSION}
 
-.PHONY: all build eth2-monitor
+.PHONY: all build eth2-monitor lint test test-e2e refresh-fixtures refresh-scenario
 all: build
 
 build: eth2-monitor
 
 eth2-monitor:
 	-@mkdir -p bin
 	-@rm -f bin/$@
-	go build -ldflags '$(LDFLAGS)' -o bin/$@ .
+	go build -ldflags '$(LDFLAGS)' -o bin/$@ ./cmd/eth2-monitor
+
+lint:
+	golangci-lint run ./...
+
+test:
+	go test -cover ./...
+
+test-e2e:
+	go test -tags=e2e -count=1 -timeout=5m ./internal/beaconchain/... ./internal/monitoring/...
+
+# Scenarios captured by tools/fixturegen. Each scenario gets its own
+# subdirectory under internal/beaconchain/testdata/beacon/<chain>/<scenario>/
+# (plus internal/monitoring/testdata/mev/ for the chain-agnostic mev
+# scenario). The head-stream-driven capture flow waits for live head
+# events on the configured BEACON_CHAIN_API endpoint — see
+# tools/fixturegen/main.go.
+SCENARIOS = _shared happy_path missed_proposal empty_block delayed_attestation cross_epoch_attestation mev
+
+# CHAIN selects the chain subdirectory under testdata/beacon/. Defaults
+# to hoodi (the chain configured in test-env/.env). Set explicitly to
+# capture against a different network:
+#   make refresh-fixtures CHAIN=sepolia
+CHAIN ?= hoodi
+
+# Refresh every scenario sequentially. The head-stream selectors each
+# wait up to ~10 minutes for a matching head event, so a full
+# refresh-fixtures run can take 30-60 minutes on a normal-finality
+# testnet. Use refresh-scenario for targeted refreshes during
+# development. Reads $BEACON_CHAIN_API or test-env/.env.
+refresh-fixtures:
+	@for s in $(SCENARIOS); do \
+		echo "==> capturing scenario: $$s (chain=$(CHAIN))"; \
+		go run ./tools/fixturegen --scenario=$$s --chain=$(CHAIN) || exit 1; \
+	done
+
+# Refresh a single scenario. Pass `SCENARIO=<name>` (e.g.
+# `make refresh-scenario SCENARIO=missed_proposal`). Honors CHAIN.
+refresh-scenario:
+	@if [ -z "$(SCENARIO)" ]; then echo "usage: make refresh-scenario SCENARIO=<name> [CHAIN=<chain>]"; exit 2; fi
+	go run ./tools/fixturegen --scenario=$(SCENARIO) --chain=$(CHAIN)

main.go → cmd/eth2-monitor/main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"eth2-monitor/cmd"
+	"github.com/stakefish/eth2-monitor/internal/cli"
 
 	isatty "github.com/mattn/go-isatty"
 	"github.com/rs/zerolog"
@@ -24,7 +24,7 @@ func init() {
 }
 
 func main() {
-	if err := cmd.Execute(); err != nil {
+	if err := cli.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}