feat(sentry): Fetch fork choice (#104)

* feat(sentry): Fetch fork choice

* feat(sentry): Rename fork choice files

.gitignore

@@ -5,3 +5,4 @@ mimicry.yaml
 dist
 GeoLite2-ASN.mmdb
 GeoLite2-City.mmdb
+__debug_bin

example_sentry.yaml

@@ -17,6 +17,21 @@ ntpServer: time.google.com
 ethereum:
   beaconNodeAddress: http://localhost:5052
 
+forkChoice:
+  enabled: false
+
+  onReOrgEvent:
+    enabled: false
+
+  interval:
+    enabled: false
+    every: 30s
+
+  at:
+    enabled: false
+    slotTimes:
+    - 4s
+
 outputs:
 - name: http-sink
   type: http

go.mod

@@ -2,6 +2,8 @@ module github.com/ethpandaops/xatu
 
 go 1.19
 
+replace github.com/attestantio/go-eth2-client v0.15.7 => github.com/samcm/go-eth2-client v0.15.8
+
 require (
 	github.com/attestantio/go-eth2-client v0.15.7
 	github.com/avast/retry-go/v4 v4.3.3
@@ -10,7 +12,7 @@ require (
 	github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9
 	github.com/creasty/defaults v1.6.0
 	github.com/ethereum/go-ethereum v1.11.2
-	github.com/ethpandaops/beacon v0.20.0
+	github.com/ethpandaops/beacon v0.22.0
 	github.com/ethpandaops/ethcore v0.0.0-20230228005828-f415550a36c0
 	github.com/ethpandaops/ethwallclock v0.3.0
 	github.com/go-co-op/gocron v1.18.0

go.sum

@@ -52,8 +52,6 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/attestantio/go-eth2-client v0.15.7 h1:0v7+Z2RZ8bNtU/0mfppXzLiYv+6a8pe2wKyA6CU9jwQ=
-github.com/attestantio/go-eth2-client v0.15.7/go.mod h1:/Oh6YTuHmHhgLN/ZnQRKHGc7HdIzGlDkI2vjNZvOsvA=
 github.com/avast/retry-go/v4 v4.3.3 h1:G56Bp6mU0b5HE1SkaoVjscZjlQb0oy4mezwY/cGH19w=
 github.com/avast/retry-go/v4 v4.3.3/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
@@ -130,8 +128,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/ethereum/go-ethereum v1.11.2 h1:z/luyejbevDCAMUUiu0rc80dxJxOnpoG58k5o0tSawc=
 github.com/ethereum/go-ethereum v1.11.2/go.mod h1:DuefStAgaxoaYGLR0FueVcVbehmn5n9QUcVrMCuOvuc=
-github.com/ethpandaops/beacon v0.20.0 h1:z389nMmzVYbPhP4+ahcaezqr9SivolWhnCYeWVeWFz8=
-github.com/ethpandaops/beacon v0.20.0/go.mod h1:fkS2U962xdB6+VwBn+J+DMK8cTgTtzVtjZWtvTKjbuE=
+github.com/ethpandaops/beacon v0.22.0 h1:zZwgfbJlLj/GP9XKCbVs41bjeCW8ijnWQ3vVjoQnFRY=
+github.com/ethpandaops/beacon v0.22.0/go.mod h1:p+PMyAYXro2hgNEMNbCtzLOvzHund9Q9BTPATvf8/SA=
 github.com/ethpandaops/ethcore v0.0.0-20230228005828-f415550a36c0 h1:whK6CP+UV0jkTxp2XznMM4tbb4ltn0nL7219hkitSaQ=
 github.com/ethpandaops/ethcore v0.0.0-20230228005828-f415550a36c0/go.mod h1:9505XhCkbfVvYWzJJQdI0Y/EaXomqNYU/QuDjzzJqVM=
 github.com/ethpandaops/ethwallclock v0.3.0 h1:xF5fwtBf+bHFHZKBnwiPFEuelW3sMM7SD3ZNFq1lJY4=
@@ -498,6 +496,8 @@ github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6us
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/samcm/go-eth2-client v0.15.8 h1:V2gwKrnxImQE/Fmy9a2rzNRj0GQqnhP74Rgfm067HTA=
+github.com/samcm/go-eth2-client v0.15.8/go.mod h1:PLRKnILnr63V3yl2VagBqnhVRFBWc0V+JhQSsXQaSwQ=
 github.com/savid/ttlcache/v3 v3.0.2 h1:P7LAHoFNfCjKKJyYcSTFYsNmO+xHaRXTTrLrjb2UJJY=
 github.com/savid/ttlcache/v3 v3.0.2/go.mod h1:9OBR4zMFiOT3Vk2aghO8vOhmsdfTFT4orFnQ4cl+VyM=
 github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=

pkg/proto/eth/v1/fork_choice.proto

@@ -34,8 +34,8 @@ message ForkChoiceNode {
 
   string validity = 7 [ json_name = "validity" ];
 
-  string ExecutionBlockHash = 8 [ json_name = "ExecutionBlockHash" ];
+  string ExecutionBlockHash = 8 [ json_name = "execution_block_hash" ];
 
-  bytes ExtraData = 9 [ json_name = "ExtraData" ];
+  string ExtraData = 9 [ json_name = "extra_data" ];
 }