Merge pull request #7 from ethpandaops/fix/proto-structure

Fix/proto structure

.gitignore

@@ -1 +1,2 @@
-sentry.yaml
+sentry.yaml
+dist

.goreleaser.yaml

@@ -4,7 +4,6 @@ before:
   hooks:
     - go mod tidy
     - go generate ./...
-    - make build-web
 builds:
   - env:
       - CGO_ENABLED=0

go.mod

@@ -3,14 +3,23 @@ module github.com/ethpandaops/xatu
 go 1.17
 
 require (
-	github.com/attestantio/go-eth2-client v0.14.1 // indirect
+	github.com/attestantio/go-eth2-client v0.14.1
+	github.com/creasty/defaults v1.6.0
+	github.com/go-co-op/gocron v1.17.1
+	github.com/pkg/errors v0.9.1
+	github.com/samcm/beacon v0.6.0
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/cobra v1.6.1
+	google.golang.org/protobuf v1.28.1
+	gopkg.in/yaml.v2 v2.4.0
+)
+
+require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9 // indirect
-	github.com/creasty/defaults v1.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/ferranbt/fastssz v0.1.1 // indirect
-	github.com/go-co-op/gocron v1.17.1 // indirect
 	github.com/goccy/go-yaml v1.9.5 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
@@ -20,7 +29,6 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.13.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
@@ -29,16 +37,11 @@ require (
 	github.com/r3labs/sse/v2 v2.7.4 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/rs/zerolog v1.27.0 // indirect
-	github.com/samcm/beacon v0.6.0 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/cobra v1.6.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
 	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
 	golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

pkg/proto/eth/v1/attestation.proto

@@ -17,17 +17,21 @@ message Checkpoint {
 message Attestation {
   string aggregation_bits = 1 [json_name="aggregation_bits"];
 
-  uint64 slot = 2;
+  string signature = 2;
+
+  AttestationData data = 3;
+}
 
-  uint64 index = 3;
+message AttestationData {
+  uint64 slot = 1;
 
-  string beacon_block_root = 4 [json_name="beacon_block_root"];
+  uint64 index = 2;
 
-  Checkpoint source = 5;
+  string beacon_block_root = 3 [json_name="beacon_block_root"];
 
-  Checkpoint target = 6;
+  Checkpoint source = 4;
 
-  string signature = 7;
+  Checkpoint target = 5;
 }
 
 message AggregateAttestationAndProof {