From d3c2124e228b67770f204605c89dd1f33ed5d69d Mon Sep 17 00:00:00 2001
From: Felipe Madero <felipe.madero@gmail.com>
Date: Tue, 10 Jan 2023 11:47:03 -0300
Subject: [PATCH 1/2] add data dir flag to node flags

---
 local/network.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/local/network.go b/local/network.go
index 7af7f2ff..d8b2a1cc 100644
--- a/local/network.go
+++ b/local/network.go
@@ -910,6 +910,7 @@ type buildFlagsReturn struct {
 	dbDir     string
 	logsDir   string
 	pluginDir string
+	dataDir   string
 	httpHost  string
 }
 
@@ -931,6 +932,12 @@ func (ln *localNetwork) buildFlags(
 		return buildFlagsReturn{}, err
 	}
 
+	// Tell the node to put all node related data in [nodeDir] unless given in config file
+	dataDir, err := getConfigEntry(nodeConfig.Flags, configFile, config.DataDirKey, nodeDir)
+	if err != nil {
+		return buildFlagsReturn{}, err
+	}
+
 	// pluginDir from all configs for node
 	pluginDir, err := getConfigEntry(nodeConfig.Flags, configFile, config.PluginDirKey, "")
 	if err != nil {
@@ -965,6 +972,7 @@ func (ln *localNetwork) buildFlags(
 	// Flags for AvalancheGo
 	flags := []string{
 		fmt.Sprintf("--%s=%d", config.NetworkNameKey, ln.networkID),
+		fmt.Sprintf("--%s=%s", config.DataDirKey, dataDir),
 		fmt.Sprintf("--%s=%s", config.DBPathKey, dbDir),
 		fmt.Sprintf("--%s=%s", config.LogsDirKey, logsDir),
 		fmt.Sprintf("--%s=%d", config.HTTPPortKey, apiPort),
@@ -1002,6 +1010,7 @@ func (ln *localNetwork) buildFlags(
 		flags:     flags,
 		apiPort:   apiPort,
 		p2pPort:   p2pPort,
+		dataDir:   dataDir,
 		dbDir:     dbDir,
 		logsDir:   logsDir,
 		pluginDir: pluginDir,

From 1ee4cd23f72fb40decf43a6c99469c283c10ef5e Mon Sep 17 00:00:00 2001
From: Felipe Madero <felipe.madero@gmail.com>
Date: Tue, 10 Jan 2023 12:54:07 -0300
Subject: [PATCH 2/2] only set flag for this PR

---
 local/network.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/local/network.go b/local/network.go
index d8b2a1cc..c62226af 100644
--- a/local/network.go
+++ b/local/network.go
@@ -910,7 +910,6 @@ type buildFlagsReturn struct {
 	dbDir     string
 	logsDir   string
 	pluginDir string
-	dataDir   string
 	httpHost  string
 }
 
@@ -1010,7 +1009,6 @@ func (ln *localNetwork) buildFlags(
 		flags:     flags,
 		apiPort:   apiPort,
 		p2pPort:   p2pPort,
-		dataDir:   dataDir,
 		dbDir:     dbDir,
 		logsDir:   logsDir,
 		pluginDir: pluginDir,