all DKG packets are now gossiped throughout the network

client/grpc/client_test.go

@@ -95,7 +95,6 @@ func TestClientClose(t *testing.T) {
 	wg := sync.WaitGroup{}
 	wg.Add(1)
 	go func() {
-		//nolint:revive // we drain the channel
 		for range c.Watch(context.Background()) {
 		}
 		wg.Done()

client/http/http_test.go

@@ -151,7 +151,7 @@ func TestHTTPWatch(t *testing.T) {
 	if len(first.Randomness()) == 0 {
 		t.Fatal("should get randomness from watching")
 	}
-	//nolint:revive // draining channel until the context expires
+
 	for range result {
 	}
 	_ = httpClient.Close()
@@ -186,7 +186,6 @@ func TestHTTPClientClose(t *testing.T) {
 	wg := sync.WaitGroup{}
 	wg.Add(1)
 	go func() {
-		//nolint:revive // draining channel
 		for range httpClient.Watch(context.Background()) {
 		}
 		wg.Done()

client/lp2p/client.go

@@ -213,7 +213,7 @@ func (c *Client) Watch(ctx context.Context) <-chan client.Result {
 				c.log.Debugw("client.Watch done")
 				end()
 				// drain leftover on innerCh
-				for range innerCh { //nolint:revive
+				for range innerCh {
 				}
 				c.log.Debugw("client.Watch finished draining the innerCh")
 				return

client/optimizing.go

@@ -250,7 +250,6 @@ LOOP:
 			stats = append(stats, rr.stat)
 			res = rr.result
 			if rr.err != nil && !errors.Is(rr.err, common.ErrEmptyClientUnsupportedGet) {
-				//nolint:errorlint
 				err = fmt.Errorf("%v - %w", err, rr.err)
 			} else if rr.err == nil {
 				err = nil

common/key/group.go

@@ -254,7 +254,7 @@ func (g *Group) FromTOML(i interface{}) error {
 	}
 
 	if g.Threshold < dkg.MinimumT(len(gt.Nodes)) {
-		return errors.New("group file have threshold 0")
+		return errors.New("group file has threshold 0")
 	} else if g.Threshold > g.Len() {
 		return errors.New("group file threshold greater than number of participants")
 	}

demo/main.go

@@ -100,6 +100,7 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
+
 	err = orch.RunDKG(1 * time.Minute)
 	if err != nil {
 		panic(err)

demo/node/node_subprocess.go

@@ -347,7 +347,7 @@ func (n *NodeProc) StartLeaderReshare(thr int, transitionTime time.Time, _ int,
 		"--threshold", strconv.Itoa(thr),
 		"--transition-time", durationUntilTransitionTime.String(),
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 	defer cancel()
 	proposeCmd := exec.CommandContext(ctx, n.binary, proposeArgs...)
 	_ = runCommand(proposeCmd)

internal/chain/beacon/node_test.go

@@ -57,8 +57,12 @@ func (t *testBeaconServer) SyncChain(req *drand.SyncRequest, p drand.Protocol_Sy
 	return SyncChain(t.h.l, t.h.chain, req, p)
 }
 
-func (t *testBeaconServer) Migrate(context.Context, *drand.Empty) (*drand.Empty, error) {
-	return &drand.Empty{}, nil
+func (t *testBeaconServer) Command(context.Context, *drand.DKGCommand) (*drand.EmptyDKGResponse, error) {
+	return &drand.EmptyDKGResponse{}, nil
+}
+
+func (t *testBeaconServer) Packet(context.Context, *drand.GossipPacket) (*drand.EmptyDKGResponse, error) {
+	return &drand.EmptyDKGResponse{}, nil
 }
 
 func dkgShares(t *testing.T, n, thr int, sch *crypto.Scheme) ([]*key.Share, []kyber.Point) {

internal/core/drand_daemon_dkg_proxy.go

@@ -2,69 +2,12 @@ package core
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/drand/drand/protobuf/drand"
 )
 
-func (dd *DrandDaemon) StartNetwork(ctx context.Context, options *drand.FirstProposalOptions) (*drand.EmptyResponse, error) {
-	return dd.dkg.StartNetwork(ctx, options)
-}
-
-func (dd *DrandDaemon) StartProposal(ctx context.Context, options *drand.ProposalOptions) (*drand.EmptyResponse, error) {
-	return dd.dkg.StartProposal(ctx, options)
-}
-
-func (dd *DrandDaemon) StartAbort(ctx context.Context, options *drand.AbortOptions) (*drand.EmptyResponse, error) {
-	beaconID := options.BeaconID
-
-	if !dd.beaconExists(beaconID) {
-		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)
-	}
-
-	return dd.dkg.StartAbort(ctx, options)
-}
-
-func (dd *DrandDaemon) StartExecute(ctx context.Context, options *drand.ExecutionOptions) (*drand.EmptyResponse, error) {
-	beaconID := options.BeaconID
-
-	if !dd.beaconExists(beaconID) {
-		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)
-	}
-
-	return dd.dkg.StartExecute(ctx, options)
-}
-
-func (dd *DrandDaemon) StartJoin(ctx context.Context, options *drand.JoinOptions) (*drand.EmptyResponse, error) {
-	beaconID := options.BeaconID
-
-	if !dd.beaconExists(beaconID) {
-		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)
-	}
-
-	return dd.dkg.StartJoin(ctx, options)
-}
-
-func (dd *DrandDaemon) StartAccept(ctx context.Context, options *drand.AcceptOptions) (*drand.EmptyResponse, error) {
-	beaconID := options.BeaconID
-
-	if !dd.beaconExists(beaconID) {
-		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)
-	}
-
-	return dd.dkg.StartAccept(ctx, options)
-}
-
-func (dd *DrandDaemon) StartReject(ctx context.Context, options *drand.RejectOptions) (*drand.EmptyResponse, error) {
-	beaconID := options.BeaconID
-
-	if !dd.beaconExists(beaconID) {
-		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)
-	}
-
-	return dd.dkg.StartReject(ctx, options)
-}
-
 func (dd *DrandDaemon) DKGStatus(ctx context.Context, request *drand.DKGStatusRequest) (*drand.DKGStatusResponse, error) {
 	beaconID := request.BeaconID
 
@@ -75,52 +18,40 @@ func (dd *DrandDaemon) DKGStatus(ctx context.Context, request *drand.DKGStatusRe
 	return dd.dkg.DKGStatus(ctx, request)
 }
 
-func (dd *DrandDaemon) Propose(ctx context.Context, terms *drand.ProposalTerms) (*drand.EmptyResponse, error) {
-	return dd.dkg.Propose(ctx, terms)
-}
-
-func (dd *DrandDaemon) Abort(ctx context.Context, abortDKG *drand.AbortDKG) (*drand.EmptyResponse, error) {
-	beaconID := abortDKG.Metadata.BeaconID
-
-	if !dd.beaconExists(beaconID) {
-		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)
+func (dd *DrandDaemon) Command(ctx context.Context, command *drand.DKGCommand) (*drand.EmptyDKGResponse, error) {
+	if command.Metadata == nil {
+		return nil, errors.New("could not find command metadata to read beaconID")
 	}
-
-	return dd.dkg.Abort(ctx, abortDKG)
-}
-
-func (dd *DrandDaemon) Execute(ctx context.Context, execution *drand.StartExecution) (*drand.EmptyResponse, error) {
-	beaconID := execution.Metadata.BeaconID
+	beaconID := command.Metadata.BeaconID
 
 	if !dd.beaconExists(beaconID) {
 		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)
 	}
 
-	return dd.dkg.Execute(ctx, execution)
+	return dd.dkg.Command(ctx, command)
 }
 
-func (dd *DrandDaemon) Accept(ctx context.Context, proposal *drand.AcceptProposal) (*drand.EmptyResponse, error) {
-	beaconID := proposal.Metadata.BeaconID
-
-	if !dd.beaconExists(beaconID) {
-		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)
+func (dd *DrandDaemon) Packet(ctx context.Context, packet *drand.GossipPacket) (*drand.EmptyDKGResponse, error) {
+	if packet.Metadata == nil {
+		return nil, errors.New("could not find command metadata to read beaconID")
 	}
-
-	return dd.dkg.Accept(ctx, proposal)
-}
-
-func (dd *DrandDaemon) Reject(ctx context.Context, proposal *drand.RejectProposal) (*drand.EmptyResponse, error) {
-	beaconID := proposal.Metadata.BeaconID
+	beaconID := packet.Metadata.BeaconID
 
 	if !dd.beaconExists(beaconID) {
 		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)
 	}
 
-	return dd.dkg.Reject(ctx, proposal)
+	return dd.dkg.Packet(ctx, packet)
 }
 
-func (dd *DrandDaemon) BroadcastDKG(ctx context.Context, packet *drand.DKGPacket) (*drand.EmptyResponse, error) {
-	beaconID := packet.Metadata.BeaconID
+func (dd *DrandDaemon) BroadcastDKG(ctx context.Context, packet *drand.DKGPacket) (*drand.EmptyDKGResponse, error) {
+	if packet.GetDkg() == nil {
+		return nil, errors.New("DKG was missing from packet")
+	}
+	if packet.GetDkg().Metadata == nil {
+		return nil, errors.New("could not find packet metadata to read beaconID")
+	}
+	beaconID := packet.Dkg.Metadata.BeaconID
 
 	if !dd.beaconExists(beaconID) {
 		return nil, fmt.Errorf("beacon with ID %s is not running on this daemon", beaconID)