Initial electra

docker-compose.yml

@@ -158,6 +158,21 @@ services:
  - ./deploy/local/docker-compose/xatu-server.yaml:/etc/xatu-server/config.yaml
  networks:
  - xatu-net
+ xatu-cannon:
+ profiles:
+ - "cannon"
+ command: cannon --config /etc/xatu-cannon/config.yaml
+ container_name: xatu-cannon
+ hostname: xatu-cannon
+ build:
+ context: .
+ dockerfile: Dockerfile
+ environment:
+ EVENT_INGESTER_AUTHORIZATION_SECRET: ${EVENT_INGESTER_AUTHORIZATION_SECRET}
+ volumes:
+ - ./deploy/local/docker-compose/xatu-cannon.yaml:/etc/xatu-cannon/config.yaml
+ networks:
+ - xatu-net
 
  xatu-postgres:
  profiles:
@@ -356,7 +371,7 @@ services:
  environment:
  KAFKA_BROKERS: "xatu-kafka:29092"
  ports:
- - "${VECTOR_HTTP_KAFKA_ADDRESS:-127.0.0.1}:${VECTOR_HTTP_KAFKA_PORT:-9005}:9005"
+ - "${VECTOR_HTTP_KAFKA_ADDRESS:-127.0.0.1}:${VECTOR_HTTP_KAFKA_PORT:-9055}:9005"
  networks:
  - xatu-net
  healthcheck:

go.mod

@@ -4,6 +4,8 @@ go 1.22.0
 
 replace github.com/probe-lab/hermes => github.com/ethpandaops/hermes v0.0.0-20240527060557-ae23464cdc41
 
+replace github.com/attestantio/go-eth2-client => github.com/attestantio/go-eth2-client v0.0.0-20240701211822-0a60485fce68
+
 require (
  github.com/IBM/sarama v1.43.0
  github.com/attestantio/go-eth2-client v0.19.10
@@ -34,11 +36,9 @@ require (
  github.com/prometheus/client_golang v1.19.0
  github.com/prometheus/client_model v0.6.0
  github.com/prysmaticlabs/prysm/v5 v5.0.2
- github.com/r3labs/sse/v2 v2.10.0
  github.com/redis/go-redis/v9 v9.5.1
  github.com/sirupsen/logrus v1.9.3
  github.com/spf13/cobra v1.8.0
- github.com/spf13/viper v1.19.0
  github.com/stretchr/testify v1.9.0
  go.opentelemetry.io/otel v1.24.0
  go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
@@ -48,7 +48,6 @@ require (
  golang.org/x/sync v0.6.0
  google.golang.org/grpc v1.62.1
  google.golang.org/protobuf v1.33.0
- gopkg.in/cenkalti/backoff.v1 v1.1.0
  gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -127,7 +126,6 @@ require (
  github.com/hashicorp/go-uuid v1.0.3 // indirect
  github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
  github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
- github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e // indirect
  github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
  github.com/holiman/uint256 v1.2.4 // indirect
@@ -163,7 +161,6 @@ require (
  github.com/libp2p/go-reuseport v0.4.0 // indirect
  github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
  github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
- github.com/magiconair/properties v1.8.7 // indirect
  github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.20 // indirect
@@ -194,36 +191,33 @@ require (
  github.com/opencontainers/runtime-spec v1.2.0 // indirect
  github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
  github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
- github.com/pelletier/go-toml/v2 v2.2.2 // indirect
  github.com/pierrec/lz4/v4 v4.1.21 // indirect
+ github.com/pk910/dynamic-ssz v0.0.4 // indirect
  github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
  github.com/prometheus/common v0.48.0 // indirect
  github.com/prometheus/procfs v0.12.0 // indirect
  github.com/prysmaticlabs/fastssz v0.0.0-20221107182844-78142813af44 // indirect
- github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 // indirect
+ github.com/prysmaticlabs/go-bitfield v0.0.0-20240328144219-a1caa50c3a1e // indirect
  github.com/prysmaticlabs/gohashtree v0.0.4-beta // indirect
  github.com/prysmaticlabs/prombbolt v0.0.0-20210126082820-9b7adba6db7c // indirect
  github.com/quic-go/qpack v0.4.0 // indirect
  github.com/quic-go/quic-go v0.42.0 // indirect
  github.com/quic-go/webtransport-go v0.6.0 // indirect
+ github.com/r3labs/sse/v2 v2.10.0 // indirect
  github.com/raulk/go-watchdog v1.3.0 // indirect
  github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
  github.com/rivo/uniseg v0.4.4 // indirect
  github.com/robfig/cron/v3 v3.0.1 // indirect
  github.com/rogpeppe/go-internal v1.11.0 // indirect
  github.com/rs/cors v1.7.0 // indirect
- github.com/rs/zerolog v1.29.1 // indirect
+ github.com/rs/zerolog v1.32.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
- github.com/sagikazarmark/locafero v0.4.0 // indirect
- github.com/sagikazarmark/slog-shim v0.1.0 // indirect
  github.com/schollz/progressbar/v3 v3.3.4 // indirect
  github.com/shirou/gopsutil v3.21.11+incompatible // indirect
- github.com/sourcegraph/conc v0.3.0 // indirect
  github.com/spaolacci/murmur3 v1.1.0 // indirect
  github.com/spf13/afero v1.11.0 // indirect
  github.com/spf13/cast v1.6.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
- github.com/subosito/gotenv v1.6.0 // indirect
  github.com/supranational/blst v0.3.11 // indirect
  github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
  github.com/thejerf/suture/v4 v4.0.5 // indirect
@@ -247,24 +241,24 @@ require (
  go.uber.org/mock v0.4.0 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  go.uber.org/zap v1.27.0 // indirect
- golang.org/x/crypto v0.21.0 // indirect
+ golang.org/x/crypto v0.23.0 // indirect
  golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
  golang.org/x/mod v0.15.0 // indirect
  golang.org/x/net v0.23.0 // indirect
  golang.org/x/oauth2 v0.18.0 // indirect
- golang.org/x/sys v0.18.0 // indirect
- golang.org/x/term v0.18.0 // indirect
- golang.org/x/text v0.14.0 // indirect
+ golang.org/x/sys v0.20.0 // indirect
+ golang.org/x/term v0.20.0 // indirect
+ golang.org/x/text v0.15.0 // indirect
  golang.org/x/time v0.5.0 // indirect
  golang.org/x/tools v0.18.0 // indirect
  golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
  google.golang.org/api v0.171.0 // indirect
  google.golang.org/appengine v1.6.8 // indirect
- google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
  google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
  google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
+ gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect
+ gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
- gopkg.in/ini.v1 v1.67.0 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  k8s.io/apimachinery v0.20.0 // indirect
  k8s.io/client-go v0.20.0 // indirect