adding to network + server

Author: felipemadero

network/network.go

@@ -121,6 +121,8 @@ type Network interface {
 	AddPermissionlessValidators(context.Context, []PermissionlessStakerSpec) error
 	// Remove a validator from a subnet
 	RemoveSubnetValidators(context.Context, []SubnetValidatorsSpec) error
+	// Add a validator toa subnet
+	AddSubnetValidators(context.Context, []SubnetValidatorsSpec) error
 	// Get the elastic subnet tx id for the given subnet id
 	GetElasticSubnetID(context.Context, ids.ID) (ids.ID, error)
 }

server/network.go

@@ -377,6 +377,45 @@ func (lc *localNetwork) AddPermissionlessValidators(ctx context.Context, validat
 	return nil
 }
 
+func (lc *localNetwork) AddSubnetValidators(ctx context.Context, validatorSpecs []network.SubnetValidatorsSpec) error {
+	lc.lock.Lock()
+	defer lc.lock.Unlock()
+
+	if len(validatorSpecs) == 0 {
+		ux.Print(lc.log, logging.Orange.Wrap(logging.Bold.Wrap("no validator specs provided...")))
+		return nil
+	}
+
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	go func(ctx context.Context) {
+		select {
+		case <-lc.stopCh:
+			// The network is stopped; return from method calls below.
+			cancel()
+		case <-ctx.Done():
+			// This method is done. Don't leak [ctx].
+		}
+	}(ctx)
+
+	if err := lc.awaitHealthyAndUpdateNetworkInfo(ctx); err != nil {
+		return err
+	}
+
+	err := lc.nw.AddSubnetValidators(ctx, validatorSpecs)
+	if err != nil {
+		return err
+	}
+
+	if err := lc.awaitHealthyAndUpdateNetworkInfo(ctx); err != nil {
+		return err
+	}
+
+	ux.Print(lc.log, logging.Green.Wrap(logging.Bold.Wrap("finished adding subnet validators")))
+	return nil
+}
+
 func (lc *localNetwork) RemoveSubnetValidator(ctx context.Context, validatorSpecs []network.SubnetValidatorsSpec) error {
 	lc.lock.Lock()
 	defer lc.lock.Unlock()

server/server.go

@@ -638,6 +638,64 @@ func (s *server) AddPermissionlessValidator(
 	return &rpcpb.AddPermissionlessValidatorResponse{ClusterInfo: clusterInfo}, nil
 }
 
+func (s *server) AddSubnetValidators(
+	_ context.Context,
+	req *rpcpb.AddSubnetValidatorsRequest,
+) (*rpcpb.AddSubnetValidatorsResponse, error) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	if s.network == nil {
+		return nil, ErrNotBootstrapped
+	}
+
+	s.log.Debug("AddSubnetValidators")
+
+	if len(req.GetValidatorsSpec()) == 0 {
+		return nil, ErrNoValidatorSpec
+	}
+
+	validatorSpecList := []network.SubnetValidatorsSpec{}
+	for _, spec := range req.GetValidatorsSpec() {
+		validatorSpec := getSubnetValidatorSpec(spec)
+		validatorSpecList = append(validatorSpecList, validatorSpec)
+	}
+
+	// check that the given subnets exist
+	subnetsSet := set.Set[string]{}
+	subnetsSet.Add(maps.Keys(s.clusterInfo.Subnets)...)
+
+	for _, validatorSpec := range validatorSpecList {
+		if validatorSpec.SubnetID == "" {
+			return nil, ErrNoSubnetID
+		} else if !subnetsSet.Contains(validatorSpec.SubnetID) {
+			return nil, fmt.Errorf("subnet id %q does not exist", validatorSpec.SubnetID)
+		}
+	}
+
+	s.clusterInfo.Healthy = false
+	s.clusterInfo.CustomChainsHealthy = false
+
+	ctx, cancel := context.WithTimeout(context.Background(), waitForHealthyTimeout)
+	defer cancel()
+	err := s.network.AddSubnetValidators(ctx, validatorSpecList)
+
+	s.updateClusterInfo()
+
+	if err != nil {
+		s.log.Error("failed to add subnet validators", zap.Error(err))
+		return nil, err
+	}
+
+	s.log.Info("successfully added subnet validators")
+
+	clusterInfo, err := deepCopy(s.clusterInfo)
+	if err != nil {
+		return nil, err
+	}
+	return &rpcpb.AddSubnetValidatorsResponse{ClusterInfo: clusterInfo}, nil
+}
+
 func (s *server) RemoveSubnetValidator(
 	_ context.Context,
 	req *rpcpb.RemoveSubnetValidatorRequest,
@@ -1550,6 +1608,15 @@ func getPermissionlessValidatorSpec(
 	return validatorSpec, nil
 }
 
+func getSubnetValidatorSpec(
+	spec *rpcpb.SubnetValidatorsSpec,
+) network.SubnetValidatorsSpec {
+	return network.SubnetValidatorsSpec{
+		SubnetID:  spec.SubnetId,
+		NodeNames: spec.GetNodeNames(),
+	}
+}
+
 func getRemoveSubnetValidatorSpec(
 	spec *rpcpb.RemoveSubnetValidatorSpec,
 ) network.SubnetValidatorsSpec {