From 5ea3b1d23883dd48524f6f616108eba30831b34f Mon Sep 17 00:00:00 2001
From: Terence Tsao <terence@prysmaticlabs.com>
Date: Thu, 21 Nov 2019 13:36:21 -0800
Subject: [PATCH 1/7] Use array of roles

---
 validator/client/runner.go    | 39 ++++++++++++++---------------------
 validator/client/validator.go | 19 +++++++++--------
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/validator/client/runner.go b/validator/client/runner.go
index 73b7703850d0..bffef0d453b9 100644
--- a/validator/client/runner.go
+++ b/validator/client/runner.go
@@ -2,14 +2,11 @@ package client
 
 import (
 	"context"
-	"fmt"
 	"sync"
 	"time"
 
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1"
-	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -26,7 +23,7 @@ type Validator interface {
 	SlotDeadline(slot uint64) time.Time
 	LogValidatorGainsAndLosses(ctx context.Context, slot uint64) error
 	UpdateAssignments(ctx context.Context, slot uint64) error
-	RolesAt(slot uint64) map[[48]byte]pb.ValidatorRole // validator pubKey -> role
+	RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole // validator pubKey -> role
 	SubmitAttestation(ctx context.Context, slot uint64, pubKey [48]byte)
 	ProposeBlock(ctx context.Context, slot uint64, pubKey [48]byte)
 }
@@ -85,28 +82,24 @@ func run(ctx context.Context, v Validator) {
 			}
 
 			var wg sync.WaitGroup
-			for id, role := range v.RolesAt(slot) {
+			for id, roles := range v.RolesAt(slot) {
 				wg.Add(1)
-				go func(role pb.ValidatorRole, id [48]byte) {
-					log := log.WithFields(logrus.Fields{
-						"pubKey": fmt.Sprintf("%#x", bytesutil.Trunc(id[:])),
-						"role":   role,
-					})
-					switch role {
-					case pb.ValidatorRole_BOTH:
-						go v.SubmitAttestation(slotCtx, slot, id)
-						v.ProposeBlock(slotCtx, slot, id)
-					case pb.ValidatorRole_ATTESTER:
-						v.SubmitAttestation(slotCtx, slot, id)
-					case pb.ValidatorRole_PROPOSER:
-						v.ProposeBlock(slotCtx, slot, id)
-					case pb.ValidatorRole_UNKNOWN:
-						log.Debug("No active role, doing nothing")
-					default:
-						log.Warn("Unhandled role")
+				go func(roles []pb.ValidatorRole, id [48]byte) {
+
+					for _, role := range roles {
+						switch role {
+						case pb.ValidatorRole_ATTESTER:
+							go v.SubmitAttestation(slotCtx, slot, id)
+						case pb.ValidatorRole_PROPOSER:
+							go v.ProposeBlock(slotCtx, slot, id)
+						case pb.ValidatorRole_UNKNOWN:
+							log.Debug("No active roles, doing nothing")
+						default:
+							log.Warn("Unhandled roles")
+						}
 					}
 
-				}(role, id)
+				}(roles, id)
 			}
 			// Wait for all processes to complete, then report span complete.
 			go func() {
diff --git a/validator/client/validator.go b/validator/client/validator.go
index 3934ab271298..494507ec1156 100644
--- a/validator/client/validator.go
+++ b/validator/client/validator.go
@@ -259,25 +259,26 @@ func (v *validator) UpdateAssignments(ctx context.Context, slot uint64) error {
 // RolesAt slot returns the validator roles at the given slot. Returns nil if the
 // validator is known to not have a roles at the at slot. Returns UNKNOWN if the
 // validator assignments are unknown. Otherwise returns a valid ValidatorRole map.
-func (v *validator) RolesAt(slot uint64) map[[48]byte]pb.ValidatorRole {
-	rolesAt := make(map[[48]byte]pb.ValidatorRole)
+func (v *validator) RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole {
+	rolesAt := make(map[[48]byte][]pb.ValidatorRole)
 	for _, assignment := range v.assignments.ValidatorAssignment {
-		var role pb.ValidatorRole
+		var roles []pb.ValidatorRole
 		switch {
 		case assignment == nil:
-			role = pb.ValidatorRole_UNKNOWN
+			roles = append(roles, pb.ValidatorRole_UNKNOWN)
 		case assignment.ProposerSlot == slot && assignment.AttesterSlot == slot:
-			role = pb.ValidatorRole_BOTH
+			roles = append(roles, pb.ValidatorRole_PROPOSER)
+			roles = append(roles, pb.ValidatorRole_ATTESTER)
 		case assignment.AttesterSlot == slot:
-			role = pb.ValidatorRole_ATTESTER
+			roles = append(roles, pb.ValidatorRole_ATTESTER)
 		case assignment.ProposerSlot == slot:
-			role = pb.ValidatorRole_PROPOSER
+			roles = append(roles, pb.ValidatorRole_PROPOSER)
 		default:
-			role = pb.ValidatorRole_UNKNOWN
+			roles = append(roles, pb.ValidatorRole_UNKNOWN)
 		}
 		var pubKey [48]byte
 		copy(pubKey[:], assignment.PublicKey)
-		rolesAt[pubKey] = role
+		rolesAt[pubKey] = roles
 	}
 	return rolesAt
 }

From ef8d8e187065ef503df01c5ff141882dba8ef36a Mon Sep 17 00:00:00 2001
From: Terence Tsao <terence@prysmaticlabs.com>
Date: Thu, 21 Nov 2019 13:36:31 -0800
Subject: [PATCH 2/7] Fixed tests

---
 validator/client/fake_validator_test.go |  8 ++++----
 validator/client/runner_test.go         |  6 +++---
 validator/client/validator_test.go      | 13 ++++++++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/validator/client/fake_validator_test.go b/validator/client/fake_validator_test.go
index 40f13e102e99..c15f92f5ba30 100644
--- a/validator/client/fake_validator_test.go
+++ b/validator/client/fake_validator_test.go
@@ -22,7 +22,7 @@ type fakeValidator struct {
 	UpdateAssignmentsRet             error
 	RoleAtCalled                     bool
 	RoleAtArg1                       uint64
-	RoleAtRet                        pb.ValidatorRole
+	RolesAtRet                       []pb.ValidatorRole
 	AttestToBlockHeadCalled          bool
 	AttestToBlockHeadArg1            uint64
 	ProposeBlockCalled               bool
@@ -77,11 +77,11 @@ func (fv *fakeValidator) LogValidatorGainsAndLosses(_ context.Context, slot uint
 	return nil
 }
 
-func (fv *fakeValidator) RolesAt(slot uint64) map[[48]byte]pb.ValidatorRole {
+func (fv *fakeValidator) RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole {
 	fv.RoleAtCalled = true
 	fv.RoleAtArg1 = slot
-	vr := make(map[[48]byte]pb.ValidatorRole)
-	vr[[48]byte{1}] = fv.RoleAtRet
+	vr := make(map[[48]byte][]pb.ValidatorRole)
+	vr[[48]byte{1}] = fv.RolesAtRet
 	return vr
 }
 
diff --git a/validator/client/runner_test.go b/validator/client/runner_test.go
index 80b600a8f30a..392d03658767 100644
--- a/validator/client/runner_test.go
+++ b/validator/client/runner_test.go
@@ -114,7 +114,7 @@ func TestAttests_NextSlot(t *testing.T) {
 	slot := uint64(55)
 	ticker := make(chan uint64)
 	v.NextSlotRet = ticker
-	v.RoleAtRet = pb.ValidatorRole_ATTESTER
+	v.RolesAtRet = []pb.ValidatorRole{pb.ValidatorRole_ATTESTER}
 	go func() {
 		ticker <- slot
 
@@ -138,7 +138,7 @@ func TestProposes_NextSlot(t *testing.T) {
 	slot := uint64(55)
 	ticker := make(chan uint64)
 	v.NextSlotRet = ticker
-	v.RoleAtRet = pb.ValidatorRole_PROPOSER
+	v.RolesAtRet = []pb.ValidatorRole{pb.ValidatorRole_PROPOSER}
 	go func() {
 		ticker <- slot
 
@@ -162,7 +162,7 @@ func TestBothProposesAndAttests_NextSlot(t *testing.T) {
 	slot := uint64(55)
 	ticker := make(chan uint64)
 	v.NextSlotRet = ticker
-	v.RoleAtRet = pb.ValidatorRole_BOTH
+	v.RolesAtRet = []pb.ValidatorRole{pb.ValidatorRole_ATTESTER, pb.ValidatorRole_PROPOSER}
 	go func() {
 		ticker <- slot
 
diff --git a/validator/client/validator_test.go b/validator/client/validator_test.go
index bd13cb18c626..e13adb94945e 100644
--- a/validator/client/validator_test.go
+++ b/validator/client/validator_test.go
@@ -579,16 +579,19 @@ func TestRolesAt_OK(t *testing.T) {
 		},
 	}
 	roleMap := v.RolesAt(1)
-	if roleMap[[48]byte{0x01}] != pb.ValidatorRole_ATTESTER {
+	if roleMap[[48]byte{0x01}][0] != pb.ValidatorRole_ATTESTER {
 		t.Errorf("Unexpected validator role. want: ValidatorRole_PROPOSER")
 	}
-	if roleMap[[48]byte{0x02}] != pb.ValidatorRole_PROPOSER {
+	if roleMap[[48]byte{0x02}][0] != pb.ValidatorRole_PROPOSER {
 		t.Errorf("Unexpected validator role. want: ValidatorRole_ATTESTER")
 	}
-	if roleMap[[48]byte{0x03}] != pb.ValidatorRole_UNKNOWN {
+	if roleMap[[48]byte{0x03}][0] != pb.ValidatorRole_UNKNOWN {
 		t.Errorf("Unexpected validator role. want: UNKNOWN")
 	}
-	if roleMap[[48]byte{0x04}] != pb.ValidatorRole_BOTH {
-		t.Errorf("Unexpected validator role. want: BOTH")
+	if roleMap[[48]byte{0x04}][0] != pb.ValidatorRole_PROPOSER {
+		t.Errorf("Unexpected validator role. want: ValidatorRole_PROPOSER")
+	}
+	if roleMap[[48]byte{0x04}][1] != pb.ValidatorRole_ATTESTER {
+		t.Errorf("Unexpected validator role. want: ValidatorRole_ATTESTER")
 	}
 }

From 7e89c7c7817e972d271720a0c25e57f8d8bbef5c Mon Sep 17 00:00:00 2001
From: Terence Tsao <terence@prysmaticlabs.com>
Date: Thu, 21 Nov 2019 13:36:40 -0800
Subject: [PATCH 3/7] Build

---
 proto/beacon/db/attestation_container.pb.go   |   5 +-
 .../db/finalized_block_root_container.pb.go   |   3 +-
 proto/beacon/p2p/v1/messages.pb.go            |   5 +-
 proto/beacon/p2p/v1/types.pb.go               |   5 +-
 proto/beacon/rpc/v1/services.pb.go            | 208 +++++++++---------
 proto/beacon/rpc/v1/services.proto            |   1 -
 proto/beacon/rpc/v1_gateway/services.pb.go    | 204 +++++++++--------
 proto/eth/v1alpha1/archive.pb.go              |   5 +-
 proto/eth/v1alpha1/attestation.pb.go          |   5 +-
 proto/eth/v1alpha1/beacon_block.pb.go         |   5 +-
 proto/eth/v1alpha1/beacon_chain.pb.go         |   5 +-
 proto/eth/v1alpha1/node.pb.go                 |   5 +-
 proto/eth/v1alpha1/slasher.pb.go              |   7 +-
 proto/eth/v1alpha1/validator.pb.go            |   5 +-
 proto/sharding/p2p/v1/messages.pb.go          |   3 +-
 15 files changed, 223 insertions(+), 248 deletions(-)

diff --git a/proto/beacon/db/attestation_container.pb.go b/proto/beacon/db/attestation_container.pb.go
index 6185c0ae3f65..5e6b890cfe18 100755
--- a/proto/beacon/db/attestation_container.pb.go
+++ b/proto/beacon/db/attestation_container.pb.go
@@ -5,13 +5,12 @@ package db
 
 import (
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield"
 	v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/beacon/db/finalized_block_root_container.pb.go b/proto/beacon/db/finalized_block_root_container.pb.go
index ec2d6ffa74b4..a7eae5c80789 100755
--- a/proto/beacon/db/finalized_block_root_container.pb.go
+++ b/proto/beacon/db/finalized_block_root_container.pb.go
@@ -5,10 +5,9 @@ package db
 
 import (
 	fmt "fmt"
+	proto "github.com/gogo/protobuf/proto"
 	io "io"
 	math "math"
-
-	proto "github.com/gogo/protobuf/proto"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/beacon/p2p/v1/messages.pb.go b/proto/beacon/p2p/v1/messages.pb.go
index 429de7fc2a97..c49daf0c207c 100755
--- a/proto/beacon/p2p/v1/messages.pb.go
+++ b/proto/beacon/p2p/v1/messages.pb.go
@@ -5,11 +5,10 @@ package ethereum_beacon_p2p_v1
 
 import (
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/beacon/p2p/v1/types.pb.go b/proto/beacon/p2p/v1/types.pb.go
index 74ff5e6ce4a8..3ff88f8599ac 100755
--- a/proto/beacon/p2p/v1/types.pb.go
+++ b/proto/beacon/p2p/v1/types.pb.go
@@ -5,13 +5,12 @@ package ethereum_beacon_p2p_v1
 
 import (
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield"
 	v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/beacon/rpc/v1/services.pb.go b/proto/beacon/rpc/v1/services.pb.go
index 42c223a99c73..c26070a9b46d 100755
--- a/proto/beacon/rpc/v1/services.pb.go
+++ b/proto/beacon/rpc/v1/services.pb.go
@@ -7,14 +7,12 @@ import (
 	context "context"
 	encoding_binary "encoding/binary"
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	proto "github.com/gogo/protobuf/proto"
 	types "github.com/gogo/protobuf/types"
 	v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
-	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -34,21 +32,18 @@ const (
 	ValidatorRole_UNKNOWN  ValidatorRole = 0
 	ValidatorRole_ATTESTER ValidatorRole = 1
 	ValidatorRole_PROPOSER ValidatorRole = 2
-	ValidatorRole_BOTH     ValidatorRole = 3
 )
 
 var ValidatorRole_name = map[int32]string{
 	0: "UNKNOWN",
 	1: "ATTESTER",
 	2: "PROPOSER",
-	3: "BOTH",
 }
 
 var ValidatorRole_value = map[string]int32{
 	"UNKNOWN":  0,
 	"ATTESTER": 1,
 	"PROPOSER": 2,
-	"BOTH":     3,
 }
 
 func (x ValidatorRole) String() string {
@@ -1433,106 +1428,105 @@ func init() {
 func init() { proto.RegisterFile("proto/beacon/rpc/v1/services.proto", fileDescriptor_9eb4e94b85965285) }
 
 var fileDescriptor_9eb4e94b85965285 = []byte{
-	// 1581 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x4f, 0x6f, 0x13, 0x47,
-	0x14, 0x67, 0x1d, 0xc7, 0x09, 0xcf, 0x4e, 0xb2, 0x99, 0x84, 0xc4, 0x98, 0x40, 0xd3, 0x2d, 0x94,
-	0x24, 0x12, 0x76, 0x62, 0x10, 0x6a, 0x41, 0x14, 0xd9, 0xf1, 0x92, 0x58, 0x20, 0x27, 0xac, 0x4d,
-	0x42, 0xc5, 0x61, 0x35, 0xb6, 0x87, 0x78, 0x85, 0xbd, 0xb3, 0xd9, 0x1d, 0x5b, 0xe4, 0x52, 0xa9,
-	0x97, 0x4a, 0xbd, 0xb5, 0x87, 0x9e, 0xab, 0x7e, 0x86, 0x1e, 0xfa, 0x15, 0x38, 0xf6, 0x03, 0xf4,
-	0x50, 0xa1, 0x7e, 0x90, 0x6a, 0x67, 0x66, 0xd7, 0x1b, 0xff, 0x21, 0x0e, 0xb7, 0x9d, 0xf7, 0xde,
-	0xef, 0xbd, 0x37, 0x6f, 0xde, 0x3f, 0x1b, 0x34, 0xc7, 0xa5, 0x8c, 0xe6, 0xea, 0x04, 0x37, 0xa8,
-	0x9d, 0x73, 0x9d, 0x46, 0xae, 0xb7, 0x93, 0xf3, 0x88, 0xdb, 0xb3, 0x1a, 0xc4, 0xcb, 0x72, 0x26,
-	0x5a, 0x21, 0xac, 0x45, 0x5c, 0xd2, 0xed, 0x64, 0x85, 0x58, 0xd6, 0x75, 0x1a, 0xd9, 0xde, 0x4e,
-	0xe6, 0xc6, 0x09, 0xa5, 0x27, 0x6d, 0x92, 0xe3, 0x52, 0xf5, 0xee, 0xdb, 0x1c, 0xe9, 0x38, 0xec,
-	0x4c, 0x80, 0x32, 0x77, 0x84, 0x62, 0xc2, 0x5a, 0xb9, 0xde, 0x0e, 0x6e, 0x3b, 0x2d, 0xbc, 0x23,
-	0xad, 0x98, 0xf5, 0x36, 0x6d, 0xbc, 0x93, 0x62, 0xb7, 0x47, 0x88, 0x61, 0xc6, 0x88, 0xc7, 0x30,
-	0xb3, 0xa8, 0x2d, 0xa5, 0xd6, 0xa4, 0x25, 0xec, 0x58, 0x39, 0x6c, 0xdb, 0x54, 0x30, 0xa5, 0x7f,
-	0xda, 0x1e, 0xa4, 0x8a, 0xbe, 0x4a, 0x83, 0x9c, 0x76, 0x89, 0xc7, 0x10, 0x82, 0xb8, 0xd7, 0xa6,
-	0x2c, 0xad, 0xac, 0x2b, 0x1b, 0x71, 0x83, 0x7f, 0xa3, 0xaf, 0x60, 0xce, 0xc5, 0x76, 0x13, 0x53,
-	0xd3, 0x25, 0x3d, 0x82, 0xdb, 0xe9, 0xd8, 0xba, 0xb2, 0x91, 0x32, 0x52, 0x82, 0x68, 0x70, 0x9a,
-	0xb6, 0x0d, 0x0b, 0x87, 0x2e, 0x75, 0xa8, 0x47, 0x0c, 0xe2, 0x39, 0xd4, 0xf6, 0x08, 0xba, 0x09,
-	0xc0, 0xdd, 0x35, 0x5d, 0x2a, 0x35, 0xa6, 0x8c, 0xab, 0x9c, 0x62, 0x50, 0xca, 0xb4, 0x9f, 0x15,
-	0x40, 0x85, 0xbe, 0xbb, 0x81, 0x07, 0x37, 0x01, 0x9c, 0x6e, 0xbd, 0x6d, 0x35, 0xcc, 0x77, 0xe4,
-	0x2c, 0x40, 0x09, 0xca, 0x73, 0x72, 0x86, 0x56, 0x61, 0xc6, 0xa1, 0x0d, 0xb3, 0x6e, 0x31, 0xe9,
-	0x46, 0xc2, 0xa1, 0x8d, 0xa2, 0xd5, 0xf7, 0x7c, 0x2a, 0xe2, 0xf9, 0x5d, 0x58, 0x68, 0xd0, 0x4e,
-	0xc7, 0x62, 0x8c, 0x10, 0xd3, 0xb2, 0x9b, 0xe4, 0x7d, 0x3a, 0xce, 0xd9, 0xf3, 0x21, 0xb9, 0xec,
-	0x53, 0xb5, 0xdb, 0x30, 0x2f, 0x5c, 0x09, 0x9d, 0x47, 0x10, 0x8f, 0xb8, 0xcd, 0xbf, 0x35, 0x03,
-	0x6e, 0x1c, 0xe1, 0xb6, 0xd5, 0xc4, 0x8c, 0xba, 0x87, 0xc4, 0x7d, 0x4b, 0xdd, 0x0e, 0xb6, 0x1b,
-	0xe4, 0x53, 0xb1, 0xfb, 0x02, 0x92, 0xfd, 0xdb, 0x78, 0xe9, 0xd8, 0xfa, 0xd4, 0x46, 0xca, 0x80,
-	0xf0, 0x3a, 0x9e, 0xf6, 0x5b, 0x0c, 0xd6, 0x46, 0x2b, 0x95, 0x8e, 0x64, 0x60, 0xb6, 0x8e, 0xdb,
-	0x3e, 0xc9, 0x4b, 0x2b, 0xeb, 0x53, 0x1b, 0x71, 0x23, 0x3c, 0xa3, 0x4d, 0x50, 0x19, 0x65, 0xb8,
-	0x6d, 0xf6, 0x02, 0x0d, 0x1e, 0x8f, 0x4a, 0xdc, 0x58, 0xe0, 0xf4, 0x50, 0xb1, 0x87, 0x1e, 0xc2,
-	0xaa, 0x10, 0xc5, 0x0d, 0x66, 0xf5, 0x48, 0x14, 0x21, 0x22, 0x76, 0x8d, 0xb3, 0x0b, 0x9c, 0x1b,
-	0xc1, 0xdd, 0x03, 0xd4, 0xb1, 0x3c, 0xcf, 0xb2, 0x4f, 0xa2, 0x90, 0x38, 0xbf, 0xc7, 0xa2, 0xe4,
-	0x44, 0xc4, 0xf7, 0x60, 0x1d, 0xf7, 0x88, 0x8b, 0x4f, 0xc8, 0x90, 0x21, 0x53, 0xba, 0x9d, 0x9e,
-	0x5e, 0x57, 0x36, 0x62, 0xc6, 0x4d, 0x29, 0x37, 0x60, 0xb1, 0x28, 0x84, 0xb4, 0x27, 0x90, 0x09,
-	0x69, 0x5c, 0xe4, 0x5c, 0x92, 0x0c, 0x84, 0x55, 0x19, 0x0a, 0xeb, 0xef, 0xb1, 0xc8, 0x5b, 0x45,
-	0xf1, 0x32, 0xaa, 0x0f, 0xe1, 0x1a, 0x16, 0x54, 0xd2, 0x34, 0x87, 0x54, 0x15, 0x63, 0x69, 0xc5,
-	0x58, 0x0a, 0x05, 0x0e, 0x43, 0xbd, 0xe8, 0x08, 0x66, 0xfd, 0x7c, 0xed, 0x7a, 0x44, 0x3c, 0x66,
-	0x32, 0xff, 0x28, 0x3b, 0xba, 0xc4, 0xb3, 0x9f, 0x30, 0x9f, 0xad, 0x72, 0x1d, 0x46, 0xa8, 0x2b,
-	0xe3, 0x40, 0x42, 0xd0, 0x2e, 0xca, 0xff, 0x3d, 0x48, 0x08, 0x10, 0x7f, 0xe8, 0x64, 0x3e, 0x77,
-	0xa1, 0x79, 0x69, 0x4b, 0x9a, 0x36, 0x24, 0x5c, 0x7b, 0x04, 0xab, 0xfa, 0x7b, 0x8b, 0x91, 0x66,
-	0xff, 0xf5, 0x26, 0x8e, 0xee, 0x63, 0x48, 0x0f, 0x63, 0x65, 0x64, 0x2f, 0x04, 0xbf, 0x04, 0xb4,
-	0xdb, 0xc2, 0x96, 0x5d, 0x65, 0xd8, 0xed, 0xd7, 0x5b, 0x1a, 0x66, 0x3c, 0x9f, 0x40, 0x9a, 0xfc,
-	0xce, 0xb3, 0x46, 0x70, 0x44, 0x5f, 0x42, 0xea, 0x84, 0xd8, 0xc4, 0xb3, 0x3c, 0x93, 0x59, 0x1d,
-	0x22, 0x13, 0x3c, 0x29, 0x69, 0x35, 0xab, 0x43, 0xb4, 0x87, 0x70, 0x2d, 0xf4, 0x84, 0x17, 0xf4,
-	0x64, 0xcd, 0x44, 0xcb, 0xc2, 0xca, 0x20, 0x4e, 0xba, 0xb3, 0x0c, 0xd3, 0xa2, 0x5f, 0x88, 0x62,
-	0x16, 0x07, 0xed, 0x15, 0x2c, 0x16, 0x3c, 0xcf, 0x3a, 0xb1, 0x3b, 0xc4, 0x66, 0x91, 0x68, 0x11,
-	0x87, 0x36, 0x5a, 0x26, 0x77, 0x58, 0x02, 0x80, 0x93, 0xf8, 0x15, 0x2f, 0xee, 0x01, 0xbf, 0x4c,
-	0x01, 0x8a, 0xea, 0x95, 0x3e, 0x9c, 0xc2, 0x72, 0xbf, 0x78, 0x70, 0xc8, 0xe7, 0x21, 0x4d, 0xe6,
-	0xbf, 0x1b, 0xf7, 0xf0, 0xc3, 0x9a, 0x22, 0xa9, 0xd8, 0xe7, 0x2d, 0xf5, 0x86, 0x89, 0x99, 0x9f,
-	0x62, 0xb0, 0x34, 0x42, 0x18, 0xad, 0xc1, 0xd5, 0xb0, 0x63, 0xca, 0x2e, 0xd4, 0x27, 0x8c, 0x6a,
-	0xb3, 0xb1, 0x51, 0x6d, 0xd6, 0x9f, 0x24, 0x62, 0x40, 0x11, 0xd7, 0x8c, 0x34, 0xeb, 0x54, 0x40,
-	0xac, 0xca, 0x71, 0xe3, 0x88, 0x49, 0x22, 0x85, 0x44, 0xcb, 0x4e, 0x05, 0x44, 0x2e, 0x74, 0xfe,
-	0x61, 0xa7, 0x07, 0xab, 0xe4, 0x69, 0x58, 0x25, 0x89, 0x75, 0x65, 0x63, 0x3e, 0x7f, 0x77, 0xd2,
-	0x2a, 0x09, 0xaa, 0xe3, 0xaf, 0x18, 0xac, 0x8e, 0xa9, 0xa0, 0x88, 0x72, 0xe5, 0xb3, 0x94, 0xa3,
-	0x6f, 0xe1, 0x3a, 0x61, 0xad, 0x1d, 0xb3, 0x49, 0x1c, 0xea, 0x59, 0x4c, 0x0c, 0x75, 0xd3, 0xee,
-	0x76, 0xea, 0xc4, 0x95, 0x91, 0xf3, 0xf7, 0x86, 0x9d, 0x92, 0xe0, 0xf3, 0x01, 0x5d, 0xe1, 0x5c,
-	0xf4, 0x00, 0x56, 0x02, 0x94, 0x65, 0x37, 0xda, 0x5d, 0xcf, 0xa2, 0x76, 0x34, 0x94, 0xcb, 0x92,
-	0x5b, 0x0e, 0x98, 0x3c, 0x5a, 0x9b, 0xa0, 0xe2, 0xb0, 0x09, 0x99, 0x3c, 0x35, 0x65, 0x54, 0x17,
-	0xfa, 0x74, 0xdd, 0x27, 0xa3, 0xa7, 0xb0, 0xc6, 0x15, 0xf8, 0x82, 0x96, 0x6d, 0x46, 0x60, 0xa7,
-	0x5d, 0xd2, 0x15, 0xcd, 0x3b, 0x6e, 0x5c, 0x0f, 0x64, 0xca, 0x76, 0xbf, 0xbb, 0xbd, 0xf4, 0x05,
-	0xb4, 0x27, 0x30, 0x57, 0xa2, 0x1d, 0x6c, 0x85, 0xbd, 0x7a, 0x19, 0xa6, 0x85, 0x45, 0x59, 0x4a,
-	0xfc, 0x80, 0x56, 0x20, 0xd1, 0xe4, 0x62, 0xc1, 0x18, 0x17, 0x27, 0xed, 0x31, 0xcc, 0x07, 0x70,
-	0x19, 0xee, 0x4d, 0x50, 0xfd, 0x3c, 0xc4, 0xac, 0xeb, 0x12, 0x53, 0x62, 0x84, 0xaa, 0x85, 0x90,
-	0x2e, 0x20, 0xda, 0xaf, 0x31, 0x58, 0xe4, 0xd1, 0xaa, 0xb9, 0xa4, 0x3f, 0x41, 0x9f, 0x41, 0x9c,
-	0xb9, 0x32, 0x6f, 0x93, 0xf9, 0xfc, 0xb8, 0xd7, 0x1a, 0x02, 0x66, 0xfd, 0x43, 0x85, 0x36, 0x89,
-	0xc1, 0xf1, 0x99, 0x3f, 0x15, 0x98, 0x0d, 0x48, 0xe8, 0x1b, 0x98, 0xe6, 0xcf, 0xc6, 0x5d, 0x49,
-	0xe6, 0xb5, 0xbe, 0x56, 0xc2, 0x5a, 0xd9, 0x60, 0x1f, 0xcb, 0x16, 0xb9, 0x09, 0xb1, 0x62, 0x09,
-	0xc0, 0xc0, 0x5a, 0x14, 0x1b, 0x58, 0x8b, 0xfc, 0x81, 0xeb, 0x60, 0x97, 0x59, 0x0d, 0xcb, 0xe1,
-	0xc3, 0xa9, 0x47, 0x19, 0x09, 0x66, 0xf4, 0x62, 0x94, 0x73, 0xe4, 0x33, 0xfc, 0xe6, 0x22, 0x57,
-	0x00, 0x2e, 0x27, 0x5e, 0x15, 0xc4, 0xf4, 0xf7, 0x29, 0xda, 0x0b, 0x58, 0xf6, 0x9d, 0xe6, 0x2e,
-	0xf8, 0xc9, 0x10, 0x3c, 0xcb, 0x0d, 0xb8, 0xea, 0xe7, 0x8d, 0xf9, 0xd6, 0xa5, 0x1d, 0x19, 0xcf,
-	0x59, 0x9f, 0xf0, 0xcc, 0xa5, 0x1d, 0x7f, 0xcb, 0xe2, 0x4c, 0x46, 0x65, 0x3e, 0x26, 0xfc, 0x63,
-	0x8d, 0x6e, 0x15, 0x61, 0x2e, 0xcc, 0x6a, 0x83, 0xb6, 0x09, 0x4a, 0xc2, 0xcc, 0xab, 0xca, 0xf3,
-	0xca, 0xc1, 0x71, 0x45, 0xbd, 0x82, 0x52, 0x30, 0x5b, 0xa8, 0xd5, 0xf4, 0x6a, 0x4d, 0x37, 0x54,
-	0xc5, 0x3f, 0x1d, 0x1a, 0x07, 0x87, 0x07, 0x55, 0xdd, 0x50, 0x63, 0x68, 0x16, 0xe2, 0xc5, 0x83,
-	0xda, 0xbe, 0x3a, 0xb5, 0xf5, 0x87, 0x02, 0x0b, 0x03, 0xa5, 0x81, 0x10, 0xcc, 0x4b, 0x35, 0x66,
-	0xb5, 0x56, 0xa8, 0xbd, 0xaa, 0xaa, 0x57, 0xd0, 0x32, 0xa8, 0x25, 0xfd, 0xf0, 0xa0, 0x5a, 0xae,
-	0x99, 0x86, 0xbe, 0xab, 0x97, 0x8f, 0xf4, 0x92, 0xaa, 0xf8, 0x92, 0x87, 0x7a, 0xa5, 0x54, 0xae,
-	0xec, 0x99, 0x85, 0xdd, 0x5a, 0xf9, 0x48, 0x57, 0x63, 0x08, 0x20, 0x21, 0xbf, 0xa7, 0x7c, 0x7e,
-	0xb9, 0x52, 0xae, 0x95, 0x0b, 0x35, 0xbd, 0x64, 0xea, 0xaf, 0xcb, 0x35, 0x35, 0x8e, 0x54, 0x48,
-	0x1d, 0x97, 0x6b, 0xfb, 0x25, 0xa3, 0x70, 0x5c, 0x28, 0xbe, 0xd0, 0xd5, 0x69, 0x1f, 0xe1, 0xf3,
-	0xf4, 0x92, 0x9a, 0xf0, 0x11, 0xe2, 0xdb, 0xac, 0xbe, 0x28, 0x54, 0xf7, 0xf5, 0x92, 0x3a, 0x93,
-	0xff, 0x47, 0x81, 0x85, 0x42, 0xd0, 0x95, 0xc4, 0x4a, 0x8f, 0x5a, 0x80, 0x64, 0xf0, 0x22, 0x6b,
-	0x2b, 0xda, 0x1a, 0xdb, 0x87, 0x87, 0x76, 0xdb, 0xcc, 0xd7, 0x63, 0xb2, 0x24, 0x22, 0x5a, 0xc2,
-	0x0c, 0x23, 0x13, 0x16, 0xab, 0xdd, 0x7a, 0xc7, 0x3a, 0x67, 0x48, 0xbb, 0x18, 0x1c, 0x35, 0x30,
-	0xca, 0x99, 0x20, 0xb3, 0xf3, 0x1f, 0x94, 0x70, 0x5d, 0x0f, 0xaf, 0xf7, 0x1a, 0x52, 0xd2, 0x4f,
-	0x9e, 0x2b, 0xe8, 0xf6, 0x27, 0x0b, 0x25, 0xb8, 0xd2, 0x04, 0x89, 0x8f, 0xde, 0x40, 0x4a, 0x1a,
-	0x13, 0xe7, 0x09, 0x30, 0x99, 0xb1, 0x4d, 0x75, 0xe0, 0x57, 0x46, 0xfe, 0xbf, 0x19, 0x50, 0xfb,
-	0xd9, 0x24, 0xef, 0xf2, 0x06, 0x40, 0xb4, 0x04, 0x1e, 0xce, 0x3b, 0xe3, 0x74, 0x9d, 0x6b, 0x54,
-	0xe3, 0x83, 0x37, 0xd0, 0x90, 0x7e, 0x80, 0xc5, 0x63, 0x6c, 0xb1, 0x67, 0xd1, 0xcd, 0x0e, 0xe5,
-	0x2f, 0xb5, 0x06, 0x0a, 0x83, 0xf7, 0x3f, 0x63, 0x75, 0xdc, 0x56, 0x10, 0x85, 0xf9, 0xf3, 0x5b,
-	0x0b, 0xba, 0x77, 0xa1, 0xa2, 0xe8, 0x56, 0x94, 0xc9, 0x4e, 0x2a, 0x2e, 0x2f, 0xdc, 0x86, 0xa5,
-	0xdd, 0x60, 0x90, 0x47, 0x96, 0x82, 0xcd, 0x49, 0x36, 0x10, 0x61, 0x71, 0x6b, 0xf2, 0x65, 0x05,
-	0x9d, 0x0e, 0x77, 0x87, 0x4b, 0xde, 0xef, 0xb2, 0x3b, 0x31, 0xfa, 0x51, 0x81, 0xe5, 0x51, 0x3f,
-	0xc2, 0xd0, 0xc5, 0x2f, 0x34, 0xfc, 0x3b, 0x30, 0xf3, 0xe0, 0x72, 0x20, 0xe9, 0x43, 0x17, 0xd4,
-	0xc1, 0x9d, 0x1a, 0x8d, 0xbd, 0xc8, 0x98, 0xcd, 0x3d, 0xb3, 0x3d, 0x39, 0x40, 0x9a, 0xfd, 0x3e,
-	0x4c, 0xe6, 0xfe, 0x52, 0x8e, 0x56, 0xb2, 0xe2, 0x4f, 0x83, 0x6c, 0xf0, 0xf7, 0x44, 0x56, 0xef,
-	0x38, 0xec, 0x6c, 0xfc, 0x33, 0x0e, 0x2f, 0xf4, 0xdb, 0x0a, 0x7a, 0x0e, 0x73, 0xbb, 0xd8, 0xa6,
-	0xb6, 0xd5, 0xc0, 0xed, 0x7d, 0x82, 0x9b, 0x63, 0xd5, 0x4e, 0xd0, 0x0f, 0x8a, 0xa9, 0x0f, 0x1f,
-	0x6f, 0x29, 0x7f, 0x7f, 0xbc, 0xa5, 0xfc, 0xfb, 0xf1, 0x96, 0x52, 0x4f, 0x70, 0x0d, 0xf7, 0xff,
-	0x0f, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x0b, 0x30, 0xbe, 0x83, 0x11, 0x00, 0x00,
+	// 1561 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xcd, 0x6e, 0xdb, 0xc6,
+	0x13, 0x0f, 0x65, 0x59, 0x76, 0x46, 0xb2, 0x4d, 0xaf, 0x1d, 0x5b, 0x51, 0x3e, 0xfe, 0xfe, 0xb3,
+	0x49, 0x63, 0x1b, 0x88, 0x64, 0x2b, 0x41, 0x90, 0x26, 0x48, 0x03, 0xd9, 0x62, 0x1c, 0x21, 0x81,
+	0xec, 0x50, 0x8a, 0x9d, 0x22, 0x07, 0x62, 0x25, 0x6d, 0x2c, 0x22, 0x22, 0x97, 0x26, 0x57, 0x42,
+	0x7c, 0x29, 0xd0, 0x4b, 0x81, 0xde, 0xda, 0x43, 0xcf, 0x45, 0x9f, 0xa1, 0x87, 0xbe, 0x42, 0x8e,
+	0x7d, 0x80, 0x1e, 0x8a, 0xa0, 0x0f, 0x52, 0x70, 0x77, 0x49, 0xd1, 0xfa, 0x88, 0xe5, 0xdc, 0xb8,
+	0x33, 0xf3, 0x9b, 0x99, 0x9d, 0x9d, 0x2f, 0x09, 0x34, 0xd7, 0xa3, 0x8c, 0x16, 0x1a, 0x04, 0x37,
+	0xa9, 0x53, 0xf0, 0xdc, 0x66, 0xa1, 0xb7, 0x5d, 0xf0, 0x89, 0xd7, 0xb3, 0x9a, 0xc4, 0xcf, 0x73,
+	0x26, 0x5a, 0x21, 0xac, 0x4d, 0x3c, 0xd2, 0xb5, 0xf3, 0x42, 0x2c, 0xef, 0xb9, 0xcd, 0x7c, 0x6f,
+	0x3b, 0x77, 0xed, 0x98, 0xd2, 0xe3, 0x0e, 0x29, 0x70, 0xa9, 0x46, 0xf7, 0x5d, 0x81, 0xd8, 0x2e,
+	0x3b, 0x15, 0xa0, 0xdc, 0x6d, 0xa1, 0x98, 0xb0, 0x76, 0xa1, 0xb7, 0x8d, 0x3b, 0x6e, 0x1b, 0x6f,
+	0x4b, 0x2b, 0x66, 0xa3, 0x43, 0x9b, 0xef, 0xa5, 0xd8, 0xad, 0x11, 0x62, 0x98, 0x31, 0xe2, 0x33,
+	0xcc, 0x2c, 0xea, 0x08, 0x29, 0x6d, 0x0f, 0x32, 0x3b, 0x01, 0xc8, 0x20, 0x27, 0x5d, 0xe2, 0x33,
+	0x84, 0x20, 0xe9, 0x77, 0x28, 0xcb, 0x2a, 0x6b, 0xca, 0x7a, 0xd2, 0xe0, 0xdf, 0xe8, 0x2b, 0x98,
+	0xf3, 0xb0, 0xd3, 0xc2, 0xd4, 0xf4, 0x48, 0x8f, 0xe0, 0x4e, 0x36, 0xb1, 0xa6, 0xac, 0x67, 0x8c,
+	0x8c, 0x20, 0x1a, 0x9c, 0xa6, 0x6d, 0xc1, 0xc2, 0x81, 0x47, 0x5d, 0xea, 0x13, 0x83, 0xf8, 0x2e,
+	0x75, 0x7c, 0x82, 0x6e, 0x00, 0x70, 0x87, 0x4c, 0x8f, 0x4a, 0x8d, 0x19, 0xe3, 0x32, 0xa7, 0x18,
+	0x94, 0x32, 0xed, 0x27, 0x05, 0x50, 0xa9, 0xef, 0x50, 0xe8, 0xc1, 0x0d, 0x00, 0xb7, 0xdb, 0xe8,
+	0x58, 0x4d, 0xf3, 0x3d, 0x39, 0x0d, 0x51, 0x82, 0xf2, 0x82, 0x9c, 0xa2, 0x55, 0x98, 0x71, 0x69,
+	0xd3, 0x6c, 0x58, 0x4c, 0xba, 0x91, 0x72, 0x69, 0x73, 0xc7, 0xea, 0x7b, 0x3e, 0x15, 0xf3, 0xfc,
+	0x0e, 0x2c, 0x34, 0xa9, 0x6d, 0x5b, 0x8c, 0x11, 0x62, 0x5a, 0x4e, 0x8b, 0x7c, 0xc8, 0x26, 0x39,
+	0x7b, 0x3e, 0x22, 0x57, 0x02, 0xaa, 0x76, 0x0b, 0xe6, 0x85, 0x2b, 0x91, 0xf3, 0x08, 0x92, 0x31,
+	0xb7, 0xf9, 0xb7, 0x66, 0xc0, 0xb5, 0x43, 0xdc, 0xb1, 0x5a, 0x98, 0x51, 0xef, 0x80, 0x78, 0xef,
+	0xa8, 0x67, 0x63, 0xa7, 0x49, 0x3e, 0x17, 0xbb, 0xff, 0x41, 0xba, 0x7f, 0x1b, 0x3f, 0x9b, 0x58,
+	0x9b, 0x5a, 0xcf, 0x18, 0x10, 0x5d, 0xc7, 0xd7, 0x7e, 0x4d, 0xc0, 0xf5, 0xd1, 0x4a, 0xa5, 0x23,
+	0x39, 0x98, 0x6d, 0xe0, 0x4e, 0x40, 0xf2, 0xb3, 0xca, 0xda, 0xd4, 0x7a, 0xd2, 0x88, 0xce, 0x68,
+	0x03, 0x54, 0x46, 0x19, 0xee, 0x98, 0xbd, 0x50, 0x83, 0xcf, 0xa3, 0x92, 0x34, 0x16, 0x38, 0x3d,
+	0x52, 0xec, 0xa3, 0x07, 0xb0, 0x2a, 0x44, 0x71, 0x93, 0x59, 0x3d, 0x12, 0x47, 0x88, 0x88, 0x5d,
+	0xe1, 0xec, 0x12, 0xe7, 0xc6, 0x70, 0x77, 0x01, 0xd9, 0x96, 0xef, 0x5b, 0xce, 0x71, 0x1c, 0x92,
+	0xe4, 0xf7, 0x58, 0x94, 0x9c, 0x98, 0xf8, 0x1e, 0xac, 0xe1, 0x1e, 0xf1, 0xf0, 0x31, 0x19, 0x32,
+	0x64, 0x4a, 0xb7, 0xb3, 0xd3, 0x6b, 0xca, 0x7a, 0xc2, 0xb8, 0x21, 0xe5, 0x06, 0x2c, 0xee, 0x08,
+	0x21, 0xed, 0x09, 0xe4, 0x22, 0x1a, 0x17, 0x39, 0x93, 0x24, 0x03, 0x61, 0x55, 0x86, 0xc2, 0xfa,
+	0x5b, 0x22, 0xf6, 0x56, 0x71, 0xbc, 0x8c, 0xea, 0x03, 0xb8, 0x82, 0x05, 0x95, 0xb4, 0xcc, 0x21,
+	0x55, 0x3b, 0x89, 0xac, 0x62, 0x2c, 0x45, 0x02, 0x07, 0x91, 0x5e, 0x74, 0x08, 0xb3, 0x41, 0xbe,
+	0x76, 0x7d, 0x22, 0x1e, 0x33, 0x5d, 0x7c, 0x94, 0x1f, 0x5d, 0xc4, 0xf9, 0xcf, 0x98, 0xcf, 0xd7,
+	0xb8, 0x0e, 0x23, 0xd2, 0x95, 0x73, 0x21, 0x25, 0x68, 0xe7, 0xe5, 0xff, 0x1e, 0xa4, 0x04, 0x88,
+	0x3f, 0x74, 0xba, 0x58, 0x38, 0xd7, 0xbc, 0xb4, 0x25, 0x4d, 0x1b, 0x12, 0xae, 0x3d, 0x82, 0x55,
+	0xfd, 0x83, 0xc5, 0x48, 0xab, 0xff, 0x7a, 0x13, 0x47, 0xf7, 0x31, 0x64, 0x87, 0xb1, 0x32, 0xb2,
+	0xe7, 0x82, 0x5f, 0x01, 0xda, 0x6d, 0x63, 0xcb, 0xa9, 0x31, 0xec, 0xf5, 0xeb, 0x2d, 0x0b, 0x33,
+	0x7e, 0x40, 0x20, 0x2d, 0x7e, 0xe7, 0x59, 0x23, 0x3c, 0xa2, 0xff, 0x43, 0xe6, 0x98, 0x38, 0xc4,
+	0xb7, 0x7c, 0x93, 0x59, 0x36, 0x91, 0x09, 0x9e, 0x96, 0xb4, 0xba, 0x65, 0x13, 0xed, 0x01, 0x5c,
+	0x89, 0x3c, 0xe1, 0x05, 0x3d, 0x59, 0x33, 0xd1, 0xf2, 0xb0, 0x32, 0x88, 0x93, 0xee, 0x2c, 0xc3,
+	0xb4, 0xe8, 0x17, 0xa2, 0x98, 0xc5, 0x41, 0x7b, 0x0d, 0x8b, 0x25, 0xdf, 0xb7, 0x8e, 0x1d, 0x9b,
+	0x38, 0x2c, 0x16, 0x2d, 0xe2, 0xd2, 0x66, 0xdb, 0xe4, 0x0e, 0x4b, 0x00, 0x70, 0x12, 0xbf, 0xe2,
+	0xf9, 0x3d, 0xe0, 0xe7, 0x29, 0x40, 0x71, 0xbd, 0xd2, 0x87, 0x13, 0x58, 0xee, 0x17, 0x0f, 0x8e,
+	0xf8, 0x3c, 0xa4, 0xe9, 0xe2, 0xb7, 0xe3, 0x1e, 0x7e, 0x58, 0x53, 0x2c, 0x15, 0xfb, 0xbc, 0xa5,
+	0xde, 0x30, 0x31, 0xf7, 0x63, 0x02, 0x96, 0x46, 0x08, 0xa3, 0xeb, 0x70, 0x39, 0xea, 0x98, 0xb2,
+	0x0b, 0xf5, 0x09, 0xa3, 0xda, 0x6c, 0x62, 0x54, 0x9b, 0x0d, 0x26, 0x89, 0x18, 0x41, 0xc4, 0x33,
+	0x63, 0xcd, 0x3a, 0x13, 0x12, 0x6b, 0x72, 0xdc, 0xb8, 0x62, 0x92, 0x48, 0x21, 0xd1, 0xb2, 0x33,
+	0x21, 0x91, 0x0b, 0x9d, 0x7d, 0xd8, 0xe9, 0xc1, 0x2a, 0x79, 0x1a, 0x55, 0x49, 0x6a, 0x4d, 0x59,
+	0x9f, 0x2f, 0xde, 0x99, 0xb4, 0x4a, 0xc2, 0xea, 0xf8, 0x33, 0x01, 0xab, 0x63, 0x2a, 0x28, 0xa6,
+	0x5c, 0xf9, 0x22, 0xe5, 0xe8, 0x1b, 0xb8, 0x4a, 0x58, 0x7b, 0xdb, 0x6c, 0x11, 0x97, 0xfa, 0x16,
+	0x13, 0x63, 0xdb, 0x74, 0xba, 0x76, 0x83, 0x78, 0x32, 0x72, 0xc1, 0x66, 0xb0, 0x5d, 0x16, 0x7c,
+	0x3e, 0xa0, 0xab, 0x9c, 0x8b, 0xee, 0xc3, 0x4a, 0x88, 0xb2, 0x9c, 0x66, 0xa7, 0xeb, 0x5b, 0xd4,
+	0x89, 0x87, 0x72, 0x59, 0x72, 0x2b, 0x21, 0x93, 0x47, 0x6b, 0x03, 0x54, 0x1c, 0x35, 0x21, 0x93,
+	0xa7, 0xa6, 0x8c, 0xea, 0x42, 0x9f, 0xae, 0x07, 0x64, 0xf4, 0x14, 0xae, 0x73, 0x05, 0x81, 0xa0,
+	0xe5, 0x98, 0x31, 0xd8, 0x49, 0x97, 0x74, 0x45, 0xf3, 0x4e, 0x1a, 0x57, 0x43, 0x99, 0x8a, 0xd3,
+	0xef, 0x6e, 0xaf, 0x02, 0x01, 0xed, 0x09, 0xcc, 0x95, 0xa9, 0x8d, 0xad, 0xa8, 0x57, 0x2f, 0xc3,
+	0xb4, 0xb0, 0x28, 0x4b, 0x89, 0x1f, 0xd0, 0x0a, 0xa4, 0x5a, 0x5c, 0x2c, 0x1c, 0xe3, 0xe2, 0xa4,
+	0x3d, 0x86, 0xf9, 0x10, 0x2e, 0xc3, 0xbd, 0x01, 0x6a, 0x90, 0x87, 0x98, 0x75, 0x3d, 0x62, 0x4a,
+	0x8c, 0x50, 0xb5, 0x10, 0xd1, 0x05, 0x44, 0xfb, 0x25, 0x01, 0x8b, 0x3c, 0x5a, 0x75, 0x8f, 0xf4,
+	0x27, 0xe8, 0x33, 0x48, 0x32, 0x4f, 0xe6, 0x6d, 0xba, 0x58, 0x1c, 0xf7, 0x5a, 0x43, 0xc0, 0x7c,
+	0x70, 0xa8, 0xd2, 0x16, 0x31, 0x38, 0x3e, 0xf7, 0x87, 0x02, 0xb3, 0x21, 0x09, 0x3d, 0x84, 0x69,
+	0xfe, 0x6c, 0xdc, 0x95, 0x74, 0x51, 0xeb, 0x6b, 0x25, 0xac, 0x9d, 0x0f, 0x37, 0xae, 0xfc, 0x0e,
+	0x37, 0x21, 0x56, 0x2c, 0x01, 0x18, 0x58, 0x8b, 0x12, 0x03, 0x6b, 0x51, 0x30, 0x70, 0x5d, 0xec,
+	0x31, 0xab, 0x69, 0xb9, 0x7c, 0x38, 0xf5, 0x28, 0x23, 0xe1, 0x8c, 0x5e, 0x8c, 0x73, 0x0e, 0x03,
+	0x46, 0xd0, 0x5c, 0xe4, 0x0a, 0xc0, 0xe5, 0xc4, 0xab, 0x82, 0x98, 0xfe, 0x01, 0x45, 0x7b, 0x09,
+	0xcb, 0x81, 0xd3, 0xdc, 0x85, 0x20, 0x19, 0xc2, 0x67, 0xb9, 0x06, 0x97, 0x83, 0xbc, 0x31, 0xdf,
+	0x79, 0xd4, 0x96, 0xf1, 0x9c, 0x0d, 0x08, 0xcf, 0x3c, 0x6a, 0x07, 0x5b, 0x16, 0x67, 0x32, 0x2a,
+	0xf3, 0x31, 0x15, 0x1c, 0xeb, 0x74, 0xf3, 0x21, 0xcc, 0x45, 0x59, 0x6d, 0xd0, 0x0e, 0x41, 0x69,
+	0x98, 0x79, 0x5d, 0x7d, 0x51, 0xdd, 0x3f, 0xaa, 0xaa, 0x97, 0x50, 0x06, 0x66, 0x4b, 0xf5, 0xba,
+	0x5e, 0xab, 0xeb, 0x86, 0xaa, 0x04, 0xa7, 0x03, 0x63, 0xff, 0x60, 0xbf, 0xa6, 0x1b, 0x6a, 0x62,
+	0xf3, 0x77, 0x05, 0x16, 0x06, 0x0a, 0x02, 0x21, 0x98, 0x97, 0x60, 0xb3, 0x56, 0x2f, 0xd5, 0x5f,
+	0xd7, 0xd4, 0x4b, 0x68, 0x19, 0xd4, 0xb2, 0x7e, 0xb0, 0x5f, 0xab, 0xd4, 0x4d, 0x43, 0xdf, 0xd5,
+	0x2b, 0x87, 0x7a, 0x59, 0x55, 0x02, 0xc9, 0x03, 0xbd, 0x5a, 0xae, 0x54, 0xf7, 0xcc, 0xd2, 0x6e,
+	0xbd, 0x72, 0xa8, 0xab, 0x09, 0x04, 0x90, 0x92, 0xdf, 0x53, 0x01, 0xbf, 0x52, 0xad, 0xd4, 0x2b,
+	0xa5, 0xba, 0x5e, 0x36, 0xf5, 0x37, 0x95, 0xba, 0x9a, 0x44, 0x2a, 0x64, 0x8e, 0x2a, 0xf5, 0xe7,
+	0x65, 0xa3, 0x74, 0x54, 0xda, 0x79, 0xa9, 0xab, 0xd3, 0x01, 0x22, 0xe0, 0xe9, 0x65, 0x35, 0x15,
+	0x20, 0xc4, 0xb7, 0x59, 0x7b, 0x59, 0xaa, 0x3d, 0xd7, 0xcb, 0xea, 0x4c, 0xf1, 0x6f, 0x05, 0x16,
+	0x4a, 0x61, 0x2f, 0x12, 0xab, 0x3a, 0x6a, 0x03, 0x92, 0x21, 0x8b, 0x2d, 0xab, 0x68, 0x73, 0x6c,
+	0xf7, 0x1d, 0xda, 0x68, 0x73, 0x5f, 0x8f, 0xc9, 0x8d, 0x98, 0x68, 0x19, 0x33, 0x8c, 0x4c, 0x58,
+	0xac, 0x75, 0x1b, 0xb6, 0x75, 0xc6, 0x90, 0x76, 0x3e, 0x38, 0x6e, 0x60, 0x94, 0x33, 0x61, 0x3e,
+	0x17, 0x3f, 0x2a, 0xd1, 0x92, 0x1e, 0x5d, 0xef, 0x0d, 0x64, 0xa4, 0x9f, 0x3c, 0x43, 0xd0, 0xad,
+	0xcf, 0x96, 0x47, 0x78, 0xa5, 0x09, 0xd2, 0x1d, 0xbd, 0x85, 0x8c, 0x34, 0x26, 0xce, 0x13, 0x60,
+	0x72, 0x63, 0x5b, 0xe9, 0xc0, 0x6f, 0x8b, 0xe2, 0xbf, 0x33, 0xa0, 0xf6, 0xb3, 0x49, 0xde, 0xe5,
+	0x2d, 0x80, 0x68, 0x04, 0x3c, 0x9c, 0xb7, 0xc7, 0xe9, 0x3a, 0xd3, 0x9e, 0xc6, 0x07, 0x6f, 0xa0,
+	0x0d, 0x7d, 0x0f, 0x8b, 0x47, 0xd8, 0x62, 0xcf, 0xe2, 0xfb, 0x1c, 0x2a, 0x5e, 0x68, 0xf9, 0x13,
+	0x06, 0xef, 0x7d, 0xc1, 0xc2, 0xb8, 0xa5, 0x20, 0x0a, 0xf3, 0x67, 0x77, 0x15, 0x74, 0xf7, 0x5c,
+	0x45, 0xf1, 0x5d, 0x28, 0x97, 0x9f, 0x54, 0x5c, 0x5e, 0xb8, 0x03, 0x4b, 0xbb, 0xe1, 0xf8, 0x8e,
+	0xad, 0x02, 0x1b, 0x93, 0xec, 0x1d, 0xc2, 0xe2, 0xe6, 0xe4, 0x2b, 0x0a, 0x3a, 0x19, 0xee, 0x0e,
+	0x17, 0xbc, 0xdf, 0x45, 0x37, 0x61, 0xf4, 0x83, 0x02, 0xcb, 0xa3, 0x7e, 0x7a, 0xa1, 0xf3, 0x5f,
+	0x68, 0xf8, 0xd7, 0x5f, 0xee, 0xfe, 0xc5, 0x40, 0xd2, 0x87, 0x2e, 0xa8, 0x83, 0x9b, 0x34, 0x1a,
+	0x7b, 0x91, 0x31, 0xfb, 0x7a, 0x6e, 0x6b, 0x72, 0x80, 0x34, 0xfb, 0x5d, 0x94, 0xcc, 0xfd, 0x55,
+	0x1c, 0xad, 0xe4, 0xc5, 0xdf, 0x0e, 0xf9, 0xf0, 0x6f, 0x87, 0xbc, 0x6e, 0xbb, 0xec, 0x74, 0xfc,
+	0x33, 0x0e, 0xaf, 0xf1, 0x5b, 0x0a, 0x7a, 0x01, 0x73, 0xbb, 0xd8, 0xa1, 0x8e, 0xd5, 0xc4, 0x9d,
+	0xe7, 0x04, 0xb7, 0xc6, 0xaa, 0x9d, 0xa0, 0x1f, 0xec, 0x64, 0x3e, 0x7e, 0xba, 0xa9, 0xfc, 0xf5,
+	0xe9, 0xa6, 0xf2, 0xcf, 0xa7, 0x9b, 0x4a, 0x23, 0xc5, 0x35, 0xdc, 0xfb, 0x2f, 0x00, 0x00, 0xff,
+	0xff, 0xbb, 0xb1, 0xbf, 0x42, 0x5b, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/beacon/rpc/v1/services.proto b/proto/beacon/rpc/v1/services.proto
index 9afa2f9a6c73..0c2b4f93c437 100644
--- a/proto/beacon/rpc/v1/services.proto
+++ b/proto/beacon/rpc/v1/services.proto
@@ -92,7 +92,6 @@ message ChainStartResponse {
      UNKNOWN = 0;
      ATTESTER = 1;
      PROPOSER = 2;
-     BOTH = 3;
 }
 
 message ValidatorIndexRequest {
diff --git a/proto/beacon/rpc/v1_gateway/services.pb.go b/proto/beacon/rpc/v1_gateway/services.pb.go
index 71e12f632de1..574e68b0dbda 100755
--- a/proto/beacon/rpc/v1_gateway/services.pb.go
+++ b/proto/beacon/rpc/v1_gateway/services.pb.go
@@ -6,15 +6,13 @@ package ethereum_beacon_rpc_v1
 import (
 	context "context"
 	fmt "fmt"
-	math "math"
-
 	proto "github.com/golang/protobuf/proto"
 	empty "github.com/golang/protobuf/ptypes/empty"
 	v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
-	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -34,21 +32,18 @@ const (
 	ValidatorRole_UNKNOWN  ValidatorRole = 0
 	ValidatorRole_ATTESTER ValidatorRole = 1
 	ValidatorRole_PROPOSER ValidatorRole = 2
-	ValidatorRole_BOTH     ValidatorRole = 3
 )
 
 var ValidatorRole_name = map[int32]string{
 	0: "UNKNOWN",
 	1: "ATTESTER",
 	2: "PROPOSER",
-	3: "BOTH",
 }
 
 var ValidatorRole_value = map[string]int32{
 	"UNKNOWN":  0,
 	"ATTESTER": 1,
 	"PROPOSER": 2,
-	"BOTH":     3,
 }
 
 func (x ValidatorRole) String() string {
@@ -1249,105 +1244,104 @@ func init() {
 func init() { proto.RegisterFile("proto/beacon/rpc/v1/services.proto", fileDescriptor_9eb4e94b85965285) }
 
 var fileDescriptor_9eb4e94b85965285 = []byte{
-	// 1563 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xcd, 0x6e, 0xdb, 0xc6,
-	0x13, 0x0f, 0x65, 0x59, 0x76, 0x46, 0xb2, 0x4d, 0xaf, 0x1d, 0x5b, 0x51, 0x1c, 0xfc, 0xfd, 0x67,
-	0x93, 0xc6, 0x36, 0x10, 0xc9, 0x56, 0x82, 0xa0, 0x4d, 0x90, 0x06, 0x92, 0xc5, 0xd8, 0x42, 0x02,
-	0xd9, 0xa1, 0x14, 0x3b, 0x45, 0x0e, 0xc4, 0x4a, 0xda, 0x58, 0x44, 0x44, 0x2e, 0x4d, 0xae, 0x84,
-	0xf8, 0x52, 0xa0, 0x97, 0x02, 0xbd, 0xb5, 0x87, 0x9e, 0x8b, 0x3e, 0x43, 0x0f, 0x7d, 0x85, 0x3e,
-	0x44, 0x8f, 0x7d, 0x90, 0x82, 0xbb, 0x4b, 0x8a, 0xd6, 0x47, 0x2c, 0xe7, 0xc6, 0x9d, 0x99, 0xdf,
-	0xcc, 0xec, 0xec, 0x7c, 0x49, 0xa0, 0xb9, 0x1e, 0x65, 0xb4, 0xd0, 0x24, 0xb8, 0x45, 0x9d, 0x82,
-	0xe7, 0xb6, 0x0a, 0xfd, 0xbd, 0x82, 0x4f, 0xbc, 0xbe, 0xd5, 0x22, 0x7e, 0x9e, 0x33, 0xd1, 0x1a,
-	0x61, 0x1d, 0xe2, 0x91, 0x9e, 0x9d, 0x17, 0x62, 0x79, 0xcf, 0x6d, 0xe5, 0xfb, 0x7b, 0xb9, 0x3b,
-	0x67, 0x94, 0x9e, 0x75, 0x49, 0x81, 0x4b, 0x35, 0x7b, 0x1f, 0x0a, 0xc4, 0x76, 0xd9, 0x85, 0x00,
-	0xe5, 0xee, 0x0b, 0xc5, 0x84, 0x75, 0x0a, 0xfd, 0x3d, 0xdc, 0x75, 0x3b, 0x78, 0x4f, 0x5a, 0x31,
-	0x9b, 0x5d, 0xda, 0xfa, 0x28, 0xc5, 0xee, 0x8d, 0x11, 0xc3, 0x8c, 0x11, 0x9f, 0x61, 0x66, 0x51,
-	0x47, 0x4a, 0x6d, 0x48, 0x4b, 0xd8, 0xb5, 0x0a, 0xd8, 0x71, 0xa8, 0x60, 0x4a, 0xff, 0xb4, 0x03,
-	0xc8, 0x94, 0x03, 0x95, 0x06, 0x39, 0xef, 0x11, 0x9f, 0x21, 0x04, 0x49, 0xbf, 0x4b, 0x59, 0x56,
-	0xd9, 0x54, 0xb6, 0x92, 0x06, 0xff, 0x46, 0x5f, 0xc1, 0x82, 0x87, 0x9d, 0x36, 0xa6, 0xa6, 0x47,
-	0xfa, 0x04, 0x77, 0xb3, 0x89, 0x4d, 0x65, 0x2b, 0x63, 0x64, 0x04, 0xd1, 0xe0, 0x34, 0x6d, 0x17,
-	0x96, 0x8e, 0x3d, 0xea, 0x52, 0x9f, 0x18, 0xc4, 0x77, 0xa9, 0xe3, 0x13, 0x74, 0x17, 0x80, 0xbb,
-	0x6b, 0x7a, 0x54, 0x6a, 0xcc, 0x18, 0x37, 0x39, 0xc5, 0xa0, 0x94, 0x69, 0x3f, 0x2b, 0x80, 0x4a,
-	0x03, 0x77, 0x43, 0x0f, 0xee, 0x02, 0xb8, 0xbd, 0x66, 0xd7, 0x6a, 0x99, 0x1f, 0xc9, 0x45, 0x88,
-	0x12, 0x94, 0x57, 0xe4, 0x02, 0xad, 0xc3, 0x9c, 0x4b, 0x5b, 0x66, 0xd3, 0x62, 0xd2, 0x8d, 0x94,
-	0x4b, 0x5b, 0x65, 0x6b, 0xe0, 0xf9, 0x4c, 0xcc, 0xf3, 0x07, 0xb0, 0xd4, 0xa2, 0xb6, 0x6d, 0x31,
-	0x46, 0x88, 0x69, 0x39, 0x6d, 0xf2, 0x29, 0x9b, 0xe4, 0xec, 0xc5, 0x88, 0x5c, 0x0d, 0xa8, 0xda,
-	0x3d, 0x58, 0x14, 0xae, 0x44, 0xce, 0x23, 0x48, 0xc6, 0xdc, 0xe6, 0xdf, 0x9a, 0x01, 0x77, 0x4e,
-	0x70, 0xd7, 0x6a, 0x63, 0x46, 0xbd, 0x63, 0xe2, 0x7d, 0xa0, 0x9e, 0x8d, 0x9d, 0x16, 0xf9, 0x5c,
-	0xec, 0xfe, 0x07, 0xe9, 0xc1, 0x6d, 0xfc, 0x6c, 0x62, 0x73, 0x66, 0x2b, 0x63, 0x40, 0x74, 0x1d,
-	0x5f, 0xfb, 0x2d, 0x01, 0x1b, 0xe3, 0x95, 0x4a, 0x47, 0x72, 0x30, 0xdf, 0xc4, 0xdd, 0x80, 0xe4,
-	0x67, 0x95, 0xcd, 0x99, 0xad, 0xa4, 0x11, 0x9d, 0xd1, 0x36, 0xa8, 0x8c, 0x32, 0xdc, 0x35, 0xfb,
-	0xa1, 0x06, 0x9f, 0x47, 0x25, 0x69, 0x2c, 0x71, 0x7a, 0xa4, 0xd8, 0x47, 0x4f, 0x60, 0x5d, 0x88,
-	0xe2, 0x16, 0xb3, 0xfa, 0x24, 0x8e, 0x10, 0x11, 0xbb, 0xc5, 0xd9, 0x25, 0xce, 0x8d, 0xe1, 0x1e,
-	0x02, 0xb2, 0x2d, 0xdf, 0xb7, 0x9c, 0xb3, 0x38, 0x24, 0xc9, 0xef, 0xb1, 0x2c, 0x39, 0x31, 0xf1,
-	0x03, 0xd8, 0xc4, 0x7d, 0xe2, 0xe1, 0x33, 0x32, 0x62, 0xc8, 0x94, 0x6e, 0x67, 0x67, 0x37, 0x95,
-	0xad, 0x84, 0x71, 0x57, 0xca, 0x0d, 0x59, 0x2c, 0x0b, 0x21, 0xed, 0x39, 0xe4, 0x22, 0x1a, 0x17,
-	0xb9, 0x94, 0x24, 0x43, 0x61, 0x55, 0x46, 0xc2, 0xfa, 0x7b, 0x22, 0xf6, 0x56, 0x71, 0xbc, 0x8c,
-	0xea, 0x13, 0xb8, 0x85, 0x05, 0x95, 0xb4, 0xcd, 0x11, 0x55, 0xe5, 0x44, 0x56, 0x31, 0x56, 0x22,
-	0x81, 0xe3, 0x48, 0x2f, 0x3a, 0x81, 0xf9, 0x20, 0x5f, 0x7b, 0x3e, 0x11, 0x8f, 0x99, 0x2e, 0x3e,
-	0xcd, 0x8f, 0x2f, 0xf1, 0xfc, 0x67, 0xcc, 0xe7, 0xeb, 0x5c, 0x87, 0x11, 0xe9, 0xca, 0xb9, 0x90,
-	0x12, 0xb4, 0xab, 0xf2, 0xff, 0x00, 0x52, 0x02, 0xc4, 0x1f, 0x3a, 0x5d, 0x2c, 0x5c, 0x69, 0x5e,
-	0xda, 0x92, 0xa6, 0x0d, 0x09, 0xd7, 0x9e, 0xc2, 0xba, 0xfe, 0xc9, 0x62, 0xa4, 0x3d, 0x78, 0xbd,
-	0xa9, 0xa3, 0xfb, 0x0c, 0xb2, 0xa3, 0x58, 0x19, 0xd9, 0x2b, 0xc1, 0x6f, 0x00, 0xed, 0x77, 0xb0,
-	0xe5, 0xd4, 0x19, 0xf6, 0x06, 0xf5, 0x96, 0x85, 0x39, 0x3f, 0x20, 0x90, 0x36, 0xbf, 0xf3, 0xbc,
-	0x11, 0x1e, 0xd1, 0xff, 0x21, 0x73, 0x46, 0x1c, 0xe2, 0x5b, 0xbe, 0xc9, 0x2c, 0x9b, 0xc8, 0x04,
-	0x4f, 0x4b, 0x5a, 0xc3, 0xb2, 0x89, 0xf6, 0x04, 0x6e, 0x45, 0x9e, 0xf0, 0x82, 0x9e, 0xae, 0x99,
-	0x68, 0x79, 0x58, 0x1b, 0xc6, 0x49, 0x77, 0x56, 0x61, 0x56, 0xf4, 0x0b, 0x51, 0xcc, 0xe2, 0xa0,
-	0xbd, 0x85, 0xe5, 0x92, 0xef, 0x5b, 0x67, 0x8e, 0x4d, 0x1c, 0x16, 0x8b, 0x16, 0x71, 0x69, 0xab,
-	0x63, 0x72, 0x87, 0x25, 0x00, 0x38, 0x89, 0x5f, 0xf1, 0xea, 0x1e, 0xf0, 0xcb, 0x0c, 0xa0, 0xb8,
-	0x5e, 0xe9, 0xc3, 0x39, 0xac, 0x0e, 0x8a, 0x07, 0x47, 0x7c, 0x1e, 0xd2, 0x74, 0xf1, 0xbb, 0x49,
-	0x0f, 0x3f, 0xaa, 0x29, 0x96, 0x8a, 0x03, 0xde, 0x4a, 0x7f, 0x94, 0x98, 0xfb, 0x29, 0x01, 0x2b,
-	0x63, 0x84, 0xd1, 0x06, 0xdc, 0x8c, 0x3a, 0xa6, 0xec, 0x42, 0x03, 0xc2, 0xb8, 0x36, 0x9b, 0x18,
-	0xd7, 0x66, 0x83, 0x49, 0x22, 0x06, 0x14, 0xf1, 0xcc, 0x58, 0xb3, 0xce, 0x84, 0xc4, 0xba, 0x1c,
-	0x37, 0xae, 0x98, 0x24, 0x52, 0x48, 0xb4, 0xec, 0x4c, 0x48, 0xe4, 0x42, 0x97, 0x1f, 0x76, 0x76,
-	0xb8, 0x4a, 0x5e, 0x44, 0x55, 0x92, 0xda, 0x54, 0xb6, 0x16, 0x8b, 0x0f, 0xa6, 0xad, 0x92, 0xb0,
-	0x3a, 0xfe, 0x4a, 0xc0, 0xfa, 0x84, 0x0a, 0x8a, 0x29, 0x57, 0xbe, 0x48, 0x39, 0xfa, 0x16, 0x6e,
-	0x13, 0xd6, 0xd9, 0x33, 0xdb, 0xc4, 0xa5, 0xbe, 0xc5, 0xc4, 0x50, 0x37, 0x9d, 0x9e, 0xdd, 0x24,
-	0x9e, 0x8c, 0x5c, 0xb0, 0x37, 0xec, 0x55, 0x04, 0x9f, 0x0f, 0xe8, 0x1a, 0xe7, 0xa2, 0xc7, 0xb0,
-	0x16, 0xa2, 0x2c, 0xa7, 0xd5, 0xed, 0xf9, 0x16, 0x75, 0xe2, 0xa1, 0x5c, 0x95, 0xdc, 0x6a, 0xc8,
-	0xe4, 0xd1, 0xda, 0x06, 0x15, 0x47, 0x4d, 0xc8, 0xe4, 0xa9, 0x29, 0xa3, 0xba, 0x34, 0xa0, 0xeb,
-	0x01, 0x19, 0xbd, 0x80, 0x0d, 0xae, 0x20, 0x10, 0xb4, 0x1c, 0x33, 0x06, 0x3b, 0xef, 0x91, 0x9e,
-	0x68, 0xde, 0x49, 0xe3, 0x76, 0x28, 0x53, 0x75, 0x06, 0xdd, 0xed, 0x4d, 0x20, 0xa0, 0x3d, 0x87,
-	0x85, 0x0a, 0xb5, 0xb1, 0x15, 0xf5, 0xea, 0x55, 0x98, 0x15, 0x16, 0x65, 0x29, 0xf1, 0x03, 0x5a,
-	0x83, 0x54, 0x9b, 0x8b, 0x85, 0x63, 0x5c, 0x9c, 0xb4, 0x67, 0xb0, 0x18, 0xc2, 0x65, 0xb8, 0xb7,
-	0x41, 0x0d, 0xf2, 0x10, 0xb3, 0x9e, 0x47, 0x4c, 0x89, 0x11, 0xaa, 0x96, 0x22, 0xba, 0x80, 0x68,
-	0xbf, 0x26, 0x60, 0x99, 0x47, 0xab, 0xe1, 0x91, 0xc1, 0x04, 0x7d, 0x09, 0x49, 0xe6, 0xc9, 0xbc,
-	0x4d, 0x17, 0x8b, 0x93, 0x5e, 0x6b, 0x04, 0x98, 0x0f, 0x0e, 0x35, 0xda, 0x26, 0x06, 0xc7, 0xe7,
-	0xfe, 0x54, 0x60, 0x3e, 0x24, 0xa1, 0x6f, 0x60, 0x96, 0x3f, 0x1b, 0x77, 0x25, 0x5d, 0xd4, 0x06,
-	0x5a, 0x09, 0xeb, 0xe4, 0xc3, 0x7d, 0x2c, 0x5f, 0xe6, 0x26, 0xc4, 0x8a, 0x25, 0x00, 0x43, 0x6b,
-	0x51, 0x62, 0x68, 0x2d, 0x0a, 0x06, 0xae, 0x8b, 0x3d, 0x66, 0xb5, 0x2c, 0x97, 0x0f, 0xa7, 0x3e,
-	0x65, 0x24, 0x9c, 0xd1, 0xcb, 0x71, 0xce, 0x49, 0xc0, 0x08, 0x9a, 0x8b, 0x5c, 0x01, 0xb8, 0x9c,
-	0x78, 0x55, 0x10, 0xd3, 0x3f, 0xa0, 0x68, 0xaf, 0x61, 0x35, 0x70, 0x9a, 0xbb, 0x10, 0x24, 0x43,
-	0xf8, 0x2c, 0x77, 0xe0, 0x66, 0x90, 0x37, 0xe6, 0x07, 0x8f, 0xda, 0x32, 0x9e, 0xf3, 0x01, 0xe1,
-	0xa5, 0x47, 0xed, 0x60, 0xcb, 0xe2, 0x4c, 0x46, 0x65, 0x3e, 0xa6, 0x82, 0x63, 0x83, 0xee, 0x94,
-	0x61, 0x21, 0xca, 0x6a, 0x83, 0x76, 0x09, 0x4a, 0xc3, 0xdc, 0xdb, 0xda, 0xab, 0xda, 0xd1, 0x69,
-	0x4d, 0xbd, 0x81, 0x32, 0x30, 0x5f, 0x6a, 0x34, 0xf4, 0x7a, 0x43, 0x37, 0x54, 0x25, 0x38, 0x1d,
-	0x1b, 0x47, 0xc7, 0x47, 0x75, 0xdd, 0x50, 0x13, 0x68, 0x1e, 0x92, 0xe5, 0xa3, 0xc6, 0xa1, 0x3a,
-	0xb3, 0xf3, 0x87, 0x02, 0x4b, 0x43, 0xa5, 0x81, 0x10, 0x2c, 0x4a, 0x35, 0x66, 0xbd, 0x51, 0x6a,
-	0xbc, 0xad, 0xab, 0x37, 0xd0, 0x2a, 0xa8, 0x15, 0xfd, 0xf8, 0xa8, 0x5e, 0x6d, 0x98, 0x86, 0xbe,
-	0xaf, 0x57, 0x4f, 0xf4, 0x8a, 0xaa, 0x04, 0x92, 0xc7, 0x7a, 0xad, 0x52, 0xad, 0x1d, 0x98, 0xa5,
-	0xfd, 0x46, 0xf5, 0x44, 0x57, 0x13, 0x08, 0x20, 0x25, 0xbf, 0x67, 0x02, 0x7e, 0xb5, 0x56, 0x6d,
-	0x54, 0x4b, 0x0d, 0xbd, 0x62, 0xea, 0xef, 0xaa, 0x0d, 0x35, 0x89, 0x54, 0xc8, 0x9c, 0x56, 0x1b,
-	0x87, 0x15, 0xa3, 0x74, 0x5a, 0x2a, 0xbf, 0xd6, 0xd5, 0xd9, 0x00, 0x11, 0xf0, 0xf4, 0x8a, 0x9a,
-	0x0a, 0x10, 0xe2, 0xdb, 0xac, 0xbf, 0x2e, 0xd5, 0x0f, 0xf5, 0x8a, 0x3a, 0x57, 0xfc, 0x47, 0x81,
-	0xa5, 0x52, 0xd8, 0x95, 0xc4, 0x4a, 0x8f, 0x3a, 0x80, 0x64, 0xf0, 0x62, 0x6b, 0x2b, 0xda, 0x99,
-	0xd8, 0x87, 0x47, 0x76, 0xdb, 0xdc, 0xd7, 0x13, 0xb2, 0x24, 0x26, 0x5a, 0xc1, 0x0c, 0x23, 0x13,
-	0x96, 0xeb, 0xbd, 0xa6, 0x6d, 0x5d, 0x32, 0xa4, 0x5d, 0x0d, 0x8e, 0x1b, 0x18, 0xe7, 0x4c, 0x98,
-	0xd9, 0xc5, 0xbf, 0x95, 0x68, 0x5d, 0x8f, 0xae, 0xf7, 0x0e, 0x32, 0xd2, 0x4f, 0x9e, 0x2b, 0xe8,
-	0xde, 0x67, 0x0b, 0x25, 0xbc, 0xd2, 0x14, 0x89, 0x8f, 0xde, 0x43, 0x46, 0x1a, 0x13, 0xe7, 0x29,
-	0x30, 0xb9, 0x89, 0x4d, 0x75, 0xe8, 0x57, 0x46, 0xf1, 0xdf, 0x39, 0x50, 0x07, 0xd9, 0x24, 0xef,
-	0xf2, 0x1e, 0x40, 0xb4, 0x04, 0x1e, 0xce, 0xfb, 0x93, 0x74, 0x5d, 0x6a, 0x54, 0x93, 0x83, 0x37,
-	0xd4, 0x90, 0x7e, 0x80, 0xe5, 0x53, 0x6c, 0xb1, 0x97, 0xf1, 0xcd, 0x0e, 0x15, 0xaf, 0xb5, 0x06,
-	0x0a, 0x83, 0x8f, 0xbe, 0x60, 0x75, 0xdc, 0x55, 0x10, 0x85, 0xc5, 0xcb, 0x5b, 0x0b, 0x7a, 0x78,
-	0xa5, 0xa2, 0xf8, 0x56, 0x94, 0xcb, 0x4f, 0x2b, 0x2e, 0x2f, 0xdc, 0x85, 0x95, 0xfd, 0x70, 0x90,
-	0xc7, 0x96, 0x82, 0xed, 0x69, 0x36, 0x10, 0x61, 0x71, 0x67, 0xfa, 0x65, 0x05, 0x9d, 0x8f, 0x76,
-	0x87, 0x6b, 0xde, 0xef, 0xba, 0x3b, 0x31, 0xfa, 0x51, 0x81, 0xd5, 0x71, 0x3f, 0xc2, 0xd0, 0xd5,
-	0x2f, 0x34, 0xfa, 0x3b, 0x30, 0xf7, 0xf8, 0x7a, 0x20, 0xe9, 0x43, 0x0f, 0xd4, 0xe1, 0x9d, 0x1a,
-	0x4d, 0xbc, 0xc8, 0x84, 0xcd, 0x3d, 0xb7, 0x3b, 0x3d, 0x40, 0x9a, 0xfd, 0x3e, 0x4a, 0xe6, 0xc1,
-	0x52, 0x8e, 0xd6, 0xf2, 0xe2, 0x4f, 0x83, 0x7c, 0xf8, 0xf7, 0x44, 0x5e, 0xb7, 0x5d, 0x76, 0x31,
-	0xf9, 0x19, 0x47, 0x17, 0xfa, 0x5d, 0x05, 0xbd, 0x82, 0x85, 0x7d, 0xec, 0x50, 0xc7, 0x6a, 0xe1,
-	0xee, 0x21, 0xc1, 0xed, 0x89, 0x6a, 0xa7, 0xe8, 0x07, 0xcd, 0x14, 0xc7, 0x3c, 0xfa, 0x2f, 0x00,
-	0x00, 0xff, 0xff, 0x9f, 0x74, 0xae, 0xcd, 0x75, 0x11, 0x00, 0x00,
+	// 1543 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xcf, 0x6e, 0xdb, 0x46,
+	0x13, 0x0f, 0x65, 0x59, 0x76, 0x46, 0xb2, 0x4d, 0xaf, 0x1d, 0x5b, 0x51, 0x12, 0x7c, 0xfe, 0xf8,
+	0x25, 0x5f, 0x6c, 0x03, 0x91, 0x6c, 0x25, 0x08, 0xd2, 0x04, 0x69, 0x20, 0x5b, 0x8c, 0x23, 0x24,
+	0x90, 0x1d, 0x4a, 0xb1, 0x53, 0xe4, 0x40, 0xac, 0xa8, 0x8d, 0x45, 0x44, 0xe4, 0xd2, 0xe4, 0x4a,
+	0x88, 0x2f, 0x05, 0x7a, 0x29, 0xd0, 0x5b, 0x7b, 0xe8, 0xb9, 0xe8, 0x33, 0xf4, 0xd0, 0x57, 0xe8,
+	0x43, 0xf4, 0xd8, 0x07, 0x29, 0xb8, 0xbb, 0xa4, 0x68, 0xfd, 0x89, 0xe5, 0xdc, 0xb8, 0x33, 0xf3,
+	0x9b, 0x99, 0x9d, 0x9d, 0x7f, 0x12, 0x68, 0x9e, 0x4f, 0x19, 0x2d, 0xb5, 0x08, 0xb6, 0xa8, 0x5b,
+	0xf2, 0x3d, 0xab, 0xd4, 0xdf, 0x2d, 0x05, 0xc4, 0xef, 0xdb, 0x16, 0x09, 0x8a, 0x9c, 0x89, 0xd6,
+	0x08, 0xeb, 0x10, 0x9f, 0xf4, 0x9c, 0xa2, 0x10, 0x2b, 0xfa, 0x9e, 0x55, 0xec, 0xef, 0x16, 0x6e,
+	0x9d, 0x52, 0x7a, 0xda, 0x25, 0x25, 0x2e, 0xd5, 0xea, 0x7d, 0x2c, 0x11, 0xc7, 0x63, 0xe7, 0x02,
+	0x54, 0xb8, 0x27, 0x14, 0x13, 0xd6, 0x29, 0xf5, 0x77, 0x71, 0xd7, 0xeb, 0xe0, 0x5d, 0x69, 0xc5,
+	0x6c, 0x75, 0xa9, 0xf5, 0x49, 0x8a, 0xdd, 0x1d, 0x23, 0x86, 0x19, 0x23, 0x01, 0xc3, 0xcc, 0xa6,
+	0xae, 0x90, 0xd2, 0x0e, 0x20, 0xb7, 0x17, 0x82, 0x0c, 0x72, 0xd6, 0x23, 0x01, 0x43, 0x08, 0xd2,
+	0x41, 0x97, 0xb2, 0xbc, 0xb2, 0xa1, 0x6c, 0xa6, 0x0d, 0xfe, 0x8d, 0xfe, 0x07, 0x0b, 0x3e, 0x76,
+	0xdb, 0x98, 0x9a, 0x3e, 0xe9, 0x13, 0xdc, 0xcd, 0xa7, 0x36, 0x94, 0xcd, 0x9c, 0x91, 0x13, 0x44,
+	0x83, 0xd3, 0xb4, 0x1d, 0x58, 0x3a, 0xf2, 0xa9, 0x47, 0x03, 0x62, 0x90, 0xc0, 0xa3, 0x6e, 0x40,
+	0xd0, 0x1d, 0x00, 0xee, 0x90, 0xe9, 0x53, 0xa9, 0x31, 0x67, 0x5c, 0xe7, 0x14, 0x83, 0x52, 0xa6,
+	0xfd, 0xa4, 0x00, 0xaa, 0x0c, 0x1c, 0x8a, 0x3c, 0xb8, 0x03, 0xe0, 0xf5, 0x5a, 0x5d, 0xdb, 0x32,
+	0x3f, 0x91, 0xf3, 0x08, 0x25, 0x28, 0xaf, 0xc9, 0x39, 0x5a, 0x87, 0x39, 0x8f, 0x5a, 0x66, 0xcb,
+	0x66, 0xd2, 0x8d, 0x8c, 0x47, 0xad, 0x3d, 0x7b, 0xe0, 0xf9, 0x4c, 0xc2, 0xf3, 0xfb, 0xb0, 0x64,
+	0x51, 0xc7, 0xb1, 0x19, 0x23, 0xc4, 0xb4, 0xdd, 0x36, 0xf9, 0x9c, 0x4f, 0x73, 0xf6, 0x62, 0x4c,
+	0xae, 0x85, 0x54, 0xed, 0x2e, 0x2c, 0x0a, 0x57, 0x62, 0xe7, 0x11, 0xa4, 0x13, 0x6e, 0xf3, 0x6f,
+	0xcd, 0x80, 0x5b, 0xc7, 0xb8, 0x6b, 0xb7, 0x31, 0xa3, 0xfe, 0x11, 0xf1, 0x3f, 0x52, 0xdf, 0xc1,
+	0xae, 0x45, 0xbe, 0x14, 0xbb, 0xff, 0x40, 0x76, 0x70, 0x9b, 0x20, 0x9f, 0xda, 0x98, 0xd9, 0xcc,
+	0x19, 0x10, 0x5f, 0x27, 0xd0, 0x7e, 0x4d, 0xc1, 0xed, 0xf1, 0x4a, 0xa5, 0x23, 0x05, 0x98, 0x6f,
+	0xe1, 0x6e, 0x48, 0x0a, 0xf2, 0xca, 0xc6, 0xcc, 0x66, 0xda, 0x88, 0xcf, 0x68, 0x0b, 0x54, 0x46,
+	0x19, 0xee, 0x9a, 0xfd, 0x48, 0x43, 0xc0, 0xa3, 0x92, 0x36, 0x96, 0x38, 0x3d, 0x56, 0x1c, 0xa0,
+	0xc7, 0xb0, 0x2e, 0x44, 0xb1, 0xc5, 0xec, 0x3e, 0x49, 0x22, 0x44, 0xc4, 0x6e, 0x70, 0x76, 0x85,
+	0x73, 0x13, 0xb8, 0x07, 0x80, 0x1c, 0x3b, 0x08, 0x6c, 0xf7, 0x34, 0x09, 0x49, 0xf3, 0x7b, 0x2c,
+	0x4b, 0x4e, 0x42, 0xfc, 0x00, 0x36, 0x70, 0x9f, 0xf8, 0xf8, 0x94, 0x8c, 0x18, 0x32, 0xa5, 0xdb,
+	0xf9, 0xd9, 0x0d, 0x65, 0x33, 0x65, 0xdc, 0x91, 0x72, 0x43, 0x16, 0xf7, 0x84, 0x90, 0xf6, 0x1c,
+	0x0a, 0x31, 0x8d, 0x8b, 0x5c, 0x48, 0x92, 0xa1, 0xb0, 0x2a, 0x23, 0x61, 0xfd, 0x2d, 0x95, 0x78,
+	0xab, 0x24, 0x5e, 0x46, 0xf5, 0x31, 0xdc, 0xc0, 0x82, 0x4a, 0xda, 0xe6, 0x88, 0xaa, 0xbd, 0x54,
+	0x5e, 0x31, 0x56, 0x62, 0x81, 0xa3, 0x58, 0x2f, 0x3a, 0x86, 0xf9, 0x30, 0x5f, 0x7b, 0x01, 0x11,
+	0x8f, 0x99, 0x2d, 0x3f, 0x2d, 0x8e, 0x2f, 0xe2, 0xe2, 0x17, 0xcc, 0x17, 0x1b, 0x5c, 0x87, 0x11,
+	0xeb, 0x2a, 0x78, 0x90, 0x11, 0xb4, 0xcb, 0xf2, 0xff, 0x00, 0x32, 0x02, 0xc4, 0x1f, 0x3a, 0x5b,
+	0x2e, 0x5d, 0x6a, 0x5e, 0xda, 0x92, 0xa6, 0x0d, 0x09, 0xd7, 0x9e, 0xc2, 0xba, 0xfe, 0xd9, 0x66,
+	0xa4, 0x3d, 0x78, 0xbd, 0xa9, 0xa3, 0xfb, 0x0c, 0xf2, 0xa3, 0x58, 0x19, 0xd9, 0x4b, 0xc1, 0x6f,
+	0x01, 0xed, 0x77, 0xb0, 0xed, 0x36, 0x18, 0xf6, 0x07, 0xf5, 0x96, 0x87, 0xb9, 0x20, 0x24, 0x90,
+	0x36, 0xbf, 0xf3, 0xbc, 0x11, 0x1d, 0xd1, 0x7f, 0x21, 0x77, 0x4a, 0x5c, 0x12, 0xd8, 0x81, 0xc9,
+	0x6c, 0x87, 0xc8, 0x04, 0xcf, 0x4a, 0x5a, 0xd3, 0x76, 0x88, 0xf6, 0x18, 0x6e, 0xc4, 0x9e, 0xf0,
+	0x82, 0x9e, 0xae, 0x99, 0x68, 0x45, 0x58, 0x1b, 0xc6, 0x49, 0x77, 0x56, 0x61, 0x56, 0xf4, 0x0b,
+	0x51, 0xcc, 0xe2, 0xa0, 0xbd, 0x83, 0xe5, 0x4a, 0x10, 0xd8, 0xa7, 0xae, 0x43, 0x5c, 0x96, 0x88,
+	0x16, 0xf1, 0xa8, 0xd5, 0x31, 0xb9, 0xc3, 0x12, 0x00, 0x9c, 0xc4, 0xaf, 0x78, 0x79, 0x0f, 0xf8,
+	0x79, 0x06, 0x50, 0x52, 0xaf, 0xf4, 0xe1, 0x0c, 0x56, 0x07, 0xc5, 0x83, 0x63, 0x3e, 0x0f, 0x69,
+	0xb6, 0xfc, 0xed, 0xa4, 0x87, 0x1f, 0xd5, 0x94, 0x48, 0xc5, 0x01, 0x6f, 0xa5, 0x3f, 0x4a, 0x2c,
+	0xfc, 0x98, 0x82, 0x95, 0x31, 0xc2, 0xe8, 0x36, 0x5c, 0x8f, 0x3b, 0xa6, 0xec, 0x42, 0x03, 0xc2,
+	0xb8, 0x36, 0x9b, 0x1a, 0xd7, 0x66, 0xc3, 0x49, 0x22, 0x46, 0x10, 0xf1, 0xcd, 0x44, 0xb3, 0xce,
+	0x45, 0xc4, 0x86, 0x1c, 0x37, 0x9e, 0x98, 0x24, 0x52, 0x48, 0xb4, 0xec, 0x5c, 0x44, 0xe4, 0x42,
+	0x17, 0x1f, 0x76, 0x76, 0xb8, 0x4a, 0x5e, 0xc4, 0x55, 0x92, 0xd9, 0x50, 0x36, 0x17, 0xcb, 0xf7,
+	0xa7, 0xad, 0x92, 0xa8, 0x3a, 0xfe, 0x4c, 0xc1, 0xfa, 0x84, 0x0a, 0x4a, 0x28, 0x57, 0xbe, 0x4a,
+	0x39, 0xfa, 0x06, 0x6e, 0x12, 0xd6, 0xd9, 0x35, 0xdb, 0xc4, 0xa3, 0x81, 0xcd, 0xc4, 0xd8, 0x36,
+	0xdd, 0x9e, 0xd3, 0x22, 0xbe, 0x8c, 0x5c, 0xb8, 0x19, 0xec, 0x56, 0x05, 0x9f, 0x0f, 0xe8, 0x3a,
+	0xe7, 0xa2, 0x47, 0xb0, 0x16, 0xa1, 0x6c, 0xd7, 0xea, 0xf6, 0x02, 0x9b, 0xba, 0xc9, 0x50, 0xae,
+	0x4a, 0x6e, 0x2d, 0x62, 0xf2, 0x68, 0x6d, 0x81, 0x8a, 0xe3, 0x26, 0x64, 0xf2, 0xd4, 0x94, 0x51,
+	0x5d, 0x1a, 0xd0, 0xf5, 0x90, 0x8c, 0x5e, 0xc0, 0x6d, 0xae, 0x20, 0x14, 0xb4, 0x5d, 0x33, 0x01,
+	0x3b, 0xeb, 0x91, 0x9e, 0x68, 0xde, 0x69, 0xe3, 0x66, 0x24, 0x53, 0x73, 0x07, 0xdd, 0xed, 0x6d,
+	0x28, 0xa0, 0x3d, 0x87, 0x85, 0x2a, 0x75, 0xb0, 0x1d, 0xf7, 0xea, 0x55, 0x98, 0x15, 0x16, 0x65,
+	0x29, 0xf1, 0x03, 0x5a, 0x83, 0x4c, 0x9b, 0x8b, 0x45, 0x63, 0x5c, 0x9c, 0xb4, 0x67, 0xb0, 0x18,
+	0xc1, 0x65, 0xb8, 0xb7, 0x40, 0x0d, 0xf3, 0x10, 0xb3, 0x9e, 0x4f, 0x4c, 0x89, 0x11, 0xaa, 0x96,
+	0x62, 0xba, 0x80, 0x68, 0xbf, 0xa4, 0x60, 0x99, 0x47, 0xab, 0xe9, 0x93, 0xc1, 0x04, 0x7d, 0x09,
+	0x69, 0xe6, 0xcb, 0xbc, 0xcd, 0x96, 0xcb, 0x93, 0x5e, 0x6b, 0x04, 0x58, 0x0c, 0x0f, 0x75, 0xda,
+	0x26, 0x06, 0xc7, 0x17, 0xfe, 0x50, 0x60, 0x3e, 0x22, 0xa1, 0x27, 0x30, 0xcb, 0x9f, 0x8d, 0xbb,
+	0x92, 0x2d, 0x6b, 0x03, 0xad, 0x84, 0x75, 0x8a, 0xd1, 0xc6, 0x55, 0xdc, 0xe3, 0x26, 0xc4, 0x8a,
+	0x25, 0x00, 0x43, 0x6b, 0x51, 0x6a, 0x68, 0x2d, 0x0a, 0x07, 0xae, 0x87, 0x7d, 0x66, 0x5b, 0xb6,
+	0xc7, 0x87, 0x53, 0x9f, 0x32, 0x12, 0xcd, 0xe8, 0xe5, 0x24, 0xe7, 0x38, 0x64, 0x84, 0xcd, 0x45,
+	0xae, 0x00, 0x5c, 0x4e, 0xbc, 0x2a, 0x88, 0xe9, 0x1f, 0x52, 0xb4, 0x37, 0xb0, 0x1a, 0x3a, 0xcd,
+	0x5d, 0x08, 0x93, 0x21, 0x7a, 0x96, 0x5b, 0x70, 0x3d, 0xcc, 0x1b, 0xf3, 0xa3, 0x4f, 0x1d, 0x19,
+	0xcf, 0xf9, 0x90, 0xf0, 0xd2, 0xa7, 0x4e, 0xb8, 0x65, 0x71, 0x26, 0xa3, 0x32, 0x1f, 0x33, 0xe1,
+	0xb1, 0x49, 0xb7, 0x9f, 0xc0, 0x42, 0x9c, 0xd5, 0x06, 0xed, 0x12, 0x94, 0x85, 0xb9, 0x77, 0xf5,
+	0xd7, 0xf5, 0xc3, 0x93, 0xba, 0x7a, 0x0d, 0xe5, 0x60, 0xbe, 0xd2, 0x6c, 0xea, 0x8d, 0xa6, 0x6e,
+	0xa8, 0x4a, 0x78, 0x3a, 0x32, 0x0e, 0x8f, 0x0e, 0x1b, 0xba, 0xa1, 0xa6, 0xb6, 0x7f, 0x57, 0x60,
+	0x69, 0xa8, 0x20, 0x10, 0x82, 0x45, 0x09, 0x36, 0x1b, 0xcd, 0x4a, 0xf3, 0x5d, 0x43, 0xbd, 0x86,
+	0x56, 0x41, 0xad, 0xea, 0x47, 0x87, 0x8d, 0x5a, 0xd3, 0x34, 0xf4, 0x7d, 0xbd, 0x76, 0xac, 0x57,
+	0x55, 0x25, 0x94, 0x3c, 0xd2, 0xeb, 0xd5, 0x5a, 0xfd, 0xc0, 0xac, 0xec, 0x37, 0x6b, 0xc7, 0xba,
+	0x9a, 0x42, 0x00, 0x19, 0xf9, 0x3d, 0x13, 0xf2, 0x6b, 0xf5, 0x5a, 0xb3, 0x56, 0x69, 0xea, 0x55,
+	0x53, 0x7f, 0x5f, 0x6b, 0xaa, 0x69, 0xa4, 0x42, 0xee, 0xa4, 0xd6, 0x7c, 0x55, 0x35, 0x2a, 0x27,
+	0x95, 0xbd, 0x37, 0xba, 0x3a, 0x1b, 0x22, 0x42, 0x9e, 0x5e, 0x55, 0x33, 0x21, 0x42, 0x7c, 0x9b,
+	0x8d, 0x37, 0x95, 0xc6, 0x2b, 0xbd, 0xaa, 0xce, 0x95, 0xff, 0x56, 0x60, 0xa9, 0x12, 0xf5, 0x22,
+	0xb1, 0xaa, 0xa3, 0x0e, 0x20, 0x19, 0xb2, 0xc4, 0xb2, 0x8a, 0xb6, 0x27, 0x76, 0xdf, 0x91, 0x8d,
+	0xb6, 0xf0, 0xff, 0x09, 0xb9, 0x91, 0x10, 0xad, 0x62, 0x86, 0x91, 0x09, 0xcb, 0x8d, 0x5e, 0xcb,
+	0xb1, 0x2f, 0x18, 0xd2, 0x2e, 0x07, 0x27, 0x0d, 0x8c, 0x73, 0x26, 0xca, 0xe7, 0xf2, 0x5f, 0x4a,
+	0xbc, 0xa4, 0xc7, 0xd7, 0x7b, 0x0f, 0x39, 0xe9, 0x27, 0xcf, 0x10, 0x74, 0xf7, 0x8b, 0xe5, 0x11,
+	0x5d, 0x69, 0x8a, 0x74, 0x47, 0x1f, 0x20, 0x27, 0x8d, 0x89, 0xf3, 0x14, 0x98, 0xc2, 0xc4, 0x56,
+	0x3a, 0xf4, 0xdb, 0xa2, 0xfc, 0xcf, 0x1c, 0xa8, 0x83, 0x6c, 0x92, 0x77, 0xf9, 0x00, 0x20, 0x1a,
+	0x01, 0x0f, 0xe7, 0xbd, 0x49, 0xba, 0x2e, 0xb4, 0xa7, 0xc9, 0xc1, 0x1b, 0x6a, 0x43, 0xdf, 0xc3,
+	0xf2, 0x09, 0xb6, 0xd9, 0xcb, 0xe4, 0x3e, 0x87, 0xca, 0x57, 0x5a, 0xfe, 0x84, 0xc1, 0x87, 0x5f,
+	0xb1, 0x30, 0xee, 0x28, 0x88, 0xc2, 0xe2, 0xc5, 0x5d, 0x05, 0x3d, 0xb8, 0x54, 0x51, 0x72, 0x17,
+	0x2a, 0x14, 0xa7, 0x15, 0x97, 0x17, 0xee, 0xc2, 0xca, 0x7e, 0x34, 0xbe, 0x13, 0xab, 0xc0, 0xd6,
+	0x34, 0x7b, 0x87, 0xb0, 0xb8, 0x3d, 0xfd, 0x8a, 0x82, 0xce, 0x46, 0xbb, 0xc3, 0x15, 0xef, 0x77,
+	0xd5, 0x4d, 0x18, 0xfd, 0xa0, 0xc0, 0xea, 0xb8, 0x9f, 0x5e, 0xe8, 0xf2, 0x17, 0x1a, 0xfd, 0xf5,
+	0x57, 0x78, 0x74, 0x35, 0x90, 0xf4, 0xa1, 0x07, 0xea, 0xf0, 0x26, 0x8d, 0x26, 0x5e, 0x64, 0xc2,
+	0xbe, 0x5e, 0xd8, 0x99, 0x1e, 0x20, 0xcd, 0x7e, 0x17, 0x27, 0xf3, 0x60, 0x15, 0x47, 0x6b, 0x45,
+	0xf1, 0xb7, 0x43, 0x31, 0xfa, 0xdb, 0xa1, 0xa8, 0x3b, 0x1e, 0x3b, 0x9f, 0xfc, 0x8c, 0xa3, 0x6b,
+	0xfc, 0x8e, 0x82, 0x5e, 0xc3, 0xc2, 0x3e, 0x76, 0xa9, 0x6b, 0x5b, 0xb8, 0xfb, 0x8a, 0xe0, 0xf6,
+	0x44, 0xb5, 0x53, 0xf4, 0x83, 0x56, 0x86, 0x63, 0x1e, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x09,
+	0x75, 0xe0, 0x75, 0x4d, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/eth/v1alpha1/archive.pb.go b/proto/eth/v1alpha1/archive.pb.go
index 4067734ccfdd..382fc1dd2f1b 100755
--- a/proto/eth/v1alpha1/archive.pb.go
+++ b/proto/eth/v1alpha1/archive.pb.go
@@ -5,11 +5,10 @@ package eth
 
 import (
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/eth/v1alpha1/attestation.pb.go b/proto/eth/v1alpha1/attestation.pb.go
index 008971640b79..b68d1b3d02d9 100755
--- a/proto/eth/v1alpha1/attestation.pb.go
+++ b/proto/eth/v1alpha1/attestation.pb.go
@@ -5,12 +5,11 @@ package eth
 
 import (
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/eth/v1alpha1/beacon_block.pb.go b/proto/eth/v1alpha1/beacon_block.pb.go
index 552ea64b0fd1..f9eb15a7834f 100755
--- a/proto/eth/v1alpha1/beacon_block.pb.go
+++ b/proto/eth/v1alpha1/beacon_block.pb.go
@@ -5,11 +5,10 @@ package eth
 
 import (
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/eth/v1alpha1/beacon_chain.pb.go b/proto/eth/v1alpha1/beacon_chain.pb.go
index b9b34139df62..9b10c7a3650c 100755
--- a/proto/eth/v1alpha1/beacon_chain.pb.go
+++ b/proto/eth/v1alpha1/beacon_chain.pb.go
@@ -6,14 +6,13 @@ package eth
 import (
 	context "context"
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	types "github.com/gogo/protobuf/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/eth/v1alpha1/node.pb.go b/proto/eth/v1alpha1/node.pb.go
index 647805e30f3d..2ba95ac9b419 100755
--- a/proto/eth/v1alpha1/node.pb.go
+++ b/proto/eth/v1alpha1/node.pb.go
@@ -6,13 +6,12 @@ package eth
 import (
 	context "context"
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	proto "github.com/gogo/protobuf/proto"
 	types "github.com/gogo/protobuf/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/eth/v1alpha1/slasher.pb.go b/proto/eth/v1alpha1/slasher.pb.go
index d22c0758e6fc..08faf1541075 100755
--- a/proto/eth/v1alpha1/slasher.pb.go
+++ b/proto/eth/v1alpha1/slasher.pb.go
@@ -6,12 +6,11 @@ package eth
 import (
 	context "context"
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	proto "github.com/gogo/protobuf/proto"
 	types "github.com/gogo/protobuf/types"
 	grpc "google.golang.org/grpc"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -901,7 +900,7 @@ func (m *EpochSpanMap) MarshalTo(dAtA []byte) (int, error) {
 	var l int
 	_ = l
 	if len(m.EpochSpanMap) > 0 {
-		for k := range m.EpochSpanMap {
+		for k, _ := range m.EpochSpanMap {
 			dAtA[i] = 0xa
 			i++
 			v := m.EpochSpanMap[k]
diff --git a/proto/eth/v1alpha1/validator.pb.go b/proto/eth/v1alpha1/validator.pb.go
index 4fb145895295..d4f83587b8da 100755
--- a/proto/eth/v1alpha1/validator.pb.go
+++ b/proto/eth/v1alpha1/validator.pb.go
@@ -7,14 +7,13 @@ import (
 	context "context"
 	encoding_binary "encoding/binary"
 	fmt "fmt"
-	io "io"
-	math "math"
-
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	types "github.com/gogo/protobuf/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
+	io "io"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/sharding/p2p/v1/messages.pb.go b/proto/sharding/p2p/v1/messages.pb.go
index 61228b93def4..ba268c5f4bac 100644
--- a/proto/sharding/p2p/v1/messages.pb.go
+++ b/proto/sharding/p2p/v1/messages.pb.go
@@ -5,10 +5,9 @@ package ethereum_sharding_p2p_v1
 
 import (
 	fmt "fmt"
+	proto "github.com/gogo/protobuf/proto"
 	io "io"
 	math "math"
-
-	proto "github.com/gogo/protobuf/proto"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

From 0f7ce7a3da0c00b0a8e40a3fff3ceb4422691550 Mon Sep 17 00:00:00 2001
From: terence tsao <terence@prysmaticlabs.com>
Date: Thu, 21 Nov 2019 13:52:34 -0800
Subject: [PATCH 4/7] Update validator/client/runner.go

Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
---
 validator/client/runner.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/validator/client/runner.go b/validator/client/runner.go
index bffef0d453b9..61041fa44be9 100644
--- a/validator/client/runner.go
+++ b/validator/client/runner.go
@@ -23,7 +23,7 @@ type Validator interface {
 	SlotDeadline(slot uint64) time.Time
 	LogValidatorGainsAndLosses(ctx context.Context, slot uint64) error
 	UpdateAssignments(ctx context.Context, slot uint64) error
-	RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole // validator pubKey -> role
+	RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole // validator pubKey -> roles
 	SubmitAttestation(ctx context.Context, slot uint64, pubKey [48]byte)
 	ProposeBlock(ctx context.Context, slot uint64, pubKey [48]byte)
 }

From 4c4384f911fabb5c48efcd8b6dbb4a7b67b732fe Mon Sep 17 00:00:00 2001
From: terence tsao <terence@prysmaticlabs.com>
Date: Thu, 21 Nov 2019 13:52:52 -0800
Subject: [PATCH 5/7] Update validator/client/runner.go

Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
---
 validator/client/runner.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/validator/client/runner.go b/validator/client/runner.go
index 61041fa44be9..219b9539417a 100644
--- a/validator/client/runner.go
+++ b/validator/client/runner.go
@@ -95,7 +95,7 @@ func run(ctx context.Context, v Validator) {
 						case pb.ValidatorRole_UNKNOWN:
 							log.Debug("No active roles, doing nothing")
 						default:
-							log.Warn("Unhandled roles")
+							log.Warnf("Unhandled role %v", role)
 						}
 					}
 

From 6a0b6390bb6768915a1d9199b0794d0c604ce739 Mon Sep 17 00:00:00 2001
From: Terence Tsao <terence@prysmaticlabs.com>
Date: Thu, 21 Nov 2019 13:58:31 -0800
Subject: [PATCH 6/7] If

---
 validator/client/runner.go    |  2 +-
 validator/client/validator.go | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/validator/client/runner.go b/validator/client/runner.go
index bffef0d453b9..61041fa44be9 100644
--- a/validator/client/runner.go
+++ b/validator/client/runner.go
@@ -23,7 +23,7 @@ type Validator interface {
 	SlotDeadline(slot uint64) time.Time
 	LogValidatorGainsAndLosses(ctx context.Context, slot uint64) error
 	UpdateAssignments(ctx context.Context, slot uint64) error
-	RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole // validator pubKey -> role
+	RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole // validator pubKey -> roles
 	SubmitAttestation(ctx context.Context, slot uint64, pubKey [48]byte)
 	ProposeBlock(ctx context.Context, slot uint64, pubKey [48]byte)
 }
diff --git a/validator/client/validator.go b/validator/client/validator.go
index 494507ec1156..bfaa737b8376 100644
--- a/validator/client/validator.go
+++ b/validator/client/validator.go
@@ -263,19 +263,21 @@ func (v *validator) RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole {
 	rolesAt := make(map[[48]byte][]pb.ValidatorRole)
 	for _, assignment := range v.assignments.ValidatorAssignment {
 		var roles []pb.ValidatorRole
-		switch {
-		case assignment == nil:
+
+		if assignment == nil {
 			roles = append(roles, pb.ValidatorRole_UNKNOWN)
-		case assignment.ProposerSlot == slot && assignment.AttesterSlot == slot:
+			continue
+		}
+		if assignment.ProposerSlot == slot {
 			roles = append(roles, pb.ValidatorRole_PROPOSER)
+		}
+		if assignment.AttesterSlot == slot {
 			roles = append(roles, pb.ValidatorRole_ATTESTER)
-		case assignment.AttesterSlot == slot:
-			roles = append(roles, pb.ValidatorRole_ATTESTER)
-		case assignment.ProposerSlot == slot:
-			roles = append(roles, pb.ValidatorRole_PROPOSER)
-		default:
+		}
+		if len(roles) == 0 {
 			roles = append(roles, pb.ValidatorRole_UNKNOWN)
 		}
+
 		var pubKey [48]byte
 		copy(pubKey[:], assignment.PublicKey)
 		rolesAt[pubKey] = roles

From 952c29a39bd2e7317620ec5ba717e57962337b5d Mon Sep 17 00:00:00 2001
From: Terence Tsao <terence@prysmaticlabs.com>
Date: Thu, 21 Nov 2019 14:05:51 -0800
Subject: [PATCH 7/7] Empty

---
 validator/client/validator.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/validator/client/validator.go b/validator/client/validator.go
index bfaa737b8376..87cdbb34506e 100644
--- a/validator/client/validator.go
+++ b/validator/client/validator.go
@@ -265,7 +265,6 @@ func (v *validator) RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole {
 		var roles []pb.ValidatorRole
 
 		if assignment == nil {
-			roles = append(roles, pb.ValidatorRole_UNKNOWN)
 			continue
 		}
 		if assignment.ProposerSlot == slot {