fixes etc.

cmd/control/control.go

@@ -642,7 +642,7 @@ func restartNodeFunc(cmd *cobra.Command, args []string) error {
 		if err := json.Unmarshal([]byte(upgradeConfigs), &upgradeConfigsMap); err != nil {
 			return err
 		}
-		opts = append(opts, client.WithChainConfigs(upgradeConfigsMap))
+		opts = append(opts, client.WithUpgradeConfigs(upgradeConfigsMap))
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), requestTimeout)

local/network.go

@@ -187,6 +187,7 @@ func init() {
 		defaultNetworkConfig.NodeConfigs[i].ChainConfigFiles = map[string]string{
 			"C": string(cChainConfig),
 		}
+		defaultNetworkConfig.NodeConfigs[i].UpgradeConfigFiles = map[string]string{}
 		defaultNetworkConfig.NodeConfigs[i].IsBeacon = true
 	}
 
@@ -1207,28 +1208,32 @@ func writeFiles(genesis []byte, nodeRootDir string, nodeConfig *node.Config) ([]
 			return nil, fmt.Errorf("couldn't write file at %q: %w", f.path, err)
 		}
 	}
-	if nodeConfig.ChainConfigFiles != nil {
-		// only one flag and multiple files
-		chainConfigDir := filepath.Join(nodeRootDir, chainConfigSubDir)
+
+	chainConfigDir := filepath.Join(nodeRootDir, chainConfigSubDir)
+	if nodeConfig.ChainConfigFiles != nil || nodeConfig.UpgradeConfigFiles != nil {
+		// only specify this flag once
 		flags = append(flags, fmt.Sprintf("--%s=%s", config.ChainConfigDirKey, chainConfigDir))
+	}
+
+	// add the config files for all specified chains
+	if nodeConfig.ChainConfigFiles != nil {
 		for chainAlias, chainConfigFile := range nodeConfig.ChainConfigFiles {
 			chainConfigPath := filepath.Join(chainConfigDir, chainAlias, configFileName)
 			if err := createFileAndWrite(chainConfigPath, []byte(chainConfigFile)); err != nil {
 				return nil, fmt.Errorf("couldn't write file at %q: %w", chainConfigPath, err)
 			}
 		}
 	}
+
+	// add the upgrade files for all specified chains
 	if nodeConfig.UpgradeConfigFiles != nil {
-		// only one flag and multiple files
-		chainConfigDir := filepath.Join(nodeRootDir, chainConfigSubDir)
-		// TODO: only need to specify this flag once
-		flags = append(flags, fmt.Sprintf("--%s=%s", config.ChainConfigDirKey, chainConfigDir))
 		for chainAlias, upgradeChainFile := range nodeConfig.UpgradeConfigFiles {
 			upgradeConfigPath := filepath.Join(chainConfigDir, chainAlias, upgradeConfigFileName)
 			if err := createFileAndWrite(upgradeConfigPath, []byte(upgradeChainFile)); err != nil {
 				return nil, fmt.Errorf("couldn't write file at %q: %w", upgradeConfigPath, err)
 			}
 		}
 	}
+
 	return flags, nil
 }

server/server.go

@@ -775,6 +775,7 @@ func (s *server) AddNode(ctx context.Context, req *rpcpb.AddNodeRequest) (*rpcpb
 		RedirectStderr: s.cfg.RedirectNodesOutput,
 	}
 	nodeConfig.ChainConfigFiles = map[string]string{}
+	nodeConfig.UpgradeConfigFiles = map[string]string{}
 	for k, v := range s.network.chainConfigs {
 		nodeConfig.ChainConfigFiles[k] = v
 	}