From 7e1ea234f582655e7fa231e08d1e582983346540 Mon Sep 17 00:00:00 2001
From: RekCuy63 <rrifvckzieger@gmail.com>
Date: Wed, 20 May 2026 10:55:52 +0800
Subject: [PATCH 1/2] cmd/utils: respect --state.size-tracking=false

---
 cmd/utils/flags.go      |  4 ++--
 cmd/utils/flags_test.go | 42 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index c41cf4ee40..a48d9ccef2 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -1936,8 +1936,8 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 			cfg.EthDiscoveryURLs = SplitAndTrim(urls)
 		}
 	}
-	if ctx.Bool(StateSizeTrackingFlag.Name) {
-		cfg.EnableStateSizeTracking = true
+	if ctx.IsSet(StateSizeTrackingFlag.Name) {
+		cfg.EnableStateSizeTracking = ctx.Bool(StateSizeTrackingFlag.Name)
 	}
 	// Override any default configs for hard coded networks.
 	switch {
diff --git a/cmd/utils/flags_test.go b/cmd/utils/flags_test.go
index 0be3370d4a..e68d86b746 100644
--- a/cmd/utils/flags_test.go
+++ b/cmd/utils/flags_test.go
@@ -18,8 +18,12 @@
 package utils
 
 import (
+	"flag"
 	"reflect"
 	"testing"
+
+	"github.com/ethereum/go-ethereum/eth/ethconfig"
+	"github.com/urfave/cli/v2"
 )
 
 func Test_SplitTagsFlag(t *testing.T) {
@@ -64,3 +68,41 @@ func Test_SplitTagsFlag(t *testing.T) {
 		})
 	}
 }
+
+func TestSetEthConfigAllowsDisablingStateSizeTracking(t *testing.T) {
+	ctx := newTestFlagContext(t, []cli.Flag{
+		CacheFlag,
+		CacheDatabaseFlag,
+		CacheGCFlag,
+		CacheSnapshotFlag,
+		CacheTrieFlag,
+		CryptoKZGFlag,
+		FDLimitFlag,
+		GCModeFlag,
+		SnapshotFlag,
+		StateSizeTrackingFlag,
+	}, "--state.size-tracking=false")
+
+	cfg := ethconfig.Defaults
+	cfg.EnableStateSizeTracking = true
+	SetEthConfig(ctx, nil, &cfg)
+
+	if cfg.EnableStateSizeTracking {
+		t.Fatal("state size tracking should be disabled by explicit CLI flag")
+	}
+}
+
+func newTestFlagContext(t *testing.T, flags []cli.Flag, args ...string) *cli.Context {
+	t.Helper()
+
+	set := flag.NewFlagSet(t.Name(), flag.ContinueOnError)
+	for _, flag := range flags {
+		if err := flag.Apply(set); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if err := set.Parse(args); err != nil {
+		t.Fatal(err)
+	}
+	return cli.NewContext(cli.NewApp(), set, nil)
+}

From 3e52d136a5f696e46dd5c5b80ec77163a241fa9c Mon Sep 17 00:00:00 2001
From: Jared Wasinger <j-wasinger@hotmail.com>
Date: Wed, 20 May 2026 10:06:22 -0400
Subject: [PATCH 2/2] remove unit test

---
 cmd/utils/flags_test.go | 42 -----------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/cmd/utils/flags_test.go b/cmd/utils/flags_test.go
index e68d86b746..0be3370d4a 100644
--- a/cmd/utils/flags_test.go
+++ b/cmd/utils/flags_test.go
@@ -18,12 +18,8 @@
 package utils
 
 import (
-	"flag"
 	"reflect"
 	"testing"
-
-	"github.com/ethereum/go-ethereum/eth/ethconfig"
-	"github.com/urfave/cli/v2"
 )
 
 func Test_SplitTagsFlag(t *testing.T) {
@@ -68,41 +64,3 @@ func Test_SplitTagsFlag(t *testing.T) {
 		})
 	}
 }
-
-func TestSetEthConfigAllowsDisablingStateSizeTracking(t *testing.T) {
-	ctx := newTestFlagContext(t, []cli.Flag{
-		CacheFlag,
-		CacheDatabaseFlag,
-		CacheGCFlag,
-		CacheSnapshotFlag,
-		CacheTrieFlag,
-		CryptoKZGFlag,
-		FDLimitFlag,
-		GCModeFlag,
-		SnapshotFlag,
-		StateSizeTrackingFlag,
-	}, "--state.size-tracking=false")
-
-	cfg := ethconfig.Defaults
-	cfg.EnableStateSizeTracking = true
-	SetEthConfig(ctx, nil, &cfg)
-
-	if cfg.EnableStateSizeTracking {
-		t.Fatal("state size tracking should be disabled by explicit CLI flag")
-	}
-}
-
-func newTestFlagContext(t *testing.T, flags []cli.Flag, args ...string) *cli.Context {
-	t.Helper()
-
-	set := flag.NewFlagSet(t.Name(), flag.ContinueOnError)
-	for _, flag := range flags {
-		if err := flag.Apply(set); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if err := set.Parse(args); err != nil {
-		t.Fatal(err)
-	}
-	return cli.NewContext(cli.NewApp(), set, nil)
-}