Cleanup service - move preserve parent and utxo cleanup from blockass…

config/cleanup.go

@@ -0,0 +1,15 @@
+package config
+
+import "time"
+
+// CleanupSettings contains configuration for the Cleanup service.
+type CleanupSettings struct {
+	// GRPCListenAddress is the address the cleanup service listens on for gRPC requests
+	GRPCListenAddress string
+
+	// GRPCAddress is the address other services use to connect to the cleanup service
+	GRPCAddress string
+
+	// PollingInterval is how often to poll block assembly state for cleanup triggers
+	PollingInterval time.Duration
+}

daemon/daemon.go

@@ -57,6 +57,7 @@ const (
 	loggerBlockchain               = "bchn"
 	loggerBlockchainClient         = "bchc"
 	loggerBlockchainSQL            = "bcsql"
+	loggerCleanup                  = "cleanup"
 	loggerKafkaConsumerBlocks      = "kcb"
 	loggerKafkaConsumerRejectedTx  = "kcrtx"
 	loggerKafkaConsumerSubtree     = "kcs"
@@ -87,6 +88,8 @@ const (
 	serviceBlockPersister          = "blockpersister"
 	serviceBlockPersisterFormal    = "BlockPersister"
 	serviceBlockValidation         = "blockvalidation"
+	serviceCleanup                 = "cleanup"
+	serviceCleanupFormal           = "Cleanup"
 	serviceBlockValidationFormal   = "BlockValidation"
 	serviceBlockchainFormal        = "Blockchain"
 	serviceHelp                    = "help"
@@ -510,6 +513,9 @@ func printUsage() {
 	fmt.Println("    -alert=<1|0>")
 	fmt.Println("          whether to start the alert service")
 	fmt.Println("")
+	fmt.Println("    -cleanup=<1|0>")
+	fmt.Println("          whether to start the cleanup service")
+	fmt.Println("")
 	fmt.Println("    -all=0")
 	fmt.Println("          disable all services unless explicitly overridden")
 	fmt.Println("")

daemon/daemon_services.go

@@ -15,6 +15,7 @@ import (
 	"github.com/bsv-blockchain/teranode/services/blockchain"
 	"github.com/bsv-blockchain/teranode/services/blockpersister"
 	"github.com/bsv-blockchain/teranode/services/blockvalidation"
+	"github.com/bsv-blockchain/teranode/services/cleanup"
 	"github.com/bsv-blockchain/teranode/services/legacy"
 	"github.com/bsv-blockchain/teranode/services/legacy/peer"
 	"github.com/bsv-blockchain/teranode/services/p2p"
@@ -68,6 +69,7 @@ func (d *Daemon) startServices(ctx context.Context, logger ulogger.Logger, appSe
 	startLegacy := d.shouldStart(serviceLegacyFormal, args)
 	startRPC := d.shouldStart(serviceRPCFormal, args)
 	startAlert := d.shouldStart(serviceAlertFormal, args)
+	startCleanup := d.shouldStart(serviceCleanupFormal, args)
 
 	// Create the application count based on the services that are going to be started
 	d.appCount += len(d.externalServices)
@@ -117,6 +119,7 @@ func (d *Daemon) startServices(ctx context.Context, logger ulogger.Logger, appSe
 		{startValidator, func() error { return d.startValidatorService(ctx, appSettings, createLogger) }},
 		{startPropagation, func() error { return d.startPropagationService(ctx, appSettings, createLogger) }},
 		{startLegacy, func() error { return d.startLegacyService(ctx, appSettings, createLogger) }},
+		{startCleanup, func() error { return d.startCleanupService(ctx, appSettings, createLogger) }},
 	}
 
 	// Loop through and start each service if needed
@@ -1065,3 +1068,38 @@ func (d *Daemon) startLegacyService(
 		blockassemblyClient,
 	))
 }
+
+// startCleanupService initializes and adds the Cleanup service to the ServiceManager.
+func (d *Daemon) startCleanupService(ctx context.Context, appSettings *settings.Settings,
+	createLogger func(string) ulogger.Logger) error {
+	// Create the UTXO store for the Cleanup service
+	utxoStore, err := d.daemonStores.GetUtxoStore(ctx, createLogger(loggerUtxos), appSettings)
+	if err != nil {
+		return err
+	}
+
+	// Create the blockchain client for the Cleanup service
+	blockchainClient, err := d.daemonStores.GetBlockchainClient(
+		ctx, createLogger(loggerBlockchainClient), appSettings, serviceCleanup,
+	)
+	if err != nil {
+		return err
+	}
+
+	// Create the block assembly client for the Cleanup service
+	blockAssemblyClient, err := blockassembly.NewClient(ctx, createLogger(loggerBlockAssembly), appSettings)
+	if err != nil {
+		return err
+	}
+
+	// Add the Cleanup service to the ServiceManager
+	return d.ServiceManager.AddService(serviceCleanupFormal, cleanup.New(
+		ctx,
+		createLogger(loggerCleanup),
+		appSettings,
+		utxoStore,
+		blockchainClient,
+		blockAssemblyClient,
+		nil, // blobStore not needed for cleanup service
+	))
+}