Split P2P Topics And Introduce Middleware (Adapters)

WORKSPACE

@@ -566,3 +566,9 @@ go_repository(
  commit = "c4c61651e9e37fa117f53c5a906d3b63090d8445",
  importpath = "github.com/syndtr/goleveldb",
 )
+
+go_repository(
+ name = "com_github_libp2p_go_libp2p_blankhost",
+ commit = "073f507db72de824e981aa0f15f158175a8d6be1",
+ importpath = "github.com/libp2p/go-libp2p-blankhost",
+)

beacon-chain/node/BUILD.bazel

@@ -2,7 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
  name = "go_default_library",
- srcs = ["node.go"],
+ srcs = [
+ "node.go",
+ "p2p_config.go",
+ ],
  importpath = "github.com/prysmaticlabs/prysm/beacon-chain/node",
  visibility = ["//beacon-chain:__subpackages__"],
  deps = [
@@ -13,6 +16,7 @@ go_library(
  "//beacon-chain/sync:go_default_library",
  "//beacon-chain/sync/initial-sync:go_default_library",
  "//beacon-chain/utils:go_default_library",
+ "//proto/beacon/p2p/v1:go_default_library",
  "//shared:go_default_library",
  "//shared/cmd:go_default_library",
  "//shared/database:go_default_library",

beacon-chain/node/node.go

@@ -144,10 +144,11 @@ func (b *BeaconNode) startDB(ctx *cli.Context) error {
 }
 
 func (b *BeaconNode) registerP2P() error {
- beaconp2p, err := p2p.NewServer()
+ beaconp2p, err := configureP2P()
  if err != nil {
  return fmt.Errorf("could not register p2p service: %v", err)
  }
+
  return b.services.RegisterService(beaconp2p)
 }
 

beacon-chain/node/p2p_config.go

@@ -0,0 +1,35 @@
+package node
+
+import (
+ "github.com/prysmaticlabs/prysm/shared/p2p"
+
+ pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
+)
+
+var topicMappings = map[pb.Topic]interface{}{
+ pb.Topic_BEACON_BLOCK_HASH_ANNOUNCE: pb.BeaconBlockHashAnnounce{},
+ pb.Topic_BEACON_BLOCK_REQUEST: pb.BeaconBlockRequest{},
+ pb.Topic_BEACON_BLOCK_REQUEST_BY_SLOT_NUMBER: pb.BeaconBlockRequestBySlotNumber{},
+ pb.Topic_BEACON_BLOCK_RESPONSE: pb.BeaconBlockResponse{},
+ pb.Topic_CRYSTALLIZED_STATE_HASH_ANNOUNCE: pb.CrystallizedStateHashAnnounce{},
+ pb.Topic_CRYSTALLIZED_STATE_REQUEST: pb.CrystallizedStateRequest{},
+ pb.Topic_CRYSTALLIZED_STATE_RESPONSE: pb.CrystallizedStateResponse{},
+ pb.Topic_ACTIVE_STATE_HASH_ANNOUNCE: pb.ActiveStateHashAnnounce{},
+ pb.Topic_ACTIVE_STATE_REQUEST: pb.ActiveStateRequest{},
+ pb.Topic_ACTIVE_STATE_RESPONSE: pb.ActiveStateResponse{},
+}
+
+func configureP2P() (*p2p.Server, error) {
+ s, err := p2p.NewServer()
+ if err != nil {
+ return nil, err
+ }
+
+ // TODO(437, 438): Define default adapters for logging, monitoring, etc.
+ var adapters []p2p.Adapter
+ for k, v := range topicMappings {
+ s.RegisterTopic(k.String(), v, adapters...)
+ }
+
+ return s, nil
+}

beacon-chain/sync/BUILD.bazel

@@ -18,6 +18,7 @@ go_test(
  name = "go_default_test",
  srcs = ["service_test.go"],
  embed = [":go_default_library"],
+ race = "off", # TODO(#377): fix issues with race detection testing.
  deps = [
  "//proto/beacon/p2p/v1:go_default_library",
  "//shared/p2p:go_default_library",

proto/README.md

@@ -12,6 +12,18 @@ proto/
  sharding/
  p2p/
  v1/
+ testing/
 ```
 
-We specify messages available for p2p communication common to beacon chain nodes and sharding clients.
+We specify messages available for p2p communication common to beacon chain nodes and sharding clients.
+
+For now, we are checking in all generated code to support native go dependency
+management. The generated pb.go files can be derived from bazel's bin 
+directory.
+
+For example, when we build the testing go proto library 
+`bazel build //proto/testing:ethereum_testing_go_proto` there is a pb.go 
+generated at 
+`bazel-bin/proto/testing/linux_amd64_stripped/ethereum_testing_go_proto\~/github.com/prysmaticlabs/prysm/proto/testing/test.pb.go`.
+This generated file can be copied, or you can use you protoc locally if you
+prefer.

proto/beacon/p2p/v1/messages.proto

@@ -4,6 +4,20 @@ package ethereum.beacon.p2p.v1;
 
 import "google/protobuf/timestamp.proto";
 
+enum Topic {
+ UNKNOWN = 0;
+ BEACON_BLOCK_HASH_ANNOUNCE = 1;
+ BEACON_BLOCK_REQUEST = 2;
+ BEACON_BLOCK_REQUEST_BY_SLOT_NUMBER = 3;
+ BEACON_BLOCK_RESPONSE = 4;
+ CRYSTALLIZED_STATE_HASH_ANNOUNCE = 5;
+ CRYSTALLIZED_STATE_REQUEST = 6;
+ CRYSTALLIZED_STATE_RESPONSE = 7;
+ ACTIVE_STATE_HASH_ANNOUNCE = 8;
+ ACTIVE_STATE_REQUEST = 9;
+ ACTIVE_STATE_RESPONSE = 10;
+} 
+
 message BeaconBlockHashAnnounce {
  bytes hash = 1;
 }

proto/sharding/p2p/v1/messages.proto

@@ -2,22 +2,11 @@ syntax = "proto3";
 
 package ethereum.sharding.p2p.v1;
 
-// TODO: Split the topics into p2p for beacon chain and p2p for sharding.
 enum Topic {
  UNKNOWN = 0;
  COLLATION_BODY_REQUEST = 1;
  COLLATION_BODY_RESPONSE = 2;
  TRANSACTIONS = 3;
- BEACON_BLOCK_HASH_ANNOUNCE = 4;
- BEACON_BLOCK_REQUEST = 5;
- BEACON_BLOCK_REQUEST_BY_SLOT_NUMBER = 6;
- BEACON_BLOCK_RESPONSE = 7;
- CRYSTALLIZED_STATE_HASH_ANNOUNCE = 8;
- CRYSTALLIZED_STATE_REQUEST = 9;
- CRYSTALLIZED_STATE_RESPONSE = 10;
- ACTIVE_STATE_HASH_ANNOUNCE = 11;
- ACTIVE_STATE_REQUEST = 12;
- ACTIVE_STATE_RESPONSE = 13;
 } 
 
 message CollationBodyRequest {