Include Validator Index in GetDuties Response, Update EthereumAPIs

WORKSPACE

@@ -1255,7 +1255,7 @@ go_repository(
 
 go_repository(
     name = "com_github_prysmaticlabs_ethereumapis",
-    commit = "87118fb893cc6f32b25793d819790fd3bcce3221",
+    commit = "8a785e129627db2be96339a35fb2317b200160b1",
     importpath = "github.com/prysmaticlabs/ethereumapis",
     patch_args = ["-p1"],
     patches = [

beacon-chain/rpc/validator/assignments.go

@@ -58,6 +58,7 @@ func (vs *Server) GetDuties(ctx context.Context, req *ethpb.DutiesRequest) (*eth
 			if ok {
 				assignment.Committee = ca.Committee
 				assignment.Status = ethpb.ValidatorStatus_ACTIVE
+				assignment.ValidatorIndex = idx
 				assignment.PublicKey = pubKey
 				assignment.AttesterSlot = ca.AttesterSlot
 				assignment.ProposerSlot = proposerIndexToSlot[idx]

beacon-chain/rpc/validator/assignments_test.go

@@ -5,11 +5,11 @@ import (
 	"encoding/binary"
 	"fmt"
 	"strings"
-	"sync"
 	"testing"
 
 	ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
 	"github.com/prysmaticlabs/go-ssz"
+
 	mockChain "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing"
 	blk "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
@@ -105,22 +105,14 @@ func TestGetDuties_OK(t *testing.T) {
 		t.Fatalf("Could not get signing root %v", err)
 	}
 
-	var wg sync.WaitGroup
-	numOfValidators := int(depChainStart)
-	errs := make(chan error, numOfValidators)
+	pubKeys := make([][]byte, len(deposits))
+	indices := make([]uint64, len(deposits))
 	for i := 0; i < len(deposits); i++ {
-		wg.Add(1)
-		go func(index int) {
-			errs <- db.SaveValidatorIndex(ctx, deposits[index].Data.PublicKey, uint64(index))
-			wg.Done()
-		}(i)
-	}
-	wg.Wait()
-	close(errs)
-	for err := range errs {
-		if err != nil {
-			t.Fatalf("Could not save validator index: %v", err)
-		}
+		pubKeys[i] = deposits[i].Data.PublicKey
+		indices[i] = uint64(i)
+	}
+	if err := db.SaveValidatorIndices(ctx, pubKeys, indices); err != nil {
+		t.Fatal(err)
 	}
 
 	vs := &Server{
@@ -157,6 +149,21 @@ func TestGetDuties_OK(t *testing.T) {
 		t.Errorf("Assigned slot %d can't be higher than %d",
 			res.Duties[0].AttesterSlot, state.Slot+params.BeaconConfig().SlotsPerEpoch)
 	}
+
+	// We request for duties for all validators.
+	req = &ethpb.DutiesRequest{
+		PublicKeys: pubKeys,
+		Epoch:      0,
+	}
+	res, err = vs.GetDuties(context.Background(), req)
+	if err != nil {
+		t.Fatalf("Could not call epoch committee assignment %v", err)
+	}
+	for i := 0; i < len(res.Duties); i++ {
+		if res.Duties[i].ValidatorIndex != uint64(i) {
+			t.Errorf("Wanted %d, received %d", i, res.Duties[i].ValidatorIndex)
+		}
+	}
 }
 
 func TestGetDuties_CurrentEpoch_ShouldNotFail(t *testing.T) {
@@ -182,22 +189,14 @@ func TestGetDuties_CurrentEpoch_ShouldNotFail(t *testing.T) {
 		t.Fatalf("Could not get signing root %v", err)
 	}
 
-	var wg sync.WaitGroup
-	numOfValidators := int(depChainStart)
-	errs := make(chan error, numOfValidators)
+	pubKeys := make([][]byte, len(deposits))
+	indices := make([]uint64, len(deposits))
 	for i := 0; i < len(deposits); i++ {
-		wg.Add(1)
-		go func(index int) {
-			errs <- db.SaveValidatorIndex(ctx, deposits[index].Data.PublicKey, uint64(index))
-			wg.Done()
-		}(i)
-	}
-	wg.Wait()
-	close(errs)
-	for err := range errs {
-		if err != nil {
-			t.Fatalf("Could not save validator index: %v", err)
-		}
+		pubKeys[i] = deposits[i].Data.PublicKey
+		indices[i] = uint64(i)
+	}
+	if err := db.SaveValidatorIndices(ctx, pubKeys, indices); err != nil {
+		t.Fatal(err)
 	}
 
 	vs := &Server{
@@ -241,22 +240,14 @@ func TestGetDuties_MultipleKeys_OK(t *testing.T) {
 		t.Fatalf("Could not get signing root %v", err)
 	}
 
-	var wg sync.WaitGroup
-	numOfValidators := int(depChainStart)
-	errs := make(chan error, numOfValidators)
-	for i := 0; i < numOfValidators; i++ {
-		wg.Add(1)
-		go func(index int) {
-			errs <- db.SaveValidatorIndex(ctx, deposits[index].Data.PublicKey, uint64(index))
-			wg.Done()
-		}(i)
+	pubKeys := make([][]byte, len(deposits))
+	indices := make([]uint64, len(deposits))
+	for i := 0; i < len(deposits); i++ {
+		pubKeys[i] = deposits[i].Data.PublicKey
+		indices[i] = uint64(i)
 	}
-	wg.Wait()
-	close(errs)
-	for err := range errs {
-		if err != nil {
-			t.Fatalf("Could not save validator index: %v", err)
-		}
+	if err := db.SaveValidatorIndices(ctx, pubKeys, indices); err != nil {
+		t.Fatal(err)
 	}
 
 	vs := &Server{
@@ -320,22 +311,14 @@ func BenchmarkCommitteeAssignment(b *testing.B) {
 		b.Fatalf("Could not get signing root %v", err)
 	}
 
-	var wg sync.WaitGroup
-	numOfValidators := int(depChainStart)
-	errs := make(chan error, numOfValidators)
-	for i := 0; i < numOfValidators; i++ {
-		wg.Add(1)
-		go func(index int) {
-			errs <- db.SaveValidatorIndex(ctx, deposits[index].Data.PublicKey, uint64(index))
-			wg.Done()
-		}(i)
+	pubKeys := make([][]byte, len(deposits))
+	indices := make([]uint64, len(deposits))
+	for i := 0; i < len(deposits); i++ {
+		pubKeys[i] = deposits[i].Data.PublicKey
+		indices[i] = uint64(i)
 	}
-	wg.Wait()
-	close(errs)
-	for err := range errs {
-		if err != nil {
-			b.Fatalf("Could not save validator index: %v", err)
-		}
+	if err := db.SaveValidatorIndices(ctx, pubKeys, indices); err != nil {
+		b.Fatal(err)
 	}
 
 	vs := &Server{