refactor: prune everything (backport #11177)

CHANGELOG.md

@@ -44,6 +44,11 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+<<<<<<< HEAD
+=======
+* (store) [\#11177](https://github.com/cosmos/cosmos-sdk/pull/11177) Update the prune `nothing` strategy to store the last two heights.
+* [\#10844](https://github.com/cosmos/cosmos-sdk/pull/10844) Automatic recovering non-consistent keyring storage during public key import.
+>>>>>>> 75bcf47f1 (refactor: prune everything (#11177))
 * (store) [\#11117](https://github.com/cosmos/cosmos-sdk/pull/11117) Fix data race in store trace component
 
 ### Improvements

server/config/config.go

@@ -317,6 +317,11 @@ func (c Config) ValidateBasic() error {
 	if c.BaseConfig.MinGasPrices == "" {
 		return sdkerrors.ErrAppConfig.Wrap("set min gas price in app.toml or flag or env variable")
 	}
+	if c.Pruning == storetypes.PruningOptionEverything && c.StateSync.SnapshotInterval > 0 {
+		return sdkerrors.ErrAppConfig.Wrapf(
+			"cannot enable state sync snapshots with '%s' pruning setting", storetypes.PruningOptionEverything,
+		)
+	}
 
 	return nil
 }

server/config/toml.go

@@ -22,8 +22,13 @@ minimum-gas-prices = "{{ .BaseConfig.MinGasPrices }}"
 
 # default: the last 100 states are kept in addition to every 500th state; pruning at 10 block intervals
 # nothing: all historic states will be saved, nothing will be deleted (i.e. archiving node)
+<<<<<<< HEAD
 # everything: all saved states will be deleted, storing only the current state; pruning at 10 block intervals
 # custom: allow pruning options to be manually specified through 'pruning-keep-recent', 'pruning-keep-every', and 'pruning-interval'
+=======
+# everything: all saved states will be deleted, storing only the current and previous state; pruning at 10 block intervals
+# custom: allow pruning options to be manually specified through 'pruning-keep-recent' and 'pruning-interval'
+>>>>>>> 75bcf47f1 (refactor: prune everything (#11177))
 pruning = "{{ .BaseConfig.Pruning }}"
 
 # These are applied if and only if the pruning strategy is custom.

server/start.go

@@ -88,8 +88,13 @@ For '--pruning' the options are as follows:
 
 default: the last 100 states are kept in addition to every 500th state; pruning at 10 block intervals
 nothing: all historic states will be saved, nothing will be deleted (i.e. archiving node)
+<<<<<<< HEAD
 everything: all saved states will be deleted, storing only the current state; pruning at 10 block intervals
 custom: allow pruning options to be manually specified through 'pruning-keep-recent', 'pruning-keep-every', and 'pruning-interval'
+=======
+everything: all saved states will be deleted, storing only the current and previous state; pruning at 10 block intervals
+custom: allow pruning options to be manually specified through 'pruning-keep-recent' and 'pruning-interval'
+>>>>>>> 75bcf47f1 (refactor: prune everything (#11177))
 
 Node halting configurations exist in the form of two flags: '--halt-height' and '--halt-time'. During
 the ABCI Commit phase, the node will check if the current block height is greater than or equal to

store/rootmulti/store.go

@@ -396,12 +396,17 @@ func (rs *Store) Commit() types.CommitID {
 		previousHeight = rs.lastCommitInfo.GetVersion()
 		version = previousHeight + 1
 	}
+<<<<<<< HEAD
+=======
+
+	rs.lastCommitInfo = commitStores(version, rs.stores, rs.removalMap)
+>>>>>>> 75bcf47f1 (refactor: prune everything (#11177))
 
 	rs.lastCommitInfo = commitStores(version, rs.stores)
 
 	// Determine if pruneHeight height needs to be added to the list of heights to
 	// be pruned, where pruneHeight = (commitHeight - 1) - KeepRecent.
-	if int64(rs.pruningOpts.KeepRecent) < previousHeight {
+	if rs.pruningOpts.Interval > 0 && int64(rs.pruningOpts.KeepRecent) < previousHeight {
 		pruneHeight := previousHeight - int64(rs.pruningOpts.KeepRecent)
 		// We consider this height to be pruned iff:
 		//

store/types/pruning.go

@@ -19,9 +19,15 @@ var (
 	PruneDefault = NewPruningOptions(362880, 100, 10)
 
 	// PruneEverything defines a pruning strategy where all committed heights are
+<<<<<<< HEAD
 	// deleted, storing only the current height and where to-be pruned heights are
 	// pruned at every 10th height.
 	PruneEverything = NewPruningOptions(0, 0, 10)
+=======
+	// deleted, storing only the current and previous height and where to-be pruned
+	// heights are pruned at every 10th height.
+	PruneEverything = NewPruningOptions(2, 10)
+>>>>>>> 75bcf47f1 (refactor: prune everything (#11177))
 
 	// PruneNothing defines a pruning strategy where all heights are kept on disk.
 	PruneNothing = NewPruningOptions(0, 1, 0)