Merge branch 'master' into cgroupsv2-resourcemanager

OffchainLabs · Aug 10, 2023 · 325566f · 325566f
2 parents a007e25 + 0485120
commit 325566f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 6 deletions.
diff --git a/cmd/genericconf/server.go b/cmd/genericconf/server.go
@@ -165,9 +165,8 @@ func (a AuthRPCConfig) Apply(stackConf *node.Config) {
 	stackConf.AuthPort = a.Port
 	stackConf.AuthVirtualHosts = []string{} // dont allow http access
 	stackConf.JWTSecret = a.JwtSecret
-	// a few settings are not available as stanard config, but we can change the default. sigh..
-	node.DefaultAuthOrigins = a.Origins
-	node.DefaultAuthModules = a.API
+	stackConf.AuthModules = a.API
+	stackConf.AuthOrigins = a.Origins
 }
 
 var AuthRPCConfigDefault = AuthRPCConfig{

diff --git a/cmd/nitro-val/nitro_val.go b/cmd/nitro-val/nitro_val.go
@@ -109,6 +109,9 @@ func mainImpl() int {
 
 		return genericconf.InitLog(newCfg.LogType, log.Lvl(newCfg.LogLevel), &newCfg.FileLogging, pathResolver(nodeConfig.Persistent.LogDir))
 	})
+
+	valnode.EnsureValidationExposedViaAuthRPC(&stackConf)
+
 	stack, err := node.New(&stackConf)
 	if err != nil {
 		flag.Usage()

diff --git a/cmd/nitro/nitro.go b/cmd/nitro/nitro.go
@@ -368,6 +368,11 @@ func mainImpl() int {
 
 	resourcemanager.Init(&nodeConfig.Node.ResourceManagement)
 
+	var sameProcessValidationNodeEnabled bool
+	if nodeConfig.Node.BlockValidator.Enable && (nodeConfig.Node.BlockValidator.ValidationServer.URL == "self" || nodeConfig.Node.BlockValidator.ValidationServer.URL == "self-auth") {
+		sameProcessValidationNodeEnabled = true
+		valnode.EnsureValidationExposedViaAuthRPC(&stackConf)
+	}
 	stack, err := node.New(&stackConf)
 	if err != nil {
 		flag.Usage()
@@ -427,7 +432,7 @@ func mainImpl() int {
 	fatalErrChan := make(chan error, 10)
 
 	var valNode *valnode.ValidationNode
-	if nodeConfig.Node.BlockValidator.Enable && (nodeConfig.Node.BlockValidator.ValidationServer.URL == "self" || nodeConfig.Node.BlockValidator.ValidationServer.URL == "self-auth") {
+	if sameProcessValidationNodeEnabled {
 		valNode, err = valnode.CreateValidationNode(
 			func() *valnode.Config { return &liveNodeConfig.Get().Validation },
 			stack,

diff --git a/go-ethereum b/go-ethereum
diff --git a/system_tests/common_test.go b/system_tests/common_test.go
@@ -326,6 +326,8 @@ func createTestValidationNode(t *testing.T, ctx context.Context, config *valnode
 	stackConf.P2P.NoDiscovery = true
 	stackConf.P2P.ListenAddr = ""
 
+	valnode.EnsureValidationExposedViaAuthRPC(&stackConf)
+
 	stack, err := node.New(&stackConf)
 	Require(t, err)
 

diff --git a/validator/valnode/valnode.go b/validator/valnode/valnode.go
@@ -71,6 +71,19 @@ type ValidationNode struct {
 	jitSpawner *server_jit.JitSpawner
 }
 
+func EnsureValidationExposedViaAuthRPC(stackConf *node.Config) {
+	found := false
+	for _, module := range stackConf.AuthModules {
+		if module == server_api.Namespace {
+			found = true
+			break
+		}
+	}
+	if !found {
+		stackConf.AuthModules = append(stackConf.AuthModules, server_api.Namespace)
+	}
+}
+
 func CreateValidationNode(configFetcher ValidationConfigFetcher, stack *node.Node, fatalErrChan chan error) (*ValidationNode, error) {
 	config := configFetcher()
 	locator, err := server_common.NewMachineLocator(config.Wasm.RootPath)
@@ -84,7 +97,6 @@ func CreateValidationNode(configFetcher ValidationConfigFetcher, stack *node.Nod
 	if err != nil {
 		return nil, err
 	}
-	node.DefaultAuthModules = []string{server_api.Namespace}
 	var serverAPI *server_api.ExecServerAPI
 	var jitSpawner *server_jit.JitSpawner
 	if config.UseJit {