From e35d5eb3fe2faea7122b45cfc27ddce53ace2c29 Mon Sep 17 00:00:00 2001
From: philip-morlier <philipmorlier@gmail.com>
Date: Mon, 23 Oct 2023 13:25:54 -0700
Subject: [PATCH] Fixed pluginDefaultDataDir

---
 cmd/utils/flags.go        | 8 ++++++--
 cmd/utils/plugin_hooks.go | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index ee7e6794a..2b0542084 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -989,9 +989,10 @@ func init() {
 // if none (or the empty string) is specified. If the node is starting a testnet,
 // then a subdirectory of the specified datadir will be used.
 func MakeDataDir(ctx *cli.Context) string {
-	// begin PluGeth injection
 	if path := ctx.String(DataDirFlag.Name); path == "" {
+		// begin PluGeth injection
 		if pluginPath := pluginDefaultDataDir(path); pluginPath != "" {
+			log.Error("Inside datdir injection number one")
 			return pluginPath
 		}
 	// end PluGeth injection
@@ -1446,6 +1447,7 @@ func SetNodeConfig(ctx *cli.Context, cfg *node.Config) {
 	setGraphQL(ctx, cfg)
 	setWS(ctx, cfg)
 	setNodeUserIdent(ctx, cfg)
+	log.Error("calling set data dir", "cfg.datadir", cfg.DataDir)
 	SetDataDir(ctx, cfg)
 	setSmartCard(ctx, cfg)
 
@@ -1510,10 +1512,12 @@ func setSmartCard(ctx *cli.Context, cfg *node.Config) {
 }
 
 func SetDataDir(ctx *cli.Context, cfg *node.Config) {
+	log.Error("Inside of setDataDir", "default", node.DefaultDataDir())
 	// begin PluGeth injection
 	pluginPath := pluginDefaultDataDir(node.DefaultDataDir())
 	switch {
-	case pluginPath != "" && cfg.DataDir == node.DefaultDataDir():
+	case pluginPath != "" && ctx.String(DataDirFlag.Name) == node.DefaultDataDir():
+		log.Error("Inside datdir injection number two")
 		cfg.DataDir = pluginPath
 	// end PluGeth injection
 	case ctx.IsSet(DataDirFlag.Name):
diff --git a/cmd/utils/plugin_hooks.go b/cmd/utils/plugin_hooks.go
index 12b85b581..df28ad8f1 100644
--- a/cmd/utils/plugin_hooks.go
+++ b/cmd/utils/plugin_hooks.go
@@ -22,7 +22,6 @@ func DefaultDataDir(pl *plugins.PluginLoader, path string) string {
 }
 
 func pluginDefaultDataDir(path string) string {
-	log.Error("public default data dir")
 	if plugins.DefaultPluginLoader == nil {
 		log.Warn("Attempting DefaultDataDir, but default PluginLoader has not been initialized")
 		return ""