Self review.

cmd/gossamer/config.go

@@ -443,7 +443,9 @@ func setDotGlobalConfigFromToml(tomlCfg *ctoml.Config, cfg *dot.GlobalConfig) {
 		}
 
 		cfg.MetricsPort = tomlCfg.Global.MetricsPort
+
 		cfg.RetainBlocks = tomlCfg.Global.RetainBlocks
+		cfg.GCMode = tomlCfg.Global.GCMode
 	}
 }
 
@@ -473,9 +475,8 @@ func setDotGlobalConfigFromFlags(ctx *cli.Context, cfg *dot.GlobalConfig) {
 		cfg.MetricsPort = uint32(metricsPort)
 	}
 
-	// check --retain-blocks flag
 	cfg.RetainBlocks = ctx.GlobalInt64(RetainBlockNumberFlag.Name)
-
+	cfg.GCMode = ctx.GlobalString(GCModeFlag.Name)
 	cfg.NoTelemetry = ctx.Bool("no-telemetry")
 }
 

cmd/gossamer/export.go

@@ -85,6 +85,7 @@ func dotConfigToToml(dcfg *dot.Config) *ctoml.Config {
 		LogLvl:       dcfg.Global.LogLvl.String(),
 		MetricsPort:  dcfg.Global.MetricsPort,
 		RetainBlocks: dcfg.Global.RetainBlocks,
+		GCMode:       dcfg.Global.GCMode,
 	}
 
 	cfg.Log = ctoml.LogConfig{

cmd/gossamer/flags.go

@@ -285,6 +285,13 @@ var (
 		Usage: "Retain number of block from latest block while pruning",
 		Value: 256,
 	}
+
+	// GCModeFlag sets the blockchain GC mode. It's either full or archive.
+	GCModeFlag = cli.StringFlag{
+		Name:  "gcmode",
+		Usage: `Blockchain garbage collection mode ("full", "archive")`,
+		Value: "full",
+	}
 )
 
 // flag sets that are shared by multiple commands
@@ -302,6 +309,7 @@ var (
 		DBPathFlag,
 		BloomFilterSizeFlag,
 		RetainBlockNumberFlag,
+		GCModeFlag,
 	}
 
 	// StartupFlags are flags that are valid for use with the root command and the export subcommand

cmd/gossamer/main.go

@@ -234,8 +234,12 @@ func gossamerAction(ctx *cli.Context) error {
 		return err
 	}
 
-	if cfg.Global.RetainBlocks < 256 {
-		return fmt.Errorf("retain blocks cannot be less than 256")
+	if cfg.Global.RetainBlocks < 10 {
+		return fmt.Errorf("--%s cannot be less than 256", RetainBlockNumberFlag.Name)
+	}
+
+	if cfg.Global.GCMode != "full" && cfg.Global.GCMode != "archive" {
+		return fmt.Errorf("--%s must be either 'full' or 'archive'", GCModeFlag.Name)
 	}
 
 	cfg.Global.LogLvl = lvl

dot/config.go

@@ -53,6 +53,7 @@ type GlobalConfig struct {
 	MetricsPort    uint32
 	NoTelemetry    bool
 	RetainBlocks   int64
+	GCMode         string
 }
 
 // LogConfig represents the log levels for individual packages

dot/config/toml/config.go

@@ -35,6 +35,7 @@ type GlobalConfig struct {
 	LogLvl       string `toml:"log,omitempty"`
 	MetricsPort  uint32 `toml:"metrics-port,omitempty"`
 	RetainBlocks int64  `toml:"retain-blocks,omitempty"`
+	GCMode       string `toml:"gc-mode,omitempty"`
 }
 
 // LogConfig represents the log levels for individual packages

dot/node.go

@@ -237,9 +237,14 @@ func NewNode(cfg *Config, ks *keystore.GlobalKeystore, stopFunc func()) (*Node,
 	// Network Service
 	var networkSrvc *network.Service
 
-	pruner, err := state.CreatePruner(stateSrvc.DB(), cfg.Global.RetainBlocks)
-	if err != nil {
-		logger.Error("failed to create pruner:", err)
+	var pruner state.Pruner
+	if cfg.Global.GCMode == "full" {
+		pruner, err = state.CreatePruner(stateSrvc.DB(), cfg.Global.RetainBlocks)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		pruner = &state.ArchivalNodePruner{}
 	}
 
 	// check if network service is enabled

dot/services.go

@@ -165,7 +165,7 @@ func createRuntime(cfg *Config, st *state.Service, ks *keystore.GlobalKeystore,
 	return rt, nil
 }
 
-func createBABEService(cfg *Config, rt runtime.Instance, st *state.Service, ks keystore.Keystore, pruner *state.Pruner) (*babe.Service, error) {
+func createBABEService(cfg *Config, rt runtime.Instance, st *state.Service, ks keystore.Keystore, pruner state.Pruner) (*babe.Service, error) {
 	logger.Info(
 		"creating BABE service...",
 		"authority", cfg.Core.BabeAuthority,
@@ -377,7 +377,7 @@ func createBlockVerifier(st *state.Service) (*babe.VerificationManager, error) {
 	return ver, nil
 }
 
-func createSyncService(cfg *Config, st *state.Service, bp sync.BlockProducer, fg sync.FinalityGadget, dh *core.DigestHandler, verifier *babe.VerificationManager, rt runtime.Instance, pruner *state.Pruner) (*sync.Service, error) {
+func createSyncService(cfg *Config, st *state.Service, bp sync.BlockProducer, fg sync.FinalityGadget, dh *core.DigestHandler, verifier *babe.VerificationManager, rt runtime.Instance, pruner state.Pruner) (*sync.Service, error) {
 	syncCfg := &sync.Config{
 		LogLvl:           cfg.Log.SyncLvl,
 		BlockState:       st.Block,

dot/services_test.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/ChainSafe/gossamer/dot/network"
+	"github.com/ChainSafe/gossamer/dot/state"
 	"github.com/ChainSafe/gossamer/dot/types"
 	"github.com/ChainSafe/gossamer/lib/keystore"
 	"github.com/ChainSafe/gossamer/lib/utils"
@@ -136,7 +137,7 @@ func TestCreateSyncService(t *testing.T) {
 	ver, err := createBlockVerifier(stateSrvc)
 	require.NoError(t, err)
 
-	_, err = createSyncService(cfg, stateSrvc, nil, nil, nil, ver, rt, nil)
+	_, err = createSyncService(cfg, stateSrvc, nil, nil, nil, ver, rt, &state.ArchivalNodePruner{})
 	require.NoError(t, err)
 }
 
@@ -233,7 +234,7 @@ func TestCreateBABEService(t *testing.T) {
 	rt, err := createRuntime(cfg, stateSrvc, ks, &network.Service{})
 	require.NoError(t, err)
 
-	bs, err := createBABEService(cfg, rt, stateSrvc, ks.Babe, nil)
+	bs, err := createBABEService(cfg, rt, stateSrvc, ks.Babe, &state.ArchivalNodePruner{})
 	require.NoError(t, err)
 	require.NotNil(t, bs)
 }